diff --git a/setup/config.php b/setup/config.php
index 7f3d32dcf3..7a31b094cf 100644
--- a/setup/config.php
+++ b/setup/config.php
@@ -40,7 +40,7 @@
$phpgw_setup->db->next_record();
if ($phpgw_setup->db->f("config_value") <> $newsetting[1]) {
$phpgw_setup->db->query("DELETE FROM newsgroups");
- $phpgw_setup->db->query("DELETE FROM users_newsgroups");
+// $phpgw_setup->db->query("DELETE FROM users_newsgroups");
}
}
}
diff --git a/setup/inc/phpgw_setup.inc.php b/setup/inc/phpgw_setup.inc.php
index c578838313..097441e4ac 100644
--- a/setup/inc/phpgw_setup.inc.php
+++ b/setup/inc/phpgw_setup.inc.php
@@ -40,7 +40,7 @@
echo "\n";
echo "\n";
- if ($phpgw_info["setup"]["stage"]["header"] == 10){
+ if ($phpgw_info["setup"]["stage"]["header"] == "10"){
echo " \n";
echo " | Setup/Config Admin Login | \n";
echo "
\n";
@@ -134,17 +134,10 @@
}else{
return True;
}
- } elseif (isset($HeaderPW)) {
- if ($HeaderPW != $phpgw_info["server"]["header_admin_password"] && $auth_type == "Header") {
- setcookie("HeaderPW"); // scrub the old one
- $phpgw_info["setup"]["HeaderLoginMSG"] = "Invalid session cookie (cookies must be enabled)";
- return False;
- }else{
- return True;
- }
} elseif (isset($FormPW)) {
if (isset($ConfigLogin)){
if ($FormPW == $phpgw_domain[$FormDomain]["config_passwd"] && $auth_type == "Config") {
+ setcookie("HeaderPW"); // scrub the old one
setcookie("ConfigPW",$FormPW);
setcookie("ConfigDomain",$FormDomain);
$ConfigDomain = $FormDomain;
@@ -162,6 +155,14 @@
return False;
}
}
+ } elseif (isset($HeaderPW)) {
+ if ($HeaderPW != $phpgw_info["server"]["header_admin_password"] && $auth_type == "Header") {
+ setcookie("HeaderPW"); // scrub the old one
+ $phpgw_info["setup"]["HeaderLoginMSG"] = "Invalid session cookie (cookies must be enabled)";
+ return False;
+ }else{
+ return True;
+ }
} else {
return False;
}
@@ -353,4 +354,4 @@
}
-?>
\ No newline at end of file
+?>
diff --git a/setup/index.php b/setup/index.php
index 9741ef1018..1789032ecd 100644
--- a/setup/index.php
+++ b/setup/index.php
@@ -20,7 +20,7 @@
/* Check header and authentication */
$phpgw_info["setup"]["stage"]["header"] = $phpgw_setup->check_header();
- if ($phpgw_info["setup"]["stage"]["header"] != 10){
+ if ($phpgw_info["setup"]["stage"]["header"] != "10"){
Header("Location: manageheader.php");
exit;
}elseif (!$phpgw_setup->auth("Config")){
diff --git a/setup/manageheader.php b/setup/manageheader.php
index 4807df7ccc..6ad1014737 100644
--- a/setup/manageheader.php
+++ b/setup/manageheader.php
@@ -251,6 +251,11 @@
}
echo '";
echo "";