Reset rewritten, SQL fixed, zeros are now numeric

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

diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index f8eceec4b33efc69e89861f8fd5efbb7769e294b..f09301c9b48e104e4e22049d8b78ce3cb79dbdd5 100644 (file)
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -4,11 +4,11 @@
  * ===============                              Last change: 08/29/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
- * File              : lib.php                                          *
+ * File              : lib-mysql3.php                                   *
  * -------------------------------------------------------------------- *
- * Short description :                                                  *
+ * Short description : Database layer for MySQL +3.x server             *
  * -------------------------------------------------------------------- *
- * Kurzbeschreibung  :                                                  *
+ * Kurzbeschreibung  : Datenbankschicht fuer MySQL +3.x Server          *
  * -------------------------------------------------------------------- *
  *                                                                      *
  * -------------------------------------------------------------------- *
@@ -48,6 +48,7 @@ function SQL_QUERY($sql_string, $F, $L) {
        $querytimeBefore = array_sum(explode(' ', microtime()));
 
        // Run SQL command
+       //* DEBUG: */ echo $sql_string."<br />\n";
        $result = @mysql_query($sql_string, $link)
         or ADD_FATAL($F." (".$L."):".mysql_error()."<br />
 ".MYSQL_QUERY_STRING."<br />
@@ -84,12 +85,12 @@ function SQL_QUERY($sql_string, $F, $L) {
        } // END - if
 
        // Count DB hits
-       if (!isset($_CONFIG['db_hits'])) {
+       if (!isset($_CONFIG['db_hits_run'])) {
                // Count in dummy variable
-               $_CONFIG['db_hits'] = 1;
+               $_CONFIG['db_hits_run'] = 1;
        } else {
                // Count to config array
-               $_CONFIG['db_hits']++;
+               $_CONFIG['db_hits_run']++;
        }
 
        // Return the result
@@ -104,33 +105,44 @@ function SQL_NUMROWS($result) {
                $lines = @mysql_num_rows($result);
 
                // Is the result empty? Then we have an error!
-               if (empty($lines)) $lines = "0";
+               if (empty($lines)) $lines = 0;
        } else {
                // No resource given, no lines found!
-               $lines = "0";
+               $lines = 0;
        }
        return $lines;
 }
 
 // SQL affected rows
-function SQL_AFFECTEDROWS($lnk="x", $F="dummy", $L="dummy") {
+function SQL_AFFECTEDROWS() {
        global $link;
-       // $lnk will be ignored for now!
+
+       // Valid link resource?
+       if (!is_resource($link)) return false;
+
+       // Get affected rows
        $lines = @mysql_affected_rows($link);
+
+       // Return it
        return $lines;
 }
 
 // SQL fetch row
 function SQL_FETCHROW($result) {
+       // Init data
        $DATA = array();
+
+       // Is a result resource set?
+       if (!is_resource($result)) return false;
+
        $DATA = @mysql_fetch_row($result);
        return $DATA;
 }
 
 // SQL fetch array
-function SQL_FETCHARRAY($res=false, $nr=0, $remove_numerical=true) {
+function SQL_FETCHARRAY($res, $nr=0, $remove_numerical=true) {
        // Is a result resource set?
-       if (!$res) return false;
+       if (!is_resource($res)) return false;
 
        // Initialize array
        $row = array();
@@ -178,13 +190,17 @@ function SQL_SELECT_DB($dbName, $link, $F, $L) {
 }
 // SQL close link
 function SQL_CLOSE(&$link, $F, $L) {
+       global $_CONFIG, $cacheInstance, $cacheArray;
+
        // Is there still a valid link?
        if (!is_resource($link)) {
                // Skip double close
                return false;
        } // END - if
 
-       global $_CONFIG, $cacheInstance, $cacheArray;
+       // 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))) {
                // Update counter for db/cache
                UPDATE_CONFIG(array("db_hits", "cache_hits"), array(bigintval($_CONFIG['db_hits']), bigintval($_CONFIG['cache_hits'])));
@@ -203,6 +219,7 @@ function SQL_FREERESULT($result) {
 // SQL string escaping
 function SQL_QUERY_ESC($qstring, $data, $file, $line, $run=true, $strip=true) {
        global $link;
+       $query = "";
        $eval = "\$query = sprintf(\"".$qstring."\"";
        foreach ($data as $var) {
                if ((!empty($var)) || ($var === 0)) {
@@ -219,10 +236,15 @@ function SQL_QUERY_ESC($qstring, $data, $file, $line, $run=true, $strip=true) {
        //
        // Debugging
        //
-       //$fp = fopen(PATH."escape_debug.log", 'a') or mxchange_die("Cannot write debug.log!");
-       //fwrite($fp, $file."(".$line."): ".str_replace('\r', "", str_replace('\n', " ", $eval))."\n");
+       //$fp = fopen(PATH."inc/cache/escape_debug.log", 'a') or mxchange_die("Cannot write debug.log!");
+       //fwrite($fp, $file."(".$line."): ".str_replace("\r", "", str_replace("\n", " ", $eval))."\n");
        //fclose($fp);
-       eval($eval);
+       @eval($eval);
+       if (empty($query)) {
+               print "eval=".htmlentities($eval)."<pre>";
+               debug_print_backtrace();
+               die("</pre>");
+       }
        if ($run) {
                // Run SQL query (default)
                return SQL_QUERY($query, $file, $line);