Thread: SF.net SVN: postfixadmin:[577] trunk/common.php
Brought to you by:
christian_boltz,
gingerdog
From: <Gin...@us...> - 2009-03-13 20:49:35
|
Revision: 577 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=577&view=rev Author: GingerDog Date: 2009-03-13 20:49:32 +0000 (Fri, 13 Mar 2009) Log Message: ----------- common.php: add autoloading for model classes Modified Paths: -------------- trunk/common.php Modified: trunk/common.php =================================================================== --- trunk/common.php 2009-03-13 20:49:05 UTC (rev 576) +++ trunk/common.php 2009-03-13 20:49:32 UTC (rev 577) @@ -59,5 +59,19 @@ require_once("$incpath/functions.inc.php"); require_once("$incpath/languages/" . check_language () . ".lang"); +/** + * @param string $class + * __autoload implementation, for use with spl_autoload_register(). + */ +function postfixadmin_autoload($class) { + $PATH = dirname(__FILE__) . '/model/' . $class . '.php'; + if(is_file($PATH)) { + require_once($PATH); + return true; + } + return false; +} +spl_autoload_register('postfixadmin_autoload'); + /* 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...> - 2009-04-02 20:49:33
|
Revision: 611 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=611&view=rev Author: GingerDog Date: 2009-04-02 20:49:32 +0000 (Thu, 02 Apr 2009) Log Message: ----------- fix register globals check in common.php - see https://sourceforge.net/tracker/?func=detail&aid=2721614&group_id=191583&atid=937964 Modified Paths: -------------- trunk/common.php Modified: trunk/common.php =================================================================== --- trunk/common.php 2009-04-02 20:30:07 UTC (rev 610) +++ trunk/common.php 2009-04-02 20:49:32 UTC (rev 611) @@ -40,7 +40,7 @@ (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')) { +if(ini_get('register_globals') == 'on') { die("Please turn off register_globals; edit your php.ini"); } require_once("$incpath/variables.inc.php"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Gin...@us...> - 2009-04-08 20:23:19
|
Revision: 618 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=618&view=rev Author: GingerDog Date: 2009-04-08 20:17:24 +0000 (Wed, 08 Apr 2009) Log Message: ----------- common.php: remove requirement to delete setup.php; require $CONF["setup_password"] is changed etc Modified Paths: -------------- trunk/common.php Modified: trunk/common.php =================================================================== --- trunk/common.php 2009-04-08 20:16:35 UTC (rev 617) +++ trunk/common.php 2009-04-08 20:17:24 UTC (rev 618) @@ -22,20 +22,6 @@ } 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 { - # 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__); (ini_get('magic_quotes_gpc') ? ini_set('magic_quotes_runtime', '0') : '1'); (ini_get('magic_quotes_gpc') ? ini_set('magic_quotes_sybase', '0') : '1'); @@ -46,15 +32,23 @@ require_once("$incpath/variables.inc.php"); if(!is_file("$incpath/config.inc.php")) { - // incorrectly setup... - incorrect_setup(); + die("config.inc.php is missing!"); } require_once("$incpath/config.inc.php"); + if(isset($CONF['configured'])) { if($CONF['configured'] == FALSE) { - incorrect_setup(); + die("Please edit config.inc.php - change \$CONF['configured'] to true after setting your database settings"); } + if(!isset($CONF['setup_password'])) { + die("You must have a \$CONF['setup_password'] defined - this allows authenticated access to setup.php"); + } + if($CONF['setup_password'] == 'changeme') { + die("You must specify a password in config.inc.php (\$CONF['setup_password']) in order to access setup.php"); + } } + + require_once("$incpath/languages/language.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...> - 2009-04-19 18:48:46
|
Revision: 637 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=637&view=rev Author: GingerDog Date: 2009-04-19 18:48:35 +0000 (Sun, 19 Apr 2009) Log Message: ----------- common.php: remove redundant check Modified Paths: -------------- trunk/common.php Modified: trunk/common.php =================================================================== --- trunk/common.php 2009-04-19 11:43:49 UTC (rev 636) +++ trunk/common.php 2009-04-19 18:48:35 UTC (rev 637) @@ -43,9 +43,6 @@ if(!isset($CONF['setup_password'])) { die("You must have a \$CONF['setup_password'] defined - this allows authenticated access to setup.php"); } - if($CONF['setup_password'] == 'changeme') { - die("You must specify a password in config.inc.php (\$CONF['setup_password']) in order to access setup.php"); - } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <no...@us...> - 2009-11-06 19:23:37
|
Revision: 761 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=761&view=rev Author: normes Date: 2009-11-06 19:23:07 +0000 (Fri, 06 Nov 2009) Log Message: ----------- Small typo fixed... Modified Paths: -------------- trunk/common.php Modified: trunk/common.php =================================================================== --- trunk/common.php 2009-11-06 19:22:15 UTC (rev 760) +++ trunk/common.php 2009-11-06 19:23:07 UTC (rev 761) @@ -64,9 +64,9 @@ //***** if(!is_file("$incpath/smarty.inc.php")) { - die("smarty.inc.php is missing! Sonething is wrong..."); + die("smarty.inc.php is missing! Something is wrong..."); } require_once ("$incpath/smarty.inc.php"); //***** /* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */ -?> \ No newline at end of file +?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Gin...@us...> - 2011-02-07 23:31:18
|
Revision: 953 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=953&view=rev Author: GingerDog Date: 2011-02-07 23:31:12 +0000 (Mon, 07 Feb 2011) Log Message: ----------- see changeset:952 ... move php code out of template into here Modified Paths: -------------- trunk/common.php Modified: trunk/common.php =================================================================== --- trunk/common.php 2011-02-07 23:30:46 UTC (rev 952) +++ trunk/common.php 2011-02-07 23:31:12 UTC (rev 953) @@ -19,7 +19,10 @@ if(!defined('POSTFIXADMIN')) { # already defined if called from setup.php session_start(); - define('POSTFIXADMIN', 1); # checked in included files + define('POSTFIXADMIN', 1); # checked in included files + if(empty($_SESSION['flash'])) { + $_SESSION['flash'] = array(); + } } $incpath = dirname(__FILE__); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Gin...@us...> - 2011-10-24 22:25:42
|
Revision: 1239 http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1239&view=rev Author: GingerDog Date: 2011-10-24 22:25:36 +0000 (Mon, 24 Oct 2011) Log Message: ----------- Remove getInstance calls; not needed as we use ::write Modified Paths: -------------- trunk/common.php Modified: trunk/common.php =================================================================== --- trunk/common.php 2011-10-24 22:25:10 UTC (rev 1238) +++ trunk/common.php 2011-10-24 22:25:36 UTC (rev 1239) @@ -81,10 +81,7 @@ } spl_autoload_register('postfixadmin_autoload'); -Lang::getInstance(); Lang::write($PALANG); - -Config::getInstance(); Config::write($CONF); if (!defined('POSTFIXADMIN_CLI')) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2013-04-01 22:12:13
|
Revision: 1454 http://sourceforge.net/p/postfixadmin/code/1454 Author: christian_boltz Date: 2013-04-01 22:12:10 +0000 (Mon, 01 Apr 2013) Log Message: ----------- common.php: - move postfixadmin_autoload() and spl_autoload_register upwards (it's needed earlier after using the Config class in more functions) - call Config::write earlier (as soon as $CONF is complete) Modified Paths: -------------- trunk/common.php Modified: trunk/common.php =================================================================== --- trunk/common.php 2013-04-01 21:59:56 UTC (rev 1453) +++ trunk/common.php 2013-04-01 22:12:10 UTC (rev 1454) @@ -35,6 +35,22 @@ if(ini_get('register_globals') == 'on') { die("Please turn off register_globals; edit your php.ini"); } + +/** + * @param string $class + * __autoload implementation, for use with spl_autoload_register(). + */ +function postfixadmin_autoload($class) { + $PATH = dirname(__FILE__) . '/model/' . $class . '.php'; + + if(is_file($PATH)) { + require_once($PATH); + return true; + } + return false; +} +spl_autoload_register('postfixadmin_autoload'); + require_once("$incpath/variables.inc.php"); if(!is_file("$incpath/config.inc.php")) { @@ -48,6 +64,7 @@ } } +Config::write($CONF); require_once("$incpath/languages/language.php"); require_once("$incpath/functions.inc.php"); @@ -66,23 +83,7 @@ $PALANG = $hook_func ($PALANG, $language); } -/** - * @param string $class - * __autoload implementation, for use with spl_autoload_register(). - */ -function postfixadmin_autoload($class) { - $PATH = dirname(__FILE__) . '/model/' . $class . '.php'; - - if(is_file($PATH)) { - require_once($PATH); - return true; - } - return false; -} -spl_autoload_register('postfixadmin_autoload'); - Lang::write($PALANG); -Config::write($CONF); if (!defined('POSTFIXADMIN_CLI')) { if(!is_file("$incpath/smarty.inc.php")) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2013-10-31 20:52:51
|
Revision: 1548 http://sourceforge.net/p/postfixadmin/code/1548 Author: christian_boltz Date: 2013-10-31 20:52:45 +0000 (Thu, 31 Oct 2013) Log Message: ----------- common.php: - call Config::write() earlier, because check_language() uses it - later add $PALANG with Config::write(__LANG) Thanks to <controlcde> for reporting the results of this bug on IRC (even if I had to hunt it down to find the reason ;-) Modified Paths: -------------- trunk/common.php Modified: trunk/common.php =================================================================== --- trunk/common.php 2013-10-31 20:38:14 UTC (rev 1547) +++ trunk/common.php 2013-10-31 20:52:45 UTC (rev 1548) @@ -64,6 +64,8 @@ } } +Config::write($CONF); + require_once("$incpath/languages/language.php"); require_once("$incpath/functions.inc.php"); @@ -81,11 +83,9 @@ $PALANG = $hook_func ($PALANG, $language); } -$CONF['__LANG'] = $PALANG; +Config::write('__LANG', $PALANG); -Config::write($CONF); - if (!defined('POSTFIXADMIN_CLI')) { if(!is_file("$incpath/smarty.inc.php")) { die("smarty.inc.php is missing! Something is wrong..."); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gin...@us...> - 2014-01-14 16:00:45
|
Revision: 1623 http://sourceforge.net/p/postfixadmin/code/1623 Author: gingerdog Date: 2014-01-14 16:00:42 +0000 (Tue, 14 Jan 2014) Log Message: ----------- use !empty to avoid error Modified Paths: -------------- trunk/common.php Modified: trunk/common.php =================================================================== --- trunk/common.php 2014-01-12 17:39:58 UTC (rev 1622) +++ trunk/common.php 2014-01-14 16:00:42 UTC (rev 1623) @@ -84,7 +84,7 @@ require_once("$incpath/languages/" . $language . ".lang"); -if($CONF['language_hook'] != '' && function_exists($CONF['language_hook'])) { +if(!empty($CONF['language_hook']) && function_exists($CONF['language_hook'])) { $hook_func = $CONF['language_hook']; $PALANG = $hook_func ($PALANG, $language); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gin...@us...> - 2015-07-12 12:09:36
|
Revision: 1792 http://sourceforge.net/p/postfixadmin/code/1792 Author: gingerdog Date: 2015-07-12 12:09:34 +0000 (Sun, 12 Jul 2015) Log Message: ----------- merge patch from https://sourceforge.net/p/postfixadmin/bugs/347/ (thank you Eugene Grosbein) - explictly set session_cache_limiter to nocache Modified Paths: -------------- trunk/common.php Modified: trunk/common.php =================================================================== --- trunk/common.php 2015-06-26 13:34:04 UTC (rev 1791) +++ trunk/common.php 2015-07-12 12:09:34 UTC (rev 1792) @@ -20,6 +20,8 @@ define('POSTFIXADMIN', 1); # checked in included files if (!defined('POSTFIXADMIN_CLI')) { + // this is the default; see also https://sourceforge.net/p/postfixadmin/bugs/347/ + session_cache_limiter('nocache'); session_start(); if (defined('POSTFIXADMIN_LOGOUT')) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2016-05-22 16:57:11
|
Revision: 1846 http://sourceforge.net/p/postfixadmin/code/1846 Author: christian_boltz Date: 2016-05-22 16:57:09 +0000 (Sun, 22 May 2016) Log Message: ----------- rename session cookie With the default PHPSESSID cookie name, there are some rare (and hard to debug) cases that break logging in if a different application on the domain also uses a PHPSESSID cookie. See https://sourceforge.net/p/postfixadmin/bugs/314/ for details. Using 'postfixadmin_session' as cookie name should fix this. Modified Paths: -------------- trunk/common.php Modified: trunk/common.php =================================================================== --- trunk/common.php 2016-05-22 16:17:46 UTC (rev 1845) +++ trunk/common.php 2016-05-22 16:57:09 UTC (rev 1846) @@ -22,6 +22,7 @@ if (!defined('POSTFIXADMIN_CLI')) { // this is the default; see also https://sourceforge.net/p/postfixadmin/bugs/347/ session_cache_limiter('nocache'); + session_name('postfixadmin_session'); session_start(); if (defined('POSTFIXADMIN_LOGOUT')) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |