X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fdb%2Flib-mysql3.php;h=4d7910d0b9254021e2f7d65afb35880ef755ec24;hp=68cdd067ad5fd0c6f8a8f11e871b22585b76dcc7;hb=def1c791b52a6b8b5891539387525c3736f3c24c;hpb=dc25bd7a76750f02e2d617c9db9eb0aae53270f5

diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index 68cdd067ad..4d7910d0b9 100644
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -41,8 +41,8 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // SQL queries
-function SQL_QUERY ($sqlString, $F, $L, $enableCodes = true) {
-	// Do we have cache?
+function SQL_QUERY ($sqlString, $F, $L, $enableCodes = TRUE) {
+	// Is there cache?
 	if (!isset($GLOBALS[__FUNCTION__][$sqlString])) {
 		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called: ' . $sqlString);
 
@@ -52,13 +52,13 @@ function SQL_QUERY ($sqlString, $F, $L, $enableCodes = true) {
 		// Empty query string or link is not up?
 		if (empty($sqlStringModified)) {
 			// Empty SQL string!
-			debug_report_bug(__FUNCTION__, __LINE__, sprintf("SQL string is empty. Please fix this. file=%s, line=%s",
+			reportBug(__FUNCTION__, __LINE__, sprintf("SQL string is empty, please fix this: file=%s, line=%s",
 				basename($F),
 				$L
 			));
 		} elseif (!SQL_IS_LINK_UP()) {
 			// We should not quietly ignore this
-			debug_report_bug(__FUNCTION__, __LINE__, sprintf("Cannot query database: sqlString=%s,file=%s,line=%s",
+			reportBug(__FUNCTION__, __LINE__, sprintf("Cannot query database: sqlString=%s,file=%s,line=%s",
 				$sqlStringModified,
 				basename($F),
 				$L
@@ -66,14 +66,14 @@ function SQL_QUERY ($sqlString, $F, $L, $enableCodes = true) {
 		}
 
 		// Remove \t, \n and \r from queries they may confuse some MySQL versions
-		$sqlStringModified = str_replace("\t", ' ', str_replace("\n", ' ', str_replace("\r", ' ', $sqlStringModified)));
+		$sqlStringModified = str_replace(array(chr(9), chr(10), chr(13)), array(' ', ' ', ' '), $sqlStringModified);
 
 		// Compile config entries out
 		$sqlStringModified = SQL_PREPARE_SQL_STRING($sqlStringModified, $enableCodes);
 
 		// Cache it and remember as last SQL query
 		$GLOBALS[__FUNCTION__][$sqlString] = $sqlStringModified;
-		$GLOBALS['last_sql'] = $sqlStringModified;
+		$GLOBALS['last_sql']               = $sqlStringModified;
 		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Stored cache: ' . $sqlStringModified);
 	}  else {
 		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cache used: ' . $sqlString);
@@ -85,17 +85,16 @@ function SQL_QUERY ($sqlString, $F, $L, $enableCodes = true) {
 	}
 
 	// Starting time
-	$querytimeBefore = microtime(true);
+	$querytimeBefore = microtime(TRUE);
 
 	// Run SQL command
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'F=' . basename($F) . ',L=' . $L . ',sql=' . $GLOBALS['last_sql']);
 	$result = mysql_query($GLOBALS['last_sql'], SQL_GET_LINK())
-		or debug_report_bug($F, $L, 'file='. basename($F) . ',line=' . $L . ':mysql_error()=' . mysql_error() . "\n".
-'Query string:' . $GLOBALS['last_sql']);
+		or SQL_ERROR($F, $L, 'file='. basename($F) . ',line=' . $L . ':mysql_error()=' . mysql_error() . ',last_query=' . $GLOBALS['last_sql']);
 	//* DEBUG: */ logDebugMessage($F, $L, 'sql=' . $GLOBALS['last_sql'] . ',affected=' . SQL_AFFECTEDROWS() . ',numRows='.(is_resource($result) ? SQL_NUMROWS($result) : gettype($result)));
 
 	// Calculate query time
-	$queryTime = microtime(true) - $querytimeBefore;
+	$queryTime = microtime(TRUE) - $querytimeBefore;
 
 	// Add this query to array including timing
 	addSqlToDebug($result, $GLOBALS['last_sql'], $queryTime, $F, $L);
@@ -110,26 +109,20 @@ function SQL_QUERY ($sqlString, $F, $L, $enableCodes = true) {
 	incrementConfigEntry('sql_count');
 
 	// Debug output
-	if ((!isCssOutputMode()) && (isDebugModeEnabled()) && (isSqlDebuggingEnabled())) {
+	if (SQL_DEBUG_ENABLED()) {
 		// Is this the first call?
 		if (!isset($GLOBALS['sql_first_entry'])) {
 			// Write first entry
 			appendLineToFile(getCachePath() . 'mysql.log', 'Module=' . getModule());
-			$GLOBALS['sql_first_entry'] = true;
+			$GLOBALS['sql_first_entry'] = TRUE;
 		} // END - if
 
 		// Append debug line
-		appendLineToFile(getCachePath() . 'mysql.log', basename($F) . '|LINE=' . $L . '|NUM=' . (is_resource($result) ? SQL_NUMROWS($result) : 'false') . '|AFFECTED=' . SQL_AFFECTEDROWS() . '|QUERYTIME:' . $queryTime . '): ' . str_replace("\r", '', str_replace("\n", ' ', $GLOBALS['last_sql'])));
+		appendLineToFile(getCachePath() . 'mysql.log', basename($F) . '|LINE=' . $L . '|NUM=' . (is_resource($result) ? SQL_NUMROWS($result) : 'false') . '|AFFECTED=' . SQL_AFFECTEDROWS() . '|QUERYTIME:' . ($queryTime * 1000) . 'ms): ' . str_replace(array(chr(13), chr(10)), array('', ' '), $GLOBALS['last_sql']));
 	} // END - if
 
-	// Count DB hits
-	if (!isStatsEntrySet('db_hits')) {
-		// Count in dummy variable
-		setStatsEntry('db_hits', 1);
-	} else {
-		// Count to config array
-		incrementStatsEntry('db_hits');
-	}
+	// Increment stats entry
+	incrementStatsEntry('db_hits');
 
 	// Return the result
 	return $result;
@@ -138,13 +131,13 @@ function SQL_QUERY ($sqlString, $F, $L, $enableCodes = true) {
 // SQL num rows
 function SQL_NUMROWS ($resource) {
 	// Valid link resource?
-	if (!SQL_IS_LINK_UP()) return false;
+	if (!SQL_IS_LINK_UP()) return FALSE;
 
 	// Link is not up, no rows by default
-	$lines = false;
+	$lines = FALSE;
 
 	// Is the result a valid resource?
-	if (isset($GLOBALS['sql_numrows'][$resource])) {
+	if (isset($GLOBALS['sql_numrows'][intval($resource)])) {
 		// Use cache
 		$lines = $GLOBALS['sql_numrows'][intval($resource)];
 	} elseif (is_resource($resource)) {
@@ -155,7 +148,7 @@ function SQL_NUMROWS ($resource) {
 		$GLOBALS['sql_numrows'][intval($resource)] = $lines;
 	} else {
 		// No resource given, please fix this
-		debug_report_bug(__FUNCTION__, __LINE__, 'No resource given! result[]=' . gettype($resource) . ',last_sql=' .  $GLOBALS['last_sql']);
+		reportBug(__FUNCTION__, __LINE__, 'No resource given! result[]=' . gettype($resource) . ',last_sql=' .  $GLOBALS['last_sql']);
 	}
 
 	// Return lines
@@ -165,7 +158,7 @@ function SQL_NUMROWS ($resource) {
 // SQL affected rows
 function SQL_AFFECTEDROWS() {
 	// Valid link resource?
-	if (!SQL_IS_LINK_UP()) return false;
+	if (!SQL_IS_LINK_UP()) return FALSE;
 
 	// Get affected rows
 	$lines = mysql_affected_rows(SQL_GET_LINK());
@@ -177,19 +170,19 @@ function SQL_AFFECTEDROWS() {
 // SQL fetch row
 function SQL_FETCHROW ($resource) {
 	// Is a result resource set?
-	if ((!is_resource($resource)) || (!SQL_IS_LINK_UP())) return false;
+	if ((!is_resource($resource)) || (!SQL_IS_LINK_UP())) return FALSE;
 
 	// Fetch the data and return it
 	return mysql_fetch_row($resource);
 }
 
 // SQL fetch array
-function SQL_FETCHARRAY ($res) {
+function SQL_FETCHARRAY ($resource) {
 	// Is a result resource set?
-	if ((!is_resource($res)) || (!SQL_IS_LINK_UP())) return false;
+	if ((!is_resource($resource)) || (!SQL_IS_LINK_UP())) return FALSE;
 
 	// Load row from database
-	$row = mysql_fetch_assoc($res);
+	$row = mysql_fetch_assoc($resource);
 
 	// Return only arrays here
 	if (is_array($row)) {
@@ -197,14 +190,14 @@ function SQL_FETCHARRAY ($res) {
 		return $row;
 	} else {
 		// Return a false, else some loops would go endless...
-		return false;
+		return FALSE;
 	}
 }
 
 // SQL result
 function SQL_RESULT ($resource, $row, $field = '0') {
 	// Is $resource valid?
-	if ((!is_resource($resource)) || (!SQL_IS_LINK_UP())) return false;
+	if ((!is_resource($resource)) || (!SQL_IS_LINK_UP())) return FALSE;
 
 	// Run the result command
 	$result = mysql_result($resource, $row, $field);
@@ -216,33 +209,44 @@ function SQL_RESULT ($resource, $row, $field = '0') {
 // SQL connect
 function SQL_CONNECT ($host, $login, $password, $F, $L) {
 	// Try to connect
-	$linkResource = mysql_connect($host, $login, $password) or debug_report_bug(__FUNCTION__, __LINE__, $F . ' (' . $L . '):' . mysql_error());
+	$linkResource = mysql_connect($host, $login, $password) or SQL_ERROR($F, $L,  mysql_error());
 
 	// Set the link resource
-	SQL_SET_LINK($linkResource);
+	if (is_resource($linkResource)) {
+		/*
+		 * A non-resource (boolean) may happen on installation phase which
+		 * shall not be set here. Only valid link resources shall be set so
+		 * SQL_IS_LINK_UP() will only return 'true' if there is really a
+		 * working database link.
+		 */
+		SQL_SET_LINK($linkResource);
+	} // END - if
+
+	// Return the resource
+	return $linkResource;
 }
 
 // SQL select database
 function SQL_SELECT_DB ($dbName, $F, $L) {
 	// Is there still a valid link? If not, skip it.
-	if (!SQL_IS_LINK_UP()) return false;
+	if (!SQL_IS_LINK_UP()) return FALSE;
 
 	// Return the result
-	return mysql_select_db($dbName, SQL_GET_LINK()) or debug_report_bug(__FUNCTION__, __LINE__, $F . ' (' . $L . '):' . mysql_error());
+	return mysql_select_db($dbName, SQL_GET_LINK()) or SQL_ERROR($F, $L,  mysql_error());
 }
 
 // SQL close link
 function SQL_CLOSE ($F, $L) {
 	if (!SQL_IS_LINK_UP()) {
 		// Skip double close
-		return false;
+		return FALSE;
 	} // END - if
 
 	// Close database link and forget the link
-	$close = mysql_close(SQL_GET_LINK()) or debug_report_bug(__FUNCTION__, __LINE__, $F . ' (' . $L . '):'.mysql_error());
+	$close = mysql_close(SQL_GET_LINK()) or SQL_ERROR($F, $L, mysql_error());
 
 	// Close link
-	SQL_SET_LINK(null);
+	SQL_SET_LINK(NULL);
 
 	// Return the result
 	return $close;
@@ -252,7 +256,7 @@ function SQL_CLOSE ($F, $L) {
 function SQL_FREERESULT ($resource) {
 	if ((!is_resource($resource)) || (!SQL_IS_LINK_UP())) {
 		// Abort here
-		return false;
+		return FALSE;
 	} // END - if
 
 	// Free result
@@ -263,12 +267,20 @@ function SQL_FREERESULT ($resource) {
 }
 
 // SQL string escaping
-function SQL_QUERY_ESC ($sqlString, $data, $F, $L, $run = true, $strip = true, $secure = true) {
+function SQL_QUERY_ESC ($sqlString, $data, $F, $L, $run = TRUE, $strip = TRUE, $secure = TRUE) {
 	// Link is there?
-	if ((!SQL_IS_LINK_UP()) || (!is_array($data))) return false;
+	if ((!SQL_IS_LINK_UP()) || (!is_array($data))) {
+		// Link is down or data is not an array
+		/* DEBUG: */ logDebugMessage($F, $L, 'SQL_IS_LINK_UP()=' . intval(SQL_IS_LINK_UP()) . ',data[]=' . gettype($data) . ',sqlString=' . $sqlString . ': ABORTING!');
+		return FALSE;
+	} // END - if
+
+	// Init array for escape'd data with SQL string
+	$dataSecured = array(
+		'__sql_string' => $sqlString
+	);
 
 	// Escape all data
-	$dataSecured['__sql_string'] = $sqlString;
 	foreach ($data as $key => $value) {
 		$dataSecured[$key] = SQL_ESCAPE($value, $secure, $strip);
 	} // END - foreach
@@ -276,7 +288,7 @@ function SQL_QUERY_ESC ($sqlString, $data, $F, $L, $run = true, $strip = true, $
 	// Generate query
 	$query = call_user_func_array('sprintf', $dataSecured);
 
-	if ($run === true) {
+	if ($run === TRUE) {
 		// Run SQL query (default)
 		return SQL_QUERY($query, $F, $L);
 	} else {
@@ -287,26 +299,50 @@ function SQL_QUERY_ESC ($sqlString, $data, $F, $L, $run = true, $strip = true, $
 
 // Get id from last INSERT command
 function SQL_INSERTID () {
-	if (!SQL_IS_LINK_UP()) 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) {
-	// Do we have cache?
-	if (!isset($GLOBALS['sql_escapes'][''.$str.''])) {
+function SQL_ESCAPE ($str, $secureString = TRUE, $strip = TRUE) {
+	// Is there cache?
+	if (!isset($GLOBALS['sql_escapes']['' . $str . ''])) {
+		// Debug message
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'str=' . $str . ' - BEFORE!');
+
+		// Prepare the string here
+		$str = SQL_PREPARE_SQL_STRING($str);
+
+		// Debug message
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'str=' . $str . ' - AFTER!');
+
 		// Secure string first? (which is the default behaviour!)
-		if ($secureString === true) {
+		if ($secureString === TRUE) {
+			// Debug message
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'str=' . $str . ',strip=' . intval($strip) . ' - BEFORE!');
+
 			// Then do it here
 			$str = secureString($str, $strip);
+
+			// Debug message
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'str=' . $str . ',strip=' . intval($strip) . ' - AFTER!');
 		} // END - if
 
+		// Init (invalid) value
+		$ret = '!INVALID!';
+
 		if (!SQL_IS_LINK_UP()) {
 			// Fall-back to escapeQuotes() when there is no link
 			$ret = escapeQuotes($str);
 		} elseif (function_exists('mysql_real_escape_string')) {
+			// Debug message
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'str=' . $str);
+
 			// The new and improved version
 			$ret = mysql_real_escape_string($str, SQL_GET_LINK());
+
+			// Debug message
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'str=' . $str . ',ret=' . $ret);
 		} elseif (function_exists('mysql_escape_string')) {
 			// The obsolete function
 			$ret = mysql_escape_string($str, SQL_GET_LINK());
@@ -315,12 +351,18 @@ function SQL_ESCAPE ($str, $secureString = true, $strip = true) {
 			$ret = escapeQuotes($str);
 		}
 
+		// Log message
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'str=' . $str . ',ret=' . $ret);
+
 		// Cache result
-		$GLOBALS['sql_escapes'][''.$str.''] = $ret;
+		$GLOBALS['sql_escapes']['' . $str . ''] = $ret;
 	} // END - if
 
+	// Log message
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'str=' . $str . ',sql_escapes=' . $GLOBALS['sql_escapes']['' . $str . '']);
+
 	// Return it
-	return $GLOBALS['sql_escapes'][''.$str.''];
+	return $GLOBALS['sql_escapes']['' . $str . ''];
 }
 
 // SELECT query string from table, columns and so on... ;-)
@@ -328,18 +370,30 @@ function SQL_RESULT_FROM_ARRAY ($table, $columns, $idRow, $id, $F, $L) {
 	// Is columns an array?
 	if (!is_array($columns)) {
 		// No array
-		debug_report_bug(__FUNCTION__, __LINE__, sprintf("columns is not an array. %s != array, file=%s, line=%s",
+		reportBug(__FUNCTION__, __LINE__, sprintf("columns is not an array. %s != array, file=%s, line=%s",
 			gettype($columns),
 			basename($F),
 			$L
 		));
 
 		// Abort here with 'false'
-		return false;
+		return FALSE;
 	} // END  - if
 
-	// Prepare the SQL statement
-	$sql = "SELECT `".implode("`,`", $columns)."` FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`='%s' LIMIT 1";
+	// Is this is a simple array?
+	if ((is_array($columns[0])) && (isset($columns[0]['column']))) {
+		// Begin with SQL query
+		$sql = 'SELECT ';
+
+		// No, it comes from XML, so get it back from it
+		$sql .= getSqlPartFromXmlArray($columns);
+
+		// Finalize it
+		$sql .= " FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`='%s' LIMIT 1";
+	} else {
+		// Yes, prepare the SQL statement
+		$sql = 'SELECT `' . implode('`, `', $columns) . "` FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`='%s' LIMIT 1";
+	}
 
 	// Return the result
 	return SQL_QUERY_ESC($sql,
@@ -352,24 +406,24 @@ function SQL_RESULT_FROM_ARRAY ($table, $columns, $idRow, $id, $F, $L) {
 }
 
 // ALTER TABLE wrapper function
-function SQL_ALTER_TABLE ($sql, $F, $L, $enableCodes = true) {
+function SQL_ALTER_TABLE ($sql, $F, $L, $enableCodes = TRUE) {
 	// Abort if link is down
-	if (!SQL_IS_LINK_UP()) return false;
+	if (!SQL_IS_LINK_UP()) return FALSE;
 
 	// This is the default result...
-	$result = false;
+	$result = FALSE;
 
 	// Determine index/fulltext/unique word
-	$noIndex = (
-	(
-		strpos($sql, 'INDEX') === false
-	) && (
-		strpos($sql, 'KEY') === false
-	) && (
-		strpos($sql, 'FULLTEXT') === false
-	) && (
-		strpos($sql, 'UNIQUE') === false
-	)
+	$isAlterIndex = (
+		(
+			isInString('INDEX', $sql)
+		) || (
+			isInString('KEY', $sql)
+		) || (
+			isInString('FULLTEXT', $sql)
+		) || (
+			isInString('UNIQUE', $sql)
+		)
 	);
 
 	// Extract table name
@@ -377,10 +431,10 @@ function SQL_ALTER_TABLE ($sql, $F, $L, $enableCodes = true) {
 	$tableName = str_replace('`', '', $tableArray[2]);
 
 	// Debug log
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sql=' . $sql . ',tableName=' . $tableName . ',tableArray=<pre>' . print_r($tableArray, true) . '</pre>');
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sql=' . $sql . ',tableName=' . $tableName . ',tableArray=<pre>' . print_r($tableArray, TRUE) . '</pre>,isAlterIndex=' . intval($isAlterIndex));
 
 	// Shall we add/drop?
-	if (((strpos($sql, 'ADD') !== false) || (strpos($sql, 'DROP') !== false) || (strpos($sql, 'CHANGE') !== false)) && ($noIndex === true)) {
+	if (((isInString('ADD', $sql)) || (isInString('DROP', $sql)) || (isInString('CHANGE', $sql))) && ($isAlterIndex === FALSE)) {
 		// Try two columns, one should fix
 		foreach (array(4,5) as $idx) {
 			// If an entry is not set, abort here
@@ -394,52 +448,51 @@ function SQL_ALTER_TABLE ($sql, $F, $L, $enableCodes = true) {
 			$columnName = $tableArray[$idx];
 
 			// Debug log
-			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'columnName=' . $columnName . ',idx=' . $idx . ',sql=' . $sql . ',hasZeroNums=' . intval(isSqlTableColumnFound($tableName, $columnName)));
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'columnName=' . $columnName . ',idx=' . $idx . ',sql=' . $sql . ',hasZeroNums=' . intval(ifSqlColumnExists($tableName, $columnName)));
 
-			// Do we have no entry on ADD or an entry on DROP/CHANGE?
-			// 123                      4                       43    3      4           4          32    23                     4                       43    34      5            5          4    45      6              6          5    5         5    56                      7                          76    6                             654321
-			if (((!isSqlTableColumnFound($tableName, $columnName)) && (strpos($sql, 'ADD') !== false)) || ((isSqlTableColumnFound($tableName, $columnName)) && ((strpos($sql, 'DROP') !== false) || ((strpos($sql, 'CHANGE') !== false) && ($idx == 4) && ((!isSqlTableColumnFound($tableName, $tableArray[5])) || ($columnName == $tableArray[5])))))) {
+			// Is there no entry on ADD or an entry on DROP/CHANGE?
+			if (((!ifSqlColumnExists($tableName, $columnName)) && (isInString('ADD', $sql))) || ((ifSqlColumnExists($tableName, $columnName)) && ((isInString('DROP', $sql)) || ((isInString('CHANGE', $sql)) && ($idx == 4) && ((!ifSqlColumnExists($tableName, $tableArray[5])) || ($columnName == $tableArray[5])))))) {
 				// Do the query
 				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Executing: ' . $sql);
-				$result = SQL_QUERY($sql, $F, $L, false);
+				$result = SQL_QUERY($sql, $F, $L, FALSE);
 
 				// Skip further attempt(s)
 				break;
-			//       1234                     5                       54    4      5           5          43    34                      5                       54    45      6            6          54    4      5              5          432    2                    21
-			} elseif ((((isSqlTableColumnFound($tableName, $columnName)) && (strpos($sql, 'ADD') !== false)) || ((!isSqlTableColumnFound($tableName, $columnName)) && ((strpos($sql, 'DROP') !== false)) || (strpos($sql, 'CHANGE') !== false))) && ($columnName != 'KEY')) {
+			} elseif ((((ifSqlColumnExists($tableName, $columnName)) && (isInString('ADD', $sql))) || ((!ifSqlColumnExists($tableName, $columnName)) && ((isInString('DROP', $sql))) || (isInString('CHANGE', $sql)))) && ($columnName != 'KEY')) {
 				// Abort here because it is alreay there
 				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Skipped: sql=' . $sql . ',columnName=' . $columnName . ',idx=' . $idx);
 				break;
-			} elseif ((!isSqlTableColumnFound($tableName, $columnName)) && (strpos($sql, 'DROP') !== false)) {
+			} elseif ((!ifSqlColumnExists($tableName, $columnName)) && (isInString('DROP', $sql))) {
 				// Abort here because we tried to drop a column which is not there (never created maybe)
 				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'No drop: ' . $sql);
 				break;
 			} elseif ($columnName != 'KEY') {
 				// Something didn't fit, we better log it
-				logDebugMessage(__FUNCTION__, __LINE__, 'Possible problem: ' . $sql . ',hasZeroNums=' . intval(isSqlTableColumnFound($tableName, $columnName)) . '');
+				logDebugMessage(__FUNCTION__, __LINE__, 'Possible problem: ' . $sql . ',hasZeroNums=' . intval(ifSqlColumnExists($tableName, $columnName)) . '');
 			}
 		} // END - foreach
-	} elseif ((getTableType() == 'InnoDB') && (strpos($sql, 'FULLTEXT') !== false)) {
+	} elseif ((getTableType() == 'InnoDB') && (isInString('FULLTEXT', $sql))) {
 		// Skip this query silently because InnoDB does not understand fulltext indexes
-		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Skipped FULLTEXT: sql=%s,tableName=%s,hasZeroNums=%d,file=%s,line=%s", $sql, $tableName, intval((is_bool($result)) ? 0 : isSqlTableColumnFound($columnName)), $F, $L));
-	} elseif ($noIndex === false) {
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Skipped FULLTEXT: sql=%s,tableName=%s,hasZeroNums=%d,file=%s,line=%s", $sql, $tableName, intval((is_bool($result)) ? 0 : ifSqlColumnExists($columnName)), $F, $L));
+	} elseif ($isAlterIndex === TRUE) {
 		// And column name as well without backticks
 		$keyName = str_replace('`', '', $tableArray[5]);
-		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'keyName=' . $keyName . ',tableArray=<pre>' . print_r($tableArray, true) . '</pre>');
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'keyName=' . $keyName . ',tableArray=<pre>' . print_r($tableArray, TRUE) . '</pre>');
 
 		// Is this "UNIQUE" or so? FULLTEXT has been handled the elseif() block above
 		if (in_array(strtoupper($tableArray[4]), array('INDEX', 'UNIQUE', 'KEY', 'FULLTEXT'))) {
 			// Init loop
 			$begin = 1;
 			$keyName = ',';
-			while (strpos($keyName, ',') !== false) {
+			while (isInString(',', $keyName)) {
 				// Use last
+				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'keyName=' . $keyName . 'begin=' . $begin . ' - BEFORE');
 				$keyName = str_replace('`', '', $tableArray[count($tableArray) - $begin]);
-				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $keyName . '----------------' . $begin);
+				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'keyName=' . $keyName . 'begin=' . $begin . ' - BETWEEN');
 
 				// Remove brackes
-				$keyName = str_replace('(', '', str_replace(')', '', $keyName));
-				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $keyName . '----------------' . $begin);
+				$keyName = str_replace(array('(', ')'), array('', ''), $keyName);
+				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'keyName=' . $keyName . 'begin=' . $begin . ' - AFTER');
 
 				// Continue
 				$begin++;
@@ -448,13 +501,13 @@ function SQL_ALTER_TABLE ($sql, $F, $L, $enableCodes = true) {
 
 		// Shall we run it?
 		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ', tableArray[3]=' . $tableArray[3] . ',keyName=' . $keyName);
-		if ((!isSqlTableIndexAdded($tableName, $tableArray[3], $keyName)) && ($tableArray[3] == 'ADD')) {
+		if (($tableArray[3] == 'ADD') && (!isSqlTableIndexFound($tableName, $keyName))) {
 			// Send it to the SQL_QUERY() function to add it
-			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $sql);
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sql=' . $sql . ' - ADDING!');
 			$result = SQL_QUERY($sql, $F, $L, $enableCodes);
-		} elseif ((isSqlTableIndexAdded($tableName, $tableArray[3], $keyName)) && ($tableArray[3] == 'DROP')) {
+		} elseif (($tableArray[3] == 'DROP') && (isSqlTableIndexFound($tableName, $keyName))) {
 			// Send it to the SQL_QUERY() function to drop it
-			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $sql);
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sql=' . $sql . ' - DROPPING!');
 			$result = SQL_QUERY($sql, $F, $L, $enableCodes);
 		} else {
 			// Not executed
@@ -473,7 +526,7 @@ function SQL_ALTER_TABLE ($sql, $F, $L, $enableCodes = true) {
 // Getter for SQL link
 function SQL_GET_LINK () {
 	// Init link
-	$link = null;
+	$link = NULL;
 
 	// Is it in the globals?
 	if (isset($GLOBALS['sql_link'])) {
@@ -493,7 +546,7 @@ function SQL_SET_LINK ($link) {
 		return;
 	} elseif ((!is_resource($link)) && (!is_null($link))) {
 		// This should never happen!
-		debug_report_bug(__FUNCTION__, __LINE__, sprintf("Type of link is not resource or null, type=%s", gettype($link)));
+		reportBug(__FUNCTION__, __LINE__, sprintf("Type of link is not resource or null, type=%s", gettype($link)));
 	} // END - if
 
 	// Set it
@@ -505,23 +558,14 @@ function SQL_SET_LINK ($link) {
 
 // Checks if the link is up
 function SQL_IS_LINK_UP () {
-	// Default is not up
-	$linkUp = false;
-
-	// Do we have cached this?
-	if (isset($GLOBALS['is_sql_link_up'])) {
-		// Then use this
-		$linkUp = $GLOBALS['is_sql_link_up'];
-	} else {
-		// Get it
-		$linkUp = is_resource(SQL_GET_LINK());
-
-		// And cache it
-		$GLOBALS['is_sql_link_up'] = $linkUp;
-	}
+	// Is there cached this?
+	if (!isset($GLOBALS['is_sql_link_up'])) {
+		// Determine it
+		$GLOBALS['is_sql_link_up'] = is_resource(SQL_GET_LINK());
+	} // END - if
 
 	// Return the result
-	return $linkUp;
+	return $GLOBALS['is_sql_link_up'];
 }
 
 // Wrapper function to make code more readable
@@ -537,19 +581,30 @@ function SQL_HASZEROAFFECTED () {
 }
 
 // Private function to prepare the SQL query string
-function SQL_PREPARE_SQL_STRING ($sqlString, $enableCodes = true) {
+function SQL_PREPARE_SQL_STRING ($sqlString, $enableCodes = TRUE) {
+	// Debug message
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlString=' . $sqlString . ',enableCodes=' . intval($enableCodes) . ' - ENTERED!');
+
 	// Is it already cached?
-	if (!isset($GLOBALS['sql_strings'][$sqlString])) {
-		// Compile config+expression code
-		$sqlString2 = FILTER_COMPILE_EXPRESSION_CODE(FILTER_COMPILE_CONFIG($sqlString));
+	if (!isset($GLOBALS['sql_strings']['' . $sqlString . ''])) {
+		// Compile URI codes+config+expression code
+		$sqlString2 = FILTER_COMPILE_EXPRESSION_CODE(FILTER_COMPILE_CONFIG(compileUriCode($sqlString)));
+
+		// Debug message
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlString2=' . $sqlString2);
 
 		// Do final compilation
-		$GLOBALS['sql_strings'][$sqlString] = doFinalCompilation($sqlString2, false, $enableCodes);
-		//die($sqlString.'<br />'.$sqlString2.'<br />'.$GLOBALS['sql_strings'][$sqlString]);
-	} // END - if
+		$GLOBALS['sql_strings']['' . $sqlString . ''] = doFinalCompilation($sqlString2, FALSE, $enableCodes);
+	} else {
+		// Log message
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlString=' . $sqlString . ' - CACHE!');
+	}
+
+	// Debug message
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlString=' . $sqlString . ',enableCodes=' . intval($enableCodes) . ',sql_strings=' . $GLOBALS['sql_strings']['' . $sqlString . ''] . ' - EXIT!');
 
 	// Return it
-	return $GLOBALS['sql_strings'][$sqlString];
+	return $GLOBALS['sql_strings']['' . $sqlString . ''];
 }
 
 // Creates a MySQL TIMESTAMP compatible string from given Uni* timestamp
@@ -557,9 +612,28 @@ function SQL_EPOCHE_TO_TIMESTAMP ($timestamp) {
 	return generateDateTime($timestamp, 7);
 }
 
+// Log SQL errors to debug.log in installation phase or call reportBug()
+function SQL_ERROR ($file, $line, $message) {
+	// Remember plain error in last_sql_error
+	$GLOBALS['last_sql_error'] = mysql_error();
+
+	// Is there installation phase?
+	if (isInstallationPhase()) {
+		/*
+		 * In installation phase, we don't want SQL errors abort e.g. connection
+		 * tests, so just log it away.
+		 */
+		logDebugMessage($file, $line, $message);
+	} else {
+		// Regular mode, then call reportBug()
+		reportBug($file, $line, $message);
+	}
+}
+
 // Check if there is a SQL table created
-function isSqlTableCreated ($tableName) {
-	// Do we have cache?
+function ifSqlTableExists ($tableName) {
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ' - ENTERED!');
+	// Is there cache?
 	if (!isset($GLOBALS[__FUNCTION__][$tableName])) {
 		// Check if the table is there
 		$result = SQL_QUERY_ESC("SHOW TABLES FROM `{?__DB_NAME?}` WHERE `Tables_in_{?__DB_NAME?}`='{?_MYSQL_PREFIX?}_%s'",
@@ -571,19 +645,24 @@ function isSqlTableCreated ($tableName) {
 	} // END - if
 
 	// Return cache
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ',result=' . intval($GLOBALS[__FUNCTION__][$tableName]) . ' - EXIT!');
 	return $GLOBALS[__FUNCTION__][$tableName];
 }
 
 // Is a table column there?
-function isSqlTableColumnFound ($tableName, $columnName) {
-	// Do we have cache?
+function ifSqlColumnExists ($tableName, $columnName) {
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ',columnName=' . $columnName . ' - ENTERED!');
+	// Is there cache?
 	if (!isset($GLOBALS[__FUNCTION__][$tableName][$columnName])) {
 		// And column name as well
 		$columnName = str_replace('`', '', $columnName);
 
 		// Get column information
 		$result = SQL_QUERY_ESC("SHOW COLUMNS FROM `%s` LIKE '%s'",
-			array($tableName, $columnName), __FUNCTION__, __LINE__);
+			array(
+				$tableName,
+				$columnName
+			), __FUNCTION__, __LINE__);
 
 		// Determine it
 		$GLOBALS[__FUNCTION__][$tableName][$columnName] = (!SQL_HASZERONUMS($result));
@@ -594,49 +673,81 @@ function isSqlTableColumnFound ($tableName, $columnName) {
 	} // END - if
 
 	// Return cache
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ',columnName=' . $columnName . ',result=' . intval($GLOBALS[__FUNCTION__][$tableName][$columnName]) . ' - EXIT!');
 	return $GLOBALS[__FUNCTION__][$tableName][$columnName];
 }
 
-// Checks depending on the mode if the table is there
-function isSqlTableIndexAdded ($tableName, $mode, $keyName) {
-	// Do we have cache?
-	if (!isset($GLOBALS[__FUNCTION__][$tableName][$mode])) {
+// Checks depending on the mode if the index is there
+function isSqlTableIndexFound ($tableName, $keyName) {
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ',columnName=' . $keyName . ' - ENTERED!');
+	// Is there cache?
+	if (!isset($GLOBALS[__FUNCTION__][$tableName][$keyName])) {
 		// Show indexes
 		$result = SQL_QUERY_ESC("SHOW INDEX FROM `%s`", array($tableName), __FUNCTION__, __LINE__);
 
-		// Non-skipping is default for ADD
-		$GLOBALS[__FUNCTION__][$tableName][$mode] = false;
-
-		// But should we DROP?
-		if ($mode == 'DROP') {
-			// Then skip if nothing found
-			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Going to drop key ' . $keyName);
-			$GLOBALS[__FUNCTION__][$tableName][$mode] = true;
-		} // END - if
+		// The column is not found by default
+		$GLOBALS[__FUNCTION__][$tableName][$keyName] = FALSE;
 
 		// Walk through all
 		while ($content = SQL_FETCHARRAY($result)) {
-			// Is it found?
-			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'columnName='.$keyName.',content=<pre>' . print_r($content, true) . '</pre>');
-			if (($content['Key_name'] == $keyName) && ($mode == 'ADD')) {
-				// Skip this query!
-				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ADD: Skiped: tableName=' . $tableName . ',mode=' . $mode . ',keyName=' . $keyName);
-				$GLOBALS[__FUNCTION__][$tableName][$mode] = true;
-				break;
-			} elseif (($content['Key_name'] == $keyName) && ($mode == 'DROP')) {
-				// Don't skip this!
-				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'DROP: Not skiped: tableName=' . $tableName . ',mode=' . $mode . ',keyName=' . $keyName);
-				$GLOBALS[__FUNCTION__][$tableName][$mode] = false;
-				break;
-			}
+			// Add all entries for better caching behavior
+			$GLOBALS[__FUNCTION__][$tableName][$content['Key_name']] = TRUE;
 		} // END - while
 
 		// Free result
 		SQL_FREERESULT($result);
+	} else {
+		// Cache used
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ',columnName=' . $keyName . ',result=' . intval($GLOBALS[__FUNCTION__][$tableName][$keyName]) . ' - CACHE!');
 	} // END - if
 
 	// Return cache
-	return $GLOBALS[__FUNCTION__][$tableName][$mode];
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ',columnName=' . $keyName . ',result=' . intval($GLOBALS[__FUNCTION__][$tableName][$keyName]) . ' - EXIT!');
+	return $GLOBALS[__FUNCTION__][$tableName][$keyName];
+}
+
+// Init database layer
+function initDatabaseLayer () {
+	// Set all required variables:
+	$GLOBALS['last_sql_error'] = '';
+}
+
+// Get last SQL error
+function getLastSqlError () {
+	return $GLOBALS['last_sql_error'];
+}
+
+// Gets an array (or false if none is found) from all supported engines
+function getArrayFromSupportedSqlEngines ($support = 'YES') {
+	// Init array
+	$engines = array();
+
+	// This also worked, now we need to check if the selected database type is supported
+	$result = SQL_QUERY('SHOW ENGINES', __FUNCTION__, __LINE__);
+
+	// Are there entries? (Bad if not)
+	if (SQL_NUMROWS($result) > 0) {
+		// Load all and check for active entries
+		while ($content = SQL_FETCHARRAY($result)) {
+			// Is this supported?
+			if (($support == 'ALL') || ($content['Support'] == $support)) {
+				// Add it
+				array_push($engines, $content);
+			} elseif (isDebugModeEnabled()) {
+				// Log it away in debug mode
+				logDebugMessage(__FUNCTION__, __LINE__, 'Engine ' . $content['Engine'] . ' is not supported (' . $content['Supported'] . ')');
+			}
+		} // END - if
+	} else {
+		// No engines! :(
+		$engines = FALSE;
+	}
+
+	// Free result
+	SQL_FREERESULT($result);
+
+	// Return result
+	return $engines;
 }
 
 // [EOF]