New function fetchUserData() introduced to API, total rewrite (not all)

[mailer.git] / inc / config-functions.php

diff --git a/inc/config-functions.php b/inc/config-functions.php
index bb8e9696fdbbe9056216cfe08b2b1e5747e302e4..3b9b1759ffbf2fb99484f5e452536454a697a10f 100644 (file)
--- a/inc/config-functions.php
+++ b/inc/config-functions.php
@@ -97,6 +97,7 @@ function setConfigEntry ($configEntry, $value) {
 
 // Checks wether the given config entry is set
 function isConfigEntrySet ($configEntry) {
+       //* DEBUG: */ print __FUNCTION__.':'.$configEntry.'='.intval(isset($GLOBALS['config'][$configEntry])).'<br />';
        return (isset($GLOBALS['config'][$configEntry]));
 }
 
@@ -118,16 +119,16 @@ function incrementConfigEntry ($configEntry, $value=1) {
 // Checks wether the configuration array is set so the config is loaded
 function isConfigurationLoaded () {
        // Check all
-       return ((isset($GLOBALS['config'])) && (is_array($GLOBALS['config'])) && (count($GLOBALS['config']) > 0));
+       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 (isConfigurationLoaded()) {
+       if (isset($GLOBALS['config'])) {
                // Then use it
                $return = $GLOBALS['config'];
        } // END - if
@@ -297,16 +298,22 @@ function updateConfiguration ($entries, $values, $updateMode='') {
                                if (($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`=%s,", $entry, $values[$idx]);
+                                       $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]);
+                                       // Set it in config as well
+                                       setConfigEntry($entry, $values[$idx]);
+                               }
                        }
                } // END - foreach
 
@@ -314,14 +321,25 @@ function updateConfiguration ($entries, $values, $updateMode='') {
                $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 {
+               $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, $values);
+               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'", SQL_ESCAPE($values));
+               $entries = sprintf("`%s`='%s'", $entries, SQL_ESCAPE($values));
+
+               // Set it in config as well
+               setConfigEntry($entries, SQL_ESCAPE($values));
        }
 
        // Run database update
@@ -350,7 +368,7 @@ function FILTER_LOAD_CONFIGURATION ($no = 0) {
                } // 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",
+               $result_config = SQL_QUERY_ESC("SELECT * FROM `{?_MYSQL_PREFIX?}_config` WHERE `config`='%s' LIMIT 1",
                        array(bigintval($no)), __FUNCTION__, __LINE__);
 
                // Is the config there?