From 37b29231e47a0c4458dc1c15d98588f16f07e1e2 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 06 Aug 2015 03:18:44 -0400
Subject: [PATCH] - don't set password via remoting if field is empty
---
interface/web/index.php | 77 +++++++++++++++++++++++++++++---------
1 files changed, 58 insertions(+), 19 deletions(-)
diff --git a/interface/web/index.php b/interface/web/index.php
index 7e06711..7cdf5bd 100644
--- a/interface/web/index.php
+++ b/interface/web/index.php
@@ -28,43 +28,82 @@
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');
+$app->tpl->setVar('logged_in', ($_SESSION['s']['user']['active'] != 1 ? 'n' : 'y'));
// 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($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);
+}
+
+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');
+
+// Logo
+$logo = $app->db->queryOneRecord("SELECT * FROM sys_ini WHERE sysini_id = 1");
+if($logo['custom_logo'] != ''){
+ $base64_logo_txt = $logo['custom_logo'];
+} else {
+ $base64_logo_txt = $logo['default_logo'];
+}
+$tmp_base64 = explode(',', $base64_logo_txt, 2);
+$logo_dimensions = $app->functions->getimagesizefromstring(base64_decode($tmp_base64[1]));
+$app->tpl->setVar('base64_logo_width', $logo_dimensions[0].'px');
+$app->tpl->setVar('base64_logo_height', $logo_dimensions[1].'px');
+$app->tpl->setVar('base64_logo_txt', $base64_logo_txt);
+
+// Title
+$app->tpl->setVar('company_name', $sys_config['company_name']. ' :: ');
$app->tpl_defaults();
$app->tpl->pparse();
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1