From deea5024198498cc1d59d710687d83dae84a8ff2 Mon Sep 17 00:00:00 2001 From: sebastian Date: Thu, 10 Mar 2005 12:19:15 +0000 Subject: [PATCH] *** empty log message *** --- livesupport/modules/htmlUI/var/ui_browser_init.php | 4 ++-- livesupport/modules/htmlUI/var/{conf.php => ui_conf.php} | 2 ++ livesupport/modules/htmlUI/var/ui_handler_init.php | 2 +- livesupport/modules/htmlUI/var/ui_playlist.class.php | 3 ++- livesupport/modules/htmlUI/var/ui_scratchpad.class.php | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) rename livesupport/modules/htmlUI/var/{conf.php => ui_conf.php} (96%) mode change 100644 => 100755 diff --git a/livesupport/modules/htmlUI/var/ui_browser_init.php b/livesupport/modules/htmlUI/var/ui_browser_init.php index 65f54a263..517998d77 100644 --- a/livesupport/modules/htmlUI/var/ui_browser_init.php +++ b/livesupport/modules/htmlUI/var/ui_browser_init.php @@ -2,7 +2,7 @@ session_start(); ## LS classes/functions ############################################# -require_once dirname(__FILE__).'/conf.php'; +require_once dirname(__FILE__).'/ui_conf.php'; require_once dirname(__FILE__).'/ui_browser.class.php'; @@ -39,7 +39,7 @@ $Smarty->assign('USER', array('sessid' => &$uiBrowser->sessid, )); $uiBrowser->loadStationPrefs($ui_fmask['stationPrefs']); $Smarty->assign('STATIONPREFS', $uiBrowser->STATIONPREFS); - + ## retransfer incomplete formdata from SESSION to POST-data ######### if (is_array($_SESSION['retransferFormData'])){ foreach($_SESSION['retransferFormData'] as $k=>$v){ diff --git a/livesupport/modules/htmlUI/var/conf.php b/livesupport/modules/htmlUI/var/ui_conf.php old mode 100644 new mode 100755 similarity index 96% rename from livesupport/modules/htmlUI/var/conf.php rename to livesupport/modules/htmlUI/var/ui_conf.php index 6206d11c1..b73f818b7 --- a/livesupport/modules/htmlUI/var/conf.php +++ b/livesupport/modules/htmlUI/var/ui_conf.php @@ -1,4 +1,6 @@ Base->gb->addAudioClipToPlaylist($this->token, $elemId, $this->Base->sessid); if (PEAR::isError($r)) { - print_r($r); + if (UI_VERBOSE) print_r($r); $this->Base->_retMsg('Error on add item to Playlist'); return FALSE; } @@ -252,6 +252,7 @@ class uiPlaylist $r = $this->Base->gb->changeFadeInfo($this->token, $i, $val['fadeIn'], $val['fadeOut'], $this->Base->sessid); #print_r($r); if (PEAR::isError($r)) { + if (UI_VERBOSE) print_r($r); $this->Base->_retMsg('ChangeFadeInfo failed'); return FALSE; } diff --git a/livesupport/modules/htmlUI/var/ui_scratchpad.class.php b/livesupport/modules/htmlUI/var/ui_scratchpad.class.php index 61db83ca0..5fc3725a9 100755 --- a/livesupport/modules/htmlUI/var/ui_scratchpad.class.php +++ b/livesupport/modules/htmlUI/var/ui_scratchpad.class.php @@ -67,7 +67,7 @@ class uiScratchPad function addItem($id) { if(!$this->Base->STATIONPREFS[UI_SCRATCHPAD_MAXLENGTH_KEY]) { - if (!$this->verbose) $this->Base->_retMsg('ScratchPad length is not set in System Preferences, so it cannot be used.'); + if ($this->verbose) $this->Base->_retMsg('ScratchPad length is not set in System Preferences, so it cannot be used.'); return false; }