diff --git a/livesupport/modules/htmlUI/var/formmask/general.inc.php b/livesupport/modules/htmlUI/var/formmask/generic.inc.php similarity index 99% rename from livesupport/modules/htmlUI/var/formmask/general.inc.php rename to livesupport/modules/htmlUI/var/formmask/generic.inc.php index 2a838ead6..c5f989b98 100755 --- a/livesupport/modules/htmlUI/var/formmask/general.inc.php +++ b/livesupport/modules/htmlUI/var/formmask/generic.inc.php @@ -35,7 +35,7 @@ $ui_fmask = array( 'isPref' => TRUE, 'type' => 'text', 'label' => 'Station Logo path', - 'default' => 'img/logo.jpg', + 'default' => 'img/stationlogo.gif', 'required' => TRUE ), array( diff --git a/livesupport/modules/htmlUI/var/html/img/stationlogo.gif b/livesupport/modules/htmlUI/var/html/img/stationlogo.gif new file mode 100644 index 000000000..11efc23fd Binary files /dev/null and b/livesupport/modules/htmlUI/var/html/img/stationlogo.gif differ diff --git a/livesupport/modules/htmlUI/var/ui_conf.php b/livesupport/modules/htmlUI/var/ui_conf.php index d9a152abd..3fe4ed3f7 100755 --- a/livesupport/modules/htmlUI/var/ui_conf.php +++ b/livesupport/modules/htmlUI/var/ui_conf.php @@ -3,7 +3,7 @@ define('UI_VERBOSE', FALSE); define('UI_WARNING', TRUE); define('UI_ERROR', TRUE); #define('UI_TIMEZONE', ' +100'); -define('UI_TIMEZONEOFFSET', date('Z')); +define('UI_TIMEZONEOFFSET', date('Z')); define('UI_HANDLER', 'ui_handler.php'); define('UI_BROWSER', 'ui_browser.php'); @@ -61,7 +61,7 @@ require_once dirname(__FILE__).'/ui_playlist.class.php'; require_once dirname(__FILE__).'/ui_search.class.php'; require_once dirname(__FILE__).'/ui_browse.class.php'; require_once dirname(__FILE__).'/../../storageServer/var/GreenBox.php'; -require_once dirname(__FILE__).'/formmask/general.inc.php'; +require_once dirname(__FILE__).'/formmask/generic.inc.php'; require_once dirname(__FILE__).'/ui_calendar.class.php'; require_once dirname(__FILE__).'/ui_scheduler.class.php'; diff --git a/livesupport/modules/htmlUI/var/ui_handler.class.php b/livesupport/modules/htmlUI/var/ui_handler.class.php index 815246da7..e657e1617 100644 --- a/livesupport/modules/htmlUI/var/ui_handler.class.php +++ b/livesupport/modules/htmlUI/var/ui_handler.class.php @@ -641,7 +641,6 @@ class uiHandler extends uiBase { $this->gb->saveGroupPref($this->sessid, 'StationPrefs', $val['element'], $formdata[$val['element']]); else $this->gb->delGroupPref($this->sessid, 'StationPrefs', $val['element']); - #$this->STATIONPREFS[$val['element']] = is_string($this->gb->loadGroupPref(NULL, 'StationPrefs', $val['element'])) ? $this->gb->loadGroupPref($this->sessid, 'StationPrefs', $val['element']) : NULL; } if ($val['type'] == 'file' && $formdata[$val['element']]['name']) { if (FALSE === @move_uploaded_file($formdata[$val['element']]['tmp_name'], $this->gb->loadGroupPref($this->sessid, 'StationPrefs', 'stationLogoPath')))