Extensions 'admins' and 'task' are now always active

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

diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index 221e75955fe408ea91f067857a8a7c7964b1ee0c..3d7f11ca3e9f97e5194904cc4360ee904a6f5a59 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
@@ -54,17 +54,17 @@ function SQL_QUERY($sql_string, $F, $L) {
 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;
+       if (getConfig('sql_count') == null) $_CONFIG['sql_count'] = 0;
        $_CONFIG['sql_count']++;
 
        // Debug output
@@ -85,7 +85,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 {
@@ -197,13 +197,15 @@ 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
@@ -291,7 +293,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