Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

airtime_mvc/application/controllers/LibraryController.php

@@ -486,10 +486,12 @@ class LibraryController extends Zend_Controller_Action
             $this->view->error_code = $file->getSoundCloudErrorCode();
             $this->view->error_msg = $file->getSoundCloudErrorMsg();
         } elseif ($type == "file") {
-            $file = Application_Model_StoredFile::Recall($id);
+            $file                   = Application_Model_StoredFile::Recall($id);
-            $this->view->sc_id = $file->getSoundCloudId();
+            $this->view->sc_id      = $file->getSoundCloudId();
             $this->view->error_code = $file->getSoundCloudErrorCode();
-            $this->view->error_msg = $file->getSoundCloudErrorMsg();
+            $this->view->error_msg  = $file->getSoundCloudErrorMsg();
+        } else {
+            Logging::warn("Trying to upload unknown type: $type with id: $id");
         }
     }
 }

airtime_mvc/application/models/Preference.php

@@ -1100,7 +1100,17 @@ class Application_Model_Preference
             return function ($x) { return $x; };
         } else {
             $ds = unserialize($v);
-            return function ($x) use ($ds) { return $ds['ColReorder'][$x]; } ;
+            return function ($x) use ($ds) { 
+                if ( in_array($x, $ds['ColReorder'] ) ) {
+                    return $ds['ColReorder'][$x]; 
+                } else {
+                    Logging::warn("Index $x does not exist preferences");
+                    Logging::warn("Defaulting to identity and printing 
+                        preferences");
+                    Logging::warn($ds);
+                    return $x;
+                }
+            } ;
         }
     }
 

airtime_mvc/application/models/Schedule.php

@@ -344,12 +344,12 @@ SELECT showt.name AS show_name,
 JOIN cc_show AS showt ON (showt.id = si.show_id)
 WHERE si.modified_instance = FALSE
   $showPredicate
-  AND (si.starts >= '{$p_start}'
+  AND ((si.starts >= '{$p_start}'
        AND si.starts < '{$p_end}')
   OR (si.ends > '{$p_start}'
       AND si.ends <= '{$p_end}')
   OR (si.starts <= '{$p_start}'
-      AND si.ends >= '{$p_end}')
+      AND si.ends >= '{$p_end}'))
 ORDER BY si_starts,
          sched_starts;
 SQL;

airtime_mvc/application/models/Soundcloud.php

@@ -23,7 +23,8 @@ class Application_Model_Soundcloud
         return $token;
     }
 
-    public function uploadTrack($filepath, $filename, $description, $tags=array(), $release=null, $genre=null)
+    public function uploadTrack($filepath, $filename, $description,
+        $tags=array(), $release=null, $genre=null)
     {
         if ($this->getToken()) {
             if (count($tags)) {

utils/soundcloud-uploader.php

@@ -24,11 +24,11 @@ require_once($CC_CONFIG['phpDir'].'/application/configs/conf.php');
 
 $CC_CONFIG['phpDir'] = $values['general']['airtime_dir'];
 
-// Ensure library/ is on include_path
+// Ensure library/ is on include_path
-set_include_path(implode(PATH_SEPARATOR, array(
+set_include_path(implode(PATH_SEPARATOR, array(
-        get_include_path(),
+        get_include_path(),
-        realpath($CC_CONFIG['phpDir'] . '/library')
+        realpath($CC_CONFIG['phpDir'] . '/library')
-)));
+)));
 
 require_once($CC_CONFIG['phpDir'].'/application/models/StoredFile.php');
 require_once($CC_CONFIG['phpDir'].'/application/models/Preference.php');