X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fconfig-functions.php;h=189d4c448b5d59d7b45b9f851db785b6ef13246b;hb=ed2e4260898a75477dd0bffad49732fdf702717e;hp=531ad1884429a374e92c99a60658ac763e6e475f;hpb=62b8f74ec2e1d527ea0c606e1137a82f099b284b;p=mailer.git
diff --git a/inc/config-functions.php b/inc/config-functions.php
index 531ad18844..189d4c448b 100644
--- a/inc/config-functions.php
+++ b/inc/config-functions.php
@@ -1,24 +1,23 @@
0,
+ 'sql_count' => 0,
+ 'num_templates' => 0,
+ // 'DEFAULT_SALT_LENGTH' => 40,
+ // 'DEBUG_MODE' => 'N',
+ // 'DEBUG_RESET' => 'N',
+ // 'DEBUG_MONTHLY' => 'N',
+ // 'DEBUG_WEEKLY' => 'N',
+ // 'DEBUG_REGEX' => 'N',
+ // 'ADMIN_REGISTERED' => 'N',
+ // 'verbose_sql' => 'Y',
+ // For installation phase:
+ 'SMTP_HOSTNAME' => '',
+ 'SMTP_USER' => '',
+ 'SMTP_PASSWORD' => '',
+ 'MT_WORD' => '{--DEFAULT_MT_WORD--}',
+ );
}
// Getter for $GLOBALS['config'] entries
function getConfig ($configEntry) {
- // Default value
- $value = null;
-
// Is the entry there?
- if (isConfigEntrySet($configEntry)) {
- // Then use it
- $value = $GLOBALS['config'][$configEntry];
+ if (!isConfigEntrySet($configEntry)) {
+ // Raise an error of missing entries
+ debug_report_bug(__FUNCTION__, __LINE__, sprintf("Configuration entry %s is missing.", $configEntry));
} // END - if
// Return it
- return $value;
+ //* DEBUG: */ error_log(__FUNCTION__.'['.__LINE__.':] '.$configEntry.'='.$GLOBALS['config'][$configEntry]);
+ 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);
- }
-
- // If config array isn't set, set it
- if (!isConfigLoaded()) {
- // Init configuration array
- initConfig();
- } // END - if
-
- // And set it
+ // Just set it (unsecured won't hurt?)
$GLOBALS['config'][$configEntry] = $value;
}
// Checks wether the given config entry is set
function isConfigEntrySet ($configEntry) {
+ //* DEBUG: */ debugOutput(__FUNCTION__ . ':' . $configEntry . '=' . intval(isset($GLOBALS['config'][$configEntry])));
return (isset($GLOBALS['config'][$configEntry]));
}
+// Merges $GLOBALS['config'] with data in given array
+function mergeConfig ($newConfig) {
+ $GLOBALS['config'] = merge_array(getConfigArray(), $newConfig);
+
+ // Remove all cached entries
+}
+
// 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
- if (getConfig($configEntry) > 0) {
+ // Increment it if set or init it with $value
+ if (isConfigEntrySet($configEntry)) {
$GLOBALS['config'][$configEntry] += $value;
} else {
$GLOBALS['config'][$configEntry] = $value;
@@ -99,61 +112,18 @@ function incrementConfigEntry ($configEntry, $value=1) {
}
// Checks wether the configuration array is set so the config is loaded
-function isConfigLoaded () {
+function isConfigurationLoaded () {
// Check all
- 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: */ echo gettype($GLOBALS['cache_array']['config'][$no])."
\n";
- 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();
- }
+ return (isset($GLOBALS['config']['config']));
}
// Getter for whole $GLOBALS['config'] array
function getConfigArray () {
// Default is null
- $return = null;
+ $return = array();
// Is the config set?
- if (isConfigLoaded()) {
+ if (isset($GLOBALS['config'])) {
// Then use it
$return = $GLOBALS['config'];
} // END - if
@@ -167,32 +137,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',
@@ -209,20 +180,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(getPath() . 'inc/config-local.php.dist', getCachePath() . 'config-local.php', 0644);
// First of all, load the old one!
- $oldConfig = explode("\n", readFromFile(constant('PATH') . 'inc/config.php'));
+ $oldConfig = explode("\n", readFromFile(getPath() . '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: */ print htmlentities($line) . " - FOUND!
\n";
+ // Entry found
+ //* DEBUG: */ debugOutput(secureString($line) . ' - FOUND!');
// Eval the line...
eval($line);
@@ -230,12 +204,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);
@@ -252,10 +220,10 @@ function updateOldConfigFile () {
$new = strtolower($new);
} // END - if
- /// ... and write it to the new config
- //* DEBUG: */ print 'function=' . $function . ',new=' . $new . ',comment=' . $comment . "
\n";
- changeDataInFile(constant('PATH') . 'inc/cache/config-local.php', $comment, $function . "('" . $oldNew . "', \"", "\");", constant($new), 0);
- //* DEBUG: */ print "CHANGED!
\n";
+ // ... and write it to the new config
+ //* DEBUG: */ debugOutput('function=' . $function . ',new=' . $new . ',comment=' . $comment);
+ changeDataInInclude(getCachePath() . 'config-local.php', $comment, $function . "('" . $oldNew . "', \"", '");', constant($new), 0);
+ //* DEBUG: */ debugOutput('CHANGED!');
// Mark it as done
$done[$old] = 1;
@@ -272,8 +240,8 @@ function updateOldConfigFile () {
$line = trim($line);
// Is the $MySQL found?
- if (substr($line, 0, 6) == "\$MySQL") {
- // Okay found!
+ if (substr($line, 0, 6) == '$MySQL') {
+ // Okay, found
$found = true;
} elseif ($found === true) {
// Now check this row
@@ -286,22 +254,137 @@ function updateOldConfigFile () {
}
// Debug output only
- //* DEBUG: */ print htmlentities($line) . " - MySQL!
\n";
+ //* DEBUG: */ debugOutput(secureString($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);
+ changeDataInInclude(getCachePath() . 'config-local.php', $comments[$key], " '".$key."' => \"", '",', $value, 0);
}
} // END - foreach
// Finally remove old config file
- removeFile(constant('PATH') . 'inc/config.php');
+ removeFile(getPath() . '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='', $config = '0') {
+ // Do not update config in CSS mode
+ if ((isCssOutputMode()) || (isRawOutputMode()) || (isInstallationPhase())) {
+ // This logger line may be very noisy
+ /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Not updating configuration. entries[]=' . gettype($entries) . ',values[]=' . gettype($values) . ',updateMode=' . $updateMode . ',config=' . $config . ',isCssOutputMode()=' . intval(isCssOutputMode()) . ',isRawOutputMode()=' . intval(isRawOutputMode()) . ',isInstallationPhase()=' . intval(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 but no array
+ if (is_array($values[$idx])) {
+ // Arrays must be fixed...
+ debug_report_bug(__FUNCTION__, __LINE__, 'values[' . $idx . '] should not be an array! Content=
'.print_r($values[$idx], true).''); + } elseif (($values[$idx] + 0) === $values[$idx]) { + // Number detected + $all .= sprintf("`%s`=%s,", $entry, (float) $values[$idx]); + + // Set it in config as well + setConfigEntry($entry, $values[$idx]); + } elseif ($values[$idx] == 'UNIX_TIMESTAMP()') { + // Function UNIX_TIMESTAMP() detected + $all .= sprintf("`%s`=UNIX_TIMESTAMP(),", $entry); + + // Set timestamp in array as well + setConfigEntry($entry, time()); + } 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 + $entries = sprintf("`%s`=`%s`%s%s", $entries, $entries, $updateMode, (float) $values); + } elseif (($values + 0) === $values) { + // Number detected + $entries = sprintf("`%s`=%s", $entries, (float) $values); + + // Set it in config first + setConfigEntry($entries, (float) $values); + } elseif ($values == 'UNIX_TIMESTAMP()') { + // Function UNIX_TIMESTAMP() detected + $entries = sprintf("`%s`=UNIX_TIMESTAMP()", $entries); + + // Set timestamp in array as well + setConfigEntry($entries, time()); + } else { + // Regular entry to update + $entries = sprintf("`%s`='%s'", $entries, SQL_ESCAPE($values)); + + // Set it in config as well + setConfigEntry($entries, SQL_ESCAPE($values)); + } + + // Run database update + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'entries=' . $entries); + SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_config` SET ".$entries." WHERE `config`=%s LIMIT 1", + array(bigintval($config)), __FUNCTION__, __LINE__); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'entries=' . $entries . ',affectedRows=' . SQL_AFFECTEDROWS()); + + // Rebuild cache + rebuildCache('config', 'config'); +} + +// Filter for loading configuration +function FILTER_LOAD_CONFIGURATION ($no = '0') { + // Is the value null, it comes from the 'init' filter chain + if (is_null($no)) { + $no = '0'; + } // END - if + + // 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 + mergeConfig($GLOBALS['cache_array']['config'][$no]); + + // 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`='%s' 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]