X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fconfig-functions.php;h=825faea0d883e6fa11593a19de0ac1919229ae31;hp=7b398bc93e6d7c57b43d6f324ac13edf97e8f019;hb=6dcb879ba3abb21843503cacc65d1fe0848eb90f;hpb=e5dffd4249c97200cbad02f3f4eaf5c373fdb89a diff --git a/inc/config-functions.php b/inc/config-functions.php index 7b398bc93e..825faea0d8 100644 --- a/inc/config-functions.php +++ b/inc/config-functions.php @@ -10,13 +10,8 @@ * -------------------------------------------------------------------- * * Kurzbeschreibung : Konfigurationsfunktionen * * -------------------------------------------------------------------- * - * $Revision:: $ * - * $Date:: $ * - * $Tag:: 0.2.1-FINAL $ * - * $Author:: $ * - * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2009 by Roland Haeder * - * Copyright (c) 2009 - 2013 by Mailer Developer Team * + * 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 * @@ -305,7 +300,7 @@ function updateConfiguration ($entries, $values, $updateMode = '', $config = '0' // Update mode set? if (!empty($updateMode)) { // Update entry - $SQL .= 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])) { @@ -313,6 +308,7 @@ function updateConfiguration ($entries, $values, $updateMode = '', $config = '0' 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 + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Function UNIX_TIMESAMP() detected: entry=' . $entry); $SQL .= sprintf('`%s`=UNIX_TIMESTAMP(),', $entry); // Set timestamp in array as well @@ -326,15 +322,17 @@ function updateConfiguration ($entries, $values, $updateMode = '', $config = '0' // Update mode set // @TODO Call setConfigEntry() somehow - $SQL .= $entries = sprintf('`%s`=`%s`%s%s', $entry, $entry, $updateMode, (float) $values[$idx]); + $SQL .= $entries = sprintf('`%s`=`%s`%s%01.5f', $entry, $entry, $updateMode, (float) $values[$idx]); } elseif (($values[$idx] + 0) === $values[$idx]) { // Number detected - $SQL .= sprintf('`%s`=%s,', $entry, (float) $values[$idx]); + //* 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 + //* 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 @@ -349,26 +347,29 @@ function updateConfiguration ($entries, $values, $updateMode = '', $config = '0' // Is the value zero? if ($values == '0') { // Then skip it - continue; + return; } // END - if // Update mode set // @TODO Call setConfigEntry() somehow - $SQL = sprintf('`%s`=`%s`%s%s', $entries, $entries, $updateMode, (float) $values); - } elseif (($values + 0) === $values) { - // Number detected - $SQL = sprintf('`%s`=%s', $entries, (float) $values); - - // Set it in config first - setConfigEntry($entries, (float) $values); + $SQL = sprintf('`%s`=`%s`%s%01.5f', $entries, $entries, $updateMode, (float) $values); } elseif ($values == 'UNIX_TIMESTAMP()') { // Function UNIX_TIMESTAMP() detected + //* 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 + //* 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 @@ -377,7 +378,7 @@ function updateConfiguration ($entries, $values, $updateMode = '', $config = '0' // Run database update //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'SQL=' . $SQL); - sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_config` SET " . $SQL . " WHERE `config`=%s LIMIT 1", + sqlQueryEscaped('UPDATE `{?_MYSQL_PREFIX?}_config` SET ' . $SQL . ' WHERE `config`=%s LIMIT 1', array(bigintval($config)), __FUNCTION__, __LINE__); //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'SQL=' . $SQL . ',affectedRows=' . sqlAffectedRows()); @@ -407,7 +408,7 @@ function FILTER_LOAD_CONFIGURATION ($no = '0') { incrementStatsEntry('cache_hits'); } elseif ((!isExtensionActive('cache')) || (!isset($GLOBALS['cache_array']['config'][$no]))) { // Load config from DB - $result_config = sqlQueryEscaped("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?