X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fsql-functions.php;h=267dcb4fb8be6e4f4fb43a12a1e47c2dc0070bba;hp=9fe8259c59a29929bda8830dbdbe411f687fcabe;hb=49acdb7a7adbcf25a8e8683b5581bfcec72b23bd;hpb=ca256746fe0757a23df4064824c8fe2087ad5634

diff --git a/inc/sql-functions.php b/inc/sql-functions.php
index 9fe8259c59..267dcb4fb8 100644
--- a/inc/sql-functions.php
+++ b/inc/sql-functions.php
@@ -10,13 +10,8 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : SQL-Funktionen fuer Queries                      *
  * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2015 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -69,7 +64,7 @@ function getSqls () {
 
 // Add an SQL to the list
 function addSql ($sql) {
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("sql=%s, count=%d", $sql, countSqls()));
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf('sql=%s, count=%d', $sql, countSqls()));
 	array_push($GLOBALS['sqls']['generic'], $sql);
 }
 
@@ -106,7 +101,7 @@ function countSqls () {
 	if (isSqlsInitialized()) {
 		// Then count it
 		$count = count($GLOBALS['sqls']);
-		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("count=%d", $count));
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf('count=%d', $count));
 	} // END - if
 
 	// Return it
@@ -114,7 +109,7 @@ function countSqls () {
 }
 
 // Checks whether the SQLs array is filled
