Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas

airtime_mvc/application/controllers/SystemstatusController.php

@@ -16,7 +16,7 @@ class SystemstatusController extends Zend_Controller_Action
         $services = array(
             "pypo"=>Application_Model_Systemstatus::GetPypoStatus(),
             "liquidsoap"=>Application_Model_Systemstatus::GetLiquidsoapStatus(),
-            "media-monitor"=>Application_Model_Systemstatus::GetMediaMonitorStatus(),
+            //"media-monitor"=>Application_Model_Systemstatus::GetMediaMonitorStatus(),
         );
 
         $partitions = Application_Model_Systemstatus::GetDiskInfo();

airtime_mvc/application/layouts/scripts/login.phtml

@@ -13,8 +13,8 @@
         <?php echo $this->layout()->content ?>
     </div>
     <div class="footer">
-      <?php echo sprintf(_("Airtime Copyright &copy;Sourcefabric o.p.s. All rights reserved.%s"
-      ."Maintained and distributed under GNU GPL v.3 by %sSourcefabric o.p.s%s"),
+      <?php echo sprintf(_("Airtime copyright &copy; Sourcefabric z.ú. All rights reserved.%s"
+      ."Maintained and distributed under the GNU GPL v.3 by %sSourcefabric z.ú.%s"),
       "<br>", "<a href='http://www.sourcefabric.org'>" ,"</a>");?> 
     </div>
  

airtime_mvc/application/models/Preference.php

@@ -545,7 +545,11 @@ class Application_Model_Preference
     // Returns station default timezone (from preferences)
     public static function GetDefaultTimezone()
     {
-        return self::getValue("timezone");
+        $stationTimezone = self::getValue("timezone");
+        if (is_null($stationTimezone) || $stationTimezone == "") {
+            $stationTimezone = "UTC";
+        }
+        return $stationTimezone;
     }
 
     public static function SetUserTimezone($timezone = null)
@@ -1326,6 +1330,11 @@ class Application_Model_Preference
 
         $ds = unserialize($v);
         
+        
+        if (is_null($ds) || !is_array($ds)) {
+            return $id;
+        }
+        
         if (!array_key_exists('ColReorder', $ds)) {
             return $id;
         }

airtime_mvc/application/services/ShowService.php

@@ -289,7 +289,15 @@ class Application_Service_ShowService
             if ($this->ccShow->isRepeating()) {
                 $ccShowDays = $this->ccShow->getRepeatingCcShowDays();
             } else {
-                $ccShowDays = $this->ccShow->getCcShowDayss();
+                //$ccShowDays = $this->ccShow->getCcShowDayss();
+                
+                /* Cannot use the above statement to get the cc_show_days
+                 * object because it's getting the old object before the
+                 * show was edited. clearInstancePool() didn't work.
+                 */
+                $ccShowDays = CcShowDaysQuery::create()
+                    ->filterByDbShowId($this->ccShow->getDbId())
+                    ->find();
             }
         }
 
@@ -1039,6 +1047,9 @@ SQL;
                 );
                 $origStartDateTime->setTimezone(new DateTimeZone("UTC"));
                 $ccShowInstance = $this->getInstance($origStartDateTime);
+                if (!$ccShowInstance) {
+                    throw new Exception("Could not find show instance with start time: ".$origStartDateTime->format("Y-m-d H:i:s"));
+                }
             }
 
             $ccShowInstance->setDbShowId($this->ccShow->getDbId());

airtime_mvc/application/views/scripts/dashboard/about.phtml

@@ -10,7 +10,7 @@ echo sprintf(_("%sAirtime%s %s, the open radio software for scheduling and remot
 ?>
 <br>© 2013 
 <?php 
-echo sprintf(_("%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"),
+echo sprintf(_("%sSourcefabric%s z.ú Airtime is distributed under the %sGNU GPL v.3%s"),
     "<a href='http://www.sourcefabric.org' target='_blank'>",
     "</a>",
     "<a href='http://www.gnu.org/licenses/gpl-3.0-standalone.html' target='_blank'>",

airtime_mvc/application/views/scripts/login/index.phtml

@@ -4,7 +4,7 @@
     <div id="login" class="login-content clearfix">
         <?php if(isset($this->demo) && $this->demo == 1){?>
             <p style="font-weight:bold">
-            <?php echo _("Welcome to the online Airtime demo! You can log in using the username 'admin' and the password 'admin'.")?>            
+            <?php echo _("Welcome to the Airtime demo! You can log in using the username 'admin' and the password 'admin'.")?>            
             </p>
         <?php }?>
         <p class="light" style='<?php echo $this->error?"color:#902d2d;font-size:11px;padding:2px 4px;background:#c6b4b4;margin-bottom:2px;border:1px solid #c83f3f;":""?>'><?php echo $this->message; ?></p>

airtime_mvc/tests/application/helpers/TestHelper.php

@@ -109,7 +109,6 @@ class TestHelper
             //Create all the database tables
             AirtimeInstall::createDatabaseTables($dbuser, $dbpasswd, $dbname, $dbhost);
         }
-        AirtimeInstall::SetDefaultTimezone();
     }
 
     public static function setupZendBootstrap()

install_minimal/include/AirtimeInstall.php

@@ -178,7 +178,7 @@ class AirtimeInstall
 
             echo "* Giving Apache permission to access $rp".PHP_EOL;
             $success = chgrp($rp, $CC_CONFIG["webServerUser"]);
-            $success = chmod($rp, 02775);
+            $success = chmod($rp, 0775);
         }
     }