Classes

classes/artists.class.php

 <?php
+
 class Artists
 {
 
     {
         $Results = [];
         $DBs = [];
+
         foreach ($GroupIDs as $GroupID) {
             if (!is_number($GroupID)) {
                 continue;
             }
+
             $Artists = G::$Cache->get_value('groups_artists_'.$GroupID);
             if (is_array($Artists)) {
                 $Results[$GroupID] = $Artists;
                 $DBs[] = $GroupID;
             }
         }
+
         if (count($DBs) > 0) {
             $IDs = implode(',', $DBs);
             if (empty($IDs)) {
                 $IDs = "null";
             }
+
             $QueryID = G::$DB->get_query_id();
             G::$DB->query("
-        SELECT ta.GroupID,
-          ta.ArtistID,
-          ag.Name
-        FROM torrents_artists AS ta
-          JOIN artists_group AS ag ON ta.ArtistID = ag.ArtistID
-        WHERE ta.GroupID IN ($IDs)
-        ORDER BY ta.GroupID ASC,
-          ag.Name ASC;");
+            SELECT ta.GroupID,
+              ta.ArtistID,
+              ag.Name
+            FROM torrents_artists AS ta
+              JOIN artists_group AS ag ON ta.ArtistID = ag.ArtistID
+              WHERE ta.GroupID IN ($IDs)
+              ORDER BY ta.GroupID ASC,
+              ag.Name ASC;");
+
             while (list($GroupID, $ArtistID, $ArtistName) = G::$DB->next_record(MYSQLI_BOTH, false)) {
                 $Results[$GroupID][] = array('id' => $ArtistID, 'name' => $ArtistName);
                 $New[$GroupID][] = array('id' => $ArtistID, 'name' => $ArtistName);
             }
+
             G::$DB->set_query_id($QueryID);
             foreach ($DBs as $GroupID) {
                 if (isset($New[$GroupID])) {
                     G::$Cache->cache_value('groups_artists_'.$GroupID, []);
                 }
             }
+
             $Missing = array_diff($GroupIDs, array_keys($Results));
             if (!empty($Missing)) {
                 $Results += array_fill_keys($Missing, []);
             $link = Artists::display_artist($Artists[0], $MakeLink, $Escape).'  et al.'.($IncludeHyphen? ' – ':'');
             #$link = "Various".($IncludeHyphen?' – ':'');
         }
-    
             return $link;
         } else {
             return '';
     {
         $QueryID = G::$DB->get_query_id();
         G::$DB->query("
-      SELECT Name
-      FROM artists_group
-      WHERE ArtistID = ".$ArtistID);
+        SELECT Name
+        FROM artists_group
+          WHERE ArtistID = ".$ArtistID);
         list($Name) = G::$DB->next_record(MYSQLI_NUM, false);
 
         // Delete requests
         G::$DB->query("
-      SELECT RequestID
-      FROM requests_artists
-      WHERE ArtistID = $ArtistID
-        AND ArtistID != 0");
+        SELECT RequestID
+        FROM requests_artists
+          WHERE ArtistID = $ArtistID
+          AND ArtistID != 0");
+
         $Requests = G::$DB->to_array();
         foreach ($Requests as $Request) {
             list($RequestID) = $Request;
         } else {
             $Username = 'System';
         }
+        
         Misc::write_log("Artist $ArtistID ($Name) was deleted by $Username");
         G::$DB->set_query_id($QueryID);
     }

classes/autoenable.class.php

 <?php
 
+# todo: Check strict equality gently
 class AutoEnable
 {
-
     // Constants for database values
     const APPROVED = 1;
     const DENIED = 2;
 
         // Get the user's ID
         G::$DB->query("
-                SELECT um.ID, ui.BanReason
-                FROM users_main AS um
-                JOIN users_info ui ON ui.UserID = um.ID
-                WHERE um.Username = '$Username'
-                  AND um.Enabled = '2'");
+        SELECT um.ID, ui.BanReason
+        FROM users_main AS um
+          JOIN users_info ui ON ui.UserID = um.ID
+          WHERE um.Username = '$Username'
+          AND um.Enabled = '2'");
 
         if (G::$DB->has_results()) {
             // Make sure the user can make another request
             SELECT 1 FROM users_enable_requests
             WHERE UserID = '$UserID'
               AND (
-                    (
-                      Timestamp > NOW() - INTERVAL 1 WEEK
-                        AND HandledTimestamp IS NULL
-                    )
-                    OR
-                    (
-                      Timestamp > NOW() - INTERVAL 2 MONTH
-                      AND
-                      Outcome = '".self::DENIED."'
-                    )
-                  )");
+                (
+                  Timestamp > NOW() - INTERVAL 1 WEEK
+                  AND HandledTimestamp IS NULL
+                )
+                OR
+                (
+                  Timestamp > NOW() - INTERVAL 2 MONTH
+                  AND
+                  Outcome = '".self::DENIED."'
+                )
+            )");
         }
 
         $IP = $_SERVER['REMOTE_ADDR'];
                 //self::handle_requests([$RequestID], self::APPROVED, "Automatically approved (inactivity)");
             }
         }
-
         return $Output;
     }
 
             // Prepare email
             require_once(SERVER_ROOT . '/classes/templates.class.php');
             $TPL = new TEMPLATE;
+
             if ($Status == self::APPROVED) {
                 $TPL->open(SERVER_ROOT . '/templates/enable_request_accepted.tpl');
                 $TPL->set('SITE_DOMAIN', SITE_DOMAIN);
         // User notes stuff
         $StaffID = G::$LoggedUser['ID'] ?? 0;
         G::$DB->query("
-            SELECT Username
-            FROM users_main
-            WHERE ID = ?", $StaffID);
+        SELECT Username
+        FROM users_main
+          WHERE ID = ?", $StaffID);
         if (G::$DB->has_results()) {
             list($StaffUser) = G::$DB->next_record();
         } else {
 
         // Update database values and decrement cache
         G::$DB->query("
-                UPDATE users_enable_requests
-                SET HandledTimestamp = NOW(),
-                    CheckedBy = ?,
-                    Outcome = ?
-                WHERE ID IN (".implode(',', $IDs).")", $StaffID, $Status);
+        UPDATE users_enable_requests
+        SET HandledTimestamp = NOW(),
+          CheckedBy = ?,
+          Outcome = ?
+          WHERE ID IN (".implode(',', $IDs).")", $StaffID, $Status);
         G::$Cache->decrement_value(self::CACHE_KEY_NAME, count($IDs));
     }
 
         }
 
         G::$DB->query("
-            SELECT UserID
-            FROM users_enable_requests
-            WHERE Outcome = '" . self::DISCARDED . "'
-              AND ID = '$ID'");
+        SELECT UserID
+        FROM users_enable_requests
+          WHERE Outcome = '" . self::DISCARDED . "'
+          AND ID = '$ID'");
 
         if (!G::$DB->has_results()) {
             error(404);
         }
 
         G::$DB->query("
-            SELECT Username
-            FROM users_main
-            WHERE ID = '" . G::$LoggedUser['ID'] . "'");
+        SELECT Username
+        FROM users_main
+          WHERE ID = '" . G::$LoggedUser['ID'] . "'");
         list($StaffUser) = G::$DB->next_record();
 
         Tools::update_user_notes($UserID, sqltime() . " - Enable request $ID unresolved by [user]" . $StaffUser . '[/user]' . "\n\n");
         G::$DB->query("
-            UPDATE users_enable_requests
-            SET Outcome = NULL, HandledTimestamp = NULL, CheckedBy = NULL
-            WHERE ID = '$ID'");
+        UPDATE users_enable_requests
+        SET Outcome = NULL, HandledTimestamp = NULL, CheckedBy = NULL
+          WHERE ID = '$ID'");
         G::$Cache->increment_value(self::CACHE_KEY_NAME);
     }
 
     {
         $Token = db_string($Token);
         G::$DB->query("
-            SELECT uer.UserID, uer.HandledTimestamp, um.torrent_pass, um.Visible, um.IP
-            FROM users_enable_requests AS uer
-            LEFT JOIN users_main AS um ON uer.UserID = um.ID
-            WHERE Token = '$Token'");
+        SELECT uer.UserID, uer.HandledTimestamp, um.torrent_pass, um.Visible, um.IP
+        FROM users_enable_requests AS uer
+          LEFT JOIN users_main AS um ON uer.UserID = um.ID
+          WHERE Token = '$Token'");
 
         if (G::$DB->has_results()) {
             list($UserID, $Timestamp, $TorrentPass, $Visible, $IP) = G::$DB->next_record();
         } else {
             $Err = "Invalid token.";
         }
-
         return $Err;
     }
 

classes/badges.class.php

-<?
-class Badges {
-  /**
-   * Given a UserID, returns that user's badges
-   *
-   * @param int $UserID
-   * @return array of BadgeIDs
-   */
-  public static function get_badges($UserID) {
-    return Users::user_info($UserID)['Badges'];
-  }
-
-  /**
-   * Awards UserID the given BadgeID
-   *
-   * @param int $UserID
-   * @param int $BadgeID
-   * @return bool success?
-   */
-  public static function award_badge($UserID, $BadgeID) {
-    if (self::has_badge($UserID, $BadgeID)) {
-      return false;
-    } else {
-      $QueryID = G::$DB->get_query_id();
-      G::$DB->query("
-        INSERT INTO users_badges
-          (UserID, BadgeID)
-        VALUES
-          ($UserID, $BadgeID)");
-      G::$DB->set_query_id($QueryID);
-
-      G::$Cache->delete_value('user_info_'.$UserID);
-
-      return true;
+<?php
+
+class Badges
+{
+    /**
+     * Given a UserID, returns that user's badges
+     *
+     * @param int $UserID
+     * @return array of BadgeIDs
+     */
+    public static function get_badges($UserID)
+    {
+        return Users::user_info($UserID)['Badges'];
     }
-  }
-
-  /**
-   * Given a UserID, return that user's displayed badges
-   *
-   * @param int $UserID
-   * @return array of BadgeIDs
-   */
-  public static function get_displayed_badges($UserID) {
-    $Result = [];
-
-    $Badges = self::get_badges($UserID);
 
-    foreach ($Badges as $Badge => $Displayed) {
-      if ($Displayed)
-        $Result[] = $Badge;
+    /**
+     * Awards UserID the given BadgeID
+     *
+     * @param int $UserID
+     * @param int $BadgeID
+     * @return bool success?
+     */
+    public static function award_badge($UserID, $BadgeID)
+    {
+        if (self::has_badge($UserID, $BadgeID)) {
+            return false;
+        } else {
+            $QueryID = G::$DB->get_query_id();
+            G::$DB->query("
+            INSERT INTO users_badges
+              (UserID, BadgeID)
+            VALUES
+              ($UserID, $BadgeID)");
+
+            G::$DB->set_query_id($QueryID);
+            G::$Cache->delete_value('user_info_'.$UserID);
+            return true;
+        }
     }
-    return $Result;
-  }
-
-  /**
-   * Returns true if the given user owns the given badge
-   *
-   * @param int $UserID
-   * @param int $BadgeID
-   * @return bool
-   */
-  public static function has_badge($UserID, $BadgeID) {
-    $Badges = self::get_badges($UserID);
-
-    return array_key_exists($BadgeID, $Badges);
-  }
-
-  /**
-   * Creates HTML for displaying a badge.
-   *
-   * @param int $BadgeID
-   * @param bool $Tooltip Should HTML contain a tooltip?
-   * @return string HTML
-   */
-  public static function display_badge($BadgeID, $Tooltip = false) {
-    $html = "";
 
-    if (($Badges = G::$Cache->get_value('badges')) && array_key_exists($BadgeID, $Badges)) {
-      extract($Badges[$BadgeID]);
-    } else {
-      self::update_badge_cache();
-      if (($Badges = G::$Cache->get_value('badges')) && array_key_exists($BadgeID, $Badges)) {
-        extract($Badges[$BadgeID]);
-      } else {
-        global $Debug;
-        $Debug->analysis('Invalid BadgeID ' . $BadgeID . ' requested.');
-      }
+    /**
+     * Given a UserID, return that user's displayed badges
+     *
+     * @param int $UserID
+     * @return array of BadgeIDs
+     */
+    public static function get_displayed_badges($UserID)
+    {
+        $Result = [];
+        $Badges = self::get_badges($UserID);
+
+        foreach ($Badges as $Badge => $Displayed) {
+            if ($Displayed) {
+                $Result[] = $Badge;
+            }
+        }
+        return $Result;
     }
 
-    if ($Tooltip) {
-      $html .= '<a class="badge_icon"><img class="tooltip" alt="'.$Name.'" title="'.$Name.'</br>'.$Description.'" src="'.$Icon.'" /></a>';
-    } else {
-      $html .= '<a class="badge_icon"><img alt="'.$Name.'" title="'.$Name.'" src="'.$Icon.'" /></a>';
+    /**
+     * Returns true if the given user owns the given badge
+     *
+     * @param int $UserID
+     * @param int $BadgeID
+     * @return bool
+     */
+    public static function has_badge($UserID, $BadgeID)
+    {
+        $Badges = self::get_badges($UserID);
+        return array_key_exists($BadgeID, $Badges);
     }
 
-    return $html;
-  }
+    /**
+     * Creates HTML for displaying a badge.
+     *
+     * @param int $BadgeID
+     * @param bool $Tooltip Should HTML contain a tooltip?
+     * @return string HTML
+     */
+    public static function display_badge($BadgeID, $Tooltip = false)
+    {
+        $html = "";
+        if (($Badges = G::$Cache->get_value('badges')) && array_key_exists($BadgeID, $Badges)) {
+            extract($Badges[$BadgeID]);
+        } else {
+            self::update_badge_cache();
+            if (($Badges = G::$Cache->get_value('badges')) && array_key_exists($BadgeID, $Badges)) {
+                extract($Badges[$BadgeID]);
+            } else {
+                global $Debug;
+                $Debug->analysis('Invalid BadgeID ' . $BadgeID . ' requested.');
+            }
+        }
+
+        if ($Tooltip) {
+            $html .= '<a class="badge_icon"><img class="tooltip" alt="'.$Name.'" title="'.$Name.'</br>'.$Description.'" src="'.$Icon.'" /></a>';
+        } else {
+            $html .= '<a class="badge_icon"><img alt="'.$Name.'" title="'.$Name.'" src="'.$Icon.'" /></a>';
+        }
+        return $html;
+    }
 
-  public static function display_badges($BadgeIDs, $Tooltip = false) {
-    $html = "";
-    foreach ($BadgeIDs as $BadgeID) {
-      $html .= self::display_badge($BadgeID, $Tooltip);
+    public static function display_badges($BadgeIDs, $Tooltip = false)
+    {
+        $html = "";
+        foreach ($BadgeIDs as $BadgeID) {
+            $html .= self::display_badge($BadgeID, $Tooltip);
+        }
+        return $html;
     }
-    return $html;
-  }
 
-  private static function update_badge_cache() {
-      $QueryID = G::$DB->get_query_id();
+    private static function update_badge_cache()
+    {
+        $QueryID = G::$DB->get_query_id();
 
-      G::$DB->query("
+        G::$DB->query("
         SELECT
         ID, Icon, Name, Description
         FROM badges");
 
-      $badges = [];
-      if (G::$DB->has_results()) {
-        while(list($id, $icon, $name, $description) = G::$DB->next_record()) {
-          $badges[$id] = array('Icon' => $icon, 'Name' => $name, 'Description' => $Description);
+        $badges = [];
+        if (G::$DB->has_results()) {
+            while (list($id, $icon, $name, $description) = G::$DB->next_record()) {
+                $badges[$id] = array('Icon' => $icon, 'Name' => $name, 'Description' => $Description);
+            }
+            G::$Cache->cache_value('badges', $badges);
         }
-        G::$Cache->cache_value('badges', $badges);
-      }
 
-      G::$DB->set_query_id($QueryID);
-  }
+        G::$DB->set_query_id($QueryID);
+    }
 
-  public static function get_all_badges() {
-    if (($Badges = G::$Cache->get_value('badges'))) {
-      return $Badges;
-    } else {
-      self::update_badge_cache();
-      return G::$Cache->get_value('badges');
+    public static function get_all_badges()
+    {
+        if (($Badges = G::$Cache->get_value('badges'))) {
+            return $Badges;
+        } else {
+            self::update_badge_cache();
+            return G::$Cache->get_value('badges');
+        }
     }
-  }
 }
-?>

classes/bencode.class.php

         } else {
             $Data =& $Arg;
         }
+
         if ($Keys === true) {
             $this->Data = $Data;
         } elseif ($Keys === false) {
         } else {
             $this->Data = isset($Data[$Keys]) ? $Data[$Keys] : false;
         }
+
         if (!$this->Data) {
             return false;
         }
+
         $this->Enc = $this->_benc();
         return $this->Enc;
     }
             if (Int64::is_int($this->Data)) { // Integer
                 return 'i'.Int64::get($this->Data).'e';
             }
+
             if ($this->Data === true) { // Empty dictionary
                 return 'de';
             }
             return strlen($this->Data).':'.$this->Data; // String
         }
+
         if (empty($this->Data) || Int64::is_int(key($this->Data))) {
             $IsDict = false;
         } else {
             $IsDict = true;
             ksort($this->Data); // Dictionaries must be sorted
         }
+        
         $Ret = $IsDict ? 'd' : 'l';
         foreach ($this->Data as $Key => $Value) {
             if ($IsDict) {

classes/bencodedecode.class.php

 <?php
+
 /**
  * The decode class is simple and straightforward. The only thing to
  * note is that empty dictionaries are represented by boolean trues
         if (!$Strict) {
             $this->ExitOnError = false;
         }
+
         if ($Arg === false) {
             if (empty($this->Enc)) {
                 return false;
         if (empty($Path)) {
             return false;
         }
+
         if (!$this->Data = @file_get_contents($Path, FILE_BINARY)) {
             return $this->error("Error: file '$Path' could not be opened.\n");
         }
         } elseif (!$this->Data) {
             $this->Data = $this->Enc;
         }
+
         if (!$this->Data) {
             return false;
         }
+
         $this->Length = strlen($this->Data);
         $this->Pos = 0;
         $this->Dec = $this->_bdec();
+
         if ($this->Pos < $this->Length) {
             // Not really necessary, but if the torrent is invalid, it's better to warn than to silently truncate it
             return $this->error();
         if ($Data === false) {
             $Data = $this->Dec;
         }
+
         if (Int64::is_int($Data)) {
             return Int64::get($Data);
         }
+
         if (is_bool($Data)) {
             return [];
         }
+
         if (is_array($Data)) {
             $Output = [];
             foreach ($Data as $Key => $Val) {
             // The recursive nature of the class requires this to avoid duplicate error messages
             return false;
         }
+
         if ($this->ExitOnError) {
             if ($ErrMsg === false) {
                 printf(
             }
             exit();
         }
+        
         $ErrorPos = $this->Pos;
         return false;
     }

classes/bencodetorrent.class.php

 <?php
+
 /**
  * Torrent class that contains some convenient functions related to torrent meta data
  */
         if (empty($this->Dec)) {
             return false;
         }
+
         $InfoDict =& $this->Dec['info'];
         if (!isset($InfoDict['files'])) {
             // Single-file torrent
             if (isset($InfoDict['path.utf-8']['files'][0])) {
                 $this->PathKey = 'path.utf-8';
             }
+            
             foreach ($InfoDict['files'] as $File) {
                 $TmpPath = [];
                 foreach ($File[$this->PathKey] as $SubPath) {

classes/bitcoinrpc.class.php

 <?php
-class BitcoinRpc {
 
-  public static function __callStatic($Method, $Args) {
-    if (!defined('BITCOIN_RPC_URL')) {
-      return false;
-    }
-    $MessageID = mt_rand();
-    $Params = json_encode(array(
-      'method' => $Method,
-      'params' => $Args,
-      'id' => $MessageID)
-    );
+class BitcoinRpc
+{
+    public static function __callStatic($Method, $Args)
+    {
+        if (!defined('BITCOIN_RPC_URL')) {
+            return false;
+        }
 
-    $Request = array(
-      'http' => array(
-        'method' => 'POST',
-        'header' => 'Content-type: application/json',
-        'content' => $Params
-        )
-      );
+        $MessageID = mt_rand();
+        $Params = json_encode(
+            array(
+                'method' => $Method,
+                'params' => $Args,
+                'id' => $MessageID
+            )
+        );
 
-    if (!$Response = file_get_contents(BITCOIN_RPC_URL, false, stream_context_create($Request))) {
-      return false;
-    }
-    $Response = json_decode($Response);
-    if ($Response->id != $MessageID || !empty($Response->error) || empty($Response->result)) {
-      return false;
+        $Request = array(
+            'http' => array(
+                'method' => 'POST',
+                'header' => 'Content-type: application/json',
+                'content' => $Params
+            )
+        );
+
+        if (!$Response = file_get_contents(BITCOIN_RPC_URL, false, stream_context_create($Request))) {
+            return false;
+        }
+
+        $Response = json_decode($Response);
+        if ($Response->id != $MessageID || !empty($Response->error) || empty($Response->result)) {
+            return false;
+        }
+        
+        return $Response->result;
     }
-    return $Response->result;
-  }
 }

classes/bookmarks.class.php

-<?
-class Bookmarks {
+<?php
 
-  /**
-   * Check if can bookmark
-   *
-   * @param string $Type
-   * @return boolean
-   */
-  public static function can_bookmark($Type) {
-    return in_array($Type, array(
+class Bookmarks
+{
+    /**
+     * Check if can bookmark
+     *
+     * @param string $Type
+     * @return boolean
+     */
+    public static function can_bookmark($Type)
+    {
+        return in_array($Type, array(
         'torrent',
         'artist',
         'collage',
         'request'
     ));
-  }
-
-  /**
-   * Get the bookmark schema.
-   * Recommended usage:
-   * list($Table, $Col) = bookmark_schema('torrent');
-   *
-   * @param string $Type the type to get the schema for
-   */
-  public static function bookmark_schema($Type) {
-    switch ($Type) {
-      case 'torrent':
-        return array(
-            'bookmarks_torrents',
-            'GroupID'
-        );
-        break;
-      case 'artist':
-        return array(
-            'bookmarks_artists',
-            'ArtistID'
-        );
-        break;
-      case 'collage':
-        return array(
-            'bookmarks_collages',
-            'CollageID'
-        );
-        break;
-      case 'request':
-        return array(
-            'bookmarks_requests',
-            'RequestID'
-        );
-        break;
-      default:
-        die('HAX');
     }
-  }
 
-  /**
-   * Check if something is bookmarked
-   *
-   * @param string $Type
-   *          type of bookmarks to check
-   * @param int $ID
-   *          bookmark's id
-   * @return boolean
-   */
-  public static function has_bookmarked($Type, $ID) {
-    return in_array($ID, self::all_bookmarks($Type));
-  }
+    /**
+     * Get the bookmark schema.
+     * Recommended usage:
+     * list($Table, $Col) = bookmark_schema('torrent');
+     *
+     * @param string $Type the type to get the schema for
+     */
+    public static function bookmark_schema($Type)
+    {
+        switch ($Type) {
+          case 'torrent':
+            return array(
+              'bookmarks_torrents',
+              'GroupID'
+            );
+            break;
+
+          case 'artist':
+            return array(
+              'bookmarks_artists',
+              'ArtistID'
+            );
+            break;
+
+          case 'collage':
+            return array(
+              'bookmarks_collages',
+              'CollageID'
+             );
+            break;
+
+          case 'request':
+            return array(
+              'bookmarks_requests',
+              'RequestID'
+            );
+            break;
+
+          default:
+            die('h4x');
+        }
+    }
 
-  /**
-   * Fetch all bookmarks of a certain type for a user.
-   * If UserID is false than defaults to G::$LoggedUser['ID']
-   *
-   * @param string $Type
-   *          type of bookmarks to fetch
-   * @param int $UserID
-   *          userid whose bookmarks to get
-   * @return array the bookmarks
-   */
-  public static function all_bookmarks($Type, $UserID = false) {
-    if ($UserID === false) {
-      $UserID = G::$LoggedUser['ID'];
+    /**
+     * Check if something is bookmarked
+     *
+     * @param string $Type
+     *          type of bookmarks to check
+     * @param int $ID
+     *          bookmark's id
+     * @return boolean
+     */
+    public static function has_bookmarked($Type, $ID)
+    {
+        return in_array($ID, self::all_bookmarks($Type));
     }
-    $CacheKey = 'bookmarks_' . $Type . '_' . $UserID;
-    if (($Bookmarks = G::$Cache->get_value($CacheKey)) === false) {
-      list ($Table, $Col) = self::bookmark_schema($Type);
-      $QueryID = G::$DB->get_query_id();
-      G::$DB->query("
-        SELECT $Col
-        FROM $Table
-        WHERE UserID = '$UserID'");
-      $Bookmarks = G::$DB->collect($Col);
-      G::$DB->set_query_id($QueryID);
-      G::$Cache->cache_value($CacheKey, $Bookmarks, 0);
+
+    /**
+     * Fetch all bookmarks of a certain type for a user.
+     * If UserID is false than defaults to G::$LoggedUser['ID']
+     *
+     * @param string $Type
+     *          type of bookmarks to fetch
+     * @param int $UserID
+     *          userid whose bookmarks to get
+     * @return array the bookmarks
+     */
+    public static function all_bookmarks($Type, $UserID = false)
+    {
+        if ($UserID === false) {
+            $UserID = G::$LoggedUser['ID'];
+        }
+
+        $CacheKey = 'bookmarks_' . $Type . '_' . $UserID;
+        if (($Bookmarks = G::$Cache->get_value($CacheKey)) === false) {
+            list($Table, $Col) = self::bookmark_schema($Type);
+            $QueryID = G::$DB->get_query_id();
+
+            G::$DB->query("
+            SELECT $Col
+            FROM $Table
+              WHERE UserID = '$UserID'");
+
+            $Bookmarks = G::$DB->collect($Col);
+            G::$DB->set_query_id($QueryID);
+            G::$Cache->cache_value($CacheKey, $Bookmarks, 0);
+        }
+        return $Bookmarks;
     }
-    return $Bookmarks;
-  }
 }
-?>

classes/cache.class.php

 <?php
+
 /*************************************************************************|
 |--------------- Caching class -------------------------------------------|
 |*************************************************************************|

classes/calendar.class.php

-<?
-class Calendar {
-  public static $Categories = array(1 => "IRC Meeting", "IRC Brainstorm", "Poll Deadline", "Feature Release", "Blog Post", "Announcement", "Featured Album", "Product Release", "Staff Picks", "Forum Brainstorm", "Forum Discussion", "Promotion", "Absence", "Task");
-  public static $Importances = array(1 => "Critical", "Important", "Average", "Meh");
-  public static $Colors = array(
-                  "Critical" => "red",
-                  "Important" => "yellow",
-                  "Average" => "green",
-                  "Meh" => "blue");
-
-  public static $Teams = array(
-                  0 => "Everyone",
-                  1 => "Staff"
-
-                  );
-
-  public static function can_view() {
-    return check_perms('users_mod')
-
-      ;
-  }
-
-  private static function get_teams_query() {
-    $Teams = array(0);
-    $IsMod = check_perms("users_mod");
-    if ($IsMod) {
-      $Teams[] = 1;
+<?php
+
+class Calendar
+{
+    public static $Categories = array(1 => "IRC Meeting", "IRC Brainstorm", "Poll Deadline", "Feature Release", "Blog Post", "Announcement", "Featured Album", "Product Release", "Staff Picks", "Forum Brainstorm", "Forum Discussion", "Promotion", "Absence", "Task");
+    public static $Importances = array(1 => "Critical", "Important", "Average", "Meh");
+    public static $Colors = array(
+        "Critical" => "red",
+        "Important" => "yellow",
+        "Average" => "green",
+        "Meh" => "blue"
+      );
+
+    public static $Teams = array(
+        0 => "Everyone",
+        1 => "Staff"
+    );
+
+    public static function can_view()
+    {
+        return check_perms('users_mod');
     }
 
-    return "Team IN (" . implode(",", $Teams) . ") ";
-  }
+    private static function get_teams_query()
+    {
+        $Teams = array(0);
+        $IsMod = check_perms("users_mod");
 
-  public static function get_events($Month, $Year) {
-    if (empty($Month) || empty($Year)) {
-      $Date = getdate();
-      $Month = $Date['mon'];
-      $Year = $Date['year'];
+        if ($IsMod) {
+            $Teams[] = 1;
+        }
+        return "Team IN (" . implode(",", $Teams) . ") ";
     }
-    $Month = (int)$Month;
-    $Year = (int)$Year;
-
-    $TeamsSQL = self::get_teams_query();
-
-    $QueryID = G::$DB->get_query_id();
-    G::$DB->query("
-            SELECT
-              ID, Team, Title, Category, Importance, DAY(StartDate) AS StartDay, DAY(EndDate) AS EndDay
-            FROM calendar
-            WHERE
-              MONTH(StartDate) = '$Month'
-            AND
-              YEAR(StartDate) = '$Year'
-            AND
-              $TeamsSQL");
-    $Events = G::$DB->to_array();
-    G::$DB->set_query_id($QueryID);
-    return $Events;
-  }
-
-  public static function get_event($ID) {
-    $ID = (int)$ID;
-    if (empty($ID)) {
-      error("Invalid ID");
+
+    public static function get_events($Month, $Year)
+    {
+        if (empty($Month) || empty($Year)) {
+            $Date = getdate();
+            $Month = $Date['mon'];
+            $Year = $Date['year'];
+        }
+
+        $Month = (int)$Month;
+        $Year = (int)$Year;
+
+        $TeamsSQL = self::get_teams_query();
+
+        $QueryID = G::$DB->get_query_id();
+        G::$DB->query("
+        SELECT
+          ID, Team, Title, Category, Importance, DAY(StartDate) AS StartDay, DAY(EndDate) AS EndDay
+        FROM calendar
+          WHERE
+          MONTH(StartDate) = '$Month'
+          AND
+          YEAR(StartDate) = '$Year'
+          AND
+          $TeamsSQL");
+
+        $Events = G::$DB->to_array();
+        G::$DB->set_query_id($QueryID);
+        return $Events;
     }
-    $TeamsSQL = self::get_teams_query();
-    $QueryID = G::$DB->get_query_id();
-    G::$DB->query("
-            SELECT
-              ID, Team, Title, Body, Category, Importance, AddedBy, StartDate, EndDate
-            FROM calendar
-            WHERE
-              ID = '$ID'
-            AND
-              $TeamsSQL");
-    $Event = G::$DB->next_record(MYSQLI_ASSOC);
-    G::$DB->set_query_id($QueryID);
-    return $Event;
-  }
-
-  public static function create_event($Title, $Body, $Category, $Importance, $Team, $UserID, $StartDate, $EndDate = null) {
-    if (empty($Title) || empty($Body) || !is_number($Category) || !is_number($Importance)  || !is_number($Team) || empty($StartDate)) {
-      error("Error adding event");
+
+    public static function get_event($ID)
+    {
+        $ID = (int)$ID;
+        if (empty($ID)) {
+            error("Invalid ID");
+        }
+
+        $TeamsSQL = self::get_teams_query();
+        $QueryID = G::$DB->get_query_id();
+
+        G::$DB->query("
+        SELECT
+          ID, Team, Title, Body, Category, Importance, AddedBy, StartDate, EndDate
+        FROM calendar
+          WHERE
+          ID = '$ID'
+          AND
+          $TeamsSQL");
+
+        $Event = G::$DB->next_record(MYSQLI_ASSOC);
+        G::$DB->set_query_id($QueryID);
+        return $Event;
     }
-    $Title = db_string($Title);
-    $Body = db_string($Body);
-    $Category = (int)$Category;
-    $Importance = (int)$Importance;
-    $UserID = (int)$UserID;
-    $Team = (int)$Team;
-    $StartDate = db_string($StartDate);
-    $EndDate = db_string($EndDate);
-
-    $QueryID = G::$DB->get_query_id();
-    G::$DB->query("
-            INSERT INTO calendar
-              (Title, Body, Category, Importance, Team, StartDate, EndDate, AddedBy)
-            VALUES
-              ('$Title', '$Body', '$Category', '$Importance', '$Team', '$StartDate', '$EndDate', '$UserID')");
-    G::$DB->set_query_id($QueryID);
-    send_irc("PRIVMSG " . ADMIN_CHAN . " :!mod New calendar event created! Event: $Title; Starts: $StartDate; Ends: $EndDate.");
-  }
-
-  public static function update_event($ID, $Title, $Body, $Category, $Importance, $Team, $StartDate, $EndDate = null) {
-    if (!is_number($ID) || empty($Title) || empty($Body) || !is_number($Category) || !is_number($Importance) || !is_number($Team) || empty($StartDate)) {
-      error("Error updating event");
+
+    public static function create_event($Title, $Body, $Category, $Importance, $Team, $UserID, $StartDate, $EndDate = null)
+    {
+        if (empty($Title) || empty($Body) || !is_number($Category) || !is_number($Importance)  || !is_number($Team) || empty($StartDate)) {
+            error("Error adding event");
+        }
+
+        $Title = db_string($Title);
+        $Body = db_string($Body);
+        $Category = (int)$Category;
+        $Importance = (int)$Importance;
+        $UserID = (int)$UserID;
+        $Team = (int)$Team;
+        $StartDate = db_string($StartDate);
+        $EndDate = db_string($EndDate);
+
+        $QueryID = G::$DB->get_query_id();
+        G::$DB->query("
+        INSERT INTO calendar
+          (Title, Body, Category, Importance, Team, StartDate, EndDate, AddedBy)
+        VALUES
+          ('$Title', '$Body', '$Category', '$Importance', '$Team', '$StartDate', '$EndDate', '$UserID')");
+
+        G::$DB->set_query_id($QueryID);
+        send_irc("PRIVMSG " . ADMIN_CHAN . " :!mod New calendar event created! Event: $Title; Starts: $StartDate; Ends: $EndDate.");
     }
-    $ID = (int)$ID;
-    $Title = db_string($Title);
-    $Body = db_string($Body);
-    $Category = (int)$Category;
-    $Importance = (int)$Importance;
-    $Team = (int)$Team;
-    $StartDate = db_string($StartDate);
-    $EndDate = db_string($EndDate);
-    $QueryID = G::$DB->get_query_id();
-    G::$DB->query("
-            UPDATE calendar
-            SET
-              Title = '$Title',
-              Body = '$Body',
-              Category = '$Category',
-              Importance = '$Importance',
-              Team = '$Team',
-              StartDate = '$StartDate',
-              EndDate = '$EndDate'
-            WHERE
-              ID = '$ID'");
-    G::$DB->set_query_id($QueryID);
-  }
-
-  public static function remove_event($ID) {
-    $ID = (int)$ID;
-    if (!empty($ID)) {
-      $QueryID = G::$DB->get_query_id();
-      G::$DB->query("DELETE FROM calendar WHERE ID = '$ID'");
-      G::$DB->set_query_id($QueryID);
+
+    public static function update_event($ID, $Title, $Body, $Category, $Importance, $Team, $StartDate, $EndDate = null)
+    {
+        if (!is_number($ID) || empty($Title) || empty($Body) || !is_number($Category) || !is_number($Importance) || !is_number($Team) || empty($StartDate)) {
+            error("Error updating event");
+        }
+
+        $ID = (int)$ID;
+        $Title = db_string($Title);
+        $Body = db_string($Body);
+        $Category = (int)$Category;
+        $Importance = (int)$Importance;
+        $Team = (int)$Team;
+        $StartDate = db_string($StartDate);
+        $EndDate = db_string($EndDate);
+        $QueryID = G::$DB->get_query_id();
+
+        G::$DB->query("
+        UPDATE calendar
+        SET
+          Title = '$Title',
+          Body = '$Body',
+          Category = '$Category',
+          Importance = '$Importance',
+          Team = '$Team',
+          StartDate = '$StartDate',
+          EndDate = '$EndDate'
+        WHERE
+          ID = '$ID'");
+        G::$DB->set_query_id($QueryID);
     }
-  }
 
+    public static function remove_event($ID)
+    {
+        $ID = (int)$ID;
+        if (!empty($ID)) {
+            $QueryID = G::$DB->get_query_id();
+            G::$DB->query("DELETE FROM calendar WHERE ID = '$ID'");
+            G::$DB->set_query_id($QueryID);
+        }
+    }
 }

classes/classloader.php

-<?
+<?php
+
 /**
  * Load classes automatically when they're needed
  *
  * @param string $ClassName class name
  */
 spl_autoload_register(function ($ClassName) {
-  $FilePath = SERVER_ROOT . '/classes/' . strtolower($ClassName) . '.class.php';
-  if (!file_exists($FilePath)) {
-    // todo: Rename the following classes to conform with the code guidelines
-    switch ($ClassName) {
+    $FilePath = SERVER_ROOT . '/classes/' . strtolower($ClassName) . '.class.php';
+    if (!file_exists($FilePath)) {
+        // todo: Rename the following classes to conform with the code guidelines
+        switch ($ClassName) {
       case 'MASS_USER_BOOKMARKS_EDITOR':
         $FileName = 'mass_user_bookmarks_editor.class';
         break;
       default:
         die("Couldn't import class $ClassName");
     }
-    $FilePath = SERVER_ROOT . "/classes/$FileName.php";
-  }
-  require_once($FilePath);
+        $FilePath = SERVER_ROOT . "/classes/$FileName.php";
+    }
+    require_once($FilePath);
 });

classes/collages.class.php

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

classes/notificationsmanager.class.php

     const INFO = 'confirmation';
 
     public static $Importances = array(
-    'important' => self::IMPORTANT,
-    'critical' => self::CRITICAL,
-    'warning' => self::WARNING,
-    'info' => self::INFO);
+        'important' => self::IMPORTANT,
+        'critical' => self::CRITICAL,
+        'warning' => self::WARNING,
+        'info' => self::INFO
+    );
 
     // Types. These names must correspond to column names in users_notifications_settings
     const NEWS = 'News';
             if (!isset($this->Skipped[self::NEWS])) {
                 $this->load_news();
             }
+
             if (!isset($this->Skipped[self::BLOG])) {
                 $this->load_blog();
             }
+
             // if (!isset($this->Skipped[self::STAFFBLOG])) {
             //   $this->load_staff_blog();
             // }
+
             if (!isset($this->Skipped[self::STAFFPM])) {
                 $this->load_staff_pms();
             }
+
             if (!isset($this->Skipped[self::INBOX])) {
                 $this->load_inbox();
             }
+
             if (!isset($this->Skipped[self::TORRENTS])) {
                 $this->load_torrent_notifications();
             }
+
             if (!isset($this->Skipped[self::COLLAGES])) {
                 $this->load_collage_subscriptions();
             }
+
             if (!isset($this->Skipped[self::QUOTES])) {
                 $this->load_quote_notifications();
             }
+            
             if (!isset($this->Skipped[self::SUBSCRIPTIONS])) {
                 $this->load_subscriptions();
             }

classes/regex.php

 <?php
+
 // resource_type://username:password@domain:port/path?query_string#anchor
 define('RESOURCE_REGEX', '(https?|ftps?):\/\/');
 define('IP_REGEX', '(\d{1,3}\.){3}\d{1,3}');

classes/requests.class.php

 <?php
+
 class Requests
 {
     /**

classes/revisionhistory.class.php

-<?
-class RevisionHistory {
-  /**
-   * Read the revision history of an artist or torrent page
-   * @param string $Page artists or torrents
-   * @param in $PageID
-   * @return array
-   */
-  public static function get_revision_history($Page, $PageID) {
-    $Table = ($Page == 'artists') ? 'wiki_artists' : 'wiki_torrents';
-    $QueryID = G::$DB->get_query_id();
-    G::$DB->query("
-      SELECT
-        RevisionID,
-        Summary,
-        Time,
-        UserID
-      FROM $Table
-      WHERE PageID = $PageID
-      ORDER BY RevisionID DESC");
-    $Ret = G::$DB->to_array();
-    G::$DB->set_query_id($QueryID);
-    return $Ret;
-  }
+<?php
+
+class RevisionHistory
+{
+    /**
+     * Read the revision history of an artist or torrent page
+     * @param string $Page artists or torrents
+     * @param in $PageID
+     * @return array
+     */
+    public static function get_revision_history($Page, $PageID)
+    {
+        $Table = ($Page == 'artists') ? 'wiki_artists' : 'wiki_torrents';
+        $QueryID = G::$DB->get_query_id();
+
+        G::$DB->query("
+        SELECT
+          RevisionID,
+          Summary,
+          Time,
+          UserID
+        FROM $Table
+          WHERE PageID = $PageID
+          ORDER BY RevisionID DESC");
+
+        $Ret = G::$DB->to_array();
+        G::$DB->set_query_id($QueryID);
+        return $Ret;
+    }
 }

classes/revisionhistoryview.class.php

-<?
-class RevisionHistoryView {
-  /**
-   * Render the revision history
-   * @param array $RevisionHistory see RevisionHistory::get_revision_history
-   * @param string $BaseURL
-   */
-  public static function render_revision_history($RevisionHistory, $BaseURL) {
-?>
-  <table cellpadding="6" cellspacing="1" border="0" width="100%" class="box">
-    <tr class="colhead">
-      <td>Revision</td>
-      <td>Date</td>
-<? if (check_perms('users_mod')) { ?>
-      <td>User</td>
-<? } ?>
-      <td>Summary</td>
-    </tr>
-<?
+<?php
+
+class RevisionHistoryView
+{
+    /**
+     * Render the revision history
+     * @param array $RevisionHistory see RevisionHistory::get_revision_history
+     * @param string $BaseURL
+     */
+    public static function render_revision_history($RevisionHistory, $BaseURL)
+    {
+        ?>
+<table cellpadding="6" cellspacing="1" border="0" width="100%" class="box">
+  <tr class="colhead">
+    <td>Revision</td>
+    <td>Date</td>
+    <?php if (check_perms('users_mod')) { ?>
+    <td>User</td>
+    <?php } ?>
+    <td>Summary</td>
+  </tr>
+  <?php
     foreach ($RevisionHistory as $Entry) {
-      list($RevisionID, $Summary, $Time, $UserID) = $Entry;
-?>
-    <tr class="row">
-      <td>
-        <?= "<a href=\"$BaseURL&amp;revisionid=$RevisionID\">#$RevisionID</a>" ?>
-      </td>
-      <td>
-        <?=$Time?>
-      </td>
-<? if (check_perms('users_mod')) { ?>
-      <td>
-        <?=Users::format_username($UserID, false, false, false)?>
-      </td>
-<? } ?>
-      <td>
-        <?=($Summary ? $Summary : '(empty)')?>
-      </td>
-    </tr>
-<?    } ?>
-  </table>
-<?
-  }
+        list($RevisionID, $Summary, $Time, $UserID) = $Entry; ?>
+  <tr class="row">
+    <td>
+      <?= "<a href=\"$BaseURL&amp;revisionid=$RevisionID\">#$RevisionID</a>" ?>
+    </td>
+    <td>
+      <?=$Time?>
+    </td>
+    <?php if (check_perms('users_mod')) { ?>
+    <td>
+      <?=Users::format_username($UserID, false, false, false)?>
+    </td>
+    <?php } ?>
+    <td>
+      <?=($Summary ? $Summary : '(empty)')?>
+    </td>
+  </tr>
+  <?php
+    } ?>
+</table>
+<?php
+    }
 }

classes/rules.class.php

 <?php
+
 class Rules
 {
 
     {
         ?>
 <ul>
-<li><strong>No personally identifying patient data is allowed anywhere on the site.</strong></li>
+  <li><strong>No personally identifying patient data is allowed anywhere on the site.</strong></li>
 
   <li>Staff can do anything to anyone for any reason (or no reason). If you take issue with a decision, you must do so
     privately with the staff member who issued the decision or with an administrator of the site.</li>
     Thank you.</li>
 
   <li>No advertising, referrals, affiliate links, cryptocurrency pumps, or calls to action that involve using a
-    financial instrument. You'll be banned on the spot. The exceptions: discussions about cryptocurrencies that derive their value from
+    financial instrument. You'll be banned on the spot. The exceptions: discussions about cryptocurrencies that derive
+    their value from
     work performed on distributed science networks, i.e., Curecoin, FoldingCoin, and Gridcoin.</li>
 
   <li>Feel free to post announcements for your own projects, even and especially if they're commercial ones, in the

classes/tags.class.php

  * Each time a new Tags object is instantiated, the tag list is merged with the
  * overall total amount of tags to provide a Top Tags list. Merging is optional.
  */
-class Tags {
-  /**
-   * Collects all tags processed by the Tags Class
-   * @static
-   * @var array $All Class Tags
-   */
-  private static $All = [];
+class Tags
+{
+    /**
+     * Collects all tags processed by the Tags Class
+     * @static
+     * @var array $All Class Tags
+     */
+    private static $All = [];
 
-  /**
-   * All tags in the current instance
-   * @var array $Tags Instance Tags
-   */
-  private $Tags = null;
+    /**
+     * All tags in the current instance
+     * @var array $Tags Instance Tags
+     */
+    private $Tags = null;
 
-  /**
-   * @var array $TagLink Tag link list
-   */
-  private $TagLink = [];
+    /**
+     * @var array $TagLink Tag link list
+     */
+    private $TagLink = [];
 
-  /**
-   * @var string $Primary The primary tag
-   */
-  private $Primary = '';
+    /**
+     * @var string $Primary The primary tag
+     */
+    private $Primary = '';
 
-  /**
-   * Filter tags array to remove empty spaces.
-   *
-   * @param string $TagList A string of tags separated by a space
-   * @param boolean $Merge Merge the tag list with the Class' tags
-   *        E.g., compilations and soundtracks are skipped, so false
-   */
-  public function __construct($TagList, $Merge = true) {
-    if ($TagList) {
-      $this->Tags = array_filter(explode(' ', str_replace('_', '.', $TagList)));
+    /**
+     * Filter tags array to remove empty spaces.
+     *
+     * @param string $TagList A string of tags separated by a space
+     * @param boolean $Merge Merge the tag list with the Class' tags
+     *        E.g., compilations and soundtracks are skipped, so false
+     */
+    public function __construct($TagList, $Merge = true)
+    {
+        if ($TagList) {
+            $this->Tags = array_filter(explode(' ', str_replace('_', '.', $TagList)));
 
-      if ($Merge) {
-        self::$All = array_merge(self::$All, $this->Tags);
-      }
+            if ($Merge) {
+                self::$All = array_merge(self::$All, $this->Tags);
+            }
 
-      $this->Primary = $this->Tags[0];
-      sort($this->Tags);
-    } else {
-      $this->Tags = [];
+            $this->Primary = $this->Tags[0];
+            sort($this->Tags);
+        } else {
+            $this->Tags = [];
+        }
     }
-  }
-
-  /**
-   * @return string Primary Tag
-   */
-  public function get_primary() {
-    return $this->Primary;
-  }
 
-  /**
-   * Set the primary tag
-   * @param string $Primary
-   */
-  public function set_primary($Primary) {
-    $this->Primary = (string)$Primary;
-  }
+    /**
+     * @return string Primary Tag
+     */
+    public function get_primary()
+    {
+        return $this->Primary;
+    }
 
-  /**
-   * Formats primary tag as a title
-   * @return string Title
-   */
-  public function title() {
-    return ucwords(str_replace('.', ' ', $this->Primary));
-  }
+    /**
+     * Set the primary tag
+     * @param string $Primary
+     */
+    public function set_primary($Primary)
+    {
+        $this->Primary = (string)$Primary;
+    }
 
-  /**
-   * Formats primary tag as a CSS class
-   * @return string CSS Class Name
-   */
-  public function css_name() {
-    return 'tags_' . str_replace('.', '_', $this->Primary);
-  }
+    /**
+     * Formats primary tag as a title
+     * @return string Title
+     */
+    public function title()
+    {
+        return ucwords(str_replace('.', ' ', $this->Primary));
+    }
 
-  /**
-   * @return array Tags
-   */
-  public function get_tags() {
-    return $this->Tags;
-  }
+    /**
+     * Formats primary tag as a CSS class
+     * @return string CSS Class Name
+     */
+    public function css_name()
+    {
+        return 'tags_' . str_replace('.', '_', $this->Primary);
+    }
 
-  /**
-   * @return array All tags
-   */
-  public static function all() {
-    return self::$All;
-  }
+    /**
+     * @return array Tags
+     */
+    public function get_tags()
+    {
+        return $this->Tags;
+    }
 
-  /**
-   * Counts and sorts All tags
-   * @return array All tags sorted
-   */
-  public static function sorted() {
-    $Sorted = array_count_values(self::$All);
-    arsort($Sorted);
-    return $Sorted;
-  }
+    /**
+     * @return array All tags
+     */
+    public static function all()
+    {
+        return self::$All;
+    }
 
-  /**
-   * Formats tags
-   * @param string $Link Link to a taglist page
-   * @param string $ArtistName Restrict tag search by this artist
-   * @return string List of tag links
-   */
-  public function format($Link = 'torrents.php?taglist=', $ArtistName = '') {
-    if (!empty($ArtistName)) {
-      $ArtistName = "&artistname=" . urlencode($ArtistName) . "&action=advanced&searchsubmit=1";
+    /**
+     * Counts and sorts All tags
+     * @return array All tags sorted
+     */
+    public static function sorted()
+    {
+        $Sorted = array_count_values(self::$All);
+        arsort($Sorted);
+        return $Sorted;
     }
-    foreach ($this->Tags as $Tag) {
-      $Split = self::get_name_and_class($Tag);
-      $Name = $Split['name'];
-      $Class = $Split['class'];
-      if (empty($this->TagLink[$Tag])) {
-        $this->TagLink[$Tag] = '<a class="' . $Class . '" href="' . $Link . $Tag . $ArtistName . '">' . $Name . '</a>';
-      }
+
+    /**
+     * Formats tags
+     * @param string $Link Link to a taglist page
+     * @param string $ArtistName Restrict tag search by this artist
+     * @return string List of tag links
+     */
+    public function format($Link = 'torrents.php?taglist=', $ArtistName = '')
+    {
+        if (!empty($ArtistName)) {
+            $ArtistName = "&amp;artistname=" . urlencode($ArtistName) . "&amp;action=advanced&amp;searchsubmit=1";
+        }
+
+        foreach ($this->Tags as $Tag) {
+            $Split = self::get_name_and_class($Tag);
+            $Name = $Split['name'];
+            $Class = $Split['class'];
+
+            if (empty($this->TagLink[$Tag])) {
+                $this->TagLink[$Tag] = '<a class="' . $Class . '" href="' . $Link . $Tag . $ArtistName . '">' . $Name . '</a>';
+            }
+        }
+        return implode(', ', $this->TagLink);
     }
-    return implode(', ', $this->TagLink);
-  }
 
-  /**
-   * Format a list of top tags
-   * @param int $Max Max number of items to get
-   * @param string $Link  Page query where more items of this tag type can be found
-   * @param string $ArtistName Optional artist
-   */
-  public static function format_top($Max = 5, $Link = 'torrents.php?taglist=', $ArtistName = '') {
-    if (empty(self::$All)) { ?>
-      <li>No torrent tags</li>
-<?
+    /**
+     * Format a list of top tags
+     * @param int $Max Max number of items to get
+     * @param string $Link  Page query where more items of this tag type can be found
+     * @param string $ArtistName Optional artist
+     */
+    public static function format_top($Max = 5, $Link = 'torrents.php?taglist=', $ArtistName = '')
+    {
+        if (empty(self::$All)) { ?>
+<li>No torrent tags</li>
+<?php
       return;
     }
-    if (!empty($ArtistName)) {
-      $ArtistName = '&amp;artistname=' . urlencode($ArtistName) . '&amp;action=advanced&amp;searchsubmit=1';
-    }
-    foreach (array_slice(self::sorted(), 0, $Max) as $Tag => $Total) {
-      $Split = self::get_name_and_class($Tag);
-      $Name = $Split['name'];
-      $Class = $Split['class'];
-    ?>
-      <li><a class="<?=$Class?>" href="<?=$Link . display_str($Name) . $ArtistName?>"><?=display_str($Name)?></a> (<?=$Total?>)</li>
-<?    }
-  }
 
-  /**
-   * General purpose method to get all tag aliases from the DB
-   * @return array
-   */
-  public static function get_aliases() {
-    $TagAliases = G::$Cache->get_value('tag_aliases_search');
-    if ($TagAliases === false) {
-      G::$DB->query('
-      SELECT ID, BadTag, AliasTag
-      FROM tag_aliases
-      ORDER BY BadTag');
-      $TagAliases = G::$DB->to_array(false, MYSQLI_ASSOC, false);
-      // Unify tag aliases to be in_this_format as tags not in.this.format
-      array_walk_recursive($TagAliases, function(&$val) {
-        $val = preg_replace("/\./","_", $val);
-      });
-      // Clean up the array for smaller cache size
-      foreach ($TagAliases as &$TagAlias) {
-        foreach (array_keys($TagAlias) as $Key) {
-          if (is_numeric($Key)) {
-            unset($TagAlias[$Key]);
-          }
+        if (!empty($ArtistName)) {
+            $ArtistName = '&amp;artistname=' . urlencode($ArtistName) . '&amp;action=advanced&amp;searchsubmit=1';
         }
-      }
-      G::$Cache->cache_value('tag_aliases_search', $TagAliases, 3600 * 24 * 7); // cache for 7 days
-    }
-    return $TagAliases;
-  }
 
-  /**
-   * Replace bad tags with tag aliases
-   * @param array $Tags Array with sub-arrays 'include' and 'exclude'
-   * @return array
-   */
-  public static function remove_aliases($Tags) {
-    $TagAliases = self::get_aliases();
+        foreach (array_slice(self::sorted(), 0, $Max) as $Tag => $Total) {
+            $Split = self::get_name_and_class($Tag);
+            $Name = $Split['name'];
+            $Class = $Split['class']; ?>
 
-    if (isset($Tags['include'])) {
-      $End = count($Tags['include']);
-      for ($i = 0; $i < $End; $i++) {
-        foreach ($TagAliases as $TagAlias) {
-          if ($Tags['include'][$i] === $TagAlias['BadTag']) {
-            $Tags['include'][$i] = $TagAlias['AliasTag'];
-            break;
-          }
+<li><a class="<?=$Class?>"
+    href="<?=$Link . display_str($Name) . $ArtistName?>"><?=display_str($Name)?></a> (<?=$Total?>)</li>
+<?php
         }
-      }
-      // Only keep unique entries after unifying tag standard
-      $Tags['include'] = array_unique($Tags['include']);
     }
 
-    if (isset($Tags['exclude'])) {
-      $End = count($Tags['exclude']);
-      for ($i = 0; $i < $End; $i++) {
-        foreach ($TagAliases as $TagAlias) {
-          if (substr($Tags['exclude'][$i], 1) === $TagAlias['BadTag']) {
-            $Tags['exclude'][$i] = '!'.$TagAlias['AliasTag'];
-            break;
-          }
+    /**
+     * General purpose method to get all tag aliases from the DB
+     * @return array
+     */
+    public static function get_aliases()
+    {
+        $TagAliases = G::$Cache->get_value('tag_aliases_search');
+        if ($TagAliases === false) {
+            G::$DB->query('
+            SELECT ID, BadTag, AliasTag
+            FROM tag_aliases
+              ORDER BY BadTag');
+      
+            $TagAliases = G::$DB->to_array(false, MYSQLI_ASSOC, false);
+            // Unify tag aliases to be in_this_format as tags not in.this.format
+            array_walk_recursive($TagAliases, function (&$val) {
+                $val = preg_replace("/\./", "_", $val);
+            });
+            // Clean up the array for smaller cache size
+            foreach ($TagAliases as &$TagAlias) {
+                foreach (array_keys($TagAlias) as $Key) {
+                    if (is_numeric($Key)) {
+                        unset($TagAlias[$Key]);
+                    }
+                }
+            }
+            G::$Cache->cache_value('tag_aliases_search', $TagAliases, 3600 * 24 * 7); // cache for 7 days
         }
-      }
-      // Only keep unique entries after unifying tag standard
-      $Tags['exclude'] = array_unique($Tags['exclude']);
+        return $TagAliases;
     }
 
-    return $Tags;
-  }
+    /**
+     * Replace bad tags with tag aliases
+     * @param array $Tags Array with sub-arrays 'include' and 'exclude'
+     * @return array
+     */
+    public static function remove_aliases($Tags)
+    {
+        $TagAliases = self::get_aliases();
 
-  /**
-   * Filters a list of include and exclude tags to be used in a Sphinx search
-   * @param array $Tags An array of tags with sub-arrays 'include' and 'exclude'
-   * @param integer $TagType Search for Any or All of these tags.
-   * @return array Array keys predicate and input
-   *               Predicate for a Sphinx 'taglist' query
-   *               Input contains clean, aliased tags. Use it in a form instead of the user submitted string
-   */
-  public static function tag_filter_sph($Tags, $TagType) {
-    $QueryParts = [];
-    $Tags = Tags::remove_aliases($Tags);
-    $TagList = str_replace('_', '.', implode(', ', array_merge($Tags['include'], $Tags['exclude'])));
+        if (isset($Tags['include'])) {
+            $End = count($Tags['include']);
+            for ($i = 0; $i < $End; $i++) {
+                foreach ($TagAliases as $TagAlias) {
+                    if ($Tags['include'][$i] === $TagAlias['BadTag']) {
+                        $Tags['include'][$i] = $TagAlias['AliasTag'];
+                        break;
+                    }
+                }
+            }
+            // Only keep unique entries after unifying tag standard
+            $Tags['include'] = array_unique($Tags['include']);
+        }
 
-    foreach ($Tags['include'] as &$Tag) {
-      $Tag = Sphinxql::sph_escape_string($Tag);
+        if (isset($Tags['exclude'])) {
+            $End = count($Tags['exclude']);
+            for ($i = 0; $i < $End; $i++) {
+                foreach ($TagAliases as $TagAlias) {
+                    if (substr($Tags['exclude'][$i], 1) === $TagAlias['BadTag']) {
+                        $Tags['exclude'][$i] = '!'.$TagAlias['AliasTag'];
+                        break;
+                    }
+                }
+            }
+            // Only keep unique entries after unifying tag standard
+            $Tags['exclude'] = array_unique($Tags['exclude']);
+        }
+        return $Tags;
     }
 
-    if (!empty($Tags['exclude'])) {
-      foreach ($Tags['exclude'] as &$Tag) {
-        $Tag = '!' . Sphinxql::sph_escape_string(substr($Tag, 1));
-      }
-    }
+    /**
+     * Filters a list of include and exclude tags to be used in a Sphinx search
+     * @param array $Tags An array of tags with sub-arrays 'include' and 'exclude'
+     * @param integer $TagType Search for Any or All of these tags.
+     * @return array Array keys predicate and input
+     *               Predicate for a Sphinx 'taglist' query
+     *               Input contains clean, aliased tags. Use it in a form instead of the user submitted string
+     */
+    public static function tag_filter_sph($Tags, $TagType)
+    {
+        $QueryParts = [];
+        $Tags = Tags::remove_aliases($Tags);
+        $TagList = str_replace('_', '.', implode(', ', array_merge($Tags['include'], $Tags['exclude'])));
 
-    // 'All' tags
-    if (!isset($TagType) || $TagType == 1) {
-      $SearchWords = array_merge($Tags['include'], $Tags['exclude']);
-      if (!empty($Tags)) {
-        $QueryParts[] = implode(' ', $SearchWords);
-      }
-    }
-    // 'Any' tags
-    else {
-      if (!empty($Tags['include'])) {
-        $QueryParts[] = '( ' . implode(' | ', $Tags['include']) . ' )';
-      }
-      if (!empty($Tags['exclude'])) {
-        $QueryParts[] = implode(' ', $Tags['exclude']);
-      }
-    }
+        foreach ($Tags['include'] as &$Tag) {
+            $Tag = Sphinxql::sph_escape_string($Tag);
+        }
 
-    return ['input' => $TagList, 'predicate' => implode(' ', $QueryParts)];
-  }
+        if (!empty($Tags['exclude'])) {
+            foreach ($Tags['exclude'] as &$Tag) {
+                $Tag = '!' . Sphinxql::sph_escape_string(substr($Tag, 1));
+            }
+        }
 
-  /**
-   * Breaks a tag down into name and namespace class
-   * @param string $Tag Tag of the form 'tag' or 'tag:namespace'
-   * @return array Array keys name and class
-   *               name is the name of the tag without a namespace
-   *               class is the HTML class that should be applied to the tag, empty string if the tag has no namespace
-   */
-   public static function get_name_and_class($Tag) {
-			$Name = $Tag;
-			$Class = "";
-			$Split = explode(':', $Tag);
-			if (count($Split) > 1 && in_array($Split[1], TAG_NAMESPACES)) {
-				$Name = $Split[0];
-				$Class = "tag_" . $Split[1];
-			}
-      return array("name" => display_str($Name), "class" => display_str($Class));
-   }
+        // 'All' tags
+        if (!isset($TagType) || $TagType == 1) {
+            $SearchWords = array_merge($Tags['include'], $Tags['exclude']);
+            if (!empty($Tags)) {
+                $QueryParts[] = implode(' ', $SearchWords);
+            }
+        }
+        // 'Any' tags
+        else {
+            if (!empty($Tags['include'])) {
+                $QueryParts[] = '( ' . implode(' | ', $Tags['include']) . ' )';
+            }
+            if (!empty($Tags['exclude'])) {
+                $QueryParts[] = implode(' ', $Tags['exclude']);
+            }
+        }
+
+        return ['input' => $TagList, 'predicate' => implode(' ', $QueryParts)];
+    }
+
+    /**
+     * Breaks a tag down into name and namespace class
+     * @param string $Tag Tag of the form 'tag' or 'tag:namespace'
+     * @return array Array keys name and class
+     *               name is the name of the tag without a namespace
+     *               class is the HTML class that should be applied to the tag, empty string if the tag has no namespace
+     */
+    public static function get_name_and_class($Tag)
+    {
+        $Name = $Tag;
+        $Class = "";
+        $Split = explode(':', $Tag);
+        
+        if (count($Split) > 1 && in_array($Split[1], TAG_NAMESPACES)) {
+            $Name = $Split[0];
+            $Class = "tag_" . $Split[1];
+        }
+        return array("name" => display_str($Name), "class" => display_str($Class));
+    }
 }

classes/templates.class.php

-<?
+<?php
+
 // Example :
 // $TPL = new TEMPLATE;
 // $TPL->open('inv.tpl');
 // $TPL->set('ADDRESS1', $TPL->str_align(57, $UADDRESS1, 'l', ' '));
 // $TPL->get();
 
-class TEMPLATE {
-  var $file = '';
-  var $vars = [];
-
-  function open($file) {
-    $this->file = file($file);
-  }
+class TEMPLATE
+{
+    public $file = '';
+    public $vars = [];
 
-  function set($name, $var, $ifnone = '<span style="font-style: italic;">-None-</span>') {
-    if ($name != '') {
-      $this->vars[$name][0] = $var;
-      $this->vars[$name][1] = $ifnone;
+    public function open($file)
+    {
+        $this->file = file($file);
     }
-  }
 
-  function show() {
-    $TMPVAR = '';
-    for ($i = 0; $i < sizeof($this->file); $i++) {
-      $TMPVAR = $this->file[$i];
-      foreach ($this->vars as $k=>$v) {
-        if ($v[1] != '' && $v[0] == '') {
-          $v[0] = $v[1];
+    public function set($name, $var, $ifnone = '<span style="font-style: italic;">-None-</span>')
+    {
+        if ($name !== '') {
+            $this->vars[$name][0] = $var;
+            $this->vars[$name][1] = $ifnone;
         }
-        $TMPVAR = str_replace('{{'.$k.'}}', $v[0], $TMPVAR);
-      }
-      print $TMPVAR;
     }
-  }
 
-  function get() {
-    $RESULT = '';
-    $TMPVAR = '';
-    for ($i = 0; $i < sizeof($this->file); $i++) {
-      $TMPVAR = $this->file[$i];
-      foreach ($this->vars as $k=>$v) {
-        if ($v[1] != '' && $v[0] == '') {
-          $v[0] = $v[1];
+    public function show()
+    {
+        $TMPVAR = '';
+        for ($i = 0; $i < sizeof($this->file); $i++) {
+            $TMPVAR = $this->file[$i];
+            foreach ($this->vars as $k=>$v) {
+                if ($v[1] !== '' && $v[0] === '') {
+                    $v[0] = $v[1];
+                }
+                $TMPVAR = str_replace('{{'.$k.'}}', $v[0], $TMPVAR);
+            }
+            print $TMPVAR;
         }
-        $TMPVAR = str_replace('{{'.$k.'}}', $v[0], $TMPVAR);
-      }
-      $RESULT.= $TMPVAR;
     }
-    return $RESULT;
-  }
-
-  function str_align($len, $str, $align, $fill) {
-    $strlen = strlen($str);
-    if ($strlen > $len) {
-      return substr($str, 0, $len);
-
-    } elseif (($strlen == 0) || ($len == 0)) {
-      return '';
 
-    } else {
-      if (($align == 'l') || ($align == 'left')) {
-        $result = $str.str_repeat($fill, ($len - $strlen));
-
-      } elseif (($align == 'r') || ($align == 'right')) {
-        $result = str_repeat($fill, ($len - $strlen)).$str;
-
-      } elseif (($align == 'c') || ($align == 'center')) {
-        $snm = intval(($len - $strlen) / 2);
-        if (($strlen + ($snm * 2)) == $len) {
-          $result = str_repeat($fill, $snm).$str;
+    public function get()
+    {
+        $RESULT = '';
+        $TMPVAR = '';
+        for ($i = 0; $i < sizeof($this->file); $i++) {
+            $TMPVAR = $this->file[$i];
+            foreach ($this->vars as $k=>$v) {
+                if ($v[1] !== '' && $v[0] === '') {
+                    $v[0] = $v[1];
+                }
+                $TMPVAR = str_replace('{{'.$k.'}}', $v[0], $TMPVAR);
+            }
+            $RESULT.= $TMPVAR;
+        }
+        return $RESULT;
+    }
 
+    public function str_align($len, $str, $align, $fill)
+    {
+        $strlen = strlen($str);
+        if ($strlen > $len) {
+            return substr($str, 0, $len);
+        } elseif (($strlen === 0) || ($len === 0)) {
+            return '';
         } else {
-          $result = str_repeat($fill, $snm + 1).$str;
+            if (($align === 'l') || ($align === 'left')) {
+                $result = $str.str_repeat($fill, ($len - $strlen));
+            } elseif (($align === 'r') || ($align === 'right')) {
+                $result = str_repeat($fill, ($len - $strlen)).$str;
+            } elseif (($align === 'c') || ($align === 'center')) {
+                $snm = intval(($len - $strlen) / 2);
+                if (($strlen + ($snm * 2)) === $len) {
+                    $result = str_repeat($fill, $snm).$str;
+                } else {
+                    $result = str_repeat($fill, $snm + 1).$str;
+                }
+                $result.= str_repeat($fill, $snm);
+            }
+            return $result;
         }
-        $result.= str_repeat($fill, $snm);
-      }
-      return $result;
     }
-  }
 }
-?>

classes/testing.class.php

-<?
-
-class Testing {
-  private static $ClassDirectories = array("classes");
-  private static $Classes = [];
-
-  /**
-   * Initialize the testasble classes into a map keyed by class name
-   */
-  public static function init() {
-    self::load_classes();
-  }
-
-  /**
-   * Gets the class
-   */
-  public static function get_classes() {
-    return self::$Classes;
-  }
-
-  /**
-   * Loads all the classes within given directories
-   */
-  private static function load_classes() {
-    foreach (self::$ClassDirectories as $Directory)  {
-      $Directory = SERVER_ROOT . "/" . $Directory . "/";
-      foreach (glob($Directory . "*.php") as $FileName) {
-        self::get_class_name($FileName);
-      }
+<?php
+
+class Testing
+{
+    private static $ClassDirectories = array("classes");
+    private static $Classes = [];
+
+    /**
+     * Initialize the testasble classes into a map keyed by class name
+     */
+    public static function init()
+    {
+        self::load_classes();
     }
-  }
-
-  /**
-   * Gets the class and adds into the map
-   */
-  private static function get_class_name($FileName) {
-    $Tokens = token_get_all(file_get_contents($FileName));
-    $IsTestable = false;
-    $IsClass = false;
-
-    foreach ($Tokens as $Token) {
-      if (is_array($Token)) {
-        if (!$IsTestable && $Token[0] == T_DOC_COMMENT && strpos($Token[1], "@TestClass")) {
-          $IsTestable = true;
+
+    /**
+     * Gets the class
+     */
+    public static function get_classes()
+    {
+        return self::$Classes;
+    }
+
+    /**
+     * Loads all the classes within given directories
+     */
+    private static function load_classes()
+    {
+        foreach (self::$ClassDirectories as $Directory) {
+            $Directory = SERVER_ROOT . "/" . $Directory . "/";
+            foreach (glob($Directory . "*.php") as $FileName) {
+                self::get_class_name($FileName);
+            }
+        }
+    }
+
+    /**
+     * Gets the class and adds into the map
+     */
+    private static function get_class_name($FileName)
+    {
+        $Tokens = token_get_all(file_get_contents($FileName));
+        $IsTestable = false;
+        $IsClass = false;
+
+        foreach ($Tokens as $Token) {
+            if (is_array($Token)) {
+                if (!$IsTestable && $Token[0] == T_DOC_COMMENT && strpos($Token[1], "@TestClass")) {
+                    $IsTestable = true;
+                }
+
+                if ($IsTestable && $Token[0] == T_CLASS) {
+                    $IsClass = true;
+                } elseif ($IsClass && $Token[0] == T_STRING) {
+                    $ReflectionClass = new ReflectionClass($Token[1]);
+
+                    if (count(self::get_testable_methods($ReflectionClass))) {
+                        self::$Classes[$Token[1]] = new ReflectionClass($Token[1]);
+                    }
+
+                    $IsTestable = false;
+                    $IsClass = false;
+                }
+            }
+        }
+    }
+
+    /**
+     * Checks if class exists in the map
+     */
+    public static function has_class($Class)
+    {
+        return array_key_exists($Class, self::$Classes);
+    }
+
+    /**
+     * Checks if class has a given testable methood
+     */
+    public static function has_testable_method($Class, $Method)
+    {
+        $TestableMethods = self::get_testable_methods($Class);
+        foreach ($TestableMethods as $TestMethod) {
+            if ($TestMethod->getName() === $Method) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Get testable methods in a class, a testable method has a @Test
+     */
+    public static function get_testable_methods($Class)
+    {
+        if (is_string($Class)) {
+            $ReflectionClass = self::$Classes[$Class];
+        } else {
+            $ReflectionClass = $Class;
         }
-        if ($IsTestable && $Token[0] == T_CLASS) {
-          $IsClass = true;
-        } else if ($IsClass && $Token[0] == T_STRING) {
-          $ReflectionClass = new ReflectionClass($Token[1]);
-          if (count(self::get_testable_methods($ReflectionClass))) {
-            self::$Classes[$Token[1]] = new ReflectionClass($Token[1]);
-          }
-          $IsTestable = false;
-          $IsClass = false;
+
+        $ReflectionMethods = $ReflectionClass->getMethods();
+        $TestableMethods = [];
+
+        foreach ($ReflectionMethods as $Method) {
+            if ($Method->isPublic() && $Method->isStatic() && strpos($Method->getDocComment(), "@Test")) {
+                $TestableMethods[] = $Method;
+            }
         }
-      }
+        return $TestableMethods;
     }
-  }
-
-  /**
-   * Checks if class exists in the map
-   */
-  public static function has_class($Class) {
-    return array_key_exists($Class, self::$Classes);
-  }
-
-  /**
-   * Checks if class has a given testable methood
-   */
-  public static function has_testable_method($Class, $Method) {
-    $TestableMethods = self::get_testable_methods($Class);
-    foreach($TestableMethods as $TestMethod) {
-      if ($TestMethod->getName() === $Method) {
-        return true;
-      }
+
+
+    /**
+     * Get the class comment
+     */
+    public static function get_class_comment($Class)
+    {
+        $ReflectionClass = self::$Classes[$Class];
+        return trim(str_replace(array("@TestClass", "*", "/"), "", $ReflectionClass->getDocComment()));
     }
-    return false;
-  }
-
-  /**
-   * Get testable methods in a class, a testable method has a @Test
-   */
-  public static function get_testable_methods($Class) {
-    if (is_string($Class)) {
-      $ReflectionClass = self::$Classes[$Class];
-    } else {
-      $ReflectionClass = $Class;
+
+    /**
+     * Get the undocumented methods in a class
+     */
+    public static function get_undocumented_methods($Class)
+    {
+        $ReflectionClass = self::$Classes[$Class];
+        $Methods = [];
+
+        foreach ($ReflectionClass->getMethods() as $Method) {
+            if (!$Method->getDocComment()) {
+                $Methods[] = $Method;
+            }
+        }
+        return $Methods;
     }
-    $ReflectionMethods = $ReflectionClass->getMethods();
-    $TestableMethods = [];
-    foreach($ReflectionMethods as $Method) {
-      if ($Method->isPublic() && $Method->isStatic() && strpos($Method->getDocComment(), "@Test")) {
-        $TestableMethods[] = $Method;
-      }
+
+    /**
+     * Get the documented methods
+     */
+    public static function get_documented_methods($Class)
+    {
+        $ReflectionClass = self::$Classes[$Class];
+        $Methods = [];
+
+        foreach ($ReflectionClass->getMethods() as $Method) {
+            if ($Method->getDocComment()) {
+                $Methods[] = $Method;
+            }
+        }
+        return $Methods;
     }
-    return $TestableMethods;
-  }
-
-
-  /**
-   * Get the class comment
-   */
-  public static function get_class_comment($Class) {
-    $ReflectionClass = self::$Classes[$Class];
-    return trim(str_replace(array("@TestClass", "*", "/"), "", $ReflectionClass->getDocComment()));
-  }
-
-  /**
-   * Get the undocumented methods in a class
-   */
-  public static function get_undocumented_methods($Class) {
-    $ReflectionClass = self::$Classes[$Class];
-    $Methods = [];
-    foreach($ReflectionClass->getMethods() as $Method) {
-      if (!$Method->getDocComment()) {
-        $Methods[] = $Method;
-      }
+
+    /**
+     * Get all methods in a class
+     */
+    public static function get_methods($Class)
+    {
+        return self::$Classes[$Class]->getMethods();
     }
-    return $Methods;
-  }
-
-  /**
-   * Get the documented methods
-   */
-  public static function get_documented_methods($Class)  {
-    $ReflectionClass = self::$Classes[$Class];
-    $Methods = [];
-    foreach($ReflectionClass->getMethods() as $Method) {
-      if ($Method->getDocComment()) {
-        $Methods[] = $Method;
-      }
+
+    /**
+     * Get a method  comment
+     */
+    public static function get_method_comment($Method)
+    {
+        return trim(str_replace(array("*", "/"), "", $Method->getDocComment()));
     }
-    return $Methods;
-  }
-
-  /**
-   * Get all methods in a class
-   */
-  public static function get_methods($Class) {
-    return self::$Classes[$Class]->getMethods();
-  }
-
-  /**
-   * Get a method  comment
-   */
-  public static function get_method_comment($Method) {
-    return trim(str_replace(array("*", "/"), "", $Method->getDocComment()));
-  }
-
-}
+}

classes/testingview.class.php

-<?
+<?php
 
-class TestingView {
-  /**
-   * Render the linkbox
-   */
-  public static function render_linkbox($Page) { ?>
-    <div class="linkbox">
-<?      if ($Page != "classes") { ?>
-        <a href="testing.php" class="brackets">Classes</a>
-<?      }
+class TestingView
+{
+    /**
+     * Render the linkbox
+     */
+    public static function render_linkbox($Page) { ?>
+<div class="linkbox">
+  <?php if ($Page != "classes") { ?>
+  <a href="testing.php" class="brackets">Classes</a>
+  <?php }
       if ($Page != "comments") { ?>
-        <a href="testing.php?action=comments" class="brackets">Comments</a>
-<?      } ?>
-    </div>
-<?  }
+  <a href="testing.php?action=comments" class="brackets">Comments</a>
+  <?php } ?>
+</div>
+<?php  }
 
-  /**
-   * Render a list of classes
-   */
-  public static function render_classes($Classes) { ?>
-    <table>
-      <tr class="colhead">
-        <td>
-          Class
-        </td>
-        <td>
-          Testable functions
-        </td>
-      </tr>
-<?      foreach($Classes as $Key => $Value) {
+    /**
+     * Render a list of classes
+     */
+    public static function render_classes($Classes) { ?>
+<table>
+  <tr class="colhead">
+    <td>
+      Class
+    </td>
+    <td>
+      Testable functions
+    </td>
+  </tr>
+  <?php foreach ($Classes as $Key => $Value) {
         $Doc = Testing::get_class_comment($Key);
-        $Methods = count(Testing::get_testable_methods($Key));
-?>
-        <tr>
-          <td>
-            <a href="testing.php?action=class&amp;name=<?=$Key?>" class="tooltip" title="<?=$Doc?>"><?=$Key?></a>
-          </td>
-          <td>
-            <?=$Methods?>
-          </td>
-        </tr>
-<?      } ?>
-    </table>
-<?  }
+        $Methods = count(Testing::get_testable_methods($Key)); ?>
+  <tr>
+    <td>
+      <a href="testing.php?action=class&amp;name=<?=$Key?>"
+        class="tooltip" title="<?=$Doc?>"><?=$Key?></a>
+    </td>
+    <td>
+      <?=$Methods?>
+    </td>
+  </tr>
+  <?php
+    } ?>
+</table>
+<?php }
 
-  /**
-   * Render functions in a class
-   */
-  public static function render_functions($Methods) {
-    foreach($Methods as $Index => $Method) {
-      $ClassName = $Method->getDeclaringClass()->getName();
-      $MethodName = $Method->getName();
-?>
-      <div class="box box2">
-        <div class="head">
-          <span><?=self::render_method_definition($Method)?></span>
-          <span class="float_right">
-            <a data-toggle-target="#method_params_<?=$Index?>" class="brackets">Params</a>
-            <a href="#" class="brackets run" data-gazelle-id="<?=$Index?>" data-gazelle-class="<?=$ClassName?>" data-gazelle-method="<?=$MethodName?>">Run</a>
-          </span>
-        </div>
-        <div class="pad hidden" id="method_params_<?=$Index?>">
-          <?self::render_method_params($Method);?>
-        </div>
-        <div class="pad hidden" id="method_results_<?=$Index?>">
-        </div>
-      </div>
-<?    }
-  }
-
-  /**
-   * Render method parameters
-   */
-  private static function render_method_params($Method) { ?>
-    <table>
-<?    foreach($Method->getParameters() as $Parameter) {
-      $DefaultValue = $Parameter->isDefaultValueAvailable() ? $Parameter->getDefaultValue() : "";
-?>
-      <tr>
-        <td class="label">
-          <?=$Parameter->getName()?>
-        </td>
-        <td>
-          <input type="text" name="<?=$Parameter->getName()?>" value="<?=$DefaultValue?>"/>
-        </td>
-      </tr>
-<?    } ?>
-    </table>
-<?  }
+    /**
+     * Render functions in a class
+     */
+    public static function render_functions($Methods)
+    {
+        foreach ($Methods as $Index => $Method) {
+            $ClassName = $Method->getDeclaringClass()->getName();
+            $MethodName = $Method->getName(); ?>
+<div class="box box2">
+  <div class="head">
+    <span><?=self::render_method_definition($Method)?></span>
+    <span class="float_right">
+      <a data-toggle-target="#method_params_<?=$Index?>"
+        class="brackets">Params</a>
+      <a href="#" class="brackets run" data-gazelle-id="<?=$Index?>"
+        data-gazelle-class="<?=$ClassName?>"
+        data-gazelle-method="<?=$MethodName?>">Run</a>
+    </span>
+  </div>
+  <div class="pad hidden" id="method_params_<?=$Index?>">
+    <?self::render_method_params($Method); ?>
+  </div>
+  <div class="pad hidden" id="method_results_<?=$Index?>">
+  </div>
+</div>
+<?php
+        }
+    }
 
-  /**
-   * Render the method definition
-   */
-  private static function render_method_definition($Method) {
-    $Title = "<span class='tooltip' title='" . Testing::get_method_comment($Method) . "'>" . $Method->getName() . "</span> (";
-    foreach($Method->getParameters() as $Parameter) {
-      $Color = "red";
-      if ($Parameter->isDefaultValueAvailable()) {
-        $Color = "green";
-      }
-      $Title .= "<span style='color: $Color'>";
-      $Title .= "$" . $Parameter->getName();
-      if ($Parameter->isDefaultValueAvailable()) {
-        $Title .= " = " . $Parameter->getDefaultValue();
-      }
-      $Title .= "</span>";
-      $Title .= ", ";
+    /**
+     * Render method parameters
+     */
+    private static function render_method_params($Method) { ?>
+<table>
+  <?php foreach ($Method->getParameters() as $Parameter) {
+        $DefaultValue = $Parameter->isDefaultValueAvailable() ? $Parameter->getDefaultValue() : ""; ?>
+  <tr>
+    <td class="label">
+      <?=$Parameter->getName()?>
+    </td>
+    <td>
+      <input type="text" name="<?=$Parameter->getName()?>"
+        value="<?=$DefaultValue?>" />
+    </td>
+  </tr>
+  <?php
+    } ?>
+</table>
+<?php }
 
+    /**
+     * Render the method definition
+     */
+    private static function render_method_definition($Method)
+    {
+        $Title = "<span class='tooltip' title='" . Testing::get_method_comment($Method) . "'>" . $Method->getName() . "</span> (";
+        foreach ($Method->getParameters() as $Parameter) {
+            $Color = "red";
+            if ($Parameter->isDefaultValueAvailable()) {
+                $Color = "green";
+            }
+            $Title .= "<span style='color: $Color'>";
+            $Title .= "$" . $Parameter->getName();
+            if ($Parameter->isDefaultValueAvailable()) {
+                $Title .= " = " . $Parameter->getDefaultValue();
+            }
+            $Title .= "</span>";
+            $Title .= ", ";
+        }
+        $Title = rtrim($Title, ", ");
+        $Title .= ")";
+        return $Title;
     }
-    $Title = rtrim($Title, ", ");
-    $Title .= ")";
-    return $Title;
-  }
 
-  /**
-   * Renders class documentation stats
-   */
-  public static function render_missing_documentation($Classes) { ?>
-    <table>
-      <tr class="colhead">
-        <td>
-          Class
-        </td>
-        <td>
-          Class documented
-        </td>
-        <td>
-          Undocumented functions
-        </td>
-        <td>
-          Documented functions
-        </td>
-      </tr>
-<?      foreach($Classes as $Key => $Value) {
-        $ClassComment = Testing::get_class_comment($Key);
-?>
-        <tr>
-          <td>
-            <?=$Key?>
-          </td>
-          <td>
-            <?=!empty($ClassComment) ? "Yes" : "No"?>
-          <td>
-            <?=count(Testing::get_undocumented_methods($Key))?>
-          </td>
-          <td>
-            <?=count(Testing::get_documented_methods($Key))?>
-          </td>
-        </tr>
-<?      } ?>
-    </table>
-<?  }
+    /**
+     * Renders class documentation stats
+     */
+    public static function render_missing_documentation($Classes) { ?>
+<table>
+  <tr class="colhead">
+    <td>
+      Class
+    </td>
+    <td>
+      Class documented
+    </td>
+    <td>
+      Undocumented functions
+    </td>
+    <td>
+      Documented functions
+    </td>
+  </tr>
+  <?php foreach ($Classes as $Key => $Value) {
+        $ClassComment = Testing::get_class_comment($Key); ?>
+  <tr>
+    <td>
+      <?=$Key?>
+    </td>
+    <td>
+      <?=!empty($ClassComment) ? "Yes" : "No"?>
+    <td>
+      <?=count(Testing::get_undocumented_methods($Key))?>
+    </td>
+    <td>
+      <?=count(Testing::get_documented_methods($Key))?>
+    </td>
+  </tr>
+  <?php
+    } ?>
+</table>
+<?php }
 
-  /**
-   * Pretty print any data
-   */
-  public static function render_results($Data) {
-    $Results = '<pre><ul style="list-style-type: none">';
-    if (is_array($Data)) {
-      foreach ($Data as $Key => $Value){
-        if (is_array($Value)){
-          $Results .= '<li>' . $Key . ' => ' . self::render_results($Value) . '</li>';
-        } else{
-          $Results .= '<li>' . $Key . ' => ' . $Value . '</li>';
+    /**
+     * Pretty print any data
+     */
+    public static function render_results($Data)
+    {
+        $Results = '<pre><ul style="list-style-type: none">';
+        if (is_array($Data)) {
+            foreach ($Data as $Key => $Value) {
+                if (is_array($Value)) {
+                    $Results .= '<li>' . $Key . ' => ' . self::render_results($Value) . '</li>';
+                } else {
+                    $Results .= '<li>' . $Key . ' => ' . $Value . '</li>';
+                }
+            }
+        } else {
+            $Results .= '<li>' . $Data . '</li>';
         }
-      }
-    } else {
-      $Results .= '<li>' . $Data . '</li>';
+        $Results .= '</ul></pre>';
+        echo $Results;
     }
-    $Results .= '</ul></pre>';
-    echo $Results;
-  }
-
 }

classes/time.class.php

-<?
+<?php
+
 if (!extension_loaded('date')) {
-  error('Date extension not loaded.');
+    error('Date extension not loaded.');
 }
 
-function time_ago($TimeStamp) {
-  if (!$TimeStamp) { return false; }
-  if (!is_number($TimeStamp)) { // Assume that $TimeStamp is SQL timestamp
-    $TimeStamp = strtotime($TimeStamp);
-  }
-  return time() - $TimeStamp;
+function time_ago($TimeStamp)
+{
+    if (!$TimeStamp) {
+        return false;
+    }
+    if (!is_number($TimeStamp)) { // Assume that $TimeStamp is SQL timestamp
+        $TimeStamp = strtotime($TimeStamp);
+    }
+    return time() - $TimeStamp;
 }
 
 /*
  * Returns a <span> by default but can optionally return the raw time
  * difference in text (e.g. "16 hours and 28 minutes", "1 day, 18 hours").
  */
-function time_diff($TimeStamp, $Levels = 2, $Span = true, $Lowercase = false) {
-  if (!$TimeStamp) { return 'Never'; }
-  if (!is_number($TimeStamp)) { // Assume that $TimeStamp is SQL timestamp
-    $TimeStamp = strtotime($TimeStamp);
-  }
-  $Time = time() - $TimeStamp;
-
-  // If the time is negative, then it expires in the future.
-  if ($Time < 0) {
-    $Time = -$Time;
-    $HideAgo = true;
-  }
-
-  $Years = floor($Time / 31556926); // seconds in one year
-  $Remain = $Time - $Years * 31556926;
-
-  $Months = floor($Remain / 2629744); // seconds in one month
-  $Remain = $Remain - $Months * 2629744;
-
-  $Weeks = floor($Remain / 604800); // seconds in one week
-  $Remain = $Remain - $Weeks * 604800;
-
-  $Days = floor($Remain / 86400); // seconds in one day
-  $Remain = $Remain - $Days * 86400;
-
-  $Hours=floor($Remain / 3600); // seconds in one hour
-  $Remain = $Remain - $Hours * 3600;
-
-  $Minutes = floor($Remain / 60); // seconds in one minute
-  $Remain = $Remain - $Minutes * 60;
-
-  $Seconds = $Remain;
-
-  $Return = '';
-
-  if ($Years > 0 && $Levels > 0) {
-    $Return .= "$Years year".(($Years > 1) ? 's' : '' );
-    $Levels--;
-  }
-
-  if ($Months > 0 && $Levels > 0) {
-    $Return .= ($Return != '') ? ', ' : '';
-    $Return .= "$Months month".(($Months > 1) ? 's' : '');
-    $Levels--;
-  }
-
-  if ($Weeks > 0 && $Levels > 0) {
-    $Return .= ($Return != '') ? ', ' : '';
-    $Return .= "$Weeks week".(($Weeks > 1) ? 's' : '');
-    $Levels--;
-  }
-
-  if ($Days > 0 && $Levels > 0) {
-    $Return .= ($Return != '') ? ', ' : '';
-    $Return .= "$Days day".(($Days > 1) ? 's' : '');
-    $Levels--;
-  }
-
-  if ($Hours > 0 && $Levels > 0) {
-    $Return .= ($Return != '') ? ', ' : '';
-    $Return .= "$Hours hour".(($Hours > 1) ? 's' : '');
-    $Levels--;
-  }
-
-  if ($Minutes > 0 && $Levels > 0) {
-    $Return .= ($Return != '') ? ' and ' : '';
-    $Return .= "$Minutes min".(($Minutes > 1) ? 's' : '');
-  }
-
-  if ($Return == '') {
-    $Return = 'Just now';
-  } elseif (!isset($HideAgo)) {
-    $Return .= ' ago';
-  }
-
-  if ($Lowercase) {
-    $Return = strtolower($Return);
-  }
-
-  if ($Span) {
-    return '<span class="time tooltip" title="'.date('M d Y, H:i', $TimeStamp).'">'.$Return.'</span>';
-  } else {
-    return $Return;
-  }
+function time_diff($TimeStamp, $Levels = 2, $Span = true, $Lowercase = false)
+{
+    if (!$TimeStamp) {
+        return 'Never';
+    }
+    if (!is_number($TimeStamp)) { // Assume that $TimeStamp is SQL timestamp
+        $TimeStamp = strtotime($TimeStamp);
+    }
+    $Time = time() - $TimeStamp;
+
+    // If the time is negative, then it expires in the future.
+    if ($Time < 0) {
+        $Time = -$Time;
+        $HideAgo = true;
+    }
+
+    $Years = floor($Time / 31556926); // seconds in one year
+    $Remain = $Time - $Years * 31556926;
+
+    $Months = floor($Remain / 2629744); // seconds in one month
+    $Remain = $Remain - $Months * 2629744;
+
+    $Weeks = floor($Remain / 604800); // seconds in one week
+    $Remain = $Remain - $Weeks * 604800;
+
+    $Days = floor($Remain / 86400); // seconds in one day
+    $Remain = $Remain - $Days * 86400;
+
+    $Hours=floor($Remain / 3600); // seconds in one hour
+    $Remain = $Remain - $Hours * 3600;
+
+    $Minutes = floor($Remain / 60); // seconds in one minute
+    $Remain = $Remain - $Minutes * 60;
+
+    $Seconds = $Remain;
+
+    $Return = '';
+
+    if ($Years > 0 && $Levels > 0) {
+        $Return .= "$Years year".(($Years > 1) ? 's' : '');
+        $Levels--;
+    }
+
+    if ($Months > 0 && $Levels > 0) {
+        $Return .= ($Return != '') ? ', ' : '';
+        $Return .= "$Months month".(($Months > 1) ? 's' : '');
+        $Levels--;
+    }
+
+    if ($Weeks > 0 && $Levels > 0) {
+        $Return .= ($Return != '') ? ', ' : '';
+        $Return .= "$Weeks week".(($Weeks > 1) ? 's' : '');
+        $Levels--;
+    }
+
+    if ($Days > 0 && $Levels > 0) {
+        $Return .= ($Return != '') ? ', ' : '';
+        $Return .= "$Days day".(($Days > 1) ? 's' : '');
+        $Levels--;
+    }
+
+    if ($Hours > 0 && $Levels > 0) {
+        $Return .= ($Return != '') ? ', ' : '';
+        $Return .= "$Hours hour".(($Hours > 1) ? 's' : '');
+        $Levels--;
+    }
+
+    if ($Minutes > 0 && $Levels > 0) {
+        $Return .= ($Return != '') ? ' and ' : '';
+        $Return .= "$Minutes min".(($Minutes > 1) ? 's' : '');
+    }
+
+    if ($Return == '') {
+        $Return = 'Just now';
+    } elseif (!isset($HideAgo)) {
+        $Return .= ' ago';
+    }
+
+    if ($Lowercase) {
+        $Return = strtolower($Return);
+    }
+
+    if ($Span) {
+        return '<span class="time tooltip" title="'.date('M d Y, H:i', $TimeStamp).'">'.$Return.'</span>';
+    } else {
+        return $Return;
+    }
 }
 
 /* SQL utility functions */
 
-function time_plus($Offset) {
-  return date('Y-m-d H:i:s', time() + $Offset);
+function time_plus($Offset)
+{
+    return date('Y-m-d H:i:s', time() + $Offset);
 }
 
-function time_minus($Offset, $Fuzzy = false) {
-  if ($Fuzzy) {
-    return date('Y-m-d 00:00:00', time() - $Offset);
-  } else {
-    return date('Y-m-d H:i:s', time() - $Offset);
-  }
+function time_minus($Offset, $Fuzzy = false)
+{
+    if ($Fuzzy) {
+        return date('Y-m-d 00:00:00', time() - $Offset);
+    } else {
+        return date('Y-m-d H:i:s', time() - $Offset);
+    }
 }
 
 // This is never used anywhere with $timestamp set
 // todo: Why don't we just use NOW() in the sql queries?
-function sqltime($timestamp = NULL) {
-  return date('Y-m-d H:i:s', ($timestamp ?? time()));
+function sqltime($timestamp = null)
+{
+    return date('Y-m-d H:i:s', ($timestamp ?? time()));
 }
 
-function validDate($DateString) {
-  $DateTime = explode(' ', $DateString);
-  if (count($DateTime) != 2) {
-    return false;
-  }
-  list($Date, $Time) = $DateTime;
-  $SplitTime = explode(':', $Time);
-  if (count($SplitTime) != 3) {
-    return false;
-  }
-  list($H, $M, $S) = $SplitTime;
-  if ($H != 0 && !(is_number($H) && $H < 24 && $H >= 0)) { return false; }
-  if ($M != 0 && !(is_number($M) && $M < 60 && $M >= 0)) { return false; }
-  if ($S != 0 && !(is_number($S) && $S < 60 && $S >= 0)) { return false; }
-  $SplitDate = explode('-', $Date);
-  if (count($SplitDate) != 3) {
-    return false;
-  }
-  list($Y, $M, $D) = $SplitDate;
-  return checkDate($M, $D, $Y);
+function validDate($DateString)
+{
+    $DateTime = explode(' ', $DateString);
+    if (count($DateTime) != 2) {
+        return false;
+    }
+
+    list($Date, $Time) = $DateTime;
+    $SplitTime = explode(':', $Time);
+    if (count($SplitTime) != 3) {
+        return false;
+    }
+
+    list($H, $M, $S) = $SplitTime;
+    if ($H != 0 && !(is_number($H) && $H < 24 && $H >= 0)) {
+        return false;
+    }
+
+    if ($M != 0 && !(is_number($M) && $M < 60 && $M >= 0)) {
+        return false;
+    }
+
+    if ($S != 0 && !(is_number($S) && $S < 60 && $S >= 0)) {
+        return false;
+    }
+
+    $SplitDate = explode('-', $Date);
+    if (count($SplitDate) != 3) {
+        return false;
+    }
+
+    list($Y, $M, $D) = $SplitDate;
+    return checkDate($M, $D, $Y);
 }
 
-function is_valid_date($Date) {
-  return is_valid_datetime($Date, 'Y-m-d');
+function is_valid_date($Date)
+{
+    return is_valid_datetime($Date, 'Y-m-d');
 }
 
-function is_valid_time($Time) {
-  return is_valid_datetime($Time, 'H:i');
+function is_valid_time($Time)
+{
+    return is_valid_datetime($Time, 'H:i');
 }
 
-function is_valid_datetime($DateTime, $Format = 'Y-m-d H:i') {
-  $FormattedDateTime = DateTime::createFromFormat($Format, $DateTime);
-  return $FormattedDateTime && $FormattedDateTime->format($Format) == $DateTime;
+function is_valid_datetime($DateTime, $Format = 'Y-m-d H:i')
+{
+    $FormattedDateTime = DateTime::createFromFormat($Format, $DateTime);
+    return $FormattedDateTime && $FormattedDateTime->format($Format) == $DateTime;
 }
-
-?>

classes/tools.class.php

-<?
-class Tools {
-  /**
-   * Returns true if given IP is banned.
-   *
-   * @param string $IP
-   */
-  public static function site_ban_ip($IP) {
-    global $Debug;
-    $A = substr($IP, 0, strcspn($IP, '.:'));
-    $IPNum = Tools::ip_to_unsigned($IP);
-    $IPBans = G::$Cache->get_value('ip_bans_'.$A);
-    if (!is_array($IPBans)) {
-      $SQL = sprintf("
-        SELECT ID, FromIP, ToIP
-        FROM ip_bans
-        WHERE FromIP BETWEEN %d << 24 AND (%d << 24) - 1", $A, $A + 1);
-      $QueryID = G::$DB->get_query_id();
-      G::$DB->query($SQL);
-      $IPBans = G::$DB->to_array(0, MYSQLI_NUM);
-      G::$DB->set_query_id($QueryID);
-      G::$Cache->cache_value('ip_bans_'.$A, $IPBans, 0);
-    }
-    $Debug->log_var($IPBans, 'IP bans for class '.$A);
-    foreach ($IPBans as $Index => $IPBan) {
-      list ($ID, $FromIP, $ToIP) = $IPBan;
-      if ($IPNum >= $FromIP && $IPNum <= $ToIP) {
-        return true;
-      }
-    }
+<?php
 
-    return false;
-  }
-
-  /**
-   * Returns the unsigned form of an IP address.
-   *
-   * @param string $IP The IP address x.x.x.x
-   * @return string the long it represents.
-   */
-  public static function ip_to_unsigned($IP) {
-    $IPnum = sprintf('%u', ip2long($IP));
-    if (!$IPnum) {
-      // Try to encode as IPv6 (stolen from stackoverflow)
-      // Note that this is *wrong* and because of PHP's wankery stops being accurate after the most significant 16 digits or so
-      // But since this is only used for geolocation and IPv6 blocks are allocated in huge numbers, it's still fine
-      $IPnum = '';
-      foreach (unpack('C*', inet_pton($IP)) as $byte) {
-        $IPnum .= str_pad(decbin($byte), 8, "0", STR_PAD_LEFT);
-      }
-      $IPnum = base_convert(ltrim($IPnum, '0'), 2, 10);
-    }
-    return $IPnum;
-  }
-
-  /**
-   * Geolocate an IP address using the database
-   *
-   * @param $IP the ip to fetch the country for
-   * @return the country of origin
-   */
-  public static function geoip($IP) {
-    static $IPs = [];
-    if (isset($IPs[$IP])) {
-      return $IPs[$IP];
+# todo: Check strick equality gently
+class Tools
+{
+    /**
+     * Returns true if given IP is banned.
+     *
+     * @param string $IP
+     */
+    public static function site_ban_ip($IP)
+    {
+        global $Debug;
+        $A = substr($IP, 0, strcspn($IP, '.:'));
+        $IPNum = Tools::ip_to_unsigned($IP);
+        $IPBans = G::$Cache->get_value('ip_bans_'.$A);
+
+        if (!is_array($IPBans)) {
+            $SQL = sprintf("
+            SELECT ID, FromIP, ToIP
+            FROM ip_bans
+              WHERE FromIP BETWEEN %d << 24 AND (%d << 24) - 1", $A, $A + 1);
+
+            $QueryID = G::$DB->get_query_id();
+            G::$DB->query($SQL);
+            $IPBans = G::$DB->to_array(0, MYSQLI_NUM);
+            G::$DB->set_query_id($QueryID);
+            G::$Cache->cache_value('ip_bans_'.$A, $IPBans, 0);
+        }
+
+        $Debug->log_var($IPBans, 'IP bans for class '.$A);
+        foreach ($IPBans as $Index => $IPBan) {
+            list($ID, $FromIP, $ToIP) = $IPBan;
+            if ($IPNum >= $FromIP && $IPNum <= $ToIP) {
+                return true;
+            }
+        }
+        return false;
     }
-    if (is_number($IP)) {
-      $Long = $IP;
-    } else {
-      $Long = Tools::ip_to_unsigned($IP);
+
+    /**
+     * Returns the unsigned form of an IP address.
+     *
+     * @param string $IP The IP address x.x.x.x
+     * @return string the long it represents.
+     */
+    public static function ip_to_unsigned($IP)
+    {
+        $IPnum = sprintf('%u', ip2long($IP));
+        if (!$IPnum) {
+            // Try to encode as IPv6 (stolen from stackoverflow)
+            // Note that this is *wrong* and because of PHP's wankery stops being accurate after the most significant 16 digits or so
+            // But since this is only used for geolocation and IPv6 blocks are allocated in huge numbers, it's still fine
+            $IPnum = '';
+            foreach (unpack('C*', inet_pton($IP)) as $byte) {
+                $IPnum .= str_pad(decbin($byte), 8, "0", STR_PAD_LEFT);
+            }
+            $IPnum = base_convert(ltrim($IPnum, '0'), 2, 10);
+        }
+        return $IPnum;
     }
-    if (!$Long || $Long == 2130706433) { // No need to check cc for 127.0.0.1
-      return false;
+
+    /**
+     * Geolocate an IP address using the database
+     *
+     * @param $IP the ip to fetch the country for
+     * @return the country of origin
+     */
+    public static function geoip($IP)
+    {
+        static $IPs = [];
+        if (isset($IPs[$IP])) {
+            return $IPs[$IP];
+        }
+
+        if (is_number($IP)) {
+            $Long = $IP;
+        } else {
+            $Long = Tools::ip_to_unsigned($IP);
+        }
+
+        if (!$Long || $Long == 2130706433) { // No need to check cc for 127.0.0.1
+            return false;
+        }
+
+        $QueryID = G::$DB->get_query_id();
+        G::$DB->query("
+        SELECT EndIP, Code
+        FROM geoip_country
+          WHERE $Long >= StartIP
+          ORDER BY StartIP DESC
+          LIMIT 1");
+
+        if ((!list($EndIP, $Country) = G::$DB->next_record()) || $EndIP < $Long) {
+            $Country = '?';
+        }
+
+        G::$DB->set_query_id($QueryID);
+        $IPs[$IP] = $Country;
+        return $Country;
     }
-    $QueryID = G::$DB->get_query_id();
-    G::$DB->query("
-      SELECT EndIP, Code
-      FROM geoip_country
-      WHERE $Long >= StartIP
-      ORDER BY StartIP DESC
-      LIMIT 1");
-    if ((!list($EndIP, $Country) = G::$DB->next_record()) || $EndIP < $Long) {
-      $Country = '?';
+
+    /**
+     * Gets the hostname for an IP address
+     *
+     * @param $IP the IP to get the hostname for
+     * @return hostname fetched
+     */
+    public static function get_host_by_ip($IP)
+    {
+        $testar = explode('.', $IP);
+        if (count($testar) != 4) {
+            return $IP;
+        }
+
+        for ($i = 0; $i < 4; ++$i) {
+            if (!is_numeric($testar[$i])) {
+                return $IP;
+            }
+        }
+
+        $host = `host -W 1 $IP`;
+        return ($host ? end(explode(' ', $host)) : $IP);
     }
-    G::$DB->set_query_id($QueryID);
-    $IPs[$IP] = $Country;
-    return $Country;
-  }
-
-  /**
-   * Gets the hostname for an IP address
-   *
-   * @param $IP the IP to get the hostname for
-   * @return hostname fetched
-   */
-  public static function get_host_by_ip($IP) {
-    $testar = explode('.', $IP);
-    if (count($testar) != 4) {
-      return $IP;
+
+    /**
+     * Gets an hostname using AJAX
+     *
+     * @param $IP the IP to fetch
+     * @return a span with JavaScript code
+     */
+    public static function get_host_by_ajax($IP)
+    {
+        static $ID = 0;
+        ++$ID;
+        return '<span id="host_'.$ID.'">Resolving host...<script type="text/javascript">ajax.get(\'tools.php?action=get_host&ip='.$IP.'\',function(host) {$(\'#host_'.$ID.'\').raw().innerHTML=host;});</script></span>';
     }
-    for ($i = 0; $i < 4; ++$i) {
-      if (!is_numeric($testar[$i])) {
-        return $IP;
-      }
+
+    /**
+     * Looks up the full host of an IP address, by system call.
+     * Used as the server-side counterpart to get_host_by_ajax.
+     *
+     * @param string $IP The IP address to look up.
+     * @return string the host.
+     */
+    public static function lookup_ip($IP)
+    {
+        // todo: Use the G::$Cache
+        $Output = explode(' ', shell_exec('host -W 1 '.escapeshellarg($IP)));
+        if (count($Output) == 1 && empty($Output[0])) {
+            return '';
+        }
+
+        if (count($Output) != 5) {
+            return false;
+        }
+
+        if ($Output[2].' '.$Output[3] == 'not found:') {
+            return false;
+        }
+        return trim($Output[4]);
     }
 
-    $host = `host -W 1 $IP`;
-    return ($host ? end(explode(' ', $host)) : $IP);
-  }
-
-  /**
-   * Gets an hostname using AJAX
-   *
-   * @param $IP the IP to fetch
-   * @return a span with JavaScript code
-   */
-  public static function get_host_by_ajax($IP) {
-    static $ID = 0;
-    ++$ID;
-    return '<span id="host_'.$ID.'">Resolving host...<script type="text/javascript">ajax.get(\'tools.php?action=get_host&ip='.$IP.'\',function(host) {$(\'#host_'.$ID.'\').raw().innerHTML=host;});</script></span>';
-  }
-
-
-  /**
-   * Looks up the full host of an IP address, by system call.
-   * Used as the server-side counterpart to get_host_by_ajax.
-   *
-   * @param string $IP The IP address to look up.
-   * @return string the host.
-   */
-  public static function lookup_ip($IP) {
-    // todo: Use the G::$Cache
-    $Output = explode(' ',shell_exec('host -W 1 '.escapeshellarg($IP)));
-    if (count($Output) == 1 && empty($Output[0]))  { return ''; }
-    if (count($Output) != 5)                       { return false; }
-    if ($Output[2].' '.$Output[3] == 'not found:') { return false; }
-    return trim($Output[4]);
-  }
-
-  /**
-   * Format an IP address with links to IP history.
-   *
-   * @param string IP
-   * @return string The HTML
-   */
-  public static function display_ip($IP) {
-    $Line = display_str($IP).' ('.Tools::get_country_code_by_ajax($IP).') ';
-    $Line .= '<a href="user.php?action=search&amp;ip_history=on&amp;ip='.display_str($IP).'&amp;matchtype=strict" title="Search" class="brackets tooltip">S</a>';
-
-    return $Line;
-  }
-
-  public static function get_country_code_by_ajax($IP) {
-    static $ID = 0;
-    ++$ID;
-    return '<span id="cc_'.$ID.'">Resolving CC...<script type="text/javascript">ajax.get(\'tools.php?action=get_cc&ip='.$IP.'\', function(cc) {$(\'#cc_'.$ID.'\').raw().innerHTML = cc;});</script></span>';
-  }
-
-
-  /**
-   * Disable an array of users.
-   *
-   * @param array $UserIDs (You can also send it one ID as an int, because fuck types)
-   * @param BanReason 0 - Unknown, 1 - Manual, 2 - Ratio, 3 - Inactive, 4 - Unused.
-   */
-  public static function disable_users($UserIDs, $AdminComment, $BanReason = 1) {
-    $QueryID = G::$DB->get_query_id();
-    if (!is_array($UserIDs)) {
-      $UserIDs = array($UserIDs);
+    /**
+     * Format an IP address with links to IP history.
+     *
+     * @param string IP
+     * @return string The HTML
+     */
+    public static function display_ip($IP)
+    {
+        $Line = display_str($IP).' ('.Tools::get_country_code_by_ajax($IP).') ';
+        $Line .= '<a href="user.php?action=search&amp;ip_history=on&amp;ip='.display_str($IP).'&amp;matchtype=strict" title="Search" class="brackets tooltip">S</a>';
+        return $Line;
     }
-    G::$DB->query("
-      UPDATE users_info AS i
-        JOIN users_main AS m ON m.ID = i.UserID
-      SET m.Enabled = '2',
-        m.can_leech = '0',
-        i.AdminComment = CONCAT('".sqltime()." - ".($AdminComment ? $AdminComment : 'Disabled by system')."\n\n', i.AdminComment),
-        i.BanDate = NOW(),
-        i.BanReason = '$BanReason',
-        i.RatioWatchDownload = ".($BanReason == 2 ? 'm.Downloaded' : "'0'")."
-      WHERE m.ID IN(".implode(',', $UserIDs).') ');
-    G::$Cache->decrement('stats_user_count', G::$DB->affected_rows());
-    foreach ($UserIDs as $UserID) {
-      G::$Cache->delete_value("enabled_$UserID");
-      G::$Cache->delete_value("user_info_$UserID");
-      G::$Cache->delete_value("user_info_heavy_$UserID");
-      G::$Cache->delete_value("user_stats_$UserID");
-
-      G::$DB->query("
-        SELECT SessionID
-        FROM users_sessions
-        WHERE UserID = '$UserID'
-          AND Active = 1");
-      while (list($SessionID) = G::$DB->next_record()) {
-        G::$Cache->delete_value("session_$UserID"."_$SessionID");
-      }
-      G::$Cache->delete_value("users_sessions_$UserID");
-
-      G::$DB->query("
-        DELETE FROM users_sessions
-        WHERE UserID = '$UserID'");
 
+    public static function get_country_code_by_ajax($IP)
+    {
+        static $ID = 0;
+        ++$ID;
+        return '<span id="cc_'.$ID.'">Resolving CC...<script type="text/javascript">ajax.get(\'tools.php?action=get_cc&ip='.$IP.'\', function(cc) {$(\'#cc_'.$ID.'\').raw().innerHTML = cc;});</script></span>';
     }
 
-    // Remove the users from the tracker.
-    G::$DB->query('
-      SELECT torrent_pass
-      FROM users_main
-      WHERE ID in ('.implode(', ', $UserIDs).')');
-    $PassKeys = G::$DB->collect('torrent_pass');
-    $Concat = '';
-    foreach ($PassKeys as $PassKey) {
-      if (strlen($Concat) > 3950) { // Ocelot's read buffer is 4 KiB and anything exceeding it is truncated
+
+    /**
+     * Disable an array of users.
+     *
+     * @param array $UserIDs (You can also send it one ID as an int, because fuck types)
+     * @param BanReason 0 - Unknown, 1 - Manual, 2 - Ratio, 3 - Inactive, 4 - Unused.
+     */
+    public static function disable_users($UserIDs, $AdminComment, $BanReason = 1)
+    {
+        $QueryID = G::$DB->get_query_id();
+        if (!is_array($UserIDs)) {
+            $UserIDs = array($UserIDs);
+        }
+
+        G::$DB->query("
+        UPDATE users_info AS i
+          JOIN users_main AS m ON m.ID = i.UserID
+        SET m.Enabled = '2',
+          m.can_leech = '0',
+          i.AdminComment = CONCAT('".sqltime()." - ".($AdminComment ? $AdminComment : 'Disabled by system')."\n\n', i.AdminComment),
+          i.BanDate = NOW(),
+          i.BanReason = '$BanReason',
+          i.RatioWatchDownload = ".($BanReason == 2 ? 'm.Downloaded' : "'0'")."
+        WHERE m.ID IN(".implode(',', $UserIDs).') ');
+
+        G::$Cache->decrement('stats_user_count', G::$DB->affected_rows());
+        foreach ($UserIDs as $UserID) {
+            G::$Cache->delete_value("enabled_$UserID");
+            G::$Cache->delete_value("user_info_$UserID");
+            G::$Cache->delete_value("user_info_heavy_$UserID");
+            G::$Cache->delete_value("user_stats_$UserID");
+
+            G::$DB->query("
+            SELECT SessionID
+            FROM users_sessions
+              WHERE UserID = '$UserID'
+              AND Active = 1");
+
+            while (list($SessionID) = G::$DB->next_record()) {
+                G::$Cache->delete_value("session_$UserID"."_$SessionID");
+            }
+            G::$Cache->delete_value("users_sessions_$UserID");
+
+            G::$DB->query("
+            DELETE FROM users_sessions
+              WHERE UserID = '$UserID'");
+        }
+
+        // Remove the users from the tracker.
+        G::$DB->query('
+        SELECT torrent_pass
+        FROM users_main
+          WHERE ID in ('.implode(', ', $UserIDs).')');
+
+        $PassKeys = G::$DB->collect('torrent_pass');
+        $Concat = '';
+        foreach ($PassKeys as $PassKey) {
+            if (strlen($Concat) > 3950) { // Ocelot's read buffer is 4 KiB and anything exceeding it is truncated
+                Tracker::update_tracker('remove_users', array('passkeys' => $Concat));
+                $Concat = $PassKey;
+            } else {
+                $Concat .= $PassKey;
+            }
+        }
+
         Tracker::update_tracker('remove_users', array('passkeys' => $Concat));
-        $Concat = $PassKey;
-      } else {
-        $Concat .= $PassKey;
-      }
+        G::$DB->set_query_id($QueryID);
     }
-    Tracker::update_tracker('remove_users', array('passkeys' => $Concat));
-    G::$DB->set_query_id($QueryID);
-  }
-
-  /**
-   * Warn a user.
-   *
-   * @param int $UserID
-   * @param int $Duration length of warning in seconds
-   * @param string $reason
-   */
-  public static function warn_user($UserID, $Duration, $Reason) {
-    global $Time;
-
-    $QueryID = G::$DB->get_query_id();
-    G::$DB->query("
-      SELECT Warned
-      FROM users_info
-      WHERE UserID = $UserID
-        AND Warned IS NOT NULL");
-    if (G::$DB->has_results()) {
-      //User was already warned, appending new warning to old.
-      list($OldDate) = G::$DB->next_record();
-      $NewExpDate = date('Y-m-d H:i:s', strtotime($OldDate) + $Duration);
-
-      Misc::send_pm($UserID, 0,
-        'You have received multiple warnings.',
-        "When you received your latest warning (set to expire on ".date('Y-m-d', (time() + $Duration)).'), you already had a different warning (set to expire on '.date('Y-m-d', strtotime($OldDate)).").\n\n Due to this collision, your warning status will now expire at $NewExpDate.");
-
-      $AdminComment = date('Y-m-d')." - Warning (Clash) extended to expire at $NewExpDate by " . G::$LoggedUser['Username'] . "\nReason: $Reason\n\n";
-
-      G::$DB->query('
-        UPDATE users_info
-        SET
-          Warned = \''.db_string($NewExpDate).'\',
-          WarnedTimes = WarnedTimes + 1,
-          AdminComment = CONCAT(\''.db_string($AdminComment).'\', AdminComment)
-        WHERE UserID = \''.db_string($UserID).'\'');
-    } else {
-      //Not changing, user was not already warned
-      $WarnTime = time_plus($Duration);
-
-      G::$Cache->begin_transaction("user_info_$UserID");
-      G::$Cache->update_row(false, array('Warned' => $WarnTime));
-      G::$Cache->commit_transaction(0);
-
-      $AdminComment = date('Y-m-d')." - Warned until $WarnTime by " . G::$LoggedUser['Username'] . "\nReason: $Reason\n\n";
-
-      G::$DB->query('
+
+    /**
+     * Warn a user.
+     *
+     * @param int $UserID
+     * @param int $Duration length of warning in seconds
+     * @param string $reason
+     */
+    public static function warn_user($UserID, $Duration, $Reason)
+    {
+        global $Time;
+
+        $QueryID = G::$DB->get_query_id();
+        G::$DB->query("
+        SELECT Warned
+        FROM users_info
+          WHERE UserID = $UserID
+          AND Warned IS NOT NULL");
+          
+        if (G::$DB->has_results()) {
+            //User was already warned, appending new warning to old.
+            list($OldDate) = G::$DB->next_record();
+            $NewExpDate = date('Y-m-d H:i:s', strtotime($OldDate) + $Duration);
+
+            Misc::send_pm(
+                $UserID,
+                0,
+                'You have received multiple warnings.',
+                "When you received your latest warning (set to expire on ".date('Y-m-d', (time() + $Duration)).'), you already had a different warning (set to expire on '.date('Y-m-d', strtotime($OldDate)).").\n\n Due to this collision, your warning status will now expire at $NewExpDate."
+            );
+
+            $AdminComment = date('Y-m-d')." - Warning (Clash) extended to expire at $NewExpDate by " . G::$LoggedUser['Username'] . "\nReason: $Reason\n\n";
+
+            G::$DB->query('
+            UPDATE users_info
+            SET
+              Warned = \''.db_string($NewExpDate).'\',
+              WarnedTimes = WarnedTimes + 1,
+              AdminComment = CONCAT(\''.db_string($AdminComment).'\', AdminComment)
+              WHERE UserID = \''.db_string($UserID).'\'');
+        } else {
+            //Not changing, user was not already warned
+            $WarnTime = time_plus($Duration);
+
+            G::$Cache->begin_transaction("user_info_$UserID");
+            G::$Cache->update_row(false, array('Warned' => $WarnTime));
+            G::$Cache->commit_transaction(0);
+
+            $AdminComment = date('Y-m-d')." - Warned until $WarnTime by " . G::$LoggedUser['Username'] . "\nReason: $Reason\n\n";
+
+            G::$DB->query('
+            UPDATE users_info
+            SET
+              Warned = \''.db_string($WarnTime).'\',
+              WarnedTimes = WarnedTimes + 1,
+              AdminComment = CONCAT(\''.db_string($AdminComment).'\', AdminComment)
+              WHERE UserID = \''.db_string($UserID).'\'');
+        }
+        G::$DB->set_query_id($QueryID);
+    }
+
+    /**
+     * Update the notes of a user
+     * @param unknown $UserID ID of user
+     * @param unknown $AdminComment Comment to update with
+     */
+    public static function update_user_notes($UserID, $AdminComment)
+    {
+        $QueryID = G::$DB->get_query_id();
+        G::$DB->query('
         UPDATE users_info
-        SET
-          Warned = \''.db_string($WarnTime).'\',
-          WarnedTimes = WarnedTimes + 1,
-          AdminComment = CONCAT(\''.db_string($AdminComment).'\', AdminComment)
-        WHERE UserID = \''.db_string($UserID).'\'');
+        SET AdminComment = CONCAT(\''.db_string($AdminComment).'\', AdminComment)
+          WHERE UserID = \''.db_string($UserID).'\'');
+        G::$DB->set_query_id($QueryID);
     }
-    G::$DB->set_query_id($QueryID);
-  }
-
-  /**
-   * Update the notes of a user
-   * @param unknown $UserID ID of user
-   * @param unknown $AdminComment Comment to update with
-   */
-  public static function update_user_notes($UserID, $AdminComment) {
-    $QueryID = G::$DB->get_query_id();
-    G::$DB->query('
-      UPDATE users_info
-      SET AdminComment = CONCAT(\''.db_string($AdminComment).'\', AdminComment)
-      WHERE UserID = \''.db_string($UserID).'\'');
-    G::$DB->set_query_id($QueryID);
-  }
-
-  /**
-  * Check if an IP address is part of a given CIDR range.
-  * @param string $CheckIP the IP address to be looked up
-  * @param string $Subnet the CIDR subnet to be checked against
-  */
-  public static function check_cidr_range($CheckIP, $Subnet) {
-    $IP = ip2long($CheckIP);
-    $CIDR = split('/', $Subnet);
-    $SubnetIP = ip2long($CIDR[0]);
-    $SubnetMaskBits = 32 - $CIDR[1];
-
-    return (($IP>>$SubnetMaskBits) == ($SubnetIP>>$SubnetMaskBits));
-  }
 
+    /**
+    * Check if an IP address is part of a given CIDR range.
+    * @param string $CheckIP the IP address to be looked up
+    * @param string $Subnet the CIDR subnet to be checked against
+    */
+    public static function check_cidr_range($CheckIP, $Subnet)
+    {
+        $IP = ip2long($CheckIP);
+        $CIDR = split('/', $Subnet);
+        $SubnetIP = ip2long($CIDR[0]);
+        $SubnetMaskBits = 32 - $CIDR[1];
+        return (($IP>>$SubnetMaskBits) == ($SubnetIP>>$SubnetMaskBits));
+    }
 }
-?>

classes/torrentsearch.class.php

 
     // Map of sort mode => attribute name for ungrouped torrent page
     public static $SortOrders = [
-    'year' => 'year',
-    'time' => 'id',
-    'size' => 'size',
-    'seeders' => 'seeders',
-    'leechers' => 'leechers',
-    'snatched' => 'snatched',
-    'cataloguenumber' => 'cataloguenumber',
-    'random' => 1
-  ];
+        'year' => 'year',
+        'time' => 'id',
+        'size' => 'size',
+        'seeders' => 'seeders',
+        'leechers' => 'leechers',
+        'snatched' => 'snatched',
+        'cataloguenumber' => 'cataloguenumber',
+        'random' => 1
+    ];
 
     // Map of sort mode => attribute name for grouped torrent page
     private static $SortOrdersGrouped = [
-    'year' => 'year',
-    'time' => 'id',
-    'size' => 'maxsize',
-    'seeders' => 'sumseeders',
-    'leechers' => 'sumleechers',
-    'snatched' => 'sumsnatched',
-    'cataloguenumber' => 'cataloguenumber',
-    'random' => 1
-  ];
+        'year' => 'year',
+        'time' => 'id',
+        'size' => 'maxsize',
+        'seeders' => 'sumseeders',
+        'leechers' => 'sumleechers',
+        'snatched' => 'sumsnatched',
+        'cataloguenumber' => 'cataloguenumber',
+        'random' => 1
+    ];
 
     // Map of sort mode => aggregate expression required for some grouped sort orders
     private static $AggregateExp = [
-    'size' => 'MAX(size) AS maxsize',
-    'seeders' => 'SUM(seeders) AS sumseeders',
-    'leechers' => 'SUM(leechers) AS sumleechers',
-    'snatched' => 'SUM(snatched) AS sumsnatched'
-  ];
+        'size' => 'MAX(size) AS maxsize',
+        'seeders' => 'SUM(seeders) AS sumseeders',
+        'leechers' => 'SUM(leechers) AS sumleechers',
+        'snatched' => 'SUM(snatched) AS sumsnatched'
+    ];
 
     // Map of attribute name => global variable name with list of values that can be used for filtering
     private static $Attributes = [
-    'filter_cat' => false,
-    'releasetype' => 'ReleaseTypes',
-    'freetorrent' => false,
-    'censored' => false,
-    'size_unit' => false,
-    'year' => false
-  ];
+        'filter_cat' => false,
+        'releasetype' => 'ReleaseTypes',
+        'freetorrent' => false,
+        'censored' => false,
+        'size_unit' => false,
+        'year' => false
+    ];
 
     // List of fields that can be used for fulltext searches
     private static $Fields = [
-    'artistname' => 1, # Author
-    'audioformat' => 1, # Version
-    'cataloguenumber' => 1, # Accession Number
-    'numbers' => 1, # Combined ↑
-    'codec' => 1, # License
-    'container' => 1, # Format
-    'archive' => 0, # todo
-    'description' => 1, # Not group desc
-    'dlsiteid' => 1,
-    'filelist' => 1,
-    'groupname' => 1, # Title
-    'groupnamerj' => 1, # Organism
-    'groupnamejp' => 1, # Strain
-    'advgroupname' => 1,
-    'language' => 1,
-    'media' => 1, # Platform
-    'resolution' => 1, # Assembly Level
-    'searchstr' => 1,
-    'series' => 1, # Location
-    'studio' => 1, # Department/Lab
-    'location' => 1, # Combined ↑
-    'subber' => 1,
-    'subbing' => 1,
-    'taglist' => 1
+        'artistname' => 1, # Author
+        'audioformat' => 1, # Version
+        'cataloguenumber' => 1, # Accession Number
+        'numbers' => 1, # Combined ↑
+        'codec' => 1, # License
+        'container' => 1, # Format
+        'archive' => 0, # todo
+        'description' => 1, # Not group desc
+        'dlsiteid' => 1,
+        'filelist' => 1,
+        'groupname' => 1, # Title
+        'groupnamerj' => 1, # Organism
+        'groupnamejp' => 1, # Strain
+        'advgroupname' => 1,
+        'language' => 1,
+        'media' => 1, # Platform
+        'resolution' => 1, # Assembly Level
+        'searchstr' => 1,
+        'series' => 1, # Location
+        'studio' => 1, # Department/Lab
+        'location' => 1, # Combined ↑
+        'subber' => 1,
+        'subbing' => 1,
+        'taglist' => 1
   ];
 
     // List of torrent-specific fields that can be used for filtering
     private static $TorrentFields = [
-    'description' => 1,
-    'encoding' => 1,
-    'censored' => 1,
-    'language' => 1,
-    'filelist' => 1,
-    'format' => 1,
-    'media' => 1
+        'description' => 1,
+        'encoding' => 1,
+        'censored' => 1,
+        'language' => 1,
+        'filelist' => 1,
+        'format' => 1,
+        'media' => 1
   ];
 
     // Some form field names don't match the ones in the index
 
     // Specify the operator type to use for fields. Empty key sets the default
     private static $FieldOperators = [
-    '' => self::SPH_BOOL_AND,
-    'encoding' => self::SPH_BOOL_OR,
-    'format' => self::SPH_BOOL_OR,
-    'media' => self::SPH_BOOL_OR
-  ];
+        '' => self::SPH_BOOL_AND,
+        'encoding' => self::SPH_BOOL_OR,
+        'format' => self::SPH_BOOL_OR,
+        'media' => self::SPH_BOOL_OR
+    ];
 
     // Specify the separator character to use for fields. Empty key sets the default
     private static $FieldSeparators = [
-    '' => ' ',
-    'encoding' => '|',
-    'format' => '|',
-    'media' => '|',
-    'taglist' => ','
-  ];
+        '' => ' ',
+        'encoding' => '|',
+        'format' => '|',
+        'media' => '|',
+        'taglist' => ','
+    ];
 
     // Primary SphinxqlQuery object used to get group IDs or torrent IDs for ungrouped searches
     private $SphQL;
             $Debug->analysis('Bad arguments in TorrentSearch constructor', $ErrMsg, 3600*24);
             error('-1');
         }
+
         if (!is_number($Page) || $Page < 1) {
             $Page = 1;
         }
+
         if (check_perms('site_search_many')) {
             $this->Page = $Page;
         } else {
             $this->Page = min($Page, SPHINX_MAX_MATCHES / $PageSize);
         }
+
         $ResultLimit = $PageSize;
         $this->PageSize = $PageSize;
         $this->GroupResults = $GroupResults;
         $this->SphQL = new SphinxqlQuery();
         $this->SphQL->where_match('_all', 'fake', false);
+
         if ($OrderBy === 'random') {
             $this->SphQL->select('id, groupid')
         ->order_by('RAND()', '');
             $this->SphQL->select('id, groupid')
         ->order_by(self::$SortOrders[$OrderBy], $OrderWay);
         }
+
         $Offset = ($this->Page - 1) * $ResultLimit;
         $MinMax = G::$Cache->get_value('sphinx_min_max_matches');
         $MaxMatches = max($Offset + $ResultLimit, $MinMax ? $MinMax : 1000); # todo: Keep an eye on this
             $this->SphResults = false;
             return;
         }
+
         if ($this->Random && $this->GroupResults) {
             $TotalCount = $SphQLResult->get_meta('total_found');
             $this->SphResults = $SphQLResult->collect('groupid');
                 // Make sure we get $PageSize results, or all of them if there are less than $PageSize hits
                 $this->SphQL->where('groupid', $GroupIDs, true);
                 $SphQLResult = $this->SphQL->query();
+
                 if (!$SphQLResult->has_results()) {
                     break;
                 }
+
                 $this->SphResults += $SphQLResult->collect('groupid');
                 $GroupIDs = array_keys($this->SphResults);
                 $GroupCount = count($GroupIDs);
             }
+
             if ($GroupCount > $this->PageSize) {
                 $this->SphResults = array_slice($this->SphResults, 0, $this->PageSize, true);
             }
     {
         foreach ($this->Terms as $Field => $Words) {
             $SearchString = '';
+
             if (isset(self::$FormsToFields[$Field])) {
                 $Field = self::$FormsToFields[$Field];
             }
+
             $QueryParts = ['include' => [], 'exclude' => []];
             if (!empty($Words['include'])) {
                 foreach ($Words['include'] as $Word) {
                     $QueryParts['include'][] = Sphinxql::sph_escape_string($Word);
                 }
             }
+
             if (!empty($Words['exclude'])) {
                 foreach ($Words['exclude'] as $Word) {
                     $QueryParts['exclude'][] = '!' . Sphinxql::sph_escape_string(substr($Word, 1));
                 }
             }
+
             if (!empty($QueryParts)) {
                 if (isset($Words['operator'])) {
                     // Is the operator already specified?
                     // Go for the default operator
                     $Operator = self::$FieldOperators[''];
                 }
+
                 if (!empty($QueryParts['include'])) {
                     if ($Field === 'taglist') {
                         foreach ($QueryParts['include'] as $key => $Tag) {
                     }
                     $SearchString .= '( ' . implode($Operator, $QueryParts['include']) . ' ) ';
                 }
+
                 if (!empty($QueryParts['exclude'])) {
                     $SearchString .= implode(' ', $QueryParts['exclude']);
                 }
+
                 $this->SphQL->where_match($SearchString, $Field, false);
                 if (isset(self::$TorrentFields[$Field])) {
                     $this->UsedTorrentFields[$Field] = $SearchString;
         if ($Term === '') {
             return;
         }
+
         if ($Field === 'searchstr') {
             $this->search_basic($Term);
         } elseif ($Field === 'filelist') {
             if (isset($this->RawTerms['tags_type']) && (int)$this->RawTerms['tags_type'] === self::TAGS_ANY) {
                 $this->Terms['taglist']['operator'] = self::SPH_BOOL_OR;
             }
+
             // Update the RawTerms array so get_terms() can return the corrected search terms
             if (isset($this->Terms['taglist']['include'])) {
                 $AllTags = $this->Terms['taglist']['include'];
             } else {
                 $AllTags = [];
             }
+
             if (isset($this->Terms['taglist']['exclude'])) {
                 $AllTags = array_merge($AllTags, $this->Terms['taglist']['exclude']);
             }
               $this->add_word('format', $Word);
             }
             */
+
             if (in_array($Word, $SearchMedia)) {
                 $this->add_word('media', $Word);
             } else {
         } else {
             $Separator = self::$FieldSeparators[''];
         }
+
         $Words = explode($Separator, $Term);
         foreach ($Words as $Word) {
             $this->add_word($Field, $Word);
         if ($Word === '' || $Word === '-') {
             return;
         }
+
         if ($Word[0] === '!' && strlen($Word) >= 2 && strpos($Word, '!', 1) === false) {
             $this->Terms[$Field]['exclude'][] = $Word;
         } else {
         if (count($this->SphResults) === 0) {
             return;
         }
+
         $this->Groups = Torrents::get_groups($this->SphResults);
         if ($this->need_torrent_ft()) {
             // Query Sphinx for torrent IDs if torrent-specific fulltext filters were used
                 $AllTorrents += array_fill_keys(array_keys($Group['Torrents']), $GroupID);
             }
         }
+
         $TorrentCount = count($AllTorrents);
         $this->SphQLTor = new SphinxqlQuery();
         $this->SphQLTor->where_match('_all', 'fake', false);
         $this->SphQLTor->select('id')->from('torrents, delta');
+
         foreach ($this->UsedTorrentFields as $Field => $Term) {
             $this->SphQLTor->where_match($Term, $Field, false);
         }
+
         $this->SphQLTor->copy_attributes_from($this->SphQL);
         $this->SphQLTor->where('id', array_keys($AllTorrents))->limit(0, $TorrentCount, $TorrentCount);
         $SphQLResultTor = $this->SphQLTor->query();
         $MatchingTorrentIDs = $SphQLResultTor->to_pair('id', 'id');
+
         foreach ($AllTorrents as $TorrentID => $GroupID) {
             if (!isset($MatchingTorrentIDs[$TorrentID])) {
                 unset($this->Groups[$GroupID]['Torrents'][$TorrentID]);
             if (empty($Group['Torrents'])) {
                 continue;
             }
+            
             foreach ($Group['Torrents'] as $TorrentID => $Torrent) {
                 if (!$this->filter_torrent_internal($Torrent)) {
                     unset($this->Groups[$GroupID]['Torrents'][$TorrentID]);
      * @return bool True if it's a real hit
      */
     private function filter_torrent_internal($Torrent)
-    {
-        if (isset($this->UsedTorrentAttrs['freetorrent'])) {
-            $FilterValue = $this->UsedTorrentAttrs['freetorrent'];
-            if ($FilterValue === 3 && $Torrent['FreeTorrent'] === 0) {
-                // Either FL or NL is ok
-                return false;
-            } elseif ($FilterValue !== 3 && $FilterValue !== (int)$Torrent['FreeTorrent']) {
-                return false;
-            }
-        }
-        return true;
-    }
-}
-
-/* Not integers
-    private function filter_torrent_internal($Torrent)
     {
         if (isset($this->UsedTorrentAttrs['freetorrent'])) {
             $FilterValue = $this->UsedTorrentAttrs['freetorrent'];
         return true;
     }
 }
-*/

classes/tracker.class.php

-<?
+<?php
+
 // todo: Turn this into a class with nice functions like update_user, delete_torrent, etc.
-class Tracker {
-  const STATS_MAIN = 0;
-  const STATS_USER = 1;
-
-  public static $Requests = [];
-
-  /**
-   * Send a GET request over a socket directly to the tracker
-   * For example, Tracker::update_tracker('change_passkey', array('oldpasskey' => OLD_PASSKEY, 'newpasskey' => NEW_PASSKEY)) will send the request:
-   * GET /tracker_32_char_secret_code/update?action=change_passkey&oldpasskey=OLD_PASSKEY&newpasskey=NEW_PASSKEY HTTP/1.1
-   *
-   * @param string $Action The action to send
-   * @param array $Updates An associative array of key->value pairs to send to the tracker
-   * @param boolean $ToIRC Sends a message to the channel #tracker with the GET URL.
-   */
-  public static function update_tracker($Action, $Updates, $ToIRC = false) {
-    // Build request
-    $Get = TRACKER_SECRET . "/update?action=$Action";
-    foreach ($Updates as $Key => $Value) {
-      $Get .= "&$Key=$Value";
-    }
+class Tracker
+{
+    const STATS_MAIN = 0;
+    const STATS_USER = 1;
+    public static $Requests = [];
 
-    $MaxAttempts = 3;
-    // don't wait around if we're debugging
-    if (DEBUG_MODE) {
-      $MaxAttempts = 1;
-    }
+    /**
+     * Send a GET request over a socket directly to the tracker
+     * For example, Tracker::update_tracker('change_passkey', array('oldpasskey' => OLD_PASSKEY, 'newpasskey' => NEW_PASSKEY)) will send the request:
+     * GET /tracker_32_char_secret_code/update?action=change_passkey&oldpasskey=OLD_PASSKEY&newpasskey=NEW_PASSKEY HTTP/1.1
+     *
+     * @param string $Action The action to send
+     * @param array $Updates An associative array of key->value pairs to send to the tracker
+     * @param boolean $ToIRC Sends a message to the channel #tracker with the GET URL.
+     */
+    public static function update_tracker($Action, $Updates, $ToIRC = false)
+    {
+        // Build request
+        $Get = TRACKER_SECRET . "/update?action=$Action";
+        foreach ($Updates as $Key => $Value) {
+            $Get .= "&$Key=$Value";
+        }
 
-    $Err = false;
-    if (self::send_request($Get, $MaxAttempts, $Err) === false) {
-      send_irc("PRIVMSG " . BOT_DEBUG_CHAN . " :$MaxAttempts $Err $Get");
-      if (G::$Cache->get_value('ocelot_error_reported') === false) {
-        send_irc('PRIVMSG ' . ADMIN_CHAN . " :Failed to update ocelot: $Err : $Get");
-        G::$Cache->cache_value('ocelot_error_reported', true, 3600);
-      }
-      return false;
-    }
-    return true;
-  }
-
-  /**
-   * Get global peer stats from the tracker
-   *
-   * @return array(0 => $Leeching, 1 => $Seeding) or false if request failed
-   */
-  public static function global_peer_count() {
-    $Stats = self::get_stats(self::STATS_MAIN);
-    if (isset($Stats['leechers tracked']) && isset($Stats['seeders tracked'])) {
-      $Leechers = $Stats['leechers tracked'];
-      $Seeders = $Stats['seeders tracked'];
-    } else {
-      return false;
-    }
-    return array($Leechers, $Seeders);
-  }
-
-  /**
-   * Get peer stats for a user from the tracker
-   *
-   * @param string $TorrentPass The user's pass key
-   * @return array(0 => $Leeching, 1 => $Seeding) or false if the request failed
-   */
-  public static function user_peer_count($TorrentPass) {
-    $Stats = self::get_stats(self::STATS_USER, array('key' => $TorrentPass));
-    if ($Stats === false) {
-      return false;
-    }
-    if (isset($Stats['leeching']) && isset($Stats['seeding'])) {
-      $Leeching = $Stats['leeching'];
-      $Seeding = $Stats['seeding'];
-    } else {
-      // User doesn't exist, but don't tell anyone
-      $Leeching = $Seeding = 0;
-    }
-    return array($Leeching, $Seeding);
-  }
-
-  /**
-   * Get whatever info the tracker has to report
-   *
-   * @return results from get_stats()
-   */
-  public static function info() {
-    return self::get_stats(self::STATS_MAIN);
-  }
-
-  /**
-   * Send a stats request to the tracker and process the results
-   *
-   * @param int $Type Stats type to get
-   * @param array $Params Parameters required by stats type
-   * @return array with stats in named keys or false if the request failed
-   */
-  private static function get_stats($Type, $Params = false) {
-    if (!defined('TRACKER_REPORTKEY')) {
-      return false;
+        $MaxAttempts = 3;
+        // don't wait around if we're debugging
+        if (DEBUG_MODE) {
+            $MaxAttempts = 1;
+        }
+
+        $Err = false;
+        if (self::send_request($Get, $MaxAttempts, $Err) === false) {
+            send_irc("PRIVMSG " . BOT_DEBUG_CHAN . " :$MaxAttempts $Err $Get");
+            if (G::$Cache->get_value('ocelot_error_reported') === false) {
+                send_irc('PRIVMSG ' . ADMIN_CHAN . " :Failed to update ocelot: $Err : $Get");
+                G::$Cache->cache_value('ocelot_error_reported', true, 3600);
+            }
+            return false;
+        }
+        return true;
     }
-    $Get = TRACKER_REPORTKEY . '/report?';
-    if ($Type === self::STATS_MAIN) {
-      $Get .= 'get=stats';
-    } elseif ($Type === self::STATS_USER && !empty($Params['key'])) {
-      $Get .= "get=user&key=$Params[key]";
-    } else {
-      return false;
+
+    /**
+     * Get global peer stats from the tracker
+     *
+     * @return array(0 => $Leeching, 1 => $Seeding) or false if request failed
+     */
+    public static function global_peer_count()
+    {
+        $Stats = self::get_stats(self::STATS_MAIN);
+        if (isset($Stats['leechers tracked']) && isset($Stats['seeders tracked'])) {
+            $Leechers = $Stats['leechers tracked'];
+            $Seeders = $Stats['seeders tracked'];
+        } else {
+            return false;
+        }
+        return array($Leechers, $Seeders);
     }
-    $Response = self::send_request($Get);
-    if ($Response === false) {
-      return false;
+
+    /**
+     * Get peer stats for a user from the tracker
+     *
+     * @param string $TorrentPass The user's pass key
+     * @return array(0 => $Leeching, 1 => $Seeding) or false if the request failed
+     */
+    public static function user_peer_count($TorrentPass)
+    {
+        $Stats = self::get_stats(self::STATS_USER, array('key' => $TorrentPass));
+        if ($Stats === false) {
+            return false;
+        }
+
+        if (isset($Stats['leeching']) && isset($Stats['seeding'])) {
+            $Leeching = $Stats['leeching'];
+            $Seeding = $Stats['seeding'];
+        } else {
+            // User doesn't exist, but don't tell anyone
+            $Leeching = $Seeding = 0;
+        }
+        return array($Leeching, $Seeding);
     }
-    $Stats = [];
-    foreach (explode("\n", $Response) as $Stat) {
-      list($Val, $Key) = explode(" ", $Stat, 2);
-      $Stats[$Key] = $Val;
+
+    /**
+     * Get whatever info the tracker has to report
+     *
+     * @return results from get_stats()
+     */
+    public static function info()
+    {
+        return self::get_stats(self::STATS_MAIN);
     }
-    return $Stats;
-  }
-
-  /**
-   * Send a request to the tracker
-   *
-   * @param string $Path GET string to send to the tracker
-   * @param int $MaxAttempts Maximum number of failed attempts before giving up
-   * @param $Err Variable to use as storage for the error string if the request fails
-   * @return tracker response message or false if the request failed
-   */
-  private static function send_request($Get, $MaxAttempts = 1, &$Err = false) {
-    $Header = "GET /$Get HTTP/1.1\r\nConnection: Close\r\n\r\n";
-    $Attempts = 0;
-    $Sleep = 0;
-    $Success = false;
-    $StartTime = microtime(true);
-    while (!$Success && $Attempts++ < $MaxAttempts) {
-      if ($Sleep) {
-        sleep($Sleep);
-      }
-
-      // spend some time retrying if we're not in DEBUG_MODE
-      if (!DEBUG_MODE) {
-        $Sleep = 6;
-      }
-
-      // Send request
-      $File = fsockopen(TRACKER_HOST, TRACKER_PORT, $ErrorNum, $ErrorString);
-      if ($File) {
-        if (fwrite($File, $Header) === false) {
-          $Err = "Failed to fwrite()";
-          $Sleep = 3;
-          continue;
+
+    /**
+     * Send a stats request to the tracker and process the results
+     *
+     * @param int $Type Stats type to get
+     * @param array $Params Parameters required by stats type
+     * @return array with stats in named keys or false if the request failed
+     */
+    private static function get_stats($Type, $Params = false)
+    {
+        if (!defined('TRACKER_REPORTKEY')) {
+            return false;
         }
-      } else {
-        $Err = "Failed to fsockopen() - $ErrorNum - $ErrorString";
-        continue;
-      }
-
-      // Check for response.
-      $Response = '';
-      while (!feof($File)) {
-        $Response .= fread($File, 1024);
-      }
-      $DataStart = strpos($Response, "\r\n\r\n") + 4;
-      $DataEnd = strrpos($Response, "\n");
-      if ($DataEnd > $DataStart) {
-        $Data = substr($Response, $DataStart, $DataEnd - $DataStart);
-      } else {
-        $Data = "";
-      }
-      $Status = substr($Response, $DataEnd + 1);
-      if ($Status == "success") {
-        $Success = true;
-      }
+
+        $Get = TRACKER_REPORTKEY . '/report?';
+        if ($Type === self::STATS_MAIN) {
+            $Get .= 'get=stats';
+        } elseif ($Type === self::STATS_USER && !empty($Params['key'])) {
+            $Get .= "get=user&key=$Params[key]";
+        } else {
+            return false;
+        }
+
+        $Response = self::send_request($Get);
+        if ($Response === false) {
+            return false;
+        }
+
+        $Stats = [];
+        foreach (explode("\n", $Response) as $Stat) {
+            list($Val, $Key) = explode(" ", $Stat, 2);
+            $Stats[$Key] = $Val;
+        }
+        return $Stats;
     }
-    $Request = array(
-      'path' => substr($Get, strpos($Get, '/')),
-      'response' => ($Success ? $Data : $Response),
-      'status' => ($Success ? 'ok' : 'failed'),
-      'time' => 1000 * (microtime(true) - $StartTime)
-    );
-    self::$Requests[] = $Request;
-    if ($Success) {
-      return $Data;
+
+    /**
+     * Send a request to the tracker
+     *
+     * @param string $Path GET string to send to the tracker
+     * @param int $MaxAttempts Maximum number of failed attempts before giving up
+     * @param $Err Variable to use as storage for the error string if the request fails
+     * @return tracker response message or false if the request failed
+     */
+    private static function send_request($Get, $MaxAttempts = 1, &$Err = false)
+    {
+        $Header = "GET /$Get HTTP/1.1\r\nConnection: Close\r\n\r\n";
+        $Attempts = 0;
+        $Sleep = 0;
+        $Success = false;
+        $StartTime = microtime(true);
+
+        while (!$Success && $Attempts++ < $MaxAttempts) {
+            if ($Sleep) {
+                sleep($Sleep);
+            }
+
+            // spend some time retrying if we're not in DEBUG_MODE
+            if (!DEBUG_MODE) {
+                $Sleep = 6;
+            }
+
+            // Send request
+            $File = fsockopen(TRACKER_HOST, TRACKER_PORT, $ErrorNum, $ErrorString);
+            if ($File) {
+                if (fwrite($File, $Header) === false) {
+                    $Err = "Failed to fwrite()";
+                    $Sleep = 3;
+                    continue;
+                }
+            } else {
+                $Err = "Failed to fsockopen() - $ErrorNum - $ErrorString";
+                continue;
+            }
+
+            // Check for response
+            $Response = '';
+            while (!feof($File)) {
+                $Response .= fread($File, 1024);
+            }
+
+            $DataStart = strpos($Response, "\r\n\r\n") + 4;
+            $DataEnd = strrpos($Response, "\n");
+
+            if ($DataEnd > $DataStart) {
+                $Data = substr($Response, $DataStart, $DataEnd - $DataStart);
+            } else {
+                $Data = "";
+            }
+
+            $Status = substr($Response, $DataEnd + 1);
+            if ($Status === "success") {
+                $Success = true;
+            }
+        }
+
+        $Request = array(
+            'path' => substr($Get, strpos($Get, '/')),
+            'response' => ($Success ? $Data : $Response),
+            'status' => ($Success ? 'ok' : 'failed'),
+            'time' => 1000 * (microtime(true) - $StartTime)
+        );
+
+        self::$Requests[] = $Request;
+        if ($Success) {
+            return $Data;
+        }
+        return false;
     }
-    return false;
-  }
 }
-?>

classes/view.class.php

 <?php
+
 class View
 {
     /**
         if ($PageTitle !== '') {
             $PageTitle .= ' :: ';
         }
+
         $PageTitle .= SITE_NAME;
         $PageID = array(
-      $Document, // Document
-      empty($_REQUEST['action']) ? false : $_REQUEST['action'], // Action
-      empty($_REQUEST['type']) ? false : $_REQUEST['type'] // Type
-    );
+            $Document, // Document
+            empty($_REQUEST['action']) ? false : $_REQUEST['action'], // Action
+            empty($_REQUEST['type']) ? false : $_REQUEST['type'] // Type
+        );
 
         if (!is_array(G::$LoggedUser) || empty(G::$LoggedUser['ID']) || $PageTitle === 'Recover Password :: ' . SITE_NAME) {
             require(SERVER_ROOT.'/design/publicheader.php');
             // HTTP/2 Server Push headers for cloudflare
             $Scripts = array_merge(['jquery', 'global', 'ajax.class', 'jquery.autocomplete', 'autocomplete', 'tooltipster'], explode(',', $JSIncludes));
             $Styles = array_merge(['tooltipster'], explode(',', $CSSIncludes));
+
             foreach ($Scripts as $Script) {
                 if (trim($Script) === '') {
                     continue;
                 }
                 header('Link: <'.STATIC_SERVER.'functions/'.$Script.'.js?v='.filemtime(SERVER_ROOT.STATIC_SERVER.'functions/'.$Script.'.js').'>; rel=preload; as=script;', false);
             }
+
             header('Link: <'.STATIC_SERVER.'styles/global.css?v='.filemtime(SERVER_ROOT.STATIC_SERVER.'styles/global.css').'>; rel=preload; as=style', false);
             foreach ($Styles as $Style) {
                 if (trim($Style) === '') {
                 }
                 header('Link: <'.STATIC_SERVER.'styles/'.$Style.'/style.css?v='.filemtime(SERVER_ROOT.STATIC_SERVER.'styles/'.$Style.'/style.css').'>; rel=preload; as=style;', false);
             }
-            require(SERVER_ROOT.'/design/privateheader.php');
+            require SERVER_ROOT.'/design/privateheader.php';
         }
     }
 
     {
         global $ScriptStartTime, $SessionID, $UserSessions, $Debug, $Time, $Mobile;
         if (!is_array(G::$LoggedUser) || (isset($Options['recover']) && $Options['recover'] === true)) {
-            require(SERVER_ROOT.'/design/publicfooter.php');
+            require SERVER_ROOT.'/design/publicfooter.php';
         } else {
-            require(SERVER_ROOT.'/design/privatefooter.php');
+            require SERVER_ROOT.'/design/privatefooter.php';
         }
     }
 
         if (isset($LoadedTemplates[$TemplateName])) {
             $ClassName = $LoadedTemplates[$TemplateName];
         } else {
-            include(SERVER_ROOT.'/design/' . $TemplateName . '.php');
+            include SERVER_ROOT.'/design/'.$TemplateName.'.php';
 
             // Turn template_name into TemplateName
             $ClassNameParts = explode('_', $TemplateName);
             foreach ($ClassNameParts as $Index => $Part) {
                 $ClassNameParts[$Index] = ucfirst($Part);
             }
+            
             $ClassName = implode($ClassNameParts). 'Template';
             $LoadedTemplates[$TemplateName] = $ClassName;
         }

classes/wiki.class.php

-<?
-class Wiki {
-  /**
-   * Normalize an alias
-   * @param string $str
-   * @return string
-   */
-  public static function normalize_alias($str) {
-    return trim(substr(preg_replace('/[^a-z0-9]/', '', strtolower(htmlentities($str))), 0, 50));
-  }
+<?php
 
-  /**
-   * Get all aliases in an associative array of Alias => ArticleID
-   * @return array
-   */
-  public static function get_aliases() {
-    $Aliases = G::$Cache->get_value('wiki_aliases');
-    if (!$Aliases) {
-      $QueryID = G::$DB->get_query_id();
-      G::$DB->query("
-        SELECT Alias, ArticleID
-        FROM wiki_aliases");
-      $Aliases = G::$DB->to_pair('Alias', 'ArticleID');
-      G::$DB->set_query_id($QueryID);
-      G::$Cache->cache_value('wiki_aliases', $Aliases, 3600 * 24 * 14); // 2 weeks
+class Wiki
+{
+    /**
+     * Normalize an alias
+     * @param string $str
+     * @return string
+     */
+    public static function normalize_alias($str)
+    {
+        return trim(substr(preg_replace('/[^a-z0-9]/', '', strtolower(htmlentities($str))), 0, 50));
     }
-    return $Aliases;
-  }
 
-  /**
-   * Flush the alias cache. Call this whenever you touch the wiki_aliases table.
-   */
-  public static function flush_aliases() {
-    G::$Cache->delete_value('wiki_aliases');
-  }
+    /**
+     * Get all aliases in an associative array of Alias => ArticleID
+     * @return array
+     */
+    public static function get_aliases()
+    {
+        $Aliases = G::$Cache->get_value('wiki_aliases');
+        if (!$Aliases) {
+            $QueryID = G::$DB->get_query_id();
+            G::$DB->query("
+            SELECT Alias, ArticleID
+            FROM wiki_aliases");
+            $Aliases = G::$DB->to_pair('Alias', 'ArticleID');
+            G::$DB->set_query_id($QueryID);
+            G::$Cache->cache_value('wiki_aliases', $Aliases, 3600 * 24 * 14); // 2 weeks
+        }
+        return $Aliases;
+    }
 
-  /**
-   * Get the ArticleID corresponding to an alias
-   * @param string $Alias
-   * @return int
-   */
-  public static function alias_to_id($Alias) {
-    $Aliases = self::get_aliases();
-    $Alias = self::normalize_alias($Alias);
-    if (!isset($Aliases[$Alias])) {
-      return false;
-    } else {
-      return (int)$Aliases[$Alias];
+    /**
+     * Flush the alias cache. Call this whenever you touch the wiki_aliases table.
+     */
+    public static function flush_aliases()
+    {
+        G::$Cache->delete_value('wiki_aliases');
     }
-  }
 
-  /**
-   * Get an article; returns false on error if $Error = false
-   * @param int $ArticleID
-   * @param bool $Error
-   * @return array|bool
-   */
-  public static function get_article($ArticleID, $Error = true) {
-    $Contents = G::$Cache->get_value('wiki_article_'.$ArticleID);
-    if (!$Contents) {
-      $QueryID = G::$DB->get_query_id();
-      G::$DB->query("
-        SELECT
-          w.Revision,
-          w.Title,
-          w.Body,
-          w.MinClassRead,
-          w.MinClassEdit,
-          w.Date,
-          w.Author,
-          u.Username,
-          GROUP_CONCAT(a.Alias),
-          GROUP_CONCAT(a.UserID)
-        FROM wiki_articles AS w
-          LEFT JOIN wiki_aliases AS a ON w.ID=a.ArticleID
-          LEFT JOIN users_main AS u ON u.ID=w.Author
-        WHERE w.ID='$ArticleID'
-        GROUP BY w.ID");
-      if (!G::$DB->has_results()) {
-        if ($Error) {
-          error(404);
+    /**
+     * Get the ArticleID corresponding to an alias
+     * @param string $Alias
+     * @return int
+     */
+    public static function alias_to_id($Alias)
+    {
+        $Aliases = self::get_aliases();
+        $Alias = self::normalize_alias($Alias);
+        if (!isset($Aliases[$Alias])) {
+            return false;
         } else {
-          return false;
+            return (int)$Aliases[$Alias];
         }
-      }
-      $Contents = G::$DB->to_array();
-      G::$DB->set_query_id($QueryID);
-      G::$Cache->cache_value('wiki_article_'.$ArticleID, $Contents, 3600 * 24 * 14); // 2 weeks
     }
-    return $Contents;
-  }
 
-  /**
-   * Flush an article's cache. Call this whenever you edited a wiki article or its aliases.
-   * @param int $ArticleID
-   */
-  public static function flush_article($ArticleID) {
-    G::$Cache->delete_value('wiki_article_'.$ArticleID);
-  }
+    /**
+     * Get an article; returns false on error if $Error = false
+     * @param int $ArticleID
+     * @param bool $Error
+     * @return array|bool
+     */
+    public static function get_article($ArticleID, $Error = true)
+    {
+        $Contents = G::$Cache->get_value('wiki_article_'.$ArticleID);
+        if (!$Contents) {
+            $QueryID = G::$DB->get_query_id();
+            G::$DB->query("
+            SELECT
+              w.Revision,
+              w.Title,
+              w.Body,
+              w.MinClassRead,
+              w.MinClassEdit,
+              w.Date,
+              w.Author,
+              u.Username,
+            GROUP_CONCAT(a.Alias),
+            GROUP_CONCAT(a.UserID)
+            FROM wiki_articles AS w
+              LEFT JOIN wiki_aliases AS a ON w.ID=a.ArticleID
+              LEFT JOIN users_main AS u ON u.ID=w.Author
+              WHERE w.ID='$ArticleID'
+              GROUP BY w.ID");
+
+            if (!G::$DB->has_results()) {
+                if ($Error) {
+                    error(404);
+                } else {
+                    return false;
+                }
+            }
+            
+            $Contents = G::$DB->to_array();
+            G::$DB->set_query_id($QueryID);
+            G::$Cache->cache_value('wiki_article_'.$ArticleID, $Contents, 3600 * 24 * 14); // 2 weeks
+        }
+        return $Contents;
+    }
+
+    /**
+     * Flush an article's cache. Call this whenever you edited a wiki article or its aliases.
+     * @param int $ArticleID
+     */
+    public static function flush_article($ArticleID)
+    {
+        G::$Cache->delete_value('wiki_article_'.$ArticleID);
+    }
 }

classes/zip.class.php

-<?
+<?php
+
 /*************************************************************************|
 |--------------- Zip class -----------------------------------------------|
 |*************************************************************************|
 |*************************************************************************/
 
 if (!extension_loaded('zlib')) {
-  error('Zlib Extension not loaded.');
+    error('Zlib Extension not loaded.');
 }
 
-class Zip {
-  public $ArchiveSize = 0; // Total size
-  public $ArchiveFiles = 0; // Total files
-  private $Structure = ''; // Structure saved to memory
-  private $FileOffset = 0; // Offset to write data
-  private $Data = ''; //An idea
-
-  public function __construct ($ArchiveName = 'Archive') {
-    header("Content-type: application/octet-stream"); // Stream download
-    header("Content-disposition: attachment; filename=\"$ArchiveName.zip\""); // Name the archive - Should not be urlencoded
-  }
-
-  public static function unlimit () {
-    ob_end_clean();
-    set_time_limit(3600); // Limit 1 hour
-    ini_set('memory_limit', '1024M'); // Because the buffers can get extremely large
-  }
-
-  public function add_file ($FileData, $ArchivePath, $TimeStamp = 0) {
-    /* File header */
-    $this->Data = "\x50\x4b\x03\x04"; // PK signature
-    $this->Data .= "\x14\x00"; // Version requirements
-    $this->Data .= "\x00\x08"; // Bit flag - 0x8 = UTF-8 file names
-    $this->Data .= "\x08\x00"; // Compression
-    $this->Data .= "\x00\x00\x00\x00";
-    $DataLength = strlen($FileData); // Saved as variable to avoid wasting CPU calculating it multiple times.
-    $CRC32 = crc32($FileData); // Ditto.
-    $ZipData = gzcompress($FileData); // Ditto.
-    $ZipData = substr ($ZipData, 2, (strlen($ZipData) - 6)); // Checksum resolution
-    $ZipLength = strlen($ZipData); // Ditto.
-    $this->Data .= pack('V', $CRC32); // CRC-32
-    $this->Data .= pack('V', $ZipLength); // Compressed file size
-    $this->Data .= pack('V', $DataLength); // Uncompressed file size
-    $this->Data .= pack('v', strlen($ArchivePath)); // Path name length
-    $this->Data .="\x00\x00"; // Extra field length (0'd so we can ignore this)
-    $this->Data .= $ArchivePath; // File name & Extra Field (length set to 0 so ignored)
-    /* END file header */
-
-    /* File data */
-    $this->Data .= $ZipData; // File data
-    /* END file data */
-
-    /* Data descriptor
-    Not needed (only needed when 3rd bitflag is set), causes problems with OS X archive utility
-    $this->Data .= pack('V', $CRC32); // CRC-32
-    $this->Data .= pack('V', $ZipLength); // Compressed file size
-    $this->Data .= pack('V', $DataLength); // Uncompressed file size
-    END data descriptor */
-
-    $FileDataLength = strlen($this->Data);
-    $this->ArchiveSize = $this->ArchiveSize + $FileDataLength; // All we really need is the size
-    $CurrentOffset = $this->ArchiveSize; // Update offsets
-    echo $this->Data; // Get this out to reduce our memory consumption
-
-    /* Central Directory Structure */
-    $CDS = "\x50\x4b\x01\x02"; // CDS signature
-    $CDS .="\x14\x00"; // Constructor version
-    $CDS .="\x14\x00"; // Version requirements
-    $CDS .="\x00\x08"; // Bit flag - 0x8 = UTF-8 file names
-    $CDS .="\x08\x00"; // Compression
-    $CDS .="\x00\x00\x00\x00"; // Last modified
-    $CDS .= pack('V', $CRC32); // CRC-32
-    $CDS .= pack('V', $ZipLength); // Compressed file size
-    $CDS .= pack('V', $DataLength); // Uncompressed file size
-    $CDS .= pack('v', strlen($ArchivePath)); // Path name length
-    $CDS .="\x00\x00"; // Extra field length (0'd so we can ignore this)
-    $CDS .="\x00\x00"; // File comment length  (no comment, 0'd)
-    $CDS .="\x00\x00"; // Disk number start (0 seems valid)
-    $CDS .="\x00\x00"; // Internal file attributes (again with the 0's)
-    $CDS .="\x20\x00\x00\x00"; // External file attributes
-    $CDS .= pack('V', $this->FileOffset); // Offsets
-    $CDS .= $ArchivePath; // File name & Extra Field (length set to 0 so ignored)
-    /* END central Directory Structure */
-
-    $this->FileOffset = $CurrentOffset; // Update offsets
-    $this->Structure .= $CDS; // Append to structure
-    $this->ArchiveFiles++; // Increment file count
-  }
-
-  public function close_stream() {
-    echo $this->Structure; // Structure Root
-    echo "\x50\x4b\x05\x06"; // End of central directory signature
-    echo "\x00\x00"; // This disk
-    echo "\x00\x00"; // CDS start
-    echo pack('v', $this->ArchiveFiles); // Handle the number of entries
-    echo pack('v', $this->ArchiveFiles); // Ditto
-    echo pack('V', strlen($this->Structure)); //Size
-    echo pack('V', $this->ArchiveSize); // Offset
-    echo "\x00\x00"; // No comment, close it off
-  }
+class Zip
+{
+    public $ArchiveSize = 0; // Total size
+    public $ArchiveFiles = 0; // Total files
+    private $Structure = ''; // Structure saved to memory
+    private $FileOffset = 0; // Offset to write data
+    private $Data = ''; //An idea
+
+    public function __construct($ArchiveName = 'Archive')
+    {
+        header("Content-type: application/octet-stream"); // Stream download
+        header("Content-disposition: attachment; filename=\"$ArchiveName.zip\""); // Name the archive - Should not be urlencoded
+    }
+
+    public static function unlimit()
+    {
+        ob_end_clean();
+        set_time_limit(3600); // Limit 1 hour
+        ini_set('memory_limit', '1024M'); // Because the buffers can get extremely large
+    }
+
+    public function add_file($FileData, $ArchivePath, $TimeStamp = 0)
+    {
+        /* File header */
+        $this->Data = "\x50\x4b\x03\x04"; // PK signature
+        $this->Data .= "\x14\x00"; // Version requirements
+        $this->Data .= "\x00\x08"; // Bit flag - 0x8 = UTF-8 file names
+        $this->Data .= "\x08\x00"; // Compression
+        $this->Data .= "\x00\x00\x00\x00";
+
+        $DataLength = strlen($FileData); // Saved as variable to avoid wasting CPU calculating it multiple times
+        $CRC32 = crc32($FileData); // Ditto
+        $ZipData = gzcompress($FileData); // Ditto
+        $ZipData = substr($ZipData, 2, (strlen($ZipData) - 6)); // Checksum resolution
+        $ZipLength = strlen($ZipData); // Ditto
+
+        $this->Data .= pack('V', $CRC32); // CRC-32
+        $this->Data .= pack('V', $ZipLength); // Compressed file size
+        $this->Data .= pack('V', $DataLength); // Uncompressed file size
+        $this->Data .= pack('v', strlen($ArchivePath)); // Path name length
+        $this->Data .="\x00\x00"; // Extra field length (0'd so we can ignore this)
+        $this->Data .= $ArchivePath; // File name & Extra Field (length set to 0 so ignored)
+        /* END file header */
+
+        /* File data */
+        $this->Data .= $ZipData; // File data
+        /* END file data */
+
+        /* Data descriptor
+        Not needed (only needed when 3rd bitflag is set), causes problems with OS X archive utility
+        $this->Data .= pack('V', $CRC32); // CRC-32
+        $this->Data .= pack('V', $ZipLength); // Compressed file size
+        $this->Data .= pack('V', $DataLength); // Uncompressed file size
+        END data descriptor */
+
+        $FileDataLength = strlen($this->Data);
+        $this->ArchiveSize = $this->ArchiveSize + $FileDataLength; // All we really need is the size
+        $CurrentOffset = $this->ArchiveSize; // Update offsets
+        echo $this->Data; // Get this out to reduce our memory consumption
+
+        /* Central Directory Structure */
+        $CDS = "\x50\x4b\x01\x02"; // CDS signature
+        $CDS .="\x14\x00"; // Constructor version
+        $CDS .="\x14\x00"; // Version requirements
+        $CDS .="\x00\x08"; // Bit flag - 0x8 = UTF-8 file names
+        $CDS .="\x08\x00"; // Compression
+        $CDS .="\x00\x00\x00\x00"; // Last modified
+        $CDS .= pack('V', $CRC32); // CRC-32
+        $CDS .= pack('V', $ZipLength); // Compressed file size
+        $CDS .= pack('V', $DataLength); // Uncompressed file size
+        $CDS .= pack('v', strlen($ArchivePath)); // Path name length
+        $CDS .="\x00\x00"; // Extra field length (0'd so we can ignore this)
+        $CDS .="\x00\x00"; // File comment length  (no comment, 0'd)
+        $CDS .="\x00\x00"; // Disk number start (0 seems valid)
+        $CDS .="\x00\x00"; // Internal file attributes (again with the 0's)
+        $CDS .="\x20\x00\x00\x00"; // External file attributes
+        $CDS .= pack('V', $this->FileOffset); // Offsets
+        $CDS .= $ArchivePath; // File name & Extra Field (length set to 0 so ignored)
+        /* END central Directory Structure */
+
+        $this->FileOffset = $CurrentOffset; // Update offsets
+        $this->Structure .= $CDS; // Append to structure
+        $this->ArchiveFiles++; // Increment file count
+    }
+
+    public function close_stream()
+    {
+        echo $this->Structure; // Structure Root
+        echo "\x50\x4b\x05\x06"; // End of central directory signature
+        echo "\x00\x00"; // This disk
+        echo "\x00\x00"; // CDS start
+        echo pack('v', $this->ArchiveFiles); // Handle the number of entries
+        echo pack('v', $this->ArchiveFiles); // Ditto
+        echo pack('V', strlen($this->Structure)); //Size
+        echo pack('V', $this->ArchiveSize); // Offset
+        echo "\x00\x00"; // No comment, close it off
+    }
 }