X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fdb%2Flib-mysql3.php;h=0d97094c82d13cc01ddc966b90450e57e7fd62cf;hp=2e8799d9c60dde95b38409806475de94bb47108e;hb=509ae618cc32ba2b811cf66567d62abc597dc405;hpb=5f5a73c72457ea761906640dc3d29749301102f9
diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index 2e8799d9c6..0d97094c82 100644
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -10,7 +10,12 @@
* -------------------------------------------------------------------- *
* Kurzbeschreibung : Datenbankschicht fuer MySQL +3.x Server *
* -------------------------------------------------------------------- *
- * *
+ * $Revision:: $ *
+ * $Date:: $ *
+ * $Tag:: 0.2.1-FINAL $ *
+ * $Author:: $ *
+ * Needs to be in all Files and every File needs "svn propset *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2008 by Roland Haeder *
* For more information visit: http://www.mxchange.org *
@@ -33,30 +38,44 @@
// Some security stuff...
if (!defined('__SECURITY')) {
- $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+ $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
require($INC);
}
// SQL queries
function SQL_QUERY ($sql_string, $F, $L) {
// Link is up?
- if (!SQL_IS_LINK_UP()) return false;
+ if (!SQL_IS_LINK_UP()) {
+ // We should not quietly ignore this!
+ trigger_error(sprintf("Cannot query database: sql_string=%s,file=%s,line=%s",
+ $sql_string,
+ basename($F),
+ $L
+ ));
+
+ // Return 'false' because it has failed
+ return false;
+ } // END - if
// 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)));
// Replace {!_MYSQL_PREFIX!} with constant, closes #84. Thanks to profi-concept
- $sql_string = str_replace("{!_MYSQL_PREFIX!}", constant('_MYSQL_PREFIX'), $sql_string);
+ $sql_string = str_replace("{!_MYSQL_PREFIX!}", getConfig('_MYSQL_PREFIX'), $sql_string);
+
+ // Replace {!_TABLE_TYPE!} with constant
+ $sql_string = str_replace("{!_TABLE_TYPE!}", getConfig('_TABLE_TYPE'), $sql_string);
// Starting time
$querytimeBefore = array_sum(explode(' ', microtime()));
// Run SQL command
- //* DEBUG: */ echo $sql_string."
\n";
+ //* DEBUG: */ print $sql_string."
\n";
$result = mysql_query($sql_string, SQL_GET_LINK())
- or addFatalMessage(__FUNCTION__, __LINE__, $F." (".$L."):".mysql_error()."
+ or addFatalMessage(__FUNCTION__, __LINE__, $F." (".$L."):".mysql_error()."
Query string:
".$sql_string);
+ //* DEBUG: */ print __LINE__ . ': numRows=' . SQL_NUMROWS($result) . ',affected=' . SQL_AFFECTEDROWS() . "
\n";
// Ending time
$querytimeAfter = array_sum(explode(' ', microtime()));
@@ -72,18 +91,17 @@ Query string:
// Debug output
//* DEBUG: */ print "Query=".$sql_string."
, affected=".SQL_AFFECTEDROWS().", numrows=".SQL_NUMROWS($result)."
\n";
-
- if (($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-1") && (isDebugModeEnabled()) && (isBooleanConstantAndTrue('DEBUG_SQL'))) {
+ if ((getOutputMode() != '1') && (getOutputMode() != '-1') && (isDebugModeEnabled()) && (getConfig('DEBUG_SQL') == 'Y')) {
//
// Debugging stuff...
//
- $fp = fopen(constant('PATH')."inc/cache/mysql.log", 'a') or mxchange_die("Cannot write mysql.log!");
+ $fp = fopen(constant('PATH') . 'inc/cache/mysql.log', 'a') or app_die(__FILE__, __LINE__, "Cannot write mysql.log!");
if (!isset($GLOBALS['sql_first_entry'])) {
// Write first entry
- fwrite($fp, "Module=".$GLOBALS['module']."\n");
+ fwrite($fp, 'Module=' . getModule() . "\n");
$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");
+ 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
@@ -129,15 +147,12 @@ function SQL_AFFECTEDROWS() {
}
// SQL fetch row
-function SQL_FETCHROW($result) {
- // Init data
- $DATA = array();
-
+function SQL_FETCHROW ($result) {
// Is a result resource set?
if (!is_resource($result)) return false;
- $DATA = mysql_fetch_row($result);
- return $DATA;
+ // Fetch the data and return it
+ return mysql_fetch_row($result);
}
// SQL fetch array
@@ -155,7 +170,7 @@ function SQL_FETCHARRAY($res, $nr=0, $remove_numerical=true) {
if (is_array($row)) {
// Shall we remove numerical data here automatically?
if ($remove_numerical) {
- // So let's remove all numerical elements to save memory!
+ // So let's remove all numerical elements to save memory!
$max = count($row);
for ($idx = 0; $idx < ($max / 2); $idx++) {
// Remove entry
@@ -172,7 +187,11 @@ function SQL_FETCHARRAY($res, $nr=0, $remove_numerical=true) {
}
// SQL result
-function SQL_RESULT ($res, $row, $field) {
+function SQL_RESULT ($res, $row, $field = 0) {
+ // Is $res valid?
+ if (!is_resource($res)) return false;
+
+ // Run the result command and return the result
$result = mysql_result($res, $row, $field);
return $result;
}
@@ -204,16 +223,17 @@ function SQL_CLOSE ($F, $L) {
// 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($GLOBALS['cache_instance']))) {
+ if ((GET_EXT_VERSION('cache') >= '0.0.7') && (getConfig('db_hits') > 0) && (getConfig('cache_hits') > 0) && (isCacheInstanceValid())) {
// Add new hits
incrementConfigEntry('db_hits', getConfig('db_hits_run'));
// Update counter for db/cache
- UPDATE_CONFIG(array("db_hits", "cache_hits"), array(bigintval(getConfig('db_hits')), bigintval(getConfig('cache_hits'))));
+ updateConfiguration(array('db_hits', 'cache_hits'), array(getConfig('db_hits'), getConfig('cache_hits')));
} // END - if
// Close database link and forget the link
- $close = mysql_close(SQL_GET_LINK()) or addFatalMessage(__FUNCTION__, __LINE__, $F." (".$L."):".mysql_error());
+ $close = mysql_close(SQL_GET_LINK())
+ or addFatalMessage(__FUNCTION__, __LINE__, $F . ' (' . $L . '):'.mysql_error());
// Close link
SQL_SET_LINK(null);
@@ -234,42 +254,48 @@ function SQL_FREERESULT ($result) {
}
// SQL string escaping
-function SQL_QUERY_ESC ($qstring, $data, $F, $L, $run=true, $strip=true) {
+function SQL_QUERY_ESC ($qstring, $data, $F, $L, $run=true, $strip=true, $secure=true) {
// Link is there?
if (!SQL_IS_LINK_UP()) return false;
// Init variable
- $query = "failed";
+ $query = 'failed';
- if ($strip) {
- $strip = "true";
+ if ($strip === true) {
+ $strip = 'true';
} else {
- $strip = "false";
+ $strip = 'false';
+ }
+
+ if ($secure === true) {
+ $secure = 'true';
+ } else {
+ $secure = 'false';
}
$eval = "\$query = sprintf(\"".$qstring."\"";
foreach ($data as $var) {
if ((!empty($var)) || ($var === 0)) {
- $eval .= ", SQL_ESCAPE(\"".$var."\",true,".$strip.")";
+ $eval .= ", SQL_ESCAPE(\"".$var."\", ".$secure.", ".$strip.")";
} else {
$eval .= ", ''";
}
} // END - foreach
$eval .= ");";
- //
+
// Debugging
//
- //* 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: */ $fp = fopen(constant('PATH')."inc/cache/escape_debug.log", 'a') or app_die(__FILE__, __LINE__, "Cannot write debug.log!");
+ //* DEBUG: */ fwrite($fp, $F.'('.$L."): ".str_replace("\r", '', str_replace("\n", " ", $eval))."\n");
//* DEBUG: */ fclose($fp);
// Run the code
eval($eval);
// Was the eval() command fine?
- if ($query == "failed") {
+ if ($query == 'failed') {
// Something went wrong?
- debug_report_bug("eval={$eval}");
+ debug_report_bug('eval=' . $eval);
} // END - if
if ($run === true) {
@@ -320,15 +346,16 @@ function SQL_RESULT_FROM_ARRAY ($table, $columns, $idRow, $id, $F, $L) {
} // END - if
// Prepare the SQL statement
- $sql = "SELECT `".implode("`, `", $columns)."` FROM `{!_MYSQL_PREFIX!}_%s` WHERE ``='%s' LIMIT 1";
+ $sql = "SELECT `".implode("`,`", $columns)."` FROM `{!_MYSQL_PREFIX!}_%s` WHERE `%s`='%s' LIMIT 1";
// Return the result
return SQL_QUERY_ESC($sql,
array(
- bigintval($id),
$table,
- $idRow
- ), $F, $L);
+ $idRow,
+ bigintval($id),
+ ), $F, $L
+ );
}
// ALTER TABLE wrapper function
@@ -337,30 +364,90 @@ function SQL_ALTER_TABLE ($sql, $F, $L) {
$result = false;
// Determine index/fulltext/unique word
- // 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));
+ $noIndex = (
+ (
+ strpos($sql, 'INDEX') === false
+ ) && (
+ strpos($sql, 'FULLTEXT') === false
+ ) && (
+ strpos($sql, 'UNIQUE') === false
+ )
+ );
+
+ // Extract table name
+ $tableArray = explode(" ", $sql);
+ $tableName = str_replace('`', '', $tableArray[2]);
// 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]);
-
+ if (((strpos($sql, 'ADD') !== false) || (strpos($sql, 'DROP') !== false)) && ($noIndex === true)) {
// And column name as well
- $columnName = str_replace("`", "", $tableArray[4]);
+ $columnName = str_replace('`', '', $tableArray[4]);
// Get column information
- $result = SQL_QUERY_ESC("SHOW COLUMNS FROM %s LIKE '%s'",
- array($tableName, $columnName), $F, $L);
+ $result = SQL_QUERY_ESC("SHOW COLUMNS FROM `%s` LIKE '%s'",
+ array($tableName, $columnName), __FILE__, __LINE__);
// 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))) {
+ // 123 4 4 3 3 4 4 32 23 4 4 3 3 4 4 321
+ if (((SQL_NUMROWS($result) == 0) && (strpos($sql, 'ADD') !== false)) || ((SQL_NUMROWS($result) == 1) && (strpos($sql, 'DROP') !== false))) {
// Do the query
+ //* DEBUG: */ print __LINE__.':'.$sql."
\n";
+ $result = SQL_QUERY($sql, $F, $L, false);
+ } // END - if
+ } elseif ((getConfig('_TABLE_TYPE') == 'InnoDB') && (strpos($sql, 'FULLTEXT') !== false)) {
+ // Skip this query silently
+ //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Skipped FULLTEXT: sql=%s,file=%s,line=%s", $sql, $F, $L));
+ } elseif (!$noIndex) {
+ // And column name as well
+ $columnName = str_replace('`', '', $tableArray[4]);
+
+ // Is this "UNIQUE" or so? FULLTEXT has been handled the elseif() block above
+ if (in_array(strtoupper($columnName), array('INDEX', 'UNIQUE', 'KEY', 'FULLTEXT'))) {
+ // Init loop
+ $begin = 1; $columnName = ',';
+ while (strpos($columnName, ',') !== false) {
+ // Use last
+ $columnName = str_replace('`', '', $tableArray[count($tableArray) - $begin]);
+ //* DEBUG: */ print __LINE__.':'.$columnName."----------------".$begin."
\n";
+
+ // Remove brackes
+ $columnName = str_replace('(', '', str_replace(')', '', $columnName));
+ //* DEBUG: */ print __LINE__.':'.$columnName."----------------".$begin."
\n";
+
+ // Continue
+ $begin++;
+ } // END while
+ } // END - if
+
+ // Show indexes
+ $result = SQL_QUERY_ESC("SHOW INDEX FROM `%s`",
+ array($tableName), __FILE__, __LINE__);
+
+ // Walk through all
+ $skip = false;
+ while ($content = SQL_FETCHARRAY($result)) {
+ // Is it found?
+ //* DEBUG: */ print "".print_r($content, true)."
";
+ if (($content['Column_name'] == $columnName) || ($content['Key_name'] == $columnName)) {
+ // Skip this query!
+ //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Skiped: %s", $sql));
+ $skip = true;
+ break;
+ } // END - if
+ } // END - while
+
+ // Free result
+ SQL_FREERESULT($result);
+
+ // Shall we run it?
+ if (!$skip) {
+ // Send it to the SQL_QUERY() function
+ //* DEBUG: */ print __LINE__.':'.$sql."
\n";
$result = SQL_QUERY($sql, $F, $L, false);
} // END - if
} else {
- // Send it to the SQL_QUERY() function
+ // Other ALTER TABLE query
+ //* DEBUG: */ print __LINE__.':'.$sql."
\n";
$result = SQL_QUERY($sql, $F, $L, false);
}