Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
James 2012-04-09 16:09:28 -04:00
parent a57f8e2554 7fc575e750
commit 839a49f3e5
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
airtime_mvc/application/controllers/PreferenceController.php
View File

@ -235,7 +235,7 @@ class PreferenceController extends Zend_Controller_Action
$live_stream_subform->updateConnectionURLs(); $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->num_stream = $num_of_stream;
$this->view->enable_stream_conf = Application_Model_Preference::GetEnableStreamConf(); $this->view->enable_stream_conf = Application_Model_Preference::GetEnableStreamConf();
@ -260,16 +260,18 @@ class PreferenceController extends Zend_Controller_Action
else else
{ {
$path = $path.'/'; $path = $path.'/';
$handle = opendir($path); $handle = opendir($path);
while (false !== ($file = readdir($handle))) { if ($handle !== false){
if ($file != "." && $file != "..") { while (false !== ($file = readdir($handle))) {
//only show directories that aren't private. if ($file != "." && $file != "..") {
if (is_dir($path.$file) && substr($file, 0, 1) != ".") { //only show directories that aren't private.
$element = array(); if (is_dir($path.$file) && substr($file, 0, 1) != ".") {
$element["name"] = $file; $element = array();
$element["isFolder"] = true; $element["name"] = $file;
$element["isError"] = false; $element["isFolder"] = true;
$result[$file] = $element; $element["isError"] = false;
$result[$file] = $element;
}
} }
} }
} }

2
airtime_mvc/application/forms/GeneralPreferences.php
View File

@ -11,7 +11,7 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm
$defaultFade = Application_Model_Preference::GetDefaultFade(); $defaultFade = Application_Model_Preference::GetDefaultFade();
if($defaultFade == ""){ if($defaultFade == ""){
$defaultFade = '00.000000'; $defaultFade = '0.500000';
} }
//Station name //Station name