X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fdb%2Flib-mysql3.php;h=b0de8af3fce16d60a795825c28db6cd3e09cf18c;hp=67c37e02ef7d37985664e3d2258d2eed35316b03;hb=7b0f17cd637e388049d2167811e4332cec1e979b;hpb=2e9e34b22b8354dba7c0bd699e5486e99a64bc58

diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index 67c37e02ef..b0de8af3fc 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,7 +38,7 @@
 
 // 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);
 }
 
@@ -79,13 +84,13 @@ Query string:<br />
 		//
 		// 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");
 			$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
 
@@ -131,15 +136,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
@@ -174,7 +176,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;
 }
@@ -206,12 +212,12 @@ function SQL_CLOSE ($F, $L) {
 
 	// 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) && (isCacheInstanceValid())) {
+	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(getConfig(('db_hits')), 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
@@ -236,23 +242,29 @@ 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";
 
-	if ($strip) {
+	if ($strip === true) {
 		$strip = "true";
 	} else {
 		$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 .= ", ''";
 		}
@@ -261,8 +273,8 @@ function SQL_QUERY_ESC ($qstring, $data, $F, $L, $run=true, $strip=true) {
 	//
 	// 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
@@ -322,7 +334,7 @@ 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' LIMIT 1";
 
 	// Return the result
 	return SQL_QUERY_ESC($sql,
@@ -339,30 +351,83 @@ 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));
+	//         12    3             3         2    2    3                3         2    2    3              3         21
+	$noIndex = ((ereg("INDEX", $sql) == false) && (ereg("FULLTEXT", $sql) == false) && (ereg("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]);
+	// Extract table name
+	$tableArray = explode(" ", $sql);
+	$tableName = str_replace("`", '', $tableArray[2]);
 
+	// Shall we add/drop?
+	if (((ereg("ADD", $sql)) || (ereg("DROP", $sql))) && ($noIndex)) {
 		// 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);
+			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           432    23           4       4     3    3    4            4321
+		if (((SQL_NUMROWS($result) == 0) && (ereg("ADD", $sql))) || ((SQL_NUMROWS($result) == 1) && (ereg("DROP", $sql)))) {
 			// Do the query
+			//* DEBUG: */ print __LINE__.':'.$sql."<br />\n";
+			$result = SQL_QUERY($sql, $F, $L, false);
+		} // END - if
+	} elseif ((constant('_TABLE_TYPE') == "InnoDB") && (ereg("FULLTEXT", $sql))) {
+		// 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."<br />\n";
+
+				// Remove brackes
+				$columnName = str_replace("(", '', str_replace(")", '', $columnName));
+				//* DEBUG: */ print __LINE__.':'.$columnName."----------------".$begin."<br />\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 "<pre>".print_r($content, true)."</pre>";
+			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."<br />\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."<br />\n";
 		$result = SQL_QUERY($sql, $F, $L, false);
 	}