* $Date:: $ *
* $Tag:: 0.2.1-FINAL $ *
* $Author:: $ *
- * Needs to be in all Files and every File needs "svn propset *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
- * Copyright (c) 2009, 2010 by Mailer Developer Team *
- * For more information visit: http://www.mxchange.org *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team *
+ * For more information visit: http://mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
$GLOBALS['config_local_loaded'] = false;
// Is the local configuration there?
-if ((isIncludeReadable(getConfig('CACHE_PATH') . 'config-local.php')) && (isIncludeReadable('inc/config.php'))) {
+if ((isIncludeReadable(getCachePath() . 'config-local.php')) && (isIncludeReadable('inc/config.php'))) {
// We are better in installation mode
$GLOBALS['mailer_installing'] = true;
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 <strong>inc/config.php</strong> along with the new file <strong>'.getConfig('CACHE_PATH').'config-local.php</strong>. Please remove <strong>inc/config.php</strong> to avoid incompatiblity issues. Thank you.');
-} elseif (isIncludeReadable(getConfig('CACHE_PATH') . 'config-local.php')) {
+ debug_report_bug(__FILE__, __LINE__, 'You have uploaded or kept an out-dated file at <strong>inc/config.php</strong> along with the new file <strong>'.getCachePath().'config-local.php</strong>. Please remove <strong>inc/config.php</strong> to avoid incompatiblity issues. Thank you.');
+} elseif (isIncludeReadable(getCachePath() . 'config-local.php')) {
// Then load it
- loadIncludeOnce(getConfig('CACHE_PATH') . 'config-local.php');
+ loadIncludeOnce(getCachePath() . 'config-local.php');
// Mark configuration as loaded
$GLOBALS['config_local_loaded'] = true;
setConfigEntry('OUTPUT_MODE', 'render');
}
-// Check if the user setups his MySQL stuff...
-if ((empty($GLOBALS['mysql']['login'])) && (!isInstalling()) && (!isInstallationPhase()) && (!isGetRequestParameterSet('installing')) && (isInstalled())) {
+// Check if the user setups his database login stuff...
+if ((empty($GLOBALS['mysql']['login'])) && (!isInstalling()) && (!isInstallationPhase()) && (!isGetRequestElementSet('installing')) && (isInstalled())) {
// No login entered and outside installation mode
- outputHtml('<strong>{--LANG_WARNING--}:</strong>');
+ outputHtml('<strong>{--MAILER_WARNING--}:</strong>');
if (isInstalled()) {
// You have changed my configuration file!
- app_die(__FILE__, __LINE__, '{--DIE_CONFIG_CHANGED_YOU--}');
+ debug_report_bug(__FILE__, __LINE__, '{--DIE_CONFIG_CHANGED_YOU--}');
} else {
// Please run the installation script (maybe again)
- app_die(__FILE__, __LINE__, '{--DIE_RUN_INSTALL_MYSQL--}');
+ debug_report_bug(__FILE__, __LINE__, '{--DIE_RUN_INSTALL_MYSQL--}');
}
} elseif ((!isInstalling()) && (!isInstallationPhase()) && (empty($GLOBALS['mysql']['password'])) && (getConfig('WARN_NO_PASS') == 'Y')) {
- // No database password entered!!!
- loadTemplate('admin_settings_saved', false, '<div>{--LANG_WARNING--}:</div> {--WARN_NULL_PASSWORD--}');
+ // No database password entered
+ displayMessage('<div class="warning">{--MAILER_WARNING--}:</div> {--WARN_NULL_PASSWORD--}');
}
// [EOF]