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

airtime_mvc/application/controllers/ApiController.php

@@ -490,6 +490,7 @@ class ApiController extends Zend_Controller_Action
                 // If the file already exists we will update and make sure that
                 // it's marked as 'exists'.
                 $file->setFileExistsFlag(true);
+                $file->setFileHiddenFlag(false);
                 $file->setMetadata($md);
             }
             if ($md['is_record'] != 0) {

airtime_mvc/application/controllers/plugins/Acl_plugin.php

@@ -152,7 +152,10 @@ class Zend_Controller_Plugin_Acl extends Zend_Controller_Plugin_Abstract
             $resourceName .= $controller;
 
             /** Check if the controller/action can be accessed by the current user */
-            if (!$this->getAcl()->isAllowed($this->_roleName, $resourceName, $request->getActionName())) {
+            if (!$this->getAcl()->has($resourceName) 
+                || !$this->getAcl()->isAllowed($this->_roleName, 
+                        $resourceName, 
+                        $request->getActionName())) {
                 /** Redirect to access denied page */
                 $this->denyAccess();
             }

airtime_mvc/application/models/StoredFile.php

@@ -1184,6 +1184,11 @@ SQL;
         $this->_file->setDbFileExists($flag)
             ->save();
     }
+    public function setFileHiddenFlag($flag)
+    {
+        $this->_file->setDbHidden($flag)
+            ->save();
+    }
     public function setSoundCloudUploadTime($time)
     {
         $this->_file->setDbSoundCloundUploadTime($time)

airtime_mvc/application/models/StreamSetting.php

@@ -201,13 +201,6 @@ class Application_Model_StreamSetting
                             "value"=>self::getDjLiveStreamMountPoint(),
                             "type"=>"string");
         }
-        
-        $sql = "SELECT *"
-        ." FROM cc_pref"
-        ." WHERE keystr = 'off_air_meta'";
-
-        $out = $con->query($sql)->fetchAll();
-        $rows[] = array("keyname" => $out[0]["keystr"], "value"=>$out[0]["valstr"], "type"=>"string");
 
         return $rows;
     }

airtime_mvc/build/sql/defaultdata.sql

@@ -1,6 +1,9 @@
 INSERT INTO cc_subjs ("login", "type", "pass") VALUES ('admin', 'A', md5('admin'));
 -- added in 2.3
-INSERT INTO cc_pref("keystr", "valstr") VALUES('off_air_meta', 'Airtime - offline');
+INSERT INTO cc_stream_setting ("keyname", "value", "type") VALUES ('off_air_meta', 'Airtime - offline', 'string');
+INSERT INTO cc_stream_setting ("keyname", "value", "type") VALUES ('s1_listener_stat_error', '', 'string');
+INSERT INTO cc_stream_setting ("keyname", "value", "type") VALUES ('s2_listener_stat_error', '', 'string');
+INSERT INTO cc_stream_setting ("keyname", "value", "type") VALUES ('s3_listener_stat_error', '', 'string');
 -- end of added in 2.3
 
 -- added in 2.1

python_apps/pypo/pypofetch.py

@@ -277,7 +277,7 @@ class PypoFetch(Thread):
                 if (existing[s[u'keyname']] != str(s[u'value'])):
                     self.logger.info("'Need-to-restart' state detected for %s...", s[u'keyname'])
                     restart = True;
-            elif "master_live_stream_port" in s[u'keyname'] or "master_live_stream_mp" in s[u'keyname'] or "dj_live_stream_port" in s[u'keyname'] or "dj_live_stream_mp" in s[u'keyname']:
+            elif "master_live_stream_port" in s[u'keyname'] or "master_live_stream_mp" in s[u'keyname'] or "dj_live_stream_port" in s[u'keyname'] or "dj_live_stream_mp" in s[u'keyname'] or "off_air_meta" in s[u'keyname']:
                 if (existing[s[u'keyname']] != s[u'value']):
                     self.logger.info("'Need-to-restart' state detected for %s...", s[u'keyname'])
                     restart = True;