X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fdb%2Flib-mysql3.php;h=afdf53ec76fbeb838e92e6f756b8476663c483ad;hp=3f26d2ce900bba950f1340c7cb8a50e1a851f4d4;hb=fb2e318a47ed99236c9fa63ab94e0c91e805c649;hpb=ae51687a0bf708aeca3d68263320804ae0dd42ef
diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index 3f26d2ce90..afdf53ec76 100644
--- 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
@@ -51,18 +51,18 @@ function SQL_QUERY($sql_string, $F, $L) {
//* DEBUG: */ echo $sql_string."
\n";
$result = @mysql_query($sql_string, $link)
or ADD_FATAL($F." (".$L."):".mysql_error()."
-".MYSQL_QUERY_STRING."
+Query string:
".$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']++;
@@ -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']."
\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
@@ -213,6 +213,11 @@ function SQL_CLOSE(&$link, $F, $L) {
}
// SQL free result
function SQL_FREERESULT($result) {
+ if (!is_resource($result)) {
+ // Abort here
+ return false;
+ } // END - if
+
$res = @mysql_free_result($result);
return $res;
}
@@ -239,10 +244,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?
@@ -280,10 +288,10 @@ 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}
\n";
+ //* DEBUG: */ print __FUNCTION__."(".__LINE__."):str={$str}
\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