Opps ...

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

diff --git a/inc/sql-functions.php b/inc/sql-functions.php
index 75118871d76f1209baddcd6d62cbff808b1cf8c7..fae901b2733c39f2ef10059e8474e31e79648685 100644 (file)
--- a/inc/sql-functions.php
+++ b/inc/sql-functions.php
@@ -136,25 +136,31 @@ function getUpdateSqlFromArray ($array, $tableName, $whereColumn, $whereData, $e
                        continue;
                } // END - if
 
-               // Do we have a non-string (e.g. number, NULL, NOW() or back-tick at the beginning?
+               // Do we have a non-string (e.g. number, NULL, SQL function or back-tick at the beginning?
                if (is_null($multiDimId)) {
                        // 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) == '`'))  {
+                       } elseif ((substr($value, -2, 2) == '()') || (substr($value, 0, 1) == '`')) {
+                               // SQL function needs no ticks (')
+                               $SQL .= '`' . $entry . '`=' . SQL_ESCAPE($value) . ',';
+                       } elseif ('' . bigintval($value, true, false) . '' == '' . $value . '')  {
                                // No need for ticks (')
                                $SQL .= '`' . $entry . '`=' . $value . ',';
                        } else {
                                // Strings need ticks (') around them
-                               $SQL .= '`' . $entry . "`='" . SQL_ESCAPE($value) . "', ";
+                               $SQL .= '`' . $entry . "`='" . SQL_ESCAPE($value) . "',";
                        }
                } else {
                        // Handle multi-dimensional data
                        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) == '`'))  {
+                               $SQL .= '`' . $entry . '`=NULL,';
+                       } elseif ((substr($value[$multiDimId], -2, 2) == '()') || (substr($value[$multiDimId], 0, 1) == '`')) {
+                               // SQL function needs no ticks (')
+                               $SQL .= '`' . $entry . '`=' . SQL_ESCAPE($value[$multiDimId]) . ',';
+                       } elseif (('' . bigintval($value[$multiDimId], true, false) . '' == '' . $value[$multiDimId] . ''))  {
                                // No need for ticks (')
                                $SQL .= '`' . $entry . '`=' . $value[$multiDimId] . ',';
                        } else {
@@ -183,12 +189,15 @@ function getInsertSqlFromArray ($array, $tableName) {
        // Walk through all entries
        foreach (postRequestArray() as $key => $value) {
                // Log debug message
-               /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ',key=' . $key . ',value=' . $value);
+               //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ',key=' . $key . ',value=' . $value);
 
                // Add all entries
                if (is_null($value)) {
                        // Add NULL
                        $SQL .= 'NULL,';
+               } elseif (substr($value, -2, 2) == '()') {
+                       // SQL function needs no ticks (')
+                       $SQL .= SQL_ESCAPE($value) . ',';
                } elseif ('' . bigintval($value, true, false) . '' == '' . $value . '') {
                        // Number detected, no need for ticks (')
                        $SQL .= bigintval($value) . ',';