Nothing broken in testing

classes/comments.class.php

@@ -43,7 +43,6 @@ class Comments
         Subscriptions::quote_notify($Body, $PostID, $Page, $PageID);
 
         G::$DB->set_query_id($QueryID);
-
         return $PostID;
     }
 
@@ -136,7 +135,8 @@ class Comments
             return false;
         }
         list($Page, $PageID) = G::$DB->next_record();
-        // get number of pages
+
+        // Get number of pages
         G::$DB->query("
         SELECT
           CEIL(COUNT(ID) / " . TORRENT_COMMENTS_PER_PAGE . ") AS Pages,
@@ -145,8 +145,9 @@ class Comments
           WHERE Page = '$Page'
           AND PageID = $PageID
         GROUP BY PageID");
+
         if (!G::$DB->has_results()) {
-            // the comment $PostID was probably not posted on $Page
+            // The comment $PostID was probably not posted on $Page
             G::$DB->set_query_id($QueryID);
             return false;
         }
@@ -159,6 +160,7 @@ class Comments
         G::$DB->query("
         DELETE FROM comments
           WHERE ID = $PostID");
+
         G::$DB->query("
         DELETE FROM comments_edits
           WHERE Page = '$Page'
@@ -180,14 +182,12 @@ class Comments
         }
 
         G::$Cache->delete_value($Page . '_comments_' . $PageID);
-
         if ($Page === 'collages') {
             // On collages, we also need to clear the collage key (collage_$CollageID), because it has the comments in it... (why??)
             G::$Cache->delete_value("collage_$PageID");
         }
 
         G::$DB->set_query_id($QueryID);
-
         return true;
     }
 
@@ -223,7 +223,6 @@ class Comments
     public static function get_url_query($PostID)
     {
         $QueryID = G::$DB->get_query_id();
-
         G::$DB->query("
         SELECT Page, PageID
         FROM comments
@@ -272,11 +271,12 @@ class Comments
         // Format::page_limit handles a potential $_GET['page']
         if (isset($_GET['postid']) && is_number($_GET['postid']) && $NumComments > TORRENT_COMMENTS_PER_PAGE) {
             G::$DB->query("
-        SELECT COUNT(ID)
-        FROM comments
-        WHERE Page = '$Page'
-          AND PageID = $PageID
-          AND ID <= $_GET[postid]");
+            SELECT COUNT(ID)
+            FROM comments
+              WHERE Page = '$Page'
+              AND PageID = $PageID
+              AND ID <= $_GET[postid]");
+
             list($PostNum) = G::$DB->next_record();
             list($CommPage, $Limit) = Format::page_limit(TORRENT_COMMENTS_PER_PAGE, $PostNum);
         } else {
@@ -291,20 +291,21 @@ class Comments
         if ($Catalogue === false) {
             $CatalogueLimit = $CatalogueID * THREAD_CATALOGUE . ', ' . THREAD_CATALOGUE;
             G::$DB->query("
-                SELECT
-                  c.ID,
-                  c.AuthorID,
-                  c.AddedTime,
-                  c.Body,
-                  c.EditedUserID,
-                  c.EditedTime,
-                  u.Username
-                FROM comments AS c
-                  LEFT JOIN users_main AS u ON u.ID = c.EditedUserID
-                  WHERE c.Page = '$Page'
-                  AND c.PageID = $PageID
-                ORDER BY c.ID
-                LIMIT $CatalogueLimit");
+            SELECT
+              c.ID,
+              c.AuthorID,
+              c.AddedTime,
+              c.Body,
+              c.EditedUserID,
+              c.EditedTime,
+              u.Username
+            FROM comments AS c
+              LEFT JOIN users_main AS u ON u.ID = c.EditedUserID
+              WHERE c.Page = '$Page'
+              AND c.PageID = $PageID
+            ORDER BY c.ID
+              LIMIT $CatalogueLimit");
+
             $Catalogue = G::$DB->to_array(false, MYSQLI_ASSOC);
             G::$Cache->cache_value($Page.'_comments_'.$PageID.'_catalogue_'.$CatalogueID, $Catalogue, 0);
         }
@@ -318,34 +319,37 @@ class Comments
             $LastPost = $LastPost['ID'];
             $FirstPost = reset($Thread);
             $FirstPost = $FirstPost['ID'];
+
             G::$DB->query("
-                UPDATE users_notify_quoted
-                SET UnRead = false
-                  WHERE UserID = " . G::$LoggedUser['ID'] . "
-                  AND Page = '$Page'
-                  AND PageID = $PageID
-                  AND PostID >= $FirstPost
-                  AND PostID <= $LastPost");
+            UPDATE users_notify_quoted
+            SET UnRead = false
+              WHERE UserID = " . G::$LoggedUser['ID'] . "
+              AND Page = '$Page'
+              AND PageID = $PageID
+              AND PostID >= $FirstPost
+              AND PostID <= $LastPost");
+
             if (G::$DB->affected_rows()) {
                 G::$Cache->delete_value('notify_quoted_' . G::$LoggedUser['ID']);
             }
 
             // Last read
             G::$DB->query("
-        SELECT PostID
-        FROM users_comments_last_read
-          WHERE UserID = " . G::$LoggedUser['ID'] . "
-          AND Page = '$Page'
-          AND PageID = $PageID");
+            SELECT PostID
+            FROM users_comments_last_read
+              WHERE UserID = " . G::$LoggedUser['ID'] . "
+              AND Page = '$Page'
+              AND PageID = $PageID");
+
             list($LastRead) = G::$DB->next_record();
             if ($LastRead < $LastPost) {
                 G::$DB->query("
-          INSERT INTO users_comments_last_read
-            (UserID, Page, PageID, PostID)
-          VALUES
-            (" . G::$LoggedUser['ID'] . ", '$Page', $PageID, $LastPost)
-          ON DUPLICATE KEY UPDATE
-            PostID = $LastPost");
+                INSERT INTO users_comments_last_read
+                  (UserID, Page, PageID, PostID)
+                VALUES
+                  (" . G::$LoggedUser['ID'] . ", '$Page', $PageID, $LastPost)
+                ON DUPLICATE KEY UPDATE
+                  PostID = $LastPost");
                 G::$Cache->delete_value('subscriptions_user_new_' . G::$LoggedUser['ID']);
             }
         } else {
@@ -353,7 +357,6 @@ class Comments
         }
 
         G::$DB->set_query_id($QueryID);
-
         return array($NumComments, $CommPage, $Thread, $LastRead);
     }
 

classes/debug.class.php

@@ -32,19 +32,22 @@ class DEBUG
         if ($Errors > MAX_ERRORS && !defined('ERROR_EXCEPTION')) {
             $Reason[] = $Errors.' PHP errors';
         }
+
         /*
         $Queries = count($this->get_queries());
         if ($Queries > MAX_QUERIES && !defined('QUERY_EXCEPTION')) {
           $Reason[] = $Queries.' Queries';
         }
         */
+
         $Ram = memory_get_usage(true);
         if ($Ram > MAX_MEMORY && !defined('MEMORY_EXCEPTION')) {
             $Reason[] = Format::get_size($Ram).' RAM used';
         }
 
-        G::$DB->warnings(); // see comment in MYSQL::query
-        /*$Queries = $this->get_queries();
+        G::$DB->warnings(); // See comment in MYSQL::query
+        /*
+        $Queries = $this->get_queries();
         $DBWarningCount = 0;
         foreach ($Queries as $Query) {
           if (!empty($Query[2])) {
@@ -53,7 +56,8 @@ class DEBUG
         }
         if ($DBWarningCount) {
           $Reason[] = $DBWarningCount . ' DB warning(s)';
-        }*/
+        }
+        */
 
         $CacheStatus = G::$Cache->server_status();
         if (in_array(0, $CacheStatus) && !G::$Cache->get_value('cache_fail_reported')) {
@@ -75,7 +79,6 @@ class DEBUG
             $this->analysis(implode(', ', $Reason));
             return true;
         }
-
         return false;
     }
 
@@ -87,21 +90,22 @@ class DEBUG
         }
         $Identifier = Users::make_secret(5);
         G::$Cache->cache_value(
-        'analysis_'.$Identifier,
-        array(
-        'url' => $_SERVER['REQUEST_URI'],
-        'message' => $Report,
-        'errors' => $this->get_errors(true),
-        'queries' => $this->get_queries(),
-        'flags' => $this->get_flags(),
-        'includes' => $this->get_includes(),
-        'cache' => $this->get_cache_keys(),
-        'vars' => $this->get_logged_vars(),
-        'perf' => $this->get_perf(),
-        'ocelot' => $this->get_ocelot_requests()
-      ),
-        $Time
-    );
+            'analysis_'.$Identifier,
+            array(
+                'url' => $_SERVER['REQUEST_URI'],
+                'message' => $Report,
+                'errors' => $this->get_errors(true),
+                'queries' => $this->get_queries(),
+                'flags' => $this->get_flags(),
+                'includes' => $this->get_includes(),
+                'cache' => $this->get_cache_keys(),
+                'vars' => $this->get_logged_vars(),
+                'perf' => $this->get_perf(),
+                'ocelot' => $this->get_ocelot_requests()
+            ),
+            $Time
+        );
+
         $RequestURI = !empty($_SERVER['REQUEST_URI']) ? substr($_SERVER['REQUEST_URI'], 1) : '';
         send_irc('PRIVMSG '.LAB_CHAN." :{$Message} $Document ".site_url()."tools.php?action=analysis&case=$Identifier ".site_url().$RequestURI);
     }
@@ -121,9 +125,11 @@ class DEBUG
     {
         $BackTrace = debug_backtrace();
         $ID = Users::make_secret(5);
+
         if (!$VarName) {
             $VarName = $ID;
         }
+
         $File = array('path' => substr($BackTrace[0]['file'], strlen(SERVER_ROOT)), 'line' => $BackTrace[0]['line']);
         $this->LoggedVars[$ID] = array($VarName => array('bt' => $File, 'data' => $Var));
     }
@@ -134,7 +140,7 @@ class DEBUG
         $this->Flags[] = array($Event, (microtime(true) - $ScriptStartTime) * 1000, memory_get_usage(true), $this->get_cpu_time());
     }
 
-    //This isn't in the constructor because $this is not available, and the function cannot be made static
+    // This isn't in the constructor because $this is not available, and the function cannot be made static
     public function handle_errors()
     {
         //error_reporting(E_ALL ^ E_STRICT | E_WARNING | E_DEPRECATED | E_ERROR | E_PARSE); //E_STRICT disabled
@@ -151,6 +157,7 @@ class DEBUG
             if (!is_int($Key) || !is_int($LastKey) || $Key != $LastKey + 1) {
                 $Return[$Key] .= "'$Key' => ";
             }
+
             if ($Val === true) {
                 $Return[$Key] .= 'true';
             } elseif ($Val === false) {
@@ -164,6 +171,7 @@ class DEBUG
             } elseif (is_array($Val)) {
                 $Return[$Key] .= 'array('.$this->format_args($Val).')';
             }
+
             $LastKey = $Key;
         }
         return implode(', ', $Return);
@@ -171,47 +179,47 @@ class DEBUG
 
     public function php_error_handler($Level, $Error, $File, $Line)
     {
-        //Who added this, it's still something to pay attention to...
+        // Who added this, it's still something to pay attention to...
         if (stripos('Undefined index', $Error) !== false) {
             //return true;
         }
 
-        $Steps = 1; //Steps to go up in backtrace, default one
+        $Steps = 1; // Steps to go up in backtrace, default one
         $Call = '';
         $Args = '';
         $Tracer = debug_backtrace();
 
-        //This is in case something in this function goes wrong and we get stuck with an infinite loop
+        // This is in case something in this function goes wrong and we get stuck with an infinite loop
         if (isset($Tracer[$Steps]['function'], $Tracer[$Steps]['class']) && $Tracer[$Steps]['function'] == 'php_error_handler' && $Tracer[$Steps]['class'] == 'DEBUG') {
             return true;
         }
 
-        //If this error was thrown, we return the function which threw it
+        // If this error was thrown, we return the function which threw it
         if (isset($Tracer[$Steps]['function']) && $Tracer[$Steps]['function'] == 'trigger_error') {
             $Steps++;
             $File = $Tracer[$Steps]['file'];
             $Line = $Tracer[$Steps]['line'];
         }
 
-        //At this time ONLY Array strict typing is fully supported.
-        //Allow us to abuse strict typing (IE: function test(Array))
+        // At this time ONLY Array strict typing is fully supported.
+        // Allow us to abuse strict typing (IE: function test(Array))
         if (preg_match('/^Argument (\d+) passed to \S+ must be an (array), (array|string|integer|double|object) given, called in (\S+) on line (\d+) and defined$/', $Error, $Matches)) {
             $Error = 'Type hinting failed on arg '.$Matches[1]. ', expected '.$Matches[2].' but found '.$Matches[3];
             $File = $Matches[4];
             $Line = $Matches[5];
         }
 
-        //Lets not be repetative
+        // Let's not be repetative
         if (($Tracer[$Steps]['function'] == 'include' || $Tracer[$Steps]['function'] == 'require') && isset($Tracer[$Steps]['args'][0]) && $Tracer[$Steps]['args'][0] == $File) {
             unset($Tracer[$Steps]['args']);
         }
 
-        //Class
+        // Class
         if (isset($Tracer[$Steps]['class'])) {
             $Call .= $Tracer[$Steps]['class'].'::';
         }
 
-        //Function & args
+        // Function & args
         if (isset($Tracer[$Steps]['function'])) {
             $Call .= $Tracer[$Steps]['function'];
             if (isset($Tracer[$Steps]['args'][0])) {
@@ -219,7 +227,7 @@ class DEBUG
             }
         }
 
-        //Shorten the path & we're done
+        // Shorten the path & we're done
         $File = str_replace(SERVER_ROOT, '', $File);
         $Error = str_replace(SERVER_ROOT, '', $Error);
 
@@ -238,8 +246,9 @@ class DEBUG
             $PageTime = (microtime(true) - $ScriptStartTime);
             $CPUTime = $this->get_cpu_time();
             $Perf = array(
-        'Memory usage' => Format::get_size(memory_get_usage(true)),
-        'Page process time' => number_format($PageTime, 3).' s');
+                'Memory usage' => Format::get_size(memory_get_usage(true)),
+                'Page process time' => number_format($PageTime, 3).' s');
+
             if ($CPUTime) {
                 $Perf['CPU time'] = number_format($CPUTime / 1000000, 3).' s';
             }
@@ -255,7 +264,7 @@ class DEBUG
 
     public function get_errors($Light = false)
     {
-        //Because the cache can't take some of these variables
+        // Because the cache can't take some of these variables
         if ($Light) {
             foreach ($this->Errors as $Key => $Value) {
                 $this->Errors[$Key][3] = '';
@@ -347,6 +356,7 @@ class DEBUG
         if (empty($Perf)) {
             return;
         } ?>
+
 <table class="layout">
   <tr>
     <td><strong><a href="#" onclick="$(this).parents('.layout').next('#debug_perf').gtoggle(); return false;"
@@ -374,12 +384,20 @@ class DEBUG
         if (!is_array($Includes)) {
             $Includes = $this->get_includes();
         } ?>
+
 <table class="layout">
   <tr>
-    <td><strong><a href="#" onclick="$(this).parents('.layout').next('#debug_include').gtoggle(); return false;"
-          class="brackets">View</a> <?=number_format(count($Includes))?> Includes:</strong></td>
+    <td>
+      <strong>
+        <a href="#" onclick="$(this).parents('.layout').next('#debug_include').gtoggle(); return false;"
+          class="brackets">View</a>
+        <?=number_format(count($Includes))?>
+        Includes:
+      </strong>
+    </td>
   </tr>
 </table>
+
 <table id="debug_include" class="debug_table hidden">
   <?php
     foreach ($Includes as $File) {
@@ -401,15 +419,22 @@ class DEBUG
         } ?>
 <table class="layout">
   <tr>
-    <td><strong><a href="#" onclick="$(this).parents('.layout').next('#debug_classes').gtoggle(); return false;"
-          class="brackets">View</a> Classes:</strong></td>
+    <td>
+      <strong>
+        <a href="#" onclick="$(this).parents('.layout').next('#debug_classes').gtoggle(); return false;"
+          class="brackets">View</a>
+        Classes:
+      </strong>
+    </td>
   </tr>
 </table>
+
 <table id="debug_classes" class="debug_table hidden">
   <tr>
     <td>
       <pre>
-<?php          print_r($Classes);
+<?php
+print_r($Classes);
         echo "\n"; ?>
         </pre>
     </td>
@@ -423,15 +448,21 @@ class DEBUG
         ?>
 <table class="layout">
   <tr>
-    <td><strong><a href="#" onclick="$(this).parents('.layout').next('#debug_extensions').gtoggle(); return false;"
-          class="brackets">View</a> Extensions:</strong></td>
+    <td>
+      <strong>
+        <a href="#" onclick="$(this).parents('.layout').next('#debug_extensions').gtoggle(); return false;"
+          class="brackets">View</a>
+        Extensions:
+      </strong>
+    </td>
   </tr>
 </table>
 <table id="debug_extensions" class="debug_table hidden">
   <tr>
     <td>
       <pre>
-<?php          print_r($this->get_extensions());
+<?php
+print_r($this->get_extensions());
         echo "\n"; ?>
         </pre>
     </td>
@@ -445,24 +476,33 @@ class DEBUG
         if (!is_array($Flags)) {
             $Flags = $this->get_flags();
         }
+
         if (empty($Flags)) {
             return;
         } ?>
+
 <table class="layout">
   <tr>
-    <td><strong><a href="#" onclick="$(this).parents('.layout').next('#debug_flags').gtoggle(); return false;"
-          class="brackets">View</a> Flags:</strong></td>
+    <td>
+      <strong>
+        <a href="#" onclick="$(this).parents('.layout').next('#debug_flags').gtoggle(); return false;"
+          class="brackets">View</a>
+        Flags:
+      </strong>
+    </td>
   </tr>
 </table>
+
 <table id="debug_flags" class="debug_table hidden">
   <tr class="valign_top">
     <td class="debug_flags_event"><strong>Event</strong></td>
     <td class="debug_flags_time"><strong>Page time</strong></td>
-    <?php    if ($Flags[0][3] !== false) { ?>
+    <?php if ($Flags[0][3] !== false) { ?>
     <td class="debug_flags_time"><strong>CPU time</strong></td>
-    <?php    } ?>
+    <?php } ?>
     <td class="debug_flags_memory"><strong>Memory</strong></td>
   </tr>
+
   <?php
     foreach ($Flags as $Flag) {
         list($Event, $MicroTime, $Memory, $CPUTime) = $Flag; ?>
@@ -470,9 +510,9 @@ class DEBUG
     <td><?=$Event?>
     </td>
     <td><?=number_format($MicroTime, 3)?> ms</td>
-    <?php      if ($CPUTime !== false) { ?>
+    <?php if ($CPUTime !== false) { ?>
     <td><?=number_format($CPUTime / 1000, 3)?> ms</td>
-    <?php      } ?>
+    <?php } ?>
     <td><?=Format::get_size($Memory)?>
     </td>
   </tr>
@@ -487,17 +527,24 @@ class DEBUG
         if (!is_array($Constants)) {
             $Constants = $this->get_constants();
         } ?>
+
 <table class="layout">
   <tr>
-    <td><strong><a href="#" onclick="$(this).parents('.layout').next('#debug_constants').gtoggle(); return false;"
-          class="brackets">View</a> Constants:</strong></td>
+    <td>
+      <strong>
+        <a href="#" onclick="$(this).parents('.layout').next('#debug_constants').gtoggle(); return false;"
+          class="brackets">View</a>
+        Constants:
+      </strong>
+    </td>
   </tr>
 </table>
+
 <table id="debug_constants" class="debug_table hidden">
   <tr>
     <td class="debug_data debug_constants_data">
       <pre>
-<?=         display_str(print_r($Constants, true))?>
+<?=display_str(print_r($Constants, true))?>
         </pre>
     </td>
   </tr>
@@ -510,23 +557,32 @@ class DEBUG
         if (!is_array($OcelotRequests)) {
             $OcelotRequests = $this->get_ocelot_requests();
         }
+
         if (empty($OcelotRequests)) {
             return;
         } ?>
+
 <table class="layout">
   <tr>
-    <td><strong><a data-toggle-target="#debug_ocelot" class="brackets">View</a> <?=number_format(count($OcelotRequests))?> Ocelot requests:</strong>
+    <td>
+      <strong>
+        <a data-toggle-target="#debug_ocelot" class="brackets">View</a>
+        <?=number_format(count($OcelotRequests))?>
+        Ocelot requests:
+      </strong>
     </td>
   </tr>
 </table>
+
 <table id="debug_ocelot" class="debug_table hidden">
-  <?php    foreach ($OcelotRequests as $i => $Request) { ?>
+  <?php foreach ($OcelotRequests as $i => $Request) { ?>
   <tr>
     <td class="debug_data debug_ocelot_data">
       <a data-toggle-target="#debug_ocelot_<?=$i?>"><?=display_str($Request['path'])?></a>
       <pre id="debug_ocelot_<?=$i?>"
         class="hidden"><?=display_str($Request['response'])?></pre>
     </td>
+
     <td class="debug_info" style="width: 100px;">
       <?=display_str($Request['status'])?>
     </td>
@@ -534,7 +590,7 @@ class DEBUG
       <?=number_format($Request['time'], 5)?> ms
     </td>
   </tr>
-  <?php    } ?>
+  <?php } ?>
 </table>
 <?php
     }
@@ -546,18 +602,26 @@ class DEBUG
             $CacheKeys = $this->get_cache_keys();
             $Header .= ' ('.number_format($this->get_cache_time(), 5).' ms)';
         }
+
         if (empty($CacheKeys)) {
             return;
         }
         $Header = ' '.number_format(count($CacheKeys))." $Header:"; ?>
+
 <table class="layout">
   <tr>
-    <td><strong><a href="#" onclick="$(this).parents('.layout').next('#debug_cache').gtoggle(); return false;"
-          class="brackets">View</a><?=$Header?></strong></td>
+    <td>
+      <strong>
+        <a href="#" onclick="$(this).parents('.layout').next('#debug_cache').gtoggle(); return false;"
+          class="brackets">View</a>
+        <?=$Header?>
+      </strong>
+    </td>
   </tr>
 </table>
+
 <table id="debug_cache" class="debug_table hidden">
-  <?php    foreach ($CacheKeys as $Key) { ?>
+  <?php foreach ($CacheKeys as $Key) { ?>
   <tr>
     <td class="label nobr debug_info debug_cache_key">
       <a href="#"
@@ -567,11 +631,11 @@ class DEBUG
     </td>
     <td class="debug_data debug_cache_data">
       <pre id="debug_cache_<?=$Key?>" class="hidden">
-<?=         display_str(print_r(G::$Cache->get_value($Key, true), true))?>
+<?=display_str(print_r(G::$Cache->get_value($Key, true), true))?>
         </pre>
     </td>
   </tr>
-  <?php    } ?>
+  <?php } ?>
 </table>
 <?php
     }
@@ -581,13 +645,21 @@ class DEBUG
         if (!is_array($Errors)) {
             $Errors = $this->get_errors();
         }
+
         if (empty($Errors)) {
             return;
         } ?>
+
 <table class="layout">
   <tr>
-    <td><strong><a href="#" onclick="$(this).parents('.layout').next('#debug_error').gtoggle(); return false;"
-          class="brackets">View</a> <?=number_format(count($Errors))?> Errors:</strong></td>
+    <td>
+      <strong>
+        <a href="#" onclick="$(this).parents('.layout').next('#debug_error').gtoggle(); return false;"
+          class="brackets">View</a>
+        <?=number_format(count($Errors))?>
+        Errors:
+      </strong>
+    </td>
   </tr>
 </table>
 <table id="debug_error" class="debug_table hidden">
@@ -618,30 +690,41 @@ class DEBUG
             $Queries = $this->get_queries();
             $Header .= ' ('.number_format($this->get_query_time(), 5).' ms)';
         }
+
         if (empty($Queries)) {
             return;
         }
         $Header = ' '.number_format(count($Queries))." $Header:"; ?>
+
 <table class="layout">
   <tr>
-    <td><strong><a href="#" onclick="$(this).parents('.layout').next('#debug_database').gtoggle(); return false;"
-          class="brackets">View</a><?=$Header?></strong></td>
+    <td>
+      <strong>
+        <a href="#" onclick="$(this).parents('.layout').next('#debug_database').gtoggle(); return false;"
+          class="brackets">View</a>
+        <?=$Header?>
+      </strong>
+    </td>
   </tr>
 </table>
+
 <table id="debug_database" class="debug_table hidden">
   <?php
     foreach ($Queries as $Query) {
         $SQL = $Query[0] ?? null;
         $Time = $Query[1] ?? null;
         $Warnings = $Query[2] ?? null;
+
         if ($Warnings !== null) {
             $Warnings = implode('<br />', $Warnings);
         } ?>
+
   <tr class="valign_top">
     <td class="debug_data debug_query_data">
       <div><?=str_replace("\t", '&nbsp;&nbsp;', nl2br(display_str(trim($SQL))))?>
       </div>
     </td>
+
     <td class="debug_info debug_query_time" style="width: 130px;"><?=number_format($Time, 5)?> ms</td>
     <td class="debug_info debug_query_warnings"><?=$Warnings?>
     </td>
@@ -659,14 +742,21 @@ class DEBUG
             $Queries = $this->get_sphinxql_queries();
             $Header .= ' ('.number_format($this->get_sphinxql_time(), 5).' ms)';
         }
+
         if (empty($Queries)) {
             return;
         }
         $Header = ' '.number_format(count($Queries))." $Header:"; ?>
+
 <table class="layout">
   <tr>
-    <td><strong><a href="#" onclick="$(this).parents('.layout').next('#debug_sphinx').gtoggle(); return false;"
-          class="brackets">View</a><?=$Header?></strong></td>
+    <td>
+      <strong>
+        <a href="#" onclick="$(this).parents('.layout').next('#debug_sphinx').gtoggle(); return false;"
+          class="brackets">View</a>
+        <?=$Header?>
+      </strong>
+    </td>
   </tr>
 </table>
 <table id="debug_sphinx" class="debug_table hidden">
@@ -695,12 +785,19 @@ class DEBUG
             $Vars = $this->LoggedVars;
         }
         $Header = ' '.number_format(count($Vars))." $Header:"; ?>
