X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fdb%2Flib-mysql3.php;h=2f060bbe726e76ff69069e2b4b44d800c8785bc0;hb=d0c792100bf4b67acd1824860204929c1540f6fb;hp=c35c234b1deef967fea965be3c2ffefb1f4031c4;hpb=148d3a3e1641e350a708cc71e194349a09a8285f;p=mailer.git
diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index c35c234b1d..2f060bbe72 100644
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -4,11 +4,11 @@
* =============== Last change: 08/29/2004 *
* *
* -------------------------------------------------------------------- *
- * File : lib.php *
+ * File : lib-mysql3.php *
* -------------------------------------------------------------------- *
- * Short description : *
+ * Short description : Database layer for MySQL +3.x server *
* -------------------------------------------------------------------- *
- * Kurzbeschreibung : *
+ * Kurzbeschreibung : Datenbankschicht fuer MySQL +3.x Server *
* -------------------------------------------------------------------- *
* *
* -------------------------------------------------------------------- *
@@ -32,7 +32,7 @@
************************************************************************/
// Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
+if (!defined('__SECURITY')) {
$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
require($INC);
}
@@ -44,41 +44,56 @@ function SQL_QUERY($sql_string, $F, $L) {
// 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()));
+
// Run SQL command
+ //* 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);
- // Count this query
- if (!isset($_CONFIG['sql_count'])) $_CONFIG['sql_count'] = 0;
- $_CONFIG['sql_count']++;
+ // Save last successfull query
+ $_CONFIG['db_last_query'] = $sql_string;
+
+ // Ending time
+ $querytimeAfter = array_sum(explode(' ', microtime()));
+
+ // Calculate query time
+ $queryTime = $querytimeAfter - $querytimeBefore;
- // Debug output
- //* DEBUG: */ print "Query=
".$sql_string."
, affected=".SQL_AFFECTEDROWS().", numrows=".SQL_NUMROWS($result)."
\n";
+ // Count this query
+ if (!isset($_CONFIG['sql_count'])) $_CONFIG['sql_count'] = 0;
+ $_CONFIG['sql_count']++;
- if (($CSS != "1") && ($CSS != "-1") && (isBooleanConstantAndTrue('DEBUG_MODE')) && (DEBUG_SQL)) {
+ // 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'))) {
//
// Debugging stuff...
//
- $fp = @fopen(PATH."inc/cache/debug.log", 'a') or mxchange_die("Cannot write debug.log!");
+ $fp = @fopen(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");
$OK = true;
- }
- fwrite($fp, $F."(LINE=".$L."|NUM=".SQL_NUMROWS($result)."|AFFECTED=".SQL_AFFECTEDROWS()."): ".str_replace('\r', "", str_replace('\n', " ", $sql_string))."\n");
+ } // 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);
- }
+ } // END - if
// Count DB hits
- if (!isset($_CONFIG['db_hits'])) {
+ if (!isset($_CONFIG['db_hits_run'])) {
// Count in dummy variable
- $_CONFIG['db_hits'] = 0;
+ $_CONFIG['db_hits_run'] = 1;
} else {
// Count to config array
- $_CONFIG['db_hits']++;
+ $_CONFIG['db_hits_run']++;
}
+
+ // Return the result
return $result;
}
@@ -90,33 +105,44 @@ function SQL_NUMROWS($result) {
$lines = @mysql_num_rows($result);
// Is the result empty? Then we have an error!
- if (empty($lines)) $lines = "0";
+ if (empty($lines)) $lines = 0;
} else {
// No resource given, no lines found!
- $lines = "0";
+ $lines = 0;
}
return $lines;
}
// SQL affected rows
-function SQL_AFFECTEDROWS($lnk="x", $F="dummy", $L="dummy") {
+function SQL_AFFECTEDROWS() {
global $link;
- // $lnk will be ignored for now!
+
+ // Valid link resource?
+ if (!is_resource($link)) return false;
+
+ // Get affected rows
$lines = @mysql_affected_rows($link);
+
+ // Return it
return $lines;
}
// SQL fetch row
function SQL_FETCHROW($result) {
+ // Init data
$DATA = array();
+
+ // Is a result resource set?
+ if (!is_resource($result)) return false;
+
$DATA = @mysql_fetch_row($result);
return $DATA;
}
// SQL fetch array
-function SQL_FETCHARRAY($res=false, $nr=0, $remove_numerical=true) {
+function SQL_FETCHARRAY($res, $nr=0, $remove_numerical=true) {
// Is a result resource set?
- if (!$res) return false;
+ if (!is_resource($res)) return false;
// Initialize array
$row = array();
@@ -163,43 +189,53 @@ function SQL_SELECT_DB($dbName, $link, $F, $L) {
return $select;
}
// SQL close link
-function SQL_CLOSE($link, $F, $L) {
+function SQL_CLOSE(&$link, $F, $L) {
global $_CONFIG, $cacheInstance, $cacheArray;
+
+ // Is there still a valid link?
+ if (!is_resource($link)) {
+ // Skip double close
+ return false;
+ } // END - if
+ //* 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
- $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 ($cacheInstance->cache_file("config", true)) {
- // Replace data
- $cacheInstance->cache_replace("cache_hits", $_CONFIG['cache_hits'], "0", $cacheArray);
- $cacheInstance->cache_replace("db_hits" , $_CONFIG['db_hits'] , "0", $cacheArray);
- }
- }
- }
+ UPDATE_CONFIG(array("db_hits", "cache_hits"), array(bigintval($_CONFIG['db_hits']), bigintval($_CONFIG['cache_hits'])));
+ } // END - if
- // Close database link
+ // Close database link and forget the link
$close = @mysql_close($link) or ADD_FATAL($F." (".$L."):".mysql_error());
+ $link = null;
return $close;
}
// SQL free result
function SQL_FREERESULT($result) {
+ if (!is_resource($result)) {
+ // Abort here
+ return false;
+ } // END - if
+
$res = @mysql_free_result($result);
return $res;
}
// SQL string escaping
function SQL_QUERY_ESC($qstring, $data, $file, $line, $run=true, $strip=true) {
global $link;
+
+ if ($strip) {
+ $strip = "true";
+ } else {
+ $strip = "false";
+ }
+
+ $query = "";
$eval = "\$query = sprintf(\"".$qstring."\"";
foreach ($data as $var) {
- if (!empty($var)) {
- if ($strip) {
- $eval .= ", SQL_ESCAPE(\"".strip_tags($var)."\")";
- } else {
- $eval .= ", SQL_ESCAPE(\"".$var."\")";
- }
+ if ((!empty($var)) || ($var === 0)) {
+ $eval .= ", SQL_ESCAPE(\"".$var."\",true,".$strip.")";
} else {
$eval .= ", ''";
}
@@ -208,10 +244,18 @@ function SQL_QUERY_ESC($qstring, $data, $file, $line, $run=true, $strip=true) {
//
// Debugging
//
- //$fp = fopen(PATH."escape_debug.log", 'a') or mxchange_die("Cannot write debug.log!");
- //fwrite($fp, $file."(".$line."): ".str_replace('\r', "", str_replace('\n', " ", $eval))."\n");
+ //$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);
- eval($eval);
+ @eval($eval);
+ // Was the eval() command fine?
+ if (empty($query)) {
+ // Something went wrong?
+ print "eval=".htmlentities($eval)."";
+ debug_print_backtrace();
+ die("
");
+ } // END - if
+
if ($run) {
// Run SQL query (default)
return SQL_QUERY($query, $file, $line);
@@ -225,15 +269,23 @@ function SQL_INSERTID() {
return @mysql_insert_id();
}
// Escape a string for the database
-function SQL_ESCAPE($str) {
+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')) {
// The new and improved version
+ //* DEBUG: */ print __FUNCTION__."(".__LINE__."):str={$str}
\n";
return mysql_real_escape_string($str, $link);
} elseif (function_exists('mysql_escape_string')) {
// The obsulete function
@@ -244,12 +296,37 @@ function SQL_ESCAPE($str) {
}
}
// SELECT query string from table, columns and so on... ;-)
-function SQL_RESULT_FROM_ARRAY ($table, $columns, $idRow, $id) {
+function SQL_RESULT_FROM_ARRAY ($table, $columns, $idRow, $id, $F, $L) {
// Prepare the SQL statement
- $SQL = "SELECT ".implode(", ", $columns)." FROM "._MYSQL_PREFIX."_".$table." WHERE ".$idRow."=%d LIMIT 1";
+ $SQL = "SELECT ".implode(", ", $columns)." FROM "._MYSQL_PREFIX."_".$table." WHERE ".$idRow."=%s LIMIT 1";
// Return the result
- return SQL_QUERY_ESC($SQL, array(bigintval($id)), __FILE__, __LINE__);
+ return SQL_QUERY_ESC($SQL, array(bigintval($id)), $F, $L);
+}
+// ALTER TABLE wrapper function
+function SQL_ALTER_TABLE($sql, $F, $L) {
+ // Shall we add?
+ if (eregi("ADD", $sql) > 0) {
+ // Extract table name
+ $tableArray = explode(" ", $sql);
+ $tableName = str_replace("`", "", $tableArray[2]);
+
+ // And column name as well
+ $columnName = str_replace("`", "", $tableArray[4]);
+
+ // Get column information
+ $result = SQL_QUERY_ESC("SHOW COLUMNS FROM %s LIKE '%s'",
+ array($tableName, $columnName), $F, $L);
+
+ // Do we have no entry?
+ if (SQL_NUMROWS($result) == 0) {
+ // Do the query
+ return SQL_QUERY($sql, $F, $L, false);
+ } // END - if
+ } else {
+ // Send it to the SQL_QUERY() function
+ return SQL_QUERY($sql, $F, $L, false);
+ }
}
//
?>