Mixing of // fixed

diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index 25a8307ccac534ebaaaab84e705ab48712e22cc0..b802cb34b341606997275595027d6d828aaa57ac 100644 (file)
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -132,7 +132,7 @@ function SQL_QUERY ($sqlString, $F, $L) {
 }
 
 // SQL num rows
-function SQL_NUMROWS ($result) {
+function SQL_NUMROWS ($resource) {
        // Valid link resource?
        if (!SQL_IS_LINK_UP()) return false;
 
@@ -140,12 +140,12 @@ function SQL_NUMROWS ($result) {
        $lines = false;
 
        // Is the result a valid resource?
-       if (is_resource($result)) {
+       if (is_resource($resource)) {
                // Get the count of rows from database
-               $lines = mysql_num_rows($result);
+               $lines = mysql_num_rows($resource);
        } else {
                // No resource given, please fix this
-               trigger_error('No resource given! result[]=' . gettype($result));
+               trigger_error('No resource given! result[]=' . gettype($resource));
        }
 
        // Return lines
@@ -165,37 +165,24 @@ function SQL_AFFECTEDROWS() {
 }
 
 // SQL fetch row
-function SQL_FETCHROW ($result) {
+function SQL_FETCHROW ($resource) {
        // Is a result resource set?
-       if ((!is_resource($result)) || (!SQL_IS_LINK_UP())) return false;
+       if ((!is_resource($resource)) || (!SQL_IS_LINK_UP())) return false;
 
        // Fetch the data and return it
-       return mysql_fetch_row($result);
+       return mysql_fetch_row($resource);
 }
 
 // SQL fetch array
-function SQL_FETCHARRAY ($res, $nr=0, $remove_numerical=true) {
+function SQL_FETCHARRAY ($res, $nr=0) {
        // Is a result resource set?
        if ((!is_resource($res)) || (!SQL_IS_LINK_UP())) return false;
 
-       // Initialize array
-       $row = array();
-
        // Load row from database
-       $row = mysql_fetch_array($res);
+       $row = mysql_fetch_assoc($res);
 
        // Return only arrays here
        if (is_array($row)) {
-               // Shall we remove numerical data here automatically?
-               if ($remove_numerical) {
-                       // So let's remove all numerical elements to save memory!
-                       $max = count($row);
-                       for ($idx = '0'; $idx < ($max / 2); $idx++) {
-                               // Remove entry
-                               unset($row[$idx]);
-                       } // END - for
-               } // END - if
-
                // Return row
                return $row;
        } else {
@@ -205,12 +192,14 @@ function SQL_FETCHARRAY ($res, $nr=0, $remove_numerical=true) {
 }
 
 // SQL result
-function SQL_RESULT ($res, $row, $field = '0') {
-       // Is $res valid?
-       if ((!is_resource($res)) || (!SQL_IS_LINK_UP())) return false;
+function SQL_RESULT ($resource, $row, $field = '0') {
+       // Is $resource valid?
+       if ((!is_resource($resource)) || (!SQL_IS_LINK_UP())) return false;
+
+       // Run the result command
+       $result = mysql_result($resource, $row, $field);
 
-       // Run the result command and return the result
-       $result = mysql_result($res, $row, $field);
+       // ... and return the result
        return $result;
 }
 
@@ -257,23 +246,26 @@ function SQL_CLOSE ($F, $L) {
 }
 
 // SQL free result
-function SQL_FREERESULT ($result) {
-       if ((!is_resource($result)) || (!SQL_IS_LINK_UP())) {
+function SQL_FREERESULT ($resource) {
+       if ((!is_resource($resource)) || (!SQL_IS_LINK_UP())) {
                // Abort here
                return false;
        } // END - if
 
-       $res = mysql_free_result($result);
+       // Free result
+       $res = mysql_free_result($resource);
+
+       // And return that result of freeing it...
        return $res;
 }
 
 // SQL string escaping
-function SQL_QUERY_ESC ($qstring, $data, $F, $L, $run=true, $strip=true, $secure=true) {
+function SQL_QUERY_ESC ($sqlString, $data, $F, $L, $run = true, $strip = true, $secure = true) {
        // Link is there?
        if ((!SQL_IS_LINK_UP()) || (!is_array($data))) return false;
 
        // Escape all data
-       $dataSecured['__sql_string'] = $qstring;
+       $dataSecured['__sql_string'] = $sqlString;
        foreach ($data as $key => $value) {
                $dataSecured[$key] = SQL_ESCAPE($value, $secure, $strip);
        } // END - foreach
@@ -283,8 +275,8 @@ function SQL_QUERY_ESC ($qstring, $data, $F, $L, $run=true, $strip=true, $secure
 
        // Debugging
        //
-       //* DEBUG: */ $fp = fopen(getConfig('CACHE_PATH') . 'escape_debug.log', 'a') or debug_report_bug(__FUNCTION__, __LINE__, "Cannot write debug.log!");
-       //* DEBUG: */ fwrite($fp, $F.'('.$L."): ".str_replace("\r", '', str_replace("\n", ' ', $eval))."\n");
+       //* DEBUG: */ $fp = fopen(getConfig('CACHE_PATH') . 'escape_debug.log', 'a') or debug_report_bug(__FUNCTION__, __LINE__, 'Cannot write debug.log!');
+       //* DEBUG: */ fwrite($fp, $F . '(' . $L . '): ' . str_replace("\r", '', str_replace("\n", ' ', $eval)) . "\n");
        //* DEBUG: */ fclose($fp);
 
        if ($run === true) {
@@ -303,7 +295,7 @@ function SQL_INSERTID () {
 }
 
 // Escape a string for the database
-function SQL_ESCAPE ($str, $secureString=true, $strip=true) {
+function SQL_ESCAPE ($str, $secureString = true, $strip = true) {
        // Do we have cache?
        if (!isset($GLOBALS['sql_escapes'][''.$str.''])) {
                // Secure string first? (which is the default behaviour!)