diff --git a/livesupport/modules/htmlUI/var/conf.php b/livesupport/modules/htmlUI/var/conf.php index fbd289961..a3f7d1426 100644 --- a/livesupport/modules/htmlUI/var/conf.php +++ b/livesupport/modules/htmlUI/var/conf.php @@ -23,7 +23,7 @@ Author : $Author: sebastian $ - Version : $Revision: 1.6 $ + Version : $Revision: 1.7 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/htmlUI/var/Attic/conf.php,v $ ------------------------------------------------------------------------------*/ diff --git a/livesupport/modules/htmlUI/var/html/templates/examples/smarty-dynamic-fancygroup.tpl b/livesupport/modules/htmlUI/var/html/templates/examples/smarty-dynamic-fancygroup.tpl index b9124fd82..60f1690bd 100644 --- a/livesupport/modules/htmlUI/var/html/templates/examples/smarty-dynamic-fancygroup.tpl +++ b/livesupport/modules/htmlUI/var/html/templates/examples/smarty-dynamic-fancygroup.tpl @@ -1,4 +1,4 @@ - + diff --git a/livesupport/modules/htmlUI/var/html/templates/examples/smarty-dynamic-green.tpl b/livesupport/modules/htmlUI/var/html/templates/examples/smarty-dynamic-green.tpl index bc25a9fb0..7afa35b7e 100644 --- a/livesupport/modules/htmlUI/var/html/templates/examples/smarty-dynamic-green.tpl +++ b/livesupport/modules/htmlUI/var/html/templates/examples/smarty-dynamic-green.tpl @@ -1,4 +1,4 @@ - + {$element.label}: diff --git a/livesupport/modules/htmlUI/var/html/templates/examples/smarty-dynamic.tpl b/livesupport/modules/htmlUI/var/html/templates/examples/smarty-dynamic.tpl index 49b124880..2cfea9e02 100644 --- a/livesupport/modules/htmlUI/var/html/templates/examples/smarty-dynamic.tpl +++ b/livesupport/modules/htmlUI/var/html/templates/examples/smarty-dynamic.tpl @@ -1,5 +1,5 @@ - + Smarty template for Array renderer diff --git a/livesupport/modules/htmlUI/var/html/templates/smarty-static.tpl b/livesupport/modules/htmlUI/var/html/templates/smarty-static.tpl index e84454015..37bcac50f 100644 --- a/livesupport/modules/htmlUI/var/html/templates/smarty-static.tpl +++ b/livesupport/modules/htmlUI/var/html/templates/smarty-static.tpl @@ -1,5 +1,5 @@ - + Smarty template for ArraySmarty renderer: 2 column layout example diff --git a/livesupport/modules/htmlUI/var/html/ui_browser.php b/livesupport/modules/htmlUI/var/html/ui_browser.php index c4bf8865b..ec2b7c776 100644 --- a/livesupport/modules/htmlUI/var/html/ui_browser.php +++ b/livesupport/modules/htmlUI/var/html/ui_browser.php @@ -39,7 +39,7 @@ if (is_array($_REQUEST['popup'])){ $Smarty->assign('statusbar', $uiBrowser->getStationInfo($ui_fmask['systemPrefs'])); -if ($uiBrowser->userid) { +if ($uiBrowser->userid) { $Smarty->assign('showMenuTop', TRUE); $Smarty->assign('sp', $uiBrowser->getSP()); $Smarty->assign('showSP', TRUE); diff --git a/livesupport/modules/htmlUI/var/ui_base.inc.php b/livesupport/modules/htmlUI/var/ui_base.inc.php index 71249c3b7..4ba0e0643 100644 --- a/livesupport/modules/htmlUI/var/ui_base.inc.php +++ b/livesupport/modules/htmlUI/var/ui_base.inc.php @@ -34,6 +34,7 @@ class uiBase } $dbc->setFetchMode(DB_FETCHMODE_ASSOC); $this->gb =& new GreenBox(&$dbc, $config); + $this->config = $config; $this->sessid = $_REQUEST[$config['authCookieName']]; $this->userid = $this->gb->getSessUserId($this->sessid); $this->login = $this->gb->getSessLogin($this->sessid); @@ -315,7 +316,7 @@ class uiBase function getFileInfo($id) { - $f = $this->gb->analyzeFile($id, $this->sessid); + $f = $this->gb->analyzeFile($id, $this->sessid); return array( 'name' => $this->getFileName($id), 'type' => 0, diff --git a/livesupport/modules/htmlUI/var/ui_browser_init.php b/livesupport/modules/htmlUI/var/ui_browser_init.php index 87613f123..a448b0bde 100644 --- a/livesupport/modules/htmlUI/var/ui_browser_init.php +++ b/livesupport/modules/htmlUI/var/ui_browser_init.php @@ -22,7 +22,7 @@ PEAR::setErrorHandling(PEAR_ERROR_RETURN); // some global vars/objects $Smarty = new Smarty; $uiBrowser = new uiBrowser($config); -$uiBase = new uiBase($config); +$uiBase = new uiBase($config); require_once dirname(__FILE__).'/SmartyExtensions.inc.php'; diff --git a/livesupport/modules/htmlUI/var/ui_handler.class.php b/livesupport/modules/htmlUI/var/ui_handler.class.php index efd49f5ce..c12f49dac 100644 --- a/livesupport/modules/htmlUI/var/ui_handler.class.php +++ b/livesupport/modules/htmlUI/var/ui_handler.class.php @@ -33,7 +33,7 @@ class uiHandler extends uiBase { * @param pass string, password */ function login(&$formdata, &$mask) - { + { if ($this->_validateForm($formdata, $mask)) { $sessid = $this->gb->login($formdata['login'], $formdata['pass']); if($sessid && !PEAR::isError($sessid)){