»

classes/calendarview.class.php

@@ -1,119 +1,137 @@
-<?
+<?php
 
-class CalendarView {
-  private static $Days = array('S', 'M', 'T', 'W', 'T', 'F', 'S');
-  private static $Headings = array('Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday');
-  private static $Events;
+# todo: Check strict eqality all this page
+# The staff calendar may actually be broken
 
-  public static function render_title($Month, $Year) {
-    if (!is_numeric($Month) || !is_numeric($Year)) {
-      error(404);
-    }
-    $NextMonth = $Month % 12 == 0 ? 1 : $Month + 1;
-    $PreviousMonth = $Month == 1 ? 12 : $Month - 1;
-    $NextYear = $Year;
-    if ($NextMonth == 1) {
-      $NextYear++;
-    }
-    $PreviousYear = $Year;
-    if ($PreviousMonth == 12) {
-      $PreviousYear--;
+class CalendarView
+{
+    private static $Days = array('S', 'M', 'T', 'W', 'T', 'F', 'S');
+    private static $Headings = array('Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday');
+    private static $Events;
+
+    public static function render_title($Month, $Year)
+    {
+        if (!is_numeric($Month) || !is_numeric($Year)) {
+            error(404);
+        }
+
+        $NextMonth = $Month % 12 == 0 ? 1 : $Month + 1;
+        $PreviousMonth = $Month == 1 ? 12 : $Month - 1;
+        $NextYear = $Year;
+
+        if ($NextMonth == 1) {
+            $NextYear++;
+        }
+
+        $PreviousYear = $Year;
+        if ($PreviousMonth == 12) {
+            $PreviousYear--;
+        } ?>
+
+<h1 class="center">
+  <a
+    href="tools.php?action=calendar&amp;month=<?=$PreviousMonth?>&amp;year=<?=$PreviousYear?>">«</a>
+  <?=date("F", mktime(0, 0, 0, $Month, 10)) . " $Year"?>
+  <a
+    href="tools.php?action=calendar&amp;month=<?=$NextMonth?>&amp;year=<?=$NextYear?>">»</a>
+</h1>
+
+<input type="hidden" id="month" value="<?=$Month?>" />
+<input type="hidden" id="year" value="<?=$Year?>" />
+
+<?php
     }
-?>
-    <h1 class="center">
-      <a href="tools.php?action=calendar&amp;month=<?=$PreviousMonth?>&amp;year=<?=$PreviousYear?>">&lt;</a>
-      <?=date("F", mktime(0, 0, 0, $Month, 10)) . " $Year"?>
-      <a href="tools.php?action=calendar&amp;month=<?=$NextMonth?>&amp;year=<?=$NextYear?>">&gt;</a>
-    </h1>
-    <input type="hidden" id="month" value="<?=$Month?>" />
-    <input type="hidden" id="year" value="<?=$Year?>" />
-<?
-  }
-
-  private static function get_events_on($Day, $Events) {
-    // Linear search, Lol.
-    $Results = [];
-    foreach ($Events as $Event) {
-      if ($Event['StartDay'] == $Day || ($Event['StartDay'] <= $Day && $Event['EndDay'] >= $Day)) {
-        $Results[] = $Event;
-      }
+
+    private static function get_events_on($Day, $Events)
+    {
+        // Linear search, lol
+        $Results = [];
+        foreach ($Events as $Event) {
+            if ($Event['StartDay'] == $Day || ($Event['StartDay'] <= $Day && $Event['EndDay'] >= $Day)) {
+                $Results[] = $Event;
+            }
+        }
+        return $Results;
     }
-    return $Results;
-  }
-
-
-  private static function render_events_day($Day, $Events) {
-    $Events = self::get_events_on($Day, $Events);
-    foreach ($Events as $Event) {
-      $Color = Calendar::$Colors[Calendar::$Importances[$Event['Importance']]];
-      $Category = Calendar::$Categories[$Event['Category']];
-      $Tooltip = $Event['Title'] . " - " . Calendar::$Categories[$Event['Category']] . " - " . Calendar::$Importances[$Event['Importance']];
-?>
-      <p><a href="#" class="event_day tooltip" title="<?=$Tooltip?>" data-gazelle-id="<?=$Event['ID']?>" style="color: <?=$Color?>;"><?=Format::cut_string($Event['Title'], 8, true)?></a></p>
-<?
+
+    private static function render_events_day($Day, $Events)
+    {
+        $Events = self::get_events_on($Day, $Events);
+        foreach ($Events as $Event) {
+            $Color = Calendar::$Colors[Calendar::$Importances[$Event['Importance']]];
+            $Category = Calendar::$Categories[$Event['Category']];
+            $Tooltip = $Event['Title'] . " - " . Calendar::$Categories[$Event['Category']] . " - " . Calendar::$Importances[$Event['Importance']]; ?>
+
+<p>
+  <a href="#" class="event_day tooltip" title="<?=$Tooltip?>"
+    data-gazelle-id="<?=$Event['ID']?>"
+    style="color: <?=$Color?>;"><?=Format::cut_string($Event['Title'], 8, true)?></a>
+</p>
+
+<?php
+        }
     }
-  }
-
-  public static function render_calendar($Month, $Year, $Events) {
-    $RunningDay = date('w', mktime(0, 0, 0, $Month, 1, $Year));
-    $DaysInMonth = date('t', mktime(0 ,0 ,0, $Month, 1, $Year));
-    $DaysThisWeek = 1;
-    $DayCounter = 0;
-    $DatesArray = [];
-?>
-
-    <table class="calendar">
-      <tr>
-<?    foreach (self::$Headings as $Heading) { ?>
-        <td class="calendar-row calendar-heading">
-          <strong><?=$Heading?></strong>
-        </td>
-<?    } ?>
-      </tr>
-      <tr class="calendar-row">
-
-<?    for ($x = 0; $x < $RunningDay; $x++) { ?>
-        <td class="calendar-day-np"></td>
-<?
+
+    public static function render_calendar($Month, $Year, $Events)
+    {
+        $RunningDay = date('w', mktime(0, 0, 0, $Month, 1, $Year));
+        $DaysInMonth = date('t', mktime(0, 0, 0, $Month, 1, $Year));
+        $DaysThisWeek = 1;
+        $DayCounter = 0;
+        $DatesArray = []; ?>
+
+<table class="calendar">
+  <tr>
+    <?php foreach (self::$Headings as $Heading) { ?>
+    <td class="calendar-row calendar-heading">
+      <strong><?=$Heading?></strong>
+    </td>
+    <?php } ?>
+  </tr>
+
+  <tr class="calendar-row">
+    <?php for ($x = 0; $x < $RunningDay; $x++) { ?>
+    <td class="calendar-day-np"></td>
+    <?php
       $DaysThisWeek++;
     }
 
-    for ($i = 1; $i <= $DaysInMonth; $i++) {
-?>
-        <td class="calendar-day">
-          <div class="day-events">
-<?            self::render_events_day($i, $Events); ?>
-          </div>
-          <div class="day-number">
-            <?=$i?>
-          </div>
-        </td>
-<?      if ($RunningDay == 6) { ?>
-      </tr>
-<?        if (($DayCounter + 1) != $DaysInMonth) { ?>
-      <tr class="calendar-row">
-<?
+        for ($i = 1; $i <= $DaysInMonth; $i++) {
+            ?>
+    <td class="calendar-day">
+      <div class="day-events">
+        <?php self::render_events_day($i, $Events); ?>
+      </div>
+      <div class="day-number">
+        <?=$i?>
+      </div>
+    </td>
+    <?php if ($RunningDay == 6) { ?>
+  </tr>
+
+  <?php if (($DayCounter + 1) != $DaysInMonth) { ?>
+  <tr class="calendar-row">
+    <?php
         }
         $RunningDay = -1;
         $DaysThisWeek = 0;
       }
-      $DaysThisWeek++;
-      $RunningDay++;
-      $DayCounter++;
-    }
+            $DaysThisWeek++;
+            $RunningDay++;
+            $DayCounter++;
+        }
 
-    if ($DaysThisWeek < 8) {
-      for ($x = 1; $x <= (8 - $DaysThisWeek); $x++) {
-?>
-        <td class="calendar-day-np"></td>
-<?
-      }
-    }
-?>
-      </tr>
+        if ($DaysThisWeek < 8) {
+            for ($x = 1; $x <= (8 - $DaysThisWeek); $x++) {
+                ?>
+    <td class="calendar-day-np"></td>
+    <?php
+            }
+        } ?>
+  </tr>
 
-    </table>
-<?
+</table>
+<?php
     echo $Calendar;
-  }
+    }
 }

classes/format.class.php

@@ -295,8 +295,8 @@ class Format
             $Pages = '';
 
             if ($StartPage > 1) {
-                $Pages .= "<a href=\"$Location?page=1$QueryString$Anchor\"><strong>&lt;&lt; First</strong></a> ";
-                $Pages .= "<a href=\"$Location?page=".($StartPage - 1).$QueryString.$Anchor.'" class="pager_prev"><strong>&lt; Prev</strong></a> | ';
+                $Pages .= "<a href=\"$Location?page=1$QueryString$Anchor\"><strong>« First</strong></a> ";
+                $Pages .= "<a href=\"$Location?page=".($StartPage - 1).$QueryString.$Anchor.'" class="pager_prev"><strong>‹ Prev</strong></a> | ';
             }
             // End change
 
@@ -325,8 +325,8 @@ class Format
             }
 
             if ($StartPage && $StartPage < $TotalPages) {
-                $Pages .= " | <a href=\"$Location?page=".($StartPage + 1).$QueryString.$Anchor.'" class="pager_next"><strong>Next &gt;</strong></a> ';
-                $Pages .= "<a href=\"$Location?page=$TotalPages$QueryString$Anchor\"><strong> Last &gt;&gt;</strong></a>";
+                $Pages .= " | <a href=\"$Location?page=".($StartPage + 1).$QueryString.$Anchor.'" class="pager_next"><strong>Next ›</strong></a> ';
+                $Pages .= "<a href=\"$Location?page=$TotalPages$QueryString$Anchor\"><strong> Last »</strong></a>";
             }
         }
         if ($TotalPages > 1) {

classes/mediainfo.class.php

@@ -1,13 +1,17 @@
 <?php
-class MediaInfo {
-    public static function parse($string, $raw=false) {
+
+class MediaInfo
+{
+    public static function parse($string, $raw=false)
+    {
         $t = new ParseManager($string);
         $t->parse();
         return $raw ? $t->output_raw() : $t->output();
     }
 }
 
-class ParseManager {
+class ParseManager
+{
     protected $lines;
     protected $parsed_lines;
     protected $index;
@@ -22,7 +26,8 @@ class ParseManager {
 
     const GENERIC_PARSER = 'generic_parser';
     const MEDIAINFO_START = 'general';
-    public function __construct($string='') {
+    public function __construct($string='')
+    {
         $this->index = 0;
         $this->output = '';
         $this->parsed_lines = [];
@@ -31,44 +36,51 @@ class ParseManager {
         $this->add_parser($p);
     }
 
-    protected function set_string($string) {
+    protected function set_string($string)
+    {
         $string = trim($string);
         $string = static::strip_escaped_tags($string);
         $lines = preg_split("/\r\n|\n|\r/", $string);
-        array_walk($lines,function(&$l) {
+        array_walk($lines, function (&$l) {
             $l=trim($l);
         });
         $this->lines = $lines;
     }
 
-    protected function add_parser($p,$name='') {
-        $p->set_lines($this->lines,$this->index);
-        if (!$name) $name = static::GENERIC_PARSER;
+    protected function add_parser($p, $name='')
+    {
+        $p->set_lines($this->lines, $this->index);
+        if (!$name) {
+            $name = static::GENERIC_PARSER;
+        }
         $this->parsers[$name][] = $p;
     }
 
-    public function parse() {
-        // get the next section
+    public function parse()
+    {
+        // Get the next section
         while ($this->index < count($this->lines) &&
           !($line = $this->parsers[static::GENERIC_PARSER][0]->parse_line()));
         $section = SectionParser::section_name($line);
         $this->index--; // go back to line we just read
 
-        // we can have multiple mediainfo files inside the block, so handle that case here
+        // We can have multiple mediainfo files inside the block, so handle that case here
         if ($section == self::MEDIAINFO_START && isset($this->parsers[$section])) {
             $this->new_mediainfo();
         }
-        if (isset($this->available_parsers[$section])){
+
+        if (isset($this->available_parsers[$section])) {
             $parser = new $this->available_parsers[$section];
-            $this->add_parser($parser,$section);
-            // parse section using the parser
-            while ($line = $parser->parse_line()) $this->parsed_lines[] = $line;
+            $this->add_parser($parser, $section);
+            // Parse section using the parser
+            while ($line = $parser->parse_line()) {
+                $this->parsed_lines[] = $line;
+            }
 
             $this->parsed_lines[] = '';
-        }
-        else {
-            // skip until the next blank line or until the next general section
-            while ($line = $this->parsers[static::GENERIC_PARSER][0]->parse_line()){
+        } else {
+            // Skip until the next blank line or until the next general section
+            while ($line = $this->parsers[static::GENERIC_PARSER][0]->parse_line()) {
                 $section = SectionParser::section_name($line);
                 if ($section == self::MEDIAINFO_START) {
                     $this->index--; // go back to line we just read
@@ -77,15 +89,18 @@ class ParseManager {
             }
         }
 
-        // keep iterating until the last line
+        // Keep iterating until the last line
         if ($this->index < count($this->lines)) {
             $this->parse();
         }
     }
 
-    public function output($cummulative=true) {
-        $string = implode("<br />\n",$this->parsed_lines);
-        if (!isset($this->parsers['general'])) return $string;
+    public function output($cummulative=true)
+    {
+        $string = implode("<br />\n", $this->parsed_lines);
+        if (!isset($this->parsers['general'])) {
+            return $string;
+        }
 
         $midiv_start = '<div class="spoilerContainer hideContainer">
             <input type="button" class="spoilerButton" value="Show '.
@@ -95,43 +110,49 @@ class ParseManager {
 
         $output = '<table class="mediainfo"><tbody><tr><td>';
         $output .= $this->parsers['general'][0]->output();
-        if (isset($this->parsers['video'])){
+
+        if (isset($this->parsers['video'])) {
             $output .= '</td><td>';
             $output .= $this->parsers['video'][0]->output();
         }
-        if (isset($this->parsers['audio'])){
+
+        if (isset($this->parsers['audio'])) {
             $output .= '</td><td>';
             $output .= '<table><caption>Audio</caption><tbody>';
-            foreach($this->parsers['audio'] as $index => $ap) {
-                $output .= sprintf('<tr><td>#%d: &nbsp;</td><td>%s</td></tr>',intval($index+1),$ap->output());
+            foreach ($this->parsers['audio'] as $index => $ap) {
+                $output .= sprintf('<tr><td>#%d: &nbsp;</td><td>%s</td></tr>', intval($index+1), $ap->output());
             }
             $output .= '</tbody></table>';
         }
-        if (isset($this->parsers['text'])){
-            // subtitles table will be printed below the previous table
+
+        if (isset($this->parsers['text'])) {
+            // Subtitles table will be printed below the previous table
             $output .= '<br />';
             $output .= '<table><caption>Subtitles</caption><tbody>';
-            foreach($this->parsers['text'] as $index => $tp) {
-                $output .= sprintf('<tr><td>#%d: &nbsp;</td><td>%s</td></tr>',intval($index+1),$tp->output());
+            foreach ($this->parsers['text'] as $index => $tp) {
+                $output .= sprintf('<tr><td>#%d: &nbsp;</td><td>%s</td></tr>', intval($index+1), $tp->output());
             }
             $output .= '</tbody></table>';
         }
+
         $output .= '</td></tr></tbody></table><br />';
         $output = $midiv_start . $string . $midiv_end . $output;
+
         if ($cummulative) {
             $output = $this->output . $output;
         }
         return  $output;
     }
 
-    public function output_raw() {
+    public function output_raw()
+    {
         $output = [];
         $sections = ['general', 'video', 'audio', 'text'];
 
-        foreach($sections as $section) {
+        foreach ($sections as $section) {
             if (isset($this->parsers[$section])) {
                 $output[$section] = [];
-                foreach($this->parsers[$section] as $index => $parser) {
+                foreach ($this->parsers[$section] as $index => $parser) {
                     $output[$section][$index] = $parser->output_raw();
                 }
             }
@@ -139,100 +160,131 @@ class ParseManager {
         return $output;
     }
 
-    // strip escaped html tags
-    // this is not done for security, just to beautify things (html should already be escaped)
-    public static function strip_escaped_tags($string) {
+    // Strip escaped html tags
+    // This is not done for security, just to beautify things (html should already be escaped)
+    public static function strip_escaped_tags($string)
+    {
         // use the php function first
         $string = strip_tags($string);
 
         $gt = '&gt;|&#62;|>';
         $lt = '&lt;|&#60;|<';
 
-        // there is no opening tag, so don't go through the rest of the regexes
-        if (!preg_match("($lt)",$string))
+        // There is no opening tag, so don't go through the rest of the regexes
+        if (!preg_match("($lt)", $string)) {
             return $string;
+        }
 
         $tag_match = "/(?:$lt)(?P<tag>(?:(?!$gt).)*)(?:$gt)/ims";
 
-        // this should match and remove tags
-        $string = preg_replace($tag_match,'',$string);
+        // This should match and remove tags
+        $string = preg_replace($tag_match, '', $string);
 
         return $string;
     }
 
-    protected function new_mediainfo() {
+    protected function new_mediainfo()
+    {
         $this->output .= $this->output(false);
         $this->parsed_lines = [];
-        foreach(array_keys($this->parsers) as $key) {
-            if ($key != static::GENERIC_PARSER)
+
+        foreach (array_keys($this->parsers) as $key) {
+            if ($key != static::GENERIC_PARSER) {
                 unset($this->parsers[$key]);
+            }
         }
     }
-
 }
 
-class SectionParser {
+class SectionParser
+{
     protected $lines;
     protected $index;
 
-
-    public function __construct(&$lines=[],&$i=0) {
-        $this->set_lines($lines,$i);
+    public function __construct(&$lines=[], &$i=0)
+    {
+        $this->set_lines($lines, $i);
     }
-    public function set_lines(&$lines=[],&$i=0){
+
+    public function set_lines(&$lines=[], &$i=0)
+    {
         $this->lines = &$lines;
         $this->index = &$i;
     }
-    // should always return the read line
-    public function parse_line(){
+
+    // Should always return the read line
+    public function parse_line()
+    {
         if (!isset($this->lines[$this->index])) {
             return null;
         }
+
         $line = $this->lines[$this->index++];
         $pair = static::property_value_pair($line);
-        $this->handle_cases($pair['property'],$pair['value']);
+        $this->handle_cases($pair['property'], $pair['value']);
         return $line;
     }
-    public function output() {
 
+    public function output()
+    {
     }
-    protected function handle_cases($property, $value) {
 
+    protected function handle_cases($property, $value)
+    {
     }
-    public static function section_name($string) {
-        if (!$string) return false;
+
+    public static function section_name($string)
+    {
+        if (!$string) {
+            return false;
+        }
         $mistart="/^(?:general$|unique id|complete name)/i";
-        if (preg_match($mistart, $string)) return ParseManager::MEDIAINFO_START;
-        $words = explode(' ',$string);
+        if (preg_match($mistart, $string)) {
+            return ParseManager::MEDIAINFO_START;
+        }
+        $words = explode(' ', $string);
         return strtolower($words[0]);
     }
-    public static function property_value_pair($string) {
+
+    public static function property_value_pair($string)
+    {
         $pair = explode(":", $string, 2);
         return array('property'=>strtolower(trim($pair[0])),'value'=>trim($pair[1]??''));
     }
-    public static function strip_path($string) { // remove filepath
+
+    public static function strip_path($string)
+    { // remove filepath
         $string = str_replace("\\", "/", $string);
         $path_parts = pathinfo($string);
         return $path_parts['basename'];
     }
-    public static function parse_size($string) {
+
+    public static function parse_size($string)
+    {
         return str_replace(array('pixels', ' '), null, $string);
     }
-    protected static function table_head($caption) {
+
+    protected static function table_head($caption)
+    {
         return "<table class='nobr'><caption>$caption</caption><tbody>";
     }
-    protected static function table_row($property,$value) {
-        if ($value)
+
+    protected static function table_row($property, $value)
+    {
+        if ($value) {
             return "<tr><td>$property:&nbsp;&nbsp;</td><td>$value</td></tr>";
+        }
         return '';
     }
-    protected static function table_tail(){
+
+    protected static function table_tail()
+    {
         return '</tbody></table>';
     }
-
 }
 
-class AudioSectionParser extends SectionParser {
+class AudioSectionParser extends SectionParser
+{
     protected $audioformat;
     protected $audiobitrate;
     protected $audiochannels;
@@ -243,7 +295,8 @@ class AudioSectionParser extends SectionParser {
     protected $form_audioformat;
     protected $form_audiochannels;
 
-    protected function handle_cases($property,$value) {
+    protected function handle_cases($property, $value)
+    {
         switch ($property) {
             case "format":
                 $this->audioformat = $value;
@@ -268,14 +321,18 @@ class AudioSectionParser extends SectionParser {
                 break;
         }
     }
-    public function output() {
+
+    public function output()
+    {
         $this->process_vars();
         $output = $this->audiolang . ' ' . $this->channels() . ' ' . $this->format();
         $output .= ($this->audiobitrate) ? " @ $this->audiobitrate" : '';
         $output .= ($this->audiotitle) ? " ($this->audiotitle)" : '';
         return $output;
     }
-    public function output_raw() {
+
+    public function output_raw()
+    {
         $this->process_vars();
         $output = [];
         $properties = [
@@ -283,16 +340,23 @@ class AudioSectionParser extends SectionParser {
             'audiochannelpositions', 'audiotitle', 'audiolang', 'audioprofile',
             'form_audioformat', 'form_audiochannels'
         ];
-        foreach($properties as $property) {
-            if ($this->$property) $output[$property] = $this->$property;
+
+        foreach ($properties as $property) {
+            if ($this->$property) {
+                $output[$property] = $this->$property;
+            }
         }
         return $output;
     }
-    protected function process_vars() {
+
+    protected function process_vars()
+    {
         $this->form_audioformat = $this->form_format();
         $this->form_audiochannels = $this->form_channels();
     }
-    protected function format() {
+
+    protected function format()
+    {
         if (strtolower($this->audioformat) === 'mpeg audio') {
             switch (strtolower($this->audioprofile)) {
                 case 'layer 3':
@@ -305,7 +369,9 @@ class AudioSectionParser extends SectionParser {
         }
         return $this->audioformat;
     }
-    protected function form_format() {
+
+    protected function form_format()
+    {
         // Not implemented: Real Audio, DTS-HD
         switch (strtolower($this->format())) {
             case 'mp2':
@@ -329,6 +395,7 @@ class AudioSectionParser extends SectionParser {
                     default:
                         return 'DTS';
                 }
+                // no break
             case 'flac':
                 return 'FLAC';
             case 'pcm':
@@ -337,12 +404,16 @@ class AudioSectionParser extends SectionParser {
                 return 'WMA';
         }
     }
-    protected function channels() {
+
+    protected function channels()
+    {
         if (isset($this->audiochannels)) {
             $chans = preg_replace('/^(\d).*$/', '$1', $this->audiochannels);
 
-            if (isset($this->audiochannelpositions) && preg_match('/LFE/',
-                    $this->audiochannelpositions)) {
+            if (isset($this->audiochannelpositions) && preg_match(
+                '/LFE/',
+                $this->audiochannelpositions
+            )) {
                 $chans -= .9;
             } else {
                 $chans = $chans . '.0';
@@ -351,12 +422,15 @@ class AudioSectionParser extends SectionParser {
             return $chans . 'ch';
         }
     }
-    protected function form_channels() {
+
+    protected function form_channels()
+    {
         return preg_replace('/ch/', '', $this->channels());
     }
 }
 
-class GeneralSectionParser extends SectionParser {
+class GeneralSectionParser extends SectionParser
+{
     public $filename;
     protected $generalformat;
     protected $duration;
@@ -364,7 +438,8 @@ class GeneralSectionParser extends SectionParser {
     protected $form_codec;
     protected $form_releasegroup;
 
-    protected function handle_cases($property,$value) {
+    protected function handle_cases($property, $value)
+    {
         switch ($property) {
             case "complete name":
                 // Remove autodetected urls
@@ -384,7 +459,9 @@ class GeneralSectionParser extends SectionParser {
                 break;
         }
     }
-    public function output() {
+
+    public function output()
+    {
         $this->process_vars();
         $output = static::table_head('General');
         $properties = [
@@ -392,25 +469,35 @@ class GeneralSectionParser extends SectionParser {
             'Runtime' => 'duration',
             'Size' => 'filesize'
         ];
-        foreach($properties as $property => $value) {
-            $output .= static::table_row($property,$this->$value);
+
+        foreach ($properties as $property => $value) {
+            $output .= static::table_row($property, $this->$value);
         }
+
         $output .= static::table_tail();
         return  $output;
     }
-    public function output_raw() {
+
+    public function output_raw()
+    {
         $this->process_vars();
         $output = [];
         $properties = [
             'filename', 'generalformat', 'duration', 'filesize', 'form_codec',
             'form_releasegroup'
         ];
-        foreach($properties as $property) {
-            if ($this->$property) $output[$property] = $this->$property;
+
+        foreach ($properties as $property) {
+            if ($this->$property) {
+                $output[$property] = $this->$property;
+            }
         }
+
         return $output;
     }
-    protected function process_vars() {
+
+    protected function process_vars()
+    {
         switch (strtolower($this->generalformat)) {
             case 'mpeg-ts':
                 $this->form_codec = 'MPEG-TS';
@@ -420,14 +507,19 @@ class GeneralSectionParser extends SectionParser {
                 $this->form_codec = '---';
                 break;
         }
+
         $matches = [];
-        preg_match('/(?:^|.*\\|\/)\[(.*?)\].*$/',
-            $this->filename, $matches);
+        preg_match(
+            '/(?:^|.*\\|\/)\[(.*?)\].*$/',
+            $this->filename,
+            $matches
+        );
         $this->form_releasegroup = $matches ? $matches[1] : '';
     }
 }
 
-class TextSectionParser extends SectionParser {
+class TextSectionParser extends SectionParser
+{
     protected $title;
     protected $language;
     protected $format;
@@ -435,7 +527,8 @@ class TextSectionParser extends SectionParser {
     protected $processed_language;
     protected $form_format;
 
-    protected function handle_cases($property,$value) {
+    protected function handle_cases($property, $value)
+    {
         switch ($property) {
             case 'title':
                 $this->title = $value;
@@ -451,34 +544,47 @@ class TextSectionParser extends SectionParser {
                 break;
         }
     }
-    public function output() {
+
+    public function output()
+    {
         $this->process_vars();
         $language = $this->processed_language;
         $output = "$language ($this->format)";
-        if ($this->title) $output .= " ($this->title)";
-        if ($this->default) $output .= ' (default)';
+        if ($this->title) {
+            $output .= " ($this->title)";
+        }
+        if ($this->default) {
+            $output .= ' (default)';
+        }
         return $output;
     }
-    public function output_raw() {
+
+    public function output_raw()
+    {
         $this->process_vars();
         $output = [];
         $properties = [
             'title', 'language', 'format', 'default', 'processed_language',
             'form_format'
         ];
-        foreach($properties as $property) {
-            if ($this->$property) $output[$property] = $this->$property;
+        foreach ($properties as $property) {
+            if ($this->$property) {
+                $output[$property] = $this->$property;
+            }
         }
         return $output;
     }
-    protected function process_vars() {
+
+    protected function process_vars()
+    {
         $this->processed_language = ($this->language) ?
             $this->language : 'Unknown';
         $this->form_format = 'Softsubbed';
     }
 }
 
-class VideoSectionParser extends SectionParser {
+class VideoSectionParser extends SectionParser
+{
     protected $videoformat;
     protected $videoformatversion;
     protected $codec;
@@ -499,7 +605,8 @@ class VideoSectionParser extends SectionParser {
     protected $form_codec;
     protected $form_resolution;
 
-    protected function handle_cases($property,$value) {
+    protected function handle_cases($property, $value)
+    {
         switch ($property) {
             case "format":
                 $this->videoformat = $value;
@@ -546,7 +653,9 @@ class VideoSectionParser extends SectionParser {
                 break;
         }
     }
-    public function output() {
+
+    public function output()
+    {
         $this->process_vars();
         $output = static::table_head('Video');
         $properties = [
@@ -558,13 +667,17 @@ class VideoSectionParser extends SectionParser {
             'Bit rate' => 'bitrate',
             'BPP' => 'bpp'
         ];
-        foreach($properties as $property => $value) {
-            $output .= static::table_row($property,$this->$value);
+
+        foreach ($properties as $property => $value) {
+            $output .= static::table_row($property, $this->$value);
         }
+
         $output .= static::table_tail();
         return  $output;
     }
-    public function output_raw() {
+
+    public function output_raw()
+    {
         $this->process_vars();
         $output = [];
         $properties = [
@@ -574,12 +687,18 @@ class VideoSectionParser extends SectionParser {
             'processed_codec', 'processed_resolution', 'processed_framerate',
             'form_codec', 'form_resolution'
         ];
-        foreach($properties as $property) {
-            if ($this->$property) $output[$property] = $this->$property;
+
+        foreach ($properties as $property) {
+            if ($this->$property) {
+                $output[$property] = $this->$property;
+            }
         }
+
         return $output;
     }
-    protected function process_vars() {
+
+    protected function process_vars()
+    {
         $this->processed_codec = $this->compute_codec();
         $this->processed_resolution = ($this->width) ?
             $this->width . 'x' . $this->height : '';
@@ -589,7 +708,9 @@ class VideoSectionParser extends SectionParser {
         $this->form_codec = $this->compute_form_codec();
         $this->form_resolution = $this->compute_form_resolution();
     }
-    protected function compute_codec() {
+
+    protected function compute_codec()
+    {
         switch (strtolower($this->videoformat)) {
             case "mpeg video":
                 switch (strtolower($this->videoformatversion)) {
@@ -615,24 +736,28 @@ class VideoSectionParser extends SectionParser {
 
         $chk = strtolower($this->codec);
         $wl = strtolower($this->writinglibrary);
-        if (($chk === "v_mpeg4/iso/avc" || $chk === "avc1") && strpos($wl, "x264 core") === FALSE) {
+
+        if (($chk === "v_mpeg4/iso/avc" || $chk === "avc1") && strpos($wl, "x264 core") === false) {
             return "H264";
-        } else if (($chk === "v_mpeg4/iso/avc" || $chk === "avc1") && strpos($wl, "x264 core") > -1)  {
+        } elseif (($chk === "v_mpeg4/iso/avc" || $chk === "avc1") && strpos($wl, "x264 core") > -1) {
             return "x264";
-        } else if (strtolower($this->videoformat) === "avc" && strpos($wl, "x264 core") === FALSE) {
+        } elseif (strtolower($this->videoformat) === "avc" && strpos($wl, "x264 core") === false) {
             return "H264";
         }
 
-        if (($chk === 'v_mpegh/iso/hevc') || ($wl === 'hevc'))
+        if (($chk === 'v_mpegh/iso/hevc') || ($wl === 'hevc')) {
             return 'H265';
+        }
     }
-    protected function compute_form_codec() {
+
+    protected function compute_form_codec()
+    {
         // Not implemented: DVD5, DVD9, WMV, Real Video
         // MPEG-TS set as GeneralSectionParser::$form_codec if found
         // MPEG-PS sets GeneralSectionParser::$form_codec to blank form value
         //   so DVD5 or DVD9 is selected manually.
         $codec = $this->compute_codec();
-        switch(strtolower($codec)) {
+        switch (strtolower($codec)) {
             case 'x264':
             case 'h264':
                 return strtolower($this->bitdepth) == '10 bits' ?
@@ -649,25 +774,30 @@ class VideoSectionParser extends SectionParser {
             case 'mpeg-2':
                 return 'MPEG-2';
         }
-        switch(strtolower($this->codec)) {
+
+        switch (strtolower($this->codec)) {
             case 'wmv3':
                 return 'VC-1';
             case 'mp43':
                 return 'MPEG-4 v3';
         }
-        switch(strtolower($this->videoformat)) {
+
+        switch (strtolower($this->videoformat)) {
             case 'vc-1':
                 return 'VC-1';
             case 's-mpeg 4 v3':
                 return 'MPEG-4 v3';
         }
     }
-    protected function compute_form_resolution() {
+
+    protected function compute_form_resolution()
+    {
         global $Resolutions;
         $closest = null;
+        
         if (isset($this->height)) {
             $resolutions = $Resolutions;
-            foreach($resolutions as $resolution) {
+            foreach ($resolutions as $resolution) {
                 if (!isset($closest) || abs($this->height - $resolution) <
                         abs($this->height - $closest)) {
                     $closest = $resolution;

classes/reports.class.php

@@ -1,27 +1,30 @@
 <?php
-class Reports {
-  /**
-   * This function formats a string containing a torrent's remaster information
-   * to be used in Reports v2.
-   *
-   * @param boolean  $Remastered - whether the torrent contains remaster information
-   * @param string   $RemasterTitle - the title of the remaster information
-   * @param string   $RemasterYear - the year of the remaster information
-   */
-  public static function format_reports_remaster_info($Remastered, $RemasterTitle, $RemasterYear) {
-    if ($Remastered) {
-      $RemasterDisplayString = ' &lt;';
-      if ($RemasterTitle != '' && $RemasterYear != '') {
-        $RemasterDisplayString .= "$RemasterTitle - $RemasterYear";
-      } elseif ($RemasterTitle != '' && $RemasterYear == '') {
-        $RemasterDisplayString .= $RemasterTitle;
-      } elseif ($RemasterTitle == '' && $RemasterYear != '') {
-        $RemasterDisplayString .= $RemasterYear;
-      }
-      $RemasterDisplayString .= '&gt;';
-    } else {
-      $RemasterDisplayString = '';
+
+class Reports
+{
+    /**
+     * This function formats a string containing a torrent's remaster information
+     * to be used in Reports v2.
+     *
+     * @param boolean  $Remastered - whether the torrent contains remaster information
+     * @param string   $RemasterTitle - the title of the remaster information
+     * @param string   $RemasterYear - the year of the remaster information
+     */
+    public static function format_reports_remaster_info($Remastered, $RemasterTitle, $RemasterYear)
+    {
+        if ($Remastered) {
+            $RemasterDisplayString = ' &lt;';
+            if ($RemasterTitle !== '' && $RemasterYear !== '') {
+                $RemasterDisplayString .= "$RemasterTitle - $RemasterYear";
+            } elseif ($RemasterTitle !== '' && $RemasterYear === '') {
+                $RemasterDisplayString .= $RemasterTitle;
+            } elseif ($RemasterTitle === '' && $RemasterYear !== '') {
+                $RemasterDisplayString .= $RemasterYear;
+            }
+            $RemasterDisplayString .= '&gt;';
+        } else {
+            $RemasterDisplayString = '';
+        }
+        return $RemasterDisplayString;
     }
-    return $RemasterDisplayString;
-  }
 }

classes/top10view.class.php

@@ -1,84 +1,93 @@
-<?
+<?php
 
-class Top10View {
+class Top10View
+{
+    public static function render_linkbox($Selected)
+    {
+        ?>
 
-  public static function render_linkbox($Selected) {
-?>
-    <div class="linkbox">
-      <a href="top10.php?type=torrents" class="brackets"><?=self::get_selected_link("Torrents", $Selected == "torrents")?></a>
-      <a href="top10.php?type=users" class="brackets"><?=self::get_selected_link("Users", $Selected == "users")?></a>
-      <a href="top10.php?type=tags" class="brackets"><?=self::get_selected_link("Tags", $Selected == "tags")?></a>
-<?  if (FEATURE_DONATE) { ?>
-      <a href="top10.php?type=donors" class="brackets"><?=self::get_selected_link("Donors", $Selected == "donors")?></a>
-<?  } ?>
-    </div>
-<?
-  }
+<div class="linkbox">
+  <a href="top10.php?type=torrents" class="brackets"><?=self::get_selected_link("Torrents", $Selected === "torrents")?></a>
+  <a href="top10.php?type=users" class="brackets"><?=self::get_selected_link("Users", $Selected === "users")?></a>
+  <a href="top10.php?type=tags" class="brackets"><?=self::get_selected_link("Tags", $Selected === "tags")?></a>
+  <?php if (FEATURE_DONATE) { ?>
+  <a href="top10.php?type=donors" class="brackets"><?=self::get_selected_link("Donors", $Selected === "donors")?></a>
+  <?php } ?>
+</div>
 
-  private static function get_selected_link($String, $Selected) {
-    if ($Selected) {
-      return "<strong>$String</strong>";
-    } else {
-      return $String;
+<?php
     }
-  }
 
-  public static function render_artist_tile($Artist, $Category) {
-    if (self::is_valid_artist($Artist)) {
-      switch ($Category) {
-        case 'weekly':
-        case 'hyped':
-          self::render_tile("artist.php?artistname=", $Artist['name'], $Artist['image'][3]['#text']);
-          break;
-        default:
-          break;
-      }
+    private static function get_selected_link($String, $Selected)
+    {
+        if ($Selected) {
+            return "<strong>$String</strong>";
+        } else {
+            return $String;
+        }
     }
-  }
 
-  private static function render_tile($Url, $Name, $Image) {
-    if (!empty($Image)) {
-      $Name = display_str($Name);
-?>
-      <li>
-        <a href="<?=$Url?><?=$Name?>">
-          <img class="tooltip large_tile" alt="<?=$Name?>" title="<?=$Name?>" src="<?=ImageTools::process($Image)?>" />
-        </a>
-      </li>
-<?
+    public static function render_artist_tile($Artist, $Category)
+    {
+        if (self::is_valid_artist($Artist)) {
+            switch ($Category) {
+              case 'weekly':
+              case 'hyped':
+                self::render_tile("artist.php?artistname=", $Artist['name'], $Artist['image'][3]['#text']);
+                break;
+              default:
+                break;
+            }
+        }
     }
-  }
 
+    private static function render_tile($Url, $Name, $Image)
+    {
+        if (!empty($Image)) {
+            $Name = display_str($Name); ?>
 
-  public static function render_artist_list($Artist, $Category) {
-    if (self::is_valid_artist($Artist)) {
-      switch ($Category) {
-
-        case 'weekly':
-        case 'hyped':
-          self::render_list("artist.php?artistname=", $Artist['name'], $Artist['image'][3]['#text']);
-          break;
-        default:
-          break;
-      }
+<li>
+  <a
+    href="<?=$Url?><?=$Name?>">
+    <img class="tooltip large_tile" alt="<?=$Name?>"
+      title="<?=$Name?>"
+      src="<?=ImageTools::process($Image)?>" />
+  </a>
+</li>
+<?php
+        }
     }
-  }
 
-  private static function render_list($Url, $Name, $Image) {
-    if (!empty($Image)) {
-      $Image = ImageTools::process($Image);
-      $Title = "title=\"&lt;img class=&quot;large_tile&quot; src=&quot;$Image&quot; alt=&quot;&quot; /&gt;\"";
-      $Name = display_str($Name);
-?>
-      <li>
-        <a class="tooltip_image" data-title-plain="<?=$Name?>" <?=$Title?> href="<?=$Url?><?=$Name?>"><?=$Name?></a>
-      </li>
-<?
+    public static function render_artist_list($Artist, $Category)
+    {
+        if (self::is_valid_artist($Artist)) {
+            switch ($Category) {
+              case 'weekly':
+              case 'hyped':
+                self::render_list("artist.php?artistname=", $Artist['name'], $Artist['image'][3]['#text']);
+                break;
+              default:
+                break;
+            }
+        }
     }
-  }
 
-  private static function is_valid_artist($Artist) {
-    return $Artist['name'] != '[unknown]';
-  }
+    private static function render_list($Url, $Name, $Image)
+    {
+        if (!empty($Image)) {
+            $Image = ImageTools::process($Image);
+            $Title = "title=\"&lt;img class=&quot;large_tile&quot; src=&quot;$Image&quot; alt=&quot;&quot; /&gt;\"";
+            $Name = display_str($Name); ?>
+
+<li>
+  <a class="tooltip_image" data-title-plain="<?=$Name?>" <?=$Title?> href="<?=$Url?><?=$Name?>"><?=$Name?></a>
+</li>
+<?php
+        }
+    }
 
+    private static function is_valid_artist($Artist)
+    {
+        return $Artist['name'] !== '[unknown]';
+    }
 }

classes/util.php

@@ -52,6 +52,7 @@ function assert_numbers(&$Base, $Keys, $Error = 0)
     if (!is_array($Base) || !is_array($Keys)) {
         return;
     }
+
     foreach ($Keys as $Key) {
         if (!isset($Base[$Key]) || !is_number($Base[$Key])) {
             error($Error);
@@ -71,20 +72,22 @@ function is_bool_value($Value)
     if (is_bool($Value)) {
         return $Value;
     }
+
     if (is_string($Value)) {
         switch (strtolower($Value)) {
-      case 'true':
-      case 'yes':
-      case 'on':
-      case '1':
-        return true;
-      case 'false':
-      case 'no':
-      case 'off':
-      case '0':
-        return false;
-    }
+            case 'true':
+            case 'yes':
+            case 'on':
+            case '1':
+                return true;
+            case 'false':
+            case 'no':
+            case 'off':
+            case '0':
+                return false;
+        }
     }
+
     if (is_numeric($Value)) {
         if ($Value === 1) {
             return true;
@@ -92,6 +95,7 @@ function is_bool_value($Value)
             return false;
         }
     }
+
     return null;
 }
 
@@ -107,26 +111,27 @@ function display_str($Str)
     if ($Str === null || $Str === false || is_array($Str)) {
         return '';
     }
+
     if ($Str !== '' && !is_number($Str)) {
         $Str = Format::make_utf8($Str);
         $Str = mb_convert_encoding($Str, 'HTML-ENTITIES', 'UTF-8');
         $Str = preg_replace("/&(?![A-Za-z]{0,4}\w{2,3};|#[0-9]{2,6};)/m", '&', $Str);
 
         $Replace = array(
-      "'",'"',"<",">",
-      '&#128;','&#130;','&#131;','&#132;','&#133;','&#134;','&#135;','&#136;',
-      '&#137;','&#138;','&#139;','&#140;','&#142;','&#145;','&#146;','&#147;',
-      '&#148;','&#149;','&#150;','&#151;','&#152;','&#153;','&#154;','&#155;',
-      '&#156;','&#158;','&#159;'
-    );
+            "'",'"',"<",">",
+            '&#128;','&#130;','&#131;','&#132;','&#133;','&#134;','&#135;','&#136;',
+            '&#137;','&#138;','&#139;','&#140;','&#142;','&#145;','&#146;','&#147;',
+            '&#148;','&#149;','&#150;','&#151;','&#152;','&#153;','&#154;','&#155;',
+            '&#156;','&#158;','&#159;'
+        );
 
         $With = array(
-      '&#39;','&quot;','&lt;','&gt;',
-      '&#8364;','&#8218;','&#402;','&#8222;','&#8230;','&#8224;','&#8225;','&#710;',
-      '&#8240;','&#352;','&#8249;','&#338;','&#381;','&#8216;','&#8217;','&#8220;',
-      '&#8221;','&#8226;','&#8211;','&#8212;','&#732;','&#8482;','&#353;','&#8250;',
-      '&#339;','&#382;','&#376;'
-    );
+            '&#39;','&quot;','&lt;','&gt;',
+            '&#8364;','&#8218;','&#402;','&#8222;','&#8230;','&#8224;','&#8225;','&#710;',
+            '&#8240;','&#352;','&#8249;','&#338;','&#381;','&#8216;','&#8217;','&#8220;',
+            '&#8221;','&#8226;','&#8211;','&#8212;','&#732;','&#8482;','&#353;','&#8250;',
+            '&#339;','&#382;','&#376;'
+        );
 
         $Str = str_replace($Replace, $With, $Str);
     }
@@ -147,6 +152,7 @@ function send_irc($Raw)
 
     $IRCSocket = fsockopen(SOCKET_LISTEN_ADDRESS, SOCKET_LISTEN_PORT);
     $Raw = str_replace(array("\n", "\r"), '', $Raw);
+
     fwrite($IRCSocket, $Raw);
     fclose($IRCSocket);
 }
@@ -163,7 +169,7 @@ function send_irc($Raw)
 function error($Error, $NoHTML = false, $Log = false)
 {
     global $Debug;
-    require(SERVER_ROOT.'/sections/error/index.php');
+    require SERVER_ROOT.'/sections/error/index.php';
     $Debug->profile();
     die();
 }

sections/ajax/forum/thread.php

@@ -18,12 +18,13 @@ if (!isset($_GET['threadid']) || !is_number($_GET['threadid'])) {
         $ThreadID = $_GET['topicid'];
     } elseif (isset($_GET['postid']) && is_number($_GET['postid'])) {
         $DB->query("
-      SELECT TopicID
-      FROM forums_posts
-      WHERE ID = $_GET[postid]");
+        SELECT TopicID
+        FROM forums_posts
+          WHERE ID = $_GET[postid]");
         list($ThreadID) = $DB->next_record();
+
         if ($ThreadID) {
-            //Redirect postid to threadid when necessary.
+            // Redirect postid to threadid when necessary
             header("Location: ajax.php?action=forum&type=viewthread&threadid=$ThreadID&postid=$_GET[postid]");
             die();
         } else {
@@ -67,10 +68,10 @@ if ($ThreadInfo['Posts'] > $PerPage) {
         $PostNum = $_GET['post'];
     } elseif (isset($_GET['postid']) && is_number($_GET['postid'])) {
         $DB->query("
-      SELECT COUNT(ID)
-      FROM forums_posts
-      WHERE TopicID = $ThreadID
-        AND ID <= $_GET[postid]");
+        SELECT COUNT(ID)
+        FROM forums_posts
+          WHERE TopicID = $ThreadID
+          AND ID <= $_GET[postid]");
         list($PostNum) = $DB->next_record();
     } else {
         $PostNum = 1;
@@ -115,19 +116,20 @@ if ($_GET['updatelastread'] !== '0') {
     // Handle last read
     if (!$ThreadInfo['IsLocked'] || $ThreadInfo['IsSticky']) {
         $DB->query("
-      SELECT PostID
-      FROM forums_last_read_topics
-      WHERE UserID = '$LoggedUser[ID]'
-        AND TopicID = '$ThreadID'");
+        SELECT PostID
+        FROM forums_last_read_topics
+          WHERE UserID = '$LoggedUser[ID]'
+          AND TopicID = '$ThreadID'");
         list($LastRead) = $DB->next_record();
+
         if ($LastRead < $LastPost) {
             $DB->query("
-        INSERT INTO forums_last_read_topics
-          (UserID, TopicID, PostID)
-        VALUES
-          ('$LoggedUser[ID]', '$ThreadID', '".db_string($LastPost)."')
-        ON DUPLICATE KEY UPDATE
-          PostID = '$LastPost'");
+            INSERT INTO forums_last_read_topics
+              (UserID, TopicID, PostID)
+            VALUES
+              ('$LoggedUser[ID]', '$ThreadID', '".db_string($LastPost)."')
+            ON DUPLICATE KEY UPDATE
+              PostID = '$LastPost'");
         }
     }
 }
@@ -144,19 +146,19 @@ if (in_array($ThreadID, $UserSubscriptions)) {
 }
 
 $JsonPoll = [];
-if ($ThreadInfo['NoPoll'] == 0) {
+if ($ThreadInfo['NoPoll'] === 0) {
     if (!list($Question, $Answers, $Votes, $Featured, $Closed) = $Cache->get_value("polls_$ThreadID")) {
         $DB->query("
-      SELECT Question, Answers, Featured, Closed
-      FROM forums_polls
-      WHERE TopicID = '$ThreadID'");
+        SELECT Question, Answers, Featured, Closed
+        FROM forums_polls
+          WHERE TopicID = '$ThreadID'");
         list($Question, $Answers, $Featured, $Closed) = $DB->next_record(MYSQLI_NUM, array(1));
         $Answers = unserialize($Answers);
         $DB->query("
-      SELECT Vote, COUNT(UserID)
-      FROM forums_polls_votes
-      WHERE TopicID = '$ThreadID'
-      GROUP BY Vote");
+        SELECT Vote, COUNT(UserID)
+        FROM forums_polls_votes
+          WHERE TopicID = '$ThreadID'
+        GROUP BY Vote");
         $VoteArray = $DB->to_array(false, MYSQLI_NUM);
 
         $Votes = [];
@@ -186,18 +188,18 @@ if ($ThreadInfo['NoPoll'] == 0) {
     $DB->query("
     SELECT Vote
     FROM forums_polls_votes
-    WHERE UserID = '".$LoggedUser['ID']."'
+      WHERE UserID = '".$LoggedUser['ID']."'
       AND TopicID = '$ThreadID'");
     list($UserResponse) = $DB->next_record();
-    if (!empty($UserResponse) && $UserResponse != 0) {
-        $Answers[$UserResponse] = '&raquo; '.$Answers[$UserResponse];
+    if (!empty($UserResponse) && $UserResponse !== 0) {
+        $Answers[$UserResponse] = '› '.$Answers[$UserResponse];
     } else {
         if (!empty($UserResponse) && $RevealVoters) {
-            $Answers[$UserResponse] = '&raquo; '.$Answers[$UserResponse];
+            $Answers[$UserResponse] = '› '.$Answers[$UserResponse];
         }
     }
 
-    $JsonPoll['closed'] = ($Closed == 1);
+    $JsonPoll['closed'] = ($Closed === 1);
     $JsonPoll['featured'] = $Featured;
     $JsonPoll['question'] = $Question;
     $JsonPoll['maxVotes'] = (int)$MaxVotes;
@@ -213,9 +215,9 @@ if ($ThreadInfo['NoPoll'] == 0) {
             $Percent = 0;
         }
         $JsonPollAnswers[] = array(
-      'answer' => $Answer,
-      'ratio' => $Ratio,
-      'percent' => $Percent
+            'answer' => $Answer,
+            'ratio' => $Ratio,
+            'percent' => $Percent
     );
     }
 
@@ -230,10 +232,10 @@ if ($ThreadInfo['NoPoll'] == 0) {
 
 // Sqeeze in stickypost
 if ($ThreadInfo['StickyPostID']) {
-    if ($ThreadInfo['StickyPostID'] != $Thread[0]['ID']) {
+    if ($ThreadInfo['StickyPostID'] !== $Thread[0]['ID']) {
         array_unshift($Thread, $ThreadInfo['StickyPost']);
     }
-    if ($ThreadInfo['StickyPostID'] != $Thread[count($Thread) - 1]['ID']) {
+    if ($ThreadInfo['StickyPostID'] !== $Thread[count($Thread) - 1]['ID']) {
         $Thread[] = $ThreadInfo['StickyPost'];
     }
 }
@@ -274,8 +276,8 @@ print json_encode([
     'threadId' => (int)$ThreadID,
     'threadTitle' => display_str($ThreadInfo['Title']),
     'subscribed' => in_array($ThreadID, $UserSubscriptions),
-    'locked' => $ThreadInfo['IsLocked'] == 1,
-    'sticky' => $ThreadInfo['IsSticky'] == 1,
+    'locked' => $ThreadInfo['IsLocked'] === 1,
+    'sticky' => $ThreadInfo['IsSticky'] === 1,
     'currentPage' => (int)$Page,
     'pages' => ceil($ThreadInfo['Posts'] / $PerPage),
     'poll' => empty($JsonPoll) ? null : $JsonPoll,

sections/artist/artist.php

@@ -167,7 +167,7 @@ foreach ($TorrentList as $GroupID => $Group) {
 }
 
 $OpenTable = false;
-$ShowGroups = !isset($LoggedUser['TorrentGrouping']) || $LoggedUser['TorrentGrouping'] == 0;
+$ShowGroups = !isset($LoggedUser['TorrentGrouping']) || $LoggedUser['TorrentGrouping'] === 0;
 $HideTorrents = ($ShowGroups ? '' : ' hidden');
 $OldGroupID = 0;
 ?>
@@ -242,7 +242,7 @@ foreach ($TorrentList as $Group) {
         $SnatchedGroupClass = ($GroupFlags['IsSnatched'] ? ' snatched_group' : ''); ?>
     <tr class="group<?=$SnatchedGroupClass?>">
       <?php
-    $ShowGroups = !(!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGrouping'] == 1); ?>
+    $ShowGroups = !(!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGrouping'] === 1); ?>
       <td class="center">
         <div id="showimg_<?=$GroupID?>"
           class="<?=($ShowGroups ? 'hide' : 'show')?>_torrents">
@@ -315,7 +315,7 @@ foreach ($TorrentList as $Group) {
       <td class="number_column"><?=number_format($Torrent['Snatched'])?>
       </td>
       <td
-        class="number_column<?=(($Torrent['Seeders'] == 0) ? ' r00' : '')?>">
+        class="number_column<?=(($Torrent['Seeders'] === 0) ? ' r00' : '')?>">
         <?=number_format($Torrent['Seeders'])?>
       </td>
       <td class="number_column"><?=number_format($Torrent['Leechers'])?>
@@ -443,7 +443,7 @@ foreach ($TorrentList as $Group) {
       <td class="number_column"><?=number_format($Torrent['Snatched'])?>
       </td>
       <td
-        class="number_column<?=(($Torrent['Seeders'] == 0) ? ' r00' : '')?>">
+        class="number_column<?=(($Torrent['Seeders'] === 0) ? ' r00' : '')?>">
         <?=number_format($Torrent['Seeders'])?>
       </td>
       <td class="number_column"><?=number_format($Torrent['Leechers'])?>
@@ -560,7 +560,7 @@ if (check_perms('site_torrents_notify')) {
               value="<?=$Name?>" />
             <input type="hidden" name="action" value="advanced" />
             <input type="text" autocomplete="off" id="filelist" name="filelist" size="20" />
-            <input type="submit" value="&gt;" />
+            <input type="submit" value="»" />
           </form>
         </li>
       </ul>

sections/bookmarks/torrents.php

@@ -1,28 +1,31 @@
 <?php
+
+# todo: Go through line by line
 ini_set('max_execution_time', 600);
 set_time_limit(0);
 
 //~~~~~~~~~~~ Main bookmarks page ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~//
 
-function compare($X, $Y) {
-  return($Y['count'] - $X['count']);
+function compare($X, $Y)
+{
+    return($Y['count'] - $X['count']);
 }
 
 if (!empty($_GET['userid'])) {
-  if (!check_perms('users_override_paranoia')) {
-    error(403);
-  }
-  $UserID = $_GET['userid'];
-  if (!is_number($UserID)) {
-    error(404);
-  }
-  $DB->query("
+    if (!check_perms('users_override_paranoia')) {
+        error(403);
+    }
+    $UserID = $_GET['userid'];
+    if (!is_number($UserID)) {
+        error(404);
+    }
+    $DB->query("
     SELECT Username
     FROM users_main
     WHERE ID = '$UserID'");
-  list($Username) = $DB->next_record();
+    list($Username) = $DB->next_record();
 } else {
-  $UserID = $LoggedUser['ID'];
+    $UserID = $LoggedUser['ID'];
 }
 
 $Sneaky = $UserID !== $LoggedUser['ID'];
@@ -38,310 +41,394 @@ $ArtistCount = [];
 
 list($GroupIDs, $CollageDataList, $TorrentList) = Users::get_bookmarks($UserID);
 foreach ($GroupIDs as $GroupID) {
-  if (!isset($TorrentList[$GroupID])) {
-    continue;
-  }
-  $Group = $TorrentList[$GroupID];
-  extract(Torrents::array_group($Group));
-  list(, $Sort, $AddedTime) = array_values($CollageDataList[$GroupID]);
-
-  // Handle stats and stuff
-  $NumGroups++;
-
-  if ($Artists) {
-    foreach ($Artists as $Artist) {
-      if (!isset($ArtistCount[$Artist['id']])) {
-        $ArtistCount[$Artist['id']] = array('name' => $Artist['name'], 'count' => 1);
-      } else {
-        $ArtistCount[$Artist['id']]['count']++;
-      }
+    if (!isset($TorrentList[$GroupID])) {
+        continue;
     }
-  }
+    $Group = $TorrentList[$GroupID];
+    extract(Torrents::array_group($Group));
+    list(, $Sort, $AddedTime) = array_values($CollageDataList[$GroupID]);
 
-  $TorrentTags = new Tags($TagList);
+    // Handle stats and stuff
+    $NumGroups++;
 
-  $DisplayName = Artists::display_artists($Artists);
-
-  $GroupName = empty($GroupName) ? (empty($GroupNameRJ) ? $GroupNameJP : $GroupNameRJ) : $GroupName;
-
-  $DisplayName .= '<a href="torrents.php?id='.$GroupID.'" ';
-  if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
-    $DisplayName .= 'data-cover="'.ImageTools::process($WikiImage, 'thumb').'" ';
-  }
-  $DisplayName .= ' class="tooltip" title="View torrent group" dir="ltr">'.$GroupName.'</a>';
-  if ($GroupYear > 0) {
-    $DisplayName = "$DisplayName [$GroupYear]";
-  }
-  $SnatchedGroupClass = $GroupFlags['IsSnatched'] ? ' snatched_group' : '';
-
-  // Start an output buffer, so we can store this output in $TorrentTable
-  ob_start();
-  if (count($Torrents) > 1) {
-      // Grouped torrents
-      $ShowGroups = !(!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGrouping'] === 1);
-?>
-      <tr class="group" id="group_<?=$GroupID?>">
-        <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="Collapse this group. Hold &quot;Ctrl&quot; while clicking to collape all groups on this page."></a>
-          </div>
-        </td>
-        <td class="center">
-          <div title="<?=$TorrentTags->title()?>" class="tooltip <?=Format::css_category($GroupCategoryID)?>"></div>
-        </td>
-        <td colspan="5">
-          <?=$DisplayName?>
-          <span style="text-align: right;" class="float_right">
-            <?=time_diff($AddedTime);?>
-<?    if (!$Sneaky) { ?>
-            <br />
-            <a href="#group_<?=$GroupID?>" class="brackets remove_bookmark" onclick="Unbookmark('torrent', <?=$GroupID?>, ''); return false;">Remove bookmark</a>
-<?    } ?>
-          </span>
-          <div class="tags"><?=$TorrentTags->format()?></div>
-        </td>
-      </tr>
-<?
-    foreach ($Torrents as $TorrentID => $Torrent) {
-      $SnatchedTorrentClass = $Torrent['IsSnatched'] ? ' snatched_torrent' : '';
-?>
-  <tr class="group_torrent torrent_row groupid_<?=$GroupID?> <?=$SnatchedTorrentClass . $SnatchedGroupClass . (!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGrouping'] === 1 ? ' hidden' : '')?>">
-    <td colspan="3">
-      <span>[ <a href="torrents.php?action=download&amp;id=<?=$TorrentID?>&amp;authkey=<?=$LoggedUser['AuthKey']?>&amp;torrent_pass=<?=$LoggedUser['torrent_pass']?>" class="tooltip" title="Download">DL</a>
-<?      if (Torrents::can_use_token($Torrent)) { ?>
-      | <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>
-<?      } ?>
-      | <a href="reportsv2.php?action=report&amp;id=<?=$TorrentID?>" class="tooltip" title="Report">RP</a> ]
-      </span>
-      &nbsp;&nbsp;&raquo;&nbsp; <a href="torrents.php?id=<?=$GroupID?>&amp;torrentid=<?=$TorrentID?>"><?=Torrents::torrent_info($Torrent)?></a>
-    </td>
-    <td class="number_column nobr"><?=Format::get_size($Torrent['Size'])?></td>
-    <td class="number_column"><?=number_format($Torrent['Snatched'])?></td>
-    <td class="number_column<?=(($Torrent['Seeders'] == 0) ? ' r00' : '')?>"><?=number_format($Torrent['Seeders'])?></td>
-    <td class="number_column"><?=number_format($Torrent['Leechers'])?></td>
-  </tr>
-<?
+    if ($Artists) {
+        foreach ($Artists as $Artist) {
+            if (!isset($ArtistCount[$Artist['id']])) {
+                $ArtistCount[$Artist['id']] = array('name' => $Artist['name'], 'count' => 1);
+            } else {
+                $ArtistCount[$Artist['id']]['count']++;
+            }
+        }
     }
-  } else {
-    // Viewing a type that does not require grouping
 
-    $TorrentID = key($Torrents);
-    $Torrent = current($Torrents);
+    $TorrentTags = new Tags($TagList);
+
+    $DisplayName = Artists::display_artists($Artists);
 
-    $DisplayName = Artists::display_artists(Artists::get_artist($GroupID));
+    $GroupName = empty($GroupName) ? (empty($GroupNameRJ) ? $GroupNameJP : $GroupNameRJ) : $GroupName;
 
     $DisplayName .= '<a href="torrents.php?id='.$GroupID.'" ';
     if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
-      $DisplayName .= 'data-cover="'.ImageTools::process($WikiImage, 'thumb').'" ';
+        $DisplayName .= 'data-cover="'.ImageTools::process($WikiImage, 'thumb').'" ';
     }
-    $DisplayName .=' class="tooltip" title="View torrent group" dir="ltr">'.$GroupName.'</a>';
+    $DisplayName .= ' class="tooltip" title="View torrent group" dir="ltr">'.$GroupName.'</a>';
+    if ($GroupYear > 0) {
+        $DisplayName = "$DisplayName [$GroupYear]";
+    }
+    $SnatchedGroupClass = $GroupFlags['IsSnatched'] ? ' snatched_group' : '';
+
+    // Start an output buffer, so we can store this output in $TorrentTable
+    ob_start();
+    if (count($Torrents) > 1) {
+        // Grouped torrents
+        $ShowGroups = !(!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGrouping'] === 1); ?>
 
-    if ($Torrent['IsSnatched']) {
-      $DisplayName .= ' ' . Format::torrent_label('Snatched!');
+<tr class="group" id="group_<?=$GroupID?>">
+  <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="Collapse this group. Hold &quot;Ctrl&quot; while clicking to collape all groups on this page."></a>
+    </div>
+  </td>
+  <td class="center">
+    <div title="<?=$TorrentTags->title()?>"
+      class="tooltip <?=Format::css_category($GroupCategoryID)?>">
+    </div>
+  </td>
+  <td colspan="5">
+    <?=$DisplayName?>
+    <span style="text-align: right;" class="float_right">
+      <?=time_diff($AddedTime); ?>
+      <?php if (!$Sneaky) { ?>
+      <br />
+      <a href="#group_<?=$GroupID?>" class="brackets remove_bookmark"
+        onclick="Unbookmark('torrent', <?=$GroupID?>, ''); return false;">Remove
+        bookmark</a>
+      <?php } ?>
+    </span>
+    <div class="tags"><?=$TorrentTags->format()?>
+    </div>
+  </td>
+</tr>
+<?php
+    foreach ($Torrents as $TorrentID => $Torrent) {
+        $SnatchedTorrentClass = $Torrent['IsSnatched'] ? ' snatched_torrent' : ''; ?>
+<tr
+  class="group_torrent torrent_row groupid_<?=$GroupID?> <?=$SnatchedTorrentClass . $SnatchedGroupClass . (!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGrouping'] === 1 ? ' hidden' : '')?>">
+  <td colspan="3">
+    <span>[ <a
+        href="torrents.php?action=download&amp;id=<?=$TorrentID?>&amp;authkey=<?=$LoggedUser['AuthKey']?>&amp;torrent_pass=<?=$LoggedUser['torrent_pass']?>"
+        class="tooltip" title="Download">DL</a>
+      <?php if (Torrents::can_use_token($Torrent)) { ?>
+      | <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>
+    &nbsp;&nbsp;&raquo;&nbsp; <a
+      href="torrents.php?id=<?=$GroupID?>&amp;torrentid=<?=$TorrentID?>"><?=Torrents::torrent_info($Torrent)?></a>
+  </td>
+  <td class="number_column nobr"><?=Format::get_size($Torrent['Size'])?>
+  </td>
+  <td class="number_column"><?=number_format($Torrent['Snatched'])?>
+  </td>
+  <td
+    class="number_column<?=(($Torrent['Seeders'] == 0) ? ' r00' : '')?>">
+    <?=number_format($Torrent['Seeders'])?>
+  </td>
+  <td class="number_column"><?=number_format($Torrent['Leechers'])?>
+  </td>
+</tr>
+<?php
     }
-    if ($Torrent['FreeTorrent'] === '1') {
-      $DisplayName .= ' ' . Format::torrent_label('Freeleech!');
-    } elseif ($Torrent['FreeTorrent'] === '2') {
-      $DisplayName .= ' ' . Format::torrent_label('Neutral leech!');
-    } elseif ($Torrent['PersonalFL']) {
-      $DisplayName .= ' ' . Format::torrent_label('Personal Freeleech!');
+    } else {
+        // Viewing a type that does not require grouping
+
+        $TorrentID = key($Torrents);
+        $Torrent = current($Torrents);
+
+        $DisplayName = Artists::display_artists(Artists::get_artist($GroupID));
+
+        $DisplayName .= '<a href="torrents.php?id='.$GroupID.'" ';
+        if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
+            $DisplayName .= 'data-cover="'.ImageTools::process($WikiImage, 'thumb').'" ';
+        }
+        $DisplayName .=' class="tooltip" title="View torrent group" dir="ltr">'.$GroupName.'</a>';
+
+        if ($Torrent['IsSnatched']) {
+            $DisplayName .= ' ' . Format::torrent_label('Snatched!');
+        }
+        if ($Torrent['FreeTorrent'] === '1') {
+            $DisplayName .= ' ' . Format::torrent_label('Freeleech!');
+        } elseif ($Torrent['FreeTorrent'] === '2') {
+            $DisplayName .= ' ' . Format::torrent_label('Neutral leech!');
+        } elseif ($Torrent['PersonalFL']) {
+            $DisplayName .= ' ' . Format::torrent_label('Personal Freeleech!');
+        }
+        $SnatchedTorrentClass = $Torrent['IsSnatched'] ? ' snatched_torrent' : ''; ?>
+<tr
+  class="torrent torrent_row<?=$SnatchedTorrentClass . $SnatchedGroupClass?>"
+  id="group_<?=$GroupID?>">
+  <td></td>
+  <td class="center">
+    <div title="<?=$TorrentTags->title()?>"
+      class="tooltip <?=Format::css_category($GroupCategoryID)?>">
+    </div>
+  </td>
+  <td>
+    <span>
+      [ <a
+        href="torrents.php?action=download&amp;id=<?=$TorrentID?>&amp;authkey=<?=$LoggedUser['AuthKey']?>&amp;torrent_pass=<?=$LoggedUser['torrent_pass']?>"
+        class="tooltip" title="Download">DL</a>
+      <?php if (Torrents::can_use_token($Torrent)) { ?>
+      | <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>
+    <span class="float_right float_clear"><?=time_diff($AddedTime); ?></span>
+    <?php if (!$Sneaky) { ?>
+    <span class="float_right float_clear"><a
+        href="#group_<?=$GroupID?>" class="brackets remove_bookmark"
+        onclick="Unbookmark('torrent', <?=$GroupID?>, ''); return false;">Remove
+        bookmark</a></span>
+    <?php } ?>
+    <?=$DisplayName?>
+    <div class="tags"><?=$TorrentTags->format()?>
+    </div>
+
+  </td>
+  <td class="number_column nobr"><?=Format::get_size($Torrent['Size'])?>
+  </td>
+  <td class="number_column"><?=number_format($Torrent['Snatched'])?>
+  </td>
+  <td
+    class="number_column<?=(($Torrent['Seeders'] == 0) ? ' r00' : '')?>">
+    <?=number_format($Torrent['Seeders'])?>
+  </td>
+  <td class="number_column"><?=number_format($Torrent['Leechers'])?>
+  </td>
+</tr>
+<?php
     }
-    $SnatchedTorrentClass = $Torrent['IsSnatched'] ? ' snatched_torrent' : '';
-?>
-  <tr class="torrent torrent_row<?=$SnatchedTorrentClass . $SnatchedGroupClass?>" id="group_<?=$GroupID?>">
-    <td></td>
-    <td class="center">
-      <div title="<?=$TorrentTags->title()?>" class="tooltip <?=Format::css_category($GroupCategoryID)?>">
-      </div>
-    </td>
-    <td>
-      <span>
-        [ <a href="torrents.php?action=download&amp;id=<?=$TorrentID?>&amp;authkey=<?=$LoggedUser['AuthKey']?>&amp;torrent_pass=<?=$LoggedUser['torrent_pass']?>" class="tooltip" title="Download">DL</a>
-<?    if (Torrents::can_use_token($Torrent)) { ?>
-        | <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>
-<?    } ?>
-        | <a href="reportsv2.php?action=report&amp;id=<?=$TorrentID?>" class="tooltip" title="Report">RP</a> ]
-      </span>
-      <span class="float_right float_clear"><?=time_diff($AddedTime);?></span>
-<?    if (!$Sneaky) { ?>
-      <span class="float_right float_clear"><a href="#group_<?=$GroupID?>" class="brackets remove_bookmark" onclick="Unbookmark('torrent', <?=$GroupID?>, ''); return false;">Remove bookmark</a></span>
-<?    } ?>
-      <?=$DisplayName?>
-      <div class="tags"><?=$TorrentTags->format()?></div>
-
-    </td>
-    <td class="number_column nobr"><?=Format::get_size($Torrent['Size'])?></td>
-    <td class="number_column"><?=number_format($Torrent['Snatched'])?></td>
-    <td class="number_column<?=(($Torrent['Seeders'] == 0) ? ' r00' : '')?>"><?=number_format($Torrent['Seeders'])?></td>
-    <td class="number_column"><?=number_format($Torrent['Leechers'])?></td>
-  </tr>
-<?
-  }
-  $TorrentTable .= ob_get_clean();
+    $TorrentTable .= ob_get_clean();
 
-  // Album art
+    // Album art
 
-  ob_start();
+    ob_start();
 
-  $DisplayName = '';
+    $DisplayName = '';
 
-  $DisplayName .= Artists::display_artists($Artists, false);
+    $DisplayName .= Artists::display_artists($Artists, false);
 
-  $DisplayName .= $GroupName;
-  if ($GroupYear > 0) {
-    $DisplayName = "$DisplayName [$GroupYear]";
-  }
-  $Tags = display_str($TorrentTags->format());
-  $PlainTags = implode(', ', $TorrentTags->get_tags());
-?>
+    $DisplayName .= $GroupName;
+    if ($GroupYear > 0) {
+        $DisplayName = "$DisplayName [$GroupYear]";
+    }
+    $Tags = display_str($TorrentTags->format());
+    $PlainTags = implode(', ', $TorrentTags->get_tags()); ?>
 <div class='collage_image image_group_<?=$GroupID?>'>
-      <a href="torrents.php?id=<?=$GroupID?>" class="bookmark_<?=$GroupID?>">
-<?  if (!$WikiImage) {
-      $WikiImage = STATIC_SERVER.'common/noartwork/music.png';
-} ?>
-        <img class="tooltip_interactive" src="<?=ImageTools::process($WikiImage, 'thumb')?>" alt="<?=$DisplayName?>" title="<?=$DisplayName?> <br /> <?=$Tags?>" data-title-plain="<?="$DisplayName ($PlainTags)"?>" width="100%" />
-      </a>
-    </div>
+  <a href="torrents.php?id=<?=$GroupID?>"
+    class="bookmark_<?=$GroupID?>">
+    <?php if (!$WikiImage) {
+        $WikiImage = STATIC_SERVER.'common/noartwork/music.png';
+    } ?>
+    <img class="tooltip_interactive"
+      src="<?=ImageTools::process($WikiImage, 'thumb')?>"
+      alt="<?=$DisplayName?>"
+      title="<?=$DisplayName?> <br /> <?=$Tags?>"
+      data-title-plain="<?="$DisplayName ($PlainTags)"?>"
+      width="100%" />
+  </a>
+</div>
 
-<?
+<?php
   $Collage[] = ob_get_clean();
-
 }
 
 $CollageCovers = isset($LoggedUser['CollageCovers']) ? (int)$LoggedUser['CollageCovers'] : 10;
 $CollagePages = [];
 if ($CollageCovers > 0) {
-  for ($i = 0; $i < $NumGroups / $CollageCovers; $i++) {
-    $Groups = array_slice($Collage, $i * $CollageCovers, $CollageCovers);
-    $CollagePage = '';
-    foreach ($Groups as $Group) {
-      $CollagePage .= $Group;
+    for ($i = 0; $i < $NumGroups / $CollageCovers; $i++) {
+        $Groups = array_slice($Collage, $i * $CollageCovers, $CollageCovers);
+        $CollagePage = '';
+        foreach ($Groups as $Group) {
+            $CollagePage .= $Group;
+        }
+        $CollagePages[] = $CollagePage;
     }
-    $CollagePages[] = $CollagePage;
-  }
 }
 
 View::show_header($Title, 'browse,collage,wall');
 ?>
 <div class="thin">
   <div class="header">
-    <h2><? if (!$Sneaky) { ?><a href="feeds.php?feed=torrents_bookmarks_t_<?=$LoggedUser['torrent_pass']?>&amp;user=<?=$LoggedUser['ID']?>&amp;auth=<?=$LoggedUser['RSS_Auth']?>&amp;passkey=<?=$LoggedUser['torrent_pass']?>&amp;authkey=<?=$LoggedUser['AuthKey']?>&amp;name=<?=urlencode(SITE_NAME.': Bookmarked Torrents')?>"><img src="<?=STATIC_SERVER?>/common/symbols/rss.png" alt="RSS feed" /></a>&nbsp;<? } ?><?=$Title?></h2>
+    <h2><?php if (!$Sneaky) { ?><a
+        href="feeds.php?feed=torrents_bookmarks_t_<?=$LoggedUser['torrent_pass']?>&amp;user=<?=$LoggedUser['ID']?>&amp;auth=<?=$LoggedUser['RSS_Auth']?>&amp;passkey=<?=$LoggedUser['torrent_pass']?>&amp;authkey=<?=$LoggedUser['AuthKey']?>&amp;name=<?=urlencode(SITE_NAME.': Bookmarked Torrents')?>"><img
+          src="<?=STATIC_SERVER?>/common/symbols/rss.png"
+          alt="RSS feed" /></a>&nbsp;<?php } ?><?=$Title?>
+    </h2>
     <div class="linkbox">
       <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>
-<? if (count($TorrentList) > 0) { ?>
+      <?php if (count($TorrentList) > 0) { ?>
       <br /><br />
-      <a href="bookmarks.php?action=remove_snatched&amp;auth=<?=$LoggedUser['AuthKey']?>" class="brackets" onclick="return confirm('Are you sure you want to remove the bookmarks for all items you\'ve snatched?');">Remove snatched</a>
+      <a href="bookmarks.php?action=remove_snatched&amp;auth=<?=$LoggedUser['AuthKey']?>"
+        class="brackets"
+        onclick="return confirm('Are you sure you want to remove the bookmarks for all items you\'ve snatched?');">Remove
+        snatched</a>
       <a href="bookmarks.php?action=edit&amp;type=torrents" class="brackets">Manage torrents</a>
-<? } ?>
+      <?php } ?>
     </div>
   </div>
-<? if (count($TorrentList) === 0) { ?>
+  <?php if (count($TorrentList) === 0) { ?>
   <div class="box pad" align="center">
     <h2>You have not bookmarked any torrents.</h2>
   </div>
-</div><!--content-->
-<?
+</div>
+<!--content-->
+<?php
   View::show_footer();
   die();
 } ?>
-  <div class="sidebar">
-    <div class="box box_info box_statistics_bookmarked_torrents">
-      <div class="head"><strong>Stats</strong></div>
-      <ul class="stats nobullet">
-        <li>Torrent groups: <?=$NumGroups?></li>
-        <li>Artists: <?=count($ArtistCount)?></li>
-      </ul>
-    </div>
-    <div class="box box_tags">
-      <div class="head"><strong>Top Tags</strong></div>
-      <div class="pad">
-        <ol style="padding-left: 5px;">
-<? Tags::format_top(5) ?>
-        </ol>
-      </div>
+<div class="sidebar">
+  <div class="box box_info box_statistics_bookmarked_torrents">
+    <div class="head"><strong>Stats</strong></div>
+    <ul class="stats nobullet">
+      <li>Torrent groups: <?=$NumGroups?>
+      </li>
+      <li>Artists: <?=count($ArtistCount)?>
+      </li>
+    </ul>
+  </div>
+  <div class="box box_tags">
+    <div class="head"><strong>Top Tags</strong></div>
+    <div class="pad">
+      <ol style="padding-left: 5px;">
+        <?php Tags::format_top(5) ?>
+      </ol>
     </div>
-    <div class="box box_artists">
-      <div class="head"><strong>Top Artists</strong></div>
-      <div class="pad">
-<?
+  </div>
+  <div class="box box_artists">
+    <div class="head"><strong>Top Artists</strong></div>
+    <div class="pad">
+      <?php
   $Indent = "\t\t\t\t";
   if (count($ArtistCount) > 0) {
-    echo "$Indent<ol style=\"padding-left: 5px;\">\n";
-    uasort($ArtistCount, 'compare');
-    $i = 0;
-    foreach ($ArtistCount as $ID => $Artist) {
-      $i++;
-      if ($i > 10) {
-        break;
+      echo "$Indent<ol style=\"padding-left: 5px;\">\n";
+      uasort($ArtistCount, 'compare');
+      $i = 0;
+      foreach ($ArtistCount as $ID => $Artist) {
+          $i++;
+          if ($i > 10) {
+              break;
+          } ?>
+      <li><a href="artist.php?id=<?=$ID?>"><?=display_str($Artist['name'])?></a> (<?=$Artist['count']?>)</li>
+      <?php
       }
-?>
-          <li><a href="artist.php?id=<?=$ID?>"><?=display_str($Artist['name'])?></a> (<?=$Artist['count']?>)</li>
-<?
-    }
-    echo "$Indent</ol>\n";
+      echo "$Indent</ol>\n";
   } else {
-    echo "$Indent<ul class=\"nobullet\" style=\"padding-left: 5px;\">\n";
-    echo "$Indent\t<li>There are no artists to display.</li>\n";
-    echo "$Indent</ul>\n";
+      echo "$Indent<ul class=\"nobullet\" style=\"padding-left: 5px;\">\n";
+      echo "$Indent\t<li>There are no artists to display.</li>\n";
+      echo "$Indent</ul>\n";
   }
 ?>
-      </div>
     </div>
   </div>
-  <div class="main_column">
-<?
+</div>
+<div class="main_column">
+  <?php
 if ($CollageCovers !== 0) { ?>
-    <div id="coverart" class="box">
-      <div class="head" id="coverhead"><strong>Cover art</strong></div>
-      <div class="collage_images" id="collage_page0" data-wall-child=".collage_image" data-wall-size="4", data-wall-min="2">
-<?
+  <div id="coverart" class="box">
+    <div class="head" id="coverhead"><strong>Cover art</strong></div>
+    <div class="collage_images" id="collage_page0" data-wall-child=".collage_image" data-wall-size="4" ,
+      data-wall-min="2">
+      <?php
   $Page1 = array_slice($Collage, 0, $CollageCovers);
   foreach ($Page1 as $Group) {
-    echo $Group;
+      echo $Group;
   }
 ?>
-      </div>
-    </div>
-<?  if ($NumGroups > $CollageCovers) { ?>
-    <div class="linkbox pager" style="clear: left;" id="pageslinksdiv">
-      <span id="firstpage" class="invisible"><a href="#" class="pageslink" onclick="collageShow.page(0, this); return false;">&lt;&lt; First</a> | </span>
-      <span id="prevpage" class="invisible"><a href="#" id="prevpage" class="pageslink" onclick="collageShow.prevPage(); return false;">&lt; Prev</a> | </span>
-<?    for ($i = 0; $i < $NumGroups / $CollageCovers; $i++) { ?>
-      <span id="pagelink<?=$i?>" class="<?=(($i > 4) ? 'hidden' : '')?><?=(($i === 0) ? ' selected' : '')?>"><a href="#" class="pageslink" onclick="collageShow.page(<?=$i?>, this); wall('.collage_images', '.collage_image', 4); return false;"><?=($CollageCovers * $i + 1)?>-<?=min($NumGroups, $CollageCovers * ($i + 1))?></a><?=(($i !== ceil($NumGroups / $CollageCovers) - 1) ? ' | ' : '')?></span>
-<?    } ?>
-      <span id="nextbar" class="<?=(($NumGroups / $CollageCovers > 5) ? 'hidden' : '')?>"> | </span>
-      <span id="nextpage"><a href="#" class="pageslink" onclick="collageShow.nextPage(); wall('.collage_images', '.collage_image', 4); return false;">Next &gt;</a></span>
-      <span id="lastpage" class="<?=(ceil($NumGroups / $CollageCovers) === 2 ? 'invisible' : '')?>"> | <a href="#" id="lastpage" class="pageslink" onclick="collageShow.page(<?=(ceil($NumGroups / $CollageCovers) - 1)?>, this); return false;">Last &gt;&gt;</a></span>
     </div>
-    <script type="text/javascript">
-      $(()=>collageShow.init(<?=json_encode($CollagePages)?>));
-    </script>
-<?
+  </div>
+  <?php if ($NumGroups > $CollageCovers) { ?>
+  <div class="linkbox pager" style="clear: left;" id="pageslinksdiv">
+    <span id="firstpage" class="invisible">
+      <a href="#" class="pageslink" onclick="collageShow.page(0, this); return false;">‹ First</a> |
+    </span>
+    <span id="prevpage" class="invisible">
+      <a href="#" id="prevpage" class="pageslink" onclick="collageShow.prevPage(); return false;">&lsaquo; Prev</a> |
+    </span>
+    <?php for ($i = 0; $i < $NumGroups / $CollageCovers; $i++) { ?>
+    <span id="pagelink<?=$i?>"
+      class="<?=(($i > 4) ? 'hidden' : '')?><?=(($i === 0) ? ' selected' : '')?>">
+      <a href="#" class="pageslink"
+        onclick="collageShow.page(<?=$i?>, this); wall('.collage_images', '.collage_image', 4); return false;"><?=($CollageCovers * $i + 1)?>-<?=min($NumGroups, $CollageCovers * ($i + 1))?></a>
+      <?=(($i !== ceil($NumGroups / $CollageCovers) - 1) ? ' | ' : '')?>
+    </span>
+    <?php } ?>
+    <span id="nextbar"
+      class="<?=(($NumGroups / $CollageCovers > 5) ? 'hidden' : '')?>">
+      | </span>
+    <span id="nextpage">
+      <a href="#" class="pageslink"
+        onclick="collageShow.nextPage(); wall('.collage_images', '.collage_image', 4); return false;">Next ›</a>
+    </span>
+    <span id="lastpage"
+      class="<?=(ceil($NumGroups / $CollageCovers) === 2 ? 'invisible' : '')?>">
+      | <a href="#" id="lastpage" class="pageslink"
+        onclick="collageShow.page(<?=(ceil($NumGroups / $CollageCovers) - 1)?>, this); return false;">Last
+        »</a>
+    </span>
+  </div>
+
+  <script type="text/javascript">
+    $(() => collageShow.init( <?=json_encode($CollagePages)?> ));
+  </script>
+  <?php
   }
 }
 ?>
-    <table class="torrent_table grouping cats" id="torrent_table">
-      <tr class="colhead_dark">
-        <td><!-- expand/collapse --></td>
-        <td><!-- Category --></td>
-        <td width="70%"><strong>Torrents</strong></td>
-        <td>Size</td>
-        <td class="sign snatches">
-          <a><svg width="15" height="15" fill="black" class="tooltip" alt="Snatches" title="Snatches" viewBox="3 0 88 98"><path d="M20 20 A43 43,0,1,0,77 23 L90 10 L55 10 L55 45 L68 32 A30.27 30.27,0,1,1,28 29"></path></svg></a>
-        </td>
-        <td class="sign seeders">
-          <a><svg width="11" height="15" fill="black" class="tooltip" alt="Seeders" title="Seeders"><polygon points="0,7 5.5,0 11,7 8,7 8,15 3,15 3,7"></polygon></svg></a>
-        </td>
-        <td class="sign leechers">
-          <a><svg width="11" height="15" fill="black" 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></a>
-        </td>
-      </tr>
-<?=$TorrentTable?>
-    </table>
-  </div>
+
+  <table class="torrent_table grouping cats" id="torrent_table">
+    <tr class="colhead_dark">
+      <td>
+        <!-- Expand/Collapse -->
+      </td>
+      <td>
+        <!-- Category -->
+      </td>
+      <td width="70%"><strong>Torrents</strong></td>
+      <td>Size</td>
+      <td class="sign snatches">
+        <a><svg width="15" height="15" fill="black" class="tooltip" alt="Snatches" title="Snatches" viewBox="3 0 88 98">
+            <path d="M20 20 A43 43,0,1,0,77 23 L90 10 L55 10 L55 45 L68 32 A30.27 30.27,0,1,1,28 29"></path>
+          </svg></a>
+      </td>
+      <td class="sign seeders">
+        <a><svg width="11" height="15" fill="black" class="tooltip" alt="Seeders" title="Seeders">
+            <polygon points="0,7 5.5,0 11,7 8,7 8,15 3,15 3,7"></polygon>
+          </svg></a>
+      </td>
+      <td class="sign leechers">
+        <a><svg width="11" height="15" fill="black" 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></a>
+      </td>
+    </tr>
+    <?=$TorrentTable?>
+  </table>
+</div>
 </div>
-<?
-View::show_footer();
+
+<?php View::show_footer();

sections/collages/all_comments.php

@@ -1,4 +1,5 @@
-<?
+<?php
+
 /**********|| Page to show individual threads || ********************************\
 
 Things to expect in $_GET:
@@ -12,7 +13,7 @@ Things to expect in $_GET:
 
 // Check for lame SQL injection attempts
 if (!is_number($_GET['collageid'])) {
-  error(0);
+    error(0);
 }
 $CollageID = (int)$_GET['collageid'];
 
@@ -27,29 +28,33 @@ list($Name) = $DB->next_record();
 // Start printing
 View::show_header("Comments for collage $Name", 'comments,bbcode,subscriptions');
 ?>
+
 <div class="thin">
   <div class="header">
     <h2>
-      <a href="collages.php">Collages</a> &gt;
+      <a href="collages.php">Collages</a> ›
       <a href="collages.php?id=<?=$CollageID?>"><?=$Name?></a>
     </h2>
+
     <div class="linkbox">
-      <a href="#" id="subscribelink_collages<?=$CollageID?>" class="brackets" onclick="SubscribeComments('collages', <?=$CollageID?>); return false;"><?=Subscriptions::has_subscribed_comments('collages', $CollageID) !== false ? 'Unsubscribe' : 'Subscribe'?></a>
-<?
+      <a href="#" id="subscribelink_collages<?=$CollageID?>"
+        class="brackets"
+        onclick="SubscribeComments('collages', <?=$CollageID?>); return false;"><?=Subscriptions::has_subscribed_comments('collages', $CollageID) !== false ? 'Unsubscribe' : 'Subscribe'?></a>
+      <?php
 $Pages = Format::get_pages($Page, $NumComments, TORRENT_COMMENTS_PER_PAGE, 9);
 if ($Pages) {
-  echo '<br /><br />' . $Pages;
+    echo '<br /><br />' . $Pages;
 }
 ?>
     </div>
   </div>
-<?
 
+  <?php
 //---------- Begin printing
 CommentsView::render_comments($Thread, $LastRead, "collages.php?action=comments&amp;collageid=$CollageID");
 if (!$ThreadInfo['IsLocked'] || check_perms('site_moderate_forums')) {
-  if ($ThreadInfo['MinClassWrite'] <= $LoggedUser['Class'] && !$LoggedUser['DisablePosting']) {
-    View::parse('generic/reply/quickreply.php', array(
+    if ($ThreadInfo['MinClassWrite'] <= $LoggedUser['Class'] && !$LoggedUser['DisablePosting']) {
+        View::parse('generic/reply/quickreply.php', array(
       'InputName' => 'pageid',
       'InputID' => $CollageID,
       'Action' => 'comments.php?page=collages',
@@ -57,11 +62,13 @@ if (!$ThreadInfo['IsLocked'] || check_perms('site_moderate_forums')) {
       'TextareaCols' => 90,
       'SubscribeBox' => true
     ));
-  }
+    }
 }
 ?>
+
   <div class="linkbox">
     <?=$Pages?>
   </div>
 </div>
-<? View::show_footer(); ?>
+
+<?php View::show_footer();

sections/collages/artist_collage.php

@@ -1,4 +1,5 @@
-<?
+<?php
+
 // todo: Cache this
 $DB->query("
   SELECT
@@ -24,42 +25,44 @@ $NumGroupsByUser = 0;
 $UserAdditions = [];
 
 foreach ($Artists as $Artist) {
-  $UserID = $Artist['UserID'];
-  if ($UserID == $LoggedUser['ID']) {
-    $NumGroupsByUser++;
-  }
+    $UserID = $Artist['UserID'];
+    if ($UserID === $LoggedUser['ID']) {
+        $NumGroupsByUser++;
+    }
 
-  if (!isset($UserAdditions[$UserID])) {
-    $UserAdditions[$UserID] = 0;
-  }
-  $UserAdditions[$UserID]++;
+    if (!isset($UserAdditions[$UserID])) {
+        $UserAdditions[$UserID] = 0;
+    }
+    $UserAdditions[$UserID]++;
 
-  ob_start();
-?>
-      <tr>
-        <td><a href="artist.php?id=<?=$Artist['ArtistID']?>"><?=$Artist['Name']?></a></td>
-      </tr>
-<?
+    ob_start(); ?>
+<tr>
+  <td><a
+      href="artist.php?id=<?=$Artist['ArtistID']?>"><?=$Artist['Name']?></a></td>
+</tr>
+<?php
   $ArtistTable .= ob_get_clean();
 
-  ob_start();
-  ?>
-        <li class="image_group_<?=$Artist['ArtistID']?>">
-          <a href="artist.php?id=<?=$Artist['ArtistID']?>">
-<?  if ($Artist['Image']) { ?>
-            <img class="tooltip" src="<?=ImageTools::process($Artist['Image'], 'thumb')?>" alt="<?=$Artist['Name']?>" title="<?=$Artist['Name']?>" width="118" />
-<?  } else { ?>
-            <span style="width: 107px; padding: 5px;"><?=$Artist['Name']?></span>
-<?  } ?>
-          </a>
-        </li>
-<?
+    ob_start(); ?>
+<li class="image_group_<?=$Artist['ArtistID']?>">
+  <a
+    href="artist.php?id=<?=$Artist['ArtistID']?>">
+    <?php if ($Artist['Image']) { ?>
+    <img class="tooltip"
+      src="<?=ImageTools::process($Artist['Image'], 'thumb')?>"
+      alt="<?=$Artist['Name']?>"
+      title="<?=$Artist['Name']?>" width="118" />
+    <?php } else { ?>
+    <span style="width: 107px; padding: 5px;"><?=$Artist['Name']?></span>
+    <?php } ?>
+  </a>
+</li>
+<?php
   $Collage[] = ob_get_clean();
 }
 
-
 if (!check_perms('site_collages_delete') && ($Locked || ($MaxGroups > 0 && $NumGroups >= $MaxGroups) || ($MaxGroupsPerUser > 0 && $NumGroupsByUser >= $MaxGroupsPerUser))) {
-  $PreventAdditions = true;
+    $PreventAdditions = true;
 }
 
 // Silly hack for people who are on the old setting
@@ -68,108 +71,139 @@ $CollagePages = [];
 
 // Pad it out
 if ($NumGroups > $CollageCovers) {
-  for ($i = $NumGroups + 1; $i <= ceil($NumGroups / $CollageCovers) * $CollageCovers; $i++) {
-    $Collage[] = '<li></li>';
-  }
+    for ($i = $NumGroups + 1; $i <= ceil($NumGroups / $CollageCovers) * $CollageCovers; $i++) {
+        $Collage[] = '<li></li>';
+    }
 }
 
 for ($i = 0; $i < $NumGroups / $CollageCovers; $i++) {
-  $Groups = array_slice($Collage, $i * $CollageCovers, $CollageCovers);
-  $CollagePage = '';
-  foreach ($Groups as $Group) {
-    $CollagePage .= $Group;
-  }
-  $CollagePages[] = $CollagePage;
+    $Groups = array_slice($Collage, $i * $CollageCovers, $CollageCovers);
+    $CollagePage = '';
+    foreach ($Groups as $Group) {
+        $CollagePage .= $Group;
+    }
+    $CollagePages[] = $CollagePage;
 }
 
 View::show_header($Name, 'browse,collage,bbcode,recommend');
-
 ?>
+
 <div class="thin">
   <div class="header">
-    <h2><?=$Name?></h2>
+    <h2><?=$Name?>
+    </h2>
     <div class="linkbox">
       <a href="collages.php" class="brackets">List of collections</a>
-<?  if (check_perms('site_collages_create')) { ?>
+      <?php if (check_perms('site_collages_create')) { ?>
       <a href="collages.php?action=new" class="brackets">New collage</a>
-<?  } ?>
+      <?php } ?>
       <br /><br />
-<?  if (check_perms('site_collages_subscribe')) { ?>
-      <a href="#" id="subscribelink<?=$CollageID?>" class="brackets" onclick="CollageSubscribe(<?=$CollageID?>); return false;"><?=(in_array($CollageID, $CollageSubscriptions) ? 'Unsubscribe' : 'Subscribe')?></a>
-<?
+      <?php if (check_perms('site_collages_subscribe')) { ?>
+      <a href="#" id="subscribelink<?=$CollageID?>" class="brackets"
+        onclick="CollageSubscribe(<?=$CollageID?>); return false;"><?=(in_array($CollageID, $CollageSubscriptions) ? 'Unsubscribe' : 'Subscribe')?></a>
+      <?php
   }
   if (check_perms('site_collages_delete') || (check_perms('site_edit_wiki') && !$Locked)) {
-?>
-      <a href="collages.php?action=edit&amp;collageid=<?=$CollageID?>" class="brackets">Edit description</a>
-<?  } else { ?>
+      ?>
+      <a href="collages.php?action=edit&amp;collageid=<?=$CollageID?>"
+        class="brackets">Edit description</a>
+      <?php
+  } else { ?>
       <span class="brackets">Locked</span>
-<?
+      <?php
   }
   if (Bookmarks::has_bookmarked('collage', $CollageID)) {
-?>
-      <a href="#" id="bookmarklink_collage_<?=$CollageID?>" class="brackets" onclick="Unbookmark('collage', <?=$CollageID?>, 'Bookmark'); return false;">Remove bookmark</a>
-<?  } else { ?>
-      <a href="#" id="bookmarklink_collage_<?=$CollageID?>" class="brackets" onclick="Bookmark('collage', <?=$CollageID?>, 'Remove bookmark'); return false;">Bookmark</a>
-<?
+      ?>
+      <a href="#" id="bookmarklink_collage_<?=$CollageID?>"
+        class="brackets"
+        onclick="Unbookmark('collage', <?=$CollageID?>, 'Bookmark'); return false;">Remove
+        bookmark</a>
+      <?php
+  } else { ?>
+      <a href="#" id="bookmarklink_collage_<?=$CollageID?>"
+        class="brackets"
+        onclick="Bookmark('collage', <?=$CollageID?>, 'Remove bookmark'); return false;">Bookmark</a>
+      <?php
   }
   if (check_perms('site_collages_manage') && !$Locked) {
-?>
-      <a href="collages.php?action=manage_artists&amp;collageid=<?=$CollageID?>" class="brackets">Manage artists</a>
-<?  } ?>
-      <a href="reports.php?action=report&amp;type=collage&amp;id=<?=$CollageID?>" class="brackets">Report collage</a>
-<?  if (check_perms('site_collages_delete') || $CreatorID == $LoggedUser['ID']) { ?>
-      <a href="collages.php?action=delete&amp;collageid=<?=$CollageID?>&amp;auth=<?=$LoggedUser['AuthKey']?>" class="brackets" onclick="return confirm('Are you sure you want to delete this collage?');">Delete</a>
-<?  } ?>
+      ?>
+      <a href="collages.php?action=manage_artists&amp;collageid=<?=$CollageID?>"
+        class="brackets">Manage artists</a>
+      <?php
+  } ?>
+      <a href="reports.php?action=report&amp;type=collage&amp;id=<?=$CollageID?>"
+        class="brackets">Report collage</a>
+      <?php if (check_perms('site_collages_delete') || $CreatorID === $LoggedUser['ID']) { ?>
+      <a href="collages.php?action=delete&amp;collageid=<?=$CollageID?>&amp;auth=<?=$LoggedUser['AuthKey']?>"
+        class="brackets" onclick="return confirm('Are you sure you want to delete this collage?');">Delete</a>
+      <?php } ?>
     </div>
   </div>
+
   <div class="sidebar">
     <div class="box box_category">
       <div class="head"><strong>Category</strong></div>
-      <div class="pad"><a href="collages.php?action=search&amp;cats[<?=(int)$CollageCategoryID?>]=1"><?=$CollageCats[(int)$CollageCategoryID]?></a></div>
+      <div class="pad"><a
+          href="collages.php?action=search&amp;cats[<?=(int)$CollageCategoryID?>]=1"><?=$CollageCats[(int)$CollageCategoryID]?></a></div>
     </div>
+
     <div class="box box_description">
       <div class="head"><strong>Description</strong></div>
-      <div class="pad"><?=Text::full_format($Description)?></div>
+      <div class="pad"><?=Text::full_format($Description)?>
+      </div>
     </div>
+
     <div class="box box_info box_statistics_collage_torrents">
       <div class="head"><strong>Statistics</strong></div>
       <ul class="stats nobullet">
-        <li>Artists: <?=number_format($NumGroups)?></li>
-        <li>Subscribers: <?=number_format((int)$Subscribers)?></li>
-        <li>Built by <?=number_format(count($UserAdditions))?> user<?=(count($UserAdditions) > 1 ? 's' : '')?></li>
-        <li>Last updated: <?=time_diff($Updated)?></li>
+        <li>Artists: <?=number_format($NumGroups)?>
+        </li>
+        <li>Subscribers: <?=number_format((int)$Subscribers)?>
+        </li>
+        <li>Built by <?=number_format(count($UserAdditions))?>
+          user<?=(count($UserAdditions) > 1 ? 's' : '')?>
+        </li>
+        <li>Last updated: <?=time_diff($Updated)?>
+        </li>
       </ul>
     </div>
+
     <div class="box box_contributors">
       <div class="head"><strong>Top Contributors</strong></div>
       <div class="pad">
         <ol style="padding-left: 5px;">
-<?
+          <?php
 arsort($UserAdditions);
 $i = 0;
 foreach ($UserAdditions as $UserID => $Additions) {
-  $i++;
-  if ($i > 5) {
-    break;
-  }
-?>
-          <li><?=Users::format_username($UserID, false, false, false)?> (<?=number_format($Additions)?>)</li>
-<?
+    $i++;
+    if ($i > 5) {
+        break;
+    } ?>
+          <li><?=Users::format_username($UserID, false, false, false)?>
+            (<?=number_format($Additions)?>)</li>
+          <?php
 }
 ?>
         </ol>
       </div>
     </div>
-<? if (check_perms('site_collages_manage') && !isset($PreventAdditions)) { ?>
+
+    <?php if (check_perms('site_collages_manage') && !isset($PreventAdditions)) { ?>
     <div class="box box_addartist">
-      <div class="head"><strong>Add Artists</strong><span class="float_right"><a href="#" onclick="$('.add_artist_container').toggle_class('hidden'); this.innerHTML = (this.innerHTML == 'Batch add' ? 'Individual add' : 'Batch add'); return false;" class="brackets">Batch add</a></span></div>
+      <div class="head"><strong>Add Artists</strong><span class="float_right"><a href="#"
+            onclick="$('.add_artist_container').toggle_class('hidden'); this.innerHTML = (this.innerHTML === 'Batch add' ? 'Individual add' : 'Batch add'); return false;"
+            class="brackets">Batch add</a></span></div>
       <div class="pad add_artist_container">
         <form class="add_form" name="artist" action="collages.php" method="post">
           <input type="hidden" name="action" value="add_artist" />
-          <input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
-          <input type="hidden" name="collageid" value="<?=$CollageID?>" />
+          <input type="hidden" name="auth"
+            value="<?=$LoggedUser['AuthKey']?>" />
+          <input type="hidden" name="collageid"
+            value="<?=$CollageID?>" />
           <div class="field_div">
-            <input type="text" id="artist" size="20" name="url"<? Users::has_autocomplete_enabled('other'); ?> />
+            <input type="text" id="artist" size="20" name="url" <?php Users::has_autocomplete_enabled('other'); ?>
+            />
           </div>
           <div class="submit_div">
             <input type="submit" value="Add" />
@@ -177,11 +211,14 @@ foreach ($UserAdditions as $UserID => $Additions) {
           <span style="font-style: italic;">Enter the URL of an artist on the site.</span>
         </form>
       </div>
+
       <div class="pad hidden add_artist_container">
         <form class="add_form" name="artists" action="collages.php" method="post">
           <input type="hidden" name="action" value="add_artist_batch" />
-          <input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
-          <input type="hidden" name="collageid" value="<?=$CollageID?>" />
+          <input type="hidden" name="auth"
+            value="<?=$LoggedUser['AuthKey']?>" />
+          <input type="hidden" name="collageid"
+            value="<?=$CollageID?>" />
           <div class="field_div">
             <textarea name="urls" rows="5" cols="25" style="white-space: nowrap;"></textarea>
           </div>
@@ -192,11 +229,12 @@ foreach ($UserAdditions as $UserID => $Additions) {
         </form>
       </div>
     </div>
-<? } ?>
+    <?php } ?>
+
     <h3>Comments</h3>
-<?
+    <?php
 if ($CommentList === null) {
-  $DB->query("
+    $DB->query("
     SELECT
       c.ID,
       c.Body,
@@ -209,34 +247,42 @@ if ($CommentList === null) {
       AND c.PageID = $CollageID
     ORDER BY c.ID DESC
     LIMIT 15");
-  $CommentList = $DB->to_array(false, MYSQLI_NUM);
+    $CommentList = $DB->to_array(false, MYSQLI_NUM);
 }
+
 foreach ($CommentList as $Comment) {
-  list($CommentID, $Body, $UserID, $Username, $CommentTime) = $Comment;
-?>
+    list($CommentID, $Body, $UserID, $Username, $CommentTime) = $Comment; ?>
     <div class="box comment">
       <div class="head">
-        <?=Users::format_username($UserID, false, false, false) ?> <?=time_diff($CommentTime) ?>
+        <?=Users::format_username($UserID, false, false, false) ?>
+        <?=time_diff($CommentTime) ?>
         <br />
-        <a href="reports.php?action=report&amp;type=comment&amp;id=<?=$CommentID?>" class="brackets">Report</a>
+        <a href="reports.php?action=report&amp;type=comment&amp;id=<?=$CommentID?>"
+          class="brackets">Report</a>
+      </div>
+      <div class="pad"><?=Text::full_format($Body)?>
       </div>
-      <div class="pad"><?=Text::full_format($Body)?></div>
     </div>
-<?
+    <?php
 }
 ?>
+
     <div class="box pad">
-      <a href="collages.php?action=comments&amp;collageid=<?=$CollageID?>" class="brackets">View all comments</a>
+      <a href="collages.php?action=comments&amp;collageid=<?=$CollageID?>"
+        class="brackets">View all comments</a>
     </div>
-<?
+
+    <?php
 if (!$LoggedUser['DisablePosting']) {
-?>
+    ?>
     <div class="box box_addcomment">
       <div class="head"><strong>Comment</strong></div>
-      <form class="send_form" name="comment" id="quickpostform" onsubmit="quickpostform.submit_button.disabled = true;" action="comments.php" method="post">
+      <form class="send_form" name="comment" id="quickpostform" onsubmit="quickpostform.submit_button.disabled = true;"
+        action="comments.php" method="post">
         <input type="hidden" name="action" value="take_post" />
         <input type="hidden" name="page" value="collages" />
-        <input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
+        <input type="hidden" name="auth"
+          value="<?=$LoggedUser['AuthKey']?>" />
         <input type="hidden" name="pageid" value="<?=$CollageID?>" />
         <div class="pad">
           <div class="field_div">
@@ -248,53 +294,91 @@ if (!$LoggedUser['DisablePosting']) {
         </div>
       </form>
     </div>
-<?
+    <?php
 }
 ?>
   </div>
+
   <div class="main_column">
-<?
-if ($CollageCovers != 0) {
-?>
+    <?php
+if ($CollageCovers !== 0) {
+    ?>
     <div id="coverart" class="box">
       <div class="head" id="coverhead"><strong>Pictures</strong></div>
       <ul class="collage_images" id="collage_page0">
-<?
+        <?php
   $Page1 = array_slice($Collage, 0, $CollageCovers);
-  foreach ($Page1 as $Group) {
-    echo $Group;
-  }
-?>
+    foreach ($Page1 as $Group) {
+        echo $Group;
+    } ?>
       </ul>
     </div>
-<?  if ($NumGroups > $CollageCovers) { ?>
+    <?php if ($NumGroups > $CollageCovers) { ?>
     <div class="linkbox pager" style="clear: left;" id="pageslinksdiv">
-      <span id="firstpage" class="invisible"><a href="#" class="pageslink" onclick="collageShow.page(0, this); return false;"><strong>&lt;&lt; First</strong></a> | </span>
-      <span id="prevpage" class="invisible"><a href="#" class="pageslink" onclick="collageShow.prevPage(); return false;"><strong>&lt; Prev</strong></a> | </span>
-<?    for ($i = 0; $i < $NumGroups / $CollageCovers; $i++) { ?>
-      <span id="pagelink<?=$i?>" class="<?=($i > 4 ? 'hidden' : '')?><?=($i == 0 ? 'selected' : '')?>"><a href="#" class="pageslink" onclick="collageShow.page(<?=$i?>, this); return false;"><strong><?=$CollageCovers * $i + 1?>-<?=min($NumGroups, $CollageCovers * ($i + 1))?></strong></a><?=(($i != ceil($NumGroups / $CollageCovers) - 1) ? ' | ' : '')?></span>
-<?    } ?>
-      <span id="nextbar" class="<?=($NumGroups / $CollageCovers > 5) ? 'hidden' : ''?>"> | </span>
-      <span id="nextpage"><a href="#" class="pageslink" onclick="collageShow.nextPage(); return false;"><strong>Next &gt;</strong></a></span>
-      <span id="lastpage" class="<?=(ceil($NumGroups / $CollageCovers) == 2 ? 'invisible' : '')?>"> | <a href="#" class="pageslink" onclick="collageShow.page(<?=ceil($NumGroups / $CollageCovers) - 1?>, this); return false;"><strong>Last &gt;&gt;</strong></a></span>
+
+      <span id="firstpage" class="invisible">
+        <a href="#" class="pageslink" onclick="collageShow.page(0, this); return false;">
+          <strong>&raquo; First</strong>
+        </a> |
+      </span>
+
+      <span id="prevpage" class="invisible">
+        <a href="#" class="pageslink" onclick="collageShow.prevPage(); return false;">
+          <strong>‹ Prev</strong>
+        </a> |
+      </span>
+
+      <?php for ($i = 0; $i < $NumGroups / $CollageCovers; $i++) { ?>
+      <span id="pagelink<?=$i?>"
+        class="<?=($i > 4 ? 'hidden' : '')?><?=($i === 0 ? 'selected' : '')?>">
+        <a href="#" class="pageslink"
+          onclick="collageShow.page(<?=$i?>, this); return false;">
+          <strong><?=$CollageCovers * $i + 1?>-<?=min($NumGroups, $CollageCovers * ($i + 1))?></strong>
+        </a>
+        <?=(($i !== ceil($NumGroups / $CollageCovers) - 1) ? ' | ' : '')?>
+      </span>
+      <?php } ?>
+
+      <span id="nextbar"
+        class="<?=($NumGroups / $CollageCovers > 5) ? 'hidden' : ''?>">
+        | </span>
+
+      <span id="nextpage">
+        <a href="#" class="pageslink" onclick="collageShow.nextPage(); return false;">
+          <strong>Next ›</strong>
+        </a>
+      </span>
+
+      <span id="lastpage"
+        class="<?=(ceil($NumGroups / $CollageCovers) === 2 ? 'invisible' : '')?>">
+        |
+        <a href="#" class="pageslink"
+          onclick="collageShow.page(<?=ceil($NumGroups / $CollageCovers) - 1?>, this); return false;">
+          <strong>Last »</strong>
+        </a>
+      </span>
     </div>
-    <script type="text/javascript">//<![CDATA[
-      collageShow.init(<?=json_encode($CollagePages)?>);
-    //]]></script>
-<?
+
+    <script type="text/javascript">
+      //<![CDATA[
+      collageShow.init( <?=json_encode($CollagePages)?> );
+      //]]>
+    </script>
+    <?php
   }
 }
 ?>
+
     <div class="box">
       <table class="artist_table grouping cats" id="discog_table">
         <tr class="colhead_dark">
           <td><strong>Artists</strong></td>
         </tr>
-<?=$ArtistTable?>
+        <?=$ArtistTable?>
       </table>
     </div>
   </div>
 </div>
-<?
+
+<?php
 View::show_footer();
-?>

sections/collages/torrent_collage.php

@@ -1,6 +1,8 @@
-<?
-function compare($X, $Y) {
-  return($Y['count'] - $X['count']);
+<?php
+
+function compare($X, $Y)
+{
+    return($Y['count'] - $X['count']);
 }
 
 // Build the data for the collage and the torrent list
@@ -16,10 +18,11 @@ $DB->query("
 
 $GroupIDs = $DB->collect('GroupID');
 $Contributors = $DB->to_pair('GroupID', 'UserID', false);
+
 if (count($GroupIDs) > 0) {
-  $TorrentList = Torrents::get_groups($GroupIDs);
+    $TorrentList = Torrents::get_groups($GroupIDs);
 } else {
-  $TorrentList = [];
+    $TorrentList = [];
 }
 
 // Loop through the result set, building up $Collage and $TorrentTable
@@ -34,202 +37,275 @@ $UserAdditions = [];
 $Number = 0;
 
 foreach ($GroupIDs as $GroupID) {
-  if (!isset($TorrentList[$GroupID])) {
-    continue;
-  }
-  $Group = $TorrentList[$GroupID];
-  extract(Torrents::array_group($Group));
-  $UserID = $Contributors[$GroupID];
-  $TorrentTags = new Tags($TagList);
-
-  // Handle stats and stuff
-  $Number++;
-  if ($UserID == $LoggedUser['ID']) {
-    $NumGroupsByUser++;
-  }
+    if (!isset($TorrentList[$GroupID])) {
+        continue;
+    }
 
-  $CountArtists = $Artists;
+    $Group = $TorrentList[$GroupID];
+    extract(Torrents::array_group($Group));
+    $UserID = $Contributors[$GroupID];
+    $TorrentTags = new Tags($TagList);
 
-  if ($CountArtists) {
-    foreach ($CountArtists as $Artist) {
-      if (!isset($TopArtists[$Artist['id']])) {
-        $TopArtists[$Artist['id']] = array('name' => $Artist['name'], 'count' => 1);
-      } else {
-        $TopArtists[$Artist['id']]['count']++;
-      }
+    // Handle stats and stuff
+    $Number++;
+    if ($UserID == $LoggedUser['ID']) {
+        $NumGroupsByUser++;
     }
-  }
 
-  if (!isset($UserAdditions[$UserID])) {
-    $UserAdditions[$UserID] = 0;
-  }
-  $UserAdditions[$UserID]++;
+    $CountArtists = $Artists;
+    if ($CountArtists) {
+        foreach ($CountArtists as $Artist) {
+            if (!isset($TopArtists[$Artist['id']])) {
+                $TopArtists[$Artist['id']] = array('name' => $Artist['name'], 'count' => 1);
+            } else {
+                $TopArtists[$Artist['id']]['count']++;
+            }
+        }
+    }
 
-  $DisplayName = "$Number - ";
+    if (!isset($UserAdditions[$UserID])) {
+        $UserAdditions[$UserID] = 0;
+    }
+    $UserAdditions[$UserID]++;
 
-  $DisplayName .= Artists::display_artists($Artists);
+    $DisplayName = "$Number - ";
+    $DisplayName .= Artists::display_artists($Artists);
+    $DisplayName .= "<a href=\"torrents.php?id=$GroupID\" ";
 
-  $DisplayName .= "<a href=\"torrents.php?id=$GroupID\" ";
-  if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
-    $DisplayName .= 'data-cover="'.ImageTools::process($WikiImage, 'thumb').'" ';
-  }
-  $GroupName = empty($GroupName) ? (empty($GroupNameRJ) ? $GroupNameJP : $GroupNameRJ) : $GroupName;
-  $DisplayName .= "dir=\"ltr\">$GroupName</a>";
-  if ($GroupYear > 0) {
-    $DisplayName = "$DisplayName [$GroupYear]";
-  }
-  if ($GroupStudio) {
-    $DisplayName .= " [$GroupStudio]";
-  }
-  if ($GroupCatalogueNumber) {
-    $DisplayName .= " [$GroupCatalogueNumber]";
-  }
-  if ($GroupDLSiteID) {
-    $DisplayName .= " [$GroupDLSiteID]";
-  }
-  $SnatchedGroupClass = ($GroupFlags['IsSnatched'] ? ' snatched_group' : '');
-  // Start an output buffer, so we can store this output in $TorrentTable
-  ob_start();
+    if (!isset($LoggedUser['CoverArt']) || $LoggedUser['CoverArt']) {
+        $DisplayName .= 'data-cover="'.ImageTools::process($WikiImage, 'thumb').'" ';
+    }
 
-  if (count($Torrents) > 1) {
-    // Grouped torrents
-    $ShowGroups = !(!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGrouping'] == 1);
-?>
-      <tr class="group <?=$SnatchedGroupClass?>" id="group_<?=$GroupID?>">
-        <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="Collapse this group. Hold &quot;Ctrl&quot; while clicking to collapse all groups on this page."></a>
-          </div>
-        </td>
-        <td class="center">
-          <div title="<?=$TorrentTags->title()?>" class="tooltip <?=Format::css_category($GroupCategoryID)?> <?=$TorrentTags->css_name()?>"></div>
-        </td>
-        <td colspan="5">
-          <?=$DisplayName?>
-<?    if (Bookmarks::has_bookmarked('torrent', $GroupID)) { ?>
-          <span class="remove_bookmark float_right">
-            <a class="float_right" href="#" id="bookmarklink_torrent_<?=$GroupID?>" class="remove_bookmark brackets" onclick="Unbookmark('torrent', <?=$GroupID?>, 'Bookmark'); return false;">Remove bookmark</a>
-          </span>
-<?    } else { ?>
-          <span class="add_bookmark float_right">
-            <a class="float_right" href="#" id="bookmarklink_torrent_<?=$GroupID?>" class="add_bookmark brackets" onclick="Bookmark('torrent', <?=$GroupID?>, 'Remove bookmark'); return false;">Bookmark</a>
-          </span>
-<?
+    $GroupName = empty($GroupName) ? (empty($GroupNameRJ) ? $GroupNameJP : $GroupNameRJ) : $GroupName;
+    $DisplayName .= "dir=\"ltr\">$GroupName</a>";
+
+    if ($GroupYear > 0) {
+        $DisplayName = "$DisplayName<br />$GroupYear";
     }
-?>
-          <div class="tags"><?=$TorrentTags->format()?></div>
-        </td>
-      </tr>
-<?
-    foreach ($Torrents as $TorrentID => $Torrent) {
-      $SnatchedTorrentClass = $Torrent['IsSnatched'] ? ' snatched_torrent' : '';
-?>
-      <tr class="group_torrent torrent_row groupid_<?=$GroupID?> <?=$SnatchedTorrentClass . $SnatchedGroupClass . (!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGrouping'] == 1 ? ' hidden' : '')?>">
-        <td colspan="3">
-          <span class="brackets">
-            <a href="torrents.php?action=download&amp;id=<?=$TorrentID?>&amp;authkey=<?=$LoggedUser['AuthKey']?>&amp;torrent_pass=<?=$LoggedUser['torrent_pass']?>" class="tooltip" title="Download">DL</a>
-<?      if (Torrents::can_use_token($Torrent)) { ?>
-            | <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>
-<?      } ?>
-            | <a href="reportsv2.php?action=report&amp;id=<?=$TorrentID?>" class="tooltip" title="Report">RP</a>
-          </span>
-          &nbsp;&nbsp;&raquo;&nbsp; <a href="torrents.php?id=<?=$GroupID?>&amp;torrentid=<?=$TorrentID?>"><?=Torrents::torrent_info($Torrent)?></a>
-        </td>
-        <td class="number_column nobr"><?=Format::get_size($Torrent['Size'])?></td>
-        <td class="number_column"><?=number_format($Torrent['Snatched'])?></td>
-        <td class="number_column<?=(($Torrent['Seeders'] == 0) ? ' r00' : '')?>"><?=number_format($Torrent['Seeders'])?></td>
-        <td class="number_column"><?=number_format($Torrent['Leechers'])?></td>
-      </tr>
-<?
+
+    if ($GroupStudio) {
+        $DisplayName .= " / $GroupStudio";
     }
-  } else {
-    // Viewing a type that does not require grouping
 
-    $TorrentID = key($Torrents);
-    $Torrent = current($Torrents);
+    if ($GroupCatalogueNumber) {
+        $DisplayName .= " / $GroupCatalogueNumber";
+    }
+
+    /*
+    if ($GroupDLSiteID) {
+        $DisplayName .= " [$GroupDLSiteID]";
+    }
+    */
+
+    $SnatchedGroupClass = ($GroupFlags['IsSnatched'] ? ' snatched_group' : '');
+    // Start an output buffer, so we can store this output in $TorrentTable
+    ob_start();
+
+    if (count($Torrents) > 1) {
+        // Grouped torrents
+        $ShowGroups = !(!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGrouping'] == 1); ?>
+
+<tr class="group <?=$SnatchedGroupClass?>"
+  id="group_<?=$GroupID?>">
+  <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="Collapse this group. Hold &quot;Ctrl&quot; while clicking to collapse all groups on this page."></a>
+    </div>
+  </td>
+
+  <td class="center">
+    <div title="<?=$TorrentTags->title()?>"
+      class="tooltip <?=Format::css_category($GroupCategoryID)?> <?=$TorrentTags->css_name()?>">
+    </div>
+  </td>
+
+  <td colspan="5">
+    <?=$DisplayName?>
+    <?php if (Bookmarks::has_bookmarked('torrent', $GroupID)) { ?>
+    <span class="remove_bookmark float_right">
+      <a class="float_right" href="#"
+        id="bookmarklink_torrent_<?=$GroupID?>"
+        class="remove_bookmark brackets"
+        onclick="Unbookmark('torrent', <?=$GroupID?>, 'Bookmark'); return false;">Remove
+        bookmark</a>
+    </span>
+    <?php } else { ?>
+    <span class="add_bookmark float_right">
+      <a class="float_right" href="#"
+        id="bookmarklink_torrent_<?=$GroupID?>"
+        class="add_bookmark brackets"
+        onclick="Bookmark('torrent', <?=$GroupID?>, 'Remove bookmark'); return false;">Bookmark</a>
+    </span>
+    <?php
+    } ?>
+    <div class="tags"><?=$TorrentTags->format()?>
+    </div>
+  </td>
+</tr>
+
+<?php
+    foreach ($Torrents as $TorrentID => $Torrent) {
+        $SnatchedTorrentClass = $Torrent['IsSnatched'] ? ' snatched_torrent' : ''; ?>
+<tr
+  class="group_torrent torrent_row groupid_<?=$GroupID?> <?=$SnatchedTorrentClass . $SnatchedGroupClass . (!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGrouping'] == 1 ? ' hidden' : '')?>">
+
+  <td colspan="3">
+    <span class="brackets">
+      <a href="torrents.php?action=download&amp;id=<?=$TorrentID?>&amp;authkey=<?=$LoggedUser['AuthKey']?>&amp;torrent_pass=<?=$LoggedUser['torrent_pass']?>"
+        class="tooltip" title="Download">DL</a>
+      <?php if (Torrents::can_use_token($Torrent)) { ?>
+      | <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>
+    &nbsp;&nbsp;&raquo;&nbsp; <a
+      href="torrents.php?id=<?=$GroupID?>&amp;torrentid=<?=$TorrentID?>"><?=Torrents::torrent_info($Torrent)?></a>
+  </td>
+
+  <td class="number_column nobr"><?=Format::get_size($Torrent['Size'])?>
+  </td>
+
+  <td class="number_column"><?=number_format($Torrent['Snatched'])?>
+  </td>
+
+  <td
+    class="number_column<?=(($Torrent['Seeders'] == 0) ? ' r00' : '')?>">
+    <?=number_format($Torrent['Seeders'])?>
+  </td>
 
-    if ($Torrent['IsLeeching']) {
-      $DisplayName .= ' ' . Format::torrent_label('Leeching');
-    } else if ($Torrent['IsSeeding']) {
-      $DisplayName .= ' ' . Format::torrent_label('Seeding');
-    } else if ($Torrent['IsSnatched']) {
-      $DisplayName .= ' ' . Format::torrent_label('Snatched');
+  <td class="number_column"><?=number_format($Torrent['Leechers'])?>
+  </td>
+</tr>
+
+<?php
     }
-    if ($Torrent['FreeTorrent'] == '1') {
-      $DisplayName .= ' ' . Format::torrent_label('Freeleech!');
-    } elseif ($Torrent['FreeTorrent'] == '2') {
-      $DisplayName .= ' ' . Format::torrent_label('Neutral Leech!');
-    } elseif ($Torrent['PersonalFL']) {
-      $DisplayName .= ' ' . Format::torrent_label('Personal Freeleech!');
+    } else {
+        // Viewing a type that does not require grouping
+
+        $TorrentID = key($Torrents);
+        $Torrent = current($Torrents);
+
+        if ($Torrent['IsLeeching']) {
+            $DisplayName .= ' ' . Format::torrent_label('Leeching');
+        } elseif ($Torrent['IsSeeding']) {
+            $DisplayName .= ' ' . Format::torrent_label('Seeding');
+        } elseif ($Torrent['IsSnatched']) {
+            $DisplayName .= ' ' . Format::torrent_label('Snatched');
+        }
+
+        if ($Torrent['FreeTorrent'] == '1') {
+            $DisplayName .= ' ' . Format::torrent_label('Freeleech!');
+        } elseif ($Torrent['FreeTorrent'] == '2') {
+            $DisplayName .= ' ' . Format::torrent_label('Neutral Leech!');
+        } elseif ($Torrent['PersonalFL']) {
+            $DisplayName .= ' ' . Format::torrent_label('Personal Freeleech!');
+        }
+
+        $SnatchedTorrentClass = ($Torrent['IsSnatched'] ? ' snatched_torrent' : ''); ?>
+
+<tr
+  class="torrent torrent_row<?=$SnatchedTorrentClass . $SnatchedGroupClass?>"
+  id="group_<?=$GroupID?>">
+  <td></td>
+
+  <td class="center">
+    <div title="<?=$TorrentTags->title()?>"
+      class="tooltip <?=Format::css_category($GroupCategoryID)?> <?=$TorrentTags->css_name()?>">
+    </div>
+  </td>
+
+  <td>
+    <span class="brackets">
+      <a href="torrents.php?action=download&amp;id=<?=$TorrentID?>&amp;authkey=<?=$LoggedUser['AuthKey']?>&amp;torrent_pass=<?=$LoggedUser['torrent_pass']?>"
+        class="tooltip" title="Download">DL</a>
+      <?php    if (Torrents::can_use_token($Torrent)) { ?>
+      | <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>
+    <?=$DisplayName?>
+    <div class="tags"><?=$TorrentTags->format()?>
+    </div>
+  </td>
+
+  <td class="number_column nobr"><?=Format::get_size($Torrent['Size'])?>
+  </td>
+
+  <td class="number_column"><?=number_format($Torrent['Snatched'])?>
+  </td>
+
+  <td
+    class="number_column<?=(($Torrent['Seeders'] == 0) ? ' r00' : '')?>">
+    <?=number_format($Torrent['Seeders'])?>
+  </td>
+
+  <td class="number_column"><?=number_format($Torrent['Leechers'])?>
+  </td>
+</tr>
+
+<?php
     }
-    $SnatchedTorrentClass = ($Torrent['IsSnatched'] ? ' snatched_torrent' : '');
-?>
-      <tr class="torrent torrent_row<?=$SnatchedTorrentClass . $SnatchedGroupClass?>" id="group_<?=$GroupID?>">
-        <td></td>
-        <td class="center">
-          <div title="<?=$TorrentTags->title()?>" class="tooltip <?=Format::css_category($GroupCategoryID)?> <?=$TorrentTags->css_name()?>">
-          </div>
-        </td>
-        <td>
-          <span class="brackets">
-            <a href="torrents.php?action=download&amp;id=<?=$TorrentID?>&amp;authkey=<?=$LoggedUser['AuthKey']?>&amp;torrent_pass=<?=$LoggedUser['torrent_pass']?>" class="tooltip" title="Download">DL</a>
-<?    if (Torrents::can_use_token($Torrent)) { ?>
-            | <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>
-<?    } ?>
-            | <a href="reportsv2.php?action=report&amp;id=<?=$TorrentID?>" class="tooltip" title="Report">RP</a>
-          </span>
-          <?=$DisplayName?>
-          <div class="tags"><?=$TorrentTags->format()?></div>
-        </td>
-        <td class="number_column nobr"><?=Format::get_size($Torrent['Size'])?></td>
-        <td class="number_column"><?=number_format($Torrent['Snatched'])?></td>
-        <td class="number_column<?=(($Torrent['Seeders'] == 0) ? ' r00' : '')?>"><?=number_format($Torrent['Seeders'])?></td>
-        <td class="number_column"><?=number_format($Torrent['Leechers'])?></td>
-      </tr>
-<?
-  }
-  $TorrentTable .= ob_get_clean();
+    $TorrentTable .= ob_get_clean();
 
-  // Album art
+    // Album art
 
-  ob_start();
+    ob_start();
 
-  $DisplayName = '';
+    $DisplayName = '';
 
-  $DisplayName .= Artists::display_artists($Artists, false);
-  $DisplayName .= $GroupName;
-  if ($GroupYear > 0) {
-    $DisplayName = "$DisplayName [$GroupYear]";
-  }
-  $Tags = display_str($TorrentTags->format());
-  $PlainTags = implode(', ', $TorrentTags->get_tags());
-?>
-        <div class="collage_image image_group_<?=$GroupID?>">
-          <a href="torrents.php?id=<?=$GroupID?>">
-<?  if (!$WikiImage) {
-      $WikiImage = STATIC_SERVER.'common/noartwork/music.png';
+    $DisplayName .= Artists::display_artists($Artists, false);
+    $DisplayName .= $GroupName;
+
+    if ($GroupYear > 0) {
+        $DisplayName = "$DisplayName [$GroupYear]";
+    }
+
+    $Tags = display_str($TorrentTags->format());
+    $PlainTags = implode(', ', $TorrentTags->get_tags()); ?>
+
+<div class="collage_image image_group_<?=$GroupID?>">
+  <a href="torrents.php?id=<?=$GroupID?>">
+    <?php if (!$WikiImage) {
+        $WikiImage = STATIC_SERVER.'common/noartwork/music.png';
     } ?>
-            <img class="tooltip_interactive" src="<?=ImageTools::process($WikiImage, 'thumb')?>" alt="<?=$DisplayName?>" title="<?=$DisplayName?> <br /> <div class='tags'><?=$Tags?></div>" data-title-plain="<?="$DisplayName ($PlainTags)"?>" width="100%" />
-          </a>
-        </div>
-<?
+    <img class="tooltip_interactive"
+      src="<?=ImageTools::process($WikiImage, 'thumb')?>"
+      alt="<?=$DisplayName?>"
+      title="<?=$DisplayName?> <br /> <div class='tags'><?=$Tags?></div>"
+      data-title-plain="<?="$DisplayName ($PlainTags)"?>"
+      width="100%" />
+  </a>
+</div>
+
+<?php
   $Collage[] = ob_get_clean();
 }
 
 if ($CollageCategoryID === '0' && !check_perms('site_collages_delete')) {
-  if (!check_perms('site_collages_personal') || $CreatorID !== $LoggedUser['ID']) {
-    $PreventAdditions = true;
-  }
+    if (!check_perms('site_collages_personal') || $CreatorID !== $LoggedUser['ID']) {
+        $PreventAdditions = true;
+    }
 }
 
 if (!check_perms('site_collages_delete')
   && (
-    $Locked
+      $Locked
     || ($MaxGroups > 0 && $NumGroups >= $MaxGroups)
     || ($MaxGroupsPerUser > 0 && $NumGroupsByUser >= $MaxGroupsPerUser)
   )
 ) {
-  $PreventAdditions = true;
+    $PreventAdditions = true;
 }
 
 // Silly hack for people who are on the old setting
@@ -237,67 +313,84 @@ $CollageCovers = isset($LoggedUser['CollageCovers']) ? $LoggedUser['CollageCover
 $CollagePages = [];
 
 if ($CollageCovers) {
-  for ($i = 0; $i < $NumGroups / $CollageCovers; $i++) {
-    $Groups = array_slice($Collage, $i * $CollageCovers, $CollageCovers);
-    $CollagePage = '';
-    foreach ($Groups as $Group) {
-      $CollagePage .= $Group;
+    for ($i = 0; $i < $NumGroups / $CollageCovers; $i++) {
+        $Groups = array_slice($Collage, $i * $CollageCovers, $CollageCovers);
+        $CollagePage = '';
+        foreach ($Groups as $Group) {
+            $CollagePage .= $Group;
+        }
+        $CollagePages[] = $CollagePage;
     }
-    $CollagePages[] = $CollagePage;
-  }
 }
 
 View::show_header($Name, 'browse,collage,bbcode,recommend,wall');
 ?>
+
 <div class="thin">
   <div class="header">
-    <h2><?=$Name?></h2>
+    <h2><?=$Name?>
+    </h2>
     <div class="linkbox">
       <a href="collages.php" class="brackets">List of collections</a>
-<?  if (check_perms('site_collages_create')) { ?>
+      <?php  if (check_perms('site_collages_create')) { ?>
       <a href="collages.php?action=new" class="brackets">New collection</a>
-<?  } ?>
+      <?php  } ?>
       <br /><br />
-<?  if (check_perms('site_collages_subscribe')) { ?>
-      <a href="#" id="subscribelink<?=$CollageID?>" class="brackets" onclick="CollageSubscribe(<?=$CollageID?>); return false;"><?=(in_array($CollageID, $CollageSubscriptions) ? 'Unsubscribe' : 'Subscribe')?></a>
-<?
+      <?php  if (check_perms('site_collages_subscribe')) { ?>
+      <a href="#" id="subscribelink<?=$CollageID?>" class="brackets"
+        onclick="CollageSubscribe(<?=$CollageID?>); return false;"><?=(in_array($CollageID, $CollageSubscriptions) ? 'Unsubscribe' : 'Subscribe')?></a>
+      <?php
   }
   if (check_perms('site_collages_delete') || (check_perms('site_edit_wiki') && !$Locked)) {
-?>
-      <a href="collages.php?action=edit&amp;collageid=<?=$CollageID?>" class="brackets">Edit description</a>
-<?  } else { ?>
+      ?>
+      <a href="collages.php?action=edit&amp;collageid=<?=$CollageID?>"
+        class="brackets">Edit description</a>
+      <?php
+  } else { ?>
       <span class="brackets">Locked</span>
-<?
+      <?php
   }
   if (Bookmarks::has_bookmarked('collage', $CollageID)) {
-?>
-      <a href="#" id="bookmarklink_collage_<?=$CollageID?>" class="brackets" onclick="Unbookmark('collage', <?=$CollageID?>, 'Bookmark'); return false;">Remove bookmark</a>
-<?  } else { ?>
-      <a href="#" id="bookmarklink_collage_<?=$CollageID?>" class="brackets" onclick="Bookmark('collage', <?=$CollageID?>, 'Remove bookmark'); return false;">Bookmark</a>
-<?  } ?>
-<!-- <a href="#" id="recommend" class="brackets">Recommend</a> -->
-<?
+      ?>
+      <a href="#" id="bookmarklink_collage_<?=$CollageID?>"
+        class="brackets"
+        onclick="Unbookmark('collage', <?=$CollageID?>, 'Bookmark'); return false;">Remove
+        bookmark</a>
+      <?php
+  } else { ?>
+      <a href="#" id="bookmarklink_collage_<?=$CollageID?>"
+        class="brackets"
+        onclick="Bookmark('collage', <?=$CollageID?>, 'Remove bookmark'); return false;">Bookmark</a>
+      <?php  } ?>
+      <!-- <a href="#" id="recommend" class="brackets">Recommend</a> -->
+      <?php
   if (check_perms('site_collages_manage') && !$Locked) {
-?>
-      <a href="collages.php?action=manage&amp;collageid=<?=$CollageID?>" class="brackets">Manage torrents</a>
-<?  } ?>
-      <a href="reports.php?action=report&amp;type=collage&amp;id=<?=$CollageID?>" class="brackets">Report collection</a>
-<?  if (check_perms('site_collages_delete') || $CreatorID == $LoggedUser['ID']) { ?>
-      <a href="collages.php?action=delete&amp;collageid=<?=$CollageID?>&amp;auth=<?=$LoggedUser['AuthKey']?>" class="brackets" onclick="return confirm('Are you sure you want to delete this collage?');">Delete</a>
-<?  } ?>
+      ?>
+      <a href="collages.php?action=manage&amp;collageid=<?=$CollageID?>"
+        class="brackets">Manage torrents</a>
+      <?php
+  } ?>
+      <a href="reports.php?action=report&amp;type=collage&amp;id=<?=$CollageID?>"
+        class="brackets">Report collection</a>
+      <?php  if (check_perms('site_collages_delete') || $CreatorID == $LoggedUser['ID']) { ?>
+      <a href="collages.php?action=delete&amp;collageid=<?=$CollageID?>&amp;auth=<?=$LoggedUser['AuthKey']?>"
+        class="brackets" onclick="return confirm('Are you sure you want to delete this collage?');">Delete</a>
+      <?php  } ?>
     </div>
   </div>
-<? /* Misc::display_recommend($CollageID, "collage"); */ ?>
+  <?php /* Misc::display_recommend($CollageID, "collage"); */ ?>
   <div class="sidebar">
     <div class="box box_category">
       <div class="head"><strong>Category</strong></div>
-      <div class="pad"><a href="collages.php?action=search&amp;cats[<?=(int)$CollageCategoryID?>]=1"><?=$CollageCats[(int)$CollageCategoryID]?></a></div>
+      <div class="pad"><a
+          href="collages.php?action=search&amp;cats[<?=(int)$CollageCategoryID?>]=1"><?=$CollageCats[(int)$CollageCategoryID]?></a></div>
     </div>
     <div class="box box_description">
       <div class="head"><strong>Description</strong></div>
-      <div class="pad"><?=Text::full_format($Description)?></div>
+      <div class="pad"><?=Text::full_format($Description)?>
+      </div>
     </div>
-<?
+    <?php
 // I'm actually commenting this out
 /*
 if (check_perms('zip_downloader')) {
@@ -364,78 +457,91 @@ foreach ($ZIPOptions as $Option) {
 <? }
 */
 ?>
+
     <div class="box box_info box_statistics_collage_torrents">
       <div class="head"><strong>Statistics</strong></div>
       <ul class="stats nobullet">
-        <li>Torrents: <?=number_format($NumGroups)?></li>
-<? if (!empty($TopArtists)) { ?>
-        <li>Artists: <?=number_format(count($TopArtists))?></li>
-<? } ?>
-        <li>Subscribers: <?=number_format((int)$Subscribers)?></li>
-        <li>Built by <?=number_format(count($UserAdditions))?> user<?=(count($UserAdditions) > 1 ? 's' : '')?></li>
-        <li>Last updated: <?=time_diff($Updated)?></li>
+        <li>Torrents: <?=number_format($NumGroups)?>
+        </li>
+        <?php if (!empty($TopArtists)) { ?>
+        <li>Artists: <?=number_format(count($TopArtists))?>
+        </li>
+        <?php } ?>
+        <li>Subscribers: <?=number_format((int)$Subscribers)?>
+        </li>
+        <li>Built by <?=number_format(count($UserAdditions))?>
+          user<?=(count($UserAdditions) > 1 ? 's' : '')?>
+        </li>
+        <li>Last updated: <?=time_diff($Updated)?>
+        </li>
       </ul>
     </div>
     <div class="box box_tags">
       <div class="head"><strong>Top Tags</strong></div>
       <div class="pad tags">
         <ol style="padding-left: 5px">
-<?
+          <?php
         Tags::format_top(5, 'collages.php?action=search&amp;tags=');
 ?>
         </ol>
       </div>
     </div>
-<?  if (!empty($TopArtists)) { ?>
+
+    <?php  if (!empty($TopArtists)) { ?>
     <div class="box box_artists">
       <div class="head"><strong>Top Artists</strong></div>
       <div class="pad">
         <ol style="padding-left: 5px;">
-<?
+          <?php
     uasort($TopArtists, 'compare');
     $i = 0;
     foreach ($TopArtists as $ID => $Artist) {
-      $i++;
-      if ($i > 10) {
-        break;
-      }
-?>
+        $i++;
+        if ($i > 10) {
+            break;
+        } ?>
           <li><a href="artist.php?id=<?=$ID?>"><?=$Artist['name']?></a> (<?=number_format($Artist['count'])?>)</li>
-<?
+          <?php
     }
 ?>
         </ol>
       </div>
     </div>
-<?  } ?>
+    <?php  } ?>
+
     <div class="box box_contributors">
       <div class="head"><strong>Top Contributors</strong></div>
       <div class="pad">
         <ol style="padding-left: 5px;">
-<?
+          <?php
 arsort($UserAdditions);
 $i = 0;
 foreach ($UserAdditions as $UserID => $Additions) {
-  $i++;
-  if ($i > 5) {
-    break;
-  }
-?>
-          <li><?=Users::format_username($UserID, false, false, false)?> (<?=number_format($Additions)?>)</li>
-<?
+    $i++;
+    if ($i > 5) {
+        break;
+    } ?>
+          <li><?=Users::format_username($UserID, false, false, false)?>
+            (<?=number_format($Additions)?>)</li>
+          <?php
 }
 ?>
         </ol>
       </div>
     </div>
-<? if (check_perms('site_collages_manage') && !isset($PreventAdditions)) { ?>
+
+    <?php if (check_perms('site_collages_manage') && !isset($PreventAdditions)) { ?>
     <div class="box box_addtorrent">
-      <div class="head"><strong>Add Torrent Group</strong><span class="float_right"><a href="#" onclick="$('.add_torrent_container').toggle_class('hidden'); this.innerHTML = (this.innerHTML == 'Batch add' ? 'Individual add' : 'Batch add'); return false;" class="brackets">Batch add</a></span></div>
+      <div class="head"><strong>Add Torrent Group</strong><span class="float_right"><a href="#"
+            onclick="$('.add_torrent_container').toggle_class('hidden'); this.innerHTML = (this.innerHTML == 'Batch add' ? 'Individual add' : 'Batch add'); return false;"
+            class="brackets">Batch add</a></span></div>
       <div class="pad add_torrent_container">
         <form class="add_form" name="torrent" action="collages.php" method="post">
           <input type="hidden" name="action" value="add_torrent" />
-          <input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
-          <input type="hidden" name="collageid" value="<?=$CollageID?>" />
+          <input type="hidden" name="auth"
+            value="<?=$LoggedUser['AuthKey']?>" />
+          <input type="hidden" name="collageid"
+            value="<?=$CollageID?>" />
           <div class="field_div">
             <input type="text" size="20" name="url" />
           </div>
@@ -445,14 +551,19 @@ foreach ($UserAdditions as $UserID => $Additions) {
           <span style="font-style: italic;">Enter the URL of a torrent group on the site.</span>
         </form>
       </div>
+
       <div class="pad hidden add_torrent_container">
         <form class="add_form" name="torrents" action="collages.php" method="post">
           <input type="hidden" name="action" value="add_torrent_batch" />
-          <input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
-          <input type="hidden" name="collageid" value="<?=$CollageID?>" />
+          <input type="hidden" name="auth"
+            value="<?=$LoggedUser['AuthKey']?>" />
+          <input type="hidden" name="collageid"
+            value="<?=$CollageID?>" />
           <div class="field_div">
-            <textarea name="urls" rows="5" cols="25" style="white-space: pre; word-wrap: normal; overflow: auto;"></textarea>
+            <textarea name="urls" rows="5" cols="25"
+              style="white-space: pre; word-wrap: normal; overflow: auto;"></textarea>
           </div>
+
           <div class="submit_div">
             <input type="submit" value="Add" />
           </div>
@@ -460,11 +571,12 @@ foreach ($UserAdditions as $UserID => $Additions) {
         </form>
       </div>
     </div>
-<? } ?>
+    <?php } ?>
+
     <h3>Comments</h3>
-<?
+    <?php
 if ($CommentList === null) {
-  $DB->query("
+    $DB->query("
     SELECT
       c.ID,
       c.Body,
@@ -477,34 +589,41 @@ if ($CommentList === null) {
       AND c.PageID = $CollageID
     ORDER BY c.ID DESC
     LIMIT 15");
-  $CommentList = $DB->to_array(false, MYSQLI_NUM);
+    $CommentList = $DB->to_array(false, MYSQLI_NUM);
 }
 foreach ($CommentList as $Comment) {
-  list($CommentID, $Body, $UserID, $Username, $CommentTime) = $Comment;
-?>
+    list($CommentID, $Body, $UserID, $Username, $CommentTime) = $Comment; ?>
     <div class="box comment">
       <div class="head">
-        <?=Users::format_username($UserID, false, false, false) ?> <?=time_diff($CommentTime) ?>
+        <?=Users::format_username($UserID, false, false, false) ?>
+        <?=time_diff($CommentTime) ?>
         <br />
-        <a href="reports.php?action=report&amp;type=comment&amp;id=<?=$CommentID?>" class="brackets">Report</a>
+        <a href="reports.php?action=report&amp;type=comment&amp;id=<?=$CommentID?>"
+          class="brackets">Report</a>
+      </div>
+      <div class="pad"><?=Text::full_format($Body)?>
       </div>
-      <div class="pad"><?=Text::full_format($Body)?></div>
     </div>
-<?
+    <?php
 }
 ?>
+
     <div class="box pad">
-      <a href="collages.php?action=comments&amp;collageid=<?=$CollageID?>" class="brackets">View all comments</a>
+      <a href="collages.php?action=comments&amp;collageid=<?=$CollageID?>"
+        class="brackets">View all comments</a>
     </div>
-<?
+
+    <?php
 if (!$LoggedUser['DisablePosting']) {
-?>
+    ?>
     <div class="box box_addcomment">
       <div class="head"><strong>Comment</strong></div>
-      <form class="send_form" name="comment" id="quickpostform" onsubmit="quickpostform.submit_button.disabled = true;" action="comments.php" method="post">
+      <form class="send_form" name="comment" id="quickpostform" onsubmit="quickpostform.submit_button.disabled = true;"
+        action="comments.php" method="post">
         <input type="hidden" name="action" value="take_post" />
         <input type="hidden" name="page" value="collages" />
-        <input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
+        <input type="hidden" name="auth"
+          value="<?=$LoggedUser['AuthKey']?>" />
         <input type="hidden" name="pageid" value="<?=$CollageID?>" />
         <div class="pad">
           <div class="field_div">
@@ -516,64 +635,120 @@ if (!$LoggedUser['DisablePosting']) {
         </div>
       </form>
     </div>
-<?
+    <?php
 }
 ?>
   </div>
+
   <div class="main_column">
-<?
+    <?php
 if ($CollageCovers != 0) { ?>
     <div id="coverart" class="box">
       <div class="head" id="coverhead"><strong>Pictures</strong></div>
-      <div class="collage_images" id="collage_page0" data-wall-child=".collage_image" data-wall-size="4" data-wall-min="2">
-<?
+      <div class="collage_images" id="collage_page0" data-wall-child=".collage_image" data-wall-size="4"
+        data-wall-min="2">
+        <?php
   $Page1 = array_slice($Collage, 0, $CollageCovers);
   foreach ($Page1 as $Group) {
-    echo $Group;
+      echo $Group;
   }
 ?>
       </div>
     </div>
-<?  if ($NumGroups > $CollageCovers) { ?>
+
+    <?php if ($NumGroups > $CollageCovers) { ?>
     <div class="linkbox pager" style="clear: left;" id="pageslinksdiv">
-      <span id="firstpage" class="invisible"><a href="#" class="pageslink" onclick="collageShow.page(0, this); return false;"><strong>&lt;&lt; First</strong></a> | </span>
-      <span id="prevpage" class="invisible"><a href="#" class="pageslink" onclick="collageShow.prevPage(); return false;"><strong>&lt; Prev</strong></a> | </span>
-<?    for ($i = 0; $i < $NumGroups / $CollageCovers; $i++) { ?>
-      <span id="pagelink<?=$i?>" class="<?=(($i > 4) ? 'hidden' : '')?><?=(($i == 0) ? 'selected' : '')?>"><a href="#" class="pageslink" onclick="collageShow.page(<?=$i?>, this); return false;"><strong><?=$CollageCovers * $i + 1?>-<?=min($NumGroups, $CollageCovers * ($i + 1))?></strong></a><?=(($i != ceil($NumGroups / $CollageCovers) - 1) ? ' | ' : '')?></span>
-<?    } ?>
-      <span id="nextbar" class="<?=($NumGroups / $CollageCovers > 5) ? 'hidden' : ''?>"> | </span>
-      <span id="nextpage"><a href="#" class="pageslink" onclick="collageShow.nextPage(); return false;"><strong>Next &gt;</strong></a></span>
-      <span id="lastpage" class="<?=(ceil($NumGroups / $CollageCovers) == 2 ? 'invisible' : '')?>"> | <a href="#" class="pageslink" onclick="collageShow.page(<?=ceil($NumGroups / $CollageCovers) - 1?>, this); return false;"><strong>Last &gt;&gt;</strong></a></span>
+
+      <span id="firstpage" class="invisible">
+        <a href="#" class="pageslink" onclick="collageShow.page(0, this); return false;">
+          <strong>« First</strong>
+        </a> |
+      </span>
+
+      <span id="prevpage" class="invisible">
+        <a href="#" class="pageslink" onclick="collageShow.prevPage(); return false;">
+          <strong>‹ Prev</strong>
+        </a> |
+      </span>
+
+      <?php for ($i = 0; $i < $NumGroups / $CollageCovers; $i++) { ?>
+      <span id="pagelink<?=$i?>"
+        class="<?=(($i > 4) ? 'hidden' : '')?><?=(($i == 0) ? 'selected' : '')?>">
+        <a href="#" class="pageslink"
+          onclick="collageShow.page(<?=$i?>, this); return false;">
+          <strong><?=$CollageCovers * $i + 1?>-<?=min($NumGroups, $CollageCovers * ($i + 1))?></strong>
+        </a>
+        <?=(($i != ceil($NumGroups / $CollageCovers) - 1) ? ' | ' : '')?>
+      </span>
+      <?php } ?>
+
+      <span id="nextbar"
+        class="<?=($NumGroups / $CollageCovers > 5) ? 'hidden' : ''?>">
+        | </span>
+
+      <span id="nextpage">
+        <a href="#" class="pageslink" onclick="collageShow.nextPage(); return false;">
+          <strong>Next ›</strong>
+        </a>
+      </span>
+
+      <span id="lastpage"
+        class="<?=(ceil($NumGroups / $CollageCovers) == 2 ? 'invisible' : '')?>">
+        |
+        <a href="#" class="pageslink"
+          onclick="collageShow.page(<?=ceil($NumGroups / $CollageCovers) - 1?>, this); return false;">
+          <strong>Last »</strong>
+        </a>
+      </span>
     </div>
+
     <script type="text/javascript">
-      $(()=>collageShow.init(<?=json_encode($CollagePages)?>));
+      $(() => collageShow.init( <?=json_encode($CollagePages)?> ));
     </script>
-<?
+    <?php
   }
 }
 ?>
+
     <div class="box">
-    <table class="torrent_table grouping cats" id="discog_table">
-      <tr class="colhead_dark">
-        <td><!-- expand/collapse --></td>
-        <td><!-- Category --></td>
-        <td width="70%"><strong>Torrents</strong></td>
-        <td>Size</td>
-        <td class="sign snatches">
-          <a><svg width="15" height="15" fill="black" class="tooltip" alt="Snatches" title="Snatches" viewBox="3 0 88 98"><path d="M20 20 A43 43,0,1,0,77 23 L90 10 L55 10 L55 45 L68 32 A30.27 30.27,0,1,1,28 29"></path></svg></a>
-        </td>
-        <td class="sign seeders">
-          <a><svg width="11" height="15" fill="black" class="tooltip" alt="Seeders" title="Seeders"><polygon points="0,7 5.5,0 11,7 8,7 8,15 3,15 3,7"></polygon></svg></a>
-        </td>
-        <td class="sign leechers">
-          <a><svg width="11" height="15" fill="black" 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></a>
-        </td>
-      </tr>
-<?=$TorrentTable?>
-    </table>
+      <table class="torrent_table grouping cats" id="discog_table">
+        <tr class="colhead_dark">
+          <td>
+            <!-- Expand/Collapse -->
+          </td>
+
+          <td>
+            <!-- Category -->
+          </td>
+
+          <td width="70%"><strong>Torrents</strong></td>
+
+          <td>Size</td>
+
+          <td class="sign snatches">
+            <a><svg width="15" height="15" fill="black" class="tooltip" alt="Snatches" title="Snatches"
+                viewBox="3 0 88 98">
+                <path d="M20 20 A43 43,0,1,0,77 23 L90 10 L55 10 L55 45 L68 32 A30.27 30.27,0,1,1,28 29"></path>
+              </svg></a>
+          </td>
+
+          <td class="sign seeders">
+            <a><svg width="11" height="15" fill="black" class="tooltip" alt="Seeders" title="Seeders">
+                <polygon points="0,7 5.5,0 11,7 8,7 8,15 3,15 3,7"></polygon>
+              </svg></a>
+          </td>
+
+          <td class="sign leechers">
+            <a><svg width="11" height="15" fill="black" 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></a>
+          </td>
+        </tr>
+
+        <?=$TorrentTable?>
+
+      </table>
     </div>
   </div>
 </div>
-<?
-View::show_footer();
-?>
+<?php View::show_footer();

sections/forums/edit_rules.php

@@ -1,52 +1,52 @@
-<?
+<?php
 
 enforce_login();
 if (!check_perms('site_moderate_forums')) {
-  error(403);
+    error(403);
 }
 
-
 $ForumID = $_GET['forumid'];
 if (!is_number($ForumID)) {
-  error(404);
+    error(404);
 }
 
-
 if (!empty($_POST['add']) || (!empty($_POST['del']))) {
-  if (!empty($_POST['add'])) {
-    if (is_number($_POST['new_thread'])) {
-      $DB->query("
-        INSERT INTO forums_specific_rules (ForumID, ThreadID)
-        VALUES ($ForumID, ".$_POST['new_thread'].')');
+    if (!empty($_POST['add'])) {
+        if (is_number($_POST['new_thread'])) {
+            $DB->query("
+            INSERT INTO forums_specific_rules (ForumID, ThreadID)
+            VALUES ($ForumID, ".$_POST['new_thread'].')');
+        }
     }
-  }
-  if (!empty($_POST['del'])) {
-    if (is_number($_POST['threadid'])) {
-      $DB->query("
-        DELETE FROM forums_specific_rules
-        WHERE ForumID = $ForumID
-          AND ThreadID = ".$_POST['threadid']);
+
+    if (!empty($_POST['del'])) {
+        if (is_number($_POST['threadid'])) {
+            $DB->query("
+            DELETE FROM forums_specific_rules
+            WHERE ForumID = $ForumID
+              AND ThreadID = ".$_POST['threadid']);
+        }
     }
-  }
-  $Cache->delete_value('forums_list');
+    $Cache->delete_value('forums_list');
 }
 
-
 $DB->query("
-  SELECT ThreadID
-  FROM forums_specific_rules
+SELECT ThreadID
+FROM forums_specific_rules
   WHERE ForumID = $ForumID");
 $ThreadIDs = $DB->collect('ThreadID');
 
 View::show_header();
 ?>
+
 <div class="thin box pad">
   <div class="header">
     <h2>
       <a href="forums.php">Forums</a>
-      &gt;
-      <a href="forums.php?action=viewforum&amp;forumid=<?=$ForumID?>"><?=$Forums[$ForumID]['Name']?></a>
-      &gt;
+      ›
+      <a
+        href="forums.php?action=viewforum&amp;forumid=<?=$ForumID?>"><?=$Forums[$ForumID]['Name']?></a>
+      ›
       Edit forum specific rules
     </h2>
   </div>
@@ -64,19 +64,20 @@ View::show_header();
           <input type="submit" name="add" value="Add thread" />
         </td>
       </form>
-<?  foreach ($ThreadIDs as $ThreadID) { ?>
+      <?php foreach ($ThreadIDs as $ThreadID) { ?>
     <tr>
-      <td><?=$ThreadID?></td>
+      <td><?=$ThreadID?>
+      </td>
       <td>
         <form class="delete_form" name="forum_rules" action="" method="post">
-          <input type="hidden" name="threadid" value="<?=$ThreadID?>" />
+          <input type="hidden" name="threadid"
+            value="<?=$ThreadID?>" />
           <input type="submit" name="del" value="Delete link" />
         </form>
       </td>
     </tr>
-<?  } ?>
+    <?php } ?>
   </table>
 </div>
-<?
-View::show_footer();
-?>
+
+<?php View::show_footer();

sections/forums/forum.php

@@ -1,4 +1,5 @@
 <?php
+
 /**********|| Page to show individual forums || ********************************\
 
 Things to expect in $_GET:
@@ -13,15 +14,15 @@ Things to expect in $_GET:
 // Check for lame SQL injection attempts
 $ForumID = $_GET['forumid'];
 if (!is_number($ForumID)) {
-  error(0);
+    error(0);
 }
 
 $Tooltip = "tooltip";
 
 if (isset($LoggedUser['PostsPerPage'])) {
-  $PerPage = $LoggedUser['PostsPerPage'];
+    $PerPage = $LoggedUser['PostsPerPage'];
 } else {
-  $PerPage = POSTS_PER_PAGE;
+    $PerPage = POSTS_PER_PAGE;
 }
 
 list($Page, $Limit) = Format::page_limit(TOPICS_PER_PAGE);
@@ -30,11 +31,12 @@ list($Page, $Limit) = Format::page_limit(TOPICS_PER_PAGE);
 
 // Caching anything beyond the first page of any given forum is just wasting RAM.
 // Users are more likely to search than to browse to page 2.
-if ($Page == 1) {
-  list($Forum,,,$Stickies) = $Cache->get_value("forums_$ForumID");
+if ($Page === 1) {
+    list($Forum, , , $Stickies) = $Cache->get_value("forums_$ForumID");
 }
+
 if (!isset($Forum) || !is_array($Forum)) {
-  $DB->query("
+    $DB->query("
     SELECT
       ID,
       Title,
@@ -49,44 +51,47 @@ if (!isset($Forum) || !is_array($Forum)) {
     WHERE ForumID = '$ForumID'
     ORDER BY IsSticky DESC, Ranking ASC, LastPostTime DESC
     LIMIT $Limit"); // Can be cached until someone makes a new post
-  $Forum = $DB->to_array('ID', MYSQLI_ASSOC, false);
+    $Forum = $DB->to_array('ID', MYSQLI_ASSOC, false);
 
-  if ($Page == 1) {
-    $DB->query("
+    if ($Page === 1) {
+        $DB->query("
       SELECT COUNT(ID)
       FROM forums_topics
       WHERE ForumID = '$ForumID'
         AND IsSticky = '1'");
-    list($Stickies) = $DB->next_record();
-    $Cache->cache_value("forums_$ForumID", array($Forum, '', 0, $Stickies), 0);
-  }
+        list($Stickies) = $DB->next_record();
+        $Cache->cache_value("forums_$ForumID", array($Forum, '', 0, $Stickies), 0);
+    }
 }
 
 if (!isset($Forums[$ForumID])) {
-  error(404);
+    error(404);
 }
+
 // Make sure they're allowed to look at the page
 if (!check_perms('site_moderate_forums')) {
-  if (isset($LoggedUser['CustomForums'][$ForumID]) && $LoggedUser['CustomForums'][$ForumID] === 0) {
-    error(403);
-  }
+    if (isset($LoggedUser['CustomForums'][$ForumID]) && $LoggedUser['CustomForums'][$ForumID] === 0) {
+        error(403);
+    }
 }
 
-
 $ForumName = display_str($Forums[$ForumID]['Name']);
 if (!Forums::check_forumperm($ForumID)) {
-  error(403);
+    error(403);
 }
 
 // Start printing
-View::show_header('Forums &gt; '. $Forums[$ForumID]['Name'], '', '');
+View::show_header('Forums › '. $Forums[$ForumID]['Name'], '', '');
 ?>
+
 <div class="thin">
-  <h2><a href="forums.php">Forums</a> &gt; <?=$ForumName?></h2>
+  <h2><a href="forums.php">Forums</a> › <?=$ForumName?>
+  </h2>
   <div class="linkbox">
-<? if (Forums::check_forumperm($ForumID, 'Write') && Forums::check_forumperm($ForumID, 'Create')) { ?>
-    <a href="forums.php?action=new&amp;forumid=<?=$ForumID?>" class="brackets">New thread</a>
-<? } ?>
+    <?php if (Forums::check_forumperm($ForumID, 'Write') && Forums::check_forumperm($ForumID, 'Create')) { ?>
+    <a href="forums.php?action=new&amp;forumid=<?=$ForumID?>"
+      class="brackets">New thread</a>
+    <?php } ?>
     <a data-toggle-target="#searchforum" data-toggle-replace="Hide search" class="brackets">Search this forum</a>
     <div id="searchforum" class="hidden center">
       <div style="display: inline-block;">
@@ -96,7 +101,8 @@ View::show_header('Forums &gt; '. $Forums[$ForumID]['Name'], '', '');
             <tr>
               <td>
                 <input type="hidden" name="action" value="search" />
-                <input type="hidden" name="forums[]" value="<?=$ForumID?>" />
+                <input type="hidden" name="forums[]"
+                  value="<?=$ForumID?>" />
                 <strong>Search Terms</strong>
               </td>
               <td>
@@ -127,27 +133,29 @@ View::show_header('Forums &gt; '. $Forums[$ForumID]['Name'], '', '');
       </div>
     </div>
   </div>
-<?  if (check_perms('site_moderate_forums')) { ?>
+  <?php if (check_perms('site_moderate_forums')) { ?>
   <div class="linkbox">
-    <a href="forums.php?action=edit_rules&amp;forumid=<?=$ForumID?>" class="brackets">Change specific rules</a>
+    <a href="forums.php?action=edit_rules&amp;forumid=<?=$ForumID?>"
+      class="brackets">Change specific rules</a>
   </div>
-<?  } ?>
-<?  if (!empty($Forums[$ForumID]['SpecificRules'])) { ?>
+  <?php } ?>
+  <?php if (!empty($Forums[$ForumID]['SpecificRules'])) { ?>
   <div class="linkbox">
-      <strong>Forum Specific Rules</strong>
-<?    foreach ($Forums[$ForumID]['SpecificRules'] as $ThreadIDs) {
-      $Thread = Forums::get_thread_info($ThreadIDs);
-      if ($Thread === null) {
+    <strong>Forum Specific Rules</strong>
+    <?php foreach ($Forums[$ForumID]['SpecificRules'] as $ThreadIDs) {
+    $Thread = Forums::get_thread_info($ThreadIDs);
+    if ($Thread === null) {
         error(404);
-      }
-?>
+    } ?>
     <br />
-    <a href="forums.php?action=viewthread&amp;threadid=<?=$ThreadIDs?>" class="brackets"><?=display_str($Thread['Title'])?></a>
-<?    } ?>
+    <a href="forums.php?action=viewthread&amp;threadid=<?=$ThreadIDs?>"
+      class="brackets"><?=display_str($Thread['Title'])?></a>
+    <?php
+} ?>
   </div>
-<?  } ?>
+  <?php } ?>
   <div class="linkbox pager">
-<?
+    <?php
 $Pages = Format::get_pages($Page, $Forums[$ForumID]['NumTopics'], TOPICS_PER_PAGE, 9);
 echo $Pages;
 ?>
@@ -159,19 +167,19 @@ echo $Pages;
       <td style="width: 7%;">Replies</td>
       <td style="width: 14%;">Author</td>
     </tr>
-<?
+    <?php
 // Check that we have content to process
 if (count($Forum) === 0) {
-?>
+    ?>
     <tr>
       <td colspan="4">
         No threads to display in this forum!
       </td>
     </tr>
-<?
+    <?php
 } else {
-  // forums_last_read_topics is a record of the last post a user read in a topic, and what page that was on
-  $DB->query("
+        // forums_last_read_topics is a record of the last post a user read in a topic, and what page that was on
+        $DB->query("
     SELECT
       l.TopicID,
       l.PostID,
@@ -186,89 +194,99 @@ if (count($Forum) === 0) {
     WHERE l.TopicID IN (".implode(', ', array_keys($Forum)).')
       AND l.UserID = \''.$LoggedUser['ID'].'\'');
 
-  // Turns the result set into a multi-dimensional array, with
-  // forums_last_read_topics.TopicID as the key.
-  // This is done here so we get the benefit of the caching, and we
-  // don't have to make a database query for each topic on the page
-  $LastRead = $DB->to_array('TopicID');
+        // Turns the result set into a multi-dimensional array, with
+        // forums_last_read_topics.TopicID as the key.
+        // This is done here so we get the benefit of the caching, and we
+        // don't have to make a database query for each topic on the page
+        $LastRead = $DB->to_array('TopicID');
 
-  //---------- Begin printing
+        //---------- Begin printing
 
-  foreach ($Forum as $Topic) {
-    list($TopicID, $Title, $AuthorID, $Locked, $Sticky, $PostCount, $LastID, $LastTime, $LastAuthorID) = array_values($Topic);
-    // Build list of page links
-    // Only do this if there is more than one page
-    $PageLinks = [];
-    $ShownEllipses = false;
-    $PagesText = '';
-    $TopicPages = ceil($PostCount / $PerPage);
+        foreach ($Forum as $Topic) {
+            list($TopicID, $Title, $AuthorID, $Locked, $Sticky, $PostCount, $LastID, $LastTime, $LastAuthorID) = array_values($Topic);
+            // Build list of page links
+            // Only do this if there is more than one page
+            $PageLinks = [];
+            $ShownEllipses = false;
+            $PagesText = '';
+            $TopicPages = ceil($PostCount / $PerPage);
 
-    if ($TopicPages > 1) {
-      $PagesText = ' (';
-      for ($i = 1; $i <= $TopicPages; $i++) {
-        if ($TopicPages > 4 && ($i > 2 && $i <= $TopicPages - 2)) {
-          if (!$ShownEllipses) {
-            $PageLinks[] = '-';
-            $ShownEllipses = true;
-          }
-          continue;
-        }
-        $PageLinks[] = "<a href=\"forums.php?action=viewthread&amp;threadid=$TopicID&amp;page=$i\">$i</a>";
-      }
-      $PagesText .= implode(' ', $PageLinks);
-      $PagesText .= ')';
-    }
+            if ($TopicPages > 1) {
+                $PagesText = ' (';
+                for ($i = 1; $i <= $TopicPages; $i++) {
+                    if ($TopicPages > 4 && ($i > 2 && $i <= $TopicPages - 2)) {
+                        if (!$ShownEllipses) {
+                            $PageLinks[] = '-';
+                            $ShownEllipses = true;
+                        }
+                        continue;
+                    }
+                    $PageLinks[] = "<a href=\"forums.php?action=viewthread&amp;threadid=$TopicID&amp;page=$i\">$i</a>";
+                }
+                $PagesText .= implode(' ', $PageLinks);
+                $PagesText .= ')';
+            }
 
-    // handle read/unread posts - the reason we can't cache the whole page
-    if ((!$Locked || $Sticky) && ((empty($LastRead[$TopicID]) || $LastRead[$TopicID]['PostID'] < $LastID) && strtotime($LastTime) > $LoggedUser['CatchupTime'])) {
-      $Read = 'unread';
-    } else {
-      $Read = 'read';
-    }
-    if ($Locked) {
-      $Read .= '_locked';
-    }
-    if ($Sticky) {
-      $Read .= '_sticky';
-    }
-?>
-  <tr class="row">
-    <td class="<?=$Read?> <?=$Tooltip?>" title="<?=ucwords(str_replace('_', ' ', $Read))?>"></td>
-    <td>
-      <span class="float_left last_topic">
-<?
+            // handle read/unread posts - the reason we can't cache the whole page
+            if ((!$Locked || $Sticky) && ((empty($LastRead[$TopicID]) || $LastRead[$TopicID]['PostID'] < $LastID) && strtotime($LastTime) > $LoggedUser['CatchupTime'])) {
+                $Read = 'unread';
+            } else {
+                $Read = 'read';
+            }
+            if ($Locked) {
+                $Read .= '_locked';
+            }
+            if ($Sticky) {
+                $Read .= '_sticky';
+            } ?>
+    <tr class="row">
+      <td
+        class="<?=$Read?> <?=$Tooltip?>"
+        title="<?=ucwords(str_replace('_', ' ', $Read))?>">
+      </td>
+      <td>
+        <span class="float_left last_topic">
+          <?php
     $TopicLength = 75 - (2 * count($PageLinks));
-    unset($PageLinks);
-    $Title = display_str($Title);
-    $DisplayTitle = $Title;
-
-?>
-        <strong>
-          <a href="forums.php?action=viewthread&amp;threadid=<?=$TopicID?>" class="tooltip" data-title-plain="<?=$Title?>"><?=Format::cut_string($DisplayTitle, $TopicLength) ?></a>
-        </strong>
-        <?=$PagesText?>
-      </span>
-<?    if (!empty($LastRead[$TopicID])) { ?>
-      <a class="<?=$Tooltip?> last_read" title="Jump to last read" href="forums.php?action=viewthread&amp;threadid=<?=$TopicID?>&amp;page=<?=$LastRead[$TopicID]['Page']?>#post<?=$LastRead[$TopicID]['PostID']?>">
-        <svg width="15" height="11"><polygon points="0,3 0,8 8,8 8,11 15,5.5 8,0 8,3"/></svg>
-      </a>
-<?    } ?>
-      <span class="float_right last_poster">
-        by <?=Users::format_username($LastAuthorID, false, false, false, false, false)?> <?=time_diff($LastTime,1)?>
-      </span>
-    </td>
-    <td class="number_column"><?=number_format($PostCount - 1)?></td>
-    <td><?=Users::format_username($AuthorID, false, false, false, false, false)?></td>
-  </tr>
-<?  }
-} ?>
-</table>
-<!--<div class="breadcrumbs">
-  <a href="forums.php">Forums</a> &gt; <?=$ForumName?>
-</div>-->
+            unset($PageLinks);
+            $Title = display_str($Title);
+            $DisplayTitle = $Title; ?>
+          <strong>
+            <a href="forums.php?action=viewthread&amp;threadid=<?=$TopicID?>"
+              class="tooltip" data-title-plain="<?=$Title?>"><?=Format::cut_string($DisplayTitle, $TopicLength) ?></a>
+          </strong>
+          <?=$PagesText?>
+        </span>
+        <?php if (!empty($LastRead[$TopicID])) { ?>
+        <a class="<?=$Tooltip?> last_read" title="Jump to last read"
+          href="forums.php?action=viewthread&amp;threadid=<?=$TopicID?>&amp;page=<?=$LastRead[$TopicID]['Page']?>#post<?=$LastRead[$TopicID]['PostID']?>">
+          <svg width="15" height="11">
+            <polygon points="0,3 0,8 8,8 8,11 15,5.5 8,0 8,3" /></svg>
+        </a>
+        <?php } ?>
+        <span class="float_right last_poster">
+          by <?=Users::format_username($LastAuthorID, false, false, false, false, false)?>
+          <?=time_diff($LastTime, 1)?>
+        </span>
+      </td>
+      <td class="number_column"><?=number_format($PostCount - 1)?>
+      </td>
+      <td><?=Users::format_username($AuthorID, false, false, false, false, false)?>
+      </td>
+    </tr>
+    <?php
+        }
+    } ?>
+  </table>
+  <div class="breadcrumbs">
+    <a href="forums.php">Forums</a> › <?=$ForumName?>
+  </div>
   <div class="linkbox pager">
     <?=$Pages?>
   </div>
-  <div class="linkbox"><a href="forums.php?action=catchup&amp;forumid=<?=$ForumID?>&amp;auth=<?=$LoggedUser['AuthKey']?>" class="brackets">Catch up</a></div>
+  <div class="linkbox"><a
+      href="forums.php?action=catchup&amp;forumid=<?=$ForumID?>&amp;auth=<?=$LoggedUser['AuthKey']?>"
+      class="brackets">Catch up</a></div>
 </div>
-<? View::show_footer(); ?>
+
+<?php View::show_footer();

sections/forums/newthread.php

@@ -1,4 +1,5 @@
-<?
+<?php
+
 /*
 New post page
 
@@ -11,21 +12,33 @@ Information to be expected in $_GET:
 
 $ForumID = $_GET['forumid'];
 if (!is_number($ForumID)) {
-  error(404);
+    error(404);
 }
+
 $Forum = Forums::get_forum_info($ForumID);
 if ($Forum === false) {
-  error(404);
+    error(404);
 }
 
-
 if (!Forums::check_forumperm($ForumID, 'Write') || !Forums::check_forumperm($ForumID, 'Create')) {
-  error(403);
+    error(403);
 }
-View::show_header('Forums &gt; '.$Forum['Name'].' &gt; New Topic', 'comments,bbcode,jquery.validate,form_validate');
+
+View::show_header('Forums › '.$Forum['Name'].' › New Topic', 'comments,bbcode,jquery.validate,form_validate');
 ?>
+
 <div class="thin">
-  <h2><a href="forums.php">Forums</a> &gt; <a href="forums.php?action=viewforum&amp;forumid=<?=$ForumID?>"><?=$Forum['Name']?></a> &gt; <span id="newthreadtitle">New Topic</span></h2>
+  <h2>
+    <a href="forums.php">Forums</a>
+    ›
+    <a href="forums.php?action=viewforum&amp;forumid=<?=$ForumID?>">
+      <?=$Forum['Name']?></a>
+    ›
+    <span id="newthreadtitle">
+      New Topic
+    </span>
+  </h2>
+
   <div class="hidden" id="newthreadpreview">
     <div class="linkbox">
       <div class="center">
@@ -33,29 +46,31 @@ View::show_header('Forums &gt; '.$Forum['Name'].' &gt; New Topic', 'comments,bbc
         <a href="#" onclick="return false;" class="brackets"><?=!empty($HeavyInfo['AutoSubscribe']) ? 'Unsubscribe' : 'Subscribe'?></a>
       </div>
     </div>
-<?  if (check_perms('forums_polls_create')) { ?>
+    <?php if (check_perms('forums_polls_create')) { ?>
     <div class="box thin clear hidden" id="pollpreview">
-      <div class="head colhead_dark"><strong>Poll</strong> <a data-toggle-target="#threadpoll" class="brackets">View</a></div>
+      <div class="head colhead_dark"><strong>Poll</strong> <a data-toggle-target="#threadpoll" class="brackets">View</a>
+      </div>
       <div class="pad" id="threadpoll">
         <p><strong id="pollquestion"></strong></p>
         <div id="pollanswers"></div>
-        <br /><input type="radio" name="vote" id="answer_0" value="0" /> <label for="answer_0">Blank&#8202;&mdash;&#8202;Show the results!</label><br /><br />
+        <br /><input type="radio" name="vote" id="answer_0" value="0" /> <label
+          for="answer_0">Blank&#8202;&mdash;&#8202;Show the results!</label><br /><br />
         <input type="button" class="float_left" value="Vote" />
       </div>
     </div>
-<?  } ?>
+    <?php } ?>
     <table class="forum_post box vertical_margin" style="text-align: left;">
       <colgroup>
-<?  if (Users::has_avatars_enabled()) { ?>
+        <?php if (Users::has_avatars_enabled()) { ?>
         <col class="col_avatar" />
-<?  } ?>
+        <?php } ?>
         <col class="col_post_body" />
       </colgroup>
       <tr class="colhead_dark">
         <td colspan="<?=Users::has_avatars_enabled() ? 2 : 1 ?>">
           <span class="float_left"><a href="#newthreadpreview">#XXXXXX</a>
             by <strong><?=Users::format_username($LoggedUser['ID'], true, true, true, true, true)?></strong>
-          Just now
+            Just now
           </span>
           <span id="barpreview" class="float_right">
             <a href="#newthreadpreview" class="brackets">Report</a>
@@ -65,11 +80,11 @@ View::show_header('Forums &gt; '.$Forum['Name'].' &gt; New Topic', 'comments,bbc
         </td>
       </tr>
       <tr>
-<?  if (Users::has_avatars_enabled()) { ?>
+        <?php if (Users::has_avatars_enabled()) { ?>
         <td class="avatar" valign="top">
           <?=Users::show_avatar($LoggedUser['Avatar'], $LoggedUser['ID'], $LoggedUser['Username'], $HeavyInfo['DisableAvatars'])?>
         </td>
-<?  } ?>
+        <?php } ?>
         <td class="body" valign="top">
           <div id="contentpreview" style="text-align: left;"></div>
         </td>
@@ -79,7 +94,8 @@ View::show_header('Forums &gt; '.$Forum['Name'].' &gt; New Topic', 'comments,bbc
   <div class="box pad">
     <form class="create_form" name="forum_thread" action="" id="newthreadform" method="post">
       <input type="hidden" name="action" value="new" />
-      <input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
+      <input type="hidden" name="auth"
+        value="<?=$LoggedUser['AuthKey']?>" />
       <input type="hidden" name="forum" value="<?=$ForumID?>" />
       <table id="newthreadtext" class="layout">
         <tr>
@@ -88,28 +104,31 @@ View::show_header('Forums &gt; '.$Forum['Name'].' &gt; New Topic', 'comments,bbc
         </tr>
         <tr>
           <td class="label">Body</td>
-          <td><textarea id="posttext" class="required bbcode_editor" style="width: 98%;" onkeyup="resize('posttext');" name="body" cols="90" rows="8"></textarea></td>
+          <td><textarea id="posttext" class="required bbcode_editor" style="width: 98%;" onkeyup="resize('posttext');"
+              name="body" cols="90" rows="8"></textarea></td>
         </tr>
         <tr>
           <td></td>
           <td>
-            <input id="subscribebox" type="checkbox" name="subscribe"<?=!empty($HeavyInfo['AutoSubscribe']) ? ' checked="checked"' : ''?> onchange="$('#subscribeboxpreview').raw().checked=this.checked;" />
+            <input id="subscribebox" type="checkbox" name="subscribe" <?=!empty($HeavyInfo['AutoSubscribe']) ? ' checked="checked"' : ''?>
+            onchange="$('#subscribeboxpreview').raw().checked=this.checked;" />
             <label for="subscribebox">Subscribe to topic</label>
           </td>
         </tr>
-<?
+        <?php
 if (check_perms('forums_polls_create')) {
-?>
-        <script type="text/javascript">//<![CDATA[
-        var AnswerCount = 1;
+    ?>
+        <script type="text/javascript">
+          //<![CDATA[
+          var AnswerCount = 1;
 
-        function AddAnswerField() {
+          function AddAnswerField() {
             if (AnswerCount >= 25) {
               return;
             }
             var AnswerField = document.createElement("input");
             AnswerField.type = "text";
-            AnswerField.id = "answer_"+AnswerCount;
+            AnswerField.id = "answer_" + AnswerCount;
             AnswerField.className = "required";
             AnswerField.name = "answers[]";
             AnswerField.style.width = "90%";
@@ -118,9 +137,9 @@ if (check_perms('forums_polls_create')) {
             x.appendChild(document.createElement("br"));
             x.appendChild(AnswerField);
             AnswerCount++;
-        }
+          }
 
-        function RemoveAnswerField() {
+          function RemoveAnswerField() {
             if (AnswerCount == 1) {
               return;
             }
@@ -129,8 +148,8 @@ if (check_perms('forums_polls_create')) {
               x.removeChild(x.lastChild);
             }
             AnswerCount--;
-        }
-        //]]>
+          }
+          //]]>
         </script>
         <tr>
           <td colspan="2" class="center">
@@ -150,10 +169,12 @@ if (check_perms('forums_polls_create')) {
             <a href="#" onclick="RemoveAnswerField();return false;" class="brackets">&minus;</a>
           </td>
         </tr>
-<? } ?>
+        <?php
+} ?>
       </table>
       <div id="subscribediv" class="hidden">
-        <input id="subscribeboxpreview" type="checkbox" name="subscribe"<?=!empty($HeavyInfo['AutoSubscribe']) ? ' checked="checked"' : '' ?> />
+        <input id="subscribeboxpreview" type="checkbox" name="subscribe" <?=!empty($HeavyInfo['AutoSubscribe']) ? ' checked="checked"' : '' ?>
+        />
         <label for="subscribebox">Subscribe to topic</label>
       </div>
       <div id="buttons" class="center">
@@ -164,4 +185,5 @@ if (check_perms('forums_polls_create')) {
     </form>
   </div>
 </div>
-<? View::show_footer(); ?>
+
+<?php View::show_footer();

sections/userhistory/subscriptions.php

@@ -1,16 +1,17 @@
-<?
+<?php
+
 /*
-User subscription page
-*/
+ * User subscription page
+ */
 
 if (isset($LoggedUser['PostsPerPage'])) {
-  $PerPage = $LoggedUser['PostsPerPage'];
+    $PerPage = $LoggedUser['PostsPerPage'];
 } else {
-  $PerPage = POSTS_PER_PAGE;
+    $PerPage = POSTS_PER_PAGE;
 }
 list($Page, $Limit) = Format::page_limit($PerPage);
 
-View::show_header('Subscriptions','subscriptions,bbcode');
+View::show_header('Subscriptions', 'subscriptions,bbcode');
 
 $ShowUnread = (!isset($_GET['showunread']) && !isset($HeavyInfo['SubscriptionsUnread']) || isset($HeavyInfo['SubscriptionsUnread']) && !!$HeavyInfo['SubscriptionsUnread'] || isset($_GET['showunread']) && !!$_GET['showunread']);
 $ShowCollapsed = (!isset($_GET['collapse']) && !isset($HeavyInfo['SubscriptionsCollapse']) || isset($HeavyInfo['SubscriptionsCollapse']) && !!$HeavyInfo['SubscriptionsCollapse'] || isset($_GET['collapse']) && !!$_GET['collapse']);
@@ -85,6 +86,7 @@ $DB->query("
   GROUP BY t.ID)
   ORDER BY LastPostTime DESC
   LIMIT $Limit");
+
 $Results = $DB->to_array(false, MYSQLI_ASSOC, false);
 $DB->query('SELECT FOUND_ROWS()');
 list($NumResults) = $DB->next_record();
@@ -93,63 +95,68 @@ $Debug->log_var($Results, 'Results');
 
 $TorrentGroups = $Requests = [];
 foreach ($Results as $Result) {
-  if ($Result['Page'] == 'torrents') {
-    $TorrentGroups[] = $Result['PageID'];
-  } elseif ($Result['Page'] == 'requests') {
-    $Requests[] = $Result['PageID'];
-  }
+    if ($Result['Page'] === 'torrents') {
+        $TorrentGroups[] = $Result['PageID'];
+    } elseif ($Result['Page'] === 'requests') {
+        $Requests[] = $Result['PageID'];
+    }
 }
 
 $TorrentGroups = Torrents::get_groups($TorrentGroups, true, true, false);
 $Requests = Requests::get_requests($Requests);
-
 ?>
+
 <div class="thin">
   <div class="header">
-    <h2>Subscriptions<?=$ShowUnread ? ' with unread posts' . ($NumResults ? ' (' . $NumResults . ' new)' : '') : ''?></h2>
+    <h2>Subscriptions<?=$ShowUnread ? ' with unread posts' . ($NumResults ? ' (' . $NumResults . ' new)' : '') : ''?>
+    </h2>
 
     <div class="linkbox">
-<?
+      <?php
 if (!$ShowUnread) {
-?>
+    ?>
       <br /><br />
-      <a href="userhistory.php?action=subscriptions&amp;showunread=1" class="brackets">Only display subscriptions with unread replies</a>&nbsp;&nbsp;&nbsp;
-<?
+      <a href="userhistory.php?action=subscriptions&amp;showunread=1" class="brackets">Only display subscriptions with
+        unread replies</a>&nbsp;&nbsp;&nbsp;
+      <?php
 } else {
-?>
+        ?>
       <br /><br />
-      <a href="userhistory.php?action=subscriptions&amp;showunread=0" class="brackets">Show all subscriptions</a>&nbsp;&nbsp;&nbsp;
-<?
-}
+      <a href="userhistory.php?action=subscriptions&amp;showunread=0" class="brackets">Show all
+        subscriptions</a>&nbsp;&nbsp;&nbsp;
+      <?php
+    }
 if ($NumResults) {
-?>
-      <a href="#" onclick="Collapse(); return false;" id="collapselink" class="brackets"><?=$ShowCollapsed ? 'Show' : 'Hide' ?> post bodies</a>&nbsp;&nbsp;&nbsp;
-<?
+    ?>
+      <a href="#" onclick="Collapse(); return false;" id="collapselink" class="brackets"><?=$ShowCollapsed ? 'Show' : 'Hide' ?>
+        post bodies</a>&nbsp;&nbsp;&nbsp;
+      <?php
 }
 ?>
-      <a href="userhistory.php?action=catchup&amp;auth=<?=$LoggedUser['AuthKey']?>" class="brackets">Catch up</a>&nbsp;&nbsp;&nbsp;
-      <a href="userhistory.php?action=posts&amp;userid=<?=$LoggedUser['ID']?>" class="brackets">Go to post history</a>&nbsp;&nbsp;&nbsp;
+      <a href="userhistory.php?action=catchup&amp;auth=<?=$LoggedUser['AuthKey']?>"
+        class="brackets">Catch up</a>&nbsp;&nbsp;&nbsp;
+      <a href="userhistory.php?action=posts&amp;userid=<?=$LoggedUser['ID']?>"
+        class="brackets">Go to post history</a>&nbsp;&nbsp;&nbsp;
       <a href="userhistory.php?action=quote_notifications" class="brackets">Quote notifications</a>&nbsp;&nbsp;&nbsp;
     </div>
   </div>
-<?
+  <?php
 if (!$NumResults) {
-?>
+    ?>
   <div class="center">
     No subscriptions<?=$ShowUnread ? ' with unread posts' : ''?>
   </div>
-<?
+  <?php
 } else {
-?>
+        ?>
   <div class="linkbox">
-<?
+    <?php
   $Pages = Format::get_pages($Page, $NumResults, $PerPage, 11);
-  echo $Pages;
-?>
+        echo $Pages; ?>
   </div>
-<?
+  <?php
   foreach ($Results as $Result) {
-    switch ($Result['Page']) {
+      switch ($Result['Page']) {
       case 'artist':
         $Links = 'Artist: <a href="artist.php?id=' . $Result['PageID'] . '">' . display_str($Result['Name']) . '</a>';
         $JumpLink = 'artist.php?id=' . $Result['PageID'] . '&amp;postid=' . $Result['PostID'] . '#post' . $Result['PostID'];
@@ -160,30 +167,32 @@ if (!$NumResults) {
         break;
       case 'requests':
         if (!isset($Requests[$Result['PageID']])) {
-          continue;
+            continue;
         }
         $Request = $Requests[$Result['PageID']];
         $CategoryName = $Categories[$CategoryID - 1];
 
         $Links = 'Request: ';
+        /*
         if ($CategoryName == 'Music' || $CategoryName == 'Audiobooks' || $CategoryName == 'Comedy') {
-          $Links .= ($CategoryName == 'Music' ? Artists::display_artists(Requests::get_artists($Result['PageID'])) : '') . '<a href="requests.php?action=view&amp;id=' . $Result['PageID'] . '" dir="ltr">' . $Request['Title'] . " [" . $Request['Year'] . "]</a>";
+            $Links .= ($CategoryName == 'Music' ? Artists::display_artists(Requests::get_artists($Result['PageID'])) : '') . '<a href="requests.php?action=view&amp;id=' . $Result['PageID'] . '" dir="ltr">' . $Request['Title'] . " [" . $Request['Year'] . "]</a>";
         } else {
-          $Links .= '<a href="requests.php?action=view&amp;id=' . $Result['PageID'] . '">' . $Request['Title'] . "</a>";
-        }
+          */
+            $Links .= '<a href="requests.php?action=view&amp;id=' . $Result['PageID'] . '">' . $Request['Title'] . "</a>";
+        #} # else
         $JumpLink = 'requests.php?action=view&amp;id=' . $Result['PageID'] . '&amp;postid=' . $Result['PostID'] . '#post' . $Result['PostID'];
         break;
       case 'torrents':
         if (!isset($TorrentGroups[$Result['PageID']])) {
-          continue;
+            continue;
         }
         $GroupInfo = $TorrentGroups[$Result['PageID']];
         $Links = 'Torrent: ' . Artists::display_artists($GroupInfo['ExtendedArtists']) . '<a href="torrents.php?id=' . $GroupInfo['ID'] . '" dir="ltr">' . $GroupInfo['Name'] . '</a>';
         if ($GroupInfo['Year'] > 0) {
-          $Links .= " [" . $GroupInfo['Year'] . "]";
+            $Links .= " [" . $GroupInfo['Year'] . "]";
         }
         if ($GroupInfo['ReleaseType'] > 0) {
-          $Links .= " [" . $ReleaseTypes[$GroupInfo['ReleaseType']] . "]";
+            $Links .= " [" . $ReleaseTypes[$GroupInfo['ReleaseType']] . "]";
         }
         $JumpLink = 'torrents.php?id=' . $GroupInfo['ID'] . '&amp;postid=' . $Result['PostID'] . '#post' . $Result['PostID'];
         break;
@@ -197,59 +206,77 @@ if (!$NumResults) {
         break;
       default:
         error(0);
-    }
-?>
-  <table class="forum_post box vertical_margin<?=(!Users::has_avatars_enabled() ? ' noavatar' : '')?>">
+    } ?>
+
+  <table
+    class="forum_post box vertical_margin<?=(!Users::has_avatars_enabled() ? ' noavatar' : '')?>">
     <colgroup>
-<?    if (Users::has_avatars_enabled()) { ?>
+      <?php if (Users::has_avatars_enabled()) { ?>
       <col class="col_avatar" />
-<?    } ?>
+      <?php } ?>
       <col class="col_post_body" />
     </colgroup>
-    <tr class="colhead_dark notify_<?=$Result['Page']?>">
+    <tr
+      class="colhead_dark notify_<?=$Result['Page']?>">
       <td colspan="<?=Users::has_avatars_enabled() ? 2 : 1 ?>">
         <span class="float_left">
           <?=$Links . ($Result['PostID'] < $Result['LastPost'] ? ' <span class="new">(New!)</span>' : '')?>
         </span>
-        <a class="tooltip last_read" title="Jump to last read" href="<?=$JumpLink?>">
-          <svg width="15" height="11"><polygon points="0,3 0,8 8,8 8,11 15,5.5 8,0 8,3"/></svg>
+        <a class="tooltip last_read" title="Jump to last read"
+          href="<?=$JumpLink?>">
+          <svg width="15" height="11">
+            <polygon points="0,3 0,8 8,8 8,11 15,5.5 8,0 8,3" /></svg>
         </a>
-<?    if ($Result['Page'] == 'forums') { ?>
-        <span id="bar<?=$Result['PostID'] ?>" class="float_right">
-          <a href="#" onclick="Subscribe(<?=$Result['PageID']?>); return false;" id="subscribelink<?=$Result['PageID']?>" class="brackets">Unsubscribe</a>
-<?    } else { ?>
-        <span id="bar_<?=$Result['Page'] . $Result['PostID'] ?>" class="float_right">
-          <a href="#" onclick="SubscribeComments('<?=$Result['Page']?>', <?=$Result['PageID']?>); return false;" id="subscribelink_<?=$Result['Page'] . $Result['PageID']?>" class="brackets">Unsubscribe</a>
-<?    } ?>
-          &nbsp;
-          <a href="#">&uarr;</a>
-        </span>
+        <?php if ($Result['Page'] === 'forums') { ?>
+        <span id="bar<?=$Result['PostID'] ?>"
+          class="float_right">
+          <a href="#"
+            onclick="Subscribe(<?=$Result['PageID']?>); return false;"
+            id="subscribelink<?=$Result['PageID']?>"
+            class="brackets">Unsubscribe</a>
+          <?php } else { ?>
+          <span
+            id="bar_<?=$Result['Page'] . $Result['PostID'] ?>"
+            class="float_right">
+            <a href="#"
+              onclick="SubscribeComments('<?=$Result['Page']?>', <?=$Result['PageID']?>); return false;"
+              id="subscribelink_<?=$Result['Page'] . $Result['PageID']?>"
+              class="brackets">Unsubscribe</a>
+            <?php } ?>
+            &nbsp;
+            <a href="#">&uarr;</a>
+          </span>
       </td>
     </tr>
-<?    if (!empty($Result['LastReadBody'])) { // if a user is subscribed to a topic/comments but hasn't accessed the site ever, LastReadBody will be null - in this case we don't display a post. ?>
-    <tr class="row<?=$ShowCollapsed ? ' hidden' : '' ?>">
-<?      if (Users::has_avatars_enabled()) { ?>
+    <?php if (!empty($Result['LastReadBody'])) { // if a user is subscribed to a topic/comments but hasn't accessed the site ever, LastReadBody will be null - in this case we don't display a post.?>
+    <tr
+      class="row<?=$ShowCollapsed ? ' hidden' : '' ?>">
+      <?php if (Users::has_avatars_enabled()) { ?>
       <td class="avatar" valign="top">
         <?=Users::show_avatar($Result['LastReadAvatar'], $Result['LastReadUserID'], $Result['LastReadUsername'], $HeavyInfo['DisableAvatars'])?>
       </td>
-<?      } ?>
+      <?php } ?>
       <td class="body" valign="top">
         <div class="content3">
           <?=Text::full_format($Result['LastReadBody']) ?>
-<?      if ($Result['LastReadEditedUserID']) { ?>
+          <?php if ($Result['LastReadEditedUserID']) { ?>
           <br /><br />
-          Last edited by <?=Users::format_username($Result['LastReadEditedUserID'], false, false, false) ?> <?=time_diff($Result['LastReadEditedTime'])?>
-<?      } ?>
+          Last edited by <?=Users::format_username($Result['LastReadEditedUserID'], false, false, false) ?>
+          <?=time_diff($Result['LastReadEditedTime'])?>
+          <?php } ?>
         </div>
       </td>
     </tr>
-<?    } ?>
+    <?php } ?>
   </table>
-<?  } ?>
+  <?php
+  } ?>
+
   <div class="linkbox">
-<?=$Pages?>
+    <?=$Pages?>
   </div>
-<? }?>
+  <?php
+    }?>
 </div>
-<?
-View::show_footer();
+
+<?php View::show_footer();