diff --git a/livesupport/modules/htmlUI/var/html/ui_handler.php b/livesupport/modules/htmlUI/var/html/ui_handler.php index 1b84920ec..92a9c21a5 100644 --- a/livesupport/modules/htmlUI/var/html/ui_handler.php +++ b/livesupport/modules/htmlUI/var/html/ui_handler.php @@ -6,7 +6,8 @@ switch($_REQUEST['act']){ case "login": if ($uiHandler->login($_REQUEST, $ui_fmask["login"]) === TRUE) { $uiHandler->loadStationPrefs($ui_fmask['stationPrefs'], TRUE); - $uiHandler->PLAYLIST->reportLookedPL(TRUE); + # $uiHandler->PLAYLIST->reportLookedPL(); + $uiHandler->PLAYLIST->loadLookedFromPref(); } break; @@ -187,7 +188,7 @@ switch($_REQUEST['act']){ if ($_REQUEST['id']) $uiHandler->SCRATCHPAD->addItem($_REQUEST['id']); $uiHandler->SCRATCHPAD->addItem($ui_tmpid); } - $uiHandler->PLAYLIST->setRedirect('_2PL.editMetaData'); + $uiHandler->PLAYLIST->setRedirect('_2PL.editMetaData'); break; case "PL.addItem": diff --git a/livesupport/modules/htmlUI/var/localizer/data.inc.php b/livesupport/modules/htmlUI/var/localizer/data.inc.php index 59c3859a8..612ec48d0 100755 --- a/livesupport/modules/htmlUI/var/localizer/data.inc.php +++ b/livesupport/modules/htmlUI/var/localizer/data.inc.php @@ -31,7 +31,8 @@ class Data { function _realTransPath($file, $Id, $type='xml') { $s = '/'; - return $_SERVER[DOCUMENT_ROOT].$s.dirname($_SERVER[SCRIPT_NAME]).$s.Data::langPath($file, $Id, $type); + #return $_SERVER[DOCUMENT_ROOT].$s.dirname($_SERVER[SCRIPT_NAME]).$s.Data::langPath($file, $Id, $type); + return dirname(__FILE__).$s.Data::langPath($file, $Id, $type); } function langPath($file, $Id, $type) diff --git a/livesupport/modules/htmlUI/var/localizer/display.inc.php b/livesupport/modules/htmlUI/var/localizer/display.inc.php index 8ab1ecdff..a2578742e 100755 --- a/livesupport/modules/htmlUI/var/localizer/display.inc.php +++ b/livesupport/modules/htmlUI/var/localizer/display.inc.php @@ -31,19 +31,6 @@ class Display { $file['sourceId'] = _DEFAULT_LANG_; } - $html .= '
{$i.start|truncate:5:""} - {$i.end|truncate:5:""}
{$i.creator}
diff --git a/livesupport/modules/htmlUI/var/ui_handler.class.php b/livesupport/modules/htmlUI/var/ui_handler.class.php index fb5203287..468e89665 100644 --- a/livesupport/modules/htmlUI/var/ui_handler.class.php +++ b/livesupport/modules/htmlUI/var/ui_handler.class.php @@ -55,6 +55,7 @@ class uiHandler extends uiBase { #setcookie($this->config['authCookieName'], $sessid); echo ""; ob_flush(); + $id = $this->gb->getObjId($formdata['login'], $this->gb->storId); if(PEAR::isError($id)) { $this->_retMsg('Login failed'); diff --git a/livesupport/modules/htmlUI/var/ui_scheduler.class.php b/livesupport/modules/htmlUI/var/ui_scheduler.class.php index 5fe5d73d5..1c3f242e6 100755 --- a/livesupport/modules/htmlUI/var/ui_scheduler.class.php +++ b/livesupport/modules/htmlUI/var/ui_scheduler.class.php @@ -89,7 +89,8 @@ class uiScheduler extends uiCalendar foreach ($arr as $key => $val) { $items[strftime('%d', $this->_datetime2timestamp($val['start']))][number_format(strftime('%H', $this->_datetime2timestamp($val['start'])))][]= array ( - 'id' => $val['id'], + 'scheduleid'=> $val['id'], + 'plid' => $this->Base->gb->_idFromGunid($val['playlistId']), 'start' => substr($val['start'], strpos($val['start'], 'T')+1), 'end' => substr($val['end'], strpos($val['end'], 'T') + 1), 'title' => $this->Base->_getMDataValue($this->Base->gb->_idFromGunid($val['playlistId']), UI_MDATA_KEY_TITLE), @@ -115,7 +116,8 @@ class uiScheduler extends uiCalendar foreach ($arr as $key => $val) { $items[number_format(strftime('%H', $this->_datetime2timestamp($val['start'])))][]= array ( - 'id' => $val['id'], + 'plid' => $this->Base->gb->_idFromGunid($val['playlistId']), + 'scheduleid'=> $val['id'], 'start' => substr($val['start'], strpos($val['start'], 'T')+1), 'end' => substr($val['end'], strpos($val['end'], 'T') + 1), 'title' => $this->Base->_getMDataValue($this->Base->gb->_idFromGunid($val['playlistId']), UI_MDATA_KEY_TITLE), @@ -388,7 +390,7 @@ class uiScheduler extends uiCalendar function _isError($r) { if (is_array($r['error'])) { - #$this->Base->_retMsg('Error: $1', str_replace("\n", "\\n", addslashes($r['error']['message']))); + $this->Base->_retMsg('Error: $1', str_replace("\n", "\\n", addslashes($r['error']['message']))); return TRUE; } return FALSE;