config.php partly solved, see #117

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

diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index b0de8af3fce16d60a795825c28db6cd3e09cf18c..823e5d02f95ebe5949eb00875deaa5d1faad02c0 100644 (file)
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -51,10 +51,10 @@ function SQL_QUERY ($sql_string, $F, $L) {
        $sql_string = str_replace("\t", " ", str_replace("\n", " ", str_replace("\r", " ", $sql_string)));
 
        // Replace {!_MYSQL_PREFIX!} with constant, closes #84. Thanks to profi-concept
-       $sql_string = str_replace("{!_MYSQL_PREFIX!}", constant('_MYSQL_PREFIX'), $sql_string);
+       $sql_string = str_replace("{!_MYSQL_PREFIX!}", getConfig('_MYSQL_PREFIX'), $sql_string);
 
        // Replace {!_TABLE_TYPE!} with constant
-       $sql_string = str_replace("{!_TABLE_TYPE!}", constant('_TABLE_TYPE'), $sql_string);
+       $sql_string = str_replace("{!_TABLE_TYPE!}", getConfig('_TABLE_TYPE'), $sql_string);
 
        // Starting time
        $querytimeBefore = array_sum(explode(' ', microtime()));
@@ -80,11 +80,11 @@ Query string:<br />
 
        // Debug output
        //* DEBUG: */ print "Query=<pre>".$sql_string."</pre>, affected=<strong>".SQL_AFFECTEDROWS()."</strong>, numrows=<strong>".SQL_NUMROWS($result)."</strong><br />\n";
-       if (($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-1") && (isDebugModeEnabled()) && (isBooleanConstantAndTrue('DEBUG_SQL'))) {
+       if (($GLOBALS['output_mode'] != '1') && ($GLOBALS['output_mode'] != '-1') && (isDebugModeEnabled()) && (getConfig('DEBUG_SQL') == 'Y')) {
                //
                // Debugging stuff...
                //
-               $fp = fopen(constant('PATH')."inc/cache/mysql.log", 'a') or app_die(__FILE__, __LINE__, "Cannot write mysql.log!");
+               $fp = fopen(constant('PATH') . 'inc/cache/mysql.log', 'a') or app_die(__FILE__, __LINE__, "Cannot write mysql.log!");
                if (!isset($GLOBALS['sql_first_entry'])) {
                        // Write first entry
                        fwrite($fp, "Module=".$GLOBALS['module']."\n");
@@ -274,7 +274,7 @@ function SQL_QUERY_ESC ($qstring, $data, $F, $L, $run=true, $strip=true, $secure
        // Debugging
        //
        //* DEBUG: */ $fp = fopen(constant('PATH')."inc/cache/escape_debug.log", 'a') or app_die(__FILE__, __LINE__, "Cannot write debug.log!");
-       //* DEBUG: */ fwrite($fp, $F."(".$L."): ".str_replace("\r", '', str_replace("\n", " ", $eval))."\n");
+       //* DEBUG: */ fwrite($fp, $F.'('.$L."): ".str_replace("\r", '', str_replace("\n", " ", $eval))."\n");
        //* DEBUG: */ fclose($fp);
 
        // Run the code
@@ -351,47 +351,54 @@ function SQL_ALTER_TABLE ($sql, $F, $L) {
        $result = false;
 
        // Determine index/fulltext/unique word
-       //         12    3             3         2    2    3                3         2    2    3              3         21
-       $noIndex = ((ereg("INDEX", $sql) == false) && (ereg("FULLTEXT", $sql) == false) && (ereg("UNIQUE", $sql) == false));
+       $noIndex = (
+               (
+                       strpos($sql, 'INDEX') === false
+               ) && (
+                       strpos($sql, 'FULLTEXT') === false
+               ) && (
+                       strpos($sql, 'UNIQUE') === false
+               )
+       );
 
        // Extract table name
        $tableArray = explode(" ", $sql);
-       $tableName = str_replace("`", '', $tableArray[2]);
+       $tableName = str_replace('`', '', $tableArray[2]);
 
        // Shall we add/drop?
-       if (((ereg("ADD", $sql)) || (ereg("DROP", $sql))) && ($noIndex)) {
+       if (((strpos($sql, 'ADD') !== false) || (strpos($sql, 'DROP') !== false)) && ($noIndex === true)) {
                // And column name as well
-               $columnName = str_replace("`", '', $tableArray[4]);
+               $columnName = str_replace('`', '', $tableArray[4]);
 
                // Get column information
                $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           432    23           4       4     3    3    4            4321
-               if (((SQL_NUMROWS($result) == 0) && (ereg("ADD", $sql))) || ((SQL_NUMROWS($result) == 1) && (ereg("DROP", $sql)))) {
+               // 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: */ print __LINE__.':'.$sql."<br />\n";
                        $result = SQL_QUERY($sql, $F, $L, false);
                } // END - if
-       } elseif ((constant('_TABLE_TYPE') == "InnoDB") && (ereg("FULLTEXT", $sql))) {
+       } elseif ((getConfig('_TABLE_TYPE') == 'InnoDB') && (strpos($sql, 'FULLTEXT') !== false)) {
                // Skip this query silently
                //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Skipped FULLTEXT: sql=%s,file=%s,line=%s", $sql, $F, $L));
        } elseif (!$noIndex) {
                // And column name as well
-               $columnName = str_replace("`", '', $tableArray[4]);
+               $columnName = str_replace('`', '', $tableArray[4]);
 
                // Is this "UNIQUE" or so? FULLTEXT has been handled the elseif() block above
-               if (in_array(strtoupper($columnName), array("INDEX", "UNIQUE", "KEY", "FULLTEXT"))) {
+               if (in_array(strtoupper($columnName), array('INDEX', 'UNIQUE', 'KEY', 'FULLTEXT'))) {
                        // Init loop
-                       $begin = 1; $columnName = ",";
-                       while (strpos($columnName, ",") !== false) {
+                       $begin = 1; $columnName = ',';
+                       while (strpos($columnName, ',') !== false) {
                                // Use last
-                               $columnName = str_replace("`", '', $tableArray[count($tableArray) - $begin]);
+                               $columnName = str_replace('`', '', $tableArray[count($tableArray) - $begin]);
                                //* DEBUG: */ print __LINE__.':'.$columnName."----------------".$begin."<br />\n";
 
                                // Remove brackes
-                               $columnName = str_replace("(", '', str_replace(")", '', $columnName));
+                               $columnName = str_replace('(', '', str_replace(')', '', $columnName));
                                //* DEBUG: */ print __LINE__.':'.$columnName."----------------".$begin."<br />\n";
 
                                // Continue
@@ -400,7 +407,7 @@ function SQL_ALTER_TABLE ($sql, $F, $L) {
                } // END - if
 
                // Show indexes
-               $result = SQL_QUERY_ESC("SHOW INDEX FROM %s",
+               $result = SQL_QUERY_ESC("SHOW INDEX FROM `%s`",
                        array($tableName), __FILE__, __LINE__);
 
                // Walk through all