diff --git a/lam/templates/config/mainmanage.php b/lam/templates/config/mainmanage.php
index ce48c031..3700c830 100644
--- a/lam/templates/config/mainmanage.php
+++ b/lam/templates/config/mainmanage.php
@@ -51,33 +51,13 @@ if (!isset($_SESSION["mainconf_password"]) || (!$cfg->checkPassword($_SESSION["m
exit();
}
-echo $_SESSION['header'];
-
-?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-read()) {
- if (substr($jsEntry, strlen($jsEntry) - 3, 3) != '.js') continue;
- echo "\n";
+if (isset($_POST['cancel'])) {
+ // back to login
+ metaRefresh('../login.php');
+ exit();
}
+$errors = array();
// check if submit button was pressed
if (isset($_POST['submit'])) {
// remove double slashes if magic quotes are on
@@ -87,7 +67,6 @@ if (isset($_POST['submit'])) {
if (is_string($_POST[$postKeys[$i]])) $_POST[$postKeys[$i]] = stripslashes($_POST[$postKeys[$i]]);
}
}
- $errors = array();
// set master password
if (isset($_POST['masterpassword']) && ($_POST['masterpassword'] != "")) {
if ($_POST['masterpassword'] && $_POST['masterpassword2'] && ($_POST['masterpassword'] == $_POST['masterpassword2'])) {
@@ -140,18 +119,44 @@ if (isset($_POST['submit'])) {
$cfg->passwordMinClasses = $_POST['passwordMinClasses'];
// save settings
$cfg->save();
- // print messages
- if (sizeof($errors) > 0) {
- for ($i = 0; $i < sizeof($errors); $i++) StatusMessage("ERROR", $errors[$i]);
- }
- else {
- StatusMessage("INFO", _("Your settings were successfully saved."));
- // back to login page
- echo "" . _("Back to login") . "
";
+ if (sizeof($errors) == 0) {
+ metaRefresh('../login.php?confMainSavedOk=1');
exit();
}
}
+echo $_SESSION['header'];
+
+?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+read()) {
+ if (substr($jsEntry, strlen($jsEntry) - 3, 3) != '.js') continue;
+ echo "\n";
+}
+
+// print messages
+for ($i = 0; $i < sizeof($errors); $i++) {
+ StatusMessage("ERROR", $errors[$i]);
+}
+
// check if config file is writable
if (!$cfg->isWritable()) {
StatusMessage('WARN', 'The config file is not writable.', 'Your changes cannot be saved until you make the file writable for the webserver user.');
@@ -370,6 +375,7 @@ if (!$cfg->isWritable()) {
isWritable()) { ?>
">
+ ">
@@ -377,11 +383,6 @@ if (!$cfg->isWritable()) {
-
-
-
-
-