Fixed a lot typos, thanks to profi-concept

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

diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index 58bdc436b241c7b869fadfe1709d57d813c18dc1..8d0ee5f467477c1b0700e9800f285203f611c026 100644 (file)
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -90,7 +90,7 @@ Query string:<br />
        } // END - if
 
        // Count DB hits
-       if (getConfig('db_hits_run') == null) {
+       if (!isConfigEntrySet('db_hits_run')) {
                // Count in dummy variable
                setConfigEntry('db_hits_run', 1);
        } else {
@@ -103,7 +103,7 @@ Query string:<br />
 }
 
 // SQL num rows
-function SQL_NUMROWS($result) {
+function SQL_NUMROWS ($result) {
        // Is the result a valid resource?
        if (is_resource($result)) {
                // Get the count of rows from database
@@ -266,9 +266,13 @@ function SQL_QUERY_ESC ($qstring, $data, $file, $line, $run=true, $strip=true) {
        // Was the eval() command fine?
        if ($query == "failed") {
                // Something went wrong?
-               print "eval=".htmlentities($eval)."<pre>";
-               debug_print_backtrace();
-               die("</pre>");
+               printf("eval=%s\n<pre>%s</pre>",
+                       htmlentities($eval),
+                       debug_get_printable_backtrace()
+               );
+
+               // Abort further code executions
+               exit;
        } // END - if
 
        if ($run) {
@@ -318,10 +322,10 @@ function SQL_ESCAPE ($str, $secureString=true,$strip=true) {
 // 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) {
+       if (!is_array($columns)) {
                // No array
                trigger_error(sprintf("columns is not array. %s!=array", gettype($columns)));
-       }
+       } // END  - if
 
        // Prepare the SQL statement
        $SQL = "SELECT `".implode("`, `", $columns)."` FROM `{!_MYSQL_PREFIX!}_%s` WHERE ``='%s' LIMIT 1";
@@ -357,6 +361,7 @@ function SQL_ALTER_TABLE ($sql, $F, $L) {
                        array($tableName, $columnName), $F, $L);
 
                // 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) && (eregi("ADD", $sql) > 0)) || ((SQL_NUMROWS($result) == 1) && (eregi("DROP", $sql) > 0))) {
                        // Do the query
                        $result = SQL_QUERY($sql, $F, $L, false);