Fixes

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

diff --git a/inc/sql-functions.php b/inc/sql-functions.php
index 84456a0f00d2f2dba9d455aaf790df079a0e8bb4..9fe8259c59a29929bda8830dbdbe411f687fcabe 100644 (file)
--- a/inc/sql-functions.php
+++ b/inc/sql-functions.php
@@ -149,6 +149,9 @@ function getUpdateSqlFromArray ($array, $tableName, $whereColumn, $whereData, $e
                        } elseif ('' . bigintval($value, TRUE, FALSE) . '' == '' . $value . '')  {
                                // No need for ticks (')
                                $SQL .= '`' . $entry . '`=' . $value . ',';
+                       } elseif ('' . (float) $value . '' == '' . $value . '') {
+                               // Float number detected
+                               $SQL .= '`' . $entry . '`=' . sprintf(getConfig('FLOAT_MASK'), $value) . ',';
                        } else {
                                // Strings need ticks (') around them
                                $SQL .= '`' . $entry . "`='" . SQL_ESCAPE($value) . "',";
@@ -164,6 +167,9 @@ function getUpdateSqlFromArray ($array, $tableName, $whereColumn, $whereData, $e
                        } elseif (('' . bigintval($value[$multiDimId], TRUE, FALSE) . '' == '' . $value[$multiDimId] . ''))  {
                                // No need for ticks (')
                                $SQL .= '`' . $entry . '`=' . $value[$multiDimId] . ',';
+                       } elseif ('' . (float) $value[$multiDimId] . '' == '' . $value[$multiDimId] . '') {
+                               // Float number detected
+                               $SQL .= '`' . $entry . '`=' . sprintf(getConfig('FLOAT_MASK'), $value[$multiDimId]) . ',';
                        } else {
                                // Strings need ticks (') around them
                                $SQL .= '`' . $entry . "`='" . SQL_ESCAPE($value[$multiDimId]) . "',";
@@ -181,11 +187,7 @@ function getUpdateSqlFromArray ($array, $tableName, $whereColumn, $whereData, $e
 // "Getter" for an "INSERT INTO" SQL query
 function getInsertSqlFromArray ($array, $tableName) {
        // Init SQL
-       $SQL = 'INSERT INTO
-`{?_MYSQL_PREFIX?}_' . $tableName . '`
-(
-`' . implode('`, `', array_keys($array)) . '`
-) VALUES (';
+       $SQL = 'INSERT INTO `{?_MYSQL_PREFIX?}_' . $tableName . '` (`' . implode('`, `', array_keys($array)) . '`) VALUES (';
 
        // Walk through all entries
        foreach ($array as $key => $value) {
@@ -204,7 +206,7 @@ function getInsertSqlFromArray ($array, $tableName) {
                        $SQL .= bigintval($value) . ',';
                } elseif ('' . (float) $value . '' == '' . $value . '') {
                        // Float number detected
-                       $SQL .= sprintf('%01.5f', $value);
+                       $SQL .= sprintf(getConfig('FLOAT_MASK'), $value) . ',';
                } else {
                        // Everything else might be a string, so add ticks around it
                        $SQL .= chr(39) . SQL_ESCAPE($value) . chr(39) . ',';
@@ -215,6 +217,7 @@ function getInsertSqlFromArray ($array, $tableName) {
        $SQL = substr($SQL, 0, -1) . ')';
 
        // Return SQL query
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ',sql=' . $SQL);
        return $SQL;
 }