diff --git a/lam/templates/config/confmain.php b/lam/templates/config/confmain.php
index 4f21551f..d036373d 100644
--- a/lam/templates/config/confmain.php
+++ b/lam/templates/config/confmain.php
@@ -50,7 +50,7 @@ if (isset($_POST['passwd'])) $passwd = $_POST['passwd'];
// check if password was entered
// if not: load login page
-if (!isset($passwd) && !isset($_SESSION['conf_isAuthenticated'])) {
+if (!isset($passwd) && !(isset($_SESSION['conf_isAuthenticated']) && isset($_SESSION['conf_config']))) {
$_SESSION['conf_message'] = _("No password was entered!");
/** go back to login if password is empty */
metaRefresh('conflogin.php');
@@ -83,6 +83,10 @@ if (isset($_POST['cancelSettings'])) {
}
$errorsToDisplay = array();
+if (isset($_SESSION['conf_messages']) && is_array($_SESSION['conf_messages'])) {
+ $errorsToDisplay = array_merge($errorsToDisplay, $_SESSION['conf_messages']);
+ unset($_SESSION['conf_messages']);
+}
// check if button was pressed and if we have to save the settings or go to another tab
if (isset($_POST['saveSettings']) || isset($_POST['editmodules'])
@@ -156,7 +160,7 @@ foreach ($jsFiles as $jsEntry) {
isWritable()) {
- StatusMessage('WARN', 'The config file is not writable.', 'Your changes cannot be saved until you make the file writable for the webserver user.');
+ StatusMessage('WARN', _('The config file is not writable.'), _('Your changes cannot be saved until you make the file writable for the webserver user.'));
echo " ";
}
diff --git a/lam/templates/config/confsave.php b/lam/templates/config/confsave.php
index 29aacfa2..eb1ae7f1 100644
--- a/lam/templates/config/confsave.php
+++ b/lam/templates/config/confsave.php
@@ -85,10 +85,10 @@ for ($i = 0; $i < sizeof($sessionKeys); $i++) {
}
if ($result === LAMConfig::SAVE_OK) {
- metaRefresh('../login.php?configSaveOk=1&configSaveFile=' . $conf->getPath());
+ metaRefresh('../login.php?configSaveOk=1&configSaveFile=' . $conf->getName());
}
else {
- metaRefresh('../login.php?configSaveFailed=1&configSaveFile=' . $conf->getPath());
+ metaRefresh('../login.php?configSaveFailed=1&configSaveFile=' . $conf->getName());
}
?>
\ No newline at end of file
diff --git a/lam/templates/config/profmanage.php b/lam/templates/config/profmanage.php
index ece5df77..ef59fbd4 100644
--- a/lam/templates/config/profmanage.php
+++ b/lam/templates/config/profmanage.php
@@ -43,52 +43,6 @@ if (strtolower(session_module_name()) == 'files') {
setlanguage();
-echo $_SESSION['header'];
-
-?>
-
-