From: fidian Date: Mon, 23 Apr 2001 19:17:11 +0000 (+0000) Subject: * Added the "global" stuff X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=commitdiff_plain;h=55c6134513e3e3a9e5c8fad41bea9b9aff37dac6 * Added the "global" stuff Reason behind "global" stuff: Since we now can include("../dir/any_file.php") at any time, we need to make sure that all global variables are truly registered as globals. If I didn't have them, and within a function, I included a file that was supposed to set globals, it would not and errors would be generated and improper execution of the program would result. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1297 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- diff --git a/config/conf.pl b/config/conf.pl index bc811a3f..340caec4 100755 --- a/config/conf.pl +++ b/config/conf.pl @@ -1579,7 +1579,7 @@ sub save_data { print FILE "\t\$config_use_color = $config_use_color;\n"; print FILE "\n"; - print FILE "\tglobal \$org_name, \$org_logo, \$org_title;\n"; + print FILE "\tglobal \$org_name, \$org_logo, \$org_title, \$signout_page;\n"; print FILE "\t\$org_name = \"$org_name\";\n"; print FILE "\t\$org_logo = \"$org_logo\";\n"; print FILE "\t\$org_title = \"$org_title\";\n"; diff --git a/config/config_default.php b/config/config_default.php index 085f92b3..70500cba 100644 --- a/config/config_default.php +++ b/config/config_default.php @@ -79,6 +79,7 @@ // For instance, the following would return the user to your // home page: $signout_page = "/"; // Set to the empty string to continue to use the default signout page. + global $signout_page; $signout_page = ""; // Many servers store mail in your home directory. With this, they