X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fdb%2Flib-mysql3.php;h=0c2b15b17f24bf7e8715cdf2449928196ea0820a;hp=fc424e00289fab1c11706bc797793a26b238a0da;hb=58b29a924c48e7c1ce38c435c92e541b53984c56;hpb=4d6226782aa4ba157dca8c3891412ba50159481f

diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index fc424e0028..0c2b15b17f 100644
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -39,18 +39,25 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
 }
 
 // SQL queries
-function SQL_QUERY($sql_string, $F, $L, $compile=false)
+function SQL_QUERY($sql_string, $F, $L)
 {
-	global $link, $CSS, $CONFIG, $OK;
+	global $link, $CSS, $_CONFIG, $OK;
+
+	// Remove \t, \n and \r from queries they may confuse some MySQL version I have heard
+	$sql_string = str_replace("\t", " ", str_replace("\n", " ", str_replace("\r", " ", $sql_string)));
 
 	// Run SQL command
 	$result = @mysql_query($sql_string, $link)
-	 or ADD_FATAL($F." (".$L."):".mysql_error()."<BR>
-".MYSQL_QUERY_STRING."<BR>
+	 or ADD_FATAL($F." (".$L."):".mysql_error()."<br />
+".MYSQL_QUERY_STRING."<br />
 ".$sql_string);
 
+	 // Count this query
+	 if (!isset($_CONFIG['sql_count'])) $_CONFIG['sql_count'] = 0;
+	 $_CONFIG['sql_count']++;
+
 	 // Debug output
-	 print "Query=<em>".$sql_string."</em>, affected=<b>".SQL_AFFECTEDROWS()."</b>, numrows=<b>".SQL_NUMROWS($result)."</b><br />\n";
+	 //* DEBUG: */ print "Query=<pre>".$sql_string."</pre>, affected=<b>".SQL_AFFECTEDROWS()."</b>, numrows=<b>".SQL_NUMROWS($result)."</b><br />\n";
 
 	if (($CSS != "1") && ($CSS != "-1") && (DEBUG_MODE) && (DEBUG_SQL))
 	{
@@ -68,15 +75,15 @@ function SQL_QUERY($sql_string, $F, $L, $compile=false)
 	}
 
 	// 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;
 }
@@ -167,27 +174,30 @@ 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, $cacheInstance, $cacheArray;
+	if ((GET_EXT_VERSION("cache") >= "0.0.7") && (isset($_CONFIG['db_hits'])) && (isset($_CONFIG['cache_hits'])) && (is_object($cacheInstance)))
 	{
 		// 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__);
+		$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__);
 
 		// Update cache here
 		if (GET_EXT_VERSION("cache") >= "0.1.2")
 		{
-			if ($CACHE->cache_file("config", true))
+			if ($cacheInstance->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);
+				$cacheInstance->cache_replace("cache_hits", $_CONFIG['cache_hits'], "0", $cacheArray);
+				$cacheInstance->cache_replace("db_hits"   , $_CONFIG['db_hits']   , "0", $cacheArray);
 			}
 		}
 	}