X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fconfig-functions.php;h=825faea0d883e6fa11593a19de0ac1919229ae31;hp=209743115ad8d477ba58a38c1826d4fd09d0e1d3;hb=6dcb879ba3abb21843503cacc65d1fe0848eb90f;hpb=8cef2a4631919672cbbfd484f6e198e1f21b087d
diff --git a/inc/config-functions.php b/inc/config-functions.php
index 209743115a..825faea0d8 100644
--- a/inc/config-functions.php
+++ b/inc/config-functions.php
@@ -10,14 +10,9 @@
* -------------------------------------------------------------------- *
* Kurzbeschreibung : Konfigurationsfunktionen *
* -------------------------------------------------------------------- *
- * $Revision:: $ *
- * $Date:: $ *
- * $Tag:: 0.2.1-FINAL $ *
- * $Author:: $ *
- * -------------------------------------------------------------------- *
* 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 - 2016 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 *
@@ -45,7 +40,7 @@ function initConfig () {
// Init not if already found
if (isConfigurationLoaded()) {
// Already initialized
- debug_report_bug(__FUNCTION__, __LINE__, 'Configuration is already initialized.');
+ reportBug(__FUNCTION__, __LINE__, 'Configuration is already initialized.');
} // END - if
// Set a minimum of configuration, required to by-pass some error triggers in getConfig()
@@ -55,8 +50,10 @@ function initConfig () {
'num_templates' => 0,
// 'DEFAULT_SALT_LENGTH' => 40,
// 'DEBUG_MODE' => 'N',
- // 'DEBUG_RESET' => 'N',
+ // 'DEBUG_HOURLY' => 'N',
+ // 'DEBUG_DAILY' => 'N',
// 'DEBUG_MONTHLY' => 'N',
+ // 'DEBUG_YEARLY' => 'N',
// 'DEBUG_WEEKLY' => 'N',
// 'DEBUG_REGEX' => 'N',
// 'ADMIN_REGISTERED' => 'N',
@@ -71,13 +68,10 @@ function initConfig () {
// Getter for $GLOBALS['config'] entries
function getConfig ($configEntry) {
- // Default value
- $value = null;
-
// Is the entry there?
if (!isConfigEntrySet($configEntry)) {
// Raise an error of missing entries
- debug_report_bug(__FUNCTION__, __LINE__, sprintf("Configuration entry %s is missing.", $configEntry));
+ reportBug(__FUNCTION__, __LINE__, sprintf('Configuration entry %s is missing.', $configEntry));
} // END - if
// Return it
@@ -89,22 +83,35 @@ function getConfig ($configEntry) {
function setConfigEntry ($configEntry, $value) {
// Just set it (unsecured won't hurt?)
$GLOBALS['config'][$configEntry] = $value;
+
+ // Remove cache
+ removeGlobalCache($configEntry);
+}
+
+// Removes entry in $GLOBALS
+function removeGlobalCache ($configEntry) {
+ // Generate key
+ $key = 'get' . capitalizeUnderscoreString($configEntry);
+
+ // Remove it
+ unset($GLOBALS[$key]);
}
-// Checks wether the given config entry is set
+// Checks whether the given config entry is set
function isConfigEntrySet ($configEntry) {
- //* DEBUG: */ debugOutput(__FUNCTION__.':'.$configEntry.'='.intval(isset($GLOBALS['config'][$configEntry])));
- return (isset($GLOBALS['config'][$configEntry]));
+ //* DEBUG: */ debugOutput(__FUNCTION__ . ':' . $configEntry . '=' . intval(isset($GLOBALS['config'][$configEntry])));
+ return ((isset($GLOBALS['config'][$configEntry])) || (array_key_exists($configEntry, $GLOBALS['config'])));
}
// Merges $GLOBALS['config'] with data in given array
function mergeConfig ($newConfig) {
+ // Merge current configuration with new one
$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
+ // Increment it if set or init it with $value
if (isConfigEntrySet($configEntry)) {
$GLOBALS['config'][$configEntry] += $value;
} else {
@@ -112,7 +119,7 @@ function incrementConfigEntry ($configEntry, $value=1) {
}
}
-// Checks wether the configuration array is set so the config is loaded
+// Checks whether the configuration array is set so the config is loaded
function isConfigurationLoaded () {
// Check all
return (isset($GLOBALS['config']['config']));
@@ -138,37 +145,37 @@ function updateOldConfigFile () {
// Watch out for these lines and execute them as single command
// @TODO Make this all better... :-/
$watchLines = array(
- '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',
+ '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',
+ 'mailer_installed' => 'MAILER_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');
+ $lowerCase = array('WARN_NO_PASS', 'MAILER_INSTALLED', 'ADMIN_REGISTERED');
// Special comments...
$comments = array(
'WARN_NO_PASS' => 'NULLPASS-WARNING',
- 'MXCHANGE_INSTALLED' => 'INSTALLED',
+ 'MAILER_INSTALLED ' => 'INSTALLED',
'ADMIN_REGISTERED' => 'ADMIN-SETUP',
'_MYSQL_PREFIX' => 'MYSQL-PREFIX',
'_TABLE_TYPE' => 'TABLE-TYPE',
@@ -184,7 +191,7 @@ function updateOldConfigFile () {
copyFileVerified(getPath() . 'inc/config-local.php.dist', getCachePath() . 'config-local.php', 0644);
// First of all, load the old one!
- $oldConfig = explode("\n", readFromFile(getPath() . 'inc/config.php'));
+ $oldConfig = explode(PHP_EOL, readFromFile(getPath() . 'inc/config.php'));
// Now, analyze every entry
$done = array();
@@ -196,7 +203,7 @@ function updateOldConfigFile () {
// Is the line found?
if ((substr($line, 0, strlen($old)) == $old) && (!isset($done[$old]))) {
- // Entry found!
+ // Entry found
//* DEBUG: */ debugOutput(secureString($line) . ' - FOUND!');
// Eval the line...
@@ -208,20 +215,20 @@ function updateOldConfigFile () {
// Default comment
$comment = str_replace('_', '-', $new);
- // Do we have a special comment?
+ // Is there a special comment?
if (isset($comments[$new])) {
// Then use it
$comment = $comments[$new];
} // END - if
- // Do we need to make $new lowercase?
+ // Does $new needs to be lower-case?
$oldNew = $new;
if (in_array($new, $lowerCase)) {
// Then do so... :)
$new = strtolower($new);
} // END - if
- /// ... and write it to the new config
+ // ... 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!');
@@ -233,7 +240,7 @@ function updateOldConfigFile () {
} // END - foreach
// By default the old array $MySQL was not found
- $found = false;
+ $found = FALSE;
// Analyze every entry again for the MySQL configuration
foreach ($oldConfig as $line) {
@@ -242,12 +249,13 @@ function updateOldConfigFile () {
// Is the $MySQL found?
if (substr($line, 0, 6) == '$MySQL') {
- // Okay found!
- $found = true;
- } elseif ($found === true) {
+ // 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
+ $found = FALSE;
break;
} elseif (substr($line, 0, 2) == '//') {
// Skip this line
@@ -274,41 +282,58 @@ function updateOldConfigFile () {
}
// Update config entries
-function updateConfiguration ($entries, $values, $updateMode='', $config = '0') {
+function updateConfiguration ($entries, $values, $updateMode = '', $config = '0', $force = FALSE) {
// Do not update config in CSS mode
- if ((isCssOutputMode()) || (isRawOutputMode()) || (isInstallationPhase())) {
+ if (($force === FALSE) && ((isCssOutputMode()) || (isRawOutputMode()) || (isInstaller()))) {
+ // 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()) . ',isInstaller()=' . intval(isInstaller()));
return;
} // END - if
- // Do we have multiple entries?
+ // Default is empty SQL
+ $SQL = '';
+
+ // Is there 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]);
+ $SQL .= sprintf('`%s`=`%s`%s%01.5f,', $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]);
+ reportBug(__FUNCTION__, __LINE__, 'values[' . $idx . '] should not be an array! Content='.print_r($values[$idx], TRUE).'
');
} elseif ($values[$idx] == 'UNIX_TIMESTAMP()') {
// Function UNIX_TIMESTAMP() detected
- $all .= sprintf("`%s`=UNIX_TIMESTAMP(),", $entry);
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Function UNIX_TIMESAMP() detected: entry=' . $entry);
+ $SQL .= sprintf('`%s`=UNIX_TIMESTAMP(),', $entry);
// Set timestamp in array as well
setConfigEntry($entry, time());
+ } elseif (!empty($updateMode)) {
+ // Is the value zero?
+ if ($values[$idx] == '0') {
+ // Then skip it
+ continue;
+ } // END - if
+
+ // Update mode set
+ // @TODO Call setConfigEntry() somehow
+ $SQL .= $entries = sprintf('`%s`=`%s`%s%01.5f', $entry, $entry, $updateMode, (float) $values[$idx]);
+ } elseif (($values[$idx] + 0) === $values[$idx]) {
+ // Number detected
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Number detected: entry=' . $entry . ',values[' . $idx . '/' . gettype($values[$idx]) . ']=' . $values[$idx]);
+ $SQL .= sprintf('`%s`=%01.5f,', $entry, (float) $values[$idx]);
+
+ // Set it in config as well
+ setConfigEntry($entry, $values[$idx]);
} else {
// String detected
- $all .= sprintf("`%s`='%s',", $entry, SQL_ESCAPE($values[$idx]));
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Regular value detected: entry=' . $entry . ',values[' . $idx . '/' . gettype($values[$idx]) . ']=' . $values[$idx]);
+ $SQL .= sprintf("`%s`='%s',", $entry, sqlEscapeString($values[$idx]));
// Set it in config as well
setConfigEntry($entry, $values[$idx]);
@@ -317,35 +342,45 @@ function updateConfiguration ($entries, $values, $updateMode='', $config = '0')
} // END - foreach
// Remove last comma
- $entries = substr($all, 0, -1);
+ $SQL = substr($SQL, 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);
+ // Is the value zero?
+ if ($values == '0') {
+ // Then skip it
+ return;
+ } // END - if
- // Set it in config first
- setConfigEntry($entries, (float) $values);
+ // Update mode set
+ // @TODO Call setConfigEntry() somehow
+ $SQL = sprintf('`%s`=`%s`%s%01.5f', $entries, $entries, $updateMode, (float) $values);
} elseif ($values == 'UNIX_TIMESTAMP()') {
// Function UNIX_TIMESTAMP() detected
- $entries = sprintf("`%s`=UNIX_TIMESTAMP()", $entries);
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Function UNIX_TIMESAMP() detected: entries=' . $entries);
+ $SQL = sprintf('`%s`=UNIX_TIMESTAMP()', $entries);
// Set timestamp in array as well
setConfigEntry($entries, time());
+ } elseif (($values + 0) === $values) {
+ // Number detected
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Number detected: entries=' . $entries . ',values[' . gettype($values) . ']=' . $values);
+ $SQL = sprintf('`%s`=%01.5f', $entries, (float) $values);
+
+ // Set it in config first
+ setConfigEntry($entries, (float) $values);
} else {
// Regular entry to update
- $entries = sprintf("`%s`='%s'", $entries, SQL_ESCAPE($values));
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Regular value detected: entries=' . $entries . ',values[' . gettype($values) . ']=' . $values);
+ $SQL = sprintf("`%s`='%s'", $entries, sqlEscapeString($values));
// Set it in config as well
- setConfigEntry($entries, SQL_ESCAPE($values));
+ setConfigEntry($entries, sqlEscapeString($values));
}
// Run database update
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'entries=' . $entries);
- SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_config` SET ".$entries." WHERE `config`=%s LIMIT 1",
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'SQL=' . $SQL);
+ sqlQueryEscaped('UPDATE `{?_MYSQL_PREFIX?}_config` SET ' . $SQL . ' WHERE `config`=%s LIMIT 1',
array(bigintval($config)), __FUNCTION__, __LINE__);
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'entries=' . $entries . ',affectedRows=' . SQL_AFFECTEDROWS());
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'SQL=' . $SQL . ',affectedRows=' . sqlAffectedRows());
// Rebuild cache
rebuildCache('config', 'config');
@@ -353,36 +388,74 @@ function updateConfiguration ($entries, $values, $updateMode='', $config = '0')
// Filter for loading configuration
function FILTER_LOAD_CONFIGURATION ($no = '0') {
- // Is the value null, fix it :(
- if (is_null($no)) $no = '0';
+ // Is installation phase?
+ if (isInstaller()) {
+ // Then don't load any configuration
+ return;
+ } // END - if
+
+ // 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
+ // Count cache hits
+ incrementStatsEntry('cache_hits');
} 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",
+ $result_config = sqlQueryEscaped('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) {
+ if (sqlNumRows($result_config) == 1) {
// Get config from database
- mergeConfig(SQL_FETCHARRAY($result_config));
+ mergeConfig(sqlFetchArray($result_config));
} // END - if
// Free result
- SQL_FREERESULT($result_config);
+ sqlFreeResult($result_config);
// Remember this config in the array
$GLOBALS['cache_array']['config'][$no] = getConfigArray();
}
}
+// "Getter" for "checked" configuration entries
+function getCheckedConfig ($configEntries) {
+ // Add entries
+ $content = getConfigEntries($configEntries, ' checked="checked"');
+
+ // Return it
+ return $content;
+}
+
+// "Getter" for "selected" configuration entries
+function getSelectedConfig ($configEntries) {
+ // Add entries
+ $content = getConfigEntries($configEntries, ' selected="selected"');
+
+ // Return it
+ return $content;
+}
+
+// "Getter" for configuration entries
+function getConfigEntries ($configEntries, $value) {
+ // Init content
+ $content = array();
+
+ // "Walk" through all entries
+ foreach ($configEntries as $entry) {
+ $content[$entry . '_' . strtolower(getConfig($entry))] = $value;
+ } // END - foreach
+
+ // Return it
+ return $content;
+}
+
// [EOF]
?>