Make minor search forms consistent

classes/collages.class.php

@@ -1,48 +1,52 @@
-<?
-class Collages {
-  public static function increase_subscriptions($CollageID) {
-    $QueryID = G::$DB->get_query_id();
-    G::$DB->query("
+<?php
+class Collages
+{
+    public static function increase_subscriptions($CollageID)
+    {
+        $QueryID = G::$DB->get_query_id();
+        G::$DB->query("
       UPDATE collages
       SET Subscribers = Subscribers + 1
       WHERE ID = '$CollageID'");
-    G::$DB->set_query_id($QueryID);
-  }
+        G::$DB->set_query_id($QueryID);
+    }
 
-  public static function decrease_subscriptions($CollageID) {
-    $QueryID = G::$DB->get_query_id();
-    G::$DB->query("
+    public static function decrease_subscriptions($CollageID)
+    {
+        $QueryID = G::$DB->get_query_id();
+        G::$DB->query("
       UPDATE collages
       SET Subscribers = IF(Subscribers < 1, 0, Subscribers - 1)
       WHERE ID = '$CollageID'");
-    G::$DB->set_query_id($QueryID);
-  }
+        G::$DB->set_query_id($QueryID);
+    }
 
-  public static function create_personal_collage() {
-    G::$DB->query("
+    public static function create_personal_collage()
+    {
+        G::$DB->query("
       SELECT
         COUNT(ID)
       FROM collages
       WHERE UserID = '" . G::$LoggedUser['ID'] . "'
         AND CategoryID = '0'
         AND Deleted = '0'");
-    list($CollageCount) = G::$DB->next_record();
+        list($CollageCount) = G::$DB->next_record();
 
-    if ($CollageCount >= G::$LoggedUser['Permissions']['MaxCollages']) {
-      // TODO: fix this, the query was for COUNT(ID), so I highly doubt that this works... - Y
-      list($CollageID) = G::$DB->next_record();
-      header('Location: collage.php?id='.$CollageID);
-      die();
-    }
-    $NameStr = db_string(G::$LoggedUser['Username'] . "'s personal collage" . ($CollageCount > 0 ? ' no. ' . ($CollageCount + 1) : ''));
-    $Description = db_string('Personal collage for ' . G::$LoggedUser['Username'] . '. The first 5 albums will appear on his or her [url=' . site_url() . 'user.php?id= ' . G::$LoggedUser['ID'] . ']profile[/url].');
-    G::$DB->query("
+        if ($CollageCount >= G::$LoggedUser['Permissions']['MaxCollages']) {
+            // @todo Fix this, the query was for COUNT(ID), so I highly doubt that this works... - Y
+            list($CollageID) = G::$DB->next_record();
+            header('Location: collage.php?id='.$CollageID);
+            die();
+        }
+        $NameStr = db_string(G::$LoggedUser['Username'] . "'s personal collage" . ($CollageCount > 0 ? ' no. ' . ($CollageCount + 1) : ''));
+        $Description = db_string('Personal collage for ' . G::$LoggedUser['Username'] . '. The first 5 albums will appear on his or her [url=' . site_url() . 'user.php?id= ' . G::$LoggedUser['ID'] . ']profile[/url].');
+        G::$DB->query("
       INSERT INTO collages
         (Name, Description, CategoryID, UserID)
       VALUES
         ('$NameStr', '$Description', '0', " . G::$LoggedUser['ID'] . ")");
-    $CollageID = G::$DB->inserted_id();
-    header('Location: collage.php?id='.$CollageID);
-    die();
-  }
+        $CollageID = G::$DB->inserted_id();
+        header('Location: collage.php?id='.$CollageID);
+        die();
+    }
 }

classes/comments.class.php

@@ -49,7 +49,7 @@ class Comments {
    * @param int $PostID
    * @param string $NewBody
    * @param bool $SendPM If true, send a PM to the author of the comment informing him about the edit
-   * @todo move permission check out of here/remove hardcoded error(404)
+   * @todo Move permission check out of here/remove hardcoded error(404)
    */
   public static function edit($PostID, $NewBody, $SendPM = false) {
     $QueryID = G::$DB->get_query_id();

classes/torrent_form.class.php

@@ -10,7 +10,7 @@ class TorrentForm
     #var $Formats = [];
     #var $Bitrates = [];
     public $Media = [];
-    var $MediaManga = [];
+    public $MediaManga = [];
     public $Containers = [];
     #var $ContainersGames = [];
     public $Codecs = [];
@@ -212,9 +212,8 @@ class TorrentForm
         </td>
       </tr>
       <?php
-          }
-        }
-      ?>
+            }
+        } ?>
 
       <!-- Rules notice and submit button -->
       <tr>
@@ -330,8 +329,8 @@ class TorrentForm
       One per field, e.g., Robert K. Mortimer [+] David Schild<br />
       <?php
         if (!empty($Torrent['Artists'])) {
-          foreach ($Torrent['Artists'] as $Num => $Artist) {
-      ?>
+            foreach ($Torrent['Artists'] as $Num => $Artist) {
+                ?>
       <input type="text" id="idols_<?= $Num ?>" name="idols[]"
         size="45" value="<?= display_str($Artist['name']) ?>"
         <?= $this->Disabled ?>/>
@@ -340,9 +339,9 @@ class TorrentForm
       <a class="remove_artist_button brackets">&minus;</a>
       <?php
             }
-          }
+            }
         } else {
-      ?>
+            ?>
       <input type="text" id="idols_0" name="idols[]" size="45" value="" <?= $this->Disabled ?> />
       <a class="add_artist_button brackets">+</a>
       <a class="remove_artist_button brackets">&minus;</a>
@@ -586,7 +585,7 @@ class TorrentForm
 
   <!-- Boolean options -->
   <tr id="censored_tr">
-    <td class="label">Aligned Sequence?</td>
+    <td class="label">Aligned Sequence</td>
     <td>
       <input type="checkbox" name="censored" value="1"
         <?= (($Torrent['Censored'] ?? 0) ? 'checked ' : '') ?>/>
@@ -595,7 +594,7 @@ class TorrentForm
   </tr>
 
   <tr id="anon_tr">
-    <td class="label">Upload Anonymously?</td>
+    <td class="label">Upload Anonymously</td>
     <td>
       <input type="checkbox" name="anonymous" value="1"
         <?= (($Torrent['Anonymous'] ?? false) ? 'checked ' : '') ?>/>

sections/collages/browse.php

@@ -20,7 +20,7 @@ if (!empty($_GET['type'])) {
 }
 
 if (!empty($_GET['search'])) {
-  // What are we looking for? Let's make sure it isn't dangerous.
+  // What are we looking for? Let's make sure it isn't dangerous
   $Search = db_string(trim($_GET['search']));
   // Break search string down into individual words
   $Words = explode(' ', $Search);
@@ -176,13 +176,13 @@ View::show_header(($BookmarkView) ? 'Your bookmarked collections' : 'Collections
       <div><input type="hidden" name="action" value="search" /></div>
       <table cellpadding="6" cellspacing="1" border="0" class="layout" width="100%">
         <tr id="search_terms">
-          <td class="label">Search terms:</td>
+          <td class="label">Search Terms</td>
           <td>
             <input type="search" name="search" size="70" value="<?=(!empty($_GET['search']) ? display_str($_GET['search']) : '')?>" />
           </td>
         </tr>
         <tr id="tagfilter">
-          <td class="label">Tags (comma-separated):</td>
+          <td class="label">Tags (comma-separated)</td>
           <td>
             <input type="text" id="tags" name="tags" size="70" value="<?=(!empty($_GET['tags']) ? display_str($_GET['tags']) : '')?>"<? Users::has_autocomplete_enabled('other'); ?> />&nbsp;
             <input type="radio" name="tags_type" id="tags_type0" value="0"<?Format::selected('tags_type', 0, 'checked')?> /><label for="tags_type0"> Any</label>&nbsp;&nbsp;
@@ -190,7 +190,7 @@ View::show_header(($BookmarkView) ? 'Your bookmarked collections' : 'Collections
           </td>
         </tr>
         <tr id="categories">
-          <td class="label">Categories:</td>
+          <td class="label">Categories</td>
           <td>
 <?    foreach ($CollageCats as $ID => $Cat) { ?>
             <input type="checkbox" value="1" name="cats[<?=$ID?>]" id="cats_<?=$ID?>"<? if (in_array($ID, $Categories)) { echo ' checked="checked"'; } ?> />
@@ -199,14 +199,14 @@ View::show_header(($BookmarkView) ? 'Your bookmarked collections' : 'Collections
           </td>
         </tr>
         <tr id="search_name_description">
-          <td class="label">Search in:</td>
+          <td class="label">Search In</td>
           <td>
             <input type="radio" name="type" value="c.name" <? if ($Type === 'c.name') { echo 'checked="checked" '; } ?>/> Names&nbsp;&nbsp;
             <input type="radio" name="type" value="description" <? if ($Type === 'description') { echo 'checked="checked" '; } ?>/> Descriptions
           </td>
         </tr>
         <tr id="order_by">
-          <td class="label">Order by:</td>
+          <td class="label">Order By</td>
           <td>
             <select name="order_by" class="ft_order_by">
 <?    foreach ($OrderVals as $Cur) { ?>

sections/forums/search.php

@@ -1,5 +1,7 @@
-<?
-//TODO: Clean up this fucking mess
+<?php
+
+// @todo Clean up this fucking mess
+
 /*
 Forums search result page
 */
@@ -7,86 +9,87 @@ Forums search result page
 list($Page, $Limit) = Format::page_limit(POSTS_PER_PAGE);
 
 if (isset($_GET['type']) && $_GET['type'] === 'body') {
-  $Type = 'body';
+    $Type = 'body';
 } else {
-  $Type = 'title';
+    $Type = 'title';
 }
 
 // What are we looking for? Let's make sure it isn't dangerous.
 if (isset($_GET['search'])) {
-  $Search = trim($_GET['search']);
+    $Search = trim($_GET['search']);
 } else {
-  $Search = '';
+    $Search = '';
 }
 
 $ThreadAfterDate = db_string($_GET['thread_created_after']);
 $ThreadBeforeDate = db_string($_GET['thread_created_before']);
 
 if ((!empty($ThreadAfterDate) && !is_valid_date($ThreadAfterDate)) || (!empty($ThreadBeforeDate) && !is_valid_date($ThreadBeforeDate))) {
-  error("Incorrect topic created date");
+    error("Incorrect topic created date");
 }
 
 $PostAfterDate = db_string($_GET['post_created_after']);
 $PostBeforeDate = db_string($_GET['post_created_before']);
 
 if ((!empty($PostAfterDate) && !is_valid_date($PostAfterDate)) || (!empty($PostBeforeDate) && !is_valid_date($PostBeforeDate))) {
-  error("Incorrect post created date");
+    error("Incorrect post created date");
 }
 
 // Searching for posts by a specific user
 if (!empty($_GET['user'])) {
-  $User = trim($_GET['user']);
-  $DB->query("
+    $User = trim($_GET['user']);
+    $DB->query("
     SELECT ID
     FROM users_main
     WHERE Username = '".db_string($User)."'");
-  list($AuthorID) = $DB->next_record();
-  if ($AuthorID === null) {
-    $AuthorID = 0;
-    //this will cause the search to return 0 results.
-    //workaround in line 276 to display that the username was wrong.
-  }
+    list($AuthorID) = $DB->next_record();
+    if ($AuthorID === null) {
+        $AuthorID = 0;
+        // This will cause the search to return 0 results
+        // Workaround in line 276 to display that the username was wrong
+    }
 } else {
-  $User = '';
+    $User = '';
 }
 
 // Are we looking in individual forums?
 if (isset($_GET['forums']) && is_array($_GET['forums'])) {
-  $ForumArray = [];
-  foreach ($_GET['forums'] as $Forum) {
-    if (is_number($Forum)) {
-      $ForumArray[] = $Forum;
+    $ForumArray = [];
+    foreach ($_GET['forums'] as $Forum) {
+        if (is_number($Forum)) {
+            $ForumArray[] = $Forum;
+        }
+    }
+    if (count($ForumArray) > 0) {
+        $SearchForums = implode(', ', $ForumArray);
     }
-  }
-  if (count($ForumArray) > 0) {
-    $SearchForums = implode(', ', $ForumArray);
-  }
 }
 
 // Searching for posts in a specific thread
 if (!empty($_GET['threadid']) && is_number($_GET['threadid'])) {
-  $ThreadID = $_GET['threadid'];
-  $Type = 'body';
-  $SQL = "
+    $ThreadID = $_GET['threadid'];
+    $Type = 'body';
+    $SQL = "
     SELECT
       Title
     FROM forums_topics AS t
       JOIN forums AS f ON f.ID = t.ForumID
     WHERE t.ID = $ThreadID
       AND " . Forums::user_forums_sql();
-  $DB->query($SQL);
-  if (list($Title) = $DB->next_record()) {
-    $Title = " &gt; <a href=\"forums.php?action=viewthread&amp;threadid=$ThreadID\">$Title</a>";
-  } else {
-    error(404);
-  }
+    $DB->query($SQL);
+    if (list($Title) = $DB->next_record()) {
+        $Title = " &gt; <a href=\"forums.php?action=viewthread&amp;threadid=$ThreadID\">$Title</a>";
+    } else {
+        error(404);
+    }
 } else {
-  $ThreadID = '';
+    $ThreadID = '';
 }
 
-// Let's hope we got some results - start printing out the content.
+// Let's hope we got some results - start printing out the content
 View::show_header('Forums &gt; Search', 'bbcode,forum_search');
 ?>
+
 <div class="thin">
   <div class="header">
     <h2><a href="forums.php">Forums</a> &gt; Search<?=$Title?></h2>
@@ -95,39 +98,45 @@ View::show_header('Forums &gt; Search', 'bbcode,forum_search');
     <input type="hidden" name="action" value="search" />
     <table cellpadding="6" cellspacing="1" border="0" class="layout border" width="100%">
       <tr>
-        <td><strong>Search for:</strong></td>
+        <td><strong>Search Terms</strong></td>
         <td>
           <input type="search" name="search" size="70" value="<?=display_str($Search)?>" />
         </td>
       </tr>
       <tr>
-        <td><strong>Posted by:</strong></td>
+        <td><strong>Posted By</strong></td>
         <td>
           <input type="search" name="user" placeholder="Username" size="70" value="<?=display_str($User)?>" />
         </td>
       </tr>
       <tr>
-        <td><strong>Topic created:</strong></td>
+        <td><strong>Topic Created</strong></td>
         <td>
-          After:
-          <input type="text" name="thread_created_after" id="thread_created_after" placeholder="YYYY-MM-DD" pattern="[1-2][0-9]{3}-[0-9]{2}-[0-9]{2}" value="<?=$ThreadAfterDate?>" />
-          Before:
+          After
+          <input type="text" name="thread_created_after" id="thread_created_after" placeholder="YYYY-MM-DD" pattern="[1-2][0-9]{3}-[0-9]{2}-[0-9]{2}" value="<?=$ThreadAfterDate?>" />&nbsp;&nbsp;
+          Before
           <input type="text" name="thread_created_before" id="thread_created_before" placeholder="YYYY-MM-DD" pattern="[1-2][0-9]{3}-[0-9]{2}-[0-9]{2}" value="<?=$ThreadBeforeDate?>" />
         </td>
       </tr>
-<?
+<?php
 if (empty($ThreadID)) {
-?>
+    ?>
       <tr>
-        <td><strong>Search in:</strong></td>
+        <td><strong>Search In</strong></td>
         <td>
-          <input type="radio" name="type" id="type_title" value="title"<? if ($Type == 'title') { echo ' checked="checked"'; } ?> />
+          <input type="radio" name="type" id="type_title" value="title"<?php if ($Type == 'title') {
+        echo ' checked="checked"';
+    } ?> />
           <label for="type_title">Titles</label>
-          <input type="radio" name="type" id="type_body" value="body"<? if ($Type == 'body') { echo ' checked="checked"'; } ?> />
-          <label for="type_body">Post bodies</label>
+          <input type="radio" name="type" id="type_body" value="body"<?php if ($Type == 'body') {
+        echo ' checked="checked"';
+    } ?> />&nbsp;&nbsp;
+          <label for="type_body">Body</label>
         </td>
       </tr>
-      <tr id="post_created_row" <? if ($Type == 'title') { echo "class='hidden'"; } ?>>
+      <tr id="post_created_row" <?php if ($Type == 'title') {
+        echo "class='hidden'";
+    } ?>>
         <td><strong>Post created:</strong></td>
         <td>
           After:
@@ -137,40 +146,37 @@ if (empty($ThreadID)) {
         </td>
       </tr>
       <tr>
-        <td><strong>Forums:</strong></td>
+        <td><strong>Forums</strong></td>
         <td>
     <table id="forum_search_cat_list" class="cat_list layout">
 
 
-<?
+<?php
   // List of forums
   $Open = false;
-  $LastCategoryID = -1;
-  $Columns = 0;
-  $i = 0;
-  foreach ($Forums as $Forum) {
-    if (!Forums::check_forumperm($Forum['ID'])) {
-      continue;
-    }
+    $LastCategoryID = -1;
+    $Columns = 0;
+    $i = 0;
+    foreach ($Forums as $Forum) {
+        if (!Forums::check_forumperm($Forum['ID'])) {
+            continue;
+        }
 
-    $Columns++;
+        $Columns++;
 
-    if ($Forum['CategoryID'] != $LastCategoryID) {
-      $LastCategoryID = $Forum['CategoryID'];
-      if ($Open) {
-        if ($Columns % 5) { ?>
+        if ($Forum['CategoryID'] != $LastCategoryID) {
+            $LastCategoryID = $Forum['CategoryID'];
+            if ($Open) {
+                if ($Columns % 5) { ?>
         <td colspan="<?=(5 - ($Columns % 5))?>"></td>
-<?
-        }
-
-?>
+<?php
+        } ?>
       </tr>
-<?
-      }
-      $Columns = 0;
-      $Open = true;
-      $i++;
-?>
+<?php
+            }
+            $Columns = 0;
+            $Open = true;
+            $i++; ?>
       <tr>
         <td colspan="5" class="forum_cat">
           <strong><?=$ForumCats[$Forum['CategoryID']]?></strong>
@@ -178,23 +184,28 @@ if (empty($ThreadID)) {
         </td>
       </tr>
       <tr>
-<?    } elseif ($Columns % 5 == 0) { ?>
+<?php
+        } elseif ($Columns % 5 == 0) { ?>
       </tr>
       <tr>
-<?    } ?>
+<?php    } ?>
         <td>
-          <input type="checkbox" name="forums[]" value="<?=$Forum['ID']?>" data-category="forum_category_<?=$i?>" id="forum_<?=$Forum['ID']?>"<? if (isset($_GET['forums']) && in_array($Forum['ID'], $_GET['forums'])) { echo ' checked="checked"';} ?> />
+          <input type="checkbox" name="forums[]" value="<?=$Forum['ID']?>" data-category="forum_category_<?=$i?>" id="forum_<?=$Forum['ID']?>"<?php if (isset($_GET['forums']) && in_array($Forum['ID'], $_GET['forums'])) {
+            echo ' checked="checked"';
+        } ?> />
           <label for="forum_<?=$Forum['ID']?>"><?=htmlspecialchars($Forum['Name'])?></label>
         </td>
-<?  }
-  if ($Columns % 5) { ?>
+<?php
+    }
+    if ($Columns % 5) { ?>
         <td colspan="<?=(5 - ($Columns % 5))?>"></td>
-<?  } ?>
+<?php  } ?>
       </tr>
     </table>
-<? } else { ?>
+<?php
+} else { ?>
             <input type="hidden" name="threadid" value="<?=$ThreadID?>" />
-<? } ?>
+<?php } ?>
           </td>
         </tr>
         <tr>
@@ -205,14 +216,13 @@ if (empty($ThreadID)) {
       </table>
     </form>
   <div class="linkbox">
-<?
+<?php
 
 // Break search string down into individual words
 $Words = explode(' ', db_string($Search));
 
 if ($Type == 'body') {
-
-  $SQL = "
+    $SQL = "
     SELECT
       SQL_CALC_FOUND_ROWS
       t.ID,
@@ -228,43 +238,42 @@ if ($Type == 'body') {
       JOIN forums AS f ON f.ID = t.ForumID
     WHERE " . Forums::user_forums_sql() . ' AND ';
 
-  //In tests, this is significantly faster than LOCATE
-  $SQL .= "p.Body LIKE '%";
-  $SQL .= implode("%' AND p.Body LIKE '%", $Words);
-  $SQL .= "%' ";
+    // In tests, this is significantly faster than LOCATE
+    $SQL .= "p.Body LIKE '%";
+    $SQL .= implode("%' AND p.Body LIKE '%", $Words);
+    $SQL .= "%' ";
 
-  //$SQL .= "LOCATE('";
-  //$SQL .= implode("', p.Body) AND LOCATE('", $Words);
-  //$SQL .= "', p.Body) ";
+    //$SQL .= "LOCATE('";
+    //$SQL .= implode("', p.Body) AND LOCATE('", $Words);
+    //$SQL .= "', p.Body) ";
 
-  if (isset($SearchForums)) {
-    $SQL .= " AND f.ID IN ($SearchForums)";
-  }
-  if (isset($AuthorID)) {
-    $SQL .= " AND p.AuthorID = '$AuthorID' ";
-  }
-  if (!empty($ThreadID)) {
-    $SQL .= " AND t.ID = '$ThreadID' ";
-  }
-  if (!empty($ThreadAfterDate)) {
-    $SQL .= " AND t.CreatedTime >= '$ThreadAfterDate'";
-  }
-  if (!empty($ThreadBeforeDate)) {
-    $SQL .= " AND t.CreatedTime <= '$ThreadBeforeDate'";
-  }
-  if (!empty($PostAfterDate)) {
-    $SQL .= " AND p.AddedTime >= '$PostAfterDate'";
-  }
-  if (!empty($PostBeforeDate)) {
-    $SQL .= " AND p.AddedTime <= '$PostBeforeDate'";
-  }
+    if (isset($SearchForums)) {
+        $SQL .= " AND f.ID IN ($SearchForums)";
+    }
+    if (isset($AuthorID)) {
+        $SQL .= " AND p.AuthorID = '$AuthorID' ";
+    }
+    if (!empty($ThreadID)) {
+        $SQL .= " AND t.ID = '$ThreadID' ";
+    }
+    if (!empty($ThreadAfterDate)) {
+        $SQL .= " AND t.CreatedTime >= '$ThreadAfterDate'";
+    }
+    if (!empty($ThreadBeforeDate)) {
+        $SQL .= " AND t.CreatedTime <= '$ThreadBeforeDate'";
+    }
+    if (!empty($PostAfterDate)) {
+        $SQL .= " AND p.AddedTime >= '$PostAfterDate'";
+    }
+    if (!empty($PostBeforeDate)) {
+        $SQL .= " AND p.AddedTime <= '$PostBeforeDate'";
+    }
 
-  $SQL .= "
+    $SQL .= "
     ORDER BY p.AddedTime DESC
     LIMIT $Limit";
-
 } else {
-  $SQL = "
+    $SQL = "
     SELECT
       SQL_CALC_FOUND_ROWS
       t.ID,
@@ -278,22 +287,22 @@ if ($Type == 'body') {
     FROM forums_topics AS t
       JOIN forums AS f ON f.ID = t.ForumID
     WHERE " . Forums::user_forums_sql() . ' AND ';
-  $SQL .= "t.Title LIKE '%";
-  $SQL .= implode("%' AND t.Title LIKE '%", $Words);
-  $SQL .= "%' ";
-  if (isset($SearchForums)) {
-    $SQL .= " AND f.ID IN ($SearchForums)";
-  }
-  if (isset($AuthorID)) {
-    $SQL .= " AND t.AuthorID = '$AuthorID' ";
-  }
-  if (!empty($ThreadAfterDate)) {
-    $SQL .= " AND t.CreatedTime >= '$ThreadAfterDate'";
-  }
-  if (!empty($ThreadBeforeDate)) {
-    $SQL .= " AND t.CreatedTime <= '$ThreadBeforeDate'";
-  }
-  $SQL .= "
+    $SQL .= "t.Title LIKE '%";
+    $SQL .= implode("%' AND t.Title LIKE '%", $Words);
+    $SQL .= "%' ";
+    if (isset($SearchForums)) {
+        $SQL .= " AND f.ID IN ($SearchForums)";
+    }
+    if (isset($AuthorID)) {
+        $SQL .= " AND t.AuthorID = '$AuthorID' ";
+    }
+    if (!empty($ThreadAfterDate)) {
+        $SQL .= " AND t.CreatedTime >= '$ThreadAfterDate'";
+    }
+    if (!empty($ThreadBeforeDate)) {
+        $SQL .= " AND t.CreatedTime <= '$ThreadBeforeDate'";
+    }
+    $SQL .= "
     ORDER BY t.LastPostTime DESC
     LIMIT $Limit";
 }
@@ -315,27 +324,28 @@ echo $Pages;
     <td>Topic creation time</td>
     <td>Last post time</td>
   </tr>
-<? if (!$DB->has_results()) { ?>
+<?php if (!$DB->has_results()) { ?>
     <tr><td colspan="4">Nothing found<?=((isset($AuthorID) && $AuthorID == 0) ? ' (unknown username)' : '')?>!</td></tr>
-<? }
+<?php }
 
 while (list($ID, $Title, $ForumID, $ForumName, $LastTime, $PostID, $Body, $ThreadCreatedTime) = $DB->next_record()) {
-  // Print results
-?>
+    // Print results?>
     <tr class="row">
       <td>
         <a href="forums.php?action=viewforum&amp;forumid=<?=$ForumID?>"><?=$ForumName?></a>
       </td>
       <td>
-<?  if (empty($ThreadID)) { ?>
+<?php  if (empty($ThreadID)) { ?>
         <a href="forums.php?action=viewthread&amp;threadid=<?=$ID?>"><?=Format::cut_string($Title, 80); ?></a>
-<?  } else { ?>
+<?php  } else { ?>
         <?=Format::cut_string($Title, 80); ?>
-<?
+<?php
   }
-  if ($Type == 'body') { ?>
-        <a data-toggle-target="#post_<?=$PostID?>_text">(Show)</a> <span class="float_right tooltip last_read" title="Jump to post"><a href="forums.php?action=viewthread&amp;threadid=<?=$ID?><? if (!empty($PostID)) { echo "&amp;postid=$PostID#post$PostID"; } ?>"></a></span>
-<?  } ?>
+    if ($Type == 'body') { ?>
+        <a data-toggle-target="#post_<?=$PostID?>_text">(Show)</a> <span class="float_right tooltip last_read" title="Jump to post"><a href="forums.php?action=viewthread&amp;threadid=<?=$ID?><?php if (!empty($PostID)) {
+        echo "&amp;postid=$PostID#post$PostID";
+    } ?>"></a></span>
+<?php  } ?>
       </td>
       <td>
         <?=time_diff($ThreadCreatedTime)?>
@@ -344,11 +354,11 @@ while (list($ID, $Title, $ForumID, $ForumName, $LastTime, $PostID, $Body, $Threa
         <?=time_diff($LastTime)?>
       </td>
     </tr>
-<?  if ($Type == 'body') { ?>
+<?php  if ($Type == 'body') { ?>
     <tr class="row hidden" id="post_<?=$PostID?>_text">
       <td colspan="4"><?=Text::full_format($Body)?></td>
     </tr>
-<?  }
+<?php  }
 }
 ?>
   </table>
@@ -357,4 +367,4 @@ while (list($ID, $Title, $ForumID, $ForumName, $LastTime, $PostID, $Body, $Threa
     <?=$Pages?>
   </div>
 </div>
-<? View::show_footer(); ?>
+<?php View::show_footer(); ?>

sections/requests/requests.php

@@ -12,82 +12,82 @@ $SortOrders = [
 ];
 
 if (empty($_GET['order']) || !isset($SortOrders[$_GET['order']])) {
-  $_GET['order'] = 'created';
+    $_GET['order'] = 'created';
 }
 $OrderBy = $_GET['order'];
 
 if (!empty($_GET['sort']) && $_GET['sort'] === 'asc') {
-  $OrderWay = 'asc';
+    $OrderWay = 'asc';
 } else {
-  $_GET['sort'] = 'desc';
-  $OrderWay = 'desc';
+    $_GET['sort'] = 'desc';
+    $OrderWay = 'desc';
 }
 $NewSort = $_GET['sort'] === 'asc' ? 'desc' : 'asc';
 
 if ($OrderBy === 'random') {
-  $SphQL->order_by('RAND()', '');
-  unset($_GET['page']);
+    $SphQL->order_by('RAND()', '');
+    unset($_GET['page']);
 } else {
-  $SphQL->order_by($SortOrders[$OrderBy], $OrderWay);
+    $SphQL->order_by($SortOrders[$OrderBy], $OrderWay);
 }
 
 $Submitted = !empty($_GET['submit']);
 
-//Paranoia
+// Paranoia
 if (!empty($_GET['userid'])) {
-  if (!is_number($_GET['userid'])) {
-    error('User ID must be an integer');
-  }
-  $UserInfo = Users::user_info($_GET['userid']);
-  if (empty($UserInfo)) {
-    error('That user does not exist');
-  }
-  $Perms = Permissions::get_permissions($UserInfo['PermissionID']);
-  $UserClass = $Perms['Class'];
+    if (!is_number($_GET['userid'])) {
+        error('User ID must be an integer');
+    }
+    $UserInfo = Users::user_info($_GET['userid']);
+    if (empty($UserInfo)) {
+        error('That user does not exist');
+    }
+    $Perms = Permissions::get_permissions($UserInfo['PermissionID']);
+    $UserClass = $Perms['Class'];
 }
 $BookmarkView = false;
 
 if (empty($_GET['type'])) {
-  $Title = 'Requests';
-  if (empty($_GET['showall'])) {
-    $SphQL->where('visible', 1);
-  }
+    $Title = 'Requests';
+    if (empty($_GET['showall'])) {
+        $SphQL->where('visible', 1);
+    }
 } else {
-  switch ($_GET['type']) {
+    switch ($_GET['type']) {
     case 'created':
       if (!empty($UserInfo)) {
-        if (!check_paranoia('requestsvoted_list', $UserInfo['Paranoia'], $Perms['Class'], $UserInfo['ID'])) {
-          error(403);
-        }
-        $Title = "Requests created by $UserInfo[Username]";
-        $SphQL->where('userid', $UserInfo['ID']);
+          if (!check_paranoia('requestsvoted_list', $UserInfo['Paranoia'], $Perms['Class'], $UserInfo['ID'])) {
+              error(403);
+          }
+          $Title = "Requests created by $UserInfo[Username]";
+          $SphQL->where('userid', $UserInfo['ID']);
       } else {
-        $Title = 'My requests';
-        $SphQL->where('userid', $LoggedUser['ID']);
+          $Title = 'My requests';
+          $SphQL->where('userid', $LoggedUser['ID']);
       }
       break;
     case 'voted':
       if (!empty($UserInfo)) {
-        if (!check_paranoia('requestsvoted_list', $UserInfo['Paranoia'], $Perms['Class'], $UserInfo['ID'])) {
-          error(403);
-        }
-        $Title = "Requests voted for by $UserInfo[Username]";
-        $SphQL->where('voter', $UserInfo['ID']);
+          if (!check_paranoia('requestsvoted_list', $UserInfo['Paranoia'], $Perms['Class'], $UserInfo['ID'])) {
+              error(403);
+          }
+          $Title = "Requests voted for by $UserInfo[Username]";
+          $SphQL->where('voter', $UserInfo['ID']);
       } else {
-        $Title = 'Requests I have voted on';
-        $SphQL->where('voter', $LoggedUser['ID']);
+          $Title = 'Requests I have voted on';
+          $SphQL->where('voter', $LoggedUser['ID']);
       }
       break;
     case 'filled':
       if (!empty($UserInfo)) {
-        if (!check_paranoia('requestsfilled_list', $UserInfo['Paranoia'], $Perms['Class'], $UserInfo['ID'])) {
-          error(403);
-        }
-        $Title = "Requests filled by $UserInfo[Username]";
-        $SphQL->where('fillerid', $UserInfo['ID']);
+          if (!check_paranoia('requestsfilled_list', $UserInfo['Paranoia'], $Perms['Class'], $UserInfo['ID'])) {
+              error(403);
+          }
+          $Title = "Requests filled by $UserInfo[Username]";
+          $SphQL->where('fillerid', $UserInfo['ID']);
       } else {
-        $Title = 'Requests I have filled';
-        $SphQL->where('fillerid', $LoggedUser['ID']);
+          $Title = 'Requests I have filled';
+          $SphQL->where('fillerid', $LoggedUser['ID']);
       }
       break;
     case 'bookmarks':
@@ -101,287 +101,289 @@ if (empty($_GET['type'])) {
 }
 
 if ($Submitted && empty($_GET['show_filled'])) {
-  $SphQL->where('torrentid', 0);
+    $SphQL->where('torrentid', 0);
 }
 
 if (!empty($_GET['formats'])) {
-  $FormatArray = $_GET['formats'];
-  if (count($FormatArray) !== count($Formats)) {
-    $FormatNameArray = [];
-    foreach ($FormatArray as $Index => $MasterIndex) {
-      if (isset($Formats[$MasterIndex])) {
-        $FormatNameArray[$Index] = '"' . strtr(Sphinxql::sph_escape_string($Formats[$MasterIndex]), '-.', '  ') . '"';
-      }
-    }
-    if (count($FormatNameArray) >= 1) {
-      if (!empty($_GET['formats_strict'])) {
-        $SearchString = '(' . implode(' | ', $FormatNameArray) . ')';
-      } else {
-        $SearchString = '(any | ' . implode(' | ', $FormatNameArray) . ')';
-      }
-      $SphQL->where_match($SearchString, 'formatlist', false);
+    $FormatArray = $_GET['formats'];
+    if (count($FormatArray) !== count($Formats)) {
+        $FormatNameArray = [];
+        foreach ($FormatArray as $Index => $MasterIndex) {
+            if (isset($Formats[$MasterIndex])) {
+                $FormatNameArray[$Index] = '"' . strtr(Sphinxql::sph_escape_string($Formats[$MasterIndex]), '-.', '  ') . '"';
+            }
+        }
+        if (count($FormatNameArray) >= 1) {
+            if (!empty($_GET['formats_strict'])) {
+                $SearchString = '(' . implode(' | ', $FormatNameArray) . ')';
+            } else {
+                $SearchString = '(any | ' . implode(' | ', $FormatNameArray) . ')';
+            }
+            $SphQL->where_match($SearchString, 'formatlist', false);
+        }
     }
-  }
 }
 
 if (!empty($_GET['media'])) {
-  $MediaArray = $_GET['media'];
-  if (count($MediaArray) !== count($Media)) {
-    $MediaNameArray = [];
-    foreach ($MediaArray as $Index => $MasterIndex) {
-      if (isset($Media[$MasterIndex])) {
-        $MediaNameArray[$Index] = '"' . strtr(Sphinxql::sph_escape_string($Media[$MasterIndex]), '-.', '  ') . '"';
-      }
-    }
+    $MediaArray = $_GET['media'];
+    if (count($MediaArray) !== count($Media)) {
+        $MediaNameArray = [];
+        foreach ($MediaArray as $Index => $MasterIndex) {
+            if (isset($Media[$MasterIndex])) {
+                $MediaNameArray[$Index] = '"' . strtr(Sphinxql::sph_escape_string($Media[$MasterIndex]), '-.', '  ') . '"';
+            }
+        }
 
-    if (count($MediaNameArray) >= 1) {
-      if (!empty($_GET['media_strict'])) {
-        $SearchString = '(' . implode(' | ', $MediaNameArray) . ')';
-      } else {
-        $SearchString = '(any | ' . implode(' | ', $MediaNameArray) . ')';
-      }
-      $SphQL->where_match($SearchString, 'medialist', false);
+        if (count($MediaNameArray) >= 1) {
+            if (!empty($_GET['media_strict'])) {
+                $SearchString = '(' . implode(' | ', $MediaNameArray) . ')';
+            } else {
+                $SearchString = '(any | ' . implode(' | ', $MediaNameArray) . ')';
+            }
+            $SphQL->where_match($SearchString, 'medialist', false);
+        }
     }
-  }
 }
 
 if (!empty($_GET['bitrates'])) {
-  $BitrateArray = $_GET['bitrates'];
-  if (count($BitrateArray) !== count($Bitrates)) {
-    $BitrateNameArray = [];
-    foreach ($BitrateArray as $Index => $MasterIndex) {
-      if (isset($Bitrates[$MasterIndex])) {
-        $BitrateNameArray[$Index] = '"' . strtr(Sphinxql::sph_escape_string($Bitrates[$MasterIndex]), '-.', '  ') . '"';
-      }
-    }
+    $BitrateArray = $_GET['bitrates'];
+    if (count($BitrateArray) !== count($Bitrates)) {
+        $BitrateNameArray = [];
+        foreach ($BitrateArray as $Index => $MasterIndex) {
+            if (isset($Bitrates[$MasterIndex])) {
+                $BitrateNameArray[$Index] = '"' . strtr(Sphinxql::sph_escape_string($Bitrates[$MasterIndex]), '-.', '  ') . '"';
+            }
+        }
 
-    if (count($BitrateNameArray) >= 1) {
-      if (!empty($_GET['bitrate_strict'])) {
-        $SearchString = '(' . implode(' | ', $BitrateNameArray) . ')';
-      } else {
-        $SearchString = '(any | ' . implode(' | ', $BitrateNameArray) . ')';
-      }
-      $SphQL->where_match($SearchString, 'bitratelist', false);
+        if (count($BitrateNameArray) >= 1) {
+            if (!empty($_GET['bitrate_strict'])) {
+                $SearchString = '(' . implode(' | ', $BitrateNameArray) . ')';
+            } else {
+                $SearchString = '(any | ' . implode(' | ', $BitrateNameArray) . ')';
+            }
+            $SphQL->where_match($SearchString, 'bitratelist', false);
+        }
     }
-  }
 }
 
 if (!empty($_GET['search'])) {
-  $SearchString = trim($_GET['search']);
-
-  if ($SearchString !== '') {
-    $SearchWords = array('include' => [], 'exclude' => []);
-    $Words = explode(' ', $SearchString);
-    foreach ($Words as $Word) {
-      $Word = trim($Word);
-      // Skip isolated hyphens to enable "Artist - Title" searches
-      if ($Word === '-') {
-        continue;
-      }
-      if ($Word[0] === '!' && strlen($Word) >= 2) {
-        if (strpos($Word, '!', 1) === false) {
-          $SearchWords['exclude'][] = $Word;
-        } else {
-          $SearchWords['include'][] = $Word;
+    $SearchString = trim($_GET['search']);
+
+    if ($SearchString !== '') {
+        $SearchWords = array('include' => [], 'exclude' => []);
+        $Words = explode(' ', $SearchString);
+        foreach ($Words as $Word) {
+            $Word = trim($Word);
+            // Skip isolated hyphens to enable "Artist - Title" searches
+            if ($Word === '-') {
+                continue;
+            }
+            if ($Word[0] === '!' && strlen($Word) >= 2) {
+                if (strpos($Word, '!', 1) === false) {
+                    $SearchWords['exclude'][] = $Word;
+                } else {
+                    $SearchWords['include'][] = $Word;
+                }
+            } elseif ($Word !== '') {
+                $SearchWords['include'][] = $Word;
+            }
         }
-      } elseif ($Word !== '') {
-        $SearchWords['include'][] = $Word;
-      }
     }
-  }
 }
 
 if (!isset($_GET['tags_type']) || $_GET['tags_type'] === '1') {
-  $TagType = 1;
-  $_GET['tags_type'] = '1';
+    $TagType = 1;
+    $_GET['tags_type'] = '1';
 } else {
-  $TagType = 0;
-  $_GET['tags_type'] = '0';
+    $TagType = 0;
+    $_GET['tags_type'] = '0';
 }
 
 if (!empty($_GET['tags'])) {
-  $SearchTags = array('include' => [], 'exclude' => []);
-  $Tags = explode(',', str_replace('.', '_', $_GET['tags']));
-  foreach ($Tags as $Tag) {
-    $Tag = trim($Tag);
-    if ($Tag[0] === '!' && strlen($Tag) >= 2) {
-      if (strpos($Tag, '!', 1) === false) {
-        $SearchTags['exclude'][] = $Tag;
-      } else {
-        $SearchTags['include'][] = $Tag;
-      }
-    } elseif ($Tag !== '') {
-      $SearchTags['include'][] = $Tag;
+    $SearchTags = array('include' => [], 'exclude' => []);
+    $Tags = explode(',', str_replace('.', '_', $_GET['tags']));
+    foreach ($Tags as $Tag) {
+        $Tag = trim($Tag);
+        if ($Tag[0] === '!' && strlen($Tag) >= 2) {
+            if (strpos($Tag, '!', 1) === false) {
+                $SearchTags['exclude'][] = $Tag;
+            } else {
+                $SearchTags['include'][] = $Tag;
+            }
+        } elseif ($Tag !== '') {
+            $SearchTags['include'][] = $Tag;
+        }
     }
-  }
 
-  $TagFilter = Tags::tag_filter_sph($SearchTags, $TagType);
-  $TagNames = $TagFilter['input'];
-
-  if (!empty($TagFilter['predicate'])) {
-    $SphQL->where_match($TagFilter['predicate'], 'taglist', false);
-  }
+    $TagFilter = Tags::tag_filter_sph($SearchTags, $TagType);
+    $TagNames = $TagFilter['input'];
 
+    if (!empty($TagFilter['predicate'])) {
+        $SphQL->where_match($TagFilter['predicate'], 'taglist', false);
+    }
 } elseif (!isset($_GET['tags_type']) || $_GET['tags_type'] !== '0') {
-  $_GET['tags_type'] = 1;
+    $_GET['tags_type'] = 1;
 } else {
-  $_GET['tags_type'] = 0;
+    $_GET['tags_type'] = 0;
 }
 
 if (isset($SearchWords)) {
-  $QueryParts = [];
-  foreach ($SearchWords['include'] as $Word) {
-    $QueryParts[] = Sphinxql::sph_escape_string($Word);
-  }
-  if (!empty($SearchWords['exclude'])) {
-    foreach ($SearchWords['exclude'] as $Word) {
-      $QueryParts[] = '!' . Sphinxql::sph_escape_string(substr($Word, 1));
+    $QueryParts = [];
+    foreach ($SearchWords['include'] as $Word) {
+        $QueryParts[] = Sphinxql::sph_escape_string($Word);
+    }
+    if (!empty($SearchWords['exclude'])) {
+        foreach ($SearchWords['exclude'] as $Word) {
+            $QueryParts[] = '!' . Sphinxql::sph_escape_string(substr($Word, 1));
+        }
+    }
+    if (!empty($QueryParts)) {
+        $SearchString = implode(' ', $QueryParts);
+        $SphQL->where_match($SearchString, '*', false);
     }
-  }
-  if (!empty($QueryParts)) {
-    $SearchString = implode(' ', $QueryParts);
-    $SphQL->where_match($SearchString, '*', false);
-  }
 }
 
 if (!empty($_GET['filter_cat'])) {
-  $CategoryArray = array_keys($_GET['filter_cat']);
-  if (count($CategoryArray) !== count($Categories)) {
-    foreach ($CategoryArray as $Key => $Index) {
-      if (!isset($Categories[$Index - 1])) {
-        unset($CategoryArray[$Key]);
-      }
-    }
-    if (count($CategoryArray) >= 1) {
-      $SphQL->where('categoryid', $CategoryArray);
+    $CategoryArray = array_keys($_GET['filter_cat']);
+    if (count($CategoryArray) !== count($Categories)) {
+        foreach ($CategoryArray as $Key => $Index) {
+            if (!isset($Categories[$Index - 1])) {
+                unset($CategoryArray[$Key]);
+            }
+        }
+        if (count($CategoryArray) >= 1) {
+            $SphQL->where('categoryid', $CategoryArray);
+        }
     }
-  }
 }
 
 if (!empty($_GET['releases'])) {
-  $ReleaseArray = $_GET['releases'];
-  if (count($ReleaseArray) !== count($ReleaseTypes)) {
-    foreach ($ReleaseArray as $Index => $Value) {
-      if (!isset($ReleaseTypes[$Value])) {
-        unset($ReleaseArray[$Index]);
-      }
-    }
-    if (count($ReleaseArray) >= 1) {
-      $SphQL->where('releasetype', $ReleaseArray);
+    $ReleaseArray = $_GET['releases'];
+    if (count($ReleaseArray) !== count($ReleaseTypes)) {
+        foreach ($ReleaseArray as $Index => $Value) {
+            if (!isset($ReleaseTypes[$Value])) {
+                unset($ReleaseArray[$Index]);
+            }
+        }
+        if (count($ReleaseArray) >= 1) {
+            $SphQL->where('releasetype', $ReleaseArray);
+        }
     }
-  }
 }
 
 if (!empty($_GET['requestor'])) {
-  if (is_number($_GET['requestor'])) {
-    $SphQL->where('userid', $_GET['requestor']);
-  } else {
-    error(404);
-  }
+    if (is_number($_GET['requestor'])) {
+        $SphQL->where('userid', $_GET['requestor']);
+    } else {
+        error(404);
+    }
 }
 
 if (isset($_GET['year'])) {
-  if (is_number($_GET['year']) || $_GET['year'] === '0') {
-    $SphQL->where('year', $_GET['year']);
-  } else {
-    error(404);
-  }
+    if (is_number($_GET['year']) || $_GET['year'] === '0') {
+        $SphQL->where('year', $_GET['year']);
+    } else {
+        error(404);
+    }
 }
 
 if (!empty($_GET['page']) && is_number($_GET['page']) && $_GET['page'] > 0) {
-  $Page = $_GET['page'];
-  $Offset = ($Page - 1) * REQUESTS_PER_PAGE;
-  $SphQL->limit($Offset, REQUESTS_PER_PAGE, $Offset + REQUESTS_PER_PAGE);
+    $Page = $_GET['page'];
+    $Offset = ($Page - 1) * REQUESTS_PER_PAGE;
+    $SphQL->limit($Offset, REQUESTS_PER_PAGE, $Offset + REQUESTS_PER_PAGE);
 } else {
-  $Page = 1;
-  $SphQL->limit(0, REQUESTS_PER_PAGE, REQUESTS_PER_PAGE);
+    $Page = 1;
+    $SphQL->limit(0, REQUESTS_PER_PAGE, REQUESTS_PER_PAGE);
 }
 
 $SphQLResult = $SphQL->query();
 $NumResults = (int)$SphQLResult->get_meta('total_found');
 if ($NumResults > 0) {
-  $SphRequests = $SphQLResult->to_array('id');
-  if ($OrderBy === 'random') {
-    $NumResults = count($SphRequests);
-  }
-  if ($NumResults > REQUESTS_PER_PAGE) {
-    if (($Page - 1) * REQUESTS_PER_PAGE > $NumResults) {
-      $Page = 0;
+    $SphRequests = $SphQLResult->to_array('id');
+    if ($OrderBy === 'random') {
+        $NumResults = count($SphRequests);
+    }
+    if ($NumResults > REQUESTS_PER_PAGE) {
+        if (($Page - 1) * REQUESTS_PER_PAGE > $NumResults) {
+            $Page = 0;
+        }
+        $PageLinks = Format::get_pages($Page, $NumResults, REQUESTS_PER_PAGE);
     }
-    $PageLinks = Format::get_pages($Page, $NumResults, REQUESTS_PER_PAGE);
-  }
 }
 
 $CurrentURL = Format::get_url(array('order', 'sort', 'page'));
 View::show_header($Title, 'requests');
-
 ?>
+
 <div class="thin">
   <div class="header">
     <h2><?=$Title?></h2>
   </div>
   <div class="linkbox">
-<?  if (!$BookmarkView) {
+<?php  if (!$BookmarkView) {
     if (check_perms('site_submit_requests')) { ?>
     <a href="requests.php?action=new" class="brackets">New request</a>
     <a href="requests.php?type=created" class="brackets">My requests</a>
-<?    }
+<?php    }
     if (check_perms('site_vote')) { ?>
     <a href="requests.php?type=voted" class="brackets">Requests I've voted on</a>
-<?    } ?>
+<?php    } ?>
     <a href="bookmarks.php?type=requests" class="brackets">Bookmarked requests</a>
-<?  } else { ?>
+<?php
+} else { ?>
     <a href="bookmarks.php?type=torrents" class="brackets">Torrents</a>
     <a href="bookmarks.php?type=artists" class="brackets">Artists</a>
     <a href="bookmarks.php?type=collages" class="brackets">Collections</a>
     <a href="bookmarks.php?type=requests" class="brackets">Requests</a>
-<?  } ?>
+<?php  } ?>
   </div>
-<?  if ($BookmarkView && $NumResults === 0) { ?>
+<?php  if ($BookmarkView && $NumResults === 0) { ?>
   <div class="box pad" align="center">
     <h2>You have not bookmarked any requests.</h2>
   </div>
-<?  } else { ?>
+<?php  } else { ?>
   <form class="search_form" name="requests" action="" method="get">
-<?    if ($BookmarkView) { ?>
+<?php    if ($BookmarkView) { ?>
     <input type="hidden" name="action" value="view" />
     <input type="hidden" name="type" value="requests" />
-<?    } elseif (isset($_GET['type'])) { ?>
+<?php    } elseif (isset($_GET['type'])) { ?>
     <input type="hidden" name="type" value="<?=$_GET['type']?>" />
-<?    } ?>
+<?php    } ?>
     <input type="hidden" name="submit" value="true" />
-<?    if (!empty($_GET['userid']) && is_number($_GET['userid'])) { ?>
+<?php    if (!empty($_GET['userid']) && is_number($_GET['userid'])) { ?>
     <input type="hidden" name="userid" value="<?=$_GET['userid']?>" />
-<?    } ?>
+<?php    } ?>
     <div class="box pad">
     <table cellpadding="6" cellspacing="1" border="0" class="layout" width="100%">
       <tr id="search_terms">
-        <td class="label"><!--Search terms:--></td>
+        <td class="label"><!--Search Terms--></td>
         <td>
-          <input type="search" name="search" size="60" class="inputtext" placeholder="Search terms" value="<? if (isset($_GET['search'])) { echo display_str($_GET['search']); } ?>" />
+          <input type="search" name="search" size="60" class="inputtext" placeholder="Search Terms" value="<?php if (isset($_GET['search'])) {
+        echo display_str($_GET['search']);
+    } ?>" />
         </td>
       </tr>
       <tr id="tagfilter">
-        <td class="label"><!--Tags (comma-separated):--></td>
+        <td class="label"><!--Tags (comma-separated)--></td>
         <td>
-          <input type="search" name="tags" id="tags" size="49" class="inputtext" placeholder="Tags (comma-separated)" value="<?=!empty($TagNames) ? display_str($TagNames) : ''?>"<? Users::has_autocomplete_enabled('other'); ?> />&nbsp;
-          <input type="radio" name="tags_type" id="tags_type0" value="0"<? Format::selected('tags_type', 0, 'checked')?> /><label for="tags_type0"> Any</label>&nbsp;&nbsp;
-          <input type="radio" name="tags_type" id="tags_type1" value="1"<? Format::selected('tags_type', 1, 'checked')?> /><label for="tags_type1"> All</label>
+          <input type="search" name="tags" id="tags" size="49" class="inputtext" placeholder="Tags (comma-separated)" value="<?=!empty($TagNames) ? display_str($TagNames) : ''?>"<?php Users::has_autocomplete_enabled('other'); ?> />&nbsp;
+          <input type="radio" name="tags_type" id="tags_type0" value="0"<?php Format::selected('tags_type', 0, 'checked')?> /><label for="tags_type0"> Any</label>&nbsp;&nbsp;
+          <input type="radio" name="tags_type" id="tags_type1" value="1"<?php Format::selected('tags_type', 1, 'checked')?> /><label for="tags_type1"> All</label>
         </td>
       </tr>
       <tr id="include_filled">
-        <td class="label"><label for="include_filled_box">Include filled:</label></td>
+        <td class="label"><label for="include_filled_box">Include Filled</label></td>
         <td>
-          <input type="checkbox" id="include_filled_box" name="show_filled"<? if (!$Submitted || !empty($_GET['show_filled']) || (!$Submitted && !empty($_GET['type']) && $_GET['type'] === 'filled')) { ?> checked="checked"<? } ?> />
+          <input type="checkbox" id="include_filled_box" name="show_filled"<?php if (!$Submitted || !empty($_GET['show_filled']) || (!$Submitted && !empty($_GET['type']) && $_GET['type'] === 'filled')) { ?> checked="checked"<?php } ?> />
         </td>
       </tr>
       <tr id="include_old">
-        <td class="label"><label for="include_old_box">Include old:</label></td>
+        <td class="label"><label for="include_old_box">Include Old</label></td>
         <td>
-          <input type="checkbox" id="include_old_box" name="showall"<? if (!empty($_GET['showall'])) { ?> checked="checked"<? } ?> />
+          <input type="checkbox" id="include_old_box" name="showall"<?php if (!empty($_GET['showall'])) { ?> checked="checked"<?php } ?> />
         </td>
       </tr>
-<?    /* ?>
+<?php    /* ?>
       <tr>
         <td class="label">Requested by:</td>
         <td>
@@ -391,40 +393,41 @@ View::show_header($Title, 'requests');
 <?    */ ?>
     </table>
     <table class="layout cat_list">
-<?
+<?php
     $x = 1;
     reset($Categories);
     foreach ($Categories as $CatKey => $CatName) {
-      if ($x % 8 === 0 || $x === 1) {
-?>
+        if ($x % 8 === 0 || $x === 1) {
+            ?>
         <tr>
-<?      } ?>
+<?php
+        } ?>
           <td>
-            <input type="checkbox" name="filter_cat[<?=($CatKey + 1) ?>]" id="cat_<?=($CatKey + 1) ?>" value="1"<? if (isset($_GET['filter_cat'][$CatKey + 1])) { ?> checked="checked"<? } ?> />
+            <input type="checkbox" name="filter_cat[<?=($CatKey + 1) ?>]" id="cat_<?=($CatKey + 1) ?>" value="1"<?php if (isset($_GET['filter_cat'][$CatKey + 1])) { ?> checked="checked"<?php } ?> />
             <label for="cat_<?=($CatKey + 1) ?>"><?=$CatName?></label>
           </td>
-<?      if ($x % 7 === 0) { ?>
+<?php      if ($x % 7 === 0) { ?>
         </tr>
-<?
+<?php
       }
-      $x++;
+        $x++;
     }
 ?>
     </table>
     <table class="layout">
       <tr>
         <td colspan="2" class="center">
-          <input type="submit" value="Search requests" />
+          <input type="submit" value="Search" />
         </td>
       </tr>
     </table>
     </div>
   </form>
-<?    if (isset($PageLinks)) { ?>
+<?php    if (isset($PageLinks)) { ?>
   <div class="linkbox">
     <?= $PageLinks?>
   </div>
-<?    } ?>
+<?php    } ?>
   <table id="request_table" class="request_table border" cellpadding="6" cellspacing="1" border="0" width="100%">
     <tr class="colhead_dark">
       <td class="small cats_col"></td>
@@ -453,68 +456,67 @@ View::show_header($Title, 'requests');
         <a href="?order=lastvote&amp;sort=<?=($OrderBy === 'lastvote' ? $NewSort : 'desc')?>&amp;<?=$CurrentURL?>"><strong>Last vote</strong></a>
       </td>
     </tr>
-<?
+<?php
     if ($NumResults === 0) {
-      // not viewing bookmarks but no requests found
+        // not viewing bookmarks but no requests found
 ?>
     <tr class="row">
       <td colspan="8">
         Nothing found!
       </td>
     </tr>
-<?    } elseif ($Page === 0) { ?>
+<?php
+    } elseif ($Page === 0) { ?>
     <tr class="row">
       <td colspan="8">
         The requested page contains no matches!
       </td>
     </tr>
-<?
-    } else {
-
-  $TimeCompare = 1267643718; // Requests v2 was implemented 2010-03-03 20:15:18
-  $Requests = Requests::get_requests(array_keys($SphRequests));
-  foreach ($Requests as $RequestID => $Request) {
-    $SphRequest = $SphRequests[$RequestID];
-    $Bounty = $SphRequest['bounty'] * 1024; // Sphinx stores bounty in kB
-    $VoteCount = $SphRequest['votes'];
-
-    if ($Request['CategoryID'] == 0) {
-      $CategoryName = 'Unknown';
-    } else {
-      $CategoryName = $Categories[$Request['CategoryID'] - 1];
-    }
-
-    if ($Request['TorrentID'] != 0) {
-      $IsFilled = true;
-      $FillerInfo = Users::user_info($Request['FillerID']);
+<?php
     } else {
-      $IsFilled = false;
-    }
-
-    $Title = empty($Request['Title']) ? (empty($Request['TitleRJ']) ? $Request['TitleJP'] : $Request['TitleRJ']) : $Request['Title'];
-
-    $ArtistForm = Requests::get_artists($RequestID);
-    $ArtistLink = Artists::display_artists($ArtistForm, true, true);
-    $FullName = "$ArtistLink<a href=\"requests.php?action=view&amp;id=$RequestID\"><span ";
-    if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
-      $FullName .= 'data-cover="'.ImageTools::process($Request['Image']).'" ';
-    }
-    $FullName .= "dir=\"ltr\">$Title</span></a>";
-
-    $ExtraInfo = '';
-
-    if (!empty($Request['CatalogueNumber'])) {
-      $ExtraInfo .= " [$Request[CatalogueNumber]]";
-    }
-
-    if (!empty($Request['DLsiteID'])) {
-      $ExtraInfo .= " [$Request[DLsiteID]]";
-    }
-    if ($ExtraInfo) {
-      $FullName .= " $ExtraInfo";
-    }
-    $Tags = $Request['Tags'];
-?>
+        $TimeCompare = 1267643718; // Requests v2 was implemented 2010-03-03 20:15:18
+        $Requests = Requests::get_requests(array_keys($SphRequests));
+        foreach ($Requests as $RequestID => $Request) {
+            $SphRequest = $SphRequests[$RequestID];
+            $Bounty = $SphRequest['bounty'] * 1024; // Sphinx stores bounty in kB
+            $VoteCount = $SphRequest['votes'];
+
+            if ($Request['CategoryID'] === 0) {
+                $CategoryName = 'Unknown';
+            } else {
+                $CategoryName = $Categories[$Request['CategoryID'] - 1];
+            }
+
+            if ($Request['TorrentID'] !== 0) {
+                $IsFilled = true;
+                $FillerInfo = Users::user_info($Request['FillerID']);
+            } else {
+                $IsFilled = false;
+            }
+
+            $Title = empty($Request['Title']) ? (empty($Request['TitleRJ']) ? $Request['TitleJP'] : $Request['TitleRJ']) : $Request['Title'];
+
+            $ArtistForm = Requests::get_artists($RequestID);
+            $ArtistLink = Artists::display_artists($ArtistForm, true, true);
+            $FullName = "$ArtistLink<a href=\"requests.php?action=view&amp;id=$RequestID\"><span ";
+            if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
+                $FullName .= 'data-cover="'.ImageTools::process($Request['Image']).'" ';
+            }
+            $FullName .= "dir=\"ltr\">$Title</span></a>";
+
+            $ExtraInfo = '';
+
+            if (!empty($Request['CatalogueNumber'])) {
+                $ExtraInfo .= " [$Request[CatalogueNumber]]";
+            }
+
+            if (!empty($Request['DLsiteID'])) {
+                $ExtraInfo .= " [$Request[DLsiteID]]";
+            }
+            if ($ExtraInfo) {
+                $FullName .= " $ExtraInfo";
+            }
+            $Tags = $Request['Tags']; ?>
     <tr class="request">
       <td class="center cats_col">
         <div title="<?=Format::pretty_category($Request['CategoryID'])?>" class="tooltip <?=Format::css_category($Request['CategoryID'])?>"></div>
@@ -522,43 +524,42 @@ View::show_header($Title, 'requests');
       <td>
         <?=$FullName?>
         <div class="tags">
-<?
+<?php
     $TagList = [];
-    foreach ($Request['Tags'] as $TagID => $TagName) {
-      $Split = Tags::get_name_and_class($TagName);
-      $TagList[] = '<a class="'.$Split['class'].'" href="?tags='.$TagName.($BookmarkView ? '&amp;type=requests' : '').'">'.display_str($Split['name']).'</a>';
-    }
-    $TagList = implode(', ', $TagList);
-?>
+            foreach ($Request['Tags'] as $TagID => $TagName) {
+                $Split = Tags::get_name_and_class($TagName);
+                $TagList[] = '<a class="'.$Split['class'].'" href="?tags='.$TagName.($BookmarkView ? '&amp;type=requests' : '').'">'.display_str($Split['name']).'</a>';
+            }
+            $TagList = implode(', ', $TagList); ?>
           <?=$TagList?>
         </div>
       </td>
       <td class="nobr">
         <span id="vote_count_<?=$RequestID?>"><?=number_format($VoteCount)?></span>
-<?    if (!$IsFilled && check_perms('site_vote')) { ?>
+<?php    if (!$IsFilled && check_perms('site_vote')) { ?>
         &nbsp;&nbsp; <a href="javascript:Vote(0, <?=$RequestID?>)" class="brackets"><strong>+</strong></a>
-<?    } ?>
+<?php    } ?>
       </td>
       <td class="number_column nobr">
         <?=Format::get_size($Bounty)?>
       </td>
       <td class="nobr">
-<?    if ($IsFilled) { ?>
+<?php    if ($IsFilled) { ?>
         <a href="torrents.php?<?=(strtotime($Request['TimeFilled']) < $TimeCompare ? 'id=' : 'torrentid=') . $Request['TorrentID']?>"><strong><?=time_diff($Request['TimeFilled'], 1)?></strong></a>
-<?    } else { ?>
+<?php    } else { ?>
         <strong>No</strong>
-<?    } ?>
+<?php    } ?>
       </td>
       <td>
-<?    if ($IsFilled) {
-        if ($Request['AnonymousFill']) { ?>
+<?php    if ($IsFilled) {
+                if ($Request['AnonymousFill']) { ?>
           <em>Anonymous</em>
-<?      } else { ?>
+<?php      } else { ?>
           <a href="user.php?id=<?=$FillerInfo['ID']?>"><?=$FillerInfo['Username']?></a>
-<?      }
-      } else { ?>
+<?php      }
+            } else { ?>
         &mdash;
-<?    } ?>
+<?php    } ?>
       </td>
       <td>
         <a href="user.php?id=<?=$Request['UserID']?>"><?=Users::format_username($Request['UserID'], false, false, false)?></a>
@@ -570,16 +571,16 @@ View::show_header($Title, 'requests');
         <?=time_diff($Request['LastVote'], 1)?>
       </td>
     </tr>
-<?
-  } // foreach
+<?php
+        } // foreach
     } // else
   } // if ($BookmarkView && $NumResults < 1)
 ?>
   </table>
-<? if (isset($PageLinks)) { ?>
+<?php if (isset($PageLinks)) { ?>
   <div class="linkbox">
     <?=$PageLinks?>
   </div>
-<? } ?>
+<?php } ?>
 </div>
-<? View::show_footer(); ?>
+<?php View::show_footer(); ?>

sections/top10/torrents.php

@@ -1,153 +1,157 @@
-<?
+<?php
 $Where = [];
 
 if (!empty($_GET['advanced']) && check_perms('site_advanced_top10')) {
-  $Details = 'all';
-  $Limit = 10;
-
-  if ($_GET['tags']) {
-    $TagWhere = [];
-    $Tags = explode(',', str_replace('.', '_', trim($_GET['tags'])));
-    foreach ($Tags as $Tag) {
-      $Tag = preg_replace('/[^a-z0-9_]/', '', $Tag);
-      if ($Tag != '') {
-        $TagWhere[] = "g.TagList REGEXP '[[:<:]]".db_string($Tag)."[[:>:]]'";
-      }
-    }
-    if (!empty($TagWhere)) {
-      if ($_GET['anyall'] == 'any') {
-        $Where[] = '('.implode(' OR ', $TagWhere).')';
-      } else {
-        $Where[] = '('.implode(' AND ', $TagWhere).')';
-      }
+    $Details = 'all';
+    $Limit = 10;
+
+    if ($_GET['tags']) {
+        $TagWhere = [];
+        $Tags = explode(',', str_replace('.', '_', trim($_GET['tags'])));
+        foreach ($Tags as $Tag) {
+            $Tag = preg_replace('/[^a-z0-9_]/', '', $Tag);
+            if ($Tag != '') {
+                $TagWhere[] = "g.TagList REGEXP '[[:<:]]".db_string($Tag)."[[:>:]]'";
+            }
+        }
+        if (!empty($TagWhere)) {
+            if ($_GET['anyall'] == 'any') {
+                $Where[] = '('.implode(' OR ', $TagWhere).')';
+            } else {
+                $Where[] = '('.implode(' AND ', $TagWhere).')';
+            }
+        }
     }
-  }
 
-  if ($_GET['category']) {
-    if (in_array($_GET['category'], $Categories)) {
-      $Where[] = "g.CategoryID = '".(array_search($_GET['category'], $Categories)+1)."'";
+    if ($_GET['category']) {
+        if (in_array($_GET['category'], $Categories)) {
+            $Where[] = "g.CategoryID = '".(array_search($_GET['category'], $Categories)+1)."'";
+        }
     }
-  }
-
 } else {
-  // error out on invalid requests (before caching)
-  if (isset($_GET['details'])) {
-    if (in_array($_GET['details'], array('day', 'week', 'overall', 'snatched', 'data', 'seeded', 'month', 'year'))) {
-      $Details = $_GET['details'];
+    // Error out on invalid requests (before caching)
+    if (isset($_GET['details'])) {
+        if (in_array($_GET['details'], array('day', 'week', 'overall', 'snatched', 'data', 'seeded', 'month', 'year'))) {
+            $Details = $_GET['details'];
+        } else {
+            error(404);
+        }
     } else {
-      error(404);
+        $Details = 'all';
     }
-  } else {
-    $Details = 'all';
-  }
 
-  // defaults to 10 (duh)
-  $Limit = (isset($_GET['limit']) ? intval($_GET['limit']) : 10);
-  $Limit = (in_array($Limit, array(10, 100, 250)) ? $Limit : 10);
+    // Defaults to 10 (duh)
+    $Limit = (isset($_GET['limit']) ? intval($_GET['limit']) : 10);
+    $Limit = (in_array($Limit, array(10, 100, 250)) ? $Limit : 10);
 }
 $Filtered = !empty($Where);
 View::show_header("Top $Limit Torrents", 'browse');
 ?>
+
 <div class="thin">
   <div class="header">
     <h2>Top <?=$Limit?> Torrents</h2>
-    <? Top10View::render_linkbox("torrents"); ?>
+    <?php Top10View::render_linkbox("torrents"); ?>
   </div>
-<?
+<?php
 
 if (check_perms('site_advanced_top10')) {
-?>
+    ?>
   <div class="box pad">
   <form class="search_form" name="torrents" action="" method="get">
     <input type="hidden" name="advanced" value="1" />
     <table cellpadding="6" cellspacing="1" border="0" class="layout" width="100%">
       <tr id="tagfilter">
-        <td class="label">Tags (comma-separated):</td>
+        <td class="label">Tags (comma-separated)</td>
         <td class="ft_taglist">
-          <input type="text" name="tags" id="tags" size="75" value="<? if (!empty($_GET['tags'])) { echo display_str($_GET['tags']);} ?>"<? Users::has_autocomplete_enabled('other'); ?> />&nbsp;
+          <input type="text" name="tags" id="tags" size="75" value="<?php if (!empty($_GET['tags'])) {
+        echo display_str($_GET['tags']);
+    } ?>"<?php Users::has_autocomplete_enabled('other'); ?> />&nbsp;
           <input type="radio" id="rdoAll" name="anyall" value="all"<?=((!isset($_GET['anyall'])||$_GET['anyall']!='any')?' checked="checked"':'')?> /><label for="rdoAll"> All</label>&nbsp;&nbsp;
           <input type="radio" id="rdoAny" name="anyall" value="any"<?=((!isset($_GET['anyall'])||$_GET['anyall']=='any')?' checked="checked"':'')?> /><label for="rdoAny"> Any</label>
         </td>
       </tr>
       <tr>
-        <td class="label">Category:</td>
+        <td class="label">Category</td>
         <td>
           <select name="category" style="width: auto;" class="ft_format">
             <option value="">Any</option>
-<?  foreach ($Categories as $CategoryName) { ?>
+<?php  foreach ($Categories as $CategoryName) { ?>
             <option value="<?=display_str($CategoryName)?>"<?=(($CategoryName==($_GET['category']??false))?'selected="selected"':'')?>><?=display_str($CategoryName)?></option>
-<?  } ?>
+<?php  } ?>
           </select>
         </td>
       </tr>
       <tr>
         <td colspan="2" class="center">
-          <input type="submit" value="Filter torrents" />
+          <input type="submit" value="Search" />
         </td>
       </tr>
     </table>
   </form>
   </div>
-<?
+<?php
 }
 
-// default setting to have them shown
+// Default setting to have them shown
 $DisableFreeTorrentTop10 = (isset($LoggedUser['DisableFreeTorrentTop10']) ? $LoggedUser['DisableFreeTorrentTop10'] : 0);
-// did they just toggle it?
+// Did they just toggle it?
 if (isset($_GET['freeleech'])) {
-  // what did they choose?
-  $NewPref = (($_GET['freeleech'] == 'hide') ? 1 : 0);
+    // what did they choose?
+    $NewPref = (($_GET['freeleech'] == 'hide') ? 1 : 0);
 
-  // Pref id different
-  if ($NewPref != $DisableFreeTorrentTop10) {
-    $DisableFreeTorrentTop10 = $NewPref;
-    Users::update_site_options($LoggedUser['ID'], array('DisableFreeTorrentTop10' => $DisableFreeTorrentTop10));
-  }
+    // Pref id different
+    if ($NewPref != $DisableFreeTorrentTop10) {
+        $DisableFreeTorrentTop10 = $NewPref;
+        Users::update_site_options($LoggedUser['ID'], array('DisableFreeTorrentTop10' => $DisableFreeTorrentTop10));
+    }
 }
 
 // Modify the Where query
 if ($DisableFreeTorrentTop10) {
-  $Where[] = "t.FreeTorrent='0'";
+    $Where[] = "t.FreeTorrent='0'";
 }
 
 // The link should say the opposite of the current setting
 $FreeleechToggleName = ($DisableFreeTorrentTop10 ? 'show' : 'hide');
 $FreeleechToggleQuery = Format::get_url(array('freeleech', 'groups'));
 
-if (!empty($FreeleechToggleQuery))
-  $FreeleechToggleQuery .= '&amp;';
+if (!empty($FreeleechToggleQuery)) {
+    $FreeleechToggleQuery .= '&amp;';
+}
 
 $FreeleechToggleQuery .= 'freeleech=' . $FreeleechToggleName;
 
 $GroupByToggleName = ((isset($_GET['groups']) && $_GET['groups'] == 'show') ? 'hide' : 'show');
 $GroupByToggleQuery = Format::get_url(array('freeleech', 'groups'));
 
-if (!empty($GroupByToggleQuery))
-  $GroupByToggleQuery .= '&amp;';
+if (!empty($GroupByToggleQuery)) {
+    $GroupByToggleQuery .= '&amp;';
+}
 
 $GroupByToggleQuery .= 'groups=' . $GroupByToggleName;
 
 $GroupBySum = '';
 $GroupBy = '';
 if (isset($_GET['groups']) && $_GET['groups'] == 'show') {
-  $GroupBy = ' GROUP BY g.ID ';
-  $GroupBySum = md5($GroupBy);
+    $GroupBy = ' GROUP BY g.ID ';
+    $GroupBySum = md5($GroupBy);
 }
 
 ?>
   <div style="text-align: right;" class="linkbox">
     <a href="top10.php?<?=$FreeleechToggleQuery?>" class="brackets"><?=ucfirst($FreeleechToggleName)?> freeleech in Top 10</a>
-<?    if (check_perms('users_mod')) { ?>
+<?php    if (check_perms('users_mod')) { ?>
       <a href="top10.php?<?=$GroupByToggleQuery?>" class="brackets"><?=ucfirst($GroupByToggleName)?> top groups</a>
-<?    } ?>
+<?php    } ?>
   </div>
-<?
+<?php
 
 if (!empty($Where)) {
-  $Where = '('.implode(' AND ', $Where).')';
-  $WhereSum = md5($Where);
+    $Where = '('.implode(' AND ', $Where).')';
+    $WhereSum = md5($Where);
 } else {
-  $WhereSum = '';
+    $WhereSum = '';
 }
 $BaseQuery = '
   SELECT
@@ -170,241 +174,241 @@ $BaseQuery = '
     LEFT JOIN torrents_group AS g ON g.ID = t.GroupID';
 
 if ($Details == 'all' || $Details == 'day') {
-  $TopTorrentsActiveLastDay = $Cache->get_value('top10tor_day_'.$Limit.$WhereSum.$GroupBySum);
-  if ($TopTorrentsActiveLastDay === false) {
-    if ($Cache->get_query_lock('top10')) {
-      $DayAgo = time_minus(86400);
-      $Query = $BaseQuery.' WHERE t.Seeders>0 AND ';
-      if (!empty($Where)) {
-        $Query .= $Where.' AND ';
-      }
-      $Query .= "
+    $TopTorrentsActiveLastDay = $Cache->get_value('top10tor_day_'.$Limit.$WhereSum.$GroupBySum);
+    if ($TopTorrentsActiveLastDay === false) {
+        if ($Cache->get_query_lock('top10')) {
+            $DayAgo = time_minus(86400);
+            $Query = $BaseQuery.' WHERE t.Seeders>0 AND ';
+            if (!empty($Where)) {
+                $Query .= $Where.' AND ';
+            }
+            $Query .= "
         t.Time>'$DayAgo'
         $GroupBy
         ORDER BY (t.Seeders + t.Leechers) DESC
         LIMIT $Limit;";
-      $DB->query($Query);
-      $TopTorrentsActiveLastDay = $DB->to_array(false, MYSQLI_NUM);
-      $Cache->cache_value('top10tor_day_'.$Limit.$WhereSum.$GroupBySum, $TopTorrentsActiveLastDay, 3600 * 2);
-      $Cache->clear_query_lock('top10');
-    } else {
-      $TopTorrentsActiveLastDay = false;
+            $DB->query($Query);
+            $TopTorrentsActiveLastDay = $DB->to_array(false, MYSQLI_NUM);
+            $Cache->cache_value('top10tor_day_'.$Limit.$WhereSum.$GroupBySum, $TopTorrentsActiveLastDay, 3600 * 2);
+            $Cache->clear_query_lock('top10');
+        } else {
+            $TopTorrentsActiveLastDay = false;
+        }
     }
-  }
-  generate_torrent_table('Most Active Torrents Uploaded in the Past Day', 'day', $TopTorrentsActiveLastDay, $Limit);
+    generate_torrent_table('Most Active Torrents Uploaded in the Past Day', 'day', $TopTorrentsActiveLastDay, $Limit);
 }
 if ($Details == 'all' || $Details == 'week') {
-  $TopTorrentsActiveLastWeek = $Cache->get_value('top10tor_week_'.$Limit.$WhereSum.$GroupBySum);
-  if ($TopTorrentsActiveLastWeek === false) {
-    if ($Cache->get_query_lock('top10')) {
-      $WeekAgo = time_minus(604800);
-      $Query = $BaseQuery.' WHERE ';
-      if (!empty($Where)) {
-        $Query .= $Where.' AND ';
-      }
-      $Query .= "
+    $TopTorrentsActiveLastWeek = $Cache->get_value('top10tor_week_'.$Limit.$WhereSum.$GroupBySum);
+    if ($TopTorrentsActiveLastWeek === false) {
+        if ($Cache->get_query_lock('top10')) {
+            $WeekAgo = time_minus(604800);
+            $Query = $BaseQuery.' WHERE ';
+            if (!empty($Where)) {
+                $Query .= $Where.' AND ';
+            }
+            $Query .= "
         t.Time>'$WeekAgo'
         $GroupBy
         ORDER BY (t.Seeders + t.Leechers) DESC
         LIMIT $Limit;";
-      $DB->query($Query);
-      $TopTorrentsActiveLastWeek = $DB->to_array(false, MYSQLI_NUM);
-      $Cache->cache_value('top10tor_week_'.$Limit.$WhereSum.$GroupBySum, $TopTorrentsActiveLastWeek, 3600 * 6);
-      $Cache->clear_query_lock('top10');
-    } else {
-      $TopTorrentsActiveLastWeek = false;
+            $DB->query($Query);
+            $TopTorrentsActiveLastWeek = $DB->to_array(false, MYSQLI_NUM);
+            $Cache->cache_value('top10tor_week_'.$Limit.$WhereSum.$GroupBySum, $TopTorrentsActiveLastWeek, 3600 * 6);
+            $Cache->clear_query_lock('top10');
+        } else {
+            $TopTorrentsActiveLastWeek = false;
+        }
     }
-  }
-  generate_torrent_table('Most Active Torrents Uploaded in the Past Week', 'week', $TopTorrentsActiveLastWeek, $Limit);
+    generate_torrent_table('Most Active Torrents Uploaded in the Past Week', 'week', $TopTorrentsActiveLastWeek, $Limit);
 }
 
 if ($Details == 'all' || $Details == 'month') {
-  $TopTorrentsActiveLastMonth = $Cache->get_value('top10tor_month_'.$Limit.$WhereSum.$GroupBySum);
-  if ($TopTorrentsActiveLastMonth === false) {
-    if ($Cache->get_query_lock('top10')) {
-      $Query = $BaseQuery.' WHERE ';
-      if (!empty($Where)) {
-        $Query .= $Where.' AND ';
-      }
-      $Query .= "
+    $TopTorrentsActiveLastMonth = $Cache->get_value('top10tor_month_'.$Limit.$WhereSum.$GroupBySum);
+    if ($TopTorrentsActiveLastMonth === false) {
+        if ($Cache->get_query_lock('top10')) {
+            $Query = $BaseQuery.' WHERE ';
+            if (!empty($Where)) {
+                $Query .= $Where.' AND ';
+            }
+            $Query .= "
         t.Time > NOW() - INTERVAL 1 MONTH
         $GroupBy
         ORDER BY (t.Seeders + t.Leechers) DESC
         LIMIT $Limit;";
-      $DB->query($Query);
-      $TopTorrentsActiveLastMonth = $DB->to_array(false, MYSQLI_NUM);
-      $Cache->cache_value('top10tor_month_'.$Limit.$WhereSum.$GroupBySum, $TopTorrentsActiveLastMonth, 3600 * 6);
-      $Cache->clear_query_lock('top10');
-    } else {
-      $TopTorrentsActiveLastMonth = false;
+            $DB->query($Query);
+            $TopTorrentsActiveLastMonth = $DB->to_array(false, MYSQLI_NUM);
+            $Cache->cache_value('top10tor_month_'.$Limit.$WhereSum.$GroupBySum, $TopTorrentsActiveLastMonth, 3600 * 6);
+            $Cache->clear_query_lock('top10');
+        } else {
+            $TopTorrentsActiveLastMonth = false;
+        }
     }
-  }
-  generate_torrent_table('Most Active Torrents Uploaded in the Past Month', 'month', $TopTorrentsActiveLastMonth, $Limit);
+    generate_torrent_table('Most Active Torrents Uploaded in the Past Month', 'month', $TopTorrentsActiveLastMonth, $Limit);
 }
 
 if ($Details == 'all' || $Details == 'year') {
-  $TopTorrentsActiveLastYear = $Cache->get_value('top10tor_year_'.$Limit.$WhereSum.$GroupBySum);
-  if ($TopTorrentsActiveLastYear === false) {
-    if ($Cache->get_query_lock('top10')) {
-      // IMPORTANT NOTE - we use WHERE t.Seeders>200 in order to speed up this query. You should remove it!
-      $Query = $BaseQuery.' WHERE ';
-      if ($Details == 'all' && !$Filtered) {
+    $TopTorrentsActiveLastYear = $Cache->get_value('top10tor_year_'.$Limit.$WhereSum.$GroupBySum);
+    if ($TopTorrentsActiveLastYear === false) {
+        if ($Cache->get_query_lock('top10')) {
+            // IMPORTANT NOTE - we use WHERE t.Seeders>200 in order to speed up this query. You should remove it!
+            $Query = $BaseQuery.' WHERE ';
+            if ($Details == 'all' && !$Filtered) {
 //        $Query .= 't.Seeders>=200 AND ';
-        if (!empty($Where)) {
-          $Query .= $Where.' AND ';
-        }
-      } elseif (!empty($Where)) {
-        $Query .= $Where.' AND ';
-      }
-      $Query .= "
+                if (!empty($Where)) {
+                    $Query .= $Where.' AND ';
+                }
+            } elseif (!empty($Where)) {
+                $Query .= $Where.' AND ';
+            }
+            $Query .= "
         t.Time > NOW() - INTERVAL 1 YEAR
         $GroupBy
         ORDER BY (t.Seeders + t.Leechers) DESC
         LIMIT $Limit;";
-      $DB->query($Query);
-      $TopTorrentsActiveLastYear = $DB->to_array(false, MYSQLI_NUM);
-      $Cache->cache_value('top10tor_year_'.$Limit.$WhereSum.$GroupBySum, $TopTorrentsActiveLastYear, 3600 * 6);
-      $Cache->clear_query_lock('top10');
-    } else {
-      $TopTorrentsActiveLastYear = false;
+            $DB->query($Query);
+            $TopTorrentsActiveLastYear = $DB->to_array(false, MYSQLI_NUM);
+            $Cache->cache_value('top10tor_year_'.$Limit.$WhereSum.$GroupBySum, $TopTorrentsActiveLastYear, 3600 * 6);
+            $Cache->clear_query_lock('top10');
+        } else {
+            $TopTorrentsActiveLastYear = false;
+        }
     }
-  }
-  generate_torrent_table('Most Active Torrents Uploaded in the Past Year', 'year', $TopTorrentsActiveLastYear, $Limit);
+    generate_torrent_table('Most Active Torrents Uploaded in the Past Year', 'year', $TopTorrentsActiveLastYear, $Limit);
 }
 
 if ($Details == 'all' || $Details == 'overall') {
-  $TopTorrentsActiveAllTime = $Cache->get_value('top10tor_overall_'.$Limit.$WhereSum.$GroupBySum);
-  if ($TopTorrentsActiveAllTime === false) {
-    if ($Cache->get_query_lock('top10')) {
-      // IMPORTANT NOTE - we use WHERE t.Seeders>500 in order to speed up this query. You should remove it!
-      $Query = $BaseQuery;
-      if ($Details=='all' && !$Filtered) {
-//        $Query .= "t.Seeders>=500 ";
-        if (!empty($Where)) {
-          $Query .= ' WHERE '.$Where;
-        }
-      } elseif (!empty($Where)) {
-        $Query .= ' WHERE '.$Where;
-      }
-      $Query .= "
+    $TopTorrentsActiveAllTime = $Cache->get_value('top10tor_overall_'.$Limit.$WhereSum.$GroupBySum);
+    if ($TopTorrentsActiveAllTime === false) {
+        if ($Cache->get_query_lock('top10')) {
+            // IMPORTANT NOTE - we use WHERE t.Seeders>500 in order to speed up this query. You should remove it!
+            $Query = $BaseQuery;
+            if ($Details=='all' && !$Filtered) {
+                //$Query .= "t.Seeders>=500 ";
+                if (!empty($Where)) {
+                    $Query .= ' WHERE '.$Where;
+                }
+            } elseif (!empty($Where)) {
+                $Query .= ' WHERE '.$Where;
+            }
+            $Query .= "
         $GroupBy
         ORDER BY (t.Seeders + t.Leechers) DESC
         LIMIT $Limit;";
-      $DB->query($Query);
-      $TopTorrentsActiveAllTime = $DB->to_array(false, MYSQLI_NUM);
-      $Cache->cache_value('top10tor_overall_'.$Limit.$WhereSum.$GroupBySum, $TopTorrentsActiveAllTime, 3600 * 6);
-      $Cache->clear_query_lock('top10');
-    } else {
-      $TopTorrentsActiveAllTime = false;
+            $DB->query($Query);
+            $TopTorrentsActiveAllTime = $DB->to_array(false, MYSQLI_NUM);
+            $Cache->cache_value('top10tor_overall_'.$Limit.$WhereSum.$GroupBySum, $TopTorrentsActiveAllTime, 3600 * 6);
+            $Cache->clear_query_lock('top10');
+        } else {
+            $TopTorrentsActiveAllTime = false;
+        }
     }
-  }
-  generate_torrent_table('Most Active Torrents of All Time', 'overall', $TopTorrentsActiveAllTime, $Limit);
+    generate_torrent_table('Most Active Torrents of All Time', 'overall', $TopTorrentsActiveAllTime, $Limit);
 }
 
 if (($Details == 'all' || $Details == 'snatched') && !$Filtered) {
-  $TopTorrentsSnatched = $Cache->get_value('top10tor_snatched_'.$Limit.$WhereSum.$GroupBySum);
-  if ($TopTorrentsSnatched === false) {
-    if ($Cache->get_query_lock('top10')) {
-      $Query = $BaseQuery;
-      if (!empty($Where)) {
-        $Query .= ' WHERE '.$Where;
-      }
-      $Query .= "
+    $TopTorrentsSnatched = $Cache->get_value('top10tor_snatched_'.$Limit.$WhereSum.$GroupBySum);
+    if ($TopTorrentsSnatched === false) {
+        if ($Cache->get_query_lock('top10')) {
+            $Query = $BaseQuery;
+            if (!empty($Where)) {
+                $Query .= ' WHERE '.$Where;
+            }
+            $Query .= "
         $GroupBy
         ORDER BY t.Snatched DESC
         LIMIT $Limit;";
-      $DB->query($Query);
-      $TopTorrentsSnatched = $DB->to_array(false, MYSQLI_NUM);
-      $Cache->cache_value('top10tor_snatched_'.$Limit.$WhereSum.$GroupBySum, $TopTorrentsSnatched, 3600 * 6);
-      $Cache->clear_query_lock('top10');
-    } else {
-      $TopTorrentsSnatched = false;
+            $DB->query($Query);
+            $TopTorrentsSnatched = $DB->to_array(false, MYSQLI_NUM);
+            $Cache->cache_value('top10tor_snatched_'.$Limit.$WhereSum.$GroupBySum, $TopTorrentsSnatched, 3600 * 6);
+            $Cache->clear_query_lock('top10');
+        } else {
+            $TopTorrentsSnatched = false;
+        }
     }
-  }
-  generate_torrent_table('Most Snatched Torrents', 'snatched', $TopTorrentsSnatched, $Limit);
+    generate_torrent_table('Most Snatched Torrents', 'snatched', $TopTorrentsSnatched, $Limit);
 }
 
 if (($Details == 'all' || $Details == 'data') && !$Filtered) {
-  $TopTorrentsTransferred = $Cache->get_value('top10tor_data_'.$Limit.$WhereSum.$GroupBySum);
-  if ($TopTorrentsTransferred === false) {
-    if ($Cache->get_query_lock('top10')) {
-      // IMPORTANT NOTE - we use WHERE t.Snatched>100 in order to speed up this query. You should remove it!
-      $Query = $BaseQuery;
-      if ($Details=='all') {
-//        $Query .= " WHERE t.Snatched>=100 ";
-        if (!empty($Where)) {
-          $Query .= ' WHERE '.$Where;
-        }
-      }
-      $Query .= "
+    $TopTorrentsTransferred = $Cache->get_value('top10tor_data_'.$Limit.$WhereSum.$GroupBySum);
+    if ($TopTorrentsTransferred === false) {
+        if ($Cache->get_query_lock('top10')) {
+            // IMPORTANT NOTE - we use WHERE t.Snatched>100 in order to speed up this query. You should remove it!
+            $Query = $BaseQuery;
+            if ($Details=='all') {
+                //$Query .= " WHERE t.Snatched>=100 ";
+                if (!empty($Where)) {
+                    $Query .= ' WHERE '.$Where;
+                }
+            }
+            $Query .= "
         $GroupBy
         ORDER BY Data DESC
         LIMIT $Limit;";
-      $DB->query($Query);
-      $TopTorrentsTransferred = $DB->to_array(false, MYSQLI_NUM);
-      $Cache->cache_value('top10tor_data_'.$Limit.$WhereSum.$GroupBySum, $TopTorrentsTransferred, 3600 * 6);
-      $Cache->clear_query_lock('top10');
-    } else {
-      $TopTorrentsTransferred = false;
+            $DB->query($Query);
+            $TopTorrentsTransferred = $DB->to_array(false, MYSQLI_NUM);
+            $Cache->cache_value('top10tor_data_'.$Limit.$WhereSum.$GroupBySum, $TopTorrentsTransferred, 3600 * 6);
+            $Cache->clear_query_lock('top10');
+        } else {
+            $TopTorrentsTransferred = false;
+        }
     }
-  }
-  generate_torrent_table('Most Data Transferred Torrents', 'data', $TopTorrentsTransferred, $Limit);
+    generate_torrent_table('Most Data Transferred Torrents', 'data', $TopTorrentsTransferred, $Limit);
 }
 
 if (($Details == 'all' || $Details == 'seeded') && !$Filtered) {
-  $TopTorrentsSeeded = $Cache->get_value('top10tor_seeded_'.$Limit.$WhereSum.$GroupBySum);
-  if ($TopTorrentsSeeded === false) {
-    if ($Cache->get_query_lock('top10')) {
-      $Query = $BaseQuery;
-      if (!empty($Where)) {
-        $Query .= ' WHERE '.$Where;
-      }
-      $Query .= "
+    $TopTorrentsSeeded = $Cache->get_value('top10tor_seeded_'.$Limit.$WhereSum.$GroupBySum);
+    if ($TopTorrentsSeeded === false) {
+        if ($Cache->get_query_lock('top10')) {
+            $Query = $BaseQuery;
+            if (!empty($Where)) {
+                $Query .= ' WHERE '.$Where;
+            }
+            $Query .= "
         $GroupBy
         ORDER BY t.Seeders DESC
         LIMIT $Limit;";
-      $DB->query($Query);
-      $TopTorrentsSeeded = $DB->to_array(false, MYSQLI_NUM);
-      $Cache->cache_value('top10tor_seeded_'.$Limit.$WhereSum.$GroupBySum, $TopTorrentsSeeded, 3600 * 6);
-      $Cache->clear_query_lock('top10');
-    } else {
-      $TopTorrentsSeeded = false;
+            $DB->query($Query);
+            $TopTorrentsSeeded = $DB->to_array(false, MYSQLI_NUM);
+            $Cache->cache_value('top10tor_seeded_'.$Limit.$WhereSum.$GroupBySum, $TopTorrentsSeeded, 3600 * 6);
+            $Cache->clear_query_lock('top10');
+        } else {
+            $TopTorrentsSeeded = false;
+        }
     }
-  }
-  generate_torrent_table('Best Seeded Torrents', 'seeded', $TopTorrentsSeeded, $Limit);
+    generate_torrent_table('Best Seeded Torrents', 'seeded', $TopTorrentsSeeded, $Limit);
 }
 
 ?>
 </div>
-<?
+<?php
 View::show_footer();
 
-// generate a table based on data from most recent query to $DB
-function generate_torrent_table($Caption, $Tag, $Details, $Limit) {
-  global $LoggedUser, $Categories, $ReleaseTypes, $GroupBy;
-?>
+// Generate a table based on data from most recent query to $DB
+function generate_torrent_table($Caption, $Tag, $Details, $Limit)
+{
+    global $LoggedUser, $Categories, $ReleaseTypes, $GroupBy; ?>
     <h3>Top <?="$Limit $Caption"?>
-<?  if (empty($_GET['advanced'])) { ?>
+<?php  if (empty($_GET['advanced'])) { ?>
     <small class="top10_quantity_links">
-<?
+<?php
     switch ($Limit) {
       case 100: ?>
         - <a href="top10.php?details=<?=$Tag?>" class="brackets">Top 10</a>
         - <span class="brackets">Top 100</span>
         - <a href="top10.php?type=torrents&amp;limit=250&amp;details=<?=$Tag?>" class="brackets">Top 250</a>
-<?        break;
+<?php        break;
       case 250: ?>
         - <a href="top10.php?details=<?=$Tag?>" class="brackets">Top 10</a>
         - <a href="top10.php?type=torrents&amp;limit=100&amp;details=<?=$Tag?>" class="brackets">Top 100</a>
         - <span class="brackets">Top 250</span>
-<?        break;
+<?php        break;
       default: ?>
         - <span class="brackets">Top 10</span>
         - <a href="top10.php?type=torrents&amp;limit=100&amp;details=<?=$Tag?>" class="brackets">Top 100</a>
         - <a href="top10.php?type=torrents&amp;limit=250&amp;details=<?=$Tag?>" class="brackets">Top 250</a>
-<?    } ?>
+<?php    } ?>
     </small>
-<?  } ?>
+<?php  } ?>
     </h3>
   <table class="torrent_table cats numbering border">
   <tr class="colhead">
@@ -418,96 +422,95 @@ function generate_torrent_table($Caption, $Tag, $Details, $Limit) {
     <td style="text-align: right;" class="sign leechers"><svg width="11" height="15" fill="white" class="tooltip" alt="Leechers" title="Leechers"><polygon points="0,8 5.5,15 11,8 8,8 8,0 3,0 3,8"></polygon></svg></td>
     <td style="text-align: right;">Peers</td>
   </tr>
-<?
+<?php
   // Server is already processing a top10 query. Starting another one will make things slow
   if ($Details === false) {
-?>
+      ?>
     <tr class="row">
       <td colspan="9" class="center">
         Server is busy processing another top list request. Please try again in a minute.
       </td>
     </tr>
     </table><br />
-<?
+<?php
     return;
   }
-  // in the unlikely event that query finds 0 rows...
-  if (empty($Details)) {
-?>
+    // iIn the unlikely event that query finds 0 rows...
+    if (empty($Details)) {
+        ?>
     <tr class="row">
       <td colspan="9" class="center">
         Found no torrents matching the criteria.
       </td>
     </tr>
     </table><br />
-<?
+<?php
     return;
-  }
-  $Rank = 0;
-  foreach ($Details as $Detail) {
-    $GroupIDs[] = $Detail[1];
-  }
-  $Artists = Artists::get_artists($GroupIDs);
+    }
+    $Rank = 0;
+    foreach ($Details as $Detail) {
+        $GroupIDs[] = $Detail[1];
+    }
+    $Artists = Artists::get_artists($GroupIDs);
 
-  foreach ($Details as $Detail) {
-    list($TorrentID, $GroupID, $GroupName, $GroupNameRJ, $GroupNameJP, $GroupCategoryID, $WikiImage, $TagsList,
+    foreach ($Details as $Detail) {
+        list($TorrentID, $GroupID, $GroupName, $GroupNameRJ, $GroupNameJP, $GroupCategoryID, $WikiImage, $TagsList,
       $Media, $Year, $Snatched, $Seeders, $Leechers, $Data, $Size) = $Detail;
 
-    $IsBookmarked = Bookmarks::has_bookmarked('torrent', $GroupID);
-    $IsSnatched = Torrents::has_snatched($TorrentID);
+        $IsBookmarked = Bookmarks::has_bookmarked('torrent', $GroupID);
+        $IsSnatched = Torrents::has_snatched($TorrentID);
 
-    $Rank++;
+        $Rank++;
 
-    // generate torrent's title
-    $DisplayName = '';
+        // Generate torrent's title
+        $DisplayName = '';
 
-    if (!empty($Artists[$GroupID])) {
-      $DisplayName = Artists::display_artists($Artists[$GroupID], true, true);
-    }
+        if (!empty($Artists[$GroupID])) {
+            $DisplayName = Artists::display_artists($Artists[$GroupID], true, true);
+        }
 
-    $DisplayName .= "<a href=\"torrents.php?id=$GroupID&amp;torrentid=$TorrentID\" ";
-    if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
-      $DisplayName .= 'data-cover="'.ImageTools::process($WikiImage, 'thumb').'" ';
-    }
+        $DisplayName .= "<a href=\"torrents.php?id=$GroupID&amp;torrentid=$TorrentID\" ";
+        if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
+            $DisplayName .= 'data-cover="'.ImageTools::process($WikiImage, 'thumb').'" ';
+        }
 
 
-    $Name = empty($GroupName) ? (empty($GroupNameRJ) ? $GroupNameJP : $GroupNameRJ) : $GroupName;
-    $DisplayName .= "dir=\"ltr\">$Name</a>";
-
-    // append extra info to torrent title
-    $ExtraInfo = '';
-    $AddExtra = '';
-    if (empty($GroupBy)) {
-      if ($Media) {
-        $ExtraInfo .= $AddExtra.$Media;
-        $AddExtra = ' / ';
-      }
-      if ($Year > 0) {
-        $ExtraInfo .= $AddExtra.$Year;
-        $AddExtra = ' ';
-      }
-      if ($IsSnatched) {
-        if ($GroupCategoryID != 5) {
-          $ExtraInfo .= ' / ';
+        $Name = empty($GroupName) ? (empty($GroupNameRJ) ? $GroupNameJP : $GroupNameRJ) : $GroupName;
+        $DisplayName .= "dir=\"ltr\">$Name</a>";
+
+        // Append extra info to torrent title
+        $ExtraInfo = '';
+        $AddExtra = '';
+        if (empty($GroupBy)) {
+            if ($Media) {
+                $ExtraInfo .= $AddExtra.$Media;
+                $AddExtra = ' / ';
+            }
+            if ($Year > 0) {
+                $ExtraInfo .= $AddExtra.$Year;
+                $AddExtra = ' ';
+            }
+            if ($IsSnatched) {
+                if ($GroupCategoryID != 5) {
+                    $ExtraInfo .= ' / ';
+                }
+                $ExtraInfo .= Format::torrent_label('Snatched!');
+            }
+            if ($ExtraInfo != '') {
+                $ExtraInfo = "- [$ExtraInfo]";
+            }
         }
-        $ExtraInfo .= Format::torrent_label('Snatched!');
-      }
-      if ($ExtraInfo != '') {
-        $ExtraInfo = "- [$ExtraInfo]";
-      }
-    }
 
-    $TorrentTags = new Tags($TagsList);
+        $TorrentTags = new Tags($TagsList);
 
-    //Get report info, use the cache if available, if not, add to it.
-    $Reported = false;
-    $Reports = Torrents::get_reports($TorrentID);
-    if (count($Reports) > 0) {
-      $Reported = true;
-    }
+        // Get report info, use the cache if available. If not, add to it
+        $Reported = false;
+        $Reports = Torrents::get_reports($TorrentID);
+        if (count($Reports) > 0) {
+            $Reported = true;
+        }
 
-    // print row
-?>
+        // Print row?>
   <tr class="torrent row<?=($IsBookmarked ? ' bookmarked' : '') . ($IsSnatched ? ' snatched_torrent' : '')?>">
     <td style="padding: 8px; text-align: center;"><strong><?=$Rank?></strong></td>
     <td class="center cats_col"><div title="<?=Format::pretty_category($GroupCategoryID)?>" class="tooltip <?=Format::css_category($GroupCategoryID)?>"></div></td>
@@ -516,18 +519,19 @@ function generate_torrent_table($Caption, $Tag, $Details, $Limit) {
 
         <span><a href="torrents.php?action=download&amp;id=<?=$TorrentID?>&amp;authkey=<?=$LoggedUser['AuthKey']?>&amp;torrent_pass=<?=$LoggedUser['torrent_pass']?>" title="Download" class="brackets tooltip">DL</a></span>
 
-        <?=$DisplayName?> <?=$ExtraInfo?><? if ($Reported) { ?> - <strong class="torrent_label tl_reported">Reported</strong><? } ?>
-<?
+        <?=$DisplayName?> <?=$ExtraInfo?><?php if ($Reported) { ?> - <strong class="torrent_label tl_reported">Reported</strong><?php } ?>
+<?php
     if ($IsBookmarked) {
-?>
+        ?>
         <span class="remove_bookmark float_right">
           <a href="#" id="bookmarklink_torrent_<?=$GroupID?>" class="bookmarklink_torrent_<?=$GroupID?> brackets" onclick="Unbookmark('torrent', <?=$GroupID?>, 'Bookmark'); return false;">Remove bookmark</a>
         </span>
-<?    } else { ?>
+<?php
+    } else { ?>
         <span class="add_bookmark float_right">
           <a href="#" id="bookmarklink_torrent_<?=$GroupID?>" class="bookmarklink_torrent_<?=$GroupID?> brackets" onclick="Bookmark('torrent', <?=$GroupID?>, 'Remove bookmark'); return false;">Bookmark</a>
         </span>
-<?    } ?>
+<?php    } ?>
         <div class="tags"><?=$TorrentTags->format()?></div>
       </div>
     </td>
@@ -538,10 +542,10 @@ function generate_torrent_table($Caption, $Tag, $Details, $Limit) {
     <td class="number_column"><?=number_format((double)$Leechers)?></td>
     <td class="number_column"><?=number_format($Seeders + $Leechers)?></td>
   </tr>
-<?
-  } //foreach ($Details as $Detail)
+<?php
+    } // foreach ($Details as $Detail)
 ?>
   </table><br />
-<?
+<?php
 }
 ?>

sections/torrents/browse.php

@@ -1,122 +1,125 @@
-<?
+<?php
+
+# @todo Go through line by line
+
 include(SERVER_ROOT.'/sections/torrents/functions.php');
 
 // The "order by x" links on columns headers
-function header_link($SortKey, $DefaultWay = 'desc') {
-  global $OrderBy, $OrderWay;
-  if ($SortKey == $OrderBy) {
-    if ($OrderWay == 'desc') {
-      $NewWay = 'asc';
+function header_link($SortKey, $DefaultWay = 'desc')
+{
+    global $OrderBy, $OrderWay;
+    if ($SortKey == $OrderBy) {
+        if ($OrderWay == 'desc') {
+            $NewWay = 'asc';
+        } else {
+            $NewWay = 'desc';
+        }
     } else {
-      $NewWay = 'desc';
+        $NewWay = $DefaultWay;
     }
-  } else {
-    $NewWay = $DefaultWay;
-  }
-  return "torrents.php?order_way=$NewWay&amp;order_by=$SortKey&amp;".Format::get_url(['order_way', 'order_by']);
+    return "torrents.php?order_way=$NewWay&amp;order_by=$SortKey&amp;".Format::get_url(['order_way', 'order_by']);
 }
 
 if (!empty($_GET['searchstr']) || !empty($_GET['groupname'])) {
-  if (!empty($_GET['searchstr'])) {
-    $InfoHash = $_GET['searchstr'];
-
-  } else {
-    $InfoHash = $_GET['groupname'];
-  }
+    if (!empty($_GET['searchstr'])) {
+        $InfoHash = $_GET['searchstr'];
+    } else {
+        $InfoHash = $_GET['groupname'];
+    }
 
-  // Search by infohash
-  if ($InfoHash = is_valid_torrenthash($InfoHash)) {
-    $InfoHash = db_string(pack('H*', $InfoHash));
-    $DB->query("
+    // Search by infohash
+    if ($InfoHash = is_valid_torrenthash($InfoHash)) {
+        $InfoHash = db_string(pack('H*', $InfoHash));
+        $DB->query("
       SELECT ID, GroupID
       FROM torrents
       WHERE info_hash = '$InfoHash'");
-    if ($DB->has_results()) {
-      list($ID, $GroupID) = $DB->next_record();
-      header("Location: torrents.php?id=$GroupID&torrentid=$ID");
-      die();
+        if ($DB->has_results()) {
+            list($ID, $GroupID) = $DB->next_record();
+            header("Location: torrents.php?id=$GroupID&torrentid=$ID");
+            die();
+        }
     }
-  }
 }
 
 // Setting default search options
 if (!empty($_GET['setdefault'])) {
-  $UnsetList = ['page', 'setdefault'];
-  $UnsetRegexp = '/(&|^)('.implode('|', $UnsetList).')=.*?(&|$)/i';
+    $UnsetList = ['page', 'setdefault'];
+    $UnsetRegexp = '/(&|^)('.implode('|', $UnsetList).')=.*?(&|$)/i';
 
-  $DB->query("
+    $DB->query("
     SELECT SiteOptions
     FROM users_info
     WHERE UserID = ?", $LoggedUser['ID']);
-  list($SiteOptions) = $DB->next_record(MYSQLI_NUM, false);
-  $SiteOptions = json_decode($SiteOptions, true) ?? [];
-  $SiteOptions['DefaultSearch'] = preg_replace($UnsetRegexp, '', $_SERVER['QUERY_STRING']);
-  $DB->query("
+    list($SiteOptions) = $DB->next_record(MYSQLI_NUM, false);
+    $SiteOptions = json_decode($SiteOptions, true) ?? [];
+    $SiteOptions['DefaultSearch'] = preg_replace($UnsetRegexp, '', $_SERVER['QUERY_STRING']);
+    $DB->query("
     UPDATE users_info
     SET SiteOptions = ?
     WHERE UserID = ?", json_encode($SiteOptions), $LoggedUser['ID']);
-  $Cache->begin_transaction("user_info_heavy_$UserID");
-  $Cache->update_row(false, ['DefaultSearch' => $SiteOptions['DefaultSearch']]);
-  $Cache->commit_transaction(0);
+    $Cache->begin_transaction("user_info_heavy_$UserID");
+    $Cache->update_row(false, ['DefaultSearch' => $SiteOptions['DefaultSearch']]);
+    $Cache->commit_transaction(0);
 
 // Clearing default search options
 } elseif (!empty($_GET['cleardefault'])) {
-  $DB->query("
+    $DB->query("
     SELECT SiteOptions
     FROM users_info
     WHERE UserID = ?", $LoggedUser['ID']);
-  list($SiteOptions) = $DB->next_record(MYSQLI_NUM, false);
-  $SiteOptions = json_decode($SiteOptions, true) ?? [];
-  $SiteOptions['DefaultSearch'] = '';
-  $DB->query("
+    list($SiteOptions) = $DB->next_record(MYSQLI_NUM, false);
+    $SiteOptions = json_decode($SiteOptions, true) ?? [];
+    $SiteOptions['DefaultSearch'] = '';
+    $DB->query("
     UPDATE users_info
     SET SiteOptions = ?
     WHERE UserID = ?", json_encode($SiteOptions), $LoggedUser['ID']);
-  $Cache->begin_transaction("user_info_heavy_$UserID");
-  $Cache->update_row(false, ['DefaultSearch' => '']);
-  $Cache->commit_transaction(0);
+    $Cache->begin_transaction("user_info_heavy_$UserID");
+    $Cache->update_row(false, ['DefaultSearch' => '']);
+    $Cache->commit_transaction(0);
 
 // Use default search options
 } elseif (empty($_SERVER['QUERY_STRING']) || (count($_GET) === 1 && isset($_GET['page']))) {
-  if (!empty($LoggedUser['DefaultSearch'])) {
-    if (!empty($_GET['page'])) {
-      $Page = $_GET['page'];
-      parse_str($LoggedUser['DefaultSearch'], $_GET);
-      $_GET['page'] = $Page;
-    } else {
-      parse_str($LoggedUser['DefaultSearch'], $_GET);
+    if (!empty($LoggedUser['DefaultSearch'])) {
+        if (!empty($_GET['page'])) {
+            $Page = $_GET['page'];
+            parse_str($LoggedUser['DefaultSearch'], $_GET);
+            $_GET['page'] = $Page;
+        } else {
+            parse_str($LoggedUser['DefaultSearch'], $_GET);
+        }
     }
-  }
 }
 // Terms were not submitted via the search form
 if (isset($_GET['searchsubmit'])) {
-  $GroupResults = !empty($_GET['group_results']);
+    $GroupResults = !empty($_GET['group_results']);
 } else {
-  $GroupResults = !$LoggedUser['DisableGrouping2'];
+    $GroupResults = !$LoggedUser['DisableGrouping2'];
 }
 
 if (!empty($_GET['order_way']) && $_GET['order_way'] == 'asc') {
-  $OrderWay = 'asc';
+    $OrderWay = 'asc';
 } else {
-  $OrderWay = 'desc';
+    $OrderWay = 'desc';
 }
 
 if (empty($_GET['order_by']) || !isset(TorrentSearch::$SortOrders[$_GET['order_by']])) {
-  $OrderBy = 'time'; // For header links
+    $OrderBy = 'time'; // For header links
 } else {
-  $OrderBy = $_GET['order_by'];
+    $OrderBy = $_GET['order_by'];
 }
 
 $Page = !empty($_GET['page']) ? (int) $_GET['page'] : 1;
 $Search = new TorrentSearch($GroupResults, $OrderBy, $OrderWay, $Page, TORRENTS_PER_PAGE);
 if (isset($LoggedUser['HideLolicon']) && $LoggedUser['HideLolicon'] == 1) {
-  $Search->insert_hidden_tags('!lolicon !shotacon !toddlercon');
+    $Search->insert_hidden_tags('!lolicon !shotacon !toddlercon');
 }
 if (isset($LoggedUser['HideScat']) && $LoggedUser['HideScat'] == 1) {
-  $Search->insert_hidden_tags('!scat');
+    $Search->insert_hidden_tags('!scat');
 }
 if (isset($LoggedUser['HideSnuff']) && $LoggedUser['HideSnuff'] == 1) {
-  $Search->insert_hidden_tags('!snuff');
+    $Search->insert_hidden_tags('!snuff');
 }
 $Results = $Search->query($_GET);
 $Groups = $Search->get_groups();
@@ -128,13 +131,13 @@ $AdvancedSearch = !empty($_GET['action']) && $_GET['action'] == 'advanced';
 $AdvancedSearch |= !empty($LoggedUser['SearchType']) && (empty($_GET['action']) || $_GET['action'] == 'advanced');
 $AdvancedSearch &= check_perms('site_advanced_search');
 if ($AdvancedSearch) {
-  $Action = 'action=advanced';
-  $HideBasic = ' hidden';
-  $HideAdvanced = '';
+    $Action = 'action=advanced';
+    $HideBasic = ' hidden';
+    $HideAdvanced = '';
 } else {
-  $Action = 'action=basic';
-  $HideBasic = '';
-  $HideAdvanced = ' hidden';
+    $Action = 'action=basic';
+    $HideBasic = '';
+    $HideAdvanced = ' hidden';
 }
 
 View::show_header('Browse Torrents', 'browse');
@@ -156,12 +159,12 @@ View::show_header('Browse Torrents', 'browse');
       </span>
     </div>
     <div id="ft_container" class="pad<?=$HideFilter ? ' hidden' : ''?>">
-<? if((isset($LoggedUser['HideLolicon']) && $LoggedUser['HideLolicon'] == 1)
+<?php if ((isset($LoggedUser['HideLolicon']) && $LoggedUser['HideLolicon'] == 1)
    || (isset($LoggedUser['HideScat'])    && $LoggedUser['HideScat']    == 1)
    || (isset($LoggedUser['HideSnuff'])   && $LoggedUser['HideSnuff']   == 1)
    ) { ?>
     <svg title="Your profile settings exclude some results" class="search_warning tooltip" width="10" height="15"><rect x=3 width="4" height="10" rx="2" ry="2"/><circle cx="5" cy="13" r="2"/></svg>
-<? } ?>
+<?php } ?>
       <table class="layout">
         <tr id="artist_name" class="ftr_advanced<?=$HideAdvanced?>">
           <td class="label"><!--Artist name:--></td>
@@ -196,35 +199,36 @@ View::show_header('Browse Torrents', 'browse');
         <tr id="torrent_description" class="ftr_advanced<?=$HideAdvanced?>">
           <td class="label"><!--<span title="Search torrent descriptions (not group information)" class="tooltip">Torrent description:</span>--></td>
           <td class="ft_description">
-            <input type="search" spellcheck="false" size="65" name="description" class="inputtext fti_advanced tooltip_left" placeholder="Torrent Description" title="Search torrent descriptions (not group information)" value="<?Format::form('description')?>" />
+            <input type="search" spellcheck="false" size="65" name="description" class="inputtext fti_advanced" placeholder="Torrent Description" value="<?php Format::form('description') ?>" /><br /><br />
+            Search torrent descriptions (not group information)
           </td>
         </tr>
         <tr id="rip_specifics" class="ftr_advanced<?=$HideAdvanced?>">
-          <td class="label">Release Specifics</td>
+          <td class="label">Specifics</td>
           <td class="nobr ft_ripspecifics">
             <select id="container" name="container" class="ft_container fti_advanced">
               <option value="">Format</option>
-  <?  foreach ($Containers as $Container) { ?>
+  <?php  foreach ($Containers as $Container) { ?>
               <option value="<?=display_str($Container);?>" <?Format::selected('container', $Container)?>><?=display_str($Container);?></option>
-  <?  } ?>
+  <?php  } ?>
             </select>
             <select name="codec" class="ft_codec fti_advanced">
               <option value="">License</option>
-  <?  foreach ($Codecs as $Codec) { ?>
+  <?php  foreach ($Codecs as $Codec) { ?>
               <option value="<?=display_str($Codec); ?>"<?Format::selected('codec', $Codec)?>><?=display_str($Codec); ?></option>
-  <?  } ?>
+  <?php  } ?>
             </select>
             <select name="media" class="ft_media fti_advanced">
               <option value="">Platform</option>
-  <?  foreach ($Media as $MediaName) { ?>
+  <?php  foreach ($Media as $MediaName) { ?>
               <option value="<?=display_str($MediaName); ?>"<?Format::selected('media', $MediaName)?>><?=display_str($MediaName); ?></option>
-  <?  } ?>
+  <?php  } ?>
             </select>
             <select name="resolution" class="ft_resolution fti_advanced">
               <option value="">Assembly Level</option>
-  <?  foreach ($Resolutions as $Resolution) { ?>
+  <?php  foreach ($Resolutions as $Resolution) { ?>
               <option value="<?=display_str($Resolution); ?>"<?Format::selected('resolution', $Resolution)?>><?=display_str($Resolution); ?></option>
-  <?  } ?>
+  <?php  } ?>
             </select>
           </td>
         </tr>
@@ -254,7 +258,7 @@ View::show_header('Browse Torrents', 'browse');
               <option value="0"<?Format::selected('freetorrent', 0)?>>Normal</option>
             </select>
             <select name="censored" class="ft_censored fti_advanced">
-              <option value="">Aligned Sequence?</option>
+              <option value="">Alignment</option>
               <option value="1"<?Format::selected('censored', 1)?>>Aligned</option>
               <option value="0"<?Format::selected('censored', 0)?>>Unaligned</option>
             </select>
@@ -269,9 +273,10 @@ View::show_header('Browse Torrents', 'browse');
         <tr id="tagfilter">
           <td class="label"><!--<span title="Use !tag to exclude tag" class="tooltip">Tags (comma-separated):</span>--></td>
           <td class="ft_taglist">
-            <input type="search" size="37" id="tags" name="taglist" class="inputtext smaller tooltip_left" title="Use !tag to exclude tag" placeholder="Tags (comma-separated)" value="<?=display_str($Search->get_terms('taglist'))?>"<? Users::has_autocomplete_enabled('other'); ?> aria-label="Tags to search">&nbsp;
+            <input type="search" size="37" id="tags" name="taglist" class="inputtext smaller" placeholder="Tags (comma-separated)" value="<?=display_str($Search->get_terms('taglist'))?>"<?php Users::has_autocomplete_enabled('other'); ?> aria-label="Tags to search">&nbsp;
             <input type="radio" name="tags_type" id="tags_type0" value="0"<?Format::selected('tags_type', 0, 'checked')?> /><label for="tags_type0"> Any</label>&nbsp;&nbsp;
-            <input type="radio" name="tags_type" id="tags_type1" value="1"<?Format::selected('tags_type', 1, 'checked')?> /><label for="tags_type1"> All</label>
+            <input type="radio" name="tags_type" id="tags_type1" value="1"<?Format::selected('tags_type', 1, 'checked')?> /><label for="tags_type1"> All</label><br /><br />
+            Use !tag to exclude tags
           </td>
         </tr>
         <tr id="order">
@@ -295,7 +300,7 @@ View::show_header('Browse Torrents', 'browse');
         </tr>
         <tr id="search_group_results">
           <td class="label">
-            <label for="group_results">Group by Release?</label>
+            <label for="group_results">Group Torrents</label>
           </td>
           <td class="ft_group_results">
             <input type="checkbox" value="1" name="group_results" id="group_results"<?=$GroupResults ? ' checked="checked"' : ''?> />
@@ -303,60 +308,60 @@ View::show_header('Browse Torrents', 'browse');
         </tr>
       </table>
       <table class="layout cat_list ft_cat_list">
-  <?
+  <?php
   $x = 0;
   reset($Categories);
   foreach ($Categories as $CatKey => $CatName) {
-    if ($x % 7 == 0) {
-      if ($x > 0) {
-  ?>
+      if ($x % 7 == 0) {
+          if ($x > 0) {
+              ?>
         </tr>
-  <?    } ?>
+  <?php
+          } ?>
         <tr>
-  <?
-    }
-    $x++;
-  ?>
+  <?php
+      }
+      $x++; ?>
           <td>
-            <input type="checkbox" name="filter_cat[<?=($CatKey + 1)?>]" id="cat_<?=($CatKey + 1)?>" value="1"<? if (isset($_GET['filter_cat'][$CatKey + 1])) { ?> checked="checked"<? } ?> />
+            <input type="checkbox" name="filter_cat[<?=($CatKey + 1)?>]" id="cat_<?=($CatKey + 1)?>" value="1"<?php if (isset($_GET['filter_cat'][$CatKey + 1])) { ?> checked="checked"<?php } ?> />
             <label for="cat_<?=($CatKey + 1)?>"><?=$CatName?></label>
           </td>
-  <?
+  <?php
   }
   ?>
         </tr>
       </table>
-      <table class="layout cat_list<? if (empty($LoggedUser['ShowTags'])) { ?> hidden<? } ?>" id="taglist">
+      <table class="layout cat_list<?php if (empty($LoggedUser['ShowTags'])) { ?> hidden<?php } ?>" id="taglist">
         <tr>
-  <?
+  <?php
   $GenreTags = $Cache->get_value('genre_tags');
   if (!$GenreTags) {
-    $DB->query('
+      $DB->query('
       SELECT Name
       FROM tags
       WHERE TagType = \'genre\'
       ORDER BY Name');
-    $GenreTags = $DB->collect('Name');
-    $Cache->cache_value('genre_tags', $GenreTags, 3600 * 6);
+      $GenreTags = $DB->collect('Name');
+      $Cache->cache_value('genre_tags', $GenreTags, 3600 * 6);
   }
 
   $x = 0;
   foreach ($GenreTags as $Tag) {
-  ?>
+      ?>
           <td><a href="#" onclick="add_tag('<?=$Tag?>'); return false;"><?=$Tag?></a></td>
-  <?
+  <?php
     $x++;
-    if ($x % 7 == 0) {
-  ?>
+      if ($x % 7 == 0) {
+          ?>
         </tr>
         <tr>
-  <?
-    }
+  <?php
+      }
   }
   if ($x % 7 != 0) { // Padding
   ?>
           <td colspan="<?=(7 - ($x % 7))?>"> </td>
-  <? } ?>
+  <?php } ?>
         </tr>
       </table>
       <table class="layout cat_list">
@@ -368,43 +373,43 @@ View::show_header('Browse Torrents', 'browse');
       </table>
       <div class="submit ft_submit">
         <span class="float_left"><?=number_format($NumResults)?> Results</span>
-        <input type="submit" value="Filter torrents" />
+        <input type="submit" value="Search" />
         <input type="hidden" name="action" id="ft_type" value="<?=($AdvancedSearch ? 'advanced' : 'basic')?>" />
         <input type="hidden" name="searchsubmit" value="1" />
-        <input type="button" value="Reset" onclick="location.href = 'torrents.php<? if (isset($_GET['action']) && $_GET['action'] === 'advanced') { ?>?action=advanced<? } ?>'" />
+        <input type="button" value="Reset" onclick="location.href = 'torrents.php<?php if (isset($_GET['action']) && $_GET['action'] === 'advanced') { ?>?action=advanced<?php } ?>'" />
         &nbsp;&nbsp;
-<?    if ($Search->has_filters()) { ?>
-        <input type="submit" name="setdefault" value="Make default" />
-<?    }
+<?php    if ($Search->has_filters()) { ?>
+        <input type="submit" name="setdefault" value="Make Default" />
+<?php    }
 
       if (!empty($LoggedUser['DefaultSearch'])) { ?>
-        <input type="submit" name="cleardefault" value="Clear default" />
-<?    } ?>
+        <input type="submit" name="cleardefault" value="Clear Default" />
+<?php    } ?>
       </div>
     </div>
   </div>
   </form>
-<? if ($NumResults == 0) { ?>
+<?php if ($NumResults == 0) { ?>
   <div class="torrents_nomatch box pad" align="center">
     <h2>Your search did not match anything.</h2>
     <p>Make sure all names are spelled correctly, or try making your search less specific.</p>
   </div>
   </div>
-<?    View::show_footer();die();
+<?php    View::show_footer();die();
   }
 
   if ($NumResults < ($Page - 1) * TORRENTS_PER_PAGE + 1) {
-    $LastPage = ceil($NumResults / TORRENTS_PER_PAGE);
-    $Pages = Format::get_pages(0, $NumResults, TORRENTS_PER_PAGE);
-?>
+      $LastPage = ceil($NumResults / TORRENTS_PER_PAGE);
+      $Pages = Format::get_pages(0, $NumResults, TORRENTS_PER_PAGE); ?>
   <div class="torrents_nomatch box pad" align="center">
     <h2>The requested page contains no matches.</h2>
     <p>You are requesting page <?=$Page?>, but the search returned only <?=number_format($LastPage) ?> pages.</p>
   </div>
   <div class="linkbox">Go to page <?=$Pages?></div>
   </div>
-<?
-    View::show_footer();die();
+<?php
+    View::show_footer();
+      die();
   }
 
   // List of pages
@@ -417,9 +422,9 @@ View::show_header('Browse Torrents', 'browse');
 
   <table class="box torrent_table cats <?=$GroupResults ? 'grouping' : 'no_grouping'?>" id="torrent_table">
     <tr class="colhead">
-  <?  if ($GroupResults) { ?>
+  <?php  if ($GroupResults) { ?>
       <td class="small"></td>
-  <?  } ?>
+  <?php  } ?>
       <td class="small cats_col"></td>
       <td>Name / <a href="<?=header_link('year')?>">Year</a></td>
       <td>Files</td>
@@ -441,75 +446,73 @@ View::show_header('Browse Torrents', 'browse');
         </a>
       </td>
     </tr>
-  <?
+  <?php
 
   // Start printing torrent list
   foreach ($Results as $Key => $GroupID) {
-    $GroupInfo = $Groups[$GroupID];
-  if (empty($GroupInfo['Torrents'])) {
-    continue;
-  }
-  $CategoryID = $GroupInfo['CategoryID'];
-  $GroupYear = $GroupInfo['Year'];
-  $Artists = $GroupInfo['Artists'];
-  $GroupCatalogueNumber = $GroupInfo['CatalogueNumber'];
-  $GroupPages = $GroupInfo['Pages'];
-  $GroupStudio = $GroupInfo['Studio'];
-  $GroupDLsiteID = $GroupInfo['DLSiteID'];
-  $GroupName = empty($GroupInfo['Name']) ? (empty($GroupInfo['NameRJ']) ? $GroupInfo['NameJP'] : $GroupInfo['NameRJ']) : $GroupInfo['Name'];
-  if ($GroupResults) {
-    $Torrents = $GroupInfo['Torrents'];
-    $GroupTime = $MaxSize = $TotalLeechers = $TotalSeeders = $TotalSnatched = 0;
-    foreach ($Torrents as $T) {
-      $GroupTime = max($GroupTime, strtotime($T['Time']));
-      $MaxSize = max($MaxSize, $T['Size']);
-      $TotalLeechers += $T['Leechers'];
-      $TotalSeeders += $T['Seeders'];
-      $TotalSnatched += $T['Snatched'];
-    }
-  } else {
-    $TorrentID = $Key;
-    $Torrents = [$TorrentID => $GroupInfo['Torrents'][$TorrentID]];
-  }
-
-  $TorrentTags = new Tags($GroupInfo['TagList']);
+      $GroupInfo = $Groups[$GroupID];
+      if (empty($GroupInfo['Torrents'])) {
+          continue;
+      }
+      $CategoryID = $GroupInfo['CategoryID'];
+      $GroupYear = $GroupInfo['Year'];
+      $Artists = $GroupInfo['Artists'];
+      $GroupCatalogueNumber = $GroupInfo['CatalogueNumber'];
+      $GroupPages = $GroupInfo['Pages'];
+      $GroupStudio = $GroupInfo['Studio'];
+      $GroupDLsiteID = $GroupInfo['DLSiteID'];
+      $GroupName = empty($GroupInfo['Name']) ? (empty($GroupInfo['NameRJ']) ? $GroupInfo['NameJP'] : $GroupInfo['NameRJ']) : $GroupInfo['Name'];
+      if ($GroupResults) {
+          $Torrents = $GroupInfo['Torrents'];
+          $GroupTime = $MaxSize = $TotalLeechers = $TotalSeeders = $TotalSnatched = 0;
+          foreach ($Torrents as $T) {
+              $GroupTime = max($GroupTime, strtotime($T['Time']));
+              $MaxSize = max($MaxSize, $T['Size']);
+              $TotalLeechers += $T['Leechers'];
+              $TotalSeeders += $T['Seeders'];
+              $TotalSnatched += $T['Snatched'];
+          }
+      } else {
+          $TorrentID = $Key;
+          $Torrents = [$TorrentID => $GroupInfo['Torrents'][$TorrentID]];
+      }
 
-  if (isset($Artists)) {
-    $DisplayName = '<div class="torrent_artists">'.Artists::display_artists($Artists).'</div> ';
-  } else {
-    $DisplayName = '';
-  }
+      $TorrentTags = new Tags($GroupInfo['TagList']);
 
-  $SnatchedGroupClass = $GroupInfo['Flags']['IsSnatched'] ? ' snatched_group' : '';
+      if (isset($Artists)) {
+          $DisplayName = '<div class="torrent_artists">'.Artists::display_artists($Artists).'</div> ';
+      } else {
+          $DisplayName = '';
+      }
 
-  if ($GroupResults && (count($Torrents) > 1 && isset($GroupedCategories[$CategoryID - 1]))) {
-    // These torrents are in a group
-    $CoverArt = $GroupInfo['WikiImage'];
-    $DisplayName .= "<a class=\"torrent_title\" href=\"torrents.php?id=$GroupID\" ";
-    if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
-      $DisplayName .= 'data-cover="'.ImageTools::process($CoverArt, 'thumb').'" ';
-    }
-    $DisplayName .= "dir=\"ltr\">$GroupName</a>";
-    if ($GroupYear) {
-      $DisplayName .= " [$GroupYear]";
-    }
-    if ($GroupStudio) {
-      $DisplayName .= " [$GroupStudio]";
-    }
-    if ($GroupCatalogueNumber) {
-      $DisplayName .= " [$GroupCatalogueNumber]";
-    }
-    if ($GroupPages) {
-      $DisplayName .= " [{$GroupPages}p]";
-    }
-    if ($GroupDLsiteID) {
-      $DisplayName .= " [$GroupDLsiteID]";
-    }
-?>
+      $SnatchedGroupClass = $GroupInfo['Flags']['IsSnatched'] ? ' snatched_group' : '';
+
+      if ($GroupResults && (count($Torrents) > 1 && isset($GroupedCategories[$CategoryID - 1]))) {
+          // These torrents are in a group
+          $CoverArt = $GroupInfo['WikiImage'];
+          $DisplayName .= "<a class=\"torrent_title\" href=\"torrents.php?id=$GroupID\" ";
+          if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
+              $DisplayName .= 'data-cover="'.ImageTools::process($CoverArt, 'thumb').'" ';
+          }
+          $DisplayName .= "dir=\"ltr\">$GroupName</a>";
+          if ($GroupYear) {
+              $DisplayName .= " [$GroupYear]";
+          }
+          if ($GroupStudio) {
+              $DisplayName .= " [$GroupStudio]";
+          }
+          if ($GroupCatalogueNumber) {
+              $DisplayName .= " [$GroupCatalogueNumber]";
+          }
+          if ($GroupPages) {
+              $DisplayName .= " [{$GroupPages}p]";
+          }
+          if ($GroupDLsiteID) {
+              $DisplayName .= " [$GroupDLsiteID]";
+          } ?>
   <tr class="group<?=$SnatchedGroupClass?>">
-<?
-$ShowGroups = !(!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGrouping'] == 1);
-?>
+<?php
+$ShowGroups = !(!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGrouping'] == 1); ?>
     <td class="center">
       <div id="showimg_<?=$GroupID?>" class="<?=($ShowGroups ? 'hide' : 'show')?>_torrents">
         <a class="tooltip show_torrents_link" onclick="toggle_group(<?=$GroupID?>, this, event)" title="Toggle this group (Hold &quot;Shift&quot; to toggle all groups)"></a>
@@ -522,15 +525,15 @@ $ShowGroups = !(!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGr
     <td colspan="2" class="big_info">
       <div class="group_info clear">
       <?=$DisplayName?>
-<?  if (in_array($GroupID, $Bookmarks)) { ?>
+<?php  if (in_array($GroupID, $Bookmarks)) { ?>
         <span class="remove_bookmark float_right">
           <a href="#" id="bookmarklink_torrent_<?=$GroupID?>" class="brackets" onclick="Unbookmark('torrent', <?=$GroupID?>, 'Bookmark'); return false;">Remove bookmark</a>
         </span>
-<?  } else { ?>
+<?php  } else { ?>
         <span class="add_bookmark float_right">
           <a href="#" id="bookmarklink_torrent_<?=$GroupID?>" class="brackets" onclick="Bookmark('torrent', <?=$GroupID?>, 'Remove bookmark'); return false;">Bookmark</a>
         </span>
-<?  } ?>
+<?php  } ?>
         <br />
         <div class="tags"><?=$TorrentTags->format('torrents.php?'.$Action.'&amp;taglist=')?></div>
       </div>
@@ -541,45 +544,43 @@ $ShowGroups = !(!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGr
     <td class="number_column<?=($TotalSeeders == 0 ? ' r00' : '')?>"><?=number_format($TotalSeeders)?></td>
     <td class="number_column"><?=number_format($TotalLeechers)?></td>
   </tr>
-<?
+<?php
     foreach ($Torrents as $TorrentID => $Data) {
-      $Data['CategoryID'] = $CategoryID;
-      // All of the individual torrents in the group
-
-      //Get report info for each torrent, use the cache if available, if not, add to it.
-      $Reported = false;
-      $Reports = Torrents::get_reports($TorrentID);
-      if (count($Reports) > 0) {
-        $Reported = true;
-      }
-
-      $SnatchedTorrentClass = $Data['IsSnatched'] ? ' snatched_torrent' : '';
-      $TorrentDL = "torrents.php?action=download&amp;id=".$TorrentID."&amp;authkey=".$LoggedUser['AuthKey']."&amp;torrent_pass=".$LoggedUser['torrent_pass'];
-
-      if (!empty(G::$LoggedUser) && (G::$LoggedUser['ShowMagnets'] ?? false)) {
-        if (!($TorrentFileName = $Cache->get_value('torrent_file_name_'.$TorrentID))) {
-          $TorrentFile = file_get_contents(TORRENT_STORE.$TorrentID.'.torrent');
-          $Tor = new BencodeTorrent($TorrentFile, false, false);
-          $TorrentFileName = $Tor->Dec['info']['name'];
-          $Cache->cache_value('torrent_file_name_'.$TorrentID, $TorrentFileName);
+        $Data['CategoryID'] = $CategoryID;
+        // All of the individual torrents in the group
+
+        //Get report info for each torrent, use the cache if available, if not, add to it.
+        $Reported = false;
+        $Reports = Torrents::get_reports($TorrentID);
+        if (count($Reports) > 0) {
+            $Reported = true;
         }
-        $TorrentMG = "magnet:?dn=".rawurlencode($TorrentFileName)."&xt=urn:btih:".$Data['info_hash']."&as=https://".SITE_DOMAIN."/".str_replace('&amp;','%26',$TorrentDL)."&tr=".implode("/".$LoggedUser['torrent_pass']."/announce&tr=",ANNOUNCE_URLS[0])."/".$LoggedUser['torrent_pass']."/announce&xl=".$Data['Size'];
-      }
 
-?>
+        $SnatchedTorrentClass = $Data['IsSnatched'] ? ' snatched_torrent' : '';
+        $TorrentDL = "torrents.php?action=download&amp;id=".$TorrentID."&amp;authkey=".$LoggedUser['AuthKey']."&amp;torrent_pass=".$LoggedUser['torrent_pass'];
+
+        if (!empty(G::$LoggedUser) && (G::$LoggedUser['ShowMagnets'] ?? false)) {
+            if (!($TorrentFileName = $Cache->get_value('torrent_file_name_'.$TorrentID))) {
+                $TorrentFile = file_get_contents(TORRENT_STORE.$TorrentID.'.torrent');
+                $Tor = new BencodeTorrent($TorrentFile, false, false);
+                $TorrentFileName = $Tor->Dec['info']['name'];
+                $Cache->cache_value('torrent_file_name_'.$TorrentID, $TorrentFileName);
+            }
+            $TorrentMG = "magnet:?dn=".rawurlencode($TorrentFileName)."&xt=urn:btih:".$Data['info_hash']."&as=https://".SITE_DOMAIN."/".str_replace('&amp;', '%26', $TorrentDL)."&tr=".implode("/".$LoggedUser['torrent_pass']."/announce&tr=", ANNOUNCE_URLS[0])."/".$LoggedUser['torrent_pass']."/announce&xl=".$Data['Size'];
+        } ?>
   <tr class="group_torrent groupid_<?=$GroupID?> <?=$SnatchedTorrentClass . $SnatchedGroupClass . (!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGrouping'] == 1 ? ' hidden' : '')?>">
     <td colspan="3">
       <span>
         [ <a href="<?=$TorrentDL?>" class="tooltip" title="Download"><?=$Data['HasFile'] ? 'DL' : 'Missing'?></a>
-<?      if (isset($TorrentMG)) { ?>
+<?php      if (isset($TorrentMG)) { ?>
         | <a href="<?=$TorrentMG?>" class="tooltip" title="Magnet Link">MG</a>
-<?      }
+<?php      }
         if (Torrents::can_use_token($Data)) { ?>
         | <a href="torrents.php?action=download&amp;id=<?=$TorrentID?>&amp;authkey=<?=$LoggedUser['AuthKey']?>&amp;torrent_pass=<?=$LoggedUser['torrent_pass']?>&amp;usetoken=1" class="tooltip" title="Use a FL Token" onclick="return confirm('Are you sure you want to use a freeleech token here?');">FL</a>
-<?      } ?>
+<?php      } ?>
         | <a href="reportsv2.php?action=report&amp;id=<?=$TorrentID?>" class="tooltip" title="Report">RP</a> ]
       </span>
-      &raquo; <a href="torrents.php?id=<?=$GroupID?>&amp;torrentid=<?=$TorrentID?>"><?=Torrents::torrent_info($Data)?><? if ($Reported) { ?> / <strong class="torrent_label tl_reported tooltip" title="Type: <?=ucfirst($Reports[0]['Type'])?><br>Comment: <?=htmlentities(htmlentities($Reports[0]['UserComment']))?>">Reported</strong><? } ?></a>
+      &raquo; <a href="torrents.php?id=<?=$GroupID?>&amp;torrentid=<?=$TorrentID?>"><?=Torrents::torrent_info($Data)?><?php if ($Reported) { ?> / <strong class="torrent_label tl_reported tooltip" title="Type: <?=ucfirst($Reports[0]['Type'])?><br>Comment: <?=htmlentities(htmlentities($Reports[0]['UserComment']))?>">Reported</strong><?php } ?></a>
     </td>
     <td class="number_column"><?=$Data['FileCount']?></td>
     <td class="nobr"><?=time_diff($Data['Time'], 1)?></td>
@@ -588,66 +589,65 @@ $ShowGroups = !(!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGr
     <td class="number_column<?=($Data['Seeders'] == 0) ? ' r00' : ''?>"><?=number_format($Data['Seeders'])?></td>
     <td class="number_column"><?=number_format($Data['Leechers'])?></td>
   </tr>
-<?
+<?php
     }
-  } else {
-    // Viewing a type that does not require grouping
-
-    $TorrentID = key($Torrents);
-    $Data = current($Torrents);
-
-    $Reported = false;
-    $Reports = Torrents::get_reports($TorrentID);
-    if (count($Reports) > 0) {
-      $Reported = true;
-    }
-
-    $Data['CategoryID'] = $CategoryID;
-    $CoverArt = $GroupInfo['WikiImage'];
-    $DisplayName .= "<a class=\"torrent_name\" href=\"torrents.php?id=$GroupID&amp;torrentid=$TorrentID#torrent$TorrentID\" ";
-    if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
-      $DisplayName .= 'data-cover="'.ImageTools::process($CoverArt, 'thumb').'" ';
-    }
-    $DisplayName .= "dir=\"ltr\">$GroupName</a>";
-    if (isset($GroupedCategories[$CategoryID - 1])) {
-      if ($GroupYear) {
-        $DisplayName .= " [$GroupYear]";
-      }
-      if ($GroupStudio) {
-        $DisplayName .= " [$GroupStudio]";
-      }
-      if ($GroupCatalogueNumber) {
-        $DisplayName .= " [$GroupCatalogueNumber]";
-      }
-      if ($GroupPages) {
-        $DisplayName .= " [{$GroupPages}p]";
-      }
-      if ($GroupDLsiteID) {
-        $DisplayName .= " [$GroupDLsiteID]";
-      }
-      $ExtraInfo = Torrents::torrent_info($Data, true, true);
-    } elseif ($Data['IsSnatched']) {
-      $ExtraInfo = Format::torrent_label('Snatched!');
-    } else {
-      $ExtraInfo = '';
-    }
-    $SnatchedTorrentClass = $Data['IsSnatched'] ? ' snatched_torrent' : '';
-    $TorrentDL = "torrents.php?action=download&amp;id=".$TorrentID."&amp;authkey=".$LoggedUser['AuthKey']."&amp;torrent_pass=".$LoggedUser['torrent_pass'];
-
-    if (!empty(G::$LoggedUser) && (G::$LoggedUser['ShowMagnets'] ?? false)) {
-      if (!($TorrentFileName = $Cache->get_value('torrent_file_name_'.$TorrentID))) {
-        $TorrentFile = file_get_contents(TORRENT_STORE.$TorrentID.'.torrent');
-        $Tor = new BencodeTorrent($TorrentFile, false, false);
-        $TorrentFileName = $Tor->Dec['info']['name'];
-        $Cache->cache_value('torrent_file_name_'.$TorrentID, $TorrentFileName);
-      }
-      $TorrentMG = "magnet:?dn=".rawurlencode($TorrentFileName)."&xt=urn:btih:".$Data['info_hash']."&as=https://".SITE_DOMAIN."/".str_replace('&amp;','%26',$TorrentDL)."&tr=".implode("/".$LoggedUser['torrent_pass']."/announce&tr=",ANNOUNCE_URLS[0])."/".$LoggedUser['torrent_pass']."/announce&xl=".$Data['Size'];
-    }
-?>
+      } else {
+          // Viewing a type that does not require grouping
+
+          $TorrentID = key($Torrents);
+          $Data = current($Torrents);
+
+          $Reported = false;
+          $Reports = Torrents::get_reports($TorrentID);
+          if (count($Reports) > 0) {
+              $Reported = true;
+          }
+
+          $Data['CategoryID'] = $CategoryID;
+          $CoverArt = $GroupInfo['WikiImage'];
+          $DisplayName .= "<a class=\"torrent_name\" href=\"torrents.php?id=$GroupID&amp;torrentid=$TorrentID#torrent$TorrentID\" ";
+          if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
+              $DisplayName .= 'data-cover="'.ImageTools::process($CoverArt, 'thumb').'" ';
+          }
+          $DisplayName .= "dir=\"ltr\">$GroupName</a>";
+          if (isset($GroupedCategories[$CategoryID - 1])) {
+              if ($GroupYear) {
+                  $DisplayName .= " [$GroupYear]";
+              }
+              if ($GroupStudio) {
+                  $DisplayName .= " [$GroupStudio]";
+              }
+              if ($GroupCatalogueNumber) {
+                  $DisplayName .= " [$GroupCatalogueNumber]";
+              }
+              if ($GroupPages) {
+                  $DisplayName .= " [{$GroupPages}p]";
+              }
+              if ($GroupDLsiteID) {
+                  $DisplayName .= " [$GroupDLsiteID]";
+              }
+              $ExtraInfo = Torrents::torrent_info($Data, true, true);
+          } elseif ($Data['IsSnatched']) {
+              $ExtraInfo = Format::torrent_label('Snatched!');
+          } else {
+              $ExtraInfo = '';
+          }
+          $SnatchedTorrentClass = $Data['IsSnatched'] ? ' snatched_torrent' : '';
+          $TorrentDL = "torrents.php?action=download&amp;id=".$TorrentID."&amp;authkey=".$LoggedUser['AuthKey']."&amp;torrent_pass=".$LoggedUser['torrent_pass'];
+
+          if (!empty(G::$LoggedUser) && (G::$LoggedUser['ShowMagnets'] ?? false)) {
+              if (!($TorrentFileName = $Cache->get_value('torrent_file_name_'.$TorrentID))) {
+                  $TorrentFile = file_get_contents(TORRENT_STORE.$TorrentID.'.torrent');
+                  $Tor = new BencodeTorrent($TorrentFile, false, false);
+                  $TorrentFileName = $Tor->Dec['info']['name'];
+                  $Cache->cache_value('torrent_file_name_'.$TorrentID, $TorrentFileName);
+              }
+              $TorrentMG = "magnet:?dn=".rawurlencode($TorrentFileName)."&xt=urn:btih:".$Data['info_hash']."&as=https://".SITE_DOMAIN."/".str_replace('&amp;', '%26', $TorrentDL)."&tr=".implode("/".$LoggedUser['torrent_pass']."/announce&tr=", ANNOUNCE_URLS[0])."/".$LoggedUser['torrent_pass']."/announce&xl=".$Data['Size'];
+          } ?>
   <tr class="torrent<?=$SnatchedTorrentClass . $SnatchedGroupClass?>">
-<?    if ($GroupResults) { ?>
+<?php    if ($GroupResults) { ?>
     <td></td>
-<?    } ?>
+<?php    } ?>
     <td class="center cats_col">
       <div title="<?=Format::pretty_category($CategoryID)?>" class="tooltip <?=Format::css_category($CategoryID)?>"></div>
     </td>
@@ -656,28 +656,28 @@ $ShowGroups = !(!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGr
         <div class="float_right">
           <span>
           [ <a href="<?=$TorrentDL?>" class="tooltip" title="Download">DL</a>
-<?    if (isset($TorrentMG)) { ?>
+<?php    if (isset($TorrentMG)) { ?>
           | <a href="<?=$TorrentMG?>" class="tooltip" title="Magnet Link">MG</a>
-<?    }
-      if (Torrents::can_use_token($Data)) { ?>
+<?php    }
+          if (Torrents::can_use_token($Data)) { ?>
           | <a href="torrents.php?action=download&amp;id=<?=$TorrentID?>&amp;authkey=<?=$LoggedUser['AuthKey']?>&amp;torrent_pass=<?=$LoggedUser['torrent_pass']?>&amp;usetoken=1" class="tooltip" title="Use a FL Token" onclick="return confirm('Are you sure you want to use a freeleech token here?');">FL</a>
-<?    } ?>
+<?php    } ?>
           | <a href="reportsv2.php?action=report&amp;id=<?=$TorrentID?>" class="tooltip" title="Report">RP</a> ]
           </span>
           <br />
-<?  if (in_array($GroupID, $Bookmarks)) { ?>
+<?php  if (in_array($GroupID, $Bookmarks)) { ?>
           <span class="remove_bookmark float_right">
             <a href="#" id="bookmarklink_torrent_<?=$GroupID?>" class="brackets" onclick="Unbookmark('torrent', <?=$GroupID?>, 'Bookmark'); return false;">Remove bookmark</a>
           </span>
-<?  } else { ?>
+<?php  } else { ?>
           <span class="add_bookmark float_right">
             <a href="#" id="bookmarklink_torrent_<?=$GroupID?>" class="brackets" onclick="Bookmark('torrent', <?=$GroupID?>, 'Remove bookmark'); return false;">Bookmark</a>
           </span>
-<?  } ?>
+<?php  } ?>
         </div>
         <?=$DisplayName?>
         <br />
-        <div style="display: inline;" class="torrent_info"><?=$ExtraInfo?><? if ($Reported) { ?> / <strong class="torrent_label tl_reported tooltip" title="Type: <?=ucfirst($Reports[0]['Type'])?><br>Comment: <?=htmlentities(htmlentities($Reports[0]['UserComment']))?>">Reported</strong><? } ?></div>
+        <div style="display: inline;" class="torrent_info"><?=$ExtraInfo?><?php if ($Reported) { ?> / <strong class="torrent_label tl_reported tooltip" title="Type: <?=ucfirst($Reports[0]['Type'])?><br>Comment: <?=htmlentities(htmlentities($Reports[0]['UserComment']))?>">Reported</strong><?php } ?></div>
         <div class="tags"><?=$TorrentTags->format("torrents.php?$Action&amp;taglist=")?></div>
       </div>
     </td>
@@ -688,11 +688,11 @@ $ShowGroups = !(!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGr
     <td class="number_column<?=($Data['Seeders'] == 0) ? ' r00' : ''?>"><?=number_format($Data['Seeders'])?></td>
     <td class="number_column"><?=number_format($Data['Leechers'])?></td>
   </tr>
-<?
+<?php
+      }
   }
-}
 ?>
 </table>
 <div class="linkbox"><?=$Pages?></div>
 </div>
-<? View::show_footer(); ?>
+<?php View::show_footer(); ?>

sections/wiki/search.php

@@ -1,11 +1,11 @@
 <?php
 if (empty($_GET['nojump'])) {
-  $ArticleID = Wiki::alias_to_id($_GET['search']);
-  if ($ArticleID) {
-    //Found the article!
-    header('Location: wiki.php?action=article&id='.$ArticleID);
-    die();
-  }
+    $ArticleID = Wiki::alias_to_id($_GET['search']);
+    if ($ArticleID) {
+        // Found the article!
+        header('Location: wiki.php?action=article&id='.$ArticleID);
+        die();
+    }
 }
 
 define('ARTICLES_PER_PAGE', 25);
@@ -17,11 +17,11 @@ $TypeTable = array('Title'=>'Title', 'Body'=>'Body');
 $OrderTable = array('Title'=>'Title', 'Created'=>'ID', 'Edited'=>'Date');
 $WayTable = array('Ascending'=>'ASC', 'Descending'=>'DESC');
 
-// What are we looking for? Let's make sure it isn't dangerous.
+// What are we looking for? Let's make sure it isn't dangerous
 $Search = db_string(trim($_GET['search']));
 
 if (!in_array($Type, array('Title', 'Body'))) {
-  $Type = 'Title';
+    $Type = 'Title';
 }
 
 // Break search string down into individual words
@@ -29,17 +29,17 @@ $Words = explode(' ', $Search);
 
 $Type = $TypeTable[$_GET['type']];
 if (!$Type) {
-  $Type = 'Title';
+    $Type = 'Title';
 }
 
 $Order = $OrderTable[$_GET['order']];
 if (!$Order) {
-  $Order = 'ID';
+    $Order = 'ID';
 }
 
 $Way = $WayTable[$_GET['way']];
 if (!$Way) {
-  $Way = 'DESC';
+    $Way = 'DESC';
 }
 
 $SQL = "
@@ -52,9 +52,9 @@ $SQL = "
   FROM wiki_articles
   WHERE MinClassRead <= '".$LoggedUser['EffectiveClass']."'";
 if ($Search != '') {
-  $SQL .= " AND $Type LIKE '%";
-  $SQL .= implode("%' AND $Type LIKE '%", $Words);
-  $SQL .= "%' ";
+    $SQL .= " AND $Type LIKE '%";
+    $SQL .= implode("%' AND $Type LIKE '%", $Words);
+    $SQL .= "%' ";
 }
 
 $SQL .= "
@@ -65,9 +65,10 @@ $DB->query("
   SELECT FOUND_ROWS()");
 list($NumResults) = $DB->next_record();
 
-View::show_header('Search articles');
+View::show_header('Search Articles');
 $DB->set_query_id($RS);
 ?>
+
 <div class="thin">
   <div class="header">
     <h2>Search articles</h2>
@@ -83,28 +84,36 @@ $DB->set_query_id($RS);
       </div>
       <table cellpadding="6" cellspacing="1" border="0" class="layout border" width="100%">
         <tr>
-          <td class="label"><label for="search"><strong>Search for:</strong></label></td>
+          <td class="label"><label for="search"><strong>Search Terms</strong></label></td>
           <td colspan="3">
             <input type="search" name="search" id="search" size="70" value="<?=display_str($_GET['search'])?>" />
           </td>
         </tr>
         <tr>
-          <td class="label"><strong>Search in:</strong></td>
+          <td class="label"><strong>Search In</strong></td>
           <td>
-            <label><input type="radio" name="type" value="Title" <? if ($Type == 'Title') { echo 'checked="checked" '; } ?>/> Title</label>
-            <label><input type="radio" name="type" value="Body" <? if ($Type == 'Body') { echo 'checked="checked" '; } ?>/> Body</label>
+            <label><input type="radio" name="type" value="Title" <?php if ($Type == 'Title') {
+    echo 'checked="checked" ';
+} ?>/> Title</label>&nbsp;&nbsp;
+            <label><input type="radio" name="type" value="Body" <?php if ($Type == 'Body') {
+    echo 'checked="checked" ';
+} ?>/> Body</label>
           </td>
-          <td class="label"><strong>Order by:</strong></td>
+          <td class="label"><strong>Order By</strong></td>
           <td>
             <select name="order">
-<?          foreach ($OrderVals as $Cur) { ?>
-              <option value="<?=$Cur?>"<? if ($_GET['order'] == $Cur || (!$_GET['order'] && $Cur == 'Time')) { echo ' selected="selected"'; } ?>><?=$Cur?></option>
-<?          } ?>
+<?php          foreach ($OrderVals as $Cur) { ?>
+              <option value="<?=$Cur?>"<?php if ($_GET['order'] == $Cur || (!$_GET['order'] && $Cur == 'Time')) {
+    echo ' selected="selected"';
+} ?>><?=$Cur?></option>
+<?php          } ?>
             </select>
             <select name="way">
-<?          foreach ($WayVals as $Cur) { ?>
-              <option value="<?=$Cur?>"<? if ($_GET['way'] == $Cur || (!$_GET['way'] && $Cur == 'Descending')) { echo ' selected="selected"'; } ?>><?=$Cur?></option>
-<?          } ?>
+<?php          foreach ($WayVals as $Cur) { ?>
+              <option value="<?=$Cur?>"<?php if ($_GET['way'] == $Cur || (!$_GET['way'] && $Cur == 'Descending')) {
+    echo ' selected="selected"';
+} ?>><?=$Cur?></option>
+<?php          } ?>
             </select>
           </td>
         </tr>
@@ -117,25 +126,25 @@ $DB->set_query_id($RS);
     </form>
   </div>
   <br />
-<?
+<?php
   $Pages = Format::get_pages($Page, $NumResults, ARTICLES_PER_PAGE);
   if ($Pages) { ?>
   <div class="linkbox pager"><?=($Pages)?></div>
-<?  } ?>
+<?php  } ?>
 <table width="100%">
   <tr class="colhead">
     <td>Article</td>
     <td>Last updated on</td>
     <td>Last edited by</td>
   </tr>
-<?  while (list($ID, $Title, $Date, $UserID) = $DB->next_record()) { ?>
+<?php  while (list($ID, $Title, $Date, $UserID) = $DB->next_record()) { ?>
   <tr>
     <td><a href="wiki.php?action=article&amp;id=<?=$ID?>"><?=$Title?></a></td>
     <td><?=$Date?></td>
     <td><?=Users::format_username($UserID, false, false, false)?></td>
   </tr>
-<?  } ?>
+<?php  } ?>
 </table>
   <div class="linkbox"><?=$Pages?></div>
 </div>
-<? View::show_footer(); ?>
+<?php View::show_footer(); ?>