+
 <table class="layout">
   <tr>
-    <td><strong><a href="#" onclick="$(this).parents('.layout').next('#debug_loggedvars').gtoggle(); return false;"
-          class="brackets">View</a><?=$Header?></strong></td>
+    <td>
+      <strong>
+        <a href="#" onclick="$(this).parents('.layout').next('#debug_loggedvars').gtoggle(); return false;"
+          class="brackets">View</a>
+        <?=$Header?>
+      </strong>
+    </td>
   </tr>
 </table>
+
 <table id="debug_loggedvars" class="debug_table hidden">
   <?php
     foreach ($Vars as $ID => $Var) {
@@ -710,13 +807,15 @@ class DEBUG
   <tr>
     <td class="debug_info debug_loggedvars_name">
       <a href="#"
-        onclick="$('#debug_loggedvars_<?=$ID?>').gtoggle(); return false;"><?=display_str($Key)?></a> (<?=$Size . ($Size == 1 ? ' element' : ' elements')?>)
-      <div><?=$Data['bt']['path'].':'.$Data['bt']['line']; ?>
+        onclick="$('#debug_loggedvars_<?=$ID?>').gtoggle(); return false;"><?=display_str($Key)?></a>
+      (<?=$Size . ($Size == 1 ? ' element' : ' elements')?>)
+      <div>
+        <?=$Data['bt']['path'].':'.$Data['bt']['line']; ?>
       </div>
     </td>
     <td class="debug_data debug_loggedvars_data">
       <pre id="debug_loggedvars_<?=$ID?>" class="hidden">
-<?=         display_str(print_r($Data['data'], true))?>
+<?=display_str(print_r($Data['data'], true))?>
         </pre>
     </td>
   </tr>

classes/forums.class.php

@@ -15,52 +15,57 @@ class Forums
         if ((!$ThreadInfo = G::$Cache->get_value('thread_' . $ThreadID . '_info')) || !isset($ThreadInfo['Ranking'])) {
             $QueryID = G::$DB->get_query_id();
             G::$DB->query("
-        SELECT
-          t.Title,
-          t.ForumID,
-          t.IsLocked,
-          t.IsSticky,
-          COUNT(fp.id) AS Posts,
-          t.LastPostAuthorID,
-          ISNULL(p.TopicID) AS NoPoll,
-          t.StickyPostID,
-          t.AuthorID as OP,
-          t.Ranking
-        FROM forums_topics AS t
-          JOIN forums_posts AS fp ON fp.TopicID = t.ID
-          LEFT JOIN forums_polls AS p ON p.TopicID = t.ID
-        WHERE t.ID = ?
-        GROUP BY fp.TopicID", $ThreadID);
+            SELECT
+              t.Title,
+              t.ForumID,
+              t.IsLocked,
+              t.IsSticky,
+              COUNT(fp.id) AS Posts,
+              t.LastPostAuthorID,
+              ISNULL(p.TopicID) AS NoPoll,
+              t.StickyPostID,
+              t.AuthorID as OP,
+              t.Ranking
+            FROM forums_topics AS t
+              JOIN forums_posts AS fp ON fp.TopicID = t.ID
+              LEFT JOIN forums_polls AS p ON p.TopicID = t.ID
+            WHERE t.ID = ?
+            GROUP BY fp.TopicID", $ThreadID);
+
             if (!G::$DB->has_results()) {
                 G::$DB->set_query_id($QueryID);
                 return null;
             }
+
             $ThreadInfo = G::$DB->next_record(MYSQLI_ASSOC, false);
             if ($ThreadInfo['StickyPostID']) {
                 $ThreadInfo['Posts']--;
                 G::$DB->query(
-            "SELECT
-            p.ID,
-            p.AuthorID,
-            p.AddedTime,
-            p.Body,
-            p.EditedUserID,
-            p.EditedTime,
-            ed.Username
-            FROM forums_posts AS p
-              LEFT JOIN users_main AS ed ON ed.ID = p.EditedUserID
-            WHERE p.TopicID = ?
-              AND p.ID = ?",
-            $ThreadID,
-            $ThreadInfo['StickyPostID']
-        );
+                    "
+                SELECT
+                  p.ID,
+                  p.AuthorID,
+                  p.AddedTime,
+                  p.Body,
+                  p.EditedUserID,
+                  p.EditedTime,
+                  ed.Username
+                FROM forums_posts AS p
+                  LEFT JOIN users_main AS ed ON ed.ID = p.EditedUserID
+                WHERE p.TopicID = ?
+                  AND p.ID = ?",
+                    $ThreadID,
+                    $ThreadInfo['StickyPostID']
+                );
                 list($ThreadInfo['StickyPost']) = G::$DB->to_array(false, MYSQLI_ASSOC);
             }
+
             G::$DB->set_query_id($QueryID);
             if (!$SelectiveCache || !$ThreadInfo['IsLocked'] || $ThreadInfo['IsSticky']) {
                 G::$Cache->cache_value('thread_' . $ThreadID . '_info', $ThreadInfo, 0);
             }
         }
+        
         if ($Return) {
             return $ThreadInfo;
         }
@@ -79,12 +84,15 @@ class Forums
         if (isset(G::$LoggedUser['CustomForums'][$ForumID]) && G::$LoggedUser['CustomForums'][$ForumID] == 1) {
             return true;
         }
+
         if ($ForumID == DONOR_FORUM && Donations::has_donor_forum(G::$LoggedUser['ID'])) {
             return true;
         }
+
         if ($Forums[$ForumID]['MinClass' . $Perm] > G::$LoggedUser['Class'] && (!isset(G::$LoggedUser['CustomForums'][$ForumID]) || G::$LoggedUser['CustomForums'][$ForumID] == 0)) {
             return false;
         }
+        
         if (isset(G::$LoggedUser['CustomForums'][$ForumID]) && G::$LoggedUser['CustomForums'][$ForumID] == 0) {
             return false;
         }
@@ -102,24 +110,25 @@ class Forums
         if (!$Forum) {
             $QueryID = G::$DB->get_query_id();
             G::$DB->query("
-        SELECT
-          Name,
-          MinClassRead,
-          MinClassWrite,
-          MinClassCreate,
-          COUNT(forums_topics.ID) AS Topics
-        FROM forums
-          LEFT JOIN forums_topics ON forums_topics.ForumID = forums.ID
-        WHERE forums.ID = ?
-        GROUP BY ForumID", $ForumID);
+            SELECT
+              Name,
+              MinClassRead,
+              MinClassWrite,
+              MinClassCreate,
+              COUNT(forums_topics.ID) AS Topics
+            FROM forums
+              LEFT JOIN forums_topics ON forums_topics.ForumID = forums.ID
+            WHERE forums.ID = ?
+              GROUP BY ForumID", $ForumID);
+
             if (!G::$DB->has_results()) {
                 return false;
             }
+
             // Makes an array, with $Forum['Name'], etc.
             $Forum = G::$DB->next_record(MYSQLI_ASSOC);
 
             G::$DB->set_query_id($QueryID);
-
             G::$Cache->cache_value("ForumInfo_$ForumID", $Forum, 86400);
         }
         return $Forum;
@@ -135,12 +144,14 @@ class Forums
         if ($ForumCats === false) {
             $QueryID = G::$DB->get_query_id();
             G::$DB->query("
-        SELECT ID, Name
-        FROM forums_categories");
+            SELECT ID, Name
+            FROM forums_categories");
+
             $ForumCats = [];
             while (list($ID, $Name) = G::$DB->next_record()) {
                 $ForumCats[$ID] = $Name;
             }
+
             G::$DB->set_query_id($QueryID);
             G::$Cache->cache_value('forums_categories', $ForumCats, 0);
         }
@@ -156,38 +167,40 @@ class Forums
         if (!$Forums = G::$Cache->get_value('forums_list')) {
             $QueryID = G::$DB->get_query_id();
             G::$DB->query("
-        SELECT
-          f.ID,
-          f.CategoryID,
-          f.Name,
-          f.Description,
-          f.MinClassRead AS MinClassRead,
-          f.MinClassWrite AS MinClassWrite,
-          f.MinClassCreate AS MinClassCreate,
-          f.NumTopics,
-          f.NumPosts,
-          f.LastPostID,
-          f.LastPostAuthorID,
-          f.LastPostTopicID,
-          f.LastPostTime,
-          0 AS SpecificRules,
-          t.Title,
-          t.IsLocked AS Locked,
-          t.IsSticky AS Sticky
-        FROM forums AS f
-          JOIN forums_categories AS fc ON fc.ID = f.CategoryID
-          LEFT JOIN forums_topics AS t ON t.ID = f.LastPostTopicID
-        GROUP BY f.ID
-        ORDER BY fc.Sort, fc.Name, f.CategoryID, f.Sort");
+            SELECT
+              f.ID,
+              f.CategoryID,
+              f.Name,
+              f.Description,
+              f.MinClassRead AS MinClassRead,
+              f.MinClassWrite AS MinClassWrite,
+              f.MinClassCreate AS MinClassCreate,
+              f.NumTopics,
+              f.NumPosts,
+              f.LastPostID,
+              f.LastPostAuthorID,
+              f.LastPostTopicID,
+              f.LastPostTime,
+              0 AS SpecificRules,
+              t.Title,
+              t.IsLocked AS Locked,
+              t.IsSticky AS Sticky
+            FROM forums AS f
+              JOIN forums_categories AS fc ON fc.ID = f.CategoryID
+              LEFT JOIN forums_topics AS t ON t.ID = f.LastPostTopicID
+            GROUP BY f.ID
+              ORDER BY fc.Sort, fc.Name, f.CategoryID, f.Sort");
             $Forums = G::$DB->to_array('ID', MYSQLI_ASSOC, false);
 
             G::$DB->query("
-        SELECT ForumID, ThreadID
-        FROM forums_specific_rules");
+            SELECT ForumID, ThreadID
+            FROM forums_specific_rules");
+
             $SpecificRules = [];
             while (list($ForumID, $ThreadID) = G::$DB->next_record(MYSQLI_NUM, false)) {
                 $SpecificRules[$ForumID][] = $ThreadID;
             }
+
             G::$DB->set_query_id($QueryID);
             foreach ($Forums as $ForumID => &$Forum) {
                 if (isset($SpecificRules[$ForumID])) {
@@ -239,30 +252,33 @@ class Forums
         } else {
             $PerPage = POSTS_PER_PAGE;
         }
+
         $TopicIDs = [];
         foreach ($Forums as $Forum) {
             if (!empty($Forum['LastPostTopicID'])) {
                 $TopicIDs[] = $Forum['LastPostTopicID'];
             }
         }
+
         if (!empty($TopicIDs)) {
             $QueryID = G::$DB->get_query_id();
             G::$DB->query("
-        SELECT
-          l.TopicID,
-          l.PostID,
-          CEIL(
-            (
-              SELECT
-                COUNT(p.ID)
-              FROM forums_posts AS p
-              WHERE p.TopicID = l.TopicID
-                AND p.ID <= l.PostID
-            ) / ?
-          ) AS Page
-        FROM forums_last_read_topics AS l
-        WHERE l.TopicID IN(" . implode(',', $TopicIDs) . ") AND
-          l.UserID = ?", $PerPage, G::$LoggedUser['ID']);
+            SELECT
+              l.TopicID,
+              l.PostID,
+              CEIL(
+                (
+                  SELECT
+                  COUNT(p.ID)
+                  FROM forums_posts AS p
+                    WHERE p.TopicID = l.TopicID
+                    AND p.ID <= l.PostID
+                ) / ?
+              ) AS Page
+            FROM forums_last_read_topics AS l
+              WHERE l.TopicID IN(" . implode(',', $TopicIDs) . ") AND
+              l.UserID = ?", $PerPage, G::$LoggedUser['ID']);
+
             $LastRead = G::$DB->to_array('TopicID', MYSQLI_ASSOC);
             G::$DB->set_query_id($QueryID);
         } else {
@@ -283,12 +299,14 @@ class Forums
         if ($UserID === null) {
             $UserID = G::$LoggedUser['ID'];
         }
+
         $QueryID = G::$DB->get_query_id();
         G::$DB->query("
-      INSERT INTO forums_topic_notes
-        (TopicID, AuthorID, AddedTime, Body)
-      VALUES
-        (?, ?, NOW(), ?)", $TopicID, $UserID, $Note);
+        INSERT INTO forums_topic_notes
+          (TopicID, AuthorID, AddedTime, Body)
+        VALUES
+          (?, ?, NOW(), ?)", $TopicID, $UserID, $Note);
+
         G::$DB->set_query_id($QueryID);
         return (bool)G::$DB->affected_rows();
     }
@@ -318,17 +336,21 @@ class Forums
         // I couldn't come up with a good name, please rename this if you can. -- Y
         $RestrictedForums = self::get_restricted_forums();
         $PermittedForums = self::get_permitted_forums();
+
         if (Donations::has_donor_forum(G::$LoggedUser['ID']) && !in_array(DONOR_FORUM, $PermittedForums)) {
             $PermittedForums[] = DONOR_FORUM;
         }
+
         $SQL = "((f.MinClassRead <= '" . G::$LoggedUser['Class'] . "'";
         if (count($RestrictedForums)) {
             $SQL .= " AND f.ID NOT IN ('" . implode("', '", $RestrictedForums) . "')";
         }
+
         $SQL .= ')';
         if (count($PermittedForums)) {
             $SQL .= " OR f.ID IN ('" . implode("', '", $PermittedForums) . "')";
         }
+        
         $SQL .= ')';
         return $SQL;
     }

classes/mass_user_torrents_table_view.class.php

@@ -10,118 +10,126 @@
  *
  * It can be used for Bookmarks, Collages, or anywhere where torrents are managed.
  */
-class MASS_USER_TORRENTS_TABLE_VIEW {
-  /**
-   * Used to set text the page heading (h2 tag)
-   * @var string $Heading
-   */
-  private $Heading = 'Manage Torrents';
-
-  /**
-   * Sets the value of the input name="type"
-   * Later to be used as $_POST['type'] in a form processor
-   * @var string $EditType
-   */
-  private $EditType;
-
-  /**
-   * Flag for empty $TorrentList
-   * @var bool $HasTorrentList
-   */
-  private $HasTorrents;
-
-  /**
-   * Internal reference to the TorrentList
-   * @var array $TorrentList
-   */
-  private $TorrentList;
-
-  /**
-   * Ref. to $CollageDataList
-   * @var array $CollageDataList
-   */
-  private $CollageDataList;
-
-  /**
-   * Counter for number of groups
-   * @var in $NumGroups
-   */
-  private $NumGroups = 0;
-
-  /**
-   * When creating a new instance of this class, TorrentList and
-   * CollageDataList must be passed. Additionally, a heading can be added.
-   *
-   * @param array $TorrentList
-   * @param array $CollageDataList
-   * @param string $EditType
-   * @param string $Heading
-   */
-  public function __construct (array &$TorrentList, array &$CollageDataList, $EditType, $Heading = null) {
-    $this->set_heading($Heading);
-    $this->set_edit_type($EditType);
-
-    $this->TorrentList = $TorrentList;
-    $this->CollageDataList = $CollageDataList;
-
-    $this->HasTorrents = !empty($TorrentList);
-    if (!$this->HasTorrents) {
-      $this->no_torrents();
+class MASS_USER_TORRENTS_TABLE_VIEW
+{
+    /**
+     * Used to set text the page heading (h2 tag)
+     * @var string $Heading
+     */
+    private $Heading = 'Manage Torrents';
+
+    /**
+     * Sets the value of the input name="type"
+     * Later to be used as $_POST['type'] in a form processor
+     * @var string $EditType
+     */
+    private $EditType;
+
+    /**
+     * Flag for empty $TorrentList
+     * @var bool $HasTorrentList
+     */
+    private $HasTorrents;
+
+    /**
+     * Internal reference to the TorrentList
+     * @var array $TorrentList
+     */
+    private $TorrentList;
+
+    /**
+     * Ref. to $CollageDataList
+     * @var array $CollageDataList
+     */
+    private $CollageDataList;
+
+    /**
+     * Counter for number of groups
+     * @var in $NumGroups
+     */
+    private $NumGroups = 0;
+
+    /**
+     * When creating a new instance of this class, TorrentList and
+     * CollageDataList must be passed. Additionally, a heading can be added.
+     *
+     * @param array $TorrentList
+     * @param array $CollageDataList
+     * @param string $EditType
+     * @param string $Heading
+     */
+    public function __construct(array &$TorrentList, array &$CollageDataList, $EditType, $Heading = null)
+    {
+        $this->set_heading($Heading);
+        $this->set_edit_type($EditType);
+
+        $this->TorrentList = $TorrentList;
+        $this->CollageDataList = $CollageDataList;
+
+        $this->HasTorrents = !empty($TorrentList);
+        if (!$this->HasTorrents) {
+            $this->no_torrents();
+        }
+    }
+
+    private function no_torrents()
+    {
+        ?>
+<div class="thin">
+  <div class="header">
+    <h2>No torrents found</h2>
+  </div>
+  <div class="box pad" align="center">
+    <p>Add some torrents and come back later</p>
+  </div>
+</div>
+<?php
+    }
+
+    /**
+     * Renders a complete page and table
+     */
+    public function render_all()
+    {
+        $this->header();
+        $this->body();
+        $this->footer();
     }
-  }
-
-  private function no_torrents () {
-?>
-    <div class="thin">
-      <div class="header">
-        <h2>No torrents found.</h2>
-      </div>
-      <div class="box pad" align="center">
-        <p>Add some torrents and come back later.</p>
-      </div>
-    </div>
-<?
-  }
-
-  /**
-   * Renders a complete page and table
-   */
-  public function render_all () {
-    $this->header();
-    $this->body();
-    $this->footer();
-  }
-
-  /**
-   * Renders a comptele page/table header: div#thin, h2, scripts, notes,
-   * form, table, etc.
-   */
-  public function header () {
-    if ($this->HasTorrents) {
-?>
 
+    /**
+     * Renders a comptele page/table header: div#thin, h2, scripts, notes,
+     * form, table, etc.
+     */
+    public function header()
+    {
+        if ($this->HasTorrents) {
+            ?>
 <div class="thin">
   <div class="header">
-    <h2><?=display_str($this->Heading)?></h2>
+    <h2><?=display_str($this->Heading)?>
+    </h2>
   </div>
 
   <table width="100%" class="layout box">
-    <tr class="colhead"><td id="sorting_head">Sorting</td></tr>
+    <tr class="colhead">
+      <td id="sorting_head">Sorting</td>
+    </tr>
+
     <tr>
       <td id="drag_drop_textnote">
-      <ul>
-        <li>Click on the headings to organize columns automatically.</li>
-        <li>Sort multiple columns simultaneously by holding down the shift key and clicking other column headers.</li>
-        <li>Click and drag any row to change its order.</li>
-        <li>Double-click on a row to check it.</li>
-      </ul>
+        <ul>
+          <li>Click on the headings to organize columns automatically.</li>
+          <li>Sort multiple columns simultaneously by holding down the shift key and clicking other column headers.</li>
+          <li>Click and drag any row to change its order.</li>
+          <li>Double-click on a row to check it.</li>
+        </ul>
       </td>
     </tr>
   </table>
 
   <form action="bookmarks.php" method="post" id="drag_drop_collage_form">
 
-<?      $this->buttons(); ?>
+    <?php $this->buttons(); ?>
 
     <table id="manage_collage_table" class="box">
       <thead>
@@ -136,131 +144,155 @@ class MASS_USER_TORRENTS_TABLE_VIEW {
         </tr>
       </thead>
       <tbody>
-<?
+        <?php
+        }
     }
-  }
-
-  /**
-   * Closes header code
-   */
-  public function footer () {
-    if ($this->HasTorrents) {
-?>
 
+    /**
+     * Closes header code
+     */
+    public function footer()
+    {
+        if ($this->HasTorrents) {
+            ?>
       </tbody>
     </table>
 
-<?      $this->buttons(); ?>
+    <?php $this->buttons(); ?>
 
     <div>
       <input type="hidden" name="action" value="mass_edit" />
-      <input type="hidden" name="type" value="<?=display_str($this->EditType)?>" />
-      <input type="hidden" name="auth" value="<?=G::$LoggedUser['AuthKey']?>" />
+      <input type="hidden" name="type"
+        value="<?=display_str($this->EditType)?>" />
+      <input type="hidden" name="auth"
+        value="<?=G::$LoggedUser['AuthKey']?>" />
     </div>
   </form>
 </div>
+<?php
+        }
+    }
 
-<?
+    /**
+     * Formats data for use in row
+     *
+     */
+    public function body()
+    {
+        if ($this->HasTorrents) {
+            foreach ($this->TorrentList as $GroupID => $Group) {
+                $Artists = [];
+
+                extract($Group);
+                extract($this->CollageDataList[$GroupID]);
+
+                $this->NumGroups++;
+
+                $DisplayName = self::display_name($ExtendedArtists, $Artists, $VanityHouse);
+                $TorrentLink = '<a href="torrents.php?id='.$GroupID.'" class="tooltip" title="View torrent">'.$Name.'</a>';
+                $Year = $Year > 0 ? $Year : '';
+                $DateAdded = date($Time);
+
+                $this->row($Sort, $GroupID, $Year, $DisplayName, $TorrentLink, $DateAdded);
+            }
+        }
     }
-  }
-
-  /**
-   * Formats data for use in row
-   *
-   */
-  public function body () {
-    if ($this->HasTorrents)
-      foreach ($this->TorrentList as $GroupID => $Group) {
-        $Artists = [];
-
-        extract($Group);
-        extract($this->CollageDataList[$GroupID]);
-
-        $this->NumGroups++;
-
-        $DisplayName = self::display_name($ExtendedArtists, $Artists, $VanityHouse);
-        $TorrentLink = '<a href="torrents.php?id='.$GroupID.'" class="tooltip" title="View torrent">'.$Name.'</a>';
-        $Year = $Year > 0 ? $Year : '';
-        $DateAdded = date($Time);
-
-        $this->row($Sort, $GroupID, $Year, $DisplayName, $TorrentLink, $DateAdded);
-      }
-  }
-
-  /**
-   * Outputs a single row
-   *
-   * @param string|int $Sort
-   * @param string|int $GroupID
-   * @param string|int $GroupYear
-   * @param string $DisplayName
-   * @param string $TorrentLink
-   */
-  public function row ($Sort, $GroupID, $GroupYear, $DisplayName, $TorrentLink, $DateAdded) {
-?>
-
-          <tr class="drag row" id="li_<?=$GroupID?>">
-            <td>
-              <input class="sort_numbers" type="text" name="sort[<?=$GroupID?>]" value="<?=$Sort?>" id="sort_<?=$GroupID?>" size="4" />
-            </td>
-            <td><?=$this->NumGroups?></td>
-            <td><?=$GroupYear ? trim($GroupYear) : ' '?></td>
-            <td><?=$DisplayName ? trim($DisplayName) : ' '?></td>
-            <td><?=$TorrentLink ? trim($TorrentLink) : ' '?></td>
-            <td class="nobr tooltip" title="<?=$DateAdded?>"><?=$DateAdded ? time_diff($DateAdded) : ' '?></td>
-            <td class="center"><input type="checkbox" name="remove[<?=$GroupID?>]" value="" /></td>
-          </tr>
-<?
-  }
-
-  /**
-   * Parses a simple display name
-   *
-   * @param array $ExtendedArtists
-   * @param array $Artists
-   * @param string $VanityHouse
-   * @return string $DisplayName
-   */
-  public static function display_name (array &$ExtendedArtists, array &$Artists, $VanityHouse) {
-    $DisplayName = '';
-    if (!empty($ExtendedArtists[1]) || !empty($ExtendedArtists[4])
-        || !empty($ExtendedArtists[5]) || !empty($ExtendedArtists[6])) {
-      unset($ExtendedArtists[2], $ExtendedArtists[3]);
-      $DisplayName = Artists::display_artists($ExtendedArtists, true, false);
-    } elseif (count($Artists) > 0) {
-      $DisplayName = Artists::display_artists(array('1'=>$Artists), true, false);
+
+    /**
+     * Outputs a single row
+     *
+     * @param string|int $Sort
+     * @param string|int $GroupID
+     * @param string|int $GroupYear
+     * @param string $DisplayName
+     * @param string $TorrentLink
+     */
+    public function row($Sort, $GroupID, $GroupYear, $DisplayName, $TorrentLink, $DateAdded)
+    {
+        ?>
+<tr class="drag row" id="li_<?=$GroupID?>">
+  <td>
+    <input class="sort_numbers" type="text"
+      name="sort[<?=$GroupID?>]"
+      value="<?=$Sort?>"
+      id="sort_<?=$GroupID?>" size="4" />
+  </td>
+
+  <td><?=$this->NumGroups?>
+  </td>
+
+  <td><?=$GroupYear ? trim($GroupYear) : ' '?>
+  </td>
+
+  <td><?=$DisplayName ? trim($DisplayName) : ' '?>
+  </td>
+
+  <td><?=$TorrentLink ? trim($TorrentLink) : ' '?>
+  </td>
+
+  <td class="nobr tooltip" title="<?=$DateAdded?>"><?=$DateAdded ? time_diff($DateAdded) : ' '?>
+  </td>
+
+  <td class="center"><input type="checkbox"
+      name="remove[<?=$GroupID?>]" value="" /></td>
+</tr>
+<?php
     }
-    if ($VanityHouse) {
-      $DisplayName .= ' [<abbr class="tooltip" title="This is a Vanity House release">VH</abbr>]';
+
+    /**
+     * Parses a simple display name
+     *
+     * @param array $ExtendedArtists
+     * @param array $Artists
+     * @param string $VanityHouse
+     * @return string $DisplayName
+     */
+    public static function display_name(array &$ExtendedArtists, array &$Artists, $VanityHouse)
+    {
+        $DisplayName = '';
+        if (!empty($ExtendedArtists[1]) || !empty($ExtendedArtists[4])
+         || !empty($ExtendedArtists[5]) || !empty($ExtendedArtists[6])) {
+            unset($ExtendedArtists[2], $ExtendedArtists[3]);
+            $DisplayName = Artists::display_artists($ExtendedArtists, true, false);
+        } elseif (count($Artists) > 0) {
+            $DisplayName = Artists::display_artists(array('1'=>$Artists), true, false);
+        }
+
+        if ($VanityHouse) {
+            $DisplayName .= ' [<abbr class="tooltip" title="This is a Vanity House release">VH</abbr>]';
+        }
+        return $DisplayName;
+    }
+
+    /**
+     * Renders buttons used at the top and bottom of the table
+     */
+    public function buttons()
+    {
+        ?>
+<div class="drag_drop_save">
+  <input type="submit" name="update" value="Update ranking" title="Save your rank"
+    class="tooltip save_sortable_collage" />
+  <input type="submit" name="delete" value="Delete checked" title="Remove items"
+    class="tooltip save_sortable_collage" />
+</div>
+<?php
+    }
+
+    /**
+     * @param string $EditType
+     */
+    public function set_edit_type($EditType)
+    {
+        $this->EditType = $EditType;
+    }
+
+    /**
+     * Set's the current page's heading
+     * @param string $Heading
+     */
+    public function set_heading($Heading)
+    {
+        $this->Heading = $Heading;
     }
-    return $DisplayName;
-  }
-
-  /**
-   * Renders buttons used at the top and bottom of the table
-   */
-  public function buttons () {
-?>
-    <div class="drag_drop_save">
-      <input type="submit" name="update" value="Update ranking" title="Save your rank" class="tooltip save_sortable_collage" />
-      <input type="submit" name="delete" value="Delete checked" title="Remove items" class="tooltip save_sortable_collage" />
-    </div>
-<?
-  }
-
-
-  /**
-   * @param string $EditType
-   */
-  public function set_edit_type ($EditType) {
-    $this->EditType = $EditType;
-  }
-
-  /**
-   * Set's the current page's heading
-   * @param string $Heading
-   */
-  public function set_heading ($Heading) {
-    $this->Heading = $Heading;
-  }
 }

classes/mediainfo.class.php

@@ -253,7 +253,7 @@ class SectionParser
     }
 
     public static function strip_path($string)
-    { // remove filepath
+    { // Remove filepath
         $string = str_replace("\\", "/", $string);
         $path_parts = pathinfo($string);
         return $path_parts['basename'];
@@ -502,7 +502,7 @@ class GeneralSectionParser extends SectionParser
             case 'mpeg-ts':
                 $this->form_codec = 'MPEG-TS';
                 break;
-            // We can't determine if it's DVD5 or DVD9, so don't guess.
+            // We can't determine if it's DVD5 or DVD9, so don't guess
             case 'mpeg-ps':
                 $this->form_codec = '---';
                 break;
@@ -760,8 +760,7 @@ class VideoSectionParser extends SectionParser
         switch (strtolower($codec)) {
             case 'x264':
             case 'h264':
-                return strtolower($this->bitdepth) == '10 bits' ?
-                    'h264 10-bit' : 'h264';
+                return strtolower($this->bitdepth) == '10 bits' ? 'h264 10-bit' : 'h264';
             case 'h265':
                 return 'h265';
             case 'xvid':

classes/paranoia.class.php

@@ -1,7 +1,7 @@
-<?
+<?php
 
-// Note: at the time this file is loaded, check_perms is not defined. Don't
-// call check_paranoia in /classes/script_start.php without ensuring check_perms has been defined
+// Note: at the time this file is loaded, check_perms is not defined.
+// Don't call check_paranoia in /classes/script_start.php without ensuring check_perms has been defined
 
 // The following are used throughout the site:
 // uploaded, ratio, downloaded: stats
@@ -37,67 +37,79 @@
  * @param $Paranoia The paranoia level to check against.
  * @param $UserClass The user class to check against (Staff can see through paranoia of lower classed staff)
  * @param $UserID Optional. The user ID of the person being viewed
- * @return mixed   1 representing the user has normal access
-           2 representing that the paranoia was overridden,
-           false representing access denied.
+ * @return mixed 1 representing the user has normal access
+ *               2 representing that the paranoia was overridden,
+ *               false representing access denied.
  */
-
 define("PARANOIA_ALLOWED", 1);
 define("PARANOIA_OVERRIDDEN", 2);
 
-function check_paranoia($Property, $Paranoia = false, $UserClass = false, $UserID = false) {
-  global $Classes;
-  if ($Property == false) {
-    return false;
-  }
-  if (!is_array($Paranoia)) {
-    $Paranoia = json_decode($Paranoia, true);
-  }
-  if (!is_array($Paranoia)) {
-    $Paranoia = [];
-  }
-  if (is_array($Property)) {
-    $all = true;
-    foreach ($Property as $P) {
-      $all = $all && check_paranoia($P, $Paranoia, $UserClass, $UserID);
-    }
-    return $all;
-  } else {
-    if (($UserID !== false) && (G::$LoggedUser['ID'] == $UserID)) {
-      return PARANOIA_ALLOWED;
+function check_paranoia($Property, $Paranoia = false, $UserClass = false, $UserID = false)
+{
+    global $Classes;
+    if ($Property == false) {
+        return false;
     }
 
-    $May = !in_array($Property, $Paranoia) && !in_array($Property . '+', $Paranoia);
-    if ($May)
-      return PARANOIA_ALLOWED;
+    if (!is_array($Paranoia)) {
+        $Paranoia = json_decode($Paranoia, true);
+    }
 
-    if (check_perms('users_override_paranoia', $UserClass)) {
-      return PARANOIA_OVERRIDDEN;
+    if (!is_array($Paranoia)) {
+        $Paranoia = [];
     }
-    $Override=false;
-    switch ($Property) {
-      case 'downloaded':
-      case 'ratio':
-      case 'uploaded':
-      case 'lastseen':
-        if (check_perms('users_mod', $UserClass))
-          return PARANOIA_OVERRIDDEN;
-        break;
-      case 'snatched': case 'snatched+':
-        if (check_perms('users_view_torrents_snatchlist', $UserClass))
-          return PARANOIA_OVERRIDDEN;
-        break;
-      case 'uploads': case 'uploads+':
-      case 'seeding': case 'seeding+':
-      case 'leeching': case 'leeching+':
-        if (check_perms('users_view_seedleech', $UserClass))
-          return PARANOIA_OVERRIDDEN;
-        break;
-      case 'invitedcount':
-        if (check_perms('users_view_invites', $UserClass))
-          return PARANOIA_OVERRIDDEN;
-        break;
+
+    if (is_array($Property)) {
+        $all = true;
+        foreach ($Property as $P) {
+            $all = $all && check_paranoia($P, $Paranoia, $UserClass, $UserID);
+        }
+        return $all;
+    } else {
+        if (($UserID !== false) && (G::$LoggedUser['ID'] == $UserID)) {
+            return PARANOIA_ALLOWED;
+        }
+
+        $May = !in_array($Property, $Paranoia) && !in_array($Property . '+', $Paranoia);
+        if ($May) {
+            return PARANOIA_ALLOWED;
+        }
+
+        if (check_perms('users_override_paranoia', $UserClass)) {
+            return PARANOIA_OVERRIDDEN;
+        }
+
+        $Override=false;
+        switch ($Property) {
+          case 'downloaded':
+          case 'ratio':
+          case 'uploaded':
+          case 'lastseen':
+            if (check_perms('users_mod', $UserClass)) {
+                return PARANOIA_OVERRIDDEN;
+            }
+            break;
+
+          case 'snatched': case 'snatched+':
+            if (check_perms('users_view_torrents_snatchlist', $UserClass)) {
+                return PARANOIA_OVERRIDDEN;
+            }
+            break;
+
+          case 'uploads': case 'uploads+':
+          case 'seeding': case 'seeding+':
+          case 'leeching': case 'leeching+':
+            if (check_perms('users_view_seedleech', $UserClass)) {
+                return PARANOIA_OVERRIDDEN;
+            }
+            break;
+            
+          case 'invitedcount':
+            if (check_perms('users_view_invites', $UserClass)) {
+                return PARANOIA_OVERRIDDEN;
+            }
+            break;
+        }
+        return false;
     }
-    return false;
-  }
 }

classes/permissions_form.php

@@ -124,7 +124,7 @@ function permissions_form()
       <tr>
         <td>
           <?php
-          display_perm('site_leech', 'Can leech.');
+    display_perm('site_leech', 'Can leech.');
     display_perm('site_upload', 'Can upload.');
     display_perm('site_vote', 'Can vote on requests.');
     display_perm('site_submit_requests', 'Can submit requests.');
@@ -168,6 +168,7 @@ function permissions_form()
       </tr>
     </table>
   </div>
+
   <div class="permission_container">
     <table>
       <tr class="colhead">
@@ -176,7 +177,7 @@ function permissions_form()
       <tr>
         <td>
           <?php
-          display_perm('users_edit_usernames', 'Can edit usernames.');
+    display_perm('users_edit_usernames', 'Can edit usernames.');
     display_perm('users_edit_ratio', 'Can edit anyone\'s upload/download amounts.');
     display_perm('users_edit_own_ratio', 'Can edit own upload/download amounts.');
     display_perm('users_edit_titles', 'Can edit titles.');
@@ -208,11 +209,12 @@ function permissions_form()
     display_perm('users_make_invisible', 'Can make users invisible');
     display_perm('users_logout', 'Can log users out');
     display_perm('users_mod', 'Can access basic moderator tools (Admin comment)'); ?>
-          *Everything is only applicable to users with the same or lower class level
+          * Everything is only applicable to users with the same or lower class level
         </td>
       </tr>
     </table>
   </div>
+
   <div class="permission_container">
     <table>
       <tr class="colhead">
@@ -221,7 +223,7 @@ function permissions_form()
       <tr>
         <td>
           <?php
-          display_perm('torrents_edit', 'Can edit any torrent');
+    display_perm('torrents_edit', 'Can edit any torrent');
     display_perm('torrents_delete', 'Can delete torrents');
     display_perm('torrents_delete_fast', 'Can delete more than 3 torrents at a time.');
     display_perm('torrents_freeleech', 'Can make torrents freeleech');
@@ -238,6 +240,7 @@ function permissions_form()
       </tr>
     </table>
   </div>
+
   <div class="permission_container">
     <table>
       <tr class="colhead">
@@ -246,7 +249,7 @@ function permissions_form()
       <tr>
         <td>
           <?php
-          display_perm('admin_manage_news', 'Can manage site news');
+    display_perm('admin_manage_news', 'Can manage site news');
     display_perm('admin_manage_blog', 'Can manage the site blog');
     display_perm('admin_manage_polls', 'Can manage polls');
     display_perm('admin_manage_forums', 'Can manage forums (add/edit/delete)');
@@ -268,6 +271,7 @@ function permissions_form()
       </tr>
     </table>
   </div>
+
   <div class="submit_container"><input type="submit" name="submit" value="Save Permission Class" /></div>
 </div>
 <?php

classes/requests.class.php

@@ -10,42 +10,43 @@ class Requests
     public static function update_sphinx_requests($RequestID)
     {
         $QueryID = G::$DB->get_query_id();
-
         G::$DB->query("
-      SELECT REPLACE(t.Name, '.', '_')
-      FROM tags AS t
-        JOIN requests_tags AS rt ON t.ID = rt.TagID
-      WHERE rt.RequestID = $RequestID");
+        SELECT REPLACE(t.Name, '.', '_')
+        FROM tags AS t
+          JOIN requests_tags AS rt ON t.ID = rt.TagID
+          WHERE rt.RequestID = $RequestID");
+
         $TagList = G::$DB->collect(0, false);
         $TagList = db_string(implode(' ', $TagList));
 
         G::$DB->query("
-      REPLACE INTO sphinx_requests_delta (
-        ID, UserID, TimeAdded, LastVote, CategoryID, Title, TagList,
-        CatalogueNumber, DLSiteID, FillerID, TorrentID,
-        TimeFilled, Visible, Votes, Bounty)
-      SELECT
-        ID, r.UserID, UNIX_TIMESTAMP(TimeAdded) AS TimeAdded,
-        UNIX_TIMESTAMP(LastVote) AS LastVote, CategoryID, Title, '$TagList',
-        CatalogueNumber, DLSiteID, FillerID, TorrentID,
-        UNIX_TIMESTAMP(TimeFilled) AS TimeFilled, Visible,
-        COUNT(rv.UserID) AS Votes, SUM(rv.Bounty) >> 10 AS Bounty
-      FROM requests AS r
-        LEFT JOIN requests_votes AS rv ON rv.RequestID = r.ID
-      WHERE ID = $RequestID
-      GROUP BY r.ID");
+        REPLACE INTO sphinx_requests_delta (
+          ID, UserID, TimeAdded, LastVote, CategoryID, Title, TagList,
+          CatalogueNumber, DLSiteID, FillerID, TorrentID,
+          TimeFilled, Visible, Votes, Bounty)
+        SELECT
+          ID, r.UserID, UNIX_TIMESTAMP(TimeAdded) AS TimeAdded,
+          UNIX_TIMESTAMP(LastVote) AS LastVote, CategoryID, Title, '$TagList',
+          CatalogueNumber, DLSiteID, FillerID, TorrentID,
+          UNIX_TIMESTAMP(TimeFilled) AS TimeFilled, Visible,
+          COUNT(rv.UserID) AS Votes, SUM(rv.Bounty) >> 10 AS Bounty
+        FROM requests AS r
+          LEFT JOIN requests_votes AS rv ON rv.RequestID = r.ID
+        WHERE ID = $RequestID
+          GROUP BY r.ID");
+
         G::$DB->query("
-      UPDATE sphinx_requests_delta
-      SET ArtistList = (
+        UPDATE sphinx_requests_delta
+        SET ArtistList = (
           SELECT GROUP_CONCAT(ag.Name SEPARATOR ' ')
           FROM requests_artists AS ra
             JOIN artists_group AS ag ON ag.ArtistID = ra.ArtistID
           WHERE ra.RequestID = $RequestID
-          GROUP BY NULL
-          )
-      WHERE ID = $RequestID");
-        G::$DB->set_query_id($QueryID);
+            GROUP BY NULL
+        )
+          WHERE ID = $RequestID");
 
+        G::$DB->set_query_id($QueryID);
         G::$Cache->delete_value("request_$RequestID");
     }
 
@@ -68,12 +69,14 @@ class Requests
                 unset($RequestIDs[$i], $Found[$GroupID], $NotFound[$GroupID]);
                 continue;
             }
+
             $Data = G::$Cache->get_value("request_$RequestID");
             if (!empty($Data)) {
                 unset($NotFound[$RequestID]);
                 $Found[$RequestID] = $Data;
             }
         }
+
         // Make sure there's something in $RequestIDs, otherwise the SQL will break
         if (count($RequestIDs) === 0) {
             return [];
@@ -81,47 +84,50 @@ class Requests
         $IDs = implode(',', array_keys($NotFound));
 
         /*
-          Don't change without ensuring you change everything else that uses get_requests()
-        */
+         * Don't change without ensuring you change everything else that uses get_requests()
+         */
 
         if (count($NotFound) > 0) {
             $QueryID = G::$DB->get_query_id();
-
             G::$DB->query("
-        SELECT
-          ID,
-          UserID,
-          TimeAdded,
-          LastVote,
-          CategoryID,
-          Title,
-          TitleRJ,
-          TitleJP,
-          Image,
-          Description,
-          CatalogueNumber,
-          DLsiteID,
-          FillerID,
-          TorrentID,
-          TimeFilled,
-          GroupID
-        FROM requests
-        WHERE ID IN ($IDs)
-        ORDER BY ID");
+            SELECT
+              ID,
+              UserID,
+              TimeAdded,
+              LastVote,
+              CategoryID,
+              Title,
+              TitleRJ,
+              TitleJP,
+              Image,
+              Description,
+              CatalogueNumber,
+              DLsiteID,
+              FillerID,
+              TorrentID,
+              TimeFilled,
+              GroupID
+            FROM requests
+              WHERE ID IN ($IDs)
+              ORDER BY ID");
+
             $Requests = G::$DB->to_array(false, MYSQLI_ASSOC, true);
             $Tags = self::get_tags(G::$DB->collect('ID', false));
+
             foreach ($Requests as $Request) {
                 $Request['AnonymousFill'] = false;
                 if ($Request['FillerID']) {
                     G::$DB->query("
-            SELECT Anonymous
-            FROM torrents
-            WHERE ID = ".$Request['TorrentID']);
+                    SELECT Anonymous
+                    FROM torrents
+                      WHERE ID = ".$Request['TorrentID']);
+
                     list($Anonymous) = G::$DB->next_record();
                     if ($Anonymous) {
                         $Request['AnonymousFill'] = true;
                     }
                 }
+
                 unset($NotFound[$Request['ID']]);
                 $Request['Tags'] = isset($Tags[$Request['ID']]) ? $Tags[$Request['ID']] : [];
                 $Found[$Request['ID']] = $Request;
@@ -166,15 +172,17 @@ class Requests
             $Results = [];
             $QueryID = G::$DB->get_query_id();
             G::$DB->query("
-        SELECT
-          ra.ArtistID,
-          ag.Name
-        FROM requests_artists AS ra
-          JOIN artists_group AS ag ON ra.ArtistID = ag.ArtistID
-        WHERE ra.RequestID = $RequestID
-        ORDER BY ag.Name ASC;");
+            SELECT
+              ra.ArtistID,
+              ag.Name
+            FROM requests_artists AS ra
+              JOIN artists_group AS ag ON ra.ArtistID = ag.ArtistID
+            WHERE ra.RequestID = $RequestID
+              ORDER BY ag.Name ASC;");
+
             $ArtistRaw = G::$DB->to_array();
             G::$DB->set_query_id($QueryID);
+
             foreach ($ArtistRaw as $ArtistRow) {
                 list($ArtistID, $ArtistName) = $ArtistRow;
                 $Results[] = array('id' => $ArtistID, 'name' => $ArtistName);
@@ -189,21 +197,25 @@ class Requests
         if (empty($RequestIDs)) {
             return [];
         }
+
         if (is_array($RequestIDs)) {
             $RequestIDs = implode(',', $RequestIDs);
         }
+
         $QueryID = G::$DB->get_query_id();
         G::$DB->query("
-      SELECT
-        rt.RequestID,
-        rt.TagID,
-        t.Name
-      FROM requests_tags AS rt
-        JOIN tags AS t ON rt.TagID = t.ID
-      WHERE rt.RequestID IN ($RequestIDs)
-      ORDER BY rt.TagID ASC");
+        SELECT
+          rt.RequestID,
+          rt.TagID,
+          t.Name
+        FROM requests_tags AS rt
+          JOIN tags AS t ON rt.TagID = t.ID
+        WHERE rt.RequestID IN ($RequestIDs)
+          ORDER BY rt.TagID ASC");
+
         $Tags = G::$DB->to_array(false, MYSQLI_NUM, false);
         G::$DB->set_query_id($QueryID);
+
         $Results = [];
         foreach ($Tags as $TagsRow) {
             list($RequestID, $TagID, $TagName) = $TagsRow;
@@ -218,18 +230,19 @@ class Requests
         if (!is_array($RequestVotes)) {
             $QueryID = G::$DB->get_query_id();
             G::$DB->query("
-        SELECT
-          rv.UserID,
-          rv.Bounty,
-          u.Username
-        FROM requests_votes AS rv
-          LEFT JOIN users_main AS u ON u.ID = rv.UserID
-        WHERE rv.RequestID = $RequestID
-        ORDER BY rv.Bounty DESC");
+            SELECT
+              rv.UserID,
+              rv.Bounty,
+              u.Username
+            FROM requests_votes AS rv
+              LEFT JOIN users_main AS u ON u.ID = rv.UserID
+            WHERE rv.RequestID = $RequestID
+              ORDER BY rv.Bounty DESC");
+
             if (!G::$DB->has_results()) {
                 return array(
-          'TotalBounty' => 0,
-          'Voters' => []);
+                    'TotalBounty' => 0,
+                    'Voters' => []);
             }
             $Votes = G::$DB->to_array();
 

classes/script_start.php

@@ -10,12 +10,14 @@
 /* generates the page are at the bottom.        */
 /*------------------------------------------------------*/
 /********************************************************/
+
 require 'config.php'; // The config contains all site wide configuration information
 
 // Check for common setup pitfalls
 if (!ini_get('short_open_tag')) {
     die('short_open_tag must be On in php.ini');
 }
+
 if (!extension_loaded('apcu')) {
     die('APCu extension not loaded');
 }
@@ -32,6 +34,7 @@ require(SERVER_ROOT.'/classes/proxies.class.php');
 if (isset($_SERVER['HTTP_CF_CONNECTING_IP'])) {
     $_SERVER['REMOTE_ADDR'] = $_SERVER['HTTP_CF_CONNECTING_IP'];
 }
+
 if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])
     && proxyCheck($_SERVER['REMOTE_ADDR'])
     && filter_var(
@@ -52,23 +55,20 @@ if (!isset($argv) && !empty($_SERVER['HTTP_HOST'])) {
     }
 }
 
-
-
-$ScriptStartTime = microtime(true); //To track how long a page takes to create
+$ScriptStartTime = microtime(true); // To track how long a page takes to create
 if (!defined('PHP_WINDOWS_VERSION_MAJOR')) {
     $RUsage = getrusage();
     $CPUTimeStart = $RUsage['ru_utime.tv_sec'] * 1000000 + $RUsage['ru_utime.tv_usec'];
 }
-ob_start(); //Start a buffer, mainly in case there is a mysql error
+ob_start(); // Start a buffer, mainly in case there is a mysql error
 
-
-require(SERVER_ROOT.'/classes/debug.class.php'); //Require the debug class
-require(SERVER_ROOT.'/classes/mysql.class.php'); //Require the database wrapper
-require(SERVER_ROOT.'/classes/cache.class.php'); //Require the caching class
-require(SERVER_ROOT.'/classes/time.class.php'); //Require the time class
-require(SERVER_ROOT.'/classes/paranoia.class.php'); //Require the paranoia check_paranoia function
-require(SERVER_ROOT.'/classes/regex.php');
-require(SERVER_ROOT.'/classes/util.php');
+require SERVER_ROOT.'/classes/debug.class.php'; // Require the debug class
+require SERVER_ROOT.'/classes/mysql.class.php'; // Require the database wrapper
+require SERVER_ROOT.'/classes/cache.class.php'; // Require the caching class
+require SERVER_ROOT.'/classes/time.class.php'; // Require the time class
+require SERVER_ROOT.'/classes/paranoia.class.php'; // Require the paranoia check_paranoia function
+require SERVER_ROOT.'/classes/regex.php';
+require SERVER_ROOT.'/classes/util.php';
 
 $Debug = new DEBUG;
 $Debug->handle_errors();
@@ -86,7 +86,6 @@ require(SERVER_ROOT.'/classes/classloader.php');
 G::initialize();
 
 //Begin browser identification
-
 $Browser = UserAgent::browser($_SERVER['HTTP_USER_AGENT']);
 $OperatingSystem = UserAgent::operating_system($_SERVER['HTTP_USER_AGENT']);
 
@@ -118,17 +117,19 @@ if (isset($_COOKIE['session']) && isset($_COOKIE['userid'])) {
     $UserSessions = $Cache->get_value("users_sessions_$UserID");
     if (!is_array($UserSessions)) {
         $DB->query(
-        "SELECT
-        SessionID,
-        Browser,
-        OperatingSystem,
-        IP,
-        LastUpdate
-      FROM users_sessions
-      WHERE UserID = '$UserID'
-        AND Active = 1
-      ORDER BY LastUpdate DESC"
-    );
+            "
+        SELECT
+          SessionID,
+          Browser,
+          OperatingSystem,
+          IP,
+          LastUpdate
+        FROM users_sessions
+          WHERE UserID = '$UserID'
+          AND Active = 1
+        ORDER BY LastUpdate DESC"
+        );
+
         $UserSessions = $DB->to_array('SessionID', MYSQLI_ASSOC);
         $Cache->cache_value("users_sessions_$UserID", $UserSessions, 0);
     }
@@ -141,12 +142,15 @@ if (isset($_COOKIE['session']) && isset($_COOKIE['userid'])) {
     $Enabled = $Cache->get_value('enabled_'.$LoggedUser['ID']);
     if ($Enabled === false) {
         $DB->query("
-      SELECT Enabled
-      FROM users_main
-      WHERE ID = '$LoggedUser[ID]'");
+        SELECT Enabled
+          FROM users_main
+          WHERE ID = '$LoggedUser[ID]'");
+
         list($Enabled) = $DB->next_record();
         $Cache->cache_value('enabled_'.$LoggedUser['ID'], $Enabled, 0);
     }
+
+    # todo: Check strict equality
     if ($Enabled == 2) {
         logout();
     }
@@ -155,9 +159,10 @@ if (isset($_COOKIE['session']) && isset($_COOKIE['userid'])) {
     $UserStats = $Cache->get_value('user_stats_'.$LoggedUser['ID']);
     if (!is_array($UserStats)) {
         $DB->query("
-      SELECT Uploaded AS BytesUploaded, Downloaded AS BytesDownloaded, RequiredRatio
-      FROM users_main
-      WHERE ID = '$LoggedUser[ID]'");
+        SELECT Uploaded AS BytesUploaded, Downloaded AS BytesDownloaded, RequiredRatio
+        FROM users_main
+          WHERE ID = '$LoggedUser[ID]'");
+
         $UserStats = $DB->next_record(MYSQLI_ASSOC);
         $Cache->cache_value('user_stats_'.$LoggedUser['ID'], $UserStats, 3600);
     }
@@ -168,15 +173,14 @@ if (isset($_COOKIE['session']) && isset($_COOKIE['userid'])) {
 
     // Create LoggedUser array
     $LoggedUser = array_merge($HeavyInfo, $LightInfo, $UserStats);
-
     $LoggedUser['RSS_Auth'] = md5($LoggedUser['ID'] . RSS_HASH . $LoggedUser['torrent_pass']);
 
     // $LoggedUser['RatioWatch'] as a bool to disable things for users on Ratio Watch
     $LoggedUser['RatioWatch'] = (
-      $LoggedUser['RatioWatchEnds']
-    && time() < strtotime($LoggedUser['RatioWatchEnds'])
-    && ($LoggedUser['BytesDownloaded'] * $LoggedUser['RequiredRatio']) > $LoggedUser['BytesUploaded']
-  );
+        $LoggedUser['RatioWatchEnds']
+     && time() < strtotime($LoggedUser['RatioWatchEnds'])
+     && ($LoggedUser['BytesDownloaded'] * $LoggedUser['RequiredRatio']) > $LoggedUser['BytesUploaded']
+    );
 
     // Load in the permissions
     $LoggedUser['Permissions'] = Permissions::get_permissions_for_user($LoggedUser['ID'], $LoggedUser['CustomPermissions']);
@@ -193,31 +197,37 @@ if (isset($_COOKIE['session']) && isset($_COOKIE['userid'])) {
     // Update LastUpdate every 10 minutes
     if (strtotime($UserSessions[$SessionID]['LastUpdate']) + 600 < time()) {
         $DB->query("
-      UPDATE users_main
-      SET LastAccess = NOW()
-      WHERE ID = '$LoggedUser[ID]'");
+        UPDATE users_main
+        SET LastAccess = NOW()
+          WHERE ID = '$LoggedUser[ID]'");
+
         $SessionQuery =
-     "UPDATE users_sessions
-      SET ";
+       "UPDATE users_sessions
+          SET ";
+
         // Only update IP if we have an encryption key in memory
         if (apcu_exists('DBKEY')) {
             $SessionQuery .= "IP = '".Crypto::encrypt($_SERVER['REMOTE_ADDR'])."', ";
         }
+
         $SessionQuery .=
        "Browser = '$Browser',
         OperatingSystem = '$OperatingSystem',
         LastUpdate = NOW()
-      WHERE UserID = '$LoggedUser[ID]'
+        WHERE UserID = '$LoggedUser[ID]'
         AND SessionID = '".db_string($SessionID)."'";
+
         $DB->query($SessionQuery);
         $Cache->begin_transaction("users_sessions_$UserID");
         $Cache->delete_row($SessionID);
+
         $UsersSessionCache = array(
         'SessionID' => $SessionID,
         'Browser' => $Browser,
         'OperatingSystem' => $OperatingSystem,
         'IP' => (apcu_exists('DBKEY') ? Crypto::encrypt($_SERVER['REMOTE_ADDR']) : $UserSessions[$SessionID]['IP']),
         'LastUpdate' => sqltime() );
+
         $Cache->insert_front($SessionID, $UsersSessionCache);
         $Cache->commit_transaction(0);
     }
@@ -227,9 +237,10 @@ if (isset($_COOKIE['session']) && isset($_COOKIE['userid'])) {
         $LoggedUser['Notify'] = $Cache->get_value('notify_filters_'.$LoggedUser['ID']);
         if (!is_array($LoggedUser['Notify'])) {
             $DB->query("
-        SELECT ID, Label
-        FROM users_notify_filters
-        WHERE UserID = '$LoggedUser[ID]'");
+            SELECT ID, Label
+            FROM users_notify_filters
+              WHERE UserID = '$LoggedUser[ID]'");
+
             $LoggedUser['Notify'] = $DB->to_array('ID');
             $Cache->cache_value('notify_filters_'.$LoggedUser['ID'], $LoggedUser['Notify'], 2592000);
         }
@@ -241,7 +252,6 @@ if (isset($_COOKIE['session']) && isset($_COOKIE['userid'])) {
     }
 
     // IP changed
-
     if (apcu_exists('DBKEY') && Crypto::decrypt($LoggedUser['IP']) != $_SERVER['REMOTE_ADDR'] && !check_perms('site_disable_ip_history')) {
         if (Tools::site_ban_ip($_SERVER['REMOTE_ADDR'])) {
             error('Your IP address has been banned.');
@@ -250,10 +260,11 @@ if (isset($_COOKIE['session']) && isset($_COOKIE['userid'])) {
         $CurIP = db_string($LoggedUser['IP']);
         $NewIP = db_string($_SERVER['REMOTE_ADDR']);
         $DB->query("
-      SELECT IP
-      FROM users_history_ips
-      WHERE EndTime IS NULL
-        AND UserID = '$LoggedUser[ID]'");
+        SELECT IP
+        FROM users_history_ips
+          WHERE EndTime IS NULL
+          AND UserID = '$LoggedUser[ID]'");
+
         while (list($EncIP) = $DB->next_record()) {
             if (Crypto::decrypt($EncIP) == $CurIP) {
                 $CurIP = $EncIP;
@@ -261,54 +272,56 @@ if (isset($_COOKIE['session']) && isset($_COOKIE['userid'])) {
                 break;
             }
         }
+
         $DB->query("
-      UPDATE users_history_ips
-      SET EndTime = NOW()
-      WHERE EndTime IS NULL
-        AND UserID = '$LoggedUser[ID]'
-        AND IP = '$CurIP'");
+        UPDATE users_history_ips
+        SET EndTime = NOW()
+          WHERE EndTime IS NULL
+          AND UserID = '$LoggedUser[ID]'
+          AND IP = '$CurIP'");
+
         $DB->query("
-      INSERT IGNORE INTO users_history_ips
-        (UserID, IP, StartTime)
-      VALUES
-        ('$LoggedUser[ID]', '".Crypto::encrypt($NewIP)."', NOW())");
+        INSERT IGNORE INTO users_history_ips
+          (UserID, IP, StartTime)
+        VALUES
+          ('$LoggedUser[ID]', '".Crypto::encrypt($NewIP)."', NOW())");
 
         $ipcc = Tools::geoip($NewIP);
         $DB->query("
-      UPDATE users_main
-      SET IP = '".Crypto::encrypt($NewIP)."', ipcc = '$ipcc'
-      WHERE ID = '$LoggedUser[ID]'");
+        UPDATE users_main
+        SET IP = '".Crypto::encrypt($NewIP)."', ipcc = '$ipcc'
+          WHERE ID = '$LoggedUser[ID]'");
+
         $Cache->begin_transaction('user_info_heavy_'.$LoggedUser['ID']);
         $Cache->update_row(false, array('IP' => Crypto::encrypt($_SERVER['REMOTE_ADDR'])));
         $Cache->commit_transaction(0);
     }
 
-
     // Get stylesheets
     $Stylesheets = $Cache->get_value('stylesheets');
     if (!is_array($Stylesheets)) {
         $DB->query('
-      SELECT
-        ID,
-        LOWER(REPLACE(Name, " ", "_")) AS Name,
-        Name AS ProperName,
-        LOWER(REPLACE(Additions, " ", "_")) AS Additions,
-        Additions AS ProperAdditions
-      FROM stylesheets');
+        SELECT
+          ID,
+          LOWER(REPLACE(Name, " ", "_")) AS Name,
+          Name AS ProperName,
+          LOWER(REPLACE(Additions, " ", "_")) AS Additions,
+          Additions AS ProperAdditions
+        FROM stylesheets');
+
         $Stylesheets = $DB->to_array('ID', MYSQLI_BOTH);
         $Cache->cache_value('stylesheets', $Stylesheets, 0);
     }
 
     // todo: Clean up this messy solution
     $LoggedUser['StyleName'] = $Stylesheets[$LoggedUser['StyleID']]['Name'];
-
     if (empty($LoggedUser['Username'])) {
         logout(); // Ghost
     }
 }
+
 G::initialize();
 $Debug->set_flag('end user handling');
-
 $Debug->set_flag('start function definitions');
 
 /**
@@ -320,22 +333,23 @@ function logout()
     setcookie('session', '', time() - 60 * 60 * 24 * 365, '/', '', false);
     setcookie('userid', '', time() - 60 * 60 * 24 * 365, '/', '', false);
     setcookie('keeplogged', '', time() - 60 * 60 * 24 * 365, '/', '', false);
+
     if ($SessionID) {
         G::$DB->query("
-      DELETE FROM users_sessions
-      WHERE UserID = '" . G::$LoggedUser['ID'] . "'
-        AND SessionID = '".db_string($SessionID)."'");
+        DELETE FROM users_sessions
+          WHERE UserID = '" . G::$LoggedUser['ID'] . "'
+          AND SessionID = '".db_string($SessionID)."'");
 
         G::$Cache->begin_transaction('users_sessions_' . G::$LoggedUser['ID']);
         G::$Cache->delete_row($SessionID);
         G::$Cache->commit_transaction(0);
     }
+
     G::$Cache->delete_value('user_info_' . G::$LoggedUser['ID']);
     G::$Cache->delete_value('user_stats_' . G::$LoggedUser['ID']);
     G::$Cache->delete_value('user_info_heavy_' . G::$LoggedUser['ID']);
 
     header('Location: login.php');
-
     die();
 }
 
@@ -345,7 +359,7 @@ function logout_all_sessions()
 
     G::$DB->query("
     DELETE FROM users_sessions
-    WHERE UserID = '$UserID'");
+      WHERE UserID = '$UserID'");
 
     G::$Cache->delete_value('users_sessions_' . $UserID);
     logout();
@@ -396,7 +410,6 @@ $Cache->cache_value('php_' . getmypid(), array(
 define('STAFF_LOCKED', 1);
 
 $AllowedPages = ['staffpm', 'ajax', 'locked', 'logout', 'login'];
-
 if (isset(G::$LoggedUser['LockedAccount']) && !in_array($Document, $AllowedPages)) {
     require(SERVER_ROOT . '/sections/locked/index.php');
 } else {
@@ -415,10 +428,10 @@ if (!defined('SKIP_NO_CACHE_HEADERS')) {
     header('Pragma: no-cache');
 }
 
-//Flush to user
+// Flush to user
 ob_end_flush();
 
 $Debug->set_flag('set headers and send to user');
 
-//Attribute profiling
+// Attribute profiling
 $Debug->profile();

classes/torrent.class.php

@@ -1,5 +1,7 @@
 <?php
 
+# todo: Rplace with https://github.com/OPSnet/bencode-torrent
+
 /*******************************************************************************
 |~~~~ Gazelle bencode parser                         ~~~~|
 --------------------------------------------------------------------------------
@@ -67,18 +69,18 @@ the BENCODE_DICT class.
 class BENCODE2
 {
     public $Val; // Decoded array
-  public $Pos = 1; // Pointer that indicates our position in the string
-  public $Str = ''; // Torrent string
-
-  public function __construct($Val, $IsParsed = false)
-  {
-      if (!$IsParsed) {
-          $this->Str = $Val;
-          $this->dec();
-      } else {
-          $this->Val = $Val;
-      }
-  }
+    public $Pos = 1; // Pointer that indicates our position in the string
+    public $Str = ''; // Torrent string
+
+    public function __construct($Val, $IsParsed = false)
+    {
+        if (!$IsParsed) {
+            $this->Str = $Val;
+            $this->dec();
+        } else {
+            $this->Val = $Val;
+        }
+    }
 
     // Decode an element based on the type. The type is really just an indicator.
     public function decode($Type, $Key)
@@ -139,8 +141,10 @@ class BENCODE_LIST extends BENCODE2
         if (empty($this->Val)) {
             return 'le';
         }
+
         $Str = 'l';
         reset($this->Val);
+
         foreach ($this->Val as $Value) {
             $Str.=$this->encode($Value);
         }
@@ -152,6 +156,7 @@ class BENCODE_LIST extends BENCODE2
     {
         $Key = 0; // Array index
         $Length = strlen($this->Str);
+
         while ($this->Pos < $Length) {
             $Type = $this->Str[$this->Pos];
             // $Type now indicates what type of element we're dealing with
@@ -179,8 +184,10 @@ class BENCODE_DICT extends BENCODE2
         if (empty($this->Val)) {
             return 'de';
         }
+
         $Str = 'd';
         reset($this->Val);
+
         foreach ($this->Val as $Key => $Value) {
             $Str.=strlen($Key).':'.$Key.$this->encode($Value);
         }
@@ -273,11 +280,13 @@ class TORRENT extends BENCODE_DICT
             $FileSizes = [];
             $TotalSize = 0;
             $Files = $this->Val['info']->Val['files']->Val;
+
             if (isset($Files[0]->Val['path.utf-8'])) {
                 $PathKey = 'path.utf-8';
             } else {
                 $PathKey = 'path';
             }
+
             foreach ($Files as $File) {
                 $FileSize = $File->Val['length'];
                 $TotalSize += $FileSize;
@@ -286,6 +295,7 @@ class TORRENT extends BENCODE_DICT
                 $FileSizes[] = $FileSize;
                 $FileNames[] = $FileName;
             }
+
             natcasesort($FileNames);
             foreach ($FileNames as $Index => $FileName) {
                 $FileList[] = array($FileSizes[$Index], $FileName);
@@ -318,7 +328,7 @@ class TORRENT extends BENCODE_DICT
         unset($this->Val['azureus_properties']);
 
         // Remove web-seeds
-        #unset($this->Val['url-list']);
+        unset($this->Val['url-list']);
 
         // Remove libtorrent resume info
         unset($this->Val['libtorrent_resume']);

classes/torrentsdl.class.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Class for functions related to the features involving torrent downloads
  */
@@ -29,19 +30,23 @@ class TorrentsDL
     public function __construct(&$QueryResult, $Title)
     {
         G::$Cache->InternalCache = false; // The internal cache is almost completely useless for this
-    Zip::unlimit(); // Need more memory and longer timeout
-    $this->QueryResult = $QueryResult;
+        Zip::unlimit(); // Need more memory and longer timeout
+        $this->QueryResult = $QueryResult;
         $this->Title = $Title;
         $this->User = G::$LoggedUser;
         $this->AnnounceURL = ANNOUNCE_URLS[0][0]."/".G::$LoggedUser['torrent_pass']."/announce";
+
         function add_passkey($Ann)
         {
             return (is_array($Ann)) ? array_map('add_passkey', $Ann) : $Ann."/".G::$LoggedUser['torrent_pass']."/announce";
         }
+
         # todo: Probably not working, but no need yet
         $this->AnnounceList = (sizeof(ANNOUNCE_URLS[0]) === 1 && sizeof(ANNOUNCE_URLS[0][0]) === 1) ? [] : array_map('add_passkey', ANNOUNCE_URLS[0]);
+
         # Tracker tiers (pending)
         #$this->AnnounceList = (sizeof(ANNOUNCE_URLS) === 1 && sizeof(ANNOUNCE_URLS[0]) === 1) ? [] : array(array_map('add_passkey', ANNOUNCE_URLS[0]), ANNOUNCE_URLS[1]);
+        
         # Original Oppaitime
         #$this->AnnounceList = (sizeof(ANNOUNCE_URLS) == 1 && sizeof(ANNOUNCE_URLS[0]) == 1) ? [] : array_map('add_passkey', ANNOUNCE_URLS);
         $this->Zip = new Zip(Misc::file_string($Title));
@@ -58,6 +63,7 @@ class TorrentsDL
         $GroupIDs = $Downloads = [];
         $OldQuery = G::$DB->get_query_id();
         G::$DB->set_query_id($this->QueryResult);
+
         if (!isset($this->IDBoundaries)) {
             if ($Key == 'TorrentID') {
                 $this->IDBoundaries = false;
@@ -65,6 +71,7 @@ class TorrentsDL
                 $this->IDBoundaries = G::$DB->to_pair($Key, 'TorrentID', false);
             }
         }
+
         $Found = 0;
         while ($Download = G::$DB->next_record(MYSQLI_ASSOC, false)) {
             if (!$this->IDBoundaries || $Download['TorrentID'] == $this->IDBoundaries[$Download[$Key]]) {
@@ -76,6 +83,7 @@ class TorrentsDL
                 }
             }
         }
+
         $this->NumFound += $Found;
         G::$DB->set_query_id($OldQuery);
         if (empty($Downloads)) {
@@ -200,21 +208,27 @@ class TorrentsDL
         if ($TorrentID !== false) {
             $MaxLength -= (strlen($TorrentID) + 1);
         }
+
         $TorrentArtist = Misc::file_string($Artist);
         $TorrentName = Misc::file_string($Album);
+
         if ($Year > 0) {
             $TorrentName .= " - $Year";
         }
+
         $TorrentInfo = [];
-        if ($Media != '') {
+        if ($Media !== '') {
             $TorrentInfo[] = $Media;
         }
-        if ($Format != '') {
+
+        if ($Format !== '') {
             $TorrentInfo[] = $Format;
         }
-        if ($Encoding != '') {
+
+        if ($Encoding !== '') {
             $TorrentInfo[] = $Encoding;
         }
+
         if (!empty($TorrentInfo)) {
             $TorrentInfo = ' (' . Misc::file_string(implode(' - ', $TorrentInfo)) . ')';
         } else {
@@ -249,12 +263,15 @@ class TorrentsDL
             }
             return $Bencode;
         }
+
         $Tor = new TORRENT(unserialize(base64_decode($TorrentData)), true);
         $Tor->set_announce_url($AnnounceURL);
+
         unset($Tor->Val['announce-list']);
         if (!empty($AnnounceList)) {
             $Tor->set_announce_list($AnnounceList);
         }
+        
         unset($Tor->Val['url-list']);
         unset($Tor->Val['libtorrent_resume']);
         return $Tor->enc();

classes/userrank.class.php

@@ -11,30 +11,29 @@ class UserRank
         $QueryID = G::$DB->get_query_id();
 
         G::$DB->query("
-      DROP TEMPORARY TABLE IF EXISTS temp_stats");
+        DROP TEMPORARY TABLE IF EXISTS temp_stats");
 
         G::$DB->query("
-      CREATE TEMPORARY TABLE temp_stats (
-        ID int(10) NOT NULL PRIMARY KEY AUTO_INCREMENT,
-        Val bigint(20) NOT NULL
-      );");
+        CREATE TEMPORARY TABLE temp_stats (
+          ID int(10) NOT NULL PRIMARY KEY AUTO_INCREMENT,
+          Val bigint(20) NOT NULL
+        );");
 
         G::$DB->query("
-      INSERT INTO temp_stats (Val) ".
-      $Query);
+        INSERT INTO temp_stats (Val) ".
+        $Query);
 
         G::$DB->query("
-      SELECT COUNT(ID)
-      FROM temp_stats");
+        SELECT COUNT(ID)
+        FROM temp_stats");
         list($UserCount) = G::$DB->next_record();
 
         G::$DB->query("
-      SELECT MIN(Val)
-      FROM temp_stats
-      GROUP BY CEIL(ID / (".(int)$UserCount." / 100));");
+        SELECT MIN(Val)
+        FROM temp_stats
+          GROUP BY CEIL(ID / (".(int)$UserCount." / 100));");
 
         $Table = G::$DB->to_array();
-
         G::$DB->set_query_id($QueryID);
 
         // Give a little variation to the cache length, so all the tables don't expire at the same time
@@ -46,60 +45,66 @@ class UserRank
     private static function table_query($TableName)
     {
         switch ($TableName) {
-      case 'uploaded':
-        $Query =  "
+        case 'uploaded':
+          $Query =  "
           SELECT Uploaded
           FROM users_main
           WHERE Enabled = '1'
             AND Uploaded > 0
           ORDER BY Uploaded;";
-        break;
-      case 'downloaded':
-        $Query =  "
+          break;
+
+        case 'downloaded':
+          $Query =  "
           SELECT Downloaded
           FROM users_main
           WHERE Enabled = '1'
             AND Downloaded > 0
           ORDER BY Downloaded;";
-        break;
-      case 'uploads':
-        $Query = "
+          break;
+
+        case 'uploads':
+          $Query = "
           SELECT COUNT(t.ID) AS Uploads
           FROM users_main AS um
             JOIN torrents AS t ON t.UserID = um.ID
           WHERE um.Enabled = '1'
           GROUP BY um.ID
           ORDER BY Uploads;";
-        break;
-      case 'requests':
-        $Query = "
+          break;
+
+        case 'requests':
+          $Query = "
           SELECT COUNT(r.ID) AS Requests
           FROM users_main AS um
             JOIN requests AS r ON r.FillerID = um.ID
           WHERE um.Enabled = '1'
           GROUP BY um.ID
           ORDER BY Requests;";
-        break;
-      case 'posts':
-        $Query = "
+          break;
+
+        case 'posts':
+          $Query = "
           SELECT COUNT(p.ID) AS Posts
           FROM users_main AS um
             JOIN forums_posts AS p ON p.AuthorID = um.ID
           WHERE um.Enabled = '1'
           GROUP BY um.ID
           ORDER BY Posts;";
-        break;
-      case 'bounty':
-        $Query = "
+          break;
+
+        case 'bounty':
+          $Query = "
           SELECT SUM(rv.Bounty) AS Bounty
           FROM users_main AS um
             JOIN requests_votes AS rv ON rv.UserID = um.ID
           WHERE um.Enabled = '1' " .
           "GROUP BY um.ID
           ORDER BY Bounty;";
-        break;
-      case 'artists':
-        $Query = "
+          break;
+
+        case 'artists':
+          $Query = "
           SELECT COUNT(ta.ArtistID) AS Artists
           FROM torrents_artists AS ta
             JOIN torrents_group AS tg ON tg.ID = ta.GroupID
@@ -107,8 +112,8 @@ class UserRank
           WHERE t.UserID != ta.UserID
           GROUP BY tg.ID
           ORDER BY Artists ASC";
-        break;
-    }
+          break;
+        }
         return $Query;
     }
 
@@ -130,6 +135,7 @@ class UserRank
                 G::$Cache->delete_value(self::PREFIX.$TableName.'_lock');
             }
         }
+
         $LastPercentile = 0;
         foreach ($Table as $Row) {
             list($CurValue) = $Row;
@@ -147,10 +153,12 @@ class UserRank
         if ($Ratio > 1) {
             $Ratio = 1;
         }
+
         $TotalScore = 0;
         if (in_array(false, func_get_args(), true)) {
             return false;
         }
+        
         $TotalScore += $Uploaded * 15;
         $TotalScore += $Downloaded * 8;
         $TotalScore += $Uploads * 25;

classes/users.class.php

@@ -15,20 +15,20 @@ class Users
         if (!$Classes || !$ClassLevels) {
             $QueryID = G::$DB->get_query_id();
             G::$DB->query('
-        SELECT ID, Name, Abbreviation, Level, Secondary
-        FROM permissions
-        ORDER BY Level');
+            SELECT ID, Name, Abbreviation, Level, Secondary
+            FROM permissions
+              ORDER BY Level');
+
             $Classes = G::$DB->to_array('ID');
             $ClassLevels = G::$DB->to_array('Level');
             G::$DB->set_query_id($QueryID);
             G::$Cache->cache_value('classes', [$Classes, $ClassLevels], 0);
         }
-        $Debug->set_flag('Loaded permissions');
 
+        $Debug->set_flag('Loaded permissions');
         return [$Classes, $ClassLevels];
     }
 
-
     /**
      * Get user info, is used for the current user and usernames all over the site.
      *
@@ -59,60 +59,62 @@ class Users
             $OldQueryID = G::$DB->get_query_id();
 
             G::$DB->query("
-        SELECT
-          m.ID,
-          m.Username,
-          m.PermissionID,
-          m.Paranoia,
-          i.Artist,
-          i.Donor,
-          i.Warned,
-          i.Avatar,
-          m.Enabled,
-          m.Title,
-          i.CatchupTime,
-          m.Visible,
-          la.Type AS LockedAccount,
-          GROUP_CONCAT(ul.PermissionID SEPARATOR ',') AS Levels
-        FROM users_main AS m
-          INNER JOIN users_info AS i ON i.UserID = m.ID
-          LEFT JOIN locked_accounts AS la ON la.UserID = m.ID
-          LEFT JOIN users_levels AS ul ON ul.UserID = m.ID
-        WHERE m.ID = '$UserID'
-        GROUP BY m.ID");
+            SELECT
+              m.ID,
+              m.Username,
+              m.PermissionID,
+              m.Paranoia,
+              i.Artist,
+              i.Donor,
+              i.Warned,
+              i.Avatar,
+              m.Enabled,
+              m.Title,
+              i.CatchupTime,
+              m.Visible,
+              la.Type AS LockedAccount,
+            GROUP_CONCAT(ul.PermissionID SEPARATOR ',') AS Levels
+            FROM users_main AS m
+              INNER JOIN users_info AS i ON i.UserID = m.ID
+              LEFT JOIN locked_accounts AS la ON la.UserID = m.ID
+              LEFT JOIN users_levels AS ul ON ul.UserID = m.ID
+            WHERE m.ID = '$UserID'
+              GROUP BY m.ID");
 
             if (!G::$DB->has_results()) { // Deleted user, maybe?
                 $UserInfo = [
-          'ID'           => $UserID,
-          'Username'     => '',
-          'PermissionID' => 0,
-          'Paranoia'     => [],
-          'Artist'       => false,
-          'Donor'        => false,
-          'Warned'       => null,
-          'Avatar'       => '',
-          'Enabled'      => 0,
-          'Title'        => '',
-          'CatchupTime'  => 0,
-          'Visible'      => '1',
-          'Levels'       => '',
-          'Class'        => 0
-        ];
+                    'ID'           => $UserID,
+                    'Username'     => '',
+                    'PermissionID' => 0,
+                    'Paranoia'     => [],
+                    'Artist'       => false,
+                    'Donor'        => false,
+                    'Warned'       => null,
+                    'Avatar'       => '',
+                    'Enabled'      => 0,
+                    'Title'        => '',
+                    'CatchupTime'  => 0,
+                    'Visible'      => '1',
+                    'Levels'       => '',
+                    'Class'        => 0
+                ];
             } else {
                 $UserInfo = G::$DB->next_record(MYSQLI_ASSOC, ['Paranoia', 'Title']);
                 $UserInfo['CatchupTime'] = strtotime($UserInfo['CatchupTime']);
+
                 if (!is_array($UserInfo['Paranoia'])) {
                     $UserInfo['Paranoia'] = json_decode($UserInfo['Paranoia'], true);
                 }
+
                 if (!$UserInfo['Paranoia']) {
                     $UserInfo['Paranoia'] = [];
                 }
                 $UserInfo['Class'] = $Classes[$UserInfo['PermissionID']]['Level'];
 
                 G::$DB->query("
-          SELECT BadgeID, Displayed
-          FROM users_badges
-          WHERE UserID = ".$UserID);
+                SELECT BadgeID, Displayed
+                FROM users_badges
+                  WHERE UserID = ".$UserID);
 
                 $Badges = [];
                 if (G::$DB->has_results()) {
@@ -132,6 +134,7 @@ class Users
             } else {
                 $UserInfo['ExtraClasses'] = [];
             }
+
             unset($UserInfo['Levels']);
             $EffectiveClass = $UserInfo['Class'];
             foreach ($UserInfo['ExtraClasses'] as $Class => $Val) {
@@ -142,11 +145,11 @@ class Users
             G::$Cache->cache_value("user_info_$UserID", $UserInfo, 2592000);
             G::$DB->set_query_id($OldQueryID);
         }
+
         if (strtotime($UserInfo['Warned']) < time()) {
             $UserInfo['Warned'] = null;
             G::$Cache->cache_value("user_info_$UserID", $UserInfo, 2592000);
         }
-
         return $UserInfo;
     }
 
@@ -164,43 +167,44 @@ class Users
         if (empty($HeavyInfo)) {
             $QueryID = G::$DB->get_query_id();
             G::$DB->query("
-        SELECT
-          m.Invites,
-          m.torrent_pass,
-          m.IP,
-          m.CustomPermissions,
-          m.can_leech AS CanLeech,
-          i.AuthKey,
-          i.RatioWatchEnds,
-          i.RatioWatchDownload,
-          i.StyleID,
-          i.StyleURL,
-          i.DisableInvites,
-          i.DisablePosting,
-          i.DisableUpload,
-          i.DisableWiki,
-          i.DisableAvatar,
-          i.DisablePM,
-          i.DisablePoints,
-          i.DisablePromotion,
-          i.DisableRequests,
-          i.DisableForums,
-          i.DisableTagging,
-          i.SiteOptions,
-          i.LastReadNews,
-          i.LastReadBlog,
-          i.RestrictedForums,
-          i.PermittedForums,
-          m.FLTokens,
-          m.BonusPoints,
-          m.HnR,
-          m.PermissionID
-        FROM users_main AS m
-          INNER JOIN users_info AS i ON i.UserID = m.ID
-        WHERE m.ID = '$UserID'");
-            $HeavyInfo = G::$DB->next_record(MYSQLI_ASSOC, ['CustomPermissions', 'SiteOptions']);
+            SELECT
+              m.Invites,
+              m.torrent_pass,
+              m.IP,
+              m.CustomPermissions,
+              m.can_leech AS CanLeech,
+              i.AuthKey,
+              i.RatioWatchEnds,
+              i.RatioWatchDownload,
+              i.StyleID,
+              i.StyleURL,
+              i.DisableInvites,
+              i.DisablePosting,
+              i.DisableUpload,
+              i.DisableWiki,
+              i.DisableAvatar,
+              i.DisablePM,
+              i.DisablePoints,
+              i.DisablePromotion,
+              i.DisableRequests,
+              i.DisableForums,
+              i.DisableTagging,
+              i.SiteOptions,
+              i.LastReadNews,
+              i.LastReadBlog,
+              i.RestrictedForums,
+              i.PermittedForums,
+              m.FLTokens,
+              m.BonusPoints,
+              m.HnR,
+              m.PermissionID
+            FROM users_main AS m
+              INNER JOIN users_info AS i ON i.UserID = m.ID
+              WHERE m.ID = '$UserID'");
 
+            $HeavyInfo = G::$DB->next_record(MYSQLI_ASSOC, ['CustomPermissions', 'SiteOptions']);
             $HeavyInfo['CustomPermissions'] = [];
+
             if (!empty($HeavyInfo['CustomPermissions'])) {
                 $HeavyInfo['CustomPermissions'] = json_decode($HeavyInfo['CustomPermissions'], true);
             }
@@ -218,9 +222,10 @@ class Users
             unset($HeavyInfo['PermittedForums']);
 
             G::$DB->query("
-        SELECT PermissionID
-        FROM users_levels
-        WHERE UserID = $UserID");
+            SELECT PermissionID
+            FROM users_levels
+              WHERE UserID = $UserID");
+
             $PermIDs = G::$DB->collect('PermissionID');
             foreach ($PermIDs as $PermID) {
                 $Perms = Permissions::get_permissions($PermID);
@@ -228,6 +233,7 @@ class Users
                     $PermittedForums = array_merge($PermittedForums, array_map('trim', explode(',', $Perms['PermittedForums'])));
                 }
             }
+
             $Perms = Permissions::get_permissions($HeavyInfo['PermissionID']);
             unset($HeavyInfo['PermissionID']);
             if (!empty($Perms['PermittedForums'])) {
@@ -240,10 +246,12 @@ class Users
                 foreach ($RestrictedForums as $ForumID) {
                     $HeavyInfo['CustomForums'][$ForumID] = 0;
                 }
+
                 foreach ($PermittedForums as $ForumID) {
                     $HeavyInfo['CustomForums'][$ForumID] = 1;
                 }
             }
+
             if (isset($HeavyInfo['CustomForums'][''])) {
                 unset($HeavyInfo['CustomForums']['']);
             }
@@ -255,7 +263,6 @@ class Users
             unset($HeavyInfo['SiteOptions']);
 
             G::$DB->set_query_id($QueryID);
-
             G::$Cache->cache_value("user_info_heavy_$UserID", $HeavyInfo, 0);
         }
         return $HeavyInfo;
@@ -273,6 +280,7 @@ class Users
         if (!is_number($UserID)) {
             error(0);
         }
+
         if (empty($NewOptions)) {
             return false;
         }
@@ -281,9 +289,10 @@ class Users
 
         // Get SiteOptions
         G::$DB->query("
-      SELECT SiteOptions
-      FROM users_info
-      WHERE UserID = $UserID");
+        SELECT SiteOptions
+        FROM users_info
+          WHERE UserID = $UserID");
+
         list($SiteOptions) = G::$DB->next_record(MYSQLI_NUM, false);
         $SiteOptions = json_decode($SiteOptions, true);
 
@@ -296,9 +305,9 @@ class Users
 
         // Update DB
         G::$DB->query("
-      UPDATE users_info
-      SET SiteOptions = '".db_string(json_encode($SiteOptions, true))."'
-      WHERE UserID = $UserID");
+        UPDATE users_info
+        SET SiteOptions = '".db_string(json_encode($SiteOptions, true))."'
+          WHERE UserID = $UserID");
         G::$DB->set_query_id($QueryID);
 
         // Update cache
@@ -370,12 +379,12 @@ class Users
     {
         global $Classes;
 
-        if ($UserID == 0) {
+        if ($UserID === 0) {
             return 'System';
         }
 
         $UserInfo = self::user_info($UserID);
-        if ($UserInfo['Username'] == '') {
+        if ($UserInfo['Username'] === '') {
             return "Unknown [$UserID]";
         }
 
@@ -404,9 +413,10 @@ class Users
         }
         if ($Badges) {
             $DonorRank = Donations::get_rank($UserID);
-            if ($DonorRank == 0 && $UserInfo['Donor'] == 1) {
+            if ($DonorRank == 0 && $UserInfo['Donor'] === 1) {
                 $DonorRank = 1;
             }
+
             if ($ShowDonorIcon && $DonorRank > 0) {
                 $IconLink = 'donate.php';
                 $IconImage = 'donor.png';
@@ -415,12 +425,15 @@ class Users
                 $SpecialRank = Donations::get_special_rank($UserID);
                 $EnabledRewards = Donations::get_enabled_rewards($UserID);
                 $DonorRewards = Donations::get_rewards($UserID);
+
                 if ($EnabledRewards['HasDonorIconMouseOverText'] && !empty($DonorRewards['IconMouseOverText'])) {
                     $IconText = display_str($DonorRewards['IconMouseOverText']);
                 }
+
                 if ($EnabledRewards['HasDonorIconLink'] && !empty($DonorRewards['CustomIconLink'])) {
                     $IconLink = display_str($DonorRewards['CustomIconLink']);
                 }
+
                 if ($EnabledRewards['HasCustomDonorIcon'] && !empty($DonorRewards['CustomIcon'])) {
                     $IconImage = ImageTools::process($DonorRewards['CustomIcon']);
                 } else {
@@ -431,6 +444,7 @@ class Users
                     } elseif ($DonorRank >= MAX_RANK) {
                         $DonorHeart = 5;
                     }
+
                     if ($DonorHeart === 1) {
                         $IconImage = STATIC_SERVER . 'common/symbols/donor.png';
                     } else {
@@ -442,16 +456,20 @@ class Users
             $Str .= Badges::display_badges(Badges::get_displayed_badges($UserID), true);
         }
 
-        $Str .= ($IsWarned && $UserInfo['Warned']) ? '<a href="wiki.php?action=article&amp;name=warnings"'
-          . '><img src="'.STATIC_SERVER.'common/symbols/warned.png" alt="Warned" title="Warned'
-          . (G::$LoggedUser['ID'] === $UserID ? ' - Expires ' . date('Y-m-d H:i', strtotime($UserInfo['Warned'])) : '')
-          . '" class="tooltip" /></a>' : '';
-        $Str .= ($IsEnabled && $UserInfo['Enabled'] == 2) ? '<a href="rules.php"><img src="'.STATIC_SERVER.'common/symbols/disabled.png" alt="Banned" title="Disabled" class="tooltip" /></a>' : '';
+        $Str .= ($IsWarned && $UserInfo['Warned'])
+          ? '<a href="wiki.php?action=article&amp;name=warnings"'.'><img src="'.STATIC_SERVER.'common/symbols/warned.png" alt="Warned" title="Warned'.(G::$LoggedUser['ID'] === $UserID ? ' - Expires '.date('Y-m-d H:i', strtotime($UserInfo['Warned']))
+          : '').'" class="tooltip" /></a>'
+          : '';
+
+        $Str .= ($IsEnabled && $UserInfo['Enabled'] === 2)
+          ? '<a href="rules.php"><img src="'.STATIC_SERVER.'common/symbols/disabled.png" alt="Banned" title="Disabled" class="tooltip" /></a>'
+          : '';
 
         if ($Class) {
             foreach (array_keys($UserInfo['ExtraClasses']) as $ExtraClass) {
                 $Str .= ' ['.Users::make_class_abbrev_string($ExtraClass).']';
             }
+
             if ($Title) {
                 $Str .= ' <strong>('.Users::make_class_string($UserInfo['PermissionID']).')</strong>';
             } else {
@@ -463,12 +481,12 @@ class Users
             // Image proxy CTs
             if (check_perms('site_proxy_images') && !empty($UserInfo['Title'])) {
                 $UserInfo['Title'] = preg_replace_callback(
-            '~src=("?)(http.+?)(["\s>])~',
-            function ($Matches) {
-                return 'src=' . $Matches[1] . ImageTools::process($Matches[2]) . $Matches[3];
-            },
-            $UserInfo['Title']
-        );
+                    '~src=("?)(http.+?)(["\s>])~',
+                    function ($Matches) {
+                        return 'src=' . $Matches[1] . ImageTools::process($Matches[2]) . $Matches[3];
+                    },
+                    $UserInfo['Title']
+                );
             }
 
             if ($UserInfo['Title']) {
@@ -510,10 +528,11 @@ class Users
         } else {
             $QueryID = G::$DB->get_query_id();
             G::$DB->query("
-        SELECT GroupID, Sort, `Time`
-        FROM bookmarks_torrents
-        WHERE UserID = $UserID
-        ORDER BY Sort, `Time` ASC");
+            SELECT GroupID, Sort, `Time`
+            FROM bookmarks_torrents
+              WHERE UserID = $UserID
+              ORDER BY Sort, `Time` ASC");
+
             $GroupIDs = G::$DB->collect('GroupID');
             $BookmarkData = G::$DB->to_array('GroupID', MYSQLI_ASSOC);
             G::$DB->set_query_id($QueryID);
@@ -521,7 +540,6 @@ class Users
         }
 
         $TorrentList = Torrents::get_groups($GroupIDs);
-
         return [$GroupIDs, $BookmarkData, $TorrentList];
     }
 
@@ -548,29 +566,34 @@ class Users
             $Rewards = Donations::get_rewards($UserID);
             $AvatarMouseOverText = $Rewards['AvatarMouseOverText'];
         }
+
         if (!empty($AvatarMouseOverText)) {
             $AvatarMouseOverText =  "title=\"$AvatarMouseOverText\" alt=\"$AvatarMouseOverText\"";
         } else {
             $AvatarMouseOverText = "alt=\"$Username's avatar\"";
         }
+
         if ($EnabledRewards['HasSecondAvatar'] && !empty($Rewards['SecondAvatar'])) {
             $SecondAvatar = ' data-gazelle-second-avatar="' . ImageTools::process($Rewards['SecondAvatar'], 'avatar') . '"';
         }
-        // case 1 is avatars disabled
+
+        // Case 1 is avatars disabled
         switch ($Setting) {
-      case 0:
-        if (!empty($Avatar)) {
-            $ToReturn = ($ReturnHTML ? "<a href=\"user.php?id=$UserID\"><img src=\"$Avatar\" ".($Size?"width=\"$Size\" ":"")."$Style $AvatarMouseOverText$SecondAvatar $Class /></a>" : $Avatar);
-        } else {
-            $URL = STATIC_SERVER.'common/avatars/default.png';
-            $ToReturn = ($ReturnHTML ? "<img src=\"$URL\" width=\"$Size\" $Style $AvatarMouseOverText$SecondAvatar />" : $URL);
-        }
-        break;
-      case 2:
-        $ShowAvatar = true;
-        // no break
-      case 3:
-        switch (G::$LoggedUser['Identicons']) {
+        case 0:
+          if (!empty($Avatar)) {
+              $ToReturn = ($ReturnHTML ? "<a href=\"user.php?id=$UserID\"><img src=\"$Avatar\" ".($Size?"width=\"$Size\" ":"")."$Style $AvatarMouseOverText$SecondAvatar $Class /></a>" : $Avatar);
+          } else {
+              $URL = STATIC_SERVER.'common/avatars/default.png';
+              $ToReturn = ($ReturnHTML ? "<img src=\"$URL\" width=\"$Size\" $Style $AvatarMouseOverText$SecondAvatar />" : $URL);
+          }
+          break;
+
+        case 2:
+          $ShowAvatar = true;
+          // no break
+
+        case 3:
+          switch (G::$LoggedUser['Identicons']) {
           case 0:
             $Type = 'identicon';
             break;
@@ -598,29 +621,32 @@ class Users
           default:
             $Type = 'identicon';
         }
-        $Rating = 'pg';
-        if (!isset($Robot) || !$Robot) {
-            $URL = 'https://secure.gravatar.com/avatar/'.md5(strtolower(trim($Username)))."?s=$Size&amp;d=$Type&amp;r=$Rating";
-        } else {
-            $URL = 'https://robohash.org/'.md5($Username)."?set=set$Type&amp;size={$Size}x$Size";
-        }
-        if ($ShowAvatar == true && !empty($Avatar)) {
-            $ToReturn = ($ReturnHTML ? "<img src=\"$Avatar\" width=\"$Size\" $Style $AvatarMouseOverText$SecondAvatar $Class />" : $Avatar);
-        } else {
-            $ToReturn = ($ReturnHTML ? "<img src=\"$URL\" width=\"$Size\" $Style $AvatarMouseOverText $Class />" : $URL);
+
+          $Rating = 'pg';
+          if (!isset($Robot) || !$Robot) {
+              $URL = 'https://secure.gravatar.com/avatar/'.md5(strtolower(trim($Username)))."?s=$Size&amp;d=$Type&amp;r=$Rating";
+          } else {
+              $URL = 'https://robohash.org/'.md5($Username)."?set=set$Type&amp;size={$Size}x$Size";
+          }
+
+          if ($ShowAvatar === true && !empty($Avatar)) {
+              $ToReturn = ($ReturnHTML ? "<img src=\"$Avatar\" width=\"$Size\" $Style $AvatarMouseOverText$SecondAvatar $Class />" : $Avatar);
+          } else {
+              $ToReturn = ($ReturnHTML ? "<img src=\"$URL\" width=\"$Size\" $Style $AvatarMouseOverText $Class />" : $URL);
+          }
+          break;
+
+        default:
+          $URL = STATIC_SERVER.'common/avatars/default.png';
+          $ToReturn = ($ReturnHTML ? "<img src=\"$URL\" width=\"$Size\" $Style $AvatarMouseOverText$SecondAvatar $Class/>" : $URL);
         }
-        break;
-      default:
-        $URL = STATIC_SERVER.'common/avatars/default.png';
-        $ToReturn = ($ReturnHTML ? "<img src=\"$URL\" width=\"$Size\" $Style $AvatarMouseOverText$SecondAvatar $Class/>" : $URL);
-    }
         return $ToReturn;
     }
 
     public static function has_avatars_enabled()
     {
         global $HeavyInfo;
-        return isset($HeavyInfo['DisableAvatars']) && ($HeavyInfo['DisableAvatars'] != 1);
+        return isset($HeavyInfo['DisableAvatars']) && ($HeavyInfo['DisableAvatars'] !== 1);
     }
 
     /**
@@ -639,23 +665,26 @@ class Users
             $Enabled = true;
         } elseif (G::$LoggedUser['AutoComplete'] !== 1) {
             switch ($Type) {
-        case 'search':
-          if (G::$LoggedUser['AutoComplete'] == 2) {
-              $Enabled = true;
-          }
-          break;
-        case 'other':
-          if (G::$LoggedUser['AutoComplete'] != 2) {
-              $Enabled = true;
-          }
-          break;
-      }
+            case 'search':
+              if (G::$LoggedUser['AutoComplete'] === 2) {
+                  $Enabled = true;
+              }
+              break;
+
+            case 'other':
+              if (G::$LoggedUser['AutoComplete'] !== 2) {
+                  $Enabled = true;
+              }
+              break;
+            }
         }
+
         if ($Enabled && $Output) {
             echo ' data-gazelle-autocomplete="true"';
         }
+
         if (!$Output) {
-            // don't return a boolean if you're echoing HTML
+            // Don't return a boolean if you're echoing HTML
             return $Enabled;
         }
     }
@@ -671,12 +700,13 @@ class Users
     {
         $ResetKey = Users::make_secret();
         G::$DB->query("
-      UPDATE users_info
-      SET
-        ResetKey = '" . db_string($ResetKey) . "',
-        ResetExpires = '" . time_plus(60 * 60) . "'
-      WHERE UserID = '$UserID'");
-        require_once(SERVER_ROOT . '/classes/templates.class.php');
+        UPDATE users_info
+        SET
+          ResetKey = '" . db_string($ResetKey) . "',
+          ResetExpires = '" . time_plus(60 * 60) . "'
+        WHERE UserID = '$UserID'");
+
+        require_once SERVER_ROOT . '/classes/templates.class.php';
         $TPL = new TEMPLATE;
         $TPL->open(SERVER_ROOT . '/templates/password_reset.tpl'); // Password reset template
         $TPL->set('Username', $Username);
@@ -688,7 +718,6 @@ class Users
         Misc::send_email($Email, 'Password reset information for ' . SITE_NAME, $TPL->get(), 'noreply');
     }
 
-
     /*
      * Authorize a new location
      *
@@ -701,7 +730,8 @@ class Users
     {
         $AuthKey = Users::make_secret();
         G::$Cache->cache_value('new_location_'.$AuthKey, ['UserID'=>$UserID, 'ASN'=>$ASN], 3600*2);
-        require_once(SERVER_ROOT . '/classes/templates.class.php');
+
+        require_once SERVER_ROOT . '/classes/templates.class.php';
         $TPL = new TEMPLATE;
         $TPL->open(SERVER_ROOT . '/templates/new_location.tpl');
         $TPL->set('Username', $Username);
@@ -720,16 +750,19 @@ class Users
         if (!($SourceKey = G::$Cache->get_value('source_key_new'))) {
             G::$Cache->cache_value('source_key_new', $SourceKey = [Users::make_secret(), time()]);
         }
+
         $SourceKeyOld = G::$Cache->get_value('source_key_old');
         if ($SourceKey[1]-time() > 3600) {
             G::$Cache->cache_value('source_key_old', $SourceKeyOld = $SourceKey);
             G::$Cache->cache_value('source_key_new', $SourceKey = [Users::make_secret(), time()]);
         }
+
         G::$DB->query("
-      SELECT
-        COUNT(ID)
-      FROM torrents
-      WHERE UserID = ".G::$LoggedUser['ID']);
+        SELECT
+          COUNT(ID)
+        FROM torrents
+          WHERE UserID = ".G::$LoggedUser['ID']);
+          
         list($Uploads) = G::$DB->next_record();
         $Source[0] = SITE_NAME.'-'.substr(hash('sha256', $SourceKey[0].G::$LoggedUser['ID'].$Uploads), 0, 10);
         $Source[1] = $SourceKeyOld ? SITE_NAME.'-'.substr(hash('sha256', $SourceKeyOld[0].G::$LoggedUser['ID'].$Uploads), 0, 10) : $Source[0];

classes/validate.class.php

@@ -18,21 +18,27 @@ class Validate
         if (!empty($Options['maxlength'])) {
             $this->Fields[$FieldName]['MaxLength'] = $Options['maxlength'];
         }
+
         if (!empty($Options['minlength'])) {
             $this->Fields[$FieldName]['MinLength'] = $Options['minlength'];
         }
+
         if (!empty($Options['comparefield'])) {
             $this->Fields[$FieldName]['CompareField'] = $Options['comparefield'];
         }
+
         if (!empty($Options['allowperiod'])) {
             $this->Fields[$FieldName]['AllowPeriod'] = $Options['allowperiod'];
         }
+
         if (!empty($Options['allowcomma'])) {
             $this->Fields[$FieldName]['AllowComma'] = $Options['allowcomma'];
         }
+
         if (!empty($Options['inarray'])) {
             $this->Fields[$FieldName]['InArray'] = $Options['inarray'];
         }
+
         if (!empty($Options['regex'])) {
             $this->Fields[$FieldName]['Regex'] = $Options['regex'];
         }
@@ -52,6 +58,7 @@ class Validate
                     } else {
                         $MaxLength = 255;
                     }
+
                     if (isset($Field['MinLength'])) {
                         $MinLength = $Field['MinLength'];
                     } else {
@@ -69,6 +76,7 @@ class Validate
                     } else {
                         $MaxLength = '';
                     }
+
                     if (isset($Field['MinLength'])) {
                         $MinLength = $Field['MinLength'];
                     } else {
@@ -79,6 +87,7 @@ class Validate
                     if (isset($Field['AllowPeriod'])) {
                         $Match .= '.';
                     }
+
                     if (isset($Field['AllowComma'])) {
                         $Match .= ',';
                     }
@@ -115,6 +124,7 @@ class Validate
                     } else {
                         $MaxLength = 255;
                     }
+
                     if (isset($Field['MinLength'])) {
                         $MinLength = $Field['MinLength'];
                     } else {
@@ -134,6 +144,7 @@ class Validate
                     } else {
                         $MaxLength = 20;
                     }
+                    
                     if (isset($Field['MinLength'])) {
                         $MinLength = $Field['MinLength'];
                     } else {

sections/forums/forum.php

@@ -278,12 +278,17 @@ if (count($Forum) === 0) {
         }
     } ?>
   </table>
+
   <div class="breadcrumbs">
-    <a href="forums.php">Forums</a> › <?=$ForumName?>
+    <p>
+      <a href="forums.php">Forums</a> › <?=$ForumName?>
+    </p>
   </div>
+
   <div class="linkbox pager">
     <?=$Pages?>
   </div>
+
   <div class="linkbox"><a
       href="forums.php?action=catchup&amp;forumid=<?=$ForumID?>&amp;auth=<?=$LoggedUser['AuthKey']?>"
       class="brackets">Catch up</a></div>