Some functions rewritten to hungarian notation, handling of array rewritten

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

diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index 2f060bbe726e76ff69069e2b4b44d800c8785bc0..b1104563e55f077ac00535ee7f4ec6f44e5d622f 100644 (file)
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -38,7 +38,7 @@ if (!defined('__SECURITY')) {
 }
 
 // SQL queries
-function SQL_QUERY($sql_string, $F, $L) {
+function SQL_QUERY ($sql_string, $F, $L) {
        global $link, $CSS, $_CONFIG, $OK;
 
        // Remove \t, \n and \r from queries they may confuse some MySQL version I have heard
@@ -50,22 +50,21 @@ function SQL_QUERY($sql_string, $F, $L) {
        // Run SQL command
        //* DEBUG: */ echo $sql_string."<br />\n";
        $result = @mysql_query($sql_string, $link)
-        or ADD_FATAL($F." (".$L."):".mysql_error()."<br />
+        or addFatalMessage($F." (".$L."):".mysql_error()."<br />
 Query string:<br />
 ".$sql_string);
 
-       // Save last successfull query
-       $_CONFIG['db_last_query'] = $sql_string;
-
        // Ending time
        $querytimeAfter = array_sum(explode(' ', microtime()));
 
        // Calculate query time
        $queryTime = $querytimeAfter - $querytimeBefore;
 
+       // Save last successfull query
+       $_CONFIG['db_last_query'] = $sql_string;
+
        // Count this query
-       if (!isset($_CONFIG['sql_count'])) $_CONFIG['sql_count'] = 0;
-       $_CONFIG['sql_count']++;
+       incrementConfigEntry('sql_count');
 
        // Debug output
        //* DEBUG: */ print "Query=<pre>".$sql_string."</pre>, affected=<b>".SQL_AFFECTEDROWS()."</b>, numrows=<b>".SQL_NUMROWS($result)."</b><br />\n";
@@ -85,7 +84,7 @@ Query string:<br />
        } // END - if
 
        // Count DB hits
-       if (!isset($_CONFIG['db_hits_run'])) {
+       if (getConfig('db_hits_run') == null) {
                // Count in dummy variable
                $_CONFIG['db_hits_run'] = 1;
        } else {
@@ -177,14 +176,14 @@ function SQL_RESULT($res, $row, $field) {
 }
 // SQL connect
 function SQL_CONNECT($host, $login, $password, $F, $L) {
-       $connect = @mysql_connect($host, $login, $password) or ADD_FATAL($F." (".$L."):".mysql_error());
+       $connect = @mysql_connect($host, $login, $password) or addFatalMessage($F." (".$L."):".mysql_error());
        return $connect;
 }
 // SQL select database
 function SQL_SELECT_DB($dbName, $link, $F, $L) {
        $select = false;
        if (is_resource($link)) {
-               $select = @mysql_select_db($dbName, $link) or ADD_FATAL($F." (".$L."):".mysql_error());
+               $select = @mysql_select_db($dbName, $link) or addFatalMessage($F." (".$L."):".mysql_error());
        }
        return $select;
 }
@@ -197,17 +196,19 @@ function SQL_CLOSE(&$link, $F, $L) {
                // Skip double close
                return false;
        } // END - if
-       //* 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))) {
+
+       // Do we need to update cache/db counter?
+       //* DEBUG: */ echo "DB=".getConfig('db_hits').",CACHE=".getConfig('cache_hits')."<br />\n";
+       if ((GET_EXT_VERSION("cache") >= "0.0.7") && (getConfig('db_hits') > 0) && (getConfig('cache_hits') > 0) && (is_object($cacheInstance))) {
                // Add new hits
-               $_CONFIG['db_hits'] += $_CONFIG['db_hits_run'];
+               $_CONFIG['db_hits'] += getConfig('db_hits_run');
 
                // Update counter for db/cache
-               UPDATE_CONFIG(array("db_hits", "cache_hits"), array(bigintval($_CONFIG['db_hits']), bigintval($_CONFIG['cache_hits'])));
+               UPDATE_CONFIG(array("db_hits", "cache_hits"), array(bigintval(getConfig('db_hits')), bigintval(getConfig('cache_hits'))));
        } // END - if
 
        // Close database link and forget the link
-       $close = @mysql_close($link) or ADD_FATAL($F." (".$L."):".mysql_error());
+       $close = mysql_close($link) or addFatalMessage($F." (".$L."):".mysql_error());
        $link = null;
        return $close;
 }
@@ -244,10 +245,13 @@ function SQL_QUERY_ESC($qstring, $data, $file, $line, $run=true, $strip=true) {
        //
        // Debugging
        //
-       //$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);
+       //* DEBUG: */ $fp = fopen(PATH."inc/cache/escape_debug.log", 'a') or mxchange_die("Cannot write debug.log!");
+       //* DEBUG: */ fwrite($fp, $file."(".$line."): ".str_replace("\r", "", str_replace("\n", " ", $eval))."\n");
+       //* DEBUG: */ fclose($fp);
+
+       // Run the code
        @eval($eval);
+
        // Was the eval() command fine?
        if (empty($query)) {
                // Something went wrong?
@@ -288,7 +292,7 @@ function SQL_ESCAPE($str, $secureString=true,$strip=true) {
                //* 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
+               // The obsolete function
                return mysql_escape_string($str, $link);
        } else {
                // If nothing else works