diff --git a/livesupport/modules/htmlUI/var/html/ui_handler.php b/livesupport/modules/htmlUI/var/html/ui_handler.php index d5fe49b3c..df726d1bf 100644 --- a/livesupport/modules/htmlUI/var/html/ui_handler.php +++ b/livesupport/modules/htmlUI/var/html/ui_handler.php @@ -5,7 +5,7 @@ switch($_REQUEST['act']){ case "login": if ($uiHandler->login($_REQUEST, $ui_fmask["login"]) === TRUE) { - #$uiHandler->checkSystemPrefs(); + $uiHandler->loadStationPrefs($ui_fmask['stationPrefs'], TRUE); $uiHandler->PLAYLIST->loadLookedFromPref(); } break; @@ -45,7 +45,7 @@ switch($_REQUEST['act']){ if ($_REQUEST['id']) { $uiHandler->editWebstream($_REQUEST, $ui_fmask['webstream']); } else { - $ui_tmpid = $uiHandler->addWebstream($_REQUEST, $ui_fmask['webstream']); + $ui_tmpid = $uiHandler->addWebstream($_REQUEST, $ui_fmask['webstream']); $uiHandler->SCRATCHPAD->addItem($ui_tmpid); } break; diff --git a/livesupport/modules/htmlUI/var/ui_base.inc.php b/livesupport/modules/htmlUI/var/ui_base.inc.php index 4dc6fd29e..018f377b0 100644 --- a/livesupport/modules/htmlUI/var/ui_base.inc.php +++ b/livesupport/modules/htmlUI/var/ui_base.inc.php @@ -113,7 +113,7 @@ class uiBase function loadStationPrefs(&$mask, $reload=FALSE) { - if (!is_array($this->STATIONPREFS || $reload===TRUE)) { + if (!is_array($this->STATIONPREFS) || $reload===TRUE) { foreach ($mask as $key=>$val) { if ($val['isPref']) { if (is_string($setting = $this->gb->loadGroupPref(NULL, 'StationPrefs', $val['element']))) { @@ -126,8 +126,8 @@ class uiBase if (!$this->STATIONPREFS['stationMaxfilesize']) $this->STATIONPREFS['stationMaxfilesize'] = strtr(ini_get('upload_max_filesize'), array('M'=>'000000', 'k'=>'000')); - if ($miss && $this->login) { - $this->_retMsg('Note: Station Preferences not setup.'); + if ($miss && $this->gb->getSessLogin($this->sessid)) { + $this->_retMsg('Note: Station Preferences not setup proberly.'); } } diff --git a/livesupport/modules/htmlUI/var/ui_browser.class.php b/livesupport/modules/htmlUI/var/ui_browser.class.php index 02490fb76..818678b4f 100644 --- a/livesupport/modules/htmlUI/var/ui_browser.class.php +++ b/livesupport/modules/htmlUI/var/ui_browser.class.php @@ -289,7 +289,7 @@ class uiBrowser extends uiBase { function addGroupMember($id) { $g = $this->groupMembers($id); - foreach($g['subj'] as $s) { + foreach($g['subj'] as $s) { $this->logins[($s['login'])]=$s['login']; } $form = new HTML_QuickForm('addGroupMember', UI_STANDARD_FORM_METHOD, UI_HANDLER); @@ -299,7 +299,7 @@ class uiBrowser extends uiBase { $form->addElement('hidden', 'act'); $form->addElement('hidden', 'reid'); $form->addElement('hidden', 'gname'); - $s =& $form->createElement('select', 'login', 'Add Group: '); + $s =& $form->createElement('select', 'login', 'Add Member: '); $s->loadArray($this->logins, NULL); $form->addElement($s); $form->addElement('submit', NULL, tra('Do')); @@ -365,7 +365,7 @@ class uiBrowser extends uiBase { * @return string (html) */ function metaDataForm($parms, $get=FALSE, $data=NULL) - { + { extract ($parms); include dirname(__FILE__).'/formmask/metadata.inc.php';