Re-layouted

diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index 513137e8b437c9ec6c92964b5147eb6fbabf386b..5e38261c4b25b4489be25d9f905f34e3688104b0 100644 (file)
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -32,15 +32,13 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
 
 // SQL queries
-function SQL_QUERY($sql_string, $F, $L)
-{
+function SQL_QUERY($sql_string, $F, $L) {
        global $link, $CSS, $_CONFIG, $OK;
 
        // Remove \t, \n and \r from queries they may confuse some MySQL version I have heard
@@ -59,8 +57,7 @@ function SQL_QUERY($sql_string, $F, $L)
         // Debug output
         //* DEBUG: */ print "Query=<pre>".$sql_string."</pre>, affected=<b>".SQL_AFFECTEDROWS()."</b>, numrows=<b>".SQL_NUMROWS($result)."</b><br />\n";
 
-       if (($CSS != "1") && ($CSS != "-1") && (isBooleanConstantAndTrue('DEBUG_MODE')) && (DEBUG_SQL))
-       {
+       if (($CSS != "1") && ($CSS != "-1") && (isBooleanConstantAndTrue('DEBUG_MODE')) && (DEBUG_SQL)) {
                //
                // Debugging stuff...
                //
@@ -75,13 +72,10 @@ function SQL_QUERY($sql_string, $F, $L)
        }
 
        // Count DB hits
-       if (!isset($_CONFIG['db_hits']))
-       {
+       if (!isset($_CONFIG['db_hits'])) {
                // Count in dummy variable
                $_CONFIG['db_hits'] = 0;
-       }
-        else
-       {
+       } else {
                // Count to config array
                $_CONFIG['db_hits']++;
        }
@@ -89,16 +83,12 @@ function SQL_QUERY($sql_string, $F, $L)
 }
 
 // SQL num rows
-function SQL_NUMROWS($result)
-{
-       if ($result != false)
-       {
+function SQL_NUMROWS($result) {
+       if ($result != false) {
                $lines = @mysql_num_rows($result);
                if (empty($lines)) $lines = "0";
 
-       }
-        else
-       {
+       } else {
                // No resource given, no lines found!
                $lines = "0";
        }
@@ -106,8 +96,7 @@ function SQL_NUMROWS($result)
 }
 
 // SQL affected rows
-function SQL_AFFECTEDROWS($lnk="x", $F="dummy", $L="dummy")
-{
+function SQL_AFFECTEDROWS($lnk="x", $F="dummy", $L="dummy") {
        global $link;
        // $lnk will be ignored for now!
        $lines = @mysql_affected_rows($link);
@@ -115,16 +104,14 @@ function SQL_AFFECTEDROWS($lnk="x", $F="dummy", $L="dummy")
 }
 
 // SQL fetch row
-function SQL_FETCHROW($result)
-{
+function SQL_FETCHROW($result) {
        $DATA = array();
        $DATA = @mysql_fetch_row($result);
        return $DATA;
 }
 
 // SQL fetch array
-function SQL_FETCHARRAY($res=false, $nr=0, $remove_numerical=true)
-{
+function SQL_FETCHARRAY($res=false, $nr=0, $remove_numerical=true) {
        // Is a result resource set?
        if (!$res) return false;
 
@@ -135,15 +122,12 @@ function SQL_FETCHARRAY($res=false, $nr=0, $remove_numerical=true)
        $row = @mysql_fetch_array($res);
 
        // Return only arrays here
-       if (is_array($row))
-       {
+       if (is_array($row)) {
                // Shall we remove numerical data here automatically?
-               if ($remove_numerical)
-               {
+               if ($remove_numerical) {
                                 // So let's remove all numerical elements to save memory!
                        $max = count($row);
-                       for ($idx = 0; $idx < ($max / 2); $idx++)
-                       {
+                       for ($idx = 0; $idx < ($max / 2); $idx++) {
                                // Remove entry
                                unset($row[$idx]);
                        }
@@ -151,29 +135,24 @@ function SQL_FETCHARRAY($res=false, $nr=0, $remove_numerical=true)
 
                // Return row
                return $row;
-       }
-        else
-       {
+       } else {
                // Return a false here...
                return false;
        }
 }
 
 // SQL result
-function SQL_RESULT($res, $row, $field)
-{
+function SQL_RESULT($res, $row, $field) {
        $result = @mysql_result($res, $row, $field);
        return $result;
 }
 // SQL connect
-function SQL_CONNECT($host, $login, $password, $F, $L)
-{
+function SQL_CONNECT($host, $login, $password, $F, $L) {
        $connect = @mysql_connect($host, $login, $password) or ADD_FATAL($F." (".$L."):".mysql_error());
        return $connect;
 }
 // SQL select database
-function SQL_SELECT_DB($DB, $link, $F, $L)
-{
+function SQL_SELECT_DB($DB, $link, $F, $L) {
        $select = false;
        if (is_resource($link)) {
                $select = @mysql_select_db($DB, $link) or ADD_FATAL($F." (".$L."):".mysql_error());
@@ -181,20 +160,16 @@ function SQL_SELECT_DB($DB, $link, $F, $L)
        return $select;
 }
 // SQL close link
-function SQL_CLOSE($link, $F, $L)
-{
+function SQL_CLOSE($link, $F, $L) {
        global $_CONFIG, $cacheInstance, $cacheArray;
-       if ((GET_EXT_VERSION("cache") >= "0.0.7") && (isset($_CONFIG['db_hits'])) && (isset($_CONFIG['cache_hits'])) && (is_object($cacheInstance)))
-       {
+       if ((GET_EXT_VERSION("cache") >= "0.0.7") && (isset($_CONFIG['db_hits'])) && (isset($_CONFIG['cache_hits'])) && (is_object($cacheInstance))) {
                // Update counter for db/cache
                $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_config SET db_hits=%d, cache_hits=%d WHERE config=0 LIMIT 1",
                        array(bigintval($_CONFIG['db_hits']), bigintval($_CONFIG['cache_hits'])), __FILE__, __LINE__);
 
                // Update cache here
-               if (GET_EXT_VERSION("cache") >= "0.1.2")
-               {
-                       if ($cacheInstance->cache_file("config", true))
-                       {
+               if (GET_EXT_VERSION("cache") >= "0.1.2") {
+                       if ($cacheInstance->cache_file("config", true)) {
                                // Replace data
                                $cacheInstance->cache_replace("cache_hits", $_CONFIG['cache_hits'], "0", $cacheArray);
                                $cacheInstance->cache_replace("db_hits"   , $_CONFIG['db_hits']   , "0", $cacheArray);
@@ -207,28 +182,22 @@ function SQL_CLOSE($link, $F, $L)
        return $close;
 }
 // SQL free result
-function SQL_FREERESULT($result)
-{
+function SQL_FREERESULT($result) {
        $res = @mysql_free_result($result);
        return $res;
 }
 // SQL string escaping
-function SQL_QUERY_ESC($qstring, $data, $file, $line, $run=true, $strip=true)
-{
+function SQL_QUERY_ESC($qstring, $data, $file, $line, $run=true, $strip=true) {
        global $link;
        $eval = "\$query = sprintf(\"".$qstring."\"";
-       foreach ($data as $var)
-       {
-               if (!empty($var))
-               {
+       foreach ($data as $var) {
+               if (!empty($var)) {
                        if ($strip) {
                                $eval .= ", SQL_ESCAPE(\"".strip_tags($var)."\")";
                        } else {
                                $eval .= ", SQL_ESCAPE(\"".$var."\")";
                        }
-               }
-                else
-               {
+               } else {
                        $eval .= ", ''";
                }
        }
@@ -240,25 +209,20 @@ function SQL_QUERY_ESC($qstring, $data, $file, $line, $run=true, $strip=true)
        //fwrite($fp, $file."(".$line."): ".str_replace('\r', "", str_replace('\n', " ", $eval))."\n");
        //fclose($fp);
        eval($eval);
-       if ($run)
-       {
+       if ($run) {
                // Run SQL query (default)
                return SQL_QUERY($query, $file, $line);
-       }
-        else
-       {
+       } else {
                // Return secured string
                return $query;
        }
 }
 // Get ID from last INSERT command
-function SQL_INSERTID()
-{
+function SQL_INSERTID() {
        return @mysql_insert_id();
 }
 // Escape a string for the database
-function SQL_ESCAPE($str)
-{
+function SQL_ESCAPE($str) {
        global $link;
        if (!is_resource($link)) {
                // Fall-back to addslashes() when there is no link