-function isSqlsValid () {
+function ifSqlsRegistered () {
 	//* DEBUG: */ debugOutput(__FUNCTION__ . ':' . intval(isSqlsInitialized()) . '/' . countSqls() . '/' . getCurrentExtensionName());
 	return (
 		(
@@ -145,7 +140,7 @@ function getUpdateSqlFromArray ($array, $tableName, $whereColumn, $whereData, $e
 				$SQL .= '`' . $entry . '`=NULL,';
 			} elseif ((substr($value, -2, 2) == '()') || (substr($value, 0, 1) == '`')) {
 				// SQL function needs no ticks (')
-				$SQL .= '`' . $entry . '`=' . SQL_ESCAPE($value) . ',';
+				$SQL .= '`' . $entry . '`=' . sqlEscapeString($value) . ',';
 			} elseif ('' . bigintval($value, TRUE, FALSE) . '' == '' . $value . '')  {
 				// No need for ticks (')
 				$SQL .= '`' . $entry . '`=' . $value . ',';
@@ -154,7 +149,7 @@ function getUpdateSqlFromArray ($array, $tableName, $whereColumn, $whereData, $e
 				$SQL .= '`' . $entry . '`=' . sprintf(getConfig('FLOAT_MASK'), $value) . ',';
 			} else {
 				// Strings need ticks (') around them
-				$SQL .= '`' . $entry . "`='" . SQL_ESCAPE($value) . "',";
+				$SQL .= '`' . $entry . "`='" . sqlEscapeString($value) . "',";
 			}
 		} else {
 			// Handle multi-dimensional data
@@ -163,7 +158,7 @@ function getUpdateSqlFromArray ($array, $tableName, $whereColumn, $whereData, $e
 				$SQL .= '`' . $entry . '`=NULL,';
 			} elseif ((substr($value[$multiDimId], -2, 2) == '()') || (substr($value[$multiDimId], 0, 1) == '`')) {
 				// SQL function needs no ticks (')
-				$SQL .= '`' . $entry . '`=' . SQL_ESCAPE($value[$multiDimId]) . ',';
+				$SQL .= '`' . $entry . '`=' . sqlEscapeString($value[$multiDimId]) . ',';
 			} elseif (('' . bigintval($value[$multiDimId], TRUE, FALSE) . '' == '' . $value[$multiDimId] . ''))  {
 				// No need for ticks (')
 				$SQL .= '`' . $entry . '`=' . $value[$multiDimId] . ',';
@@ -172,7 +167,7 @@ function getUpdateSqlFromArray ($array, $tableName, $whereColumn, $whereData, $e
 				$SQL .= '`' . $entry . '`=' . sprintf(getConfig('FLOAT_MASK'), $value[$multiDimId]) . ',';
 			} else {
 				// Strings need ticks (') around them
-				$SQL .= '`' . $entry . "`='" . SQL_ESCAPE($value[$multiDimId]) . "',";
+				$SQL .= '`' . $entry . "`='" . sqlEscapeString($value[$multiDimId]) . "',";
 			}
 		}
 	} // END - foreach
@@ -200,7 +195,7 @@ function getInsertSqlFromArray ($array, $tableName) {
 			$SQL .= 'NULL,';
 		} elseif (substr($value, -2, 2) == '()') {
 			// SQL function needs no ticks (')
-			$SQL .= SQL_ESCAPE($value) . ',';
+			$SQL .= sqlEscapeString($value) . ',';
 		} elseif ('' . bigintval($value, TRUE, FALSE) . '' == '' . $value . '') {
 			// Number detected, no need for ticks (')
 			$SQL .= bigintval($value) . ',';
@@ -209,7 +204,7 @@ function getInsertSqlFromArray ($array, $tableName) {
 			$SQL .= sprintf(getConfig('FLOAT_MASK'), $value) . ',';
 		} else {
 			// Everything else might be a string, so add ticks around it
-			$SQL .= chr(39) . SQL_ESCAPE($value) . chr(39) . ',';
+			$SQL .= chr(39) . sqlEscapeString($value) . chr(39) . ',';
 		}
 	} // END - foreach
 
@@ -222,10 +217,10 @@ function getInsertSqlFromArray ($array, $tableName) {
 }
 
 // Function to unset __is_sql_link_up
-function unsetSqlLinkUp ($F, $L) {
+function unsetSqlLinkUp ($file, $line) {
 	// Unset it
-	//* DEBUG: */ logDebugMessage($F, $L, __FUNCTION__ . ': Called!');
-	SQL_SET_LINK($F, $L, NULL);
+	//* DEBUG: */ logDebugMessage($file, $line, __FUNCTION__ . ': Called!');
+	setSqlLink($file, $line, NULL);
 }
 
 // Initializes the SQL link by bringing it up if set
@@ -233,24 +228,21 @@ function initSqlLink () {
 	// "Unset" the link
 	unsetSqlLinkUp(__FUNCTION__, __LINE__);
 
-	// Do this only if link is down
-	assert(!SQL_IS_LINK_UP());
-
 	// Is the configuration data set?
 	if ((!empty($GLOBALS['mysql']['host'])) && (!empty($GLOBALS['mysql']['login'])) && (!empty($GLOBALS['mysql']['dbase']))) {
 		// Remove cache
 		unsetSqlLinkUp(__FUNCTION__, __LINE__);
 
 		// Connect to DB
-		SQL_CONNECT($GLOBALS['mysql']['host'], $GLOBALS['mysql']['login'], $GLOBALS['mysql']['password'], __FUNCTION__, __LINE__);
+		sqlConnectToDatabase($GLOBALS['mysql']['host'], $GLOBALS['mysql']['login'], $GLOBALS['mysql']['password'], __FUNCTION__, __LINE__);
 
 		// Is the link valid?
-		if (SQL_IS_LINK_UP()) {
+		if (isSqlLinkUp()) {
 			// Enable exit on error
 			enableExitOnError();
 
 			// Is it a valid resource?
-			if (SQL_SELECT_DB($GLOBALS['mysql']['dbase'], __FUNCTION__, __LINE__) === TRUE) {
+			if (sqlSelectDatabase($GLOBALS['mysql']['dbase'], __FUNCTION__, __LINE__) === TRUE) {
 				// Set database name (required for ext-optimize and ifSqlTableExists())
 				setConfigEntry('__DB_NAME', $GLOBALS['mysql']['dbase']);
 
@@ -281,7 +273,7 @@ function importSqlDump ($path, $dumpName, $sqlPool) {
 	// Is the file readable?
 	if (!isFileReadable($FQFN)) {
 		// Not found, which is bad
-		reportBug(__FUNCTION__, __LINE__, sprintf("SQL dump %s/%s.sql is not readable.", $path, $dumpName));
+		reportBug(__FUNCTION__, __LINE__, sprintf('SQL dump %s/%s.sql is not readable.', $path, $dumpName));
 	} // END - if
 
 	// Then read it
@@ -292,11 +284,11 @@ function importSqlDump ($path, $dumpName, $sqlPool) {
 }
 
 // SQL string escaping
-function SQL_QUERY_ESC ($sqlString, $data, $F, $L, $run = TRUE, $strip = TRUE, $secure = TRUE) {
+function sqlQueryEscaped ($sqlString, $data, $file, $line, $run = TRUE, $strip = TRUE, $secure = TRUE) {
 	// Link is there?
-	if ((!SQL_IS_LINK_UP()) || (!is_array($data))) {
+	if ((!isSqlLinkUp()) || (!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!');
+		//* DEBUG: */ logDebugMessage($file, $line, 'isSqlLinkUp()=' . intval(isSqlLinkUp()) . ',data[]=' . gettype($data) . ',sqlString=' . $sqlString . ': ABORTING!');
 		return FALSE;
 	} // END - if
 
@@ -307,7 +299,9 @@ function SQL_QUERY_ESC ($sqlString, $data, $F, $L, $run = TRUE, $strip = TRUE, $
 
 	// Escape all data
 	foreach ($data as $key => $value) {
-		$dataSecured[$key] = SQL_ESCAPE($value, $secure, $strip);
+		//* DEBUG: */ logDebugMessage(basename($file) . '/' . __FUNCTION__, $line . '/' . __LINE__, 'key=' . $key . ',value=' . $value . ',run=' . intval($run) . ',strip=' . intval($strip) . ',secure=' . intval($secure));
+		$dataSecured[$key] = sqlEscapeString($value, $secure, $strip);
+		//* DEBUG: */ logDebugMessage(basename($file) . '/' . __FUNCTION__, $line . '/' . __LINE__, 'dataSecured[key]=' . $dataSecured[$key]);
 	} // END - foreach
 
 	// Generate query
@@ -315,7 +309,7 @@ function SQL_QUERY_ESC ($sqlString, $data, $F, $L, $run = TRUE, $strip = TRUE, $
 
 	if ($run === TRUE) {
 		// Run SQL query (default)
-		return SQL_QUERY($query, $F, $L);
+		return sqlQuery($query, $file, $line);
 	} else {
 		// Return secured string
 		return $query;
@@ -323,14 +317,14 @@ function SQL_QUERY_ESC ($sqlString, $data, $F, $L, $run = TRUE, $strip = TRUE, $
 }
 
 // SELECT query string from table, columns and so on... ;-)
-function SQL_RESULT_FROM_ARRAY ($table, $columns, $idRow, $id, $F, $L) {
+function getSqlResultFromArray ($table, $columns, $idRow, $id, $file, $line) {
 	// Is columns an array?
 	if (!is_array($columns)) {
 		// No array
-		reportBug(__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
+			basename($file),
+			$line
 		));
 
 		// Abort here with 'false'
@@ -353,19 +347,19 @@ function SQL_RESULT_FROM_ARRAY ($table, $columns, $idRow, $id, $F, $L) {
 	}
 
 	// Return the result
-	return SQL_QUERY_ESC($sql,
+	return sqlQueryEscaped($sql,
 		array(
 			$table,
 			$idRow,
 			bigintval($id),
-		), $F, $L
+		), $file, $line
 	);
 }
 
 // ALTER TABLE wrapper function
-function SQL_ALTER_TABLE ($sql, $F, $L, $enableCodes = TRUE) {
+function sqlQueryAlterTable ($sql, $file, $line, $enableCodes = TRUE) {
 	// Abort if link is down
-	if (!SQL_IS_LINK_UP()) return FALSE;
+	if (!isSqlLinkUp()) return FALSE;
 
 	// This is the default result...
 	$result = FALSE;
@@ -411,7 +405,7 @@ function SQL_ALTER_TABLE ($sql, $F, $L, $enableCodes = TRUE) {
 			if (((!ifSqlTableColumnExists($tableName, $columnName)) && (isInString('ADD', $sql))) || ((ifSqlTableColumnExists($tableName, $columnName)) && ((isInString('DROP', $sql)) || ((isInString('CHANGE', $sql)) && ($idx == 4) && ((!ifSqlTableColumnExists($tableName, $tableArray[5])) || ($columnName == $tableArray[5])))))) {
 				// Do the query
 				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Executing: ' . $sql);
-				$result = SQL_QUERY($sql, $F, $L, FALSE);
+				$result = sqlQuery($sql, $file, $line, FALSE);
 
 				// Skip further attempt(s)
 				break;
@@ -430,7 +424,7 @@ function SQL_ALTER_TABLE ($sql, $F, $L, $enableCodes = TRUE) {
 		} // END - foreach
 	} 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 : ifSqlTableColumnExists($columnName)), $F, $L));
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf('Skipped FULLTEXT: sql=%s,tableName=%s,hasZeroNums=%d,file=%s,line=%s', $sql, $tableName, intval((is_bool($result)) ? 0 : ifSqlTableColumnExists($columnName)), $file, $line));
 	} elseif ($isAlterIndex === TRUE) {
 		// And column name as well without backticks
 		$keyName = str_replace('`', '', $tableArray[5]);
@@ -459,13 +453,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 (($tableArray[3] == 'ADD') && (!ifSqlTableIndexExist($tableName, $keyName))) {
-			// Send it to the SQL_QUERY() function to add it
+			// Send it to the sqlQuery() function to add it
 			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sql=' . $sql . ' - ADDING!');
-			$result = SQL_QUERY($sql, $F, $L, $enableCodes);
+			$result = sqlQuery($sql, $file, $line, $enableCodes);
 		} elseif (($tableArray[3] == 'DROP') && (ifSqlTableIndexExist($tableName, $keyName))) {
-			// Send it to the SQL_QUERY() function to drop it
+			// Send it to the sqlQuery() function to drop it
 			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sql=' . $sql . ' - DROPPING!');
-			$result = SQL_QUERY($sql, $F, $L, $enableCodes);
+			$result = sqlQuery($sql, $file, $line, $enableCodes);
 		} else {
 			// Not executed
 			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Not executed: ' . $sql);
@@ -473,7 +467,7 @@ function SQL_ALTER_TABLE ($sql, $F, $L, $enableCodes = TRUE) {
 	} else {
 		// Other ALTER TABLE query
 		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $sql);
-		$result = SQL_QUERY($sql, $F, $L, $enableCodes);
+		$result = sqlQuery($sql, $file, $line, $enableCodes);
 	}
 
 	// Return result
@@ -481,7 +475,7 @@ function SQL_ALTER_TABLE ($sql, $F, $L, $enableCodes = TRUE) {
 }
 
 // Getter for SQL link
-function SQL_GET_LINK () {
+function getSqlLink () {
 	// Init link
 	$link = NULL;
 
@@ -498,32 +492,30 @@ function SQL_GET_LINK () {
 }
 
 // Setter for link
-function SQL_SET_LINK ($F, $L, $link) {
-	//* DEBUG: */ logDebugMessage($F . ':' . __FUNCTION__, $L . ':' . __LINE__, 'link[]=' . gettype($link) . ' - ENTERED!');
+// Do *not* add debug lines here. This will cause and endless loop
+function setSqlLink ($file, $line, $link) {
 	// Is this a resource or null?
-	if ((ifFatalErrorsDetected()) && (isInstallationPhase())) {
+	if ((ifFatalErrorsDetected()) && (isInstaller())) {
 		// This may happen in installation phase
-		//* DEBUG: */ logDebugMessage($F . ':' . __FUNCTION__, $L . ':' . __LINE__, 'Some fatal errors detected in installation phase.');
 		return;
-	} elseif ((!is_resource($link)) && (!is_null($link))) {
+	} elseif ((!is_resource($link)) && (!is_null($link)) && (!$link instanceof mysqli)) {
 		// This should never happen!
-		reportBug($F . ':' . __FUNCTION__, $L . ':' . __LINE__, sprintf("Type of link is not resource or null, type=%s", gettype($link)));
+		reportBug($file . ':' . __FUNCTION__, $line . ':' . __LINE__, sprintf('Type of link is not resource, null or mysqli class, type=%s', gettype($link)));
 	} // END - if
 
 	// Set it
 	$GLOBALS['__sql_link'] = $link;
 
 	// Re-init cache
-	$GLOBALS['__is_sql_link_up'] = is_resource($link);
-	//* DEBUG: */ logDebugMessage($F . ':' . __FUNCTION__, $L . ':' . __LINE__, '__is_sql_link_up=' . intval($GLOBALS['__is_sql_link_up']) . ' - EXIT!');
+	$GLOBALS['__is_sql_link_up'] = ((function_exists('isValidSqlLink')) && (isValidSqlLink($link)));
 }
 
 // Checks if the link is up
-function SQL_IS_LINK_UP () {
+function isSqlLinkUp () {
 	// Is there cached this?
 	if (!isset($GLOBALS['__is_sql_link_up'])) {
 		// Something bad went wrong
-		reportBug(__FUNCTION__, __LINE__, 'Called before SQL_SET_LINK() was called!');
+		reportBug(__FUNCTION__, __LINE__, 'Called before setSqlLink() was called!');
 	} // END - if
 
 	// Return the result
@@ -532,47 +524,50 @@ function SQL_IS_LINK_UP () {
 }
 
 // Wrapper function to make code more readable
-function SQL_HASZERONUMS ($result) {
+function ifSqlHasZeroNumRows ($result) {
 	// Just pass it through
-	return (SQL_NUMROWS($result) === 0);
+	return (sqlNumRows($result) === 0);
 }
 
 // Wrapper function to make code more readable
-function SQL_HASZEROAFFECTED () {
+function ifSqlHasZeroAffectedRows () {
 	// Just pass it through
-	return (SQL_AFFECTEDROWS() === 0);
+	return (sqlAffectedRows() === 0);
 }
 
 // Private function to prepare the SQL query string
-function SQL_PREPARE_SQL_STRING ($sqlString, $enableCodes = TRUE) {
+function sqlPrepareQueryString ($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 . ''])) {
 		// Preserve escaping and compile URI codes+config+expression code
-		$sqlString2 = FILTER_COMPILE_EXPRESSION_CODE(FILTER_COMPILE_CONFIG($sqlString));
+		$sqlString2 = str_replace(chr(92), '{BACKLASH}', $sqlString);
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlString2=' . $sqlString2);
+		$sqlString2 = FILTER_COMPILE_EXPRESSION_CODE(FILTER_COMPILE_CONFIG($sqlString2));
 
 		// Debug message
 		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlString2=' . $sqlString2);
 
-		// Do final compilation and revert {ESCAPE}
+		// Do final compilation and revert {BACKSLASH}
 		$GLOBALS['sql_strings']['' . $sqlString . ''] = doFinalCompilation($sqlString2, FALSE, $enableCodes);
+		$GLOBALS['sql_strings']['' . $sqlString . ''] = str_replace('{BACKLASH}', chr(92), $GLOBALS['sql_strings']['' . $sqlString . '']);
 	} 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!');
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sqlString=' . $sqlString . ',enableCodes=' . intval($enableCodes) . ',returned sql_string=' . $GLOBALS['sql_strings']['' . $sqlString . ''] . ' - EXIT!');
 
 	// Return it
 	return $GLOBALS['sql_strings']['' . $sqlString . ''];
 }
 
 // Creates a MySQL TIMESTAMP compatible string from given Uni* timestamp
-function SQL_EPOCHE_TO_TIMESTAMP ($timestamp) {
-	return generateDateTime($timestamp, 7);
+function getSqlTimestampFromUnix ($timestamp) {
+	return generateDateTime($timestamp, '7');
 }
 
 // Check if there is a SQL table created
@@ -586,15 +581,15 @@ function ifSqlTableExists ($tableName) {
 	// 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'",
+		$result = sqlQueryEscaped("SHOW TABLES FROM `{?__DB_NAME?}` WHERE `Tables_in_{?__DB_NAME?}`='{?_MYSQL_PREFIX?}_%s'",
 			array($tableName), __FUNCTION__, __LINE__);
 
 		// Is a link there?
-		if (!is_resource($result)) {
+		if (!isValidSqlLink($result)) {
 			// Is installation phase?
-			if (isInstallationPhase()) {
+			if (isInstaller()) {
 				// Then silently abort here
-				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'result[]=' . gettype($result) . ',isLinkUp=' . intval(SQL_IS_LINK_UP()) . ',tableName=' . $tableName . ' - Returning FALSE ...');
+				//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'result[]=' . gettype($result) . ',isLinkUp=' . intval(isSqlLinkUp()) . ',tableName=' . $tableName . ' - Returning FALSE ...');
 				return FALSE;
 			} else {
 				// Please report this
@@ -603,7 +598,7 @@ function ifSqlTableExists ($tableName) {
 		} // END - if
 
 		// Is there an entry?
-		$GLOBALS[__FUNCTION__][$tableName] = (SQL_NUMROWS($result) == 1);
+		$GLOBALS[__FUNCTION__][$tableName] = (sqlNumRows($result) == 1);
 		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ',numRows=' . intval($GLOBALS[__FUNCTION__][$tableName]));
 	} // END - if
 
@@ -624,22 +619,22 @@ function ifSqlTableColumnExists ($tableName, $columnName, $forceFound = FALSE) {
 	if (!ifSqlTableExists($tableName)) {
 		// Then abort here
 		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Table ' . $tableName . ' does not exist, columnName=' . $columnName . ',forceFound=' . intval($forceFound));
-		return (($forceFound === FALSE) && (isInstallationPhase()));
+		return (($forceFound === FALSE) && (isInstaller()));
 	} // END - if
 
 	// Get column information
-	$result = SQL_QUERY_ESC("SHOW COLUMNS FROM `%s` LIKE '%s'",
+	$result = sqlQueryEscaped("SHOW COLUMNS FROM `%s` LIKE '%s'",
 		array(
 			$tableName,
 			$columnName
 		), __FUNCTION__, __LINE__);
 
 	// Is a link there?
-	if (!is_resource($result)) {
+	if (!isValidSqlLink($result)) {
 		// Is installation phase?
-		if (isInstallationPhase()) {
+		if (isInstaller()) {
 			// Then silently abort here
-			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'result[]=' . gettype($result) . ',isLinkUp=' . intval(SQL_IS_LINK_UP()) . ',tableName=' . $tableName . ',columnName=' . $columnName . ' - Returning FALSE ...');
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'result[]=' . gettype($result) . ',isLinkUp=' . intval(isSqlLinkUp()) . ',tableName=' . $tableName . ',columnName=' . $columnName . ' - Returning FALSE ...');
 			return $forceFound;
 		} else {
 			// Please report this
@@ -648,10 +643,10 @@ function ifSqlTableColumnExists ($tableName, $columnName, $forceFound = FALSE) {
 	} // END - if
 
 	// Determine it
-	$doesExist = (!SQL_HASZERONUMS($result));
+	$doesExist = (!ifSqlHasZeroNumRows($result));
 
 	// Free result
-	SQL_FREERESULT($result);
+	sqlFreeResult($result);
 
 	// Return cache
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ',columnName=' . $columnName . ',doesExist=' . intval($doesExist) . ' - EXIT!');
@@ -670,18 +665,18 @@ function ifSqlTableIndexExist ($tableName, $keyName, $forceFound = FALSE) {
 	if (!ifSqlTableExists($tableName)) {
 		// Then abort here
 		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Table ' . $tableName . ' does not exist, keyName=' . $keyName . ',forceFound=' . intval($forceFound));
-		return (($forceFound === FALSE) && (isInstallationPhase()));
+		return (($forceFound === FALSE) && (isInstaller()));
 	} // END - if
 
 	// Show indexes
-	$result = SQL_QUERY_ESC("SHOW INDEX FROM `%s`", array($tableName), __FUNCTION__, __LINE__);
+	$result = sqlQueryEscaped("SHOW INDEX FROM `%s`", array($tableName), __FUNCTION__, __LINE__);
 
 	// Is a link there?
-	if (!is_resource($result)) {
+	if (!isValidSqlLink($result)) {
 		// Is installation phase?
-		if (isInstallationPhase()) {
+		if (isInstaller()) {
 			// Then silently abort here
-			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'result[]=' . gettype($result) . ',isLinkUp=' . intval(SQL_IS_LINK_UP()) . ',tableName=' . $tableName . ',keyName=' . $keyName . ' - Returning FALSE ...');
+			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'result[]=' . gettype($result) . ',isLinkUp=' . intval(isSqlLinkUp()) . ',tableName=' . $tableName . ',keyName=' . $keyName . ' - Returning FALSE ...');
 			return $forceFound;
 		} else {
 			// Please report this
@@ -693,7 +688,7 @@ function ifSqlTableIndexExist ($tableName, $keyName, $forceFound = FALSE) {
 	$doesExist = FALSE;
 
 	// Walk through all
-	while ($content = SQL_FETCHARRAY($result)) {
+	while ($content = sqlFetchArray($result)) {
 		// Is it the requested one?
 		if ($content['Key_name'] == $keyName) {
 			// Then it is found and exit
@@ -703,7 +698,7 @@ function ifSqlTableIndexExist ($tableName, $keyName, $forceFound = FALSE) {
 	} // END - while
 
 	// Free result
-	SQL_FREERESULT($result);
+	sqlFreeResult($result);
 
 	// Return cache
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ',keyName=' . $keyName . ',doesExist=' . intval($doesExist) . ' - EXIT!');
@@ -727,12 +722,12 @@ function getArrayFromSupportedSqlEngines ($requestedEngine = 'ALL') {
 	$engines = array();
 
 	// This also worked, now we need to check if the selected database type is supported
-	$result = SQL_QUERY('SHOW ENGINES', __FUNCTION__, __LINE__);
+	$result = sqlQuery('SHOW ENGINES', __FUNCTION__, __LINE__);
 
 	// Are there entries? (Bad if not)
-	if (!SQL_HASZERONUMS($result)) {
+	if (!ifSqlHasZeroNumRows($result)) {
 		// Load all and check for active entries
-		while ($content = SQL_FETCHARRAY($result)) {
+		while ($content = sqlFetchArray($result)) {
 			// Debug message
 			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'support=' . $requestedEngine . ',Engine=' . $content['Engine'] . ',Support=' . $content['Support']);
 
@@ -751,11 +746,72 @@ function getArrayFromSupportedSqlEngines ($requestedEngine = 'ALL') {
 	}
 
 	// Free result
-	SQL_FREERESULT($result);
+	sqlFreeResult($result);
 
 	// Return result
 	return $engines;
 }
 
+// "Getter" for result from given table and field/type LIKEs
+function sqlGetResultFromLikeColumnsType ($tableName, $field, $type) {
+	// The table should be there
+	assert(ifSqlTableExists($tableName));
+
+	// Default no field set
+	$fieldSql = '';
+	if (!empty($field)) {
+		// Then use it
+		$fieldSql = "`Field` LIKE '" . $field . "' AND";
+	} // END - if
+
+	// Show them
+	return sqlQueryEscaped("SHOW COLUMNS FROM
+	`{?_MYSQL_PREFIX?}_%s`
+WHERE
+	" . $fieldSql . "
+	`Type` LIKE '%s%%'",
+		array(
+			$tableName,
+			$type
+		), __FUNCTION__, __LINE__
+	);
+}
+
+// Log SQL errors to debug.log in installation phase or call reportBug()
+function logSqlError ($file, $line, $message) {
+	// Remember plain error in last_sql_error
+	setSqlError($file, $line, $message);
+
+	// Is login set?
+	if (!empty($GLOBALS['mysql']['login'])) {
+		// Secure login name in message
+		$message = str_replace($GLOBALS['mysql']['login'], '***', $message);
+	} // END - if
+
+	// Is database password set?
+	if (!empty($GLOBALS['mysql']['password'])) {
+		// Secure password in message
+		$message = str_replace($GLOBALS['mysql']['password'], '***', $message);
+	} // END - if
+
+	// Is database name set?
+	if (!empty($GLOBALS['mysql']['dbase'])) {
+		// Secure database name in message
+		$message = str_replace($GLOBALS['mysql']['dbase'], '***', $message);
+	} // END - if
+
+	// 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 {
+		// Regular mode, then call reportBug()
+		reportBug($file, $line, $message);
+	}
+}
+
 // [EOF]
 ?>