Fixes and cleanups

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

diff --git a/inc/sql-functions.php b/inc/sql-functions.php
index 5ec4bee18cf0ce1fdfc51ba08946e48dc4850b0a..75118871d76f1209baddcd6d62cbff808b1cf8c7 100644 (file)
--- a/inc/sql-functions.php
+++ b/inc/sql-functions.php
@@ -141,10 +141,10 @@ function getUpdateSqlFromArray ($array, $tableName, $whereColumn, $whereData, $e
                        // Handle one-dimensional data
                        if (is_null($value)) {
                                // NULL detected
-                               $SQL .= '`' . $entry . '`=NULL, ';
-                       } elseif ((bigintval($value, true, false) === $value) || ($value == 'NOW()') || (substr($value, 0, 1) == '`'))  {
+                               $SQL .= '`' . $entry . '`=NULL,';
+                       } elseif (('' . bigintval($value, true, false) . '' == '' . $value . '') || ($value == 'NOW()') || (substr($value, 0, 1) == '`'))  {
                                // No need for ticks (')
-                               $SQL .= '`' . $entry . '`=' . $value . ', ';
+                               $SQL .= '`' . $entry . '`=' . $value . ',';
                        } else {
                                // Strings need ticks (') around them
                                $SQL .= '`' . $entry . "`='" . SQL_ESCAPE($value) . "', ";
@@ -154,25 +154,25 @@ function getUpdateSqlFromArray ($array, $tableName, $whereColumn, $whereData, $e
                        if (is_null($value[$multiDimId])) {
                                // NULL detected
                                $SQL .= '`' . $entry . '`=NULL, ';
-                       } elseif ((bigintval($value[$multiDimId], true, false) === $value[$multiDimId]) || ($value[$multiDimId] == 'NOW()') || (substr($value[$multiDimId], 0, 1) == '`'))  {
+                       } elseif (('' . bigintval($value[$multiDimId], true, false) . '' == '' . $value[$multiDimId] . '') || ($value[$multiDimId] == 'NOW()') || (substr($value[$multiDimId], 0, 1) == '`'))  {
                                // No need for ticks (')
-                               $SQL .= '`' . $entry . '`=' . $value[$multiDimId] . ', ';
+                               $SQL .= '`' . $entry . '`=' . $value[$multiDimId] . ',';
                        } else {
                                // Strings need ticks (') around them
-                               $SQL .= '`' . $entry . "`='" . SQL_ESCAPE($value[$multiDimId]) . "', ";
+                               $SQL .= '`' . $entry . "`='" . SQL_ESCAPE($value[$multiDimId]) . "',";
                        }
                }
        } // END - foreach
 
        // Remove last 2 chars and finish query
-       $SQL = substr($SQL, 0, -2) . ' WHERE `' . $whereColumn . '`=' . $whereData . ' LIMIT 1';
+       $SQL = substr($SQL, 0, -1) . ' WHERE `' . $whereColumn . '`=' . $whereData . ' LIMIT 1';
 
        // Return SQL query
        return $SQL;
 }
 
 // "Getter" for an "INSERT INTO" SQL query
-function getInsertSqlFromArray ($array, $tableName, $excludedFields = array('ok', 'add', 'do_edit')) {
+function getInsertSqlFromArray ($array, $tableName) {
        // Init SQL
        $SQL = 'INSERT INTO
 `{?_MYSQL_PREFIX?}_' . $tableName . '`
@@ -181,15 +181,18 @@ function getInsertSqlFromArray ($array, $tableName, $excludedFields = array('ok'
 ) VALUES (';
 
        // Walk through all entries
-       foreach (postRequestArray() as $key=>$value) {
+       foreach (postRequestArray() as $key => $value) {
+               // Log debug message
+               /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ',key=' . $key . ',value=' . $value);
+
                // Add all entries
                if (is_null($value)) {
                        // Add NULL
                        $SQL .= 'NULL,';
-               } elseif ((bigintval($value, true, false) == $value)) {
+               } elseif ('' . bigintval($value, true, false) . '' == '' . $value . '') {
                        // Number detected, no need for ticks (')
                        $SQL .= bigintval($value) . ',';
-               } elseif ('' . (float)$value . '' == $value) {
+               } elseif ('' . (float) $value . '' == '' . $value . '') {
                        // Float number detected
                        $SQL .= sprintf('%01.5f', $value);
                } else {
@@ -199,7 +202,7 @@ function getInsertSqlFromArray ($array, $tableName, $excludedFields = array('ok'
        } // END - foreach
 
        // Finish SQL query
-       $SQL .= ')';
+       $SQL = substr($SQL, 0, -1) . ')';
 
        // Return SQL query
        return $SQL;