X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fconfigtest.php;h=33096746b38d808eb249f772f80d30adee203777;hb=46489d06566e040f4852385cc6862f65009dfe97;hp=47dc461b8c88f4526a29e6da6ae0ec58f0dff5cf;hpb=0fa9bde70c488226bcd0e1a37bb199b6b8556e77;p=squirrelmail.git diff --git a/src/configtest.php b/src/configtest.php index 47dc461b..33096746 100644 --- a/src/configtest.php +++ b/src/configtest.php @@ -3,7 +3,7 @@ /** * SquirrelMail configtest script * - * @copyright © 2003-2006 The SquirrelMail Project Team + * @copyright © 2003-2007 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail @@ -17,8 +17,54 @@ // This script could really use some restructuring as it has grown quite rapidly // but is not very 'clean'. Feel free to get some structure into this thing. -$warnings = 0; +/** force verbose error reporting and turn on display of errors */ +error_reporting(E_ALL); +ini_set('display_errors',1); + +/** Blockcopy from init.php. Cleans globals. */ +if ((bool) ini_get('register_globals') && + strtolower(ini_get('register_globals'))!='off') { + /** + * Remove all globals that are not reserved by PHP + * 'value' and 'key' are used by foreach. Don't unset them inside foreach. + */ + foreach ($GLOBALS as $key => $value) { + switch($key) { + case 'HTTP_POST_VARS': + case '_POST': + case 'HTTP_GET_VARS': + case '_GET': + case 'HTTP_COOKIE_VARS': + case '_COOKIE': + case 'HTTP_SERVER_VARS': + case '_SERVER': + case 'HTTP_ENV_VARS': + case '_ENV': + case 'HTTP_POST_FILES': + case '_FILES': + case '_REQUEST': + case 'HTTP_SESSION_VARS': + case '_SESSION': + case 'GLOBALS': + case 'key': + case 'value': + break; + default: + unset($GLOBALS[$key]); + } + } + // Unset variables used in foreach + unset($GLOBALS['key']); + unset($GLOBALS['value']); +} + + +/** + * Displays error messages and warnings + * @param string $str message + * @param boolean $fatal fatal error or only warning + */ function do_err($str, $fatal = TRUE) { global $IND, $warnings; $level = $fatal ? 'FATAL ERROR:' : 'WARNING:'; @@ -31,26 +77,51 @@ function do_err($str, $fatal = TRUE) { } } -$IND = str_repeat(' ',4); - ob_implicit_flush(); /** @ignore */ define('SM_PATH', '../'); +/** load minimal function set */ +require(SM_PATH . 'functions/global.php'); +require(SM_PATH . 'functions/strings.php'); -/* set default value in order to block remote access to script */ +/** set default value in order to block remote access */ $allow_remote_configtest=false; -/* - * Load config before output begins. functions/strings.php depends on - * functions/globals.php. functions/global.php needs to be run before - * any html output starts. If config.php is missing, error will be displayed - * later. - */ +/** Load all configuration files before output begins */ + +/* load default configuration */ +require(SM_PATH . 'config/config_default.php'); +/* reset arrays in default configuration */ +$ldap_server = array(); +$plugins = array(); +$fontsets = array(); +$theme = array(); +$theme[0]['PATH'] = SM_PATH . 'themes/default_theme.php'; +$theme[0]['NAME'] = 'Default'; +$aTemplateSet = array(); +$aTemplateSet[0]['ID'] = 'default'; +$aTemplateSet[0]['NAME'] = 'Default'; +/* load site configuration */ if (file_exists(SM_PATH . 'config/config.php')) { - require(SM_PATH . 'config/config.php'); + require(SM_PATH . 'config/config.php'); } -require(SM_PATH . 'functions/global.php'); -require(SM_PATH . 'functions/strings.php'); +/* load local configuration overrides */ +if (file_exists(SM_PATH . 'config/config_local.php')) { + require(SM_PATH . 'config/config_local.php'); +} + +/** Load plugins */ +global $disable_plugins; +$squirrelmail_plugin_hooks = array(); +if (!$disable_plugins && file_exists(SM_PATH . 'config/plugin_hooks.php')) { + require(SM_PATH . 'config/plugin_hooks.php'); +} + +/** Warning counter */ +$warnings = 0; + +/** indent */ +$IND = str_repeat(' ',4); /** * get_location starts session and must be run before output is started. @@ -105,7 +176,7 @@ echo "
SquirrelMail version: | " . $version . "< " |