Fix for broken confirmation

[mailer.git] / inc / db / lib-mysql3.php

diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index 67fcdd4e781f3c490dabe5653ba4ac067e94a6da..459eca4e69c020a558e3ae737cbbd1e921d89838 100644 (file)
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // SQL queries
-function SQL_QUERY ($sqlString, $F, $L) {
+function SQL_QUERY ($sqlString, $F, $L, $enableCodes = true) {
        // Trim SQL string
        $sqlString = trim($sqlString);
 
@@ -73,7 +73,7 @@ function SQL_QUERY ($sqlString, $F, $L) {
        $sqlString = str_replace("\t", ' ', str_replace("\n", ' ', str_replace("\r", ' ', $sqlString)));
 
        // Compile config entries out
-       $GLOBALS['last_sql'] = SQL_PREPARE_SQL_STRING($sqlString);
+       $GLOBALS['last_sql'] = SQL_PREPARE_SQL_STRING($sqlString, $enableCodes);
 
        // Starting time
        $querytimeBefore = microtime(true);
@@ -101,7 +101,7 @@ function SQL_QUERY ($sqlString, $F, $L) {
        incrementConfigEntry('sql_count');
 
        // Debug output
-       if ((getScriptOutputMode() != 1) && (isDebugModeEnabled()) && (isSqlDebuggingEnabled())) {
+       if ((!isCssOutputMode()) && (isDebugModeEnabled()) && (isSqlDebuggingEnabled())) {
                //
                // Debugging stuff...
                //
@@ -137,9 +137,15 @@ function SQL_NUMROWS ($resource) {
        $lines = false;
 
        // Is the result a valid resource?
-       if (is_resource($resource)) {
+       if (isset($GLOBALS['sql_numrows'][$resource])) {
+               // Use cache
+               $lines = $GLOBALS['sql_numrows'][intval($resource)];
+       } elseif (is_resource($resource)) {
                // Get the count of rows from database
                $lines = mysql_num_rows($resource);
+
+               // Remember it in cache
+               $GLOBALS['sql_numrows'][intval($resource)] = $lines;
        } else {
                // No resource given, please fix this
                debug_report_bug(__FUNCTION__, __LINE__, 'No resource given! result[]=' . gettype($resource) . ',last_sql=' .  $GLOBALS['last_sql']);
@@ -171,7 +177,7 @@ function SQL_FETCHROW ($resource) {
 }
 
 // SQL fetch array
-function SQL_FETCHARRAY ($res, $nr=0) {
+function SQL_FETCHARRAY ($res) {
        // Is a result resource set?
        if ((!is_resource($res)) || (!SQL_IS_LINK_UP())) return false;
 
@@ -353,7 +359,7 @@ function SQL_RESULT_FROM_ARRAY ($table, $columns, $idRow, $id, $F, $L) {
 }
 
 // ALTER TABLE wrapper function
-function SQL_ALTER_TABLE ($sql, $F, $L) {
+function SQL_ALTER_TABLE ($sql, $F, $L, $enableCodes = true) {
        // Abort if link is down
        if (!SQL_IS_LINK_UP()) return false;
 
@@ -469,7 +475,7 @@ function SQL_ALTER_TABLE ($sql, $F, $L) {
                if ($skip === false) {
                        // Send it to the SQL_QUERY() function
                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $sql);
-                       $result = SQL_QUERY($sql, $F, $L, false);
+                       $result = SQL_QUERY($sql, $F, $L, $enableCodes);
                } else {
                        // Not executed
                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Not executed: ' . $sql);
@@ -477,7 +483,7 @@ function SQL_ALTER_TABLE ($sql, $F, $L) {
        } else {
                // Other ALTER TABLE query
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $sql);
-               $result = SQL_QUERY($sql, $F, $L, false);
+               $result = SQL_QUERY($sql, $F, $L, $enableCodes);
        }
 
        // Return result
@@ -542,14 +548,15 @@ function SQL_HASZERONUMS ($result) {
 }
 
 // Private function to prepare the SQL query string
-function SQL_PREPARE_SQL_STRING ($sqlString) {
+function SQL_PREPARE_SQL_STRING ($sqlString, $enableCodes = true) {
        // Is it already cached?
        if (!isset($GLOBALS['sql_strings'][$sqlString])) {
                // Compile config+expression code
                $sqlString2 = FILTER_COMPILE_EXPRESSION_CODE(FILTER_COMPILE_CONFIG($sqlString));
 
                // Do final compilation
-               $GLOBALS['sql_strings'][$sqlString] = doFinalCompilation($sqlString2, false);
+               $GLOBALS['sql_strings'][$sqlString] = doFinalCompilation($sqlString2, false, $enableCodes);
+               //die($sqlString.'<br />'.$sqlString2.'<br />'.$GLOBALS['sql_strings'][$sqlString]);
        } // END - if
 
        // Return it