Lock reason now saved in DB, deleted accounts shall be locked for re-registering...

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

diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index 1a24f3928997617cc2a11b484fa5edf773e9527e..2f060bbe726e76ff69069e2b4b44d800c8785bc0 100644 (file)
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -51,7 +51,7 @@ function SQL_QUERY($sql_string, $F, $L) {
        //* DEBUG: */ echo $sql_string."<br />\n";
        $result = @mysql_query($sql_string, $link)
         or ADD_FATAL($F." (".$L."):".mysql_error()."<br />
-".MYSQL_QUERY_STRING."<br />
+Query string:<br />
 ".$sql_string);
 
        // Save last successfull query
@@ -197,11 +197,11 @@ function SQL_CLOSE(&$link, $F, $L) {
                // Skip double close
                return false;
        } // END - if
-
-       // Add new hits
-       $_CONFIG['db_hits'] += $_CONFIG['db_hits_run'];
        //* DEBUG: */ echo "DB=".$_CONFIG['db_hits'].",CACHE=".$_CONFIG['cache_hits']."<br />\n";
        if ((GET_EXT_VERSION("cache") >= "0.0.7") && (isset($_CONFIG['db_hits'])) && (isset($_CONFIG['cache_hits'])) && (is_object($cacheInstance))) {
+               // Add new hits
+               $_CONFIG['db_hits'] += $_CONFIG['db_hits_run'];
+
                // Update counter for db/cache
                UPDATE_CONFIG(array("db_hits", "cache_hits"), array(bigintval($_CONFIG['db_hits']), bigintval($_CONFIG['cache_hits'])));
        } // END - if
@@ -285,7 +285,7 @@ function SQL_ESCAPE($str, $secureString=true,$strip=true) {
 
        if (function_exists('mysql_real_escape_string')) {
                // The new and improved version
-               //* DEBUG: */ echo __FUNCTION__.":str={$str}<br />\n";
+               //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):str={$str}<br />\n";
                return mysql_real_escape_string($str, $link);
        } elseif (function_exists('mysql_escape_string')) {
                // The obsulete function