diff --git a/airtime_mvc/application/layouts/scripts/login.phtml b/airtime_mvc/application/layouts/scripts/login.phtml index e1e4167a2..aa4030390 100644 --- a/airtime_mvc/application/layouts/scripts/login.phtml +++ b/airtime_mvc/application/layouts/scripts/login.phtml @@ -13,8 +13,8 @@ layout()->content ?> diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php index 50de284a3..cfed23b1c 100644 --- a/airtime_mvc/application/models/Preference.php +++ b/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) @@ -1313,7 +1317,12 @@ class Application_Model_Preference } $ds = unserialize($v); - + + + if (is_null($ds) || !is_array($ds)) { + return $id; + } + if (!array_key_exists('ColReorder', $ds)) { return $id; } diff --git a/airtime_mvc/application/services/ShowService.php b/airtime_mvc/application/services/ShowService.php index e71ecc568..3c6d5f713 100644 --- a/airtime_mvc/application/services/ShowService.php +++ b/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()); diff --git a/airtime_mvc/application/views/scripts/dashboard/about.phtml b/airtime_mvc/application/views/scripts/dashboard/about.phtml index 05f65cd80..f2ccfa02d 100644 --- a/airtime_mvc/application/views/scripts/dashboard/about.phtml +++ b/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 ?>
© 2013 ", "", "", diff --git a/airtime_mvc/application/views/scripts/login/index.phtml b/airtime_mvc/application/views/scripts/login/index.phtml index 3012ae985..178aca493 100644 --- a/airtime_mvc/application/views/scripts/login/index.phtml +++ b/airtime_mvc/application/views/scripts/login/index.phtml @@ -4,7 +4,7 @@
demo) && $this->demo == 1){?>

- +

message; ?>

diff --git a/airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.mo index 5086a3ada..d0e3c2d38 100644 Binary files a/airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.mo and b/airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.mo differ diff --git a/airtime_mvc/tests/application/helpers/TestHelper.php b/airtime_mvc/tests/application/helpers/TestHelper.php index c339b2329..c33103f8e 100644 --- a/airtime_mvc/tests/application/helpers/TestHelper.php +++ b/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() diff --git a/install_minimal/include/AirtimeInstall.php b/install_minimal/include/AirtimeInstall.php index dd97f0717..63ab79f1e 100644 --- a/install_minimal/include/AirtimeInstall.php +++ b/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); } }