X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fconfig-functions.php;h=02563b99353adeba374ca1750f7086d2133604b5;hp=c70857e9af77a6b39957d952af2335b5cb34ab74;hb=feb187d8f8a4dfe861ccece329260b9e186a6851;hpb=36c3c8b749a88ce05ad0fda81e00047f9cb5433f diff --git a/inc/config-functions.php b/inc/config-functions.php index c70857e9af..02563b9935 100644 --- a/inc/config-functions.php +++ b/inc/config-functions.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,13 +38,51 @@ // Some security stuff... if (!defined('__SECURITY')) { - $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php'; - require($INC); -} + die(); +} // END - if -// Merges $GLOBALS['config'] with data in given array -function mergeConfig ($newConfig) { - $GLOBALS['config'] = merge_array(getConfigArray(), $newConfig); +// Init the config array +function initConfig () { + // Init not if already found + if (isConfigLoaded()) { + // Already initialized + debug_report_bug(sprintf("[%s:%s] Configuration is already initialized.", __FUNCTION__, __LINE__)); + } // END - if + + // Set a minimum of configuration, required to by-pass some error triggers in getConfig() + $GLOBALS['config'] = array( + 'code_length' => 0, + 'patch_level' => 0, + 'last_update' => time(), + 'activate_xchange' => 100, + 'enable_mod_title' => 'Y', + 'update_filter_usage' => 'N', + 'ADMIN_REGISTERED' => 'N', + 'MXCHANGE_INSTALLED' => 'N', + 'DEFAULT_LANG' => 'de', + 'DEFAULT_SALT_LENGTH' => 40, + 'DEBUG_MODE' => 'N', + 'DEBUG_RESET' => 'N', + 'DEBUG_MONTHLY' => 'N', + 'DEBUG_WEEKLY' => 'N', + 'DEBUG_REGEX' => 'N', + 'ADMIN_REGISTERED' => 'N', + 'sql_count' => 0, + 'sql_time' => 0, + 'num_templates' => 0, + 'default_theme' => 'default', + 'verbose_sql' => 'Y', + 'def_refid' => 0, + 'ENABLE_BACKLINK' => 'Y', + 'display_debug_sqls' => 'N', + // Keep session_save_path to fall-back to php.ini setting + 'session_save_path' => '', + // For installation phase: + 'SMTP_HOSTNAME' => '', + 'SMTP_USER' => '', + 'SMTP_PASSWORD' => '', + 'MT_WORD' => '{--DEFAULT_MT_WORD--}', + ); } // Getter for $GLOBALS['config'] entries @@ -53,27 +91,22 @@ function getConfig ($configEntry) { $value = null; // Is the entry there? - if (isConfigEntrySet($configEntry)) { - // Then use it - $value = $GLOBALS['config'][$configEntry]; + if (!isset($GLOBALS['config'][$configEntry])) { + // Raise an error of missing entries + debug_report_bug(sprintf("[%s:%s] Configuration entry %s is missing.", + __FUNCTION__, + __LINE__, + $configEntry + )); } // END - if // Return it - return $value; + return $GLOBALS['config'][$configEntry]; } // Setter for $GLOBALS['config'] entries function setConfigEntry ($configEntry, $value) { - // Secure the entry name - if (function_exists('SQL_ESCAPE')) { - // Use our secure function - $configEntry = SQL_ESCAPE($configEntry); - } else { - // Use maybe insecure function - $configEntry = smartAddSlashes($configEntry); - } - - // And set it + // Just set it (unsecured won't hurt?) $GLOBALS['config'][$configEntry] = $value; } @@ -82,6 +115,11 @@ function isConfigEntrySet ($configEntry) { return (isset($GLOBALS['config'][$configEntry])); } +// Merges $GLOBALS['config'] with data in given array +function mergeConfig ($newConfig) { + $GLOBALS['config'] = merge_array(getConfigArray(), $newConfig); +} + // Increment or init with given value or 1 as default the given config entry function incrementConfigEntry ($configEntry, $value=1) { // Increment it if set or init it with 1 @@ -98,49 +136,6 @@ function isConfigLoaded () { return ((isset($GLOBALS['config'])) && (is_array($GLOBALS['config'])) && (count($GLOBALS['config']) > 0)); } -// Init the config array -function initConfig () { - // Set a minimum dummy configuration - $GLOBALS['config'] = array( - 'code_length' => 0, - 'patch_level' => 0, - 'last_update' => time() - ); -} - -// Load configuration and return it as an arry -function loadConfiguration ($no = '0') { - // Check for cache extension, cache-array and if the requested configuration is in cache - if ((isset($GLOBALS['cache_array'])) && (is_array($GLOBALS['cache_array'])) && (isset($GLOBALS['cache_array']['config'][$no])) && (is_array($GLOBALS['cache_array']['config'][$no]))) { - // Load config from cache - //* DEBUG: */ OUTPUT_HTML(gettype($GLOBALS['cache_array']['config'][$no])."
"); - foreach ($GLOBALS['cache_array']['config'][$no] as $key => $value) { - setConfigEntry($key, $value); - } // END - foreach - - // Count cache hits if exists - if ((isConfigEntrySet('cache_hits')) && (EXT_IS_ACTIVE('cache'))) { - incrementConfigEntry('cache_hits'); - } // END - if - } elseif ((!EXT_IS_ACTIVE('cache')) || (!isset($GLOBALS['cache_array']['config'][$no]))) { - // Load config from DB - $result_config = SQL_QUERY_ESC("SELECT * FROM `{!_MYSQL_PREFIX!}_config` WHERE config=%d LIMIT 1", - array(bigintval($no)), __FUNCTION__, __LINE__); - - // Is the config there? - if (SQL_NUMROWS($result_config) == 1) { - // Get config from database - mergeConfig(SQL_FETCHARRAY($result_config)); - } // END - if - - // Free result - SQL_FREERESULT($result_config); - - // Remember this config in the array - $GLOBALS['cache_array']['config'][$no] = getConfigArray(); - } -} - // Getter for whole $GLOBALS['config'] array function getConfigArray () { // Default is null @@ -161,32 +156,33 @@ 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', + 'SITE_KEY' => 'SITE_KEY', + 'DEFAULT_LANG' => 'DEFAULT_LANG', + 'warn_no_pass' => 'WARN_NO_PASS', + 'WRITE_FOOTER' => 'WRITE_FOOTER', + 'OUTPUT_MODE' => 'OUTPUT_MODE', + 'MAIN_TITLE' => 'MAIN_TITLE', + 'SLOGAN' => 'SLOGAN', + 'WEBMASTER' => 'WEBMASTER', + 'mxchange_installed' => 'MXCHANGE_INSTALLED', + 'admin_registered' => 'ADMIN_REGISTERED', + '_MYSQL_PREFIX' => '_MYSQL_PREFIX', + '_TABLE_TYPE' => '_TABLE_TYPE', + '_DB_TYPE' => '_DB_TYPE', + 'SMTP_HOSTNAME' => 'SMTP_HOSTNAME', + 'SMTP_USER' => 'SMTP_USER', + 'SMTP_PASSWORD' => 'SMTP_PASSWORD', + 'ENABLE_BACKLINK' => 'ENABLE_BACKLINK', + 'MAIN_TITLE' => 'MAIN_TITLE', + 'SLOGAN' => 'SLOGAN', + 'WEBMASTER' => 'WEBMASTER', + 'PATH' => 'PATH', + 'URL' => 'URL', ); // 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', @@ -203,20 +199,23 @@ function updateOldConfigFile () { ); // Copy template to new file destionation - copyFileVerified(constant('PATH') . 'inc/config-local.php.dist', constant('PATH') . 'inc/cache/config-local.php', 0644); + copyFileVerified(getConfig('PATH') . 'inc/config-local.php.dist', getConfig('CACHE_PATH') . 'config-local.php', 0644); // First of all, load the old one! - $oldConfig = explode("\n", readFromFile(constant('PATH') . 'inc/config.php')); + $oldConfig = explode("\n", readFromFile(getConfig('PATH') . 'inc/config.php')); // Now, analyze every entry $done = array(); foreach ($oldConfig as $line) { // Check all watch lines foreach ($watchLines as $old => $new) { + // Add define() command around old one + $old = "define('" . $old . "',"; + // Is the line found? if ((substr($line, 0, strlen($old)) == $old) && (!isset($done[$old]))) { // Entry found! - //* DEBUG: */ OUTPUT_HTML(htmlentities($line) . " - FOUND!
"); + //* DEBUG: */ outputHtml(htmlentities($line) . " - FOUND!
"); // Eval the line... eval($line); @@ -224,12 +223,6 @@ function updateOldConfigFile () { // 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); @@ -247,9 +240,9 @@ function updateOldConfigFile () { } // END - if /// ... and write it to the new config - //* DEBUG: */ OUTPUT_HTML('function=' . $function . ',new=' . $new . ',comment=' . $comment . "
"); - changeDataInFile(constant('PATH') . 'inc/cache/config-local.php', $comment, $function . "('" . $oldNew . "', \"", "\");", constant($new), 0); - //* DEBUG: */ OUTPUT_HTML("CHANGED!
"); + //* DEBUG: */ outputHtml('function=' . $function . ',new=' . $new . ',comment=' . $comment . "
"); + changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', $comment, $function . "('" . $oldNew . "', \"", "\");", constant($new), 0); + //* DEBUG: */ outputHtml("CHANGED!
"); // Mark it as done $done[$old] = 1; @@ -280,22 +273,113 @@ function updateOldConfigFile () { } // Debug output only - //* DEBUG: */ OUTPUT_HTML(htmlentities($line) . " - MySQL!
"); + //* DEBUG: */ outputHtml(htmlentities($line) . " - MySQL!
"); // 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); + changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', $comments[$key], " '".$key."' => \"", "\",", $value, 0); } } // END - foreach // Finally remove old config file - removeFile(constant('PATH') . 'inc/config.php'); + removeFile(getConfig('PATH') . 'inc/config.php'); // Redirect to same URL to reload our new config - redirectToUrl($_SERVER['REQUEST_URI']); + redirectToUrl(getRequestUri()); +} + +// Update config entries +function updateConfiguration ($entries, $values, $updateMode='') { + // Do not update config in CSS mode + if ((getOutputMode() == '1') || (getOutputMode() == -1) || (isInstallationPhase())) { + return; + } // END - if + + // Do we have multiple entries? + if (is_array($entries)) { + // Walk through all + $all = ''; + foreach ($entries as $idx => $entry) { + // Update mode set? + if (!empty($updateMode)) { + // Update entry + $all .= sprintf("`%s`=`%s`%s%s,", $entry, $entry, $updateMode, (float)$values[$idx]); + } else { + // Check if string or number + if (($values[$idx] + 0) === $values[$idx]) { + // Number detected + $all .= sprintf("`%s`=%s,", $entry, (float)$values[$idx]); + } elseif ($values[$idx] == 'UNIX_TIMESTAMP()') { + // Function UNIX_TIMESTAMP() detected + $all .= sprintf("`%s`=%s,", $entry, $values[$idx]); + } else { + // String detected + $all .= sprintf("`%s`='%s',", $entry, SQL_ESCAPE($values[$idx])); + } + + // Set it in config as well + setConfigEntry($entry, $values[$idx]); + } + } // END - foreach + + // Remove last comma + $entries = substr($all, 0, -1); + } elseif (!empty($updateMode)) { + // Update mode set + // @TODO Find a way for updating configuration here + $entries .= sprintf("=%s%s%s", $entries, $updateMode, (float)$values); + } else { + // Set it in config first + setConfigEntry($entries, $values); + + // Regular entry to update + $entries .= sprintf("='%s'", SQL_ESCAPE($values)); + } + + // Run database update + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "entries={$entries}"); + SQL_QUERY("UPDATE `{?_MYSQL_PREFIX?}_config` SET ".$entries." WHERE `config`=0 LIMIT 1", __FUNCTION__, __LINE__); + //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):entries={$entries},affectedRows={$affectedRows}
"); + + // Rebuild cache + rebuildCacheFile('config', 'config'); +} + +// Filter for loading configuration +function FILTER_LOAD_CONFIGURATION ($no = '0') { + // Check for cache extension, cache-array and if the requested configuration is in cache + if ((isset($GLOBALS['cache_array']['config'][$no])) && (is_array($GLOBALS['cache_array']['config'][$no]))) { + // Load config from cache + //* DEBUG: */ outputHtml(gettype($GLOBALS['cache_array']['config'][$no])."
"); + mergeConfig($GLOBALS['cache_array']['config'][$no]); + //foreach ($GLOBALS['cache_array']['config'][$no] as $key => $value) { + // setConfigEntry($key, $value); + //} // END - foreach + + // Count cache hits if exists + if ((isStatsEntrySet('cache_hits')) && (isExtensionActive('cache'))) { + incrementStatsEntry('cache_hits'); + } // END - if + } elseif ((!isExtensionActive('cache')) || (!isset($GLOBALS['cache_array']['config'][$no]))) { + // Load config from DB + $result_config = SQL_QUERY_ESC("SELECT * FROM `{?_MYSQL_PREFIX?}_config` WHERE config=%d LIMIT 1", + array(bigintval($no)), __FUNCTION__, __LINE__); + + // Is the config there? + if (SQL_NUMROWS($result_config) == 1) { + // Get config from database + mergeConfig(SQL_FETCHARRAY($result_config)); + } // END - if + + // Free result + SQL_FREERESULT($result_config); + + // Remember this config in the array + $GLOBALS['cache_array']['config'][$no] = getConfigArray(); + } } // [EOF]