From 06339e0c8ac8fdbbf5d2784df8019704da9bd6eb Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 13 Jan 2015 12:28:33 -0500
Subject: [PATCH] - fixed javascript call in json file
---
interface/web/index.php | 50 ++++++++++++++++++++++++++++++--------------------
1 files changed, 30 insertions(+), 20 deletions(-)
diff --git a/interface/web/index.php b/interface/web/index.php
index c0005bc..f6929ba 100644
--- a/interface/web/index.php
+++ b/interface/web/index.php
@@ -28,8 +28,8 @@
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'])) $_SESSION['s']['module']['name'] = 'login';
@@ -41,42 +41,52 @@
$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($sys_config['use_loadindicator'] == 'y') {
+ $app->tpl->setVar('use_loadindicator', 'y');
+}
+if($sys_config['use_combobox'] == 'y') {
+ $app->tpl->setVar('use_combobox', 'y');
+}
+
+
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']);
}
// read js.d files
$js_d = ISPC_WEB_PATH . '/js/js.d';
$js_d_files = array();
if(@is_dir($js_d)) {
- $dir = opendir($js_d);
- while($file = readdir($dir)) {
- $filename = $js_d . '/' . $file;
- if($file === '.' || $file === '..' || !is_file($filename)) continue;
- if(substr($file, -3) !== '.js') continue;
- $js_d_files[] = array('file' => $file);
- }
- closedir($dir);
+ $dir = opendir($js_d);
+ while($file = readdir($dir)) {
+ $filename = $js_d . '/' . $file;
+ if($file === '.' || $file === '..' || !is_file($filename)) continue;
+ if(substr($file, -3) !== '.js') continue;
+ $js_d_files[] = array('file' => $file);
+ }
+ closedir($dir);
}
-$app->tpl->setLoop('js_d_includes', $js_d_files);
+if (!empty($js_d_files)) $app->tpl->setLoop('js_d_includes', $js_d_files);
unset($js_d_files);
+
+$app->tpl->setVar('current_theme', isset($_SESSION['s']['theme']) ? $_SESSION['s']['theme'] : 'default');
$app->tpl_defaults();
$app->tpl->pparse();
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1