From d6aadf81f11cbb3cda030d095feb6e8c8a44aafe Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 23 Jan 2014 04:36:33 -0500
Subject: [PATCH] Fixed: tpl class now accepts 4 parameters instead of 3 in tags
---
interface/web/index.php | 34 +++++++++++++++-------------------
1 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/interface/web/index.php b/interface/web/index.php
index 7e06711..c6f0ff3 100644
--- a/interface/web/index.php
+++ b/interface/web/index.php
@@ -28,43 +28,39 @@
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-require_once('../lib/config.inc.php');
-require_once('../lib/app.inc.php');
+require_once '../lib/config.inc.php';
+require_once '../lib/app.inc.php';
-if(!isset($_SESSION['s']['module']['name']) or $_SESSION['s']['module']['name']=='login') {
- $_SESSION['s']['module']['name'] = 'login';
- $app->uses('tpl');
- $app->tpl->newTemplate('login.tpl.htm');
-} else {
- $app->uses('tpl');
- $app->tpl->newTemplate('main.tpl.htm');
-}
+if(!isset($_SESSION['s']['module']['name'])) $_SESSION['s']['module']['name'] = 'login';
+
+$app->uses('tpl');
+$app->tpl->newTemplate('main.tpl.htm');
// tab change warning?
// read misc config
$app->uses('getconf');
$sys_config = $app->getconf->get_global_config('misc');
if($sys_config['tab_change_warning'] == 'y') {
- $app->tpl->setVar('tabchange_warning_enabled', 'y');
- $app->tpl->setVar('global_tabchange_warning_txt', $app->lng('global_tabchange_warning_txt'));
+ $app->tpl->setVar('tabchange_warning_enabled', 'y');
+ $app->tpl->setVar('global_tabchange_warning_txt', $app->lng('global_tabchange_warning_txt'));
} else {
- $app->tpl->setVar('tabchange_warning_enabled', 'n');
+ $app->tpl->setVar('tabchange_warning_enabled', 'n');
}
$app->tpl->setVar('tabchange_discard_enabled', $sys_config['tab_change_discard']);
if($sys_config['tab_change_discard'] == 'y') {
- $app->tpl->setVar('global_tabchange_discard_txt', $app->lng('global_tabchange_discard_txt'));
+ $app->tpl->setVar('global_tabchange_discard_txt', $app->lng('global_tabchange_discard_txt'));
}
if(isset($_SESSION['show_info_msg'])) {
- $app->tpl->setVar('show_info_msg', $_SESSION['show_info_msg']);
- unset($_SESSION['show_info_msg']);
+ $app->tpl->setVar('show_info_msg', $_SESSION['show_info_msg']);
+ unset($_SESSION['show_info_msg']);
}
if(isset($_SESSION['show_error_msg'])) {
- $app->tpl->setVar('show_error_msg', $_SESSION['show_error_msg']);
- unset($_SESSION['show_error_msg']);
+ $app->tpl->setVar('show_error_msg', $_SESSION['show_error_msg']);
+ unset($_SESSION['show_error_msg']);
}
$app->tpl_defaults();
$app->tpl->pparse();
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1