extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-06 01:52:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

updated array name

Browse Source
This commit is contained in:
seek3r 2000-11-20 16:47:44 +00:00
parent 1299230dd8
commit 2539a46a45
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
header.inc.php.sample
View File

@ -51,7 +51,7 @@
/* Use this for supporting different domains using this single install */ /* Use this for supporting different domains using this single install */
/* (ignore if you are only supporting a single domain)*/ /* (ignore if you are only supporting a single domain)*/
$phpgw_info["multiable_domains"] = False; //Set to True and create an array for each domain. $phpgw_info["multiable_domains"] = False; //Set to True and create an array for each domain.
$domains["domain1.com"] = array ( $phpgw_domain["domain1.com"] = array (
"db_host" => "localhost", "db_host" => "localhost",
"db_name" => "phpgw_domain1", "db_name" => "phpgw_domain1",
"db_user" => "phpgroupware", "db_user" => "phpgroupware",

10
setup/config.php
View File

@ -32,11 +32,11 @@
$db->User = $phpgw_info["server"]["db_user"]; $db->User = $phpgw_info["server"]["db_user"];
$db->Password = $phpgw_info["server"]["db_pass"]; $db->Password = $phpgw_info["server"]["db_pass"];
}else{ }else{
$db->Host = $domains[$SetupDomain]["db_host"]; $db->Host = $phpgw_domain[$SetupDomain]["db_host"];
$db->Type = $domains[$SetupDomain]["db_type"]; $db->Type = $phpgw_domain[$SetupDomain]["db_type"];
$db->Database = $domains[$SetupDomain]["db_name"]; $db->Database = $phpgw_domain[$SetupDomain]["db_name"];
$db->User = $domains[$SetupDomain]["db_user"]; $db->User = $phpgw_domain[$SetupDomain]["db_user"];
$db->Password = $domains[$SetupDomain]["db_pass"]; $db->Password = $phpgw_domain[$SetupDomain]["db_pass"];
} }
if ($newsettings["auth_type"] != "ldap") { if ($newsettings["auth_type"] != "ldap") {

6
setup/inc/setup_auth.inc.php
View File

@ -27,7 +27,7 @@
function loginForm($err="") function loginForm($err="")
{ {
global $phpgw_info, $domains, $SetupDomain, $SetupCookie, $FormDomain, $PHP_SELF; global $phpgw_info, $phpgw_domain, $SetupDomain, $SetupCookie, $FormDomain, $PHP_SELF;
setup_header("Please login"); setup_header("Please login");
@ -56,7 +56,7 @@
if (isset($FormPW)) { if (isset($FormPW)) {
if ($phpgw_info["multiable_domains"] == True){ if ($phpgw_info["multiable_domains"] == True){
if ($FormPW != $domains[$FormDomain]["config_passwd"]) { if ($FormPW != $phpgw_domain[$FormDomain]["config_passwd"]) {
loginForm("Invalid password."); loginForm("Invalid password.");
exit; exit;
} }
@ -70,7 +70,7 @@
$SetupCookie = $FormPW; $SetupCookie = $FormPW;
} else if (isset($SetupCookie)) { } else if (isset($SetupCookie)) {
if ($phpgw_info["multiable_domains"] == True){ if ($phpgw_info["multiable_domains"] == True){
if ($SetupCookie != $domains[$SetupDomain]["config_passwd"]) { if ($SetupCookie != $phpgw_domain[$SetupDomain]["config_passwd"]) {
setcookie("SetupCookie",""); // scrub the old one setcookie("SetupCookie",""); // scrub the old one
setcookie("SetupDomain",""); // scrub the old one setcookie("SetupDomain",""); // scrub the old one
loginForm("Invalid session cookie (cookies must be enabled)"); loginForm("Invalid session cookie (cookies must be enabled)");

10
setup/index.php
View File

@ -49,11 +49,11 @@
$db->User = $phpgw_info["server"]["db_user"]; $db->User = $phpgw_info["server"]["db_user"];
$db->Password = $phpgw_info["server"]["db_pass"]; $db->Password = $phpgw_info["server"]["db_pass"];
}else{ }else{
$db->Host = $domains[$SetupDomain]["db_host"]; $db->Host = $phpgw_domain[$SetupDomain]["db_host"];
$db->Type = $domains[$SetupDomain]["db_type"]; $db->Type = $phpgw_domain[$SetupDomain]["db_type"];
$db->Database = $domains[$SetupDomain]["db_name"]; $db->Database = $phpgw_domain[$SetupDomain]["db_name"];
$db->User = $domains[$SetupDomain]["db_user"]; $db->User = $phpgw_domain[$SetupDomain]["db_user"];
$db->Password = $domains[$SetupDomain]["db_pass"]; $db->Password = $phpgw_domain[$SetupDomain]["db_pass"];
} }
// $db->Halt_On_Error = "report"; // $db->Halt_On_Error = "report";
$db->Halt_On_Error = "no"; $db->Halt_On_Error = "no";