X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fload_config.php;h=6ecd46300d49a80999c7a5683fffd8dcdb83022c;hb=96427c506ced675944628967719d12c6b55a1af6;hp=51b4aeee1607715b11f64d5577d245049179b88a;hpb=f8da178ba4b2f0ed9bfd303d6d32f62b0919a442;p=mailer.git diff --git a/inc/load_config.php b/inc/load_config.php index 51b4aeee16..6ecd46300d 100644 --- a/inc/load_config.php +++ b/inc/load_config.php @@ -17,7 +17,7 @@ * Needs to be in all Files and every File needs "svn propset * * svn:keywords Date Revision" (autoprobset!) at least!!!!!! * * -------------------------------------------------------------------- * - * Copyright (c) 2003 - 2008 by Roland Haeder * + * Copyright (c) 2003 - 2009 by Roland Haeder * * For more information visit: http://www.mxchange.org * * * * This program is free software; you can redistribute it and/or modify * @@ -38,8 +38,7 @@ // Some security stuff... if (!defined('__SECURITY')) { - $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php'; - require($INC); + die(); } // END - if // Set some config entries which is required for installation phase @@ -51,21 +50,21 @@ setConfigEntry('_DB_TYPE' , 'mysql3'); $GLOBALS['config_local_loaded'] = false; // Is the local configuration there? -if ((isIncludeReadable('inc/cache/config-local.php')) && (isIncludeReadable('inc/config.php'))) { +if ((isIncludeReadable(getConfig('CACHE_PATH') . 'config-local.php')) && (isIncludeReadable('inc/config.php'))) { // We are better in installation mode $GLOBALS['mxchange_installing'] = true; // Define default main_title here - define('MAIN_TITLE', 'Your mail-exchange title'); + setConfigEntry('MAIN_TITLE', 'Your mail-exchange title'); // Set output mode here setConfigEntry('OUTPUT_MODE', 'render'); // Both exist! This is bad and should be avoided by the admin - app_die(__FILE__, __LINE__, 'You have uploaded or kept an out-dated file at inc/config.php along with the new file inc/cache/config-local.php. Please remove inc/config.php to avoid incompatiblity issues. Thank you.'); -} elseif (isIncludeReadable('inc/cache/config-local.php')) { + app_die(__FILE__, __LINE__, 'You have uploaded or kept an out-dated file at inc/config.php along with the new file '.getConfig('CACHE_PATH').'config-local.php. Please remove inc/config.php to avoid incompatiblity issues. Thank you.'); +} elseif (isIncludeReadable(getConfig('CACHE_PATH') . 'config-local.php')) { // Then load it - loadIncludeOnce('inc/cache/config-local.php'); + loadIncludeOnce(getConfig('CACHE_PATH') . 'config-local.php'); // Mark configuration as loaded $GLOBALS['config_local_loaded'] = true; @@ -75,21 +74,21 @@ if ((isIncludeReadable('inc/cache/config-local.php')) && (isIncludeReadable('inc } elseif (isInstalling()) { // Set some essential constants // @TODO Rewrite them to avoid this else block - define('MAIN_TITLE', 'Your mail-exchanger title'); - define('SLOGAN' , 'Your cool slogan here'); - define('WEBMASTER' , 'you@some-hoster.tld.invalid'); + setConfigEntry('MAIN_TITLE', 'Your mail-exchanger title'); + setConfigEntry('SLOGAN' , 'Your cool slogan here'); + setConfigEntry('WEBMASTER' , 'you@some-hoster.tld.invalid'); // Set output mode here setConfigEntry('OUTPUT_MODE', 'render'); } else { - // Problem in application detected - debug_report_bug('Wether we are not installing nor config-local.php is created!'); + // Redirect to install.php + redirectToUrl('install.php'); } // Check if the user setups his MySQL stuff... -if ((empty($GLOBALS['mysql']['login'])) && (!isInstalling()) && (!REQUEST_ISSET_GET('installing')) && (isInstalled())) { +if ((empty($GLOBALS['mysql']['login'])) && (!isInstalling()) && (!isGetRequestElementSet('installing')) && (isInstalled())) { // No login entered and outside installation mode - OUTPUT_HTML('{--LANG_WARNING--}: '); + outputHtml('{--LANG_WARNING--}:'); if (isInstalled()) { // You have changed my configuration file! app_die(__FILE__, __LINE__, '{--DIE_CONFIG_CHANGED_YOU--}'); @@ -99,8 +98,8 @@ if ((empty($GLOBALS['mysql']['login'])) && (!isInstalling()) && (!REQUEST_ISSET_ } } elseif ((!isInstalling()) && (empty($GLOBALS['mysql']['password'])) && (getConfig('WARN_NO_PASS') == 'Y')) { // No database password entered!!! - OUTPUT_HTML('