X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fdb%2Flib-mysql3.php;h=bcdf041e3668e2a9bd7d81f7ff254fc03f3de647;hp=50b7189f8358b768cbee03da7fc8115b129c3c5e;hb=bcabdff3613bbc285c600ac5588dcc85356e6d66;hpb=d52156d35605388b7554c31d08bc29f0bb167079
diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index 50b7189f83..bcdf041e36 100644
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -39,10 +39,8 @@ if (!defined('__SECURITY')) {
// SQL queries
function SQL_QUERY ($sql_string, $F, $L) {
- global $link, $CSS, $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)));
@@ -55,7 +53,7 @@ function SQL_QUERY ($sql_string, $F, $L) {
// Run SQL command
//* DEBUG: */ echo $sql_string."
\n";
- $result = mysql_query($sql_string, $link)
+ $result = mysql_query($sql_string, SQL_GET_LINK())
or addFatalMessage($F." (".$L."):".mysql_error()."
Query string:
".$sql_string);
@@ -75,15 +73,15 @@ Query string:
// Debug output
//* DEBUG: */ print "Query=
".$sql_string."
, affected=".SQL_AFFECTEDROWS().", numrows=".SQL_NUMROWS($result)."
\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(constant('PATH')."inc/cache/mysql.log", 'a') or mxchange_die("Cannot write mysql.log!");
- if (!isset($OK)) {
+ if (!isset($GLOBALS['sql_first_entry'])) {
// Write first entry
fwrite($fp, "Module=".$GLOBALS['module']."\n");
- $OK = true;
+ $GLOBALS['sql_first_entry'] = true;
} // END - if
fwrite($fp, $F."(LINE=".$L."|NUM=".SQL_NUMROWS($result)."|AFFECTED=".SQL_AFFECTEDROWS()."|QUERYTIME:".$queryTime."): ".str_replace('\r', "", str_replace('\n', " ", $sql_string))."\n");
fclose($fp);
@@ -120,13 +118,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;
@@ -183,30 +179,32 @@ function SQL_RESULT ($res, $row, $field) {
// 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)) {
+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')."
\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'));
@@ -215,8 +213,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;
}
@@ -233,10 +235,8 @@ function SQL_FREERESULT ($result) {
// SQL string escaping
function SQL_QUERY_ESC ($qstring, $data, $F, $L, $run=true, $strip=true) {
- global $link;
-
// Link is there?
- if (!is_resource($link)) return false;
+ if (!SQL_IS_LINK_UP()) return false;
// Init variable
$query = "failed";
@@ -283,31 +283,28 @@ function SQL_QUERY_ESC ($qstring, $data, $F, $L, $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)) {
+ 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__."(".__LINE__."):str={$str}
\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, fall back to smartAddSlashes()
return smartAddSlashes($str);
@@ -371,5 +368,41 @@ function SQL_ALTER_TABLE ($sql, $F, $L) {
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) {
+ // Is this a resource or null?
+ if ((!is_resource($link)) && (!is_null($link))) {
+ // This should never happen!
+ trigger_error(sprintf("link is not resource or null. Type: %s", gettype($link)));
+ } // END - if
+
+ // Set it
+ $GLOBALS['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));
+}
+
//
?>