minor SQL rewrites

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

diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index 2f75170617703453414e1df7de6a24971acdd448..8dec70f75c3dec4c4917ce1a64870438b783cc57 100644 (file)
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -41,7 +41,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
 // SQL queries
 function SQL_QUERY($sql_string, $F, $L)
 {
-       global $link, $CSS, $CONFIG, $OK;
+       global $link, $CSS, $_CONFIG, $OK;
 
        // Run SQL command
        $result = @mysql_query($sql_string, $link)
@@ -49,6 +49,13 @@ function SQL_QUERY($sql_string, $F, $L)
 ".MYSQL_QUERY_STRING."<br />
 ".$sql_string);
 
+        // Count this query
+        if (!isset($_CONFIG['sql_count'])) $_CONFIG['sql_count'] = 0;
+        $_CONFIG['sql_count']++;
+
+        // Debug output
+        //* DEBUG: */ print "Query=<em>".$sql_string."</em>, affected=<b>".SQL_AFFECTEDROWS()."</b>, numrows=<b>".SQL_NUMROWS($result)."</b><br />\n";
+
        if (($CSS != "1") && ($CSS != "-1") && (DEBUG_MODE) && (DEBUG_SQL))
        {
                //
@@ -65,15 +72,15 @@ function SQL_QUERY($sql_string, $F, $L)
        }
 
        // Count DB hits
-       if (!isset($CONFIG['db_hits']))
+       if (!isset($_CONFIG['db_hits']))
        {
                // Count in dummy variable
-               $CONFIG['db_hits'] = 0;
+               $_CONFIG['db_hits'] = 0;
        }
         else
        {
                // Count to config array
-               $CONFIG['db_hits']++;
+               $_CONFIG['db_hits']++;
        }
        return $result;
 }
@@ -164,18 +171,21 @@ function SQL_CONNECT($host, $login, $password, $F, $L)
 // SQL select database
 function SQL_SELECT_DB($DB, $link, $F, $L)
 {
-       $DB = @mysql_select_db($DB, $link) or ADD_FATAL($F." (".$L."):".mysql_error());
-       return $DB;
+       $select = false;
+       if (is_resource($link)) {
+               $select = @mysql_select_db($DB, $link) or ADD_FATAL($F." (".$L."):".mysql_error());
+       }
+       return $select;
 }
 // SQL close link
 function SQL_CLOSE($link, $F, $L)
 {
-       global $CONFIG, $CACHE, $CFG_CACHE;
-       if ((GET_EXT_VERSION("cache") >= "0.0.7") && (isset($CONFIG['db_hits'])) && (isset($CONFIG['cache_hits'])) && (is_object($CACHE)))
+       global $_CONFIG, $CACHE, $CFG_CACHE;
+       if ((GET_EXT_VERSION("cache") >= "0.0.7") && (isset($_CONFIG['db_hits'])) && (isset($_CONFIG['cache_hits'])) && (is_object($CACHE)))
        {
                // Update counter for db/cache
                $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_config SET db_hits=%d, cache_hits=%d WHERE config='0' LIMIT 1",
-                       array(bigintval($CONFIG['db_hits']), bigintval($CONFIG['cache_hits'])), __FILE__, __LINE__);
+                       array(bigintval($_CONFIG['db_hits']), bigintval($_CONFIG['cache_hits'])), __FILE__, __LINE__);
 
                // Update cache here
                if (GET_EXT_VERSION("cache") >= "0.1.2")
@@ -183,8 +193,8 @@ function SQL_CLOSE($link, $F, $L)
                        if ($CACHE->cache_file("config", true))
                        {
                                // Replace data
-                               $CACHE->cache_replace("cache_hits", $CONFIG['cache_hits'], "0", $CFG_CACHE);
-                               $CACHE->cache_replace("db_hits"   , $CONFIG['db_hits']   , "0", $CFG_CACHE);
+                               $CACHE->cache_replace("cache_hits", $_CONFIG['cache_hits'], "0", $CFG_CACHE);
+                               $CACHE->cache_replace("db_hits"   , $_CONFIG['db_hits']   , "0", $CFG_CACHE);
                        }
                }
        }