X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fdb%2Flib-mysql3.php;h=0d97094c82d13cc01ddc966b90450e57e7fd62cf;hp=ccdfd8e9f7b5121fedc5b16ca3fccb84ba325178;hb=509ae618cc32ba2b811cf66567d62abc597dc405;hpb=03f62d0b89aa9276ac37f4d616d940fae184d850

diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index ccdfd8e9f7..0d97094c82 100644
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -70,11 +70,12 @@ function SQL_QUERY ($sql_string, $F, $L) {
 	$querytimeBefore = array_sum(explode(' ', microtime()));
 
 	// Run SQL command
-	//* DEBUG: */ echo $sql_string."<br />\n";
+	//* DEBUG: */ print $sql_string."<br />\n";
 	$result = mysql_query($sql_string, SQL_GET_LINK())
 		or addFatalMessage(__FUNCTION__, __LINE__, $F." (".$L."):".mysql_error()."<br />
 Query string:<br />
 ".$sql_string);
+	//* DEBUG: */ print __LINE__ . ': numRows=' . SQL_NUMROWS($result) . ',affected=' . SQL_AFFECTEDROWS() . "<br />\n";
 
 	// Ending time
 	$querytimeAfter = array_sum(explode(' ', microtime()));
@@ -227,11 +228,12 @@ function SQL_CLOSE ($F, $L) {
 		incrementConfigEntry('db_hits', getConfig('db_hits_run'));
 
 		// Update counter for db/cache
-		updateConfiguration(array('db_hits', 'cache_hits'), array(getConfig(('db_hits')), getConfig(('cache_hits'))));
+		updateConfiguration(array('db_hits', 'cache_hits'), array(getConfig('db_hits'), getConfig('cache_hits')));
 	} // END - if
 
 	// Close database link and forget the link
-	$close = mysql_close(SQL_GET_LINK()) or addFatalMessage(__FUNCTION__, __LINE__, $F." (".$L."):".mysql_error());
+	$close = mysql_close(SQL_GET_LINK())
+		or addFatalMessage(__FUNCTION__, __LINE__, $F . ' (' . $L . '):'.mysql_error());
 
 	// Close link
 	SQL_SET_LINK(null);
@@ -260,15 +262,15 @@ function SQL_QUERY_ESC ($qstring, $data, $F, $L, $run=true, $strip=true, $secure
 	$query = 'failed';
 
 	if ($strip === true) {
-		$strip = "true";
+		$strip = 'true';
 	} else {
-		$strip = "false";
+		$strip = 'false';
 	}
 
 	if ($secure === true) {
-		$secure = "true";
+		$secure = 'true';
 	} else {
-		$secure = "false";
+		$secure = 'false';
 	}
 
 	$eval = "\$query = sprintf(\"".$qstring."\"";
@@ -280,7 +282,7 @@ function SQL_QUERY_ESC ($qstring, $data, $F, $L, $run=true, $strip=true, $secure
 		}
 	} // END - foreach
 	$eval .= ");";
-	//
+
 	// Debugging
 	//
 	//* DEBUG: */ $fp = fopen(constant('PATH')."inc/cache/escape_debug.log", 'a') or app_die(__FILE__, __LINE__, "Cannot write debug.log!");
@@ -293,7 +295,7 @@ function SQL_QUERY_ESC ($qstring, $data, $F, $L, $run=true, $strip=true, $secure
 	// Was the eval() command fine?
 	if ($query == 'failed') {
 		// Something went wrong?
-		debug_report_bug("eval={$eval}");
+		debug_report_bug('eval=' . $eval);
 	} // END - if
 
 	if ($run === true) {
@@ -344,15 +346,16 @@ function SQL_RESULT_FROM_ARRAY ($table, $columns, $idRow, $id, $F, $L) {
 	} // END  - if
 
 	// Prepare the SQL statement
-	$sql = "SELECT `".implode("`,`", $columns)."` FROM `{!_MYSQL_PREFIX!}_%s` WHERE ``='%s' LIMIT 1";
+	$sql = "SELECT `".implode("`,`", $columns)."` FROM `{!_MYSQL_PREFIX!}_%s` WHERE `%s`='%s' LIMIT 1";
 
 	// Return the result
 	return SQL_QUERY_ESC($sql,
-	array(
-	bigintval($id),
-	$table,
-	$idRow
-	), $F, $L);
+		array(
+			$table,
+			$idRow,
+			bigintval($id),
+		), $F, $L
+	);
 }
 
 // ALTER TABLE wrapper function
@@ -363,11 +366,11 @@ function SQL_ALTER_TABLE ($sql, $F, $L) {
 	// Determine index/fulltext/unique word
 	$noIndex = (
 	(
-	strpos($sql, 'INDEX') === false
+		strpos($sql, 'INDEX') === false
 	) && (
-	strpos($sql, 'FULLTEXT') === false
+		strpos($sql, 'FULLTEXT') === false
 	) && (
-	strpos($sql, 'UNIQUE') === false
+		strpos($sql, 'UNIQUE') === false
 	)
 	);
 
@@ -381,8 +384,8 @@ function SQL_ALTER_TABLE ($sql, $F, $L) {
 		$columnName = str_replace('`', '', $tableArray[4]);
 
 		// Get column information
-		$result = SQL_QUERY_ESC("SHOW COLUMNS FROM %s LIKE '%s'",
-		array($tableName, $columnName), __FILE__, __LINE__);
+		$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
@@ -418,7 +421,7 @@ function SQL_ALTER_TABLE ($sql, $F, $L) {
 
 		// Show indexes
 		$result = SQL_QUERY_ESC("SHOW INDEX FROM `%s`",
-		array($tableName), __FILE__, __LINE__);
+			array($tableName), __FILE__, __LINE__);
 
 		// Walk through all
 		$skip = false;