From c57d4e3fc4c829ed2a5ac3bca8c4bc3cd5515527 Mon Sep 17 00:00:00 2001
From: Duncan Sommerville <duncan.sommerville@gmail.com>
Date: Thu, 26 Feb 2015 13:30:35 -0500
Subject: [PATCH 1/3] Check if station is on a trial plan before displaying the
 trial box

---
 .../application/views/scripts/partialviews/trialBox.phtml       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/airtime_mvc/application/views/scripts/partialviews/trialBox.phtml b/airtime_mvc/application/views/scripts/partialviews/trialBox.phtml
index b38973dc2..70f8ba322 100644
--- a/airtime_mvc/application/views/scripts/partialviews/trialBox.phtml
+++ b/airtime_mvc/application/views/scripts/partialviews/trialBox.phtml
@@ -1,4 +1,4 @@
-<?php if($this->trial_remain != '' && $this->trial_remain != "Trial expired."){?>
+<?php if($this->is_trial && $this->trial_remain != '' && $this->trial_remain != "Trial expired."){?>
   <div class="trial-box">
       <p><?php echo _("Your trial expires in") ?></p>
       <div class="trial-box-calendar">

From 0b1af01822c80d494037c1d1a53632a5b249c576 Mon Sep 17 00:00:00 2001
From: Albert Santoni <albert.santoni@sourcefabric.org>
Date: Thu, 26 Feb 2015 13:52:51 -0500
Subject: [PATCH 2/3] Better exception logging and small pypo exception fix

---
 airtime_mvc/application/models/airtime/CcFiles.php | 2 +-
 python_apps/pypo/pypofile.py                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/airtime_mvc/application/models/airtime/CcFiles.php b/airtime_mvc/application/models/airtime/CcFiles.php
index 2ca2fac46..15bb3061e 100644
--- a/airtime_mvc/application/models/airtime/CcFiles.php
+++ b/airtime_mvc/application/models/airtime/CcFiles.php
@@ -100,7 +100,7 @@ class CcFiles extends BaseCcFiles {
     {
         $music_dir = Application_Model_MusicDir::getDirByPK($this->getDbDirectory());
         if (!$music_dir) {
-            throw new Exception("Invalid music_dir for file in database.");
+            throw new Exception("Invalid music_dir for file " . $this->getDbId() . " in database.");
         }
         $directory = $music_dir->getDirectory();
         $filepath  = $this->getDbFilepath();
diff --git a/python_apps/pypo/pypofile.py b/python_apps/pypo/pypofile.py
index 829c3fe23..3e5a400e5 100644
--- a/python_apps/pypo/pypofile.py
+++ b/python_apps/pypo/pypofile.py
@@ -167,7 +167,7 @@ class PypoFile(Thread):
         except IOError as e:
             logging.debug("Failed to open config file at %s: %s" % (config_path, e.strerror))
             sys.exit()
-        except Exception:
+        except Exception as e:
             logging.debug(e.strerror) 
             sys.exit()
 

From 6047670dbdfe78f8573d85b62d83e44e9130fda8 Mon Sep 17 00:00:00 2001
From: Albert Santoni <albert.santoni@sourcefabric.org>
Date: Thu, 26 Feb 2015 14:12:51 -0500
Subject: [PATCH 3/3] Fix corner case where failed uploads could show up in the
 library

---
 .../modules/rest/controllers/MediaController.php          | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/airtime_mvc/application/modules/rest/controllers/MediaController.php b/airtime_mvc/application/modules/rest/controllers/MediaController.php
index 1c18c233d..4fd98706b 100644
--- a/airtime_mvc/application/modules/rest/controllers/MediaController.php
+++ b/airtime_mvc/application/modules/rest/controllers/MediaController.php
@@ -175,14 +175,16 @@ class Rest_MediaController extends Zend_Rest_Controller
         } else if ($file && isset($requestData["resource_id"])) {
 
             $file->fromArray($whiteList, BasePeer::TYPE_FIELDNAME);
-            
+
             //store the original filename
             $file->setDbFilepath($requestData["filename"]);
-            
+
             $fileSizeBytes = $requestData["filesize"];
             if (!isset($fileSizeBytes) || $fileSizeBytes === false)
             {
-                $file->setDbImportStatus(2)->save();
+                $file->setDbImportStatus(2);
+                $file->setHidden(true);
+                $file->save();
                 $this->fileNotFoundResponse();
                 return;
             }