Heavy rewrite:

[mailer.git] / inc / db / lib-mysql3.php

diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index 2adf9c0d56347a57943ac27ffa5bb92b8eae10dc..e07cd405b535edf5239bf4120767c76b1fb07f2f 100644 (file)
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -227,11 +227,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 +261,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 +281,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 +294,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) {
@@ -364,11 +365,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
        )
        );
 
@@ -382,8 +383,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
@@ -419,7 +420,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;