X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fdb%2Flib-mysql3.php;h=24fb6e42c869ecb996f84d3904c7ec0d76591213;hp=14a4b6f9cc8cc5078b1a625c018ffa1f84806066;hb=b52976057a73d26d63b6c98a4fc9efb3e07f40e7;hpb=b4021b2ca326afc81c36b420ecfd247a00067bd1

diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index 14a4b6f9cc..24fb6e42c8 100644
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -6,19 +6,18 @@
  * -------------------------------------------------------------------- *
  * File              : lib-mysql3.php                                   *
  * -------------------------------------------------------------------- *
- * Short description : Database layer for MySQL +3.x server             *
+ * Short description : Database layer for MySQL 3/4/5 server            *
  * -------------------------------------------------------------------- *
- * Kurzbeschreibung  : Datenbankschicht fuer MySQL +3.x Server          *
+ * Kurzbeschreibung  : Datenbankschicht fuer MySQL 3/4/5 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 - 2009 by Roland Haeder                           *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2013 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 *
@@ -42,60 +41,69 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // SQL queries
-function SQL_QUERY ($sqlString, $F, $L) {
-	// Trim SQL string
-	$sqlString = trim($sqlString);
-
-	// Link is up?
-	if (!SQL_IS_LINK_UP()) {
-		// We should not quietly ignore this!
-		debug_report_bug(sprintf("Cannot query database: sqlString=%s,file=%s,line=%s",
-			$sqlString,
-			basename($F),
-			$L
-		));
-
-		// Return 'false' because it has failed
-		return false;
-	} elseif (empty($sqlString)) {
-		// Empty SQL string!
-		debug_report_bug(sprintf("SQL string is empty. Please fix this. file=%s, line=%s",
-			basename($F),
-			$L
-		));
-
-		// This is invalid, of course
-		return false;
-	}
+function sqlQuery ($sqlString, $file, $line, $enableCodes = TRUE) {
+	// Is there cache?
+	if (!isset($GLOBALS[__FUNCTION__][$sqlString])) {
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called: ' . $sqlString);
+
+		// Trim SQL string
+		$sqlStringModified = trim($sqlString);
+
+		// Empty query string or link is not up?
+		if (empty($sqlStringModified)) {
+			// Empty SQL string!
+			reportBug(__FUNCTION__, __LINE__, sprintf('SQL string is empty, please fix this: file=%s, line=%s',
+				basename($file),
+				$line
+			));
+		} elseif (!isSqlLinkUp()) {
+			// We should not quietly ignore this
+			reportBug(__FUNCTION__, __LINE__, sprintf('Cannot query database: sqlString=%s,file=%s,line=%s',
+				$sqlStringModified,
+				basename($file),
+				$line
+			));
+		}
+
+		// Remove \t, \n and \r from queries they may confuse some MySQL versions
+		$sqlStringModified = str_replace(array(chr(9), PHP_EOL, chr(13)), array(' ', ' ', ' '), $sqlStringModified);
+
+		// Compile config entries out
+		$sqlStringModified = sqlPrepareQueryString($sqlStringModified, $enableCodes);
 
-	// Remove \t, \n and \r from queries they may confuse some MySQL version I have heard
-	$sqlString = str_replace("\t", ' ', str_replace("\n", ' ', str_replace("\r", ' ', $sqlString)));
+		// Cache it and remember as last SQL query
+		$GLOBALS[__FUNCTION__][$sqlString] = $sqlStringModified;
+		$GLOBALS['last_sql']               = $sqlStringModified;
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Stored cache: ' . $sqlStringModified);
+	} elseif (!isSqlLinkUp()) {
+		// Link went down while using cached SQL
+		reportBug(__FUNCTION__, __LINE__, 'Link went down while using cached SQL: sqlString=' . $sqlString . ',file=' . basename($file) . ',line=' . $line . ',enableCodes=' . intval($enableCodes));
+	} else {
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cache used: ' . $sqlString);
 
-	// Replace {PER}
-	$sqlString = str_replace('{PER}', '%', $sqlString);
+		// Use cache (to save a lot function calls
+		$GLOBALS['last_sql'] = $GLOBALS[__FUNCTION__][$sqlString];
 
-	// Compile config out
-	$sqlString = FILTER_COMPILE_CONFIG($sqlString, true);
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cache is: ' . $sqlString);
+	}
 
 	// Starting time
-	$querytimeBefore = microtime(true);
+	$querytimeBefore = microtime(TRUE);
 
 	// Run SQL command
-	//* DEBUG: */ print('F=' . basename($F) . ',L=' . $L . 'sql=' . htmlentities($sqlString) . '<br />');
-	$result = mysql_query($sqlString, SQL_GET_LINK())
-		or addFatalMessage(__FUNCTION__, __LINE__, $F . ' (' . $L . '):' . mysql_error() . '<br />
-Query string:<br />
-' . $sqlString);
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sql=' . $sqlString . ',numRows=' . SQL_NUMROWS($result) . ',affected=' . SQL_AFFECTEDROWS());
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'file=' . basename($file) . ',line=' . $line . ',sql=' . $GLOBALS['last_sql']);
+	$result = mysql_query($GLOBALS['last_sql'], getSqlLink())
+		or sqlError($file, $line, 'file='. basename($file) . ',line=' . $line . ':mysql_error()=' . mysql_error() . ',last_query=' . $GLOBALS['last_sql']);
+	//* DEBUG: */ logDebugMessage($file, $line, 'sql=' . $GLOBALS['last_sql'] . ',affected=' . sqlAffectedRows() . ',numRows='.(isValidSqlLink($result) ? sqlNumRows($result) : gettype($result)));
 
 	// Calculate query time
-	$queryTime = microtime(true) - $querytimeBefore;
+	$queryTime = microtime(TRUE) - $querytimeBefore;
 
 	// Add this query to array including timing
-	addSqlToDebug($result, $sqlString, $queryTime, $F, $L);
+	addSqlToDebug($result, $GLOBALS['last_sql'], $queryTime, $file, $line);
 
 	// Save last successfull query
-	setConfigEntry('db_last_query', $sqlString);
+	setConfigEntry('db_last_query', $GLOBALS['last_sql']);
 
 	// Count all query times
 	incrementConfigEntry('sql_time', $queryTime);
@@ -104,48 +112,46 @@ Query string:<br />
 	incrementConfigEntry('sql_count');
 
 	// Debug output
-	if ((getOutputMode() != 1) && (isDebugModeEnabled()) && (isConfigEntrySet('DEBUG_SQL')) && (getConfig('DEBUG_SQL') == 'Y')) {
-		//
-		// Debugging stuff...
-		//
-		$fp = fopen(getConfig('CACHE_PATH') . 'mysql.log', 'a') or app_die(__FILE__, __LINE__, 'Cannot write mysql.log!');
+	if (isSqlDebugEnabled()) {
+		// Is this the first call?
 		if (!isset($GLOBALS['sql_first_entry'])) {
 			// Write first entry
-			fwrite($fp, 'Module=' . getModule() . "\n");
-			$GLOBALS['sql_first_entry'] = true;
+			appendLineToFile(getCachePath() . 'mysql.log', 'Module=' . getModule());
+			$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", ' ', $sqlString)) . "\n");
-		fclose($fp);
+
+		// Append debug line
+		appendLineToFile(getCachePath() . 'mysql.log', basename($file) . '|LINE=' . $line . '|NUM=' . (isValidSqlLink($result) ? sqlNumRows($result) : 'false') . '|AFFECTED=' . sqlAffectedRows() . '|QUERYTIME:' . ($queryTime * 1000) . 'ms): ' . str_replace(array(chr(13), PHP_EOL), 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;
 }
 
 // SQL num rows
-function SQL_NUMROWS ($result) {
+function sqlNumRows ($resource) {
+	// Valid link resource?
+	if (!isSqlLinkUp()) return FALSE;
+
 	// Link is not up, no rows by default
-	$lines = false;
+	$lines = FALSE;
 
 	// Is the result a valid resource?
-	if (is_resource($result)) {
+	if (isset($GLOBALS['sql_numrows'][intval($resource)])) {
+		// Use cache
+		$lines = $GLOBALS['sql_numrows'][intval($resource)];
+	} elseif (isValidSqlLink($resource)) {
 		// Get the count of rows from database
-		$lines = mysql_num_rows($result);
+		$lines = mysql_num_rows($resource);
 
-		// Is the result empty? Then we have an error!
-		if (empty($lines)) $lines = '0';
-	} elseif (SQL_IS_LINK_UP()) {
-		// No resource given, no lines found!
-		$lines = '0';
+		// Remember it in cache
+		$GLOBALS['sql_numrows'][intval($resource)] = $lines;
+	} else {
+		// No resource given, please fix this
+		reportBug(__FUNCTION__, __LINE__, 'No resource given! result[]=' . gettype($resource) . ',last_sql=' .  $GLOBALS['last_sql']);
 	}
 
 	// Return lines
@@ -153,394 +159,237 @@ function SQL_NUMROWS ($result) {
 }
 
 // SQL affected rows
-function SQL_AFFECTEDROWS() {
+function sqlAffectedRows () {
 	// Valid link resource?
-	if (!SQL_IS_LINK_UP()) return false;
+	if (!isSqlLinkUp()) return FALSE;
 
 	// Get affected rows
-	$lines = mysql_affected_rows(SQL_GET_LINK());
+	$lines = mysql_affected_rows(getSqlLink());
 
 	// Return it
 	return $lines;
 }
 
 // SQL fetch row
-function SQL_FETCHROW ($result) {
-	// Is a result resource set?
-	if ((!is_resource($result)) || (!SQL_IS_LINK_UP())) return false;
+function sqlFetchRow ($resource) {
+	// Is $resource valid?
+	if ((!isValidSqlLink($resource)) || (!isSqlLinkUp())) return FALSE;
 
 	// Fetch the data and return it
-	return mysql_fetch_row($result);
+	return mysql_fetch_row($resource);
 }
 
 // SQL fetch array
-function SQL_FETCHARRAY ($res, $nr=0, $remove_numerical=true) {
-	// Is a result resource set?
-	if ((!is_resource($res)) || (!SQL_IS_LINK_UP())) return false;
+function sqlFetchArray ($resource) {
+	// Is $resource valid?
+	if ((!isValidSqlLink($resource)) || (!isSqlLinkUp())) return FALSE;
 
-	// Initialize array
-	$row = array();
-
-	// Load row from database
-	$row = mysql_fetch_array($res);
+	// Load row as array from database
+	$row = mysql_fetch_assoc($resource);
 
 	// Return only arrays here
 	if (is_array($row)) {
-		// Shall we remove numerical data here automatically?
-		if ($remove_numerical) {
-			// So let's remove all numerical elements to save memory!
-			$max = count($row);
-			for ($idx = '0'; $idx < ($max / 2); $idx++) {
-				// Remove entry
-				unset($row[$idx]);
-			} // END - for
-		} // END - if
-
 		// Return row
 		return $row;
 	} else {
-		// Return a false here...
-		return false;
+		// Return a false, else some loops would go endless...
+		return FALSE;
 	}
 }
 
 // SQL result
-function SQL_RESULT ($res, $row, $field = '0') {
-	// Is $res valid?
-	if ((!is_resource($res)) || (!SQL_IS_LINK_UP())) return false;
+function sqlResult ($resource, $row, $field = '0') {
+	// Is $resource valid?
+	if ((!isValidSqlLink($resource)) || (!isSqlLinkUp())) return FALSE;
+
+	// Run the result command
+	$result = mysql_result($resource, $row, $field);
 
-	// Run the result command and return the result
-	$result = mysql_result($res, $row, $field);
+	// ... and return the result
 	return $result;
 }
 
 // SQL connect
-function SQL_CONNECT ($host, $login, $password, $F, $L) {
+function sqlConnectToDatabase ($host, $login, $password, $file, $line) {
 	// Try to connect
-	$connect = mysql_connect($host, $login, $password) or addFatalMessage(__FUNCTION__, __LINE__, $F." (".$L."):".mysql_error());
+	$linkResource = mysql_connect($host, $login, $password) or sqlError($file, $line,  mysql_error());
 
 	// Set the link resource
-	SQL_SET_LINK($connect);
+	if (isValidSqlLink($linkResource)) {
+		/*
+		 * A non-resource (boolean) may happen on installation phase which
+		 * shall not be set here. Only valid link resources shall be set so
+		 * isSqlLinkUp() will only return 'true' if there is really a
+		 * working database link.
+		 */
+		setSqlLink($file . ':' . __FUNCTION__, $line . ':' . __LINE__, $linkResource);
+
+		// Init charsets (UTF-8 is default now)
+		sqlQuery("SET
+	`character_set_results`='utf8',
+	`character_set_client`='utf8',
+	`character_set_connection`='utf8',
+	`character_set_database`='utf8',
+	`character_set_server`='utf8'", $file . ':' . __FUNCTION__, $line . ':' . __LINE__);
+	} // END - if
 
-	// Destroy cache
-	unset($GLOBALS['sql_link_res']);
+	// Return the resource
+	//* DEBUG: */ logDebugMessage($file . ':' . __FUNCTION__, $line . ':' . __LINE__, 'linkResource[]=' . gettype($linkResource));
+	return $linkResource;
 }
 
 // SQL select database
-function SQL_SELECT_DB ($dbName, $F, $L) {
+function sqlSelectDatabase ($dbName, $file, $line) {
 	// Is there still a valid link? If not, skip it.
-	if (!SQL_IS_LINK_UP()) return false;
+	if (!isSqlLinkUp()) return FALSE;
 
 	// Return the result
-	return mysql_select_db($dbName, SQL_GET_LINK()) or addFatalMessage(__FUNCTION__, __LINE__, $F." (".$L."):".mysql_error());
+	//* DEBUG: */ logDebugMessage($file . ':' . __FUNCTION__, $line . ':' . __LINE__, 'Selecting database ' . $dbName);
+	return mysql_select_db($dbName, getSqlLink()) or sqlError($file, $line,  mysql_error());
 }
 
 // SQL close link
-function SQL_CLOSE ($F, $L) {
-	if (!SQL_IS_LINK_UP()) {
+function sqlCloseLink ($file, $line) {
+	// Is the link up?
+	if (!isSqlLinkUp()) {
 		// Skip double close
-		return false;
+		//* DEBUG: */ logDebugMessage($file . ':' . __FUNCTION__, $line . ':' . __LINE__, 'Called but no link is open.');
+		return FALSE;
 	} // END - if
 
 	// Close database link and forget the link
-	$close = mysql_close(SQL_GET_LINK())
-		or addFatalMessage(__FUNCTION__, __LINE__, $F . ' (' . $L . '):'.mysql_error());
-
-	// Close link
-	SQL_SET_LINK(null);
+	$close = mysql_close(getSqlLink()) or sqlError($file . ':' . __FUNCTION__, $line . ':' . __LINE__, mysql_error());
 
-	// Destroy cache
-	unset($GLOBALS['sql_link_res']);
+	// Close link in this layer
+	unsetSqlLinkUp(__FUNCTION__, __LINE__);
 
 	// Return the result
+	//* DEBUG: */ logDebugMessage($file . ':' . __FUNCTION__, $line . ':' . __LINE__, 'close[' . gettype($close) . ']=' . intval($close));
 	return $close;
 }
 
 // SQL free result
-function SQL_FREERESULT ($result) {
-	if ((!is_resource($result)) || (!SQL_IS_LINK_UP())) {
+function sqlFreeResult ($resource) {
+	if ((!isValidSqlLink($resource)) || (!isSqlLinkUp())) {
 		// Abort here
-		return false;
+		return FALSE;
 	} // END - if
 
-	$res = mysql_free_result($result);
-	return $res;
-}
+	// Free result
+	$res = mysql_free_result($resource);
 
-// SQL string escaping
-function SQL_QUERY_ESC ($qstring, $data, $F, $L, $run=true, $strip=true, $secure=true) {
-	// Link is there?
-	if ((!SQL_IS_LINK_UP()) || (!is_array($data))) return false;
-
-	// Escape all data
-	$dataSecured['__sql_string'] = $qstring;
-	foreach ($data as $key => $value) {
-		$dataSecured[$key] = SQL_ESCAPE($value, $secure, $strip);
-	} // END - foreach
-
-	// Generate query
-	$query = call_user_func_array('sprintf', $dataSecured);
-
-	// Debugging
-	//
-	//* DEBUG: */ $fp = fopen(getConfig('CACHE_PATH') . '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);
-
-	if ($run === true) {
-		// Run SQL query (default)
-		return SQL_QUERY($query, $F, $L);
-	} else {
-		// Return secured string
-		return $query;
-	}
+	// And return that result of freeing it...
+	return $res;
 }
 
-// Get id from last INSERT command
-function SQL_INSERTID () {
-	if (!SQL_IS_LINK_UP()) return false;
-	return mysql_insert_id();
+// Get id from last INSERT command and secure id
+function getSqlInsertId () {
+	if (!isSqlLinkUp()) return FALSE;
+	return bigintval(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 sqlEscapeString ($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 = sqlPrepareQueryString($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
 
-		if (!SQL_IS_LINK_UP()) {
+		// Init (invalid) value
+		$ret = '!INVALID!';
+
+		if (!isSqlLinkUp()) {
 			// 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
-			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'str='.$str);
-			$ret = mysql_real_escape_string($str, SQL_GET_LINK());
+			$ret = mysql_real_escape_string($str, getSqlLink());
+
+			// 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());
+			$ret = mysql_escape_string($str, getSqlLink());
 		} else {
 			// If nothing else works, fall back to escapeQuotes() again
 			$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
 
-	// Return it
-	return $GLOBALS['sql_escapes'][''.$str.''];
-}
-
-// SELECT query string from table, columns and so on... ;-)
-function SQL_RESULT_FROM_ARRAY ($table, $columns, $idRow, $id, $F, $L) {
-	// Is columns an array?
-	if (!is_array($columns)) {
-		// No array
-		debug_report_bug(sprintf("columns is not an array. %s != array, file=%s, line=%s",
-			gettype($columns),
-			basename($F),
-			$L
-		));
-
-		// Abort here with 'false'
-		return false;
-	} // END  - if
-
-	// 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,
-		array(
-			$table,
-			$idRow,
-			bigintval($id),
-		), $F, $L
-	);
-}
-
-// ALTER TABLE wrapper function
-function SQL_ALTER_TABLE ($sql, $F, $L) {
-	// Abort if link is down
-	if (!SQL_IS_LINK_UP()) return false;
-
-	// This is the default result...
-	$result = false;
-
-	// Determine index/fulltext/unique word
-	$noIndex = (
-	(
-		strpos($sql, 'INDEX') === false
-	) && (
-		strpos($sql, 'KEY') === 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 (((strpos($sql, 'ADD') !== false) || (strpos($sql, 'DROP') !== false)) && ($noIndex === true)) {
-		// Try two columns, one should fix
-		foreach (array(4,5) as $idx) {
-			// And column name as well
-			$columnName = str_replace('`', '', $tableArray[$idx]);
-
-			// Get column information
-			$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') && (strpos($sql, 'ADD') !== false)) || ((SQL_NUMROWS($result) == 1) && (strpos($sql, 'DROP') !== false))) {
-				// Do the query
-				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Executing: ' . $sql);
-				$result = SQL_QUERY($sql, $F, $L, false);
-
-				// Skip further attempt(s)
-				break;
-			} elseif ((((SQL_NUMROWS($result) == 1) && (strpos($sql, 'ADD') !== false)) || ((SQL_NUMROWS($result) == '0') && (strpos($sql, 'DROP') !== false))) && ($columnName != 'KEY')) {
-				// Abort here because it is alreay there
-				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Skipped: ' . $sql);
-				break;
-			} elseif ($columnName != 'KEY') {
-				// Something didn't fit
-				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Possible problem: ' . $sql);
-			}
-		} // END - foreach
-	} elseif ((getConfig('_TABLE_TYPE') == 'InnoDB') && (strpos($sql, 'FULLTEXT') !== false)) {
-		// Skip this query silently
-		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Skipped FULLTEXT: sql=%s,file=%s,line=%s", $sql, $F, $L));
-	} elseif ($noIndex === false) {
-		// And column name as well
-		//* DEBUG: */ print __LINE__.':tableArray=<pre>' . print_r($tableArray, true) . '</pre>';
-		$keyName = str_replace('`', '', $tableArray[5]);
-
-		// Is this "UNIQUE" or so? FULLTEXT has been handled the elseif() block above
-		if (in_array(strtoupper($keyName), array('INDEX', 'UNIQUE', 'KEY', 'FULLTEXT'))) {
-			// Init loop
-			$begin = 1; $keyName = ',';
-			while (strpos($keyName, ',') !== false) {
-				// Use last
-				$keyName = str_replace('`', '', $tableArray[count($tableArray) - $begin]);
-				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $keyName . '----------------' . $begin);
-
-				// Remove brackes
-				$keyName = str_replace('(', '', str_replace(')', '', $keyName));
-				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $keyName . '----------------' . $begin);
-
-				// Continue
-				$begin++;
-			} // END while
-		} // END - if
-
-		// Show indexes
-		$result = SQL_QUERY_ESC("SHOW INDEX FROM `%s`", array($tableName), __FILE__, __LINE__);
+	// Log message
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'str=' . $str . ',sql_escapes=' . $GLOBALS['sql_escapes']['' . $str . '']);
 
-		// Non-skipping is default for ADD
-		$skip = false;
-
-		// But should we DROP?
-		if ($tableArray[3] == 'DROP') {
-			// Then skip if nothing found!
-			$skip = true;
-			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Going to drop key ' . $keyName);
-		} // END - if
-
-		// Walk through all
-		while ($content = SQL_FETCHARRAY($result)) {
-			// Is it found?
-			//* DEBUG: */ print(__LINE__.':columnName='.$keyName.',content=<pre>' . print_r($content, true) . '</pre>');
-			if (($content['Key_name'] == $keyName) && ($tableArray[3] == 'ADD')) {
-				// Skip this query!
-				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("ADD: Skiped: %s", $sql));
-				$skip = true;
-				break;
-			} elseif (($content['Key_name'] == $keyName) && ($tableArray[3] == 'DROP')) {
-				// Don't skip this!
-				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("DROP: Not skiped: %s", $sql));
-				$skip = false;
-				break;
-			}
-		} // END - while
-
-		// Free result
-		SQL_FREERESULT($result);
-
-		// Shall we run it?
-		if ($skip === false) {
-			// Send it to the SQL_QUERY() function
-			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $sql);
-			$result = SQL_QUERY($sql, $F, $L, false);
-		} else {
-			// Not executed
-			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Not executed: ' . $sql);
-		}
-	} else {
-		// Other ALTER TABLE query
-		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $sql);
-		$result = SQL_QUERY($sql, $F, $L, false);
-	}
-
-	// Return result
-	return $result;
+	// Return it
+	return $GLOBALS['sql_escapes']['' . $str . ''];
 }
 
-// Getter for SQL link
-function SQL_GET_LINK () {
-	// Init link
-	$link = null;
+// Log SQL errors to debug.log in installation phase or call reportBug()
+function sqlError ($file, $line, $message) {
+	// Remember plain error in last_sql_error
+	$GLOBALS['last_sql_error'] = mysql_error();
 
-	// Is it in the globals?
-	if (isset($GLOBALS['sql_link'])) {
-		// Then take it
-		$link = $GLOBALS['sql_link'];
+	// Is login set?
+	if (!empty($GLOBALS['mysql']['login'])) {
+		// Secure login name in message
+		$message = str_replace($GLOBALS['mysql']['login'], '***', $message);
 	} // END - if
 
-	// Return it
-	return $link;
-}
-
-// Setter for link
-function SQL_SET_LINK ($link) {
-	// Is this a resource or null?
-	if ((!is_resource($link)) && (!is_null($link))) {
-		// This should never happen!
-		debug_report_bug(sprintf("link is not resource or null. Type: %s", gettype($link)));
+	// Is database password set?
+	if (!empty($GLOBALS['mysql']['password'])) {
+		// Secure password in message
+		$message = str_replace($GLOBALS['mysql']['password'], '***', $message);
 	} // END - if
 
-	// Set it
-	$GLOBALS['sql_link'] = $link;
-}
-
-// Checks if the link is up
-function SQL_IS_LINK_UP () {
-	// Default is not up
-	$linkUp = false;
+	// Is database name set?
+	if (!empty($GLOBALS['mysql']['dbase'])) {
+		// Secure database name in message
+		$message = str_replace($GLOBALS['mysql']['dbase'], '***', $message);
+	} // END - if
 
-	// Do we have cached this?
-	if (isset($GLOBALS['sql_link_res'])) {
-		// Then use this
-		$linkUp = $GLOBALS['sql_link_res'];
+	// Is there installation phase?
+	if (isInstaller()) {
+		/*
+		 * In installation phase, we don't want SQL errors abort e.g. connection
+		 * tests, so just log it away.
+		 */
+		logDebugMessage($file, $line, $message);
 	} else {
-		// Get it
-		$linkUp = is_resource(SQL_GET_LINK());
-
-		// And cache it
-		$GLOBALS['sql_link_res'] = $linkUp;
+		// Regular mode, then call reportBug()
+		reportBug($file, $line, $message);
 	}
+}
 
-	// Return the result
-	return $linkUp;
+// Checks whether given link is a valid SQL link
+function isValidSqlLink ($linkResource) {
+	// Is it a resource?
+	return is_resource($linkResource);
 }
 
 // [EOF]