From aa370627b211a51dc46891cfa4b6e3d2ef3e52db Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Tue, 16 Jul 2013 10:45:17 -0400
Subject: [PATCH] - Fixed FS#2924 - the month will not set automatically in the autoresponder by click now Along with this fixed some display problems with the combo boxes introduced in 3.0.5. Some fields were not correctly displayed with the predefined values if value and text of the underlying option element differ.
---
interface/web/tools/interface_settings.php | 39 ++++++++++++++++++++++++++++++++++-----
1 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/interface/web/tools/interface_settings.php b/interface/web/tools/interface_settings.php
index f3751df..0c17ac9 100644
--- a/interface/web/tools/interface_settings.php
+++ b/interface/web/tools/interface_settings.php
@@ -49,7 +49,8 @@
$app->load('tform_actions');
class page_action extends tform_actions {
-
+ var $_theme_changed = false;
+
function onLoad() {
global $app, $conf, $tform_def_file;
@@ -80,6 +81,7 @@
if(!in_array($this->dataRecord['startmodule'],$this->dataRecord['modules'])) {
$app->tform->errorMessage .= $app->tform->wordbook['startmodule_err'];
}
+ $this->updateSessionTheme();
}
function onInsert() {
@@ -90,15 +92,42 @@
global $app, $conf;
if($conf['demo_mode'] == true && $this->id <= 3) $app->tform->errorMessage .= 'This function is disabled in demo mode.';
-
- $_SESSION['s']['user']['language'] = $_POST['language'];
- $_SESSION['s']['language'] = $_POST['language'];
-
+
if(@is_array($this->dataRecord['modules']) && !in_array($this->dataRecord['startmodule'],$this->dataRecord['modules'])) {
$app->tform->errorMessage .= $app->tform->wordbook['startmodule_err'];
}
+ $this->updateSessionTheme();
}
+
+ function updateSessionTheme() {
+ global $app, $conf;
+
+ if($this->dataRecord['app_theme'] != 'default') {
+ $tmp_path = ISPC_THEMES_PATH."/".$this->dataRecord['app_theme'];
+ if(!@is_dir($tmp_path) || (@file_exists($tmp_path."/ispconfig_version") && trim(file_get_contents($tmp_path."/ispconfig_version")) != ISPC_APP_VERSION)) {
+ // fall back to default theme if this one is not compatible with current ispc version
+ $this->dataRecord['app_theme'] = 'default';
+ }
+ }
+ if($this->dataRecord['app_theme'] != $_SESSION['s']['user']['theme']) $this->_theme_changed = true;
+ $_SESSION['s']['theme'] = $this->dataRecord['app_theme'];
+ $_SESSION['s']['user']['theme'] = $_SESSION['s']['theme'];
+ $_SESSION['s']['user']['app_theme'] = $_SESSION['s']['theme'];
+ }
+ function onAfterInsert() {
+ $this->onAfterUpdate();
+ }
+ function onAfterUpdate() {
+ if($this->_theme_changed == true) {
+ // not the best way, but it works
+ header('Content-Type: text/html');
+ print '<script type="text/javascript">document.location.reload();</script>';
+ exit;
+ }
+ else parent::onShow();
+ }
+
}
--
Gitblit v1.9.1