X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fdb%2Flib-mysql3.php;h=4492111863fba94c9f3d3f29edc9763e75de89ff;hp=58bdc436b241c7b869fadfe1709d57d813c18dc1;hb=5ae157f2010b3aae3c6f2ecdc6ec7c30b305be4a;hpb=8f60465485bd5e9ab2c0ddfa1f054458cf510042

diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index 58bdc436b2..4492111863 100644
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -39,23 +39,23 @@ if (!defined('__SECURITY')) {
 
 // SQL queries
 function SQL_QUERY ($sql_string, $F, $L) {
-	global $link, $CSS, $OK;
+	global $OK;
 
 	// Link is up?
-	if (!is_resource($link)) return false;
+	if (!SQL_IS_LINK_UP()) return false;
 
 	// 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)));
 
-	// Starting time
-	$querytimeBefore = array_sum(explode(' ', microtime()));
-
 	// Replace {!_MYSQL_PREFIX!} with constant, closes #84. Thanks to profi-concept
 	$sql_string = str_replace("{!_MYSQL_PREFIX!}", constant('_MYSQL_PREFIX'), $sql_string);
 
+	// Starting time
+	$querytimeBefore = array_sum(explode(' ', microtime()));
+
 	// Run SQL command
 	//* DEBUG: */ echo $sql_string."<br />\n";
-	$result = mysql_query($sql_string, $link)
+	$result = mysql_query($sql_string, SQL_GET_LINK())
 	 or addFatalMessage($F." (".$L."):".mysql_error()."<br />
 Query string:<br />
 ".$sql_string);
@@ -75,11 +75,11 @@ Query string:<br />
 	// Debug output
 	//* DEBUG: */ print "Query=<pre>".$sql_string."</pre>, affected=<strong>".SQL_AFFECTEDROWS()."</strong>, numrows=<strong>".SQL_NUMROWS($result)."</strong><br />\n";
 
-	if (($CSS != "1") && ($CSS != "-1") && (isBooleanConstantAndTrue('DEBUG_MODE')) && (isBooleanConstantAndTrue('DEBUG_SQL'))) {
+	if (($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-1") && (isBooleanConstantAndTrue('DEBUG_MODE')) && (isBooleanConstantAndTrue('DEBUG_SQL'))) {
 		//
 		// Debugging stuff...
 		//
-		$fp = @fopen(PATH."inc/cache/mysql.log", 'a') or mxchange_die("Cannot write mysql.log!");
+		$fp = fopen(constant('PATH')."inc/cache/mysql.log", 'a') or mxchange_die("Cannot write mysql.log!");
 		if (!isset($OK)) {
 			// Write first entry
 			fwrite($fp, "Module=".$GLOBALS['module']."\n");
@@ -90,7 +90,7 @@ Query string:<br />
 	} // END - if
 
 	// Count DB hits
-	if (getConfig('db_hits_run') == null) {
+	if (!isConfigEntrySet('db_hits_run')) {
 		// Count in dummy variable
 		setConfigEntry('db_hits_run', 1);
 	} else {
@@ -103,7 +103,7 @@ Query string:<br />
 }
 
 // SQL num rows
-function SQL_NUMROWS($result) {
+function SQL_NUMROWS ($result) {
 	// Is the result a valid resource?
 	if (is_resource($result)) {
 		// Get the count of rows from database
@@ -120,13 +120,11 @@ function SQL_NUMROWS($result) {
 
 // SQL affected rows
 function SQL_AFFECTEDROWS() {
-	global $link;
-
 	// Valid link resource?
-	if (!is_resource($link)) return false;
+	if (!SQL_IS_LINK_UP()) return false;
 
 	// Get affected rows
-	$lines = mysql_affected_rows($link);
+	$lines = mysql_affected_rows(SQL_GET_LINK());
 
 	// Return it
 	return $lines;
@@ -164,8 +162,8 @@ function SQL_FETCHARRAY($res, $nr=0, $remove_numerical=true) {
 			for ($idx = 0; $idx < ($max / 2); $idx++) {
 				// Remove entry
 				unset($row[$idx]);
-			}
-		}
+			} // END - for
+		} // END - if
 
 		// Return row
 		return $row;
@@ -180,30 +178,35 @@ function SQL_RESULT ($res, $row, $field) {
 	$result = mysql_result($res, $row, $field);
 	return $result;
 }
+
 // SQL connect
 function SQL_CONNECT ($host, $login, $password, $F, $L) {
+	// Try to connect
 	$connect = mysql_connect($host, $login, $password) or addFatalMessage($F." (".$L."):".mysql_error());
-	return $connect;
+
+	// Set the link resource
+	SQL_SET_LINK($connect);
 }
+
 // SQL select database
-function SQL_SELECT_DB ($dbName, $link, $F, $L) {
+function SQL_SELECT_DB ($dbName, $F, $L) {
 	// Is there still a valid link? If not, skip it.
-	if (!is_resource($link)) return false;
+	if (!SQL_IS_LINK_UP()) return false;
 
-	return mysql_select_db($dbName, $link) or addFatalMessage($F." (".$L."):".mysql_error());
+	// Return the result
+	return mysql_select_db($dbName, SQL_GET_LINK()) or addFatalMessage($F." (".$L."):".mysql_error());
 }
-// SQL close link
-function SQL_CLOSE (&$link, $F, $L) {
-	global $cacheInstance, $cacheArray;
 
-	if (!is_resource($link)) {
+// SQL close link
+function SQL_CLOSE ($F, $L) {
+	if (!SQL_IS_LINK_UP()) {
 		// Skip double close
 		return false;
 	} // END - if
 
 	// 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))) {
+	if ((GET_EXT_VERSION("cache") >= "0.0.7") && (getConfig('db_hits') > 0) && (getConfig('cache_hits') > 0) && (is_object($GLOBALS['cache_instance']))) {
 		// Add new hits
 		incrementConfigEntry('db_hits', getConfig('db_hits_run'));
 
@@ -212,8 +215,12 @@ function SQL_CLOSE (&$link, $F, $L) {
 	} // END - if
 
 	// Close database link and forget the link
-	$close = mysql_close($link) or addFatalMessage($F." (".$L."):".mysql_error());
-	$link = null;
+	$close = mysql_close(SQL_GET_LINK()) or addFatalMessage($F." (".$L."):".mysql_error());
+
+	// Close link
+	SQL_SET_LINK(null);
+
+	// Return the result
 	return $close;
 }
 
@@ -229,11 +236,9 @@ function SQL_FREERESULT ($result) {
 }
 
 // SQL string escaping
-function SQL_QUERY_ESC ($qstring, $data, $file, $line, $run=true, $strip=true) {
-	global $link;
-
+function SQL_QUERY_ESC ($qstring, $data, $F, $L, $run=true, $strip=true) {
 	// Link is there?
-	if (!is_resource($link)) return false;
+	if (!SQL_IS_LINK_UP()) return false;
 
 	// Init variable
 	$query = "failed";
@@ -251,13 +256,13 @@ function SQL_QUERY_ESC ($qstring, $data, $file, $line, $run=true, $strip=true) {
 		} else {
 			$eval .= ", ''";
 		}
-	}
+	} // END - foreach
 	$eval .= ");";
 	//
 	// Debugging
 	//
-	//* 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: */ $fp = fopen(constant('PATH')."inc/cache/escape_debug.log", 'a') or mxchange_die("Cannot write debug.log!");
+	//* DEBUG: */ fwrite($fp, $F."(".$L."): ".str_replace("\r", "", str_replace("\n", " ", $eval))."\n");
 	//* DEBUG: */ fclose($fp);
 
 	// Run the code
@@ -266,14 +271,12 @@ function SQL_QUERY_ESC ($qstring, $data, $file, $line, $run=true, $strip=true) {
 	// Was the eval() command fine?
 	if ($query == "failed") {
 		// Something went wrong?
-		print "eval=".htmlentities($eval)."<pre>";
-		debug_print_backtrace();
-		die("</pre>");
+		debug_report_bug("eval={$eval}");
 	} // END - if
 
-	if ($run) {
+	if ($run === true) {
 		// Run SQL query (default)
-		return SQL_QUERY($query, $file, $line);
+		return SQL_QUERY($query, $F, $L);
 	} else {
 		// Return secured string
 		return $query;
@@ -282,46 +285,41 @@ function SQL_QUERY_ESC ($qstring, $data, $file, $line, $run=true, $strip=true) {
 
 // Get ID from last INSERT command
 function SQL_INSERTID () {
-	global $link;
-	if (!is_resource($link)) return false;
+	if (!SQL_IS_LINK_UP()) return false;
 	return mysql_insert_id();
 }
 
 // Escape a string for the database
 function SQL_ESCAPE ($str, $secureString=true,$strip=true) {
-	global $link;
-
 	// Secure string first? (which is the default behaviour!)
 	if ($secureString) {
 		// Then do it here
 		$str = secureString($str, $strip);
 	} // END - if
 
-	if (!is_resource($link)) {
-		// Fall-back to addslashes() when there is no link
-		return addslashes($str);
-	} // END - if
-
-	if (function_exists('mysql_real_escape_string')) {
+	if (!SQL_IS_LINK_UP()) {
+		// Fall-back to smartAddSlashes() when there is no link
+		return smartAddSlashes($str);
+	} elseif (function_exists('mysql_real_escape_string')) {
 		// The new and improved version
 		//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):str={$str}<br />\n";
-		return mysql_real_escape_string($str, $link);
+		return mysql_real_escape_string($str, SQL_GET_LINK());
 	} elseif (function_exists('mysql_escape_string')) {
 		// The obsolete function
-		return mysql_escape_string($str, $link);
+		return mysql_escape_string($str, SQL_GET_LINK());
 	} else {
-		// If nothing else works
-		return addslashes($str);
+		// If nothing else works, fall back to smartAddSlashes()
+		return smartAddSlashes($str);
 	}
 }
 
 // SELECT query string from table, columns and so on... ;-)
 function SQL_RESULT_FROM_ARRAY ($table, $columns, $idRow, $id, $F, $L) {
 	// Is columns an array?
-	if (!is_array($columns) {
+	if (!is_array($columns)) {
 		// No array
 		trigger_error(sprintf("columns is not array. %s!=array", gettype($columns)));
-	}
+	} // END  - if
 
 	// Prepare the SQL statement
 	$SQL = "SELECT `".implode("`, `", $columns)."` FROM `{!_MYSQL_PREFIX!}_%s` WHERE ``='%s' LIMIT 1";
@@ -341,7 +339,8 @@ function SQL_ALTER_TABLE ($sql, $F, $L) {
 	$result = false;
 
 	// Determine index/fulltext/unique word
-	$noIndex = ((eregi("INDEX", $sql) == false) && (eregi("FULLTEXT", $sql) == false) && (eregi("UNIQUE", $sql) == false);
+	//         12     3             3         2    2     3                3         2    2     3              3         21
+	$noIndex = ((eregi("INDEX", $sql) == false) && (eregi("FULLTEXT", $sql) == false) && (eregi("UNIQUE", $sql) == false));
 
 	// Shall we add/drop?
 	if (((eregi("ADD", $sql) > 0) || (eregi("DROP", $sql) > 0)) && ($noIndex)) {
@@ -357,6 +356,7 @@ function SQL_ALTER_TABLE ($sql, $F, $L) {
 			array($tableName, $columnName), $F, $L);
 
 		// Do we have no entry on ADD or an entry on DROP?
+		// 123           4       4     3    3     4           4    32    23           4       4     3    3     4            4    321
 		if (((SQL_NUMROWS($result) == 0) && (eregi("ADD", $sql) > 0)) || ((SQL_NUMROWS($result) == 1) && (eregi("DROP", $sql) > 0))) {
 			// Do the query
 			$result = SQL_QUERY($sql, $F, $L, false);
@@ -369,5 +369,36 @@ function SQL_ALTER_TABLE ($sql, $F, $L) {
 	// Return result
 	return $result;
 }
+
+// Getter for SQL link
+function SQL_GET_LINK () {
+	// Init link
+	$link = null;
+
+	// Is it in the globals?
+	if (isset($GLOBALS['sql_link'])) {
+		// Then take it
+		$link = $GLOBALS['sql_link'];
+	} // END - if
+
+	// Return it
+	return $link;
+}
+
+// Setter for link
+function SQL_SET_LINK ($link) {
+	// Set it
+	$GLOABLS['sql_link'] = $link;
+}
+
+// Checks if the link is up
+function SQL_IS_LINK_UP () {
+	// Get the link
+	$link = SQL_GET_LINK();
+
+	// Return the result
+	return (is_resource($link));
+}
+
 //
 ?>