From 54ec6445c6e782732c7b00adcfa82320463c3112 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Mon, 9 Apr 2012 12:43:40 -0400 Subject: [PATCH 1/3] CC-3606: System->Media Folders-> system seems to search -fixed. Need to check if directory actually exists. --- .../controllers/PreferenceController.php | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php index 99d556807..417009b0f 100644 --- a/airtime_mvc/application/controllers/PreferenceController.php +++ b/airtime_mvc/application/controllers/PreferenceController.php @@ -260,16 +260,18 @@ class PreferenceController extends Zend_Controller_Action else { $path = $path.'/'; - $handle = opendir($path); - while (false !== ($file = readdir($handle))) { - if ($file != "." && $file != "..") { - //only show directories that aren't private. - if (is_dir($path.$file) && substr($file, 0, 1) != ".") { - $element = array(); - $element["name"] = $file; - $element["isFolder"] = true; - $element["isError"] = false; - $result[$file] = $element; + $handle = opendir($path); + if ($handle !== false){ + while (false !== ($file = readdir($handle))) { + if ($file != "." && $file != "..") { + //only show directories that aren't private. + if (is_dir($path.$file) && substr($file, 0, 1) != ".") { + $element = array(); + $element["name"] = $file; + $element["isFolder"] = true; + $element["isError"] = false; + $result[$file] = $element; + } } } } From 516f71c23e133bd56409378962bd239a0339c52f Mon Sep 17 00:00:00 2001 From: Denise Rigato Date: Mon, 9 Apr 2012 15:49:39 -0400 Subject: [PATCH 2/3] CC-3487: Improved restart warning message for stream settings page -fixed --- airtime_mvc/application/forms/GeneralPreferences.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/application/forms/GeneralPreferences.php b/airtime_mvc/application/forms/GeneralPreferences.php index 9e71aed56..31ef10a18 100644 --- a/airtime_mvc/application/forms/GeneralPreferences.php +++ b/airtime_mvc/application/forms/GeneralPreferences.php @@ -11,7 +11,7 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm $defaultFade = Application_Model_Preference::GetDefaultFade(); if($defaultFade == ""){ - $defaultFade = '00.000000'; + $defaultFade = '0.500000'; } //Station name From ee0a08be15f7af783200a72d27fe8e2b6906e772 Mon Sep 17 00:00:00 2001 From: Denise Rigato Date: Mon, 9 Apr 2012 15:51:17 -0400 Subject: [PATCH 3/3] CC-3487: Improved restart warning message for stream settings page -fixed --- airtime_mvc/application/controllers/PreferenceController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php index 99d556807..4013bdeba 100644 --- a/airtime_mvc/application/controllers/PreferenceController.php +++ b/airtime_mvc/application/controllers/PreferenceController.php @@ -235,7 +235,7 @@ class PreferenceController extends Zend_Controller_Action $live_stream_subform->updateConnectionURLs(); } - $this->view->confirm_pypo_restart_text = "Updating settings will temporarily interrupt any currently playing shows. Click \'OK\' to continue."; + $this->view->confirm_pypo_restart_text = "If you change the username or password values for an enabled stream the playout engine will be rebooted and your listeners will hear silence for 5-10 seconds. Changing the following fields will NOT cause a reboot: Stream Label (Global Settings), and Switch Transition Fade(s), Master Username, and Master Password (Input Stream Settings)."; $this->view->num_stream = $num_of_stream; $this->view->enable_stream_conf = Application_Model_Preference::GetEnableStreamConf();