X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fdb%2Flib-mysql3.php;h=61d9be17fa1305e720669059823f380a1851389e;hb=d5ee31ebfc85f22fc691b8c2753c42e188c1c4ef;hp=a49a60f10903333ac939830ce1cda4fed8af0489;hpb=43885129ac24cee5545a8a5ad51e90aa182fdf46;p=mailer.git
diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index a49a60f109..61d9be17fa 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,14 +32,17 @@
************************************************************************/
// 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);
}
// SQL queries
-function SQL_QUERY($sql_string, $F, $L) {
- global $link, $CSS, $_CONFIG, $OK;
+function SQL_QUERY ($sql_string, $F, $L) {
+ global $link, $CSS, $OK;
+
+ // Link is up?
+ if (!is_resource($link)) 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)));
@@ -47,91 +50,110 @@ function SQL_QUERY($sql_string, $F, $L) {
// 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);
+
// Run SQL command
- $result = @mysql_query($sql_string, $link)
- or ADD_FATAL($F." (".$L."):".mysql_error()."
-".MYSQL_QUERY_STRING."
+ //* DEBUG: */ echo $sql_string."
\n";
+ $result = mysql_query($sql_string, $link)
+ or addFatalMessage($F." (".$L."):".mysql_error()."
+Query string:
".$sql_string);
- // Starting time
+ // Ending time
$querytimeAfter = array_sum(explode(' ', microtime()));
// Calculate query time
$queryTime = $querytimeAfter - $querytimeBefore;
+ // Save last successfull query
+ setConfigEntry('db_last_query', $sql_string);
+
// Count this query
- if (!isset($_CONFIG['sql_count'])) $_CONFIG['sql_count'] = 0;
- $_CONFIG['sql_count']++;
+ incrementConfigEntry('sql_count');
// Debug output
- //* DEBUG: */ print "Query=
".$sql_string."
, affected=".SQL_AFFECTEDROWS().", numrows=".SQL_NUMROWS($result)."
\n";
+ //* 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;
- }
+ } // 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 (!isConfigEntrySet('db_hits_run')) {
// Count in dummy variable
- $_CONFIG['db_hits'] = 0;
+ setConfigEntry('db_hits_run', 1);
} else {
// Count to config array
- $_CONFIG['db_hits']++;
+ incrementConfigEntry('db_hits_run');
}
+
+ // Return the result
return $result;
}
// 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
- $lines = @mysql_num_rows($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!
- $lines = @mysql_affected_rows($link);
+
+ // 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();
- $DATA = @mysql_fetch_row($result);
+
+ // 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();
// Load row from database
- $row = @mysql_fetch_array($res);
+ $row = mysql_fetch_array($res);
// Return only arrays here
if (is_array($row)) {
@@ -154,61 +176,78 @@ function SQL_FETCHARRAY($res=false, $nr=0, $remove_numerical=true) {
}
// SQL result
-function SQL_RESULT($res, $row, $field) {
- $result = @mysql_result($res, $row, $field);
+function SQL_RESULT ($res, $row, $field) {
+ $result = mysql_result($res, $row, $field);
return $result;
}
// SQL connect
-function SQL_CONNECT($host, $login, $password, $F, $L) {
- $connect = @mysql_connect($host, $login, $password) or ADD_FATAL($F." (".$L."):".mysql_error());
+function SQL_CONNECT ($host, $login, $password, $F, $L) {
+ $connect = mysql_connect($host, $login, $password) or addFatalMessage($F." (".$L."):".mysql_error());
return $connect;
}
// SQL select database
-function SQL_SELECT_DB($dbName, $link, $F, $L) {
- $select = false;
- if (is_resource($link)) {
- $select = @mysql_select_db($dbName, $link) or ADD_FATAL($F." (".$L."):".mysql_error());
- }
- return $select;
+function SQL_SELECT_DB ($dbName, $link, $F, $L) {
+ // Is there still a valid link? If not, skip it.
+ if (!is_resource($link)) return false;
+
+ return mysql_select_db($dbName, $link) or addFatalMessage($F." (".$L."):".mysql_error());
}
// SQL close link
-function SQL_CLOSE($link, $F, $L) {
- global $_CONFIG, $cacheInstance, $cacheArray;
- if ((GET_EXT_VERSION("cache") >= "0.0.7") && (isset($_CONFIG['db_hits'])) && (isset($_CONFIG['cache_hits'])) && (is_object($cacheInstance))) {
+function SQL_CLOSE (&$link, $F, $L) {
+ global $cacheInstance, $cacheArray;
+
+ if (!is_resource($link)) {
+ // 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))) {
+ // Add new hits
+ incrementConfigEntry('db_hits', getConfig('db_hits_run'));
+
// Update counter for db/cache
- $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_config SET db_hits=%s, cache_hits=%s 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(getConfig('db_hits')), bigintval(getConfig('cache_hits'))));
+ } // END - if
- // Close database link
- $close = @mysql_close($link) or ADD_FATAL($F." (".$L."):".mysql_error());
+ // Close database link and forget the link
+ $close = mysql_close($link) or addFatalMessage($F." (".$L."):".mysql_error());
+ $link = null;
return $close;
}
+
// SQL free result
-function SQL_FREERESULT($result) {
- $res = @mysql_free_result($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) {
+function SQL_QUERY_ESC ($qstring, $data, $file, $line, $run=true, $strip=true) {
global $link;
+
+ // Link is there?
+ if (!is_resource($link)) return false;
+
+ // Init variable
+ $query = "failed";
+
+ if ($strip) {
+ $strip = "true";
+ } else {
+ $strip = "false";
+ }
+
$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 .= ", ''";
}
@@ -217,10 +256,25 @@ 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");
- //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 ($query == "failed") {
+ // Something went wrong?
+ printf("eval=%s\n%s
",
+ htmlentities($eval),
+ debug_get_printable_backtrace()
+ );
+
+ // Abort further code executions
+ exit;
+ } // END - if
+
if ($run) {
// Run SQL query (default)
return SQL_QUERY($query, $file, $line);
@@ -229,18 +283,22 @@ function SQL_QUERY_ESC($qstring, $data, $file, $line, $run=true, $strip=true) {
return $query;
}
}
+
// Get ID from last INSERT command
-function SQL_INSERTID() {
- return @mysql_insert_id();
+function SQL_INSERTID () {
+ global $link;
+ if (!is_resource($link)) return false;
+ return mysql_insert_id();
}
+
// Escape a string for the database
-function SQL_ESCAPE($str, $secureString = true) {
+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);
+ $str = secureString($str, $strip);
} // END - if
if (!is_resource($link)) {
@@ -250,27 +308,47 @@ function SQL_ESCAPE($str, $secureString = true) {
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
+ // The obsolete function
return mysql_escape_string($str, $link);
} else {
// If nothing else works
return addslashes($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) {
+ // Is columns an array?
+ if (!is_array($columns) {
+ // No array
+ trigger_error(sprintf("columns is not array. %s!=array", gettype($columns)));
+ }
+
// Prepare the SQL statement
- $SQL = "SELECT ".implode(", ", $columns)." FROM "._MYSQL_PREFIX."_".$table." WHERE ".$idRow."=%s LIMIT 1";
+ $SQL = "SELECT `".implode("`, `", $columns)."` FROM `{!_MYSQL_PREFIX!}_%s` WHERE ``='%s' LIMIT 1";
// Return the result
- return SQL_QUERY_ESC($SQL, array(bigintval($id)), __FILE__, __LINE__);
+ return SQL_QUERY_ESC($SQL,
+ array(
+ bigintval($id),
+ $table,
+ $idRow
+ ), $F, $L);
}
+
// ALTER TABLE wrapper function
-function SQL_ALTER_TABLE($sql, $F, $L) {
- // Shall we add?
- if (eregi("ADD", $sql) > 0) {
+function SQL_ALTER_TABLE ($sql, $F, $L) {
+ // This is the default result...
+ $result = false;
+
+ // Determine index/fulltext/unique word
+ $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)) {
// Extract table name
$tableArray = explode(" ", $sql);
$tableName = str_replace("`", "", $tableArray[2]);
@@ -280,17 +358,20 @@ function SQL_ALTER_TABLE($sql, $F, $L) {
// Get column information
$result = SQL_QUERY_ESC("SHOW COLUMNS FROM %s LIKE '%s'",
- array($tableName, $columnName), __FILE__, __LINE__);
+ array($tableName, $columnName), $F, $L);
- // Do we have no entry?
- if (SQL_NUMROWS($result) == 0) {
+ // Do we have no entry on ADD or an entry on DROP?
+ if (((SQL_NUMROWS($result) == 0) && (eregi("ADD", $sql) > 0)) || ((SQL_NUMROWS($result) == 1) && (eregi("DROP", $sql) > 0))) {
// Do the query
- return SQL_QUERY($sql, $F, $L, false);
+ $result = SQL_QUERY($sql, $F, $L, false);
} // END - if
} else {
// Send it to the SQL_QUERY() function
- return SQL_QUERY($sql, $F, $L, false);
+ $result = SQL_QUERY($sql, $F, $L, false);
}
+
+ // Return result
+ return $result;
}
//
?>