// Merges $_CONFIG with data in given array
function mergeConfig ($newConfig) {
global $_CONFIG;
- $_CONFIG = merge_array($_CONFIG, $newConfig);
+ $_CONFIG = merge_array(getConfigArray(), $newConfig);
}
// Getter for $_CONFIG entries
$configEntry = smartAddSlashes($configEntry);
}
+ // If config array isn't set, set it
+ if (!isConfigLoaded()) {
+ // Init configuration array
+ initConfig();
+ } // END - if
+
// And set it
$_CONFIG[$configEntry] = $value;
}
// Init the config array
function initConfig () {
global $_CONFIG;
- debug_report_bug('Reached!');
// Set a minimum dummy configuration
$_CONFIG = array(
return $return;
}
+// Updates an old inc/config.php to a inc/cache/config-local.php file
+function updateOldConfigFile () {
+ // Watch out for these lines and execute them as single command
+ // @TODO Make this all better... :-/
+ $watchLines = array(
+ "define('SITE_KEY'," => 'SITE_KEY',
+ "define('DEFAULT_LANG'," => 'DEFAULT_LANG',
+ "define('warn_no_pass'," => 'WARN_NO_PASS',
+ "define('WRITE_FOOTER'," => 'WRITE_FOOTER',
+ "define('OUTPUT_MODE'," => 'OUTPUT_MODE',
+ "define('MAIN_TITLE'," => 'MAIN_TITLE',
+ "define('SLOGAN'," => 'SLOGAN',
+ "define('WEBMASTER'," => 'WEBMASTER',
+ "define('mxchange_installed'," => 'MXCHANGE_INSTALLED',
+ "define('admin_registered'," => 'ADMIN_REGISTERED',
+ "define('_MYSQL_PREFIX'," => '_MYSQL_PREFIX',
+ "define('_TABLE_TYPE'," => '_TABLE_TYPE',
+ "define('_DB_TYPE'," => '_DB_TYPE',
+ "define('SMTP_HOSTNAME'," => 'SMTP_HOSTNAME',
+ "define('SMTP_USER'" => 'SMTP_USER',
+ "define('SMTP_PASSWORD'," => 'SMTP_PASSWORD',
+ "define('ENABLE_BACKLINK'," => 'ENABLE_BACKLINK',
+ );
+
+ // Make these lower-case! (damn stupid code...)
+ $lowerCase = array('WARN_NO_PASS', 'MXCHANGE_INSTALLED', 'ADMIN_REGISTERED');
+
+ // These are still constants...
+ // @TODO Rewrite these all to config entries, if somehow possible
+ $constants = array('MAIN_TITLE', 'SLOGAN', 'WEBMASTER');
+
+ // Special comments...
+ $comments = array(
+ 'WARN_NO_PASS' => 'NULLPASS-WARNING',
+ 'MXCHANGE_INSTALLED' => 'INSTALLED',
+ 'ADMIN_REGISTERED' => 'ADMIN-SETUP',
+ '_MYSQL_PREFIX' => 'MYSQL-PREFIX',
+ '_TABLE_TYPE' => 'TABLE-TYPE',
+ '_DB_TYPE' => 'DATABASE-TYPE',
+ 'ENABLE_BACKLINK' => 'BACKLINK',
+ 'host' => 'MYSQL-HOST',
+ 'dbase' => 'MYSQL-DBASE',
+ 'login' => 'MYSQL-LOGIN',
+ 'password' => 'MYSQL-PASSWORD'
+ );
+
+ // Copy template to new file destionation
+ copyFileVerified(constant('PATH') . 'inc/config-local.php.dist', constant('PATH') . 'inc/cache/config-local.php', 0644);
+
+ // First of all, load the old one!
+ $oldConfig = explode("\n", readFromFile(constant('PATH') . 'inc/config.php'));
+
+ // Now, analyze every entry
+ $done = array();
+ foreach ($oldConfig as $line) {
+ // Check all watch lines
+ foreach ($watchLines as $old => $new) {
+ // Is the line found?
+ if ((substr($line, 0, strlen($old)) == $old) && (!isset($done[$old]))) {
+ // Entry found!
+ //* DEBUG: */ print htmlentities($line) . " - FOUND!<br />\n";
+
+ // Eval the line...
+ eval($line);
+
+ // Setting config entry is new default behaviour!
+ $function = 'setConfigEntry';
+
+ // Still some old constants left?
+ if (in_array($new, $constants)) {
+ // Then switch over...
+ $function = 'define';
+ } // END - if
+
+ // Default comment
+ $comment = str_replace('_', '-', $new);
+
+ // Do we have a special comment?
+ if (isset($comments[$new])) {
+ // Then use it
+ $comment = $comments[$new];
+ } // END - if
+
+ // Do we need to make $new lowercase?
+ $oldNew = $new;
+ if (in_array($new, $lowerCase)) {
+ // Then do so... :)
+ $new = strtolower($new);
+ } // END - if
+
+ /// ... and write it to the new config
+ //* DEBUG: */ print 'function=' . $function . ',new=' . $new . ',comment=' . $comment . "<br />\n";
+ changeDataInFile(constant('PATH') . 'inc/cache/config-local.php', $comment, $function . "('" . $oldNew . "', \"", "\");", constant($new), 0);
+ //* DEBUG: */ print "CHANGED!<br />\n";
+
+ // Mark it as done
+ $done[$old] = 1;
+ } // END - if
+ } // END - foreach
+ } // END - foreach
+
+ // By default the old array $MySQL was not found
+ $found = false;
+
+ // Analyze every entry again for the MySQL configuration
+ foreach ($oldConfig as $line) {
+ // Trim spaces
+ $line = trim($line);
+
+ // Is the $MySQL found?
+ if (substr($line, 0, 6) == "\$MySQL") {
+ // Okay found!
+ $found = true;
+ } elseif ($found === true) {
+ // Now check this row
+ if (substr($line, 0, 2) == ');') {
+ // MySQL array is closed so stop looking for it
+ break;
+ } elseif (substr($line, 0, 2) == '//') {
+ // Skip this line
+ continue;
+ }
+
+ // Debug output only
+ //* DEBUG: */ print htmlentities($line) . " - MySQL!<br />\n";
+
+ // Split parts so we can check them and prepare them
+ $parts = explode('=>', $line);
+ $key = substr(trim($parts[0]), 1, -1); $value = substr(trim($parts[1]), 1, -2);
+
+ // We can now save the right part in new config file
+ changeDataInFile(constant('PATH') . 'inc/cache/config-local.php', $comments[$key], " '".$key."' => \"", "\",", $value, 0);
+ }
+ } // END - foreach
+
+ // Finally remove old config file
+ removeFile(constant('PATH') . 'inc/config.php');
+
+ // Redirect to same URL to reload our new config
+ redirectToUrl($_SERVER['REQUEST_URI']);
+}
+
// [EOF]
?>
projects / mailer.git / blobdiff