X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fdb%2Flib-mysql3.php;h=9dfdfcf342556f9f52076d2755e9350715f35a30;hp=17caef397c5f9ee472bf9242c8ddf84df30fb0da;hb=5b2fa7f464317185154a3550edb5786d52b2cbf9;hpb=b622c2d9285f044f49328cbd98efbf2f1a24aa8e

diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index 17caef397c..9dfdfcf342 100644
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -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);
 
@@ -73,7 +73,7 @@ function SQL_QUERY ($sqlString, $F, $L, $enableCodes = true) {
 
 		// 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,7 +85,7 @@ 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']);
@@ -94,7 +94,7 @@ function SQL_QUERY ($sqlString, $F, $L, $enableCodes = true) {
 	//* 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);
@@ -114,11 +114,11 @@ function SQL_QUERY ($sqlString, $F, $L, $enableCodes = true) {
 		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(array(chr(13), chr(10)), array('', ' '), $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
 
 	// Increment stats entry
@@ -131,10 +131,10 @@ 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'][intval($resource)])) {
@@ -158,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());
@@ -170,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)) {
@@ -190,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);
@@ -229,7 +229,7 @@ function SQL_CONNECT ($host, $login, $password, $F, $L) {
 // 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 SQL_ERROR($F, $L,  mysql_error());
@@ -239,7 +239,7 @@ function SQL_SELECT_DB ($dbName, $F, $L) {
 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
@@ -256,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
@@ -267,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 escaped 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
@@ -280,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 {
@@ -291,29 +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());
@@ -322,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... ;-)
@@ -342,7 +377,7 @@ function SQL_RESULT_FROM_ARRAY ($table, $columns, $idRow, $id, $F, $L) {
 		));
 
 		// Abort here with 'false'
-		return false;
+		return FALSE;
 	} // END  - if
 
 	// Is this is a simple array?
@@ -357,7 +392,7 @@ function SQL_RESULT_FROM_ARRAY ($table, $columns, $idRow, $id, $F, $L) {
 		$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";
+		$sql = 'SELECT `' . implode('`, `', $columns) . "` FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`='%s' LIMIT 1";
 	}
 
 	// Return the result
@@ -371,12 +406,12 @@ 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
 	$isAlterIndex = (
@@ -396,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>,isAlterIndex=' . intval($isAlterIndex));
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'sql=' . $sql . ',tableName=' . $tableName . ',tableArray=<pre>' . print_r($tableArray, TRUE) . '</pre>,isAlterIndex=' . intval($isAlterIndex));
 
 	// Shall we add/drop?
-	if (((isInString('ADD', $sql)) || (isInString('DROP', $sql)) || (isInString('CHANGE', $sql))) && ($isAlterIndex === false)) {
+	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
@@ -413,36 +448,36 @@ 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?
-			if (((!isSqlTableColumnFound($tableName, $columnName)) && (isInString('ADD', $sql))) || ((isSqlTableColumnFound($tableName, $columnName)) && ((isInString('DROP', $sql)) || ((isInString('CHANGE', $sql)) && ($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;
-			} elseif ((((isSqlTableColumnFound($tableName, $columnName)) && (isInString('ADD', $sql))) || ((!isSqlTableColumnFound($tableName, $columnName)) && ((isInString('DROP', $sql))) || (isInString('CHANGE', $sql)))) && ($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)) && (isInString('DROP', $sql))) {
+			} 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') && (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 ($isAlterIndex === true) {
+		//* 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'))) {
@@ -523,7 +558,7 @@ function SQL_SET_LINK ($link) {
 
 // Checks if the link is up
 function SQL_IS_LINK_UP () {
-	// Do we have cached this?
+	// Is there cached this?
 	if (!isset($GLOBALS['is_sql_link_up'])) {
 		// Determine it
 		$GLOBALS['is_sql_link_up'] = is_resource(SQL_GET_LINK());
@@ -546,18 +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])) {
+	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);
-	} // 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
@@ -570,7 +617,7 @@ function SQL_ERROR ($file, $line, $message) {
 	// Remember plain error in last_sql_error
 	$GLOBALS['last_sql_error'] = mysql_error();
 
-	// Do we have installation phase?
+	// Is there installation phase?
 	if (isInstallationPhase()) {
 		/*
 		 * In installation phase, we don't want SQL errors abort e.g. connection
@@ -586,7 +633,7 @@ function SQL_ERROR ($file, $line, $message) {
 // Check if there is a SQL table created
 function ifSqlTableExists ($tableName) {
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ' - ENTERED!');
-	// Do we have cache?
+	// 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'",
@@ -603,16 +650,19 @@ function ifSqlTableExists ($tableName) {
 }
 
 // Is a table column there?
-function isSqlTableColumnFound ($tableName, $columnName) {
+function ifSqlColumnExists ($tableName, $columnName) {
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ',columnName=' . $columnName . ' - ENTERED!');
-	// Do we have cache?
+	// 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));
@@ -630,18 +680,18 @@ function isSqlTableColumnFound ($tableName, $columnName) {
 // Checks depending on the mode if the index is there
 function isSqlTableIndexFound ($tableName, $keyName) {
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'tableName=' . $tableName . ',columnName=' . $keyName . ' - ENTERED!');
-	// Do we have cache?
+	// Is there cache?
 	if (!isset($GLOBALS[__FUNCTION__][$tableName][$keyName])) {
 		// Show indexes
 		$result = SQL_QUERY_ESC("SHOW INDEX FROM `%s`", array($tableName), __FUNCTION__, __LINE__);
 
 		// The column is not found by default
-		$GLOBALS[__FUNCTION__][$tableName][$keyName] = false;
+		$GLOBALS[__FUNCTION__][$tableName][$keyName] = FALSE;
 
 		// Walk through all
 		while ($content = SQL_FETCHARRAY($result)) {
 			// Add all entries for better caching behavior
-			$GLOBALS[__FUNCTION__][$tableName][$content['Key_name']] = true;
+			$GLOBALS[__FUNCTION__][$tableName][$content['Key_name']] = TRUE;
 		} // END - while
 
 		// Free result
@@ -675,7 +725,7 @@ function getArrayFromSupportedSqlEngines ($support = 'YES') {
 	// This also worked, now we need to check if the selected database type is supported
 	$result = SQL_QUERY('SHOW ENGINES', __FUNCTION__, __LINE__);
 
-	// Do we have entries? (Bad if not)
+	// Are there entries? (Bad if not)
 	if (SQL_NUMROWS($result) > 0) {
 		// Load all and check for active entries
 		while ($content = SQL_FETCHARRAY($result)) {
@@ -690,7 +740,7 @@ function getArrayFromSupportedSqlEngines ($support = 'YES') {
 		} // END - if
 	} else {
 		// No engines! :(
-		$engines = false;
+		$engines = FALSE;
 	}
 
 	// Free result