More HTML code swapped into templates (#68 again)

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

diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index 44f5fd4366055e108896dc2ea06e9a7b2665bccf..e11f335446711f138efd577d25edb2e31caa661e 100644 (file)
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -78,12 +78,12 @@ function SQL_QUERY ($sqlString, $F, $L) {
        $querytimeBefore = array_sum(explode(' ', microtime()));
 
        // Run SQL command
-       //* DEBUG: */ outputHtml($sqlString."<br />");
+       //* DEBUG: */ print($sqlString . '<br />');
        $result = mysql_query($sqlString, SQL_GET_LINK())
                or addFatalMessage(__FUNCTION__, __LINE__, $F . ' (' . $L . '):' . mysql_error() . '<br />
 Query string:<br />
 ' . $sqlString);
-       //* DEBUG: */ outputHtml(__LINE__ . ': numRows=' . SQL_NUMROWS($result) . ',affected=' . SQL_AFFECTEDROWS() . "<br />");
+       //* DEBUG: */ print(__LINE__ . ': numRows=' . SQL_NUMROWS($result) . ',affected=' . SQL_AFFECTEDROWS() . "<br />");
 
        // Ending time
        $querytimeAfter = array_sum(explode(' ', microtime()));
@@ -104,7 +104,7 @@ Query string:<br />
        incrementConfigEntry('sql_count');
 
        // Debug output
-       if ((getOutputMode() != '1') && (isDebugModeEnabled()) && (getConfig('DEBUG_SQL') == 'Y')) {
+       if ((getOutputMode() != 1) && (isDebugModeEnabled()) && (getConfig('DEBUG_SQL') == 'Y')) {
                //
                // Debugging stuff...
                //
@@ -363,7 +363,7 @@ function SQL_ESCAPE ($str, $secureString=true, $strip=true) {
                $ret = smartAddSlashes($str);
        } elseif (function_exists('mysql_real_escape_string')) {
                // The new and improved version
-               //* DEBUG: */ outputHtml(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):str={$str}<br />");
+               //* DEBUG: */ print(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):str={$str}<br />");
                $ret = mysql_real_escape_string($str, SQL_GET_LINK());
        } elseif (function_exists('mysql_escape_string')) {
                // The obsolete function
@@ -444,7 +444,7 @@ function SQL_ALTER_TABLE ($sql, $F, $L) {
                // 123           4       4     3    3      4           4          32    23           4       4     3    3      4            4          321
                if (((SQL_NUMROWS($result) == 0) && (strpos($sql, 'ADD') !== false)) || ((SQL_NUMROWS($result) == 1) && (strpos($sql, 'DROP') !== false))) {
                        // Do the query
-                       //* DEBUG: */ outputHtml(__LINE__.':'.$sql."<br />");
+                       //* DEBUG: */ print(__LINE__.':'.$sql."<br />");
                        $result = SQL_QUERY($sql, $F, $L, false);
                } // END - if
        } elseif ((getConfig('_TABLE_TYPE') == 'InnoDB') && (strpos($sql, 'FULLTEXT') !== false)) {
@@ -461,11 +461,11 @@ function SQL_ALTER_TABLE ($sql, $F, $L) {
                        while (strpos($columnName, ',') !== false) {
                                // Use last
                                $columnName = str_replace('`', '', $tableArray[count($tableArray) - $begin]);
-                               //* DEBUG: */ outputHtml(__LINE__.':'.$columnName."----------------".$begin."<br />");
+                               //* DEBUG: */ print(__LINE__.':'.$columnName."----------------".$begin."<br />");
 
                                // Remove brackes
                                $columnName = str_replace('(', '', str_replace(')', '', $columnName));
-                               //* DEBUG: */ outputHtml(__LINE__.':'.$columnName."----------------".$begin."<br />");
+                               //* DEBUG: */ print(__LINE__.':'.$columnName."----------------".$begin."<br />");
 
                                // Continue
                                $begin++;
@@ -480,7 +480,7 @@ function SQL_ALTER_TABLE ($sql, $F, $L) {
                $skip = false;
                while ($content = SQL_FETCHARRAY($result)) {
                        // Is it found?
-                       //* DEBUG: */ outputHtml("<pre>".print_r($content, true)."</pre>");
+                       //* DEBUG: */ print("<pre>".print_r($content, true)."</pre>");
                        if (($content['Column_name'] == $columnName) || ($content['Key_name'] == $columnName)) {
                                // Skip this query!
                                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Skiped: %s", $sql));
@@ -495,12 +495,12 @@ function SQL_ALTER_TABLE ($sql, $F, $L) {
                // Shall we run it?
                if ($skip === false) {
                        // Send it to the SQL_QUERY() function
-                       //* DEBUG: */ outputHtml(__LINE__.':'.$sql."<br />");
+                       //* DEBUG: */ print(__LINE__.':'.$sql."<br />");
                        $result = SQL_QUERY($sql, $F, $L, false);
                } // END - if
        } else {
                // Other ALTER TABLE query
-               //* DEBUG: */ outputHtml(__LINE__.':'.$sql."<br />");
+               //* DEBUG: */ print(__LINE__.':'.$sql."<br />");
                $result = SQL_QUERY($sql, $F, $L, false);
        }