Thread: SF.net SVN: postfixadmin: [102] trunk/common.php
Brought to you by:
christian_boltz,
gingerdog
From: <Gin...@us...> - 2007-09-28 19:28:20
|
Revision: 102 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=102&view=rev Author: GingerDog Date: 2007-09-28 12:28:24 -0700 (Fri, 28 Sep 2007) Log Message: ----------- common.php: magic quotes stuff Modified Paths: -------------- trunk/common.php Modified: trunk/common.php =================================================================== --- trunk/common.php 2007-09-28 19:27:51 UTC (rev 101) +++ trunk/common.php 2007-09-28 19:28:24 UTC (rev 102) @@ -14,6 +14,8 @@ // $incpath = dirname(__FILE__); +(ini_get('magic_quotes_gpc') ? ini_set('magic_quotes_runtime', '0') : '1'); +(ini_get('magic_quotes_gpc') ? ini_set('magic_quotes_sybase', '0') : '1'); require_once("$incpath/variables.inc.php"); if(!is_file("$incpath/config.inc.php")) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Gin...@us...> - 2007-10-04 14:57:35
|
Revision: 130 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=130&view=rev Author: GingerDog Date: 2007-10-04 07:57:39 -0700 (Thu, 04 Oct 2007) Log Message: ----------- common.php: ensure $CONF["configured"] is not false Modified Paths: -------------- trunk/common.php Modified: trunk/common.php =================================================================== --- trunk/common.php 2007-10-04 14:57:04 UTC (rev 129) +++ trunk/common.php 2007-10-04 14:57:39 UTC (rev 130) @@ -26,6 +26,12 @@ header("Location: setup.php"); exit(0); } +if(isset($CONF['configured'])) { + if($CONF['configured'] == FALSE) { + headeR("Location: setup.php"); + exit(0); + } +} require_once("$incpath/config.inc.php"); require_once("$incpath/functions.inc.php"); require_once("$incpath/languages/" . check_language () . ".lang"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2007-10-07 17:41:28
|
Revision: 136 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=136&view=rev Author: christian_boltz Date: 2007-10-07 10:41:29 -0700 (Sun, 07 Oct 2007) Log Message: ----------- - read config.inc.php earlier to make the check for $CONF['configured'] == FALSE work Modified Paths: -------------- trunk/common.php Modified: trunk/common.php =================================================================== --- trunk/common.php 2007-10-07 17:23:29 UTC (rev 135) +++ trunk/common.php 2007-10-07 17:41:29 UTC (rev 136) @@ -26,13 +26,13 @@ header("Location: setup.php"); exit(0); } +require_once("$incpath/config.inc.php"); if(isset($CONF['configured'])) { if($CONF['configured'] == FALSE) { headeR("Location: setup.php"); exit(0); } } -require_once("$incpath/config.inc.php"); require_once("$incpath/functions.inc.php"); require_once("$incpath/languages/" . check_language () . ".lang"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Gin...@us...> - 2007-10-09 16:19:40
|
Revision: 142 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=142&view=rev Author: GingerDog Date: 2007-10-09 09:19:41 -0700 (Tue, 09 Oct 2007) Log Message: ----------- common.php: caps change in headeR Modified Paths: -------------- trunk/common.php Modified: trunk/common.php =================================================================== --- trunk/common.php 2007-10-07 23:24:14 UTC (rev 141) +++ trunk/common.php 2007-10-09 16:19:41 UTC (rev 142) @@ -29,7 +29,7 @@ require_once("$incpath/config.inc.php"); if(isset($CONF['configured'])) { if($CONF['configured'] == FALSE) { - headeR("Location: setup.php"); + header("Location: setup.php"); exit(0); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Gin...@us...> - 2007-11-26 07:38:54
|
Revision: 242 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=242&view=rev Author: GingerDog Date: 2007-11-25 23:38:56 -0800 (Sun, 25 Nov 2007) Log Message: ----------- common.php: ensure register_globals are not enabled Modified Paths: -------------- trunk/common.php Modified: trunk/common.php =================================================================== --- trunk/common.php 2007-11-25 17:35:29 UTC (rev 241) +++ trunk/common.php 2007-11-26 07:38:56 UTC (rev 242) @@ -20,6 +20,9 @@ (ini_get('magic_quotes_gpc') ? ini_set('magic_quotes_runtime', '0') : '1'); (ini_get('magic_quotes_gpc') ? ini_set('magic_quotes_sybase', '0') : '1'); +if(ini_get('register_globals')) { + die("Please turn off register_globals; edit your php.ini"); +} require_once("$incpath/variables.inc.php"); if(!is_file("$incpath/config.inc.php")) { // incorrectly setup... This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2008-01-06 19:39:06
|
Revision: 288 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=288&view=rev Author: christian_boltz Date: 2008-01-06 11:39:08 -0800 (Sun, 06 Jan 2008) Log Message: ----------- common.php: - check if setup.php exists before blindly redirecting to it. Display error message if the user has already deleted it. (old behaviour caused some user confusion) Modified Paths: -------------- trunk/common.php Modified: trunk/common.php =================================================================== --- trunk/common.php 2008-01-06 17:12:10 UTC (rev 287) +++ trunk/common.php 2008-01-06 19:39:08 UTC (rev 288) @@ -19,6 +19,17 @@ define('POSTFIXADMIN', 1); # checked in included files +function incorrect_setup() { + global $incpath; + # we ask the user to delete setup.php, which makes a blind redirect a bad idea + if(!is_file("$incpath/setup.php")) { + die ("config.inc.php does not exist or is not configured correctly. Please re-install setup.php and create/fix your config."); + } else { + header("Location: setup.php"); + exit(0); + } +} + $incpath = dirname(__FILE__); (ini_get('magic_quotes_gpc') ? ini_set('magic_quotes_runtime', '0') : '1'); (ini_get('magic_quotes_gpc') ? ini_set('magic_quotes_sybase', '0') : '1'); @@ -27,16 +38,15 @@ die("Please turn off register_globals; edit your php.ini"); } require_once("$incpath/variables.inc.php"); + if(!is_file("$incpath/config.inc.php")) { // incorrectly setup... - header("Location: setup.php"); - exit(0); + incorrect_setup(); } require_once("$incpath/config.inc.php"); if(isset($CONF['configured'])) { if($CONF['configured'] == FALSE) { - header("Location: setup.php"); - exit(0); + incorrect_setup(); } } require_once("$incpath/languages/language.php"); @@ -44,3 +54,5 @@ require_once("$incpath/languages/" . check_language () . ".lang"); session_start(); + +/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Gin...@us...> - 2008-04-10 10:17:44
|
Revision: 325 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=325&view=rev Author: GingerDog Date: 2008-04-10 03:17:50 -0700 (Thu, 10 Apr 2008) Log Message: ----------- common.php: ensure we only start a session once Modified Paths: -------------- trunk/common.php Modified: trunk/common.php =================================================================== --- trunk/common.php 2008-04-10 10:17:23 UTC (rev 324) +++ trunk/common.php 2008-04-10 10:17:50 UTC (rev 325) @@ -17,6 +17,9 @@ * environment and ensures other functions are loaded. */ +if(!defined('POSTFIXADMIN')) { + session_start(); +} define('POSTFIXADMIN', 1); # checked in included files function incorrect_setup() { @@ -53,6 +56,5 @@ require_once("$incpath/functions.inc.php"); require_once("$incpath/languages/" . check_language () . ".lang"); -session_start(); /* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2008-04-25 20:35:56
|
Revision: 343 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=343&view=rev Author: christian_boltz Date: 2008-04-25 13:35:55 -0700 (Fri, 25 Apr 2008) Log Message: ----------- common.php: - common.php is indirectly included in setup.php (via upgrade.php), avoid endless redirect loop from setup.php to setup.php (just found some minutes ago, had blocker quality...) Modified Paths: -------------- trunk/common.php Modified: trunk/common.php =================================================================== --- trunk/common.php 2008-04-23 15:54:48 UTC (rev 342) +++ trunk/common.php 2008-04-25 20:35:55 UTC (rev 343) @@ -28,9 +28,12 @@ if(!is_file("$incpath/setup.php")) { die ("config.inc.php does not exist or is not configured correctly. Please re-install setup.php and create/fix your config."); } else { - header("Location: setup.php"); - exit(0); - } + # common.php is indirectly included in setup.php (via upgrade.php) - avoid endless redirect loop + if (!preg_match('/setup\.php$/', $_SERVER['SCRIPT_NAME'])) { + header("Location: setup.php"); + exit(0); + } + } } $incpath = dirname(__FILE__); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |