Big broken commit: redo torrents_group schema, remove "capture user" and "donor forum honorific" features, add ability to call API from Gazelle, duplicate API for new version, style updates, etc.

slaves.php → api.php

@@ -1,5 +1,4 @@
 <?php
 declare(strict_types=1);
 
-define('ERROR_EXCEPTION', true);
 require_once 'classes/script_start.php';

classes/donations.class.php

@@ -1,13 +1,14 @@
 <?php
 declare(strict_types=1);
 
-define('BTC_API_URL', 'https://api.bitcoinaverage.com/ticker/global/EUR/');
-define('USD_API_URL', 'http://www.google.com/ig/calculator?hl=en&q=1USD=?EUR');
-
 class Donations
 {
     private static $IsSchedule = false;
 
+
+    /**
+     * regular_donate
+     */
     public static function regular_donate($UserID, $DonationAmount, $Source, $Reason, $Currency = 'USD')
     {
         self::donate(
@@ -23,6 +24,10 @@ class Donations
         );
     }
 
+
+    /**
+     * donate
+     */
     public static function donate($UserID, $Args)
     {
         $UserID = (int) $UserID;
@@ -220,6 +225,10 @@ class Donations
         G::$DB->set_query_id($QueryID);
     }
 
+
+    /**
+     * calculate_special_rank
+     */
     private static function calculate_special_rank($UserID)
     {
         $UserID = (int) $UserID;
@@ -272,6 +281,10 @@ class Donations
         G::$DB->set_query_id($QueryID);
     }
 
+
+    /**
+     * expire_ranks
+     */
     public static function expire_ranks()
     {
         $QueryID = G::$DB->get_query_id();
@@ -309,11 +322,19 @@ class Donations
         G::$DB->set_query_id($QueryID);
     }
 
+
+    /**
+     * calculate_rank
+     */
     private static function calculate_rank($Amount)
     {
         return floor($Amount / 5);
     }
 
+
+    /**
+     * update_rank
+     */
     public static function update_rank($UserID, $Rank, $TotalRank, $Reason)
     {
         $Rank = (int) $Rank;
@@ -332,6 +353,10 @@ class Donations
         );
     }
 
+
+    /**
+     * hide_stats
+     */
     public static function hide_stats($UserID)
     {
         $QueryID = G::$DB->get_query_id();
@@ -345,6 +370,10 @@ class Donations
         G::$DB->set_query_id($QueryID);
     }
 
+
+    /**
+     * show_stats
+     */
     public static function show_stats($UserID)
     {
         $QueryID = G::$DB->get_query_id();
@@ -358,6 +387,10 @@ class Donations
         G::$DB->set_query_id($QueryID);
     }
 
+
+    /**
+     * is_visible
+     */
     public static function is_visible($UserID)
     {
         $QueryID = G::$DB->get_query_id();
@@ -375,12 +408,17 @@ class Donations
         return $HasResults;
     }
 
+
+    /**
+     * has_donor_forum
+     */
     public static function has_donor_forum($UserID)
     {
         $ENV = ENV::go();
         return self::get_rank($UserID) >= $ENV->DONOR_FORUM_RANK || self::get_special_rank($UserID) >= MAX_SPECIAL_RANK;
     }
 
+
     /**
      * Put all the common donor info in the same cache key to save some cache calls
      */
@@ -452,26 +490,46 @@ class Donations
         return $DonorInfo;
     }
 
+
+    /**
+     * get_rank
+     */
     public static function get_rank($UserID)
     {
         return self::get_donor_info($UserID)['Rank'];
     }
 
+
+    /**
+     * get_special_rank
+     */
     public static function get_special_rank($UserID)
     {
         return self::get_donor_info($UserID)['SRank'];
     }
 
+
+    /**
+     * get_total_rank
+     */
     public static function get_total_rank($UserID)
     {
         return self::get_donor_info($UserID)['TotRank'];
     }
 
+
+    /**
+     * get_donation_time
+     */
     public static function get_donation_time($UserID)
     {
         return self::get_donor_info($UserID)['Time'];
     }
 
+
+    /**
+     * get_personal_collages
+     */
     public static function get_personal_collages($UserID)
     {
         $DonorInfo = self::get_donor_info($UserID);
@@ -483,30 +541,10 @@ class Donations
         return $Collages;
     }
 
-    public static function get_titles($UserID)
-    {
-        $Results = G::$Cache->get_value("donor_title_$UserID");
-        if ($Results === false) {
-            $QueryID = G::$DB->get_query_id();
-
-            G::$DB->query("
-            SELECT
-              `Prefix`,
-              `Suffix`,
-              `UseComma`
-            FROM
-              `donor_forum_usernames`
-            WHERE
-              `UserID` = '$UserID'
-            ");
-
-            $Results = G::$DB->next_record();
-            G::$DB->set_query_id($QueryID);
-            G::$Cache->cache_value("donor_title_$UserID", $Results, 0);
-        }
-        return $Results;
-    }
 
+    /**
+     * get_enabled_rewards
+     */
     public static function get_enabled_rewards($UserID)
     {
         $Rewards = [];
@@ -553,11 +591,19 @@ class Donations
         return $Rewards;
     }
 
+
+    /**
+     * get_rewards
+     */
     public static function get_rewards($UserID)
     {
         return self::get_donor_info($UserID)['Rewards'];
     }
 
+
+    /**
+     * get_profile_rewards
+     */
     public static function get_profile_rewards($UserID)
     {
         $Results = G::$Cache->get_value("donor_profile_rewards_$UserID");
@@ -587,6 +633,10 @@ class Donations
         return $Results;
     }
 
+
+    /**
+     * add_profile_info_reward
+     */
     private static function add_profile_info_reward($Counter, &$Insert, &$Values, &$Update)
     {
         if (isset($_POST["profile_title_" . $Counter]) && isset($_POST["profile_info_" . $Counter])) {
@@ -603,6 +653,10 @@ class Donations
         }
     }
 
+
+    /**
+     * update_rewards
+     */
     public static function update_rewards($UserID)
     {
         $Rank = self::get_rank($UserID);
@@ -663,7 +717,6 @@ class Donations
                 $Values[] = "'$CustomIcon'";
                 $Update[] = "CustomIcon = '$CustomIcon'";
             }
-            self::update_titles($UserID, $_POST['donor_title_prefix'], $_POST['donor_title_suffix'], $_POST['donor_title_comma']);
             $Counter++;
         }
 
@@ -705,37 +758,10 @@ class Donations
         G::$Cache->delete_value("donor_info_$UserID");
     }
 
-    public static function update_titles($UserID, $Prefix, $Suffix, $UseComma)
-    {
-        $QueryID = G::$DB->get_query_id();
-        $Prefix = trim(db_string($Prefix));
-        $Suffix = trim(db_string($Suffix));
-        $UseComma = empty($UseComma);
-
-        G::$DB->query("
-        INSERT INTO `donor_forum_usernames`(
-          `UserID`,
-          `Prefix`,
-          `Suffix`,
-          `UseComma`
-        )
-        VALUES(
-          '$UserID',
-          '$Prefix',
-          '$Suffix',
-          '$UseComma'
-        )
-        ON DUPLICATE KEY
-        UPDATE
-          `Prefix` = '$Prefix',
-          `Suffix` = '$Suffix',
-          `UseComma` = '$UseComma'
-        ");
-
-        G::$Cache->delete_value("donor_title_$UserID");
-        G::$DB->set_query_id($QueryID);
-    }
 
+    /**
+     * get_donation_history
+     */
     public static function get_donation_history($UserID)
     {
         $UserID = (int) $UserID;
@@ -743,7 +769,6 @@ class Donations
             error(404);
         }
 
-        # todo: Investigate Rank in donations table
         $QueryID = G::$DB->get_query_id();
         G::$DB->query("
         SELECT
@@ -770,6 +795,10 @@ class Donations
         return $DonationHistory;
     }
 
+
+    /**
+     * get_rank_expiration
+     */
     public static function get_rank_expiration($UserID)
     {
         $DonorInfo = self::get_donor_info($UserID);
@@ -789,6 +818,10 @@ class Donations
         return $Return;
     }
 
+
+    /**
+     * get_leaderboard_position
+     */
     public static function get_leaderboard_position($UserID)
     {
         $UserID = (int) $UserID;
@@ -823,11 +856,19 @@ class Donations
         return $Position;
     }
 
+
+    /**
+     * is_donor
+     */
     public static function is_donor($UserID)
     {
         return self::get_rank($UserID) > 0;
     }
 
+
+    /**
+     * currency_exchange
+     */
     public static function currency_exchange($Amount, $Currency)
     {
         if (!self::is_valid_currency($Currency)) {
@@ -849,11 +890,19 @@ class Donations
         return round($Amount, 2);
     }
 
+
+    /**
+     * is_valid_currency
+     */
     public static function is_valid_currency($Currency)
     {
         return $Currency === 'EUR' || $Currency === 'BTC' || $Currency === 'USD';
     }
 
+
+    /**
+     * btc_to_euro
+     */
     public static function btc_to_euro($Amount)
     {
         $Rate = G::$Cache->get_value('btc_rate');
@@ -863,6 +912,10 @@ class Donations
         return $Rate * $Amount;
     }
 
+
+    /**
+     * usd_to_euro
+     */
     public static function usd_to_euro($Amount)
     {
         $Rate = G::$Cache->get_value('usd_rate');

classes/json.class.php

@@ -4,8 +4,6 @@ declare(strict_types = 1);
 /**
  * Adapted from
  * https://github.com/OPSnet/Gazelle/blob/master/app/Json.php
- *
- * Unused as of 2020-12-12
  */
 
 abstract class Json
@@ -14,6 +12,7 @@ abstract class Json
     protected $source;
     protected $mode;
 
+
     /**
      * __construct
      */
@@ -25,6 +24,7 @@ abstract class Json
         $this->version = 1;
     }
 
+
     /**
      * The payload of a valid JSON response, implemented in the child class.
      * @return array Payload to be passed to json_encode()
@@ -32,6 +32,7 @@ abstract class Json
      */
     abstract public function payload(): ?array;
 
+
     /**
      * Configure JSON printing (any of the json_encode  JSON_* constants)
      *
@@ -43,6 +44,7 @@ abstract class Json
         return $this;
     }
 
+
     /**
      * set the version of the Json payload. Increment the
      * value when there is significant change in the payload.
@@ -56,6 +58,7 @@ abstract class Json
         return $this;
     }
 
+
     /**
      * General failure routine for when bad things happen.
      *
@@ -77,6 +80,7 @@ abstract class Json
         );
     }
 
+
     /**
      * emit
      */
@@ -99,6 +103,7 @@ abstract class Json
         );
     }
 
+
     /**
      * debug
      */
@@ -116,6 +121,7 @@ abstract class Json
         ];
     }
 
+
     /**
      * info
      */
@@ -128,4 +134,48 @@ abstract class Json
             ]
         ];
     }
+
+
+    /**
+     * fetch
+     *
+     * Get resources over the API to populate Gazelle display.
+     * Instead of copy-pasting the same SQL queries in many places.
+     *
+     * Takes a query string, e.g., "action=torrentgroup&id=1."
+     * Requires an API key for the user ID 0 (minor database surgery).
+     */
+    public function fetch($Action, $Params = [])
+    {
+        $ENV = ENV::go();
+
+        $Token = $ENV->getPriv('SELF_API');
+        $Params = implode('&', $Params);
+
+        $ch = curl_init();
+
+        # todo: Make this use localhost and not HTTPS
+        curl_setopt($ch, CURLOPT_URL, "https://$ENV->SITE_DOMAIN/api.php?action=$Action&$Params");
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+        # https://docs.biotorrents.de
+        curl_setopt(
+            $ch,
+            CURLOPT_HTTPHEADER,
+            [
+                'Accept: application/json',
+                "Authorization: Bearer $Token",
+            ]
+        );
+
+        $Data = curl_exec($ch);
+        curl_close($ch);
+
+        # Error out on bad query
+        if (!$Data) {
+            return error();
+        } else {
+            return json_decode($Data);
+        }
+    }
 }

classes/permissions_form.php

@@ -1,12 +1,13 @@
 <?php
 declare(strict_types=1);
 
-/********************************************************************************
- ************ Permissions form ********************** user.php and tools.php ****
- ********************************************************************************
- ** This function is used to create both the class permissions form, and the   **
- ** user custom permissions form.                                              **
- ********************************************************************************/
+/**
+ * Permissions form
+ * user.php and tools.php
+ *
+ * This function is used to create both the class permissions form,
+ * and the user custom permissions form.
+ */
 
 $PermissionsArray = array(
   'site_leech' => 'Can leech (Does this work?).',
@@ -112,16 +113,17 @@ $PermissionsArray = array(
 
 function permissions_form()
 {
-    ?>
-<div class="permissions">
-  <div class="permission_container">
-    <table>
-      <tr class="colhead">
-        <td>Site</td>
-      </tr>
-      <tr>
-        <td>
-          <?php
+    echo <<<HTML
+    <div class="permission_container">
+      <table>
+        <tr class="colhead">
+          <th>Site</th>
+        </tr>
+        
+        <tr>
+          <td>
+HTML;
+
     display_perm('site_leech', 'Can leech.');
     display_perm('site_upload', 'Can upload.');
     display_perm('site_vote', 'Can vote on requests.');
@@ -161,20 +163,24 @@ function permissions_form()
     display_perm('site_forums_double_post', 'Can double post in the forums.');
     display_perm('project_team', 'Part of the project team.');
     display_perm('site_tag_aliases_read', 'Can view the list of tag aliases.');
-    display_perm('site_ratio_watch_immunity', 'Immune from being put on ratio watch.'); ?>
-        </td>
-      </tr>
-    </table>
-  </div>
+    display_perm('site_ratio_watch_immunity', 'Immune from being put on ratio watch.');
+
+    echo <<<HTML
+          </td>
+        </tr>
+      </table>
+    </div>
+    
+    <div class="permission_container">
+      <table>
+        <tr class="colhead">
+          <th>Users</th>
+        </tr>
+        
+        <tr>
+          <td>
+HTML;
 
-  <div class="permission_container">
-    <table>
-      <tr class="colhead">
-        <td>Users</td>
-      </tr>
-      <tr>
-        <td>
-          <?php
     display_perm('users_edit_usernames', 'Can edit usernames.');
     display_perm('users_edit_ratio', 'Can edit anyone\'s upload/download amounts.');
     display_perm('users_edit_own_ratio', 'Can edit own upload/download amounts.');
@@ -206,21 +212,27 @@ function permissions_form()
     display_perm('users_override_paranoia', 'Can override paranoia');
     display_perm('users_make_invisible', 'Can make users invisible');
     display_perm('users_logout', 'Can log users out');
-    display_perm('users_mod', 'Can access basic moderator tools (Admin comment)'); ?>
-          * Everything is only applicable to users with the same or lower class level
-        </td>
-      </tr>
-    </table>
-  </div>
+    display_perm('users_mod', 'Can access basic moderator tools (Admin comment)');
+
+    echo <<<HTML
+            <strong class="important_text">
+              Everything is only applicable to users with the same or lower class level
+            </strong>
+          </td>
+        </tr>
+      </table>
+    </div>
+    
+    <div class="permission_container">
+      <table>
+        <tr class="colhead">
+          <th>Torrents</th>
+        </tr>
+        
+        <tr>
+          <td>
+HTML;
 
-  <div class="permission_container">
-    <table>
-      <tr class="colhead">
-        <td>Torrents</td>
-      </tr>
-      <tr>
-        <td>
-          <?php
     display_perm('torrents_edit', 'Can edit any torrent');
     display_perm('torrents_delete', 'Can delete torrents');
     display_perm('torrents_delete_fast', 'Can delete more than 3 torrents at a time.');
@@ -232,20 +244,24 @@ function permissions_form()
     display_perm('artist_edit_vanityhouse', 'Can mark artists as part of Vanity House.');
     display_perm('torrents_fix_ghosts', 'Can fix ghost groups on artist pages.');
     display_perm('screenshots_add', 'Can add screenshots to any torrent and delete their own screenshots.');
-    display_perm('screenshots_delete', 'Can delete any screenshot from any torrent.'); ?>
-        </td>
-      </tr>
-    </table>
-  </div>
+    display_perm('screenshots_delete', 'Can delete any screenshot from any torrent.');
+
+    echo <<<HTML
+          </td>
+        </tr>
+      </table>
+    </div>
+    
+    <div class="permission_container">
+      <table>
+        <tr class="colhead">
+          <th>Administrative</th>
+        </tr>
+        
+        <tr>
+          <td>
+HTML;
 
-  <div class="permission_container">
-    <table>
-      <tr class="colhead">
-        <td>Administrative</td>
-      </tr>
-      <tr>
-        <td>
-          <?php
     display_perm('admin_manage_news', 'Can manage site news');
     display_perm('admin_manage_blog', 'Can manage the site blog');
     display_perm('admin_manage_polls', 'Can manage polls');
@@ -261,13 +277,16 @@ function permissions_form()
     display_perm('admin_manage_permissions', 'Can edit permission classes/user permissions.');
     display_perm('admin_schedule', 'Can run the site schedule.');
     display_perm('admin_login_watch', 'Can manage login watch.');
-    display_perm('admin_manage_wiki', 'Can manage wiki access.'); ?>
-        </td>
-      </tr>
-    </table>
-  </div>
+    display_perm('admin_manage_wiki', 'Can manage wiki access.');
 
-  <div class="submit_container"><input type="submit" name="submit" value="Save Permission Class" /></div>
-</div>
-<?php
+    echo <<<HTML
+          </td>
+        </tr>
+      </table>
+    </div>
+    
+    <div class="submit_container">
+      <input type="submit" name="submit" value="Save Permission Class" />
+    </div>
+HTML;
 }

classes/security.class.php

@@ -11,20 +11,23 @@ declare(strict_types = 1);
 class Security
 {
     /**
-     * Check ID
+     * Check integer
      *
      * Makes sure a number ID is valid,
      * e.g., a page ID requested by GET.
      */
-    public function CheckID($ID)
+    public function checkInt($IDs)
     {
         # Temporary failsafe
         # (int) 'dingus' = 0
         # (int) 3.14 = 3
-        $ID = (int) $ID;
+        $IDs = (is_array($IDs) ?: [(int) $IDs]);
+        foreach ($IDs as $ID) {
+            $ID = (int) $ID;
 
-        if (!is_int($ID) || $ID < 1) {
-            error(400);
+            if (!is_int($ID) || $ID < 1) {
+                error(400);
+            }
         }
 
         return;

classes/slaves.class.php

@@ -1,17 +0,0 @@
-<?php
-#declare(strict_types=1);
-
-class Slaves
-{
-    public static function get_level($SlaveID)
-    {
-        G::$DB->query("
-        SELECT u.Uploaded, u.Downloaded, u.BonusPoints, COUNT(t.UserID)
-        FROM users_main AS u
-          LEFT JOIN torrents AS t ON u.ID=t.UserID
-          WHERE u.ID = $SlaveID");
-          
-        list($Upload, $Download, $Points, $Uploads) = G::$DB->next_record();
-        return intval(((($Uploads**0.35)*1.5)+1) * max(($Upload+($Points*1000000)-$Download)/(1024**3), 1));
-    }
-};

classes/torrent_form.class.php

@@ -1285,7 +1285,7 @@ HTML;
         /**
          * Mirrors
          *
-         * This should be in the `torrents` table not `torrents_group`.
+         * This should be in the `torrents` table not `torrents_group.`
          * The intended use is for web seeds, Dat mirrors, etc.
          */
         if (!$this->DisabledFlag && $this->NewTorrent) {

classes/torrents.class.php

@@ -60,54 +60,97 @@ class Torrents
                 unset($GroupIDs[$i], $Found[$GroupID], $NotFound[$GroupID]);
                 continue;
             }
+
             $Data = G::$Cache->get_value($Key . $GroupID, true);
             if (!empty($Data) && is_array($Data) && $Data['ver'] === Cache::GROUP_VERSION) {
                 unset($NotFound[$GroupID]);
                 $Found[$GroupID] = $Data['d'];
             }
         }
+
         // Make sure there's something in $GroupIDs, otherwise the SQL will break
         if (count($GroupIDs) === 0) {
             return [];
         }
 
-        /*
-        Changing any of these attributes returned will cause very large, very dramatic site-wide chaos.
-        Do not change what is returned or the order thereof without updating:
-          torrents, artists, collages, bookmarks, better, the front page,
-        and anywhere else the get_groups function is used.
-        Update self::array_group(), too
-        */
+        /**
+         * Changing any of these attributes returned will cause very large, very dramatic site-wide chaos.
+         * Do not change what is returned or the order thereof without updating:
+         * torrents, artists, collages, bookmarks, better, the front page,
+         * and anywhere else the get_groups function is used.
+         * Update self::array_group(), too.
+         */
 
         if (count($NotFound) > 0) {
             $IDs = implode(',', array_keys($NotFound));
             $NotFound = [];
             $QueryID = G::$DB->get_query_id();
+
             G::$DB->query("
             SELECT
-              ID, Name, Title2, NameJP, Year, CatalogueNumber, Studio, Series, TagList, WikiImage, CategoryID
-            FROM torrents_group
-              WHERE ID IN ($IDs)");
+              `id`,
+              `title`,
+              `subject`,
+              `object`,
+              `published`,
+              `identifier`,
+              `workgroup`,
+              `location`,
+              `tag_list`,
+              `picture`,
+              `category_id`
+            FROM
+              `torrents_group`
+            WHERE
+              `id` IN($IDs)
+            ");
 
             while ($Group = G::$DB->next_record(MYSQLI_ASSOC, true)) {
-                $NotFound[$Group['ID']] = $Group;
-                $NotFound[$Group['ID']]['Torrents'] = [];
-                $NotFound[$Group['ID']]['Artists'] = [];
+                $NotFound[$Group['id']] = $Group;
+                $NotFound[$Group['id']]['Torrents'] = [];
+                $NotFound[$Group['id']]['Artists'] = [];
             }
             G::$DB->set_query_id($QueryID);
 
             if ($Torrents) {
                 $QueryID = G::$DB->get_query_id();
+
                 G::$DB->query("
-                  SELECT
-                  ID, GroupID, Media, Container, Codec, Resolution, Version,
-                    Censored, Archive, FileCount, FreeTorrent,
-                    Size, Leechers, Seeders, Snatched, Time, f.ExpiryTime, ID AS HasFile,
-                    FreeLeechType, hex(info_hash) as info_hash
-                  FROM torrents
-                    LEFT JOIN shop_freeleeches AS f ON f.TorrentID=ID
-                    WHERE GroupID IN ($IDs)
-                  ORDER BY GroupID, Media, Container, Codec, ID");
+                SELECT
+                  `ID`,
+                  `GroupID`,
+                  `Media`,
+                  `Container`,
+                  `Codec`,
+                  `Resolution`,
+                  `Version`,
+                  `Censored`,
+                  `Archive`,
+                  `FileCount`,
+                  `FreeTorrent`,
+                  `Size`,
+                  `Leechers`,
+                  `Seeders`,
+                  `Snatched`,
+                  `Time`,
+                  f.`ExpiryTime`,
+                  `ID` AS `HasFile`,
+                  `FreeLeechType`,
+                  HEX(`info_hash`) AS `info_hash`
+                FROM
+                  `torrents`
+                LEFT JOIN `shop_freeleeches` AS f
+                ON
+                  f.`TorrentID` = `ID`
+                WHERE
+                  `GroupID` IN($IDs)
+                ORDER BY
+                  `GroupID`,
+                  `Media`,
+                  `Container`,
+                  `Codec`,
+                  `ID`
+                ");
                   
                 while ($Torrent = G::$DB->next_record(MYSQLI_ASSOC, true)) {
                     $NotFound[$Torrent['GroupID']]['Torrents'][$Torrent['ID']] = $Torrent;
@@ -138,6 +181,7 @@ class Torrents
                 }
                 $Found[$GroupID]['Artists'] = $Data;
             }
+
             // Fetch all user specific torrent properties
             if ($Torrents) {
                 foreach ($Found as &$Group) {
@@ -166,18 +210,18 @@ class Torrents
     public static function array_group(array &$Group)
     {
         return array(
-          'GroupID' => $Group['ID'],
-          'GroupName' => $Group['Name'],
-          'GroupTitle2' => $Group['Title2'],
-          'GroupNameJP' => $Group['NameJP'],
-          'GroupYear' => $Group['Year'],
-          'GroupCategoryID' => $Group['CategoryID'],
-          'GroupCatalogueNumber' => $Group['CatalogueNumber'],
-          'GroupStudio' => $Group['Studio'],
-          'GroupSeries' => $Group['Series'],
+          'id' => $Group['id'],
+          'title' => $Group['title'],
+          'subject' => $Group['subject'],
+          'object' => $Group['object'],
+          'published' => $Group['published'],
+          'category_id' => $Group['category_id'],
+          'identifier' => $Group['identifier'],
+          'workgroup' => $Group['workgroup'],
+          'location' => $Group['location'],
           'GroupFlags' => ($Group['Flags'] ?? ''),
-          'TagList' => $Group['TagList'],
-          'WikiImage' => $Group['WikiImage'],
+          'tag_list' => $Group['tag_list'],
+          'picture' => $Group['picture'],
           'Torrents' => $Group['Torrents'],
           'Artists' => $Group['Artists']
         );
@@ -231,18 +275,24 @@ class Torrents
     {
         global $Time;
         $QueryID = G::$DB->get_query_id();
-        G::$DB->query(
-            "
-        INSERT INTO group_log
-          (GroupID, TorrentID, UserID, Info, Time, Hidden)
-        VALUES
-          (?, ?, ?, ?, NOW(), ?)",
-            $GroupID,
-            $TorrentID,
-            $UserID,
-            $Message,
-            $Hidden
-        );
+        G::$DB->query("
+        INSERT INTO `group_log`(
+          `GroupID`,
+          `TorrentID`,
+          `UserID`,
+          `Info`,
+          `Time`,
+          `Hidden`
+        )
+        VALUES(
+          '$GroupID',
+          '$TorrentID',
+          '$UserID',
+          '$Message',
+          NOW(),
+          '$Hidden'
+        )
+        ");
         G::$DB->set_query_id($QueryID);
     }
 
@@ -372,10 +422,15 @@ class Torrents
         Misc::write_log("Group $GroupID automatically deleted (No torrents have this group).");
 
         G::$DB->query("
-        SELECT CategoryID
-        FROM torrents_group
-          WHERE ID = ?", $GroupID);
+        SELECT
+          `category_id`
+        FROM
+          `torrents_group`
+        WHERE
+          `id` = '$GroupID'
+        ");
         list($Category) = G::$DB->next_record();
+
         if ($Category == 1) {
             G::$Cache->decrement('stats_album_count');
         }
@@ -460,14 +515,21 @@ class Torrents
         Comments::delete_page('torrents', $GroupID);
 
         G::$DB->query("
-        DELETE FROM torrents_group
-          WHERE ID = ?", $GroupID);
+        DELETE
+        FROM
+          `torrents_group`
+        WHERE
+          `id` = '$GroupID'
+        ");
+
         G::$DB->query("
         DELETE FROM torrents_tags
           WHERE GroupID = ?", $GroupID);
+
         G::$DB->query("
         DELETE FROM bookmarks_torrents
           WHERE GroupID = ?", $GroupID);
+
         G::$DB->query("
         DELETE FROM wiki_torrents
           WHERE PageID = ?", $GroupID);
@@ -488,15 +550,28 @@ class Torrents
         $QueryID = G::$DB->get_query_id();
 
         G::$DB->query("
-        UPDATE torrents_group
-        SET TagList = (
-          SELECT REPLACE(GROUP_CONCAT(tags.Name SEPARATOR ' '), '.', '_')
-          FROM torrents_tags AS t
-            INNER JOIN tags ON tags.ID = t.TagID
-          WHERE t.GroupID = ?
-          GROUP BY t.GroupID
+        UPDATE
+          `torrents_group`
+        SET
+          `tag_list` =(
+          SELECT
+          REPLACE
+            (
+              GROUP_CONCAT(tags.Name SEPARATOR ' '),
+              '.',
+              '_'
+            )
+          FROM
+            `torrents_tags` AS t
+          INNER JOIN `tags` ON tags.`ID` = t.`TagID`
+          WHERE
+            t.`GroupID` = '$GroupID'
+          GROUP BY
+            t.`GroupID`
         )
-          WHERE ID = ?", $GroupID, $GroupID);
+        WHERE
+          `ID` = '$GroupID'
+        ");
 
         // Fetch album artists
         G::$DB->query("
@@ -512,19 +587,76 @@ class Torrents
         }
 
         G::$DB->query("
-        REPLACE INTO sphinx_delta
-          (ID, GroupID, GroupName, GroupTitle2, GroupNameJP, TagList, Year, CatalogueNumber, CategoryID, Time,
-          Size, Snatched, Seeders, Leechers, Censored, Studio, Series,
-          FreeTorrent, Media, Container, Codec, Resolution, Version, Description,
-          FileList, ArtistName)
+        REPLACE
+        INTO sphinx_delta(
+          `ID`,
+          `GroupID`,
+          `GroupName`,
+          `GroupTitle2`,
+          `GroupNameJP`,
+          `TagList`,
+          `Year`,
+          `CatalogueNumber`,
+          `CategoryID`,
+          `Time`,
+          `Size`,
+          `Snatched`,
+          `Seeders`,
+          `Leechers`,
+          `Censored`,
+          `Studio`,
+          `Series`,
+          `FreeTorrent`,
+          `Media`,
+          `Container`,
+          `Codec`,
+          `Resolution`,
+          `Version`,
+          `Description`,
+          `FileList`,
+          `ArtistName`
+        )
         SELECT
-          t.ID, g.ID, Name, Title2, NameJP, TagList, Year, CatalogueNumber, CategoryID, UNIX_TIMESTAMP(t.Time),
-          Size, Snatched, Seeders, Leechers, Censored, Studio, Series,
-          CAST(FreeTorrent AS CHAR), Media, Container, Codec, Resolution, Version, Description,
-          REPLACE(REPLACE(FileList, '_', ' '), '/', ' ') AS FileList, ?
-        FROM torrents AS t
-          JOIN torrents_group AS g ON g.ID = t.GroupID
-          WHERE g.ID = ?", $ArtistName, $GroupID);
+          t.`ID`,
+          g.`id`,
+          `Name`,
+          `Title2`,
+          `NameJP`,
+          `TagList`,
+          `Year`,
+          `CatalogueNumber`,
+          `CategoryID`,
+          UNIX_TIMESTAMP(t.`Time`),
+          `Size`,
+          `Snatched`,
+          `Seeders`,
+          `Leechers`,
+          `Censored`,
+          `Studio`,
+          `Series`,
+          CAST(`FreeTorrent` AS CHAR),
+          `Media`,
+          `Container`,
+          `Codec`,
+          `Resolution`,
+          `Version`,
+          `Description`,
+        REPLACE
+          (
+        REPLACE
+          (`FileList`, '_', ' '),
+          '/',
+          ' '
+        ) AS FileList,
+        '$ArtistName'
+        FROM
+          `torrents` AS t
+        JOIN `torrents_group` AS g
+        ON
+          g.`id` = t.`GroupID`
+        WHERE
+          g.`id` = '$GroupID'
+        ");
 
         G::$Cache->delete_value("torrents_details_$GroupID");
         G::$Cache->delete_value("torrent_group_$GroupID");

classes/userrank.class.php

@@ -1,133 +1,211 @@
 <?php
-#declare(strict_types=1);
+declare(strict_types=1);
 
 class UserRank
 {
-    const PREFIX = 'percentiles_'; // Prefix for memcache keys, to make life easier
+    # Prefix for memcache keys, to make life easier
+    const PREFIX = 'percentiles_';
 
-    // Returns a 101 row array (101 percentiles - 0 - 100), with the minimum value for that percentile as the value for each row
-    // BTW - ingenious
+
+    /**
+     * Returns a 101 row array (101 percentiles: 0-100),
+     * with the minimum value for that percentile as the value for each row.
+     *
+     * BTW - ingenious
+     */
     private static function build_table($MemKey, $Query)
     {
         $QueryID = G::$DB->get_query_id();
 
         G::$DB->query("
-        DROP TEMPORARY TABLE IF EXISTS temp_stats");
+        DROP TEMPORARY TABLE IF EXISTS
+          `temp_stats`
+        ");
 
         G::$DB->query("
-        CREATE TEMPORARY TABLE temp_stats (
-          ID int(10) NOT NULL PRIMARY KEY AUTO_INCREMENT,
-          Val bigint(20) NOT NULL
-        );");
+        CREATE TEMPORARY TABLE `temp_stats`(
+          `id` INT NOT NULL PRIMARY KEY AUTO_INCREMENT,
+          `value` BIGINT NOT NULL
+        );
+        ");
 
         G::$DB->query("
-        INSERT INTO temp_stats (Val) ".
-        $Query);
+        INSERT INTO `temp_stats`(`value`) "
+        . $Query
+        );
 
         G::$DB->query("
-        SELECT COUNT(ID)
-        FROM temp_stats");
+        SELECT
+          COUNT(`id`)
+        FROM
+          `temp_stats`
+        ");
         list($UserCount) = G::$DB->next_record();
 
+        $UserCount = (int) $UserCount;
         G::$DB->query("
-        SELECT MIN(Val)
-        FROM temp_stats
-          GROUP BY CEIL(ID / (".(int)$UserCount." / 100));");
+        SELECT
+          MIN(`value`)
+        FROM
+          `temp_stats`
+        GROUP BY
+          CEIL(`id` /($UserCount / 100));
+        ");
 
         $Table = G::$DB->to_array();
         G::$DB->set_query_id($QueryID);
 
-        // Give a little variation to the cache length, so all the tables don't expire at the same time
+        # Give a little variation to the cache length, so all the tables don't expire at the same time
         G::$Cache->cache_value($MemKey, $Table, 3600 * 24 * rand(800, 1000) * 0.001);
 
         return $Table;
     }
 
+
+    /**
+     * table_query
+     */
     private static function table_query($TableName)
     {
         switch ($TableName) {
-        case 'uploaded':
-          $Query =  "
-          SELECT Uploaded
-          FROM users_main
-          WHERE Enabled = '1'
-            AND Uploaded > 0
-          ORDER BY Uploaded;";
-          break;
-
-        case 'downloaded':
-          $Query =  "
-          SELECT Downloaded
-          FROM users_main
-          WHERE Enabled = '1'
-            AND Downloaded > 0
-          ORDER BY Downloaded;";
-          break;
-
-        case 'uploads':
-          $Query = "
-          SELECT COUNT(t.ID) AS Uploads
-          FROM users_main AS um
-            JOIN torrents AS t ON t.UserID = um.ID
-          WHERE um.Enabled = '1'
-          GROUP BY um.ID
-          ORDER BY Uploads;";
-          break;
-
-        case 'requests':
-          $Query = "
-          SELECT COUNT(r.ID) AS Requests
-          FROM users_main AS um
-            JOIN requests AS r ON r.FillerID = um.ID
-          WHERE um.Enabled = '1'
-          GROUP BY um.ID
-          ORDER BY Requests;";
-          break;
-
-        case 'posts':
-          $Query = "
-          SELECT COUNT(p.ID) AS Posts
-          FROM users_main AS um
-            JOIN forums_posts AS p ON p.AuthorID = um.ID
-          WHERE um.Enabled = '1'
-          GROUP BY um.ID
-          ORDER BY Posts;";
-          break;
-
-        case 'bounty':
-          $Query = "
-          SELECT SUM(rv.Bounty) AS Bounty
-          FROM users_main AS um
-            JOIN requests_votes AS rv ON rv.UserID = um.ID
-          WHERE um.Enabled = '1' " .
-          "GROUP BY um.ID
-          ORDER BY Bounty;";
-          break;
-
-        case 'artists':
-          $Query = "
-          SELECT COUNT(ta.ArtistID) AS Artists
-          FROM torrents_artists AS ta
-            JOIN torrents_group AS tg ON tg.ID = ta.GroupID
-            JOIN torrents AS t ON t.GroupID = tg.ID
-          WHERE t.UserID != ta.UserID
-          GROUP BY tg.ID
-          ORDER BY Artists ASC";
-          break;
+            case 'uploaded':
+            $Query =  "
+            SELECT
+              `Uploaded`
+            FROM
+              `users_main`
+            WHERE
+              `Enabled` = '1' AND `Uploaded` > 0
+            ORDER BY
+              `Uploaded`;
+            ";
+            break;
+
+            case 'downloaded':
+            $Query =  "
+            SELECT
+              `Downloaded`
+            FROM
+              `users_main`
+            WHERE
+              `Enabled` = '1' AND `Downloaded` > 0
+            ORDER BY
+              `Downloaded`;
+            ";
+            break;
+
+            case 'uploads':
+            $Query = "
+            SELECT
+              COUNT(t.`ID`) AS `Uploads`
+            FROM
+              `users_main` AS um
+            JOIN `torrents` AS t
+            ON
+              t.`UserID` = um.`ID`
+            WHERE
+              um.`Enabled` = '1'
+            GROUP BY
+              um.`ID`
+            ORDER BY
+              `Uploads`;
+            ";
+            break;
+
+            case 'requests':
+            $Query = "
+            SELECT
+              COUNT(r.`ID`) AS `Requests`
+            FROM
+              `users_main` AS um
+            JOIN `requests` AS r
+            ON
+              r.`FillerID` = um.`ID`
+            WHERE
+              um.`Enabled` = '1'
+            GROUP BY
+              um.`ID`
+            ORDER BY
+              `Requests`;
+            ";
+            break;
+
+            case 'posts':
+            $Query = "
+            SELECT
+              COUNT(p.`ID`) AS `Posts`
+            FROM
+              `users_main` AS um
+            JOIN `forums_posts` AS p
+            ON
+              p.`AuthorID` = um.`ID`
+            WHERE
+              um.`Enabled` = '1'
+            GROUP BY
+              um.`ID`
+            ORDER BY
+              `Posts`;
+            ";
+            break;
+
+            case 'bounty':
+            $Query = "
+            SELECT
+              SUM(rv.`Bounty`) AS `Bounty`
+            FROM
+              `users_main` AS um
+            JOIN `requests_votes` AS rv
+            ON
+              rv.`UserID` = um.`ID`
+            WHERE
+              um.`Enabled` = '1'
+            GROUP BY
+              um.`ID`
+            ORDER BY
+              `Bounty`;
+            ";
+            break;
+
+            case 'artists':
+            $Query = "
+            SELECT
+              COUNT(ta.`ArtistID`) AS `Artists`
+            FROM
+              `torrents_artists` AS ta
+            JOIN `torrents_group` AS tg
+            ON
+              tg.`id` = ta.`GroupID`
+            JOIN `torrents` AS t
+            ON
+              t.`GroupID` = tg.`id`
+            WHERE
+              t.`UserID` != ta.`UserID`
+            GROUP BY
+              tg.`id`
+            ORDER BY
+              `Artists` ASC
+            ";
+            break;
         }
+
         return $Query;
     }
 
+
+    /**
+     * get_rank
+     */
     public static function get_rank($TableName, $Value)
     {
-        if ($Value == 0) {
+        if ($Value === 0) {
             return 0;
         }
 
         $Table = G::$Cache->get_value(self::PREFIX.$TableName);
         if (!$Table) {
-            //Cache lock!
+            # Cache lock!
             $Lock = G::$Cache->get_value(self::PREFIX.$TableName.'_lock');
+
             if ($Lock) {
                 return false;
             } else {
@@ -140,17 +218,25 @@ class UserRank
         $LastPercentile = 0;
         foreach ($Table as $Row) {
             list($CurValue) = $Row;
+
             if ($CurValue >= $Value) {
                 return $LastPercentile;
             }
+
             $LastPercentile++;
         }
-        return 100; // 100th percentile
+
+        # 100th percentile
+        return 100;
     }
 
+
+    /**
+     * overall_score
+     */
     public static function overall_score($Uploaded, $Downloaded, $Uploads, $Requests, $Posts, $Bounty, $Artists, $Ratio)
     {
-        // We can do this all in 1 line, but it's easier to read this way
+        # We can do this all in 1 line, but it's easier to read this way
         if ($Ratio > 1) {
             $Ratio = 1;
         }
@@ -169,6 +255,7 @@ class UserRank
         $TotalScore += $Artists;
         $TotalScore /= (15 + 8 + 25 + 2 + 1 + 1 + 1);
         $TotalScore *= $Ratio;
+        
         return $TotalScore;
     }
 }

classes/users.class.php

@@ -457,10 +457,9 @@ class Users
      * @param boolean $IsEnabled
      * @param boolean $Class whether or not to show the class
      * @param boolean $Title whether or not to show the title
-     * @param boolean $IsDonorForum for displaying donor forum honorific prefixes and suffixes
      * @return HTML formatted username
      */
-    public static function format_username($UserID, $Badges = false, $IsWarned = true, $IsEnabled = true, $Class = false, $Title = false, $IsDonorForum = false)
+    public static function format_username($UserID, $Badges = false, $IsWarned = true, $IsEnabled = true, $Class = false, $Title = false)
     {
         global $Classes;
 
@@ -490,11 +489,6 @@ class Users
         # Show donor icon?
         $ShowDonorIcon = (!in_array('hide_donor_heart', $Paranoia) || $OverrideParanoia);
 
-        if ($IsDonorForum) {
-            list($Prefix, $Suffix, $HasComma) = Donations::get_titles($UserID);
-            $Username = "$Prefix $Username" . ($HasComma ? ', ' : ' ') . "$Suffix ";
-        }
-
         if ($Title) {
             $Str .= "<strong><a href='user.php?id=$UserID'>$Username</a></strong>";
         } else {

classes/vendor/Parsedown.php

@@ -1,5 +1,4 @@
 <?php
-#declare(strict_types=1);
 
 #
 #

classes/vendor/ParsedownExtra.php

@@ -1,5 +1,4 @@
 <?php
-#declare(strict_types=1);
 
 #
 #
@@ -370,7 +369,7 @@ class ParsedownExtra extends Parsedown
 
             if ( ! isset($this->DefinitionData['Footnote'][$name]['number']))
             {
-                $this->DefinitionData['Footnote'][$name]['number'] = ++ $this->footnoteCount; # &raquo; &
+                $this->DefinitionData['Footnote'][$name]['number'] = ++ $this->footnoteCount; # » &
             }
 
             $Element = array(

classes/vendor/TwitterAPIExchange.php

@@ -1,5 +1,4 @@
 <?php
-#declare(strict_types=1);
 
 /**
  * Twitter-API-PHP : Simple PHP wrapper for the v1.1 API

design/privateheader.php

@@ -49,6 +49,7 @@ $Styles = array_filter(
     array_merge(
         [
           'vendor/jquery-ui.min',
+          'vendor/normalize',
           #'assets/fonts/fa/css/all.min',
           'global'
         ],

design/publicheader.php

@@ -41,7 +41,7 @@ foreach ($Scripts as $Script) {
 }
 
 # Load CSS
-$Styles = ['global', 'public'];
+$Styles = ['vendor/normalize', 'global', 'public'];
 foreach ($Styles as $Style) {
     echo View::pushAsset(
         "$ENV->STATIC_SERVER/styles/$Style.css",

sections/ajax/artist.php

@@ -134,22 +134,24 @@ if (empty($LoggedUser['DisableRequests'])) {
 $NumRequests = count($Requests);
 
 if (($Importances = $Cache->get_value("artist_groups_$ArtistID")) === false) {
-    /*
     $DB->query("
-      SELECT
-        DISTINCTROW ta.GroupID, ta.Importance, tg.VanityHouse, tg.Year
-      FROM torrents_artists AS ta
-        JOIN torrents_group AS tg ON tg.ID = ta.GroupID
-      WHERE ta.ArtistID = '$ArtistID'
-      ORDER BY tg.Year DESC, tg.Name DESC");
-    */
-    $DB->query("
-    SELECT
-      DISTINCTROW ta.GroupID, ta.Importance, tg.Year
-    FROM torrents_artists AS ta
-      JOIN torrents_group AS tg ON tg.ID = ta.GroupID
-    WHERE ta.ArtistID = '$ArtistID'
-    ORDER BY tg.Year DESC, tg.Name DESC");
+    SELECT DISTINCTROW
+      ta.`GroupID`,
+      ta.`Importance`,
+      tg.`published`
+    FROM
+      `torrents_artists` AS ta
+    JOIN `torrents_group` AS tg
+    ON
+      tg.`id` = ta.`GroupID`
+    WHERE
+      ta.`ArtistID` = '$ArtistID'
+    ORDER BY
+      tg.`published`,
+      tg.`Name`
+    DESC
+    ");
+    
     $GroupIDs = $DB->collect('GroupID');
     $Importances = $DB->to_array(false, MYSQLI_BOTH, false);
     $Cache->cache_value("artist_groups_$ArtistID", $Importances, 0);

sections/ajax/index.php

@@ -86,181 +86,180 @@ switch ($_GET['action']) {
    * Torrents
    */
   case 'torrent':
-    require 'torrent.php';
+    require_once 'torrent.php';
     break;
 
   case 'torrentgroup':
-    require 'torrentgroup.php';
+    require_once 'torrentgroup.php';
     break;
 
   // So the album art script can function without breaking the rate limit
   case 'torrentgroupalbumart':
-    require SERVER_ROOT.'/sections/ajax/torrentgroupalbumart.php';
+    require_once SERVER_ROOT.'/sections/ajax/torrentgroupalbumart.php';
     break;
 
   case 'browse':
-    require SERVER_ROOT.'/sections/ajax/browse.php';
+    require_once SERVER_ROOT.'/sections/ajax/browse.php';
     break;
   
    case 'tcomments':
-    require SERVER_ROOT.'/sections/ajax/tcomments.php';
+    require_once SERVER_ROOT.'/sections/ajax/tcomments.php';
     break;
 
   /**
    * Features
    */
   case 'collage':
-    require SERVER_ROOT.'/sections/ajax/collage.php';
+    require_once SERVER_ROOT.'/sections/ajax/collage.php';
     break;
   
   case 'artist':
-    require SERVER_ROOT.'/sections/ajax/artist.php';
+    require_once SERVER_ROOT.'/sections/ajax/artist.php';
     break;
 
   case 'request':
-    require SERVER_ROOT.'/sections/ajax/request.php';
+    require_once SERVER_ROOT.'/sections/ajax/request.php';
     break;
 
   case 'requests':
-    require SERVER_ROOT.'/sections/ajax/requests.php';
+    require_once SERVER_ROOT.'/sections/ajax/requests.php';
     break;
 
   case 'top10':
-    require SERVER_ROOT.'/sections/ajax/top10/index.php';
+    require_once SERVER_ROOT.'/sections/ajax/top10/index.php';
     break;
 
   /**
    * Users
    */
   case 'user':
-    require SERVER_ROOT.'/sections/ajax/user.php';
+    require_once SERVER_ROOT.'/sections/ajax/user.php';
     break;
 
   case 'usersearch':
-    require SERVER_ROOT.'/sections/ajax/usersearch.php';
+    require_once SERVER_ROOT.'/sections/ajax/usersearch.php';
     break;
   
   case 'community_stats':
-    require SERVER_ROOT.'/sections/ajax/community_stats.php';
+    require_once SERVER_ROOT.'/sections/ajax/community_stats.php';
     break;
 
   case 'user_recents':
-    require SERVER_ROOT.'/sections/ajax/user_recents.php';
+    require_once SERVER_ROOT.'/sections/ajax/user_recents.php';
     break;
 
   case 'userhistory':
-    require SERVER_ROOT.'/sections/ajax/userhistory/index.php';
+    require_once SERVER_ROOT.'/sections/ajax/userhistory/index.php';
     break;
 
   /**
    * Account
    */
   case 'inbox':
-    require SERVER_ROOT.'/sections/ajax/inbox/index.php';
+    require_once SERVER_ROOT.'/sections/ajax/inbox/index.php';
     break;
 
   case 'bookmarks':
-    require SERVER_ROOT.'/sections/ajax/bookmarks/index.php';
+    require_once SERVER_ROOT.'/sections/ajax/bookmarks/index.php';
     break;
 
   case 'notifications':
-    require SERVER_ROOT.'/sections/ajax/notifications.php';
+    require_once SERVER_ROOT.'/sections/ajax/notifications.php';
     break;
 
   case 'get_user_notifications':
-    require SERVER_ROOT.'/sections/ajax/get_user_notifications.php';
+    require_once SERVER_ROOT.'/sections/ajax/get_user_notifications.php';
     break;
 
   case 'clear_user_notification':
-    require SERVER_ROOT.'/sections/ajax/clear_user_notification.php';
+    require_once SERVER_ROOT.'/sections/ajax/clear_user_notification.php';
     break;
 
   /**
    * Forums
    */
   case 'forum':
-    require SERVER_ROOT.'/sections/ajax/forum/index.php';
+    require_once SERVER_ROOT.'/sections/ajax/forum/index.php';
     break;
 
-
   case 'subscriptions':
-    require SERVER_ROOT.'/sections/ajax/subscriptions.php';
+    require_once SERVER_ROOT.'/sections/ajax/subscriptions.php';
     break;
 
   case 'raw_bbcode':
-    require SERVER_ROOT.'/sections/ajax/raw_bbcode.php';
+    require_once SERVER_ROOT.'/sections/ajax/raw_bbcode.php';
     break;
 
   /**
    * Meta
    */
   case 'index':
-    require SERVER_ROOT.'/sections/ajax/info.php';
+    require_once SERVER_ROOT.'/sections/ajax/info.php';
     break;
 
   case 'manifest':
-    require SERVER_ROOT.'/manifest.php';
+    require_once SERVER_ROOT.'/manifest.php';
     json_die('success', manifest());
     break;
 
   case 'stats':
-    require SERVER_ROOT.'/sections/ajax/stats.php';
+    require_once SERVER_ROOT.'/sections/ajax/stats.php';
     break;
 
   case 'loadavg':
-    require SERVER_ROOT.'/sections/ajax/loadavg.php';
+    require_once SERVER_ROOT.'/sections/ajax/loadavg.php';
     break;
 
   case 'announcements':
-    require SERVER_ROOT.'/sections/ajax/announcements.php';
+    require_once SERVER_ROOT.'/sections/ajax/announcements.php';
     break;
 
   case 'wiki':
-    require SERVER_ROOT.'/sections/ajax/wiki.php';
+    require_once SERVER_ROOT.'/sections/ajax/wiki.php';
     break;
   
   case 'ontology':
-    require SERVER_ROOT.'/sections/ajax/ontology.php';
+    require_once SERVER_ROOT.'/sections/ajax/ontology.php';
     break;
   
   /**
    * Under construction
    */
   case 'preview':
-    require 'preview.php';
+    require_once 'preview.php';
     break;
 
   case 'better':
-    require SERVER_ROOT.'/sections/ajax/better/index.php';
+    require_once SERVER_ROOT.'/sections/ajax/better/index.php';
     break;
 
   case 'get_friends':
-    require SERVER_ROOT.'/sections/ajax/get_friends.php';
+    require_once SERVER_ROOT.'/sections/ajax/get_friends.php';
     break;
 
   case 'news_ajax':
-    require SERVER_ROOT.'/sections/ajax/news_ajax.php';
+    require_once SERVER_ROOT.'/sections/ajax/news_ajax.php';
     break;
 
   case 'send_recommendation':
-    require SERVER_ROOT.'/sections/ajax/send_recommendation.php';
+    require_once SERVER_ROOT.'/sections/ajax/send_recommendation.php';
     break;
 
   /*
   case 'similar_artists':
-    require SERVER_ROOT.'/sections/ajax/similar_artists.php';
+    require_once SERVER_ROOT.'/sections/ajax/similar_artists.php';
     break;
   */
 
   /*
   case 'votefavorite':
-    require SERVER_ROOT.'/sections/ajax/takevote.php';
+    require_once SERVER_ROOT.'/sections/ajax/takevote.php';
     break;
   */
 
   /*
   case 'torrent_info':
-    require 'torrent_info.php';
+    require_once 'torrent_info.php';
     break;
   */
 
@@ -273,15 +272,15 @@ switch ($_GET['action']) {
   case 'autofill':
     /*
     if ($_GET['cat'] === 'anime') {
-        require SERVER_ROOT.'/sections/ajax/autofill/anime.php';
+        require_once SERVER_ROOT.'/sections/ajax/autofill/anime.php';
     }
 
     if ($_GET['cat'] === 'jav') {
-        require SERVER_ROOT.'/sections/ajax/autofill/jav.php';
+        require_once SERVER_ROOT.'/sections/ajax/autofill/jav.php';
     }
 
     if ($_GET['cat'] === 'manga') {
-        require SERVER_ROOT.'/sections/ajax/autofill/manga.php';
+        require_once SERVER_ROOT.'/sections/ajax/autofill/manga.php';
     }
     */
     break;

sections/ajax/loadavg.php

@@ -1,5 +1,5 @@
 <?php
-#declare(strict_types=1);
+declare(strict_types=1);
 
 #authorize();
 

sections/ajax/send_recommendation.php

@@ -1,25 +1,32 @@
 <?php
 #declare(strict_types=1);
 
-$FriendID = (int)$_POST['friend'];
+$FriendID = (int) $_POST['friend'];
 $Type = $_POST['type'];
-$ID = (int)$_POST['id'];
+$ID = (int) $_POST['id'];
 $Note = $_POST['note'];
 
 if (empty($FriendID) || empty($Type) || empty($ID)) {
     echo json_encode(array('status' => 'error', 'response' => 'Error.'));
     error();
 }
+
 // Make sure the recipient is on your friends list and not some random dude.
 $DB->query("
-  SELECT f.FriendID, u.Username
-  FROM friends AS f
-    RIGHT JOIN users_enable_recommendations AS r
-      ON r.ID = f.FriendID AND r.Enable = 1
-    RIGHT JOIN users_main AS u
-      ON u.ID = f.FriendID
-  WHERE f.UserID = '$LoggedUser[ID]'
-    AND f.FriendID = '$FriendID'");
+SELECT
+  f.`FriendID`,
+  u.`Username`
+FROM
+  `friends` AS f
+RIGHT JOIN `users_enable_recommendations` AS r
+ON
+  r.`ID` = f.`FriendID` AND r.`Enable` = 1
+RIGHT JOIN `users_main` AS u
+ON
+  u.`ID` = f.`FriendID`
+WHERE
+  f.`UserID` = '$LoggedUser[ID]' AND f.`FriendID` = '$FriendID'
+");
 
 if (!$DB->has_results()) {
     echo json_encode(array('status' => 'error', 'response' => 'Not on friend list.'));
@@ -32,32 +39,48 @@ $Link = '';
 // https://en.wikipedia.org/wiki/English_articles#Distinction_between_a_and_an
 $Article = 'a';
 switch ($Type) {
-  case 'torrent':
+    case 'torrent':
     $Link = "torrents.php?id=$ID";
     $DB->query("
-      SELECT Name
-      FROM torrents_group
-      WHERE ID = '$ID'");
-    break;
-  case 'artist':
+    SELECT
+      `title`
+    FROM
+      `torrents_group`
+    WHERE
+      `id` = '$ID'
+    ");
+      break;
+
+    case 'artist':
     $Article = 'an';
     $Link = "artist.php?id=$ID";
     $DB->query("
-      SELECT Name
-      FROM artists_group
-      WHERE ArtistID = '$ID'");
+    SELECT
+      `Name`
+    FROM
+      `artists_group`
+    WHERE
+      `ArtistID` = '$ID'
+    ");
     break;
-  case 'collage':
+
+    case 'collage':
     $Link = "collages.php?id=$ID";
     $DB->query("
-      SELECT Name
-      FROM collages
-      WHERE ID = '$ID'");
+    SELECT
+      `Name`
+    FROM
+      `collages`
+    WHERE
+      `ID` = '$ID'
+    ");
     break;
 }
+
 list($Name) = $DB->next_record();
 $Subject = $LoggedUser['Username'] . " recommended you $Article $Type!";
 $Body = $LoggedUser['Username'] . " recommended you the $Type [url=".site_url()."$Link]$Name".'[/url].';
+
 if (!empty($Note)) {
     $Body = "$Body\n\n$Note";
 }

sections/ajax/stats.php

@@ -1,5 +1,5 @@
 <?php
-#declare(strict_types=1);
+declare(strict_types=1);
 
 // Begin user stats
 if (($UserCount = $Cache->get_value('stats_user_count')) === false) {
@@ -67,12 +67,13 @@ if (($TorrentCount = $Cache->get_value('stats_torrent_count')) === false) {
 if (($AlbumCount = $Cache->get_value('stats_album_count')) === false) {
     $DB->query("
     SELECT
-      COUNT(`ID`)
+      COUNT(`id`)
     FROM
       `torrents_group`
     WHERE
-      `CategoryID` = '1'
+      `category_id` = '1'
     ");
+
     list($AlbumCount) = $DB->next_record();
     $Cache->cache_value('stats_album_count', $AlbumCount, 604830); // staggered 1 week cache
 }
@@ -84,6 +85,7 @@ if (($ArtistCount = $Cache->get_value('stats_artist_count')) === false) {
     FROM
       `artists_group`
     ");
+    
     list($ArtistCount) = $DB->next_record();
     $Cache->cache_value('stats_artist_count', $ArtistCount, 604860); // staggered 1 week cache
 }

sections/ajax/top10/torrents.php

@@ -18,23 +18,29 @@ $Limit = isset($_GET['limit']) ? intval($_GET['limit']) : 10;
 $Limit = in_array($Limit, array(10, 100, 250)) ? $Limit : 10;
 
 $WhereSum = (empty($Where)) ? '' : md5($Where);
-$BaseQuery = '
-  SELECT
-    t.ID,
-    g.ID,
-    g.Name,
-    g.CategoryID,
-    g.WikiImage,
-    g.TagList,
-    t.Media,
-    g.Year,
-    t.Snatched,
-    t.Seeders,
-    t.Leechers,
-    ((t.Size * t.Snatched) + (t.Size * 0.5 * t.Leechers)) AS Data,
-    t.Size
-  FROM torrents AS t
-    LEFT JOIN torrents_group AS g ON g.ID = t.GroupID';
+$BaseQuery = "
+SELECT
+  t.`ID`,
+  g.`id`,
+  g.`title`,
+  g.`category_id`,
+  g.`picture`,
+  g.`tag_list`,
+  t.`Media`,
+  g.`published`,
+  t.`Snatched`,
+  t.`Seeders`,
+  t.`Leechers`,
+  (
+    (t.`Size` * t.`Snatched`) +(t.`Size` * 0.5 * t.`Leechers`)
+  ) AS `Data`,
+  t.`Size`
+FROM
+  `torrents` AS t
+LEFT JOIN `torrents_group` AS g
+ON
+  g.`id` = t.`GroupID`
+";
 
 $OuterResults = [];
 

sections/ajax/user_recents.php

@@ -17,18 +17,26 @@ $Results = [];
 if (check_paranoia_here('snatched')) {
     $DB->query("
     SELECT
-      g.ID,
-      g.Name,
-      g.WikiImage
-    FROM xbt_snatched AS s
-      INNER JOIN torrents AS t ON t.ID = s.fid
-      INNER JOIN torrents_group AS g ON t.GroupID = g.ID
-    WHERE s.uid = '$UserID'
-      AND g.CategoryID = '1'
-      AND g.WikiImage != ''
-    GROUP BY g.ID
-    ORDER BY s.tstamp DESC
-    LIMIT $Limit");
+      g.`id`,
+      g.`title`,
+      g.`picture`
+    FROM
+      `xbt_snatched` AS s
+    INNER JOIN `torrents` AS t
+    ON
+      t.`ID` = s.`fid`
+    INNER JOIN `torrents_group` AS g
+    ON
+      t.`GroupID` = g.`id`
+    WHERE
+      s.`uid` = '$UserID' AND g.`category_id` = '1' AND g.`picture` != ''
+    GROUP BY
+      g.`id`
+    ORDER BY
+      s.`tstamp`
+    DESC
+    LIMIT $Limit
+    ");
 
     $RecentSnatches = $DB->to_array(false, MYSQLI_ASSOC);
     $Artists = Artists::get_artists($DB->collect('ID'));
@@ -45,17 +53,23 @@ if (check_paranoia_here('snatched')) {
 if (check_paranoia_here('uploads')) {
     $DB->query("
     SELECT
-      g.ID,
-      g.Name,
-      g.WikiImage
-    FROM torrents_group AS g
-      INNER JOIN torrents AS t ON t.GroupID = g.ID
-    WHERE t.UserID = '$UserID'
-      AND g.CategoryID = '1'
-      AND g.WikiImage != ''
-    GROUP BY g.ID
-    ORDER BY t.Time DESC
-    LIMIT $Limit");
+      g.`id`,
+      g.`title`,
+      g.`picture`
+    FROM
+      `torrents_group` AS g
+    INNER JOIN `torrents` AS t
+    ON
+      t.`GroupID` = g.`id`
+    WHERE
+      t.`UserID` = '$UserID' AND g.`category_id` = '1' AND g.`picture` != ''
+    GROUP BY
+      g.`id`
+    ORDER BY
+      t.`Time`
+    DESC
+    LIMIT $Limit
+    ");
 
     $RecentUploads = $DB->to_array(false, MYSQLI_ASSOC);
     $Artists = Artists::get_artists($DB->collect('ID'));

sections/api/announcements.php

@@ -0,0 +1,83 @@
+<?
+if (!$News = $Cache->get_value('news')) {
+  $DB->query("
+    SELECT
+      ID,
+      Title,
+      Body,
+      Time
+    FROM news
+    ORDER BY Time DESC
+    LIMIT 5");
+  $News = $DB->to_array(false, MYSQLI_NUM, false);
+  $Cache->cache_value('news', $News, 3600 * 24 * 30);
+  $Cache->cache_value('news_latest_id', $News[0][0], 0);
+}
+
+if ($LoggedUser['LastReadNews'] != $News[0][0]) {
+  $Cache->begin_transaction("user_info_heavy_$UserID");
+  $Cache->update_row(false, array('LastReadNews' => $News[0][0]));
+  $Cache->commit_transaction(0);
+  $DB->query("
+    UPDATE users_info
+    SET LastReadNews = '".$News[0][0]."'
+    WHERE UserID = $UserID");
+  $LoggedUser['LastReadNews'] = $News[0][0];
+}
+
+if (($Blog = $Cache->get_value('blog')) === false) {
+  $DB->query("
+    SELECT
+      b.ID,
+      um.Username,
+      b.UserID,
+      b.Title,
+      b.Body,
+      b.Time,
+      b.ThreadID
+    FROM blog AS b
+      LEFT JOIN users_main AS um ON b.UserID = um.ID
+    ORDER BY Time DESC
+    LIMIT 20");
+  $Blog = $DB->to_array();
+  $Cache->cache_value('blog', $Blog, 1209600);
+}
+$JsonBlog = [];
+for ($i = 0; $i < 5; $i++) {
+  list($BlogID, $Author, $AuthorID, $Title, $Body, $BlogTime, $ThreadID) = $Blog[$i];
+  $JsonBlog[] = array(
+    'blogId' => (int)$BlogID,
+    'author' => $Author,
+    'title' => $Title,
+    'bbBody' => $Body,
+    'body' => Text::full_format($Body),
+    'blogTime' => $BlogTime,
+    'threadId' => (int)$ThreadID
+  );
+}
+
+$JsonAnnouncements = [];
+$Count = 0;
+foreach ($News as $NewsItem) {
+  list($NewsID, $Title, $Body, $NewsTime) = $NewsItem;
+  if (strtotime($NewsTime) > time()) {
+    continue;
+  }
+
+  $JsonAnnouncements[] = array(
+    'newsId' => (int)$NewsID,
+    'title' => $Title,
+    'bbBody' => $Body,
+    'body' => Text::full_format($Body),
+    'newsTime' => $NewsTime
+  );
+
+  if (++$Count > 4) {
+    break;
+  }
+}
+
+json_die("success", array(
+  'announcements' => $JsonAnnouncements,
+  'blogPosts' => $JsonBlog
+));

sections/api/artist.php

@@ -0,0 +1,362 @@
+<?php
+#declare(strict_types=1);
+
+# todo: Go through line by line
+
+// For sorting tags
+function compare($X, $Y)
+{
+    return($Y['count'] - $X['count']);
+}
+
+if (!empty($_GET['artistreleases'])) {
+    $OnlyArtistReleases = true;
+}
+
+if ($_GET['id'] && $_GET['artistname']) {
+    json_die('failure', 'bad parameters');
+}
+
+$ArtistID = $_GET['id'];
+if ($ArtistID && !is_number($ArtistID)) {
+    json_die('failure');
+}
+
+if (empty($ArtistID)) {
+    if (!empty($_GET['artistname'])) {
+        $Name = db_string(trim($_GET['artistname']));
+        $DB->query("
+      SELECT ArtistID
+      FROM artists_alias
+      WHERE Name LIKE '$Name'");
+        if (!(list($ArtistID) = $DB->next_record(MYSQLI_NUM, false))) {
+            json_die('failure');
+        }
+        // If we get here, we got the ID!
+    }
+}
+
+if (!empty($_GET['revisionid'])) { // if they're viewing an old revision
+    $RevisionID = $_GET['revisionid'];
+    if (!is_number($RevisionID)) {
+        error(0);
+    }
+    $Data = $Cache->get_value("artist_$ArtistID"."_revision_$RevisionID");
+} else { // viewing the live version
+    $Data = $Cache->get_value("artist_$ArtistID");
+    $RevisionID = false;
+}
+if ($Data) {
+    list($Name, $Image, $Body) = current($Data);
+} else {
+    if ($RevisionID) {
+        /*
+          $sql = "
+            SELECT
+              a.Name,
+              wiki.Image,
+              wiki.body,
+              a.VanityHouse
+            FROM wiki_artists AS wiki
+              LEFT JOIN artists_group AS a ON wiki.RevisionID = a.RevisionID
+            WHERE wiki.RevisionID = '$RevisionID' ";
+        */
+        $sql = "
+      SELECT
+        a.Name,
+        wiki.Image,
+        wiki.body
+      FROM wiki_artists AS wiki
+        LEFT JOIN artists_group AS a ON wiki.RevisionID = a.RevisionID
+      WHERE wiki.RevisionID = '$RevisionID' ";
+    } else {
+        /*
+          $sql = "
+            SELECT
+              a.Name,
+              wiki.Image,
+              wiki.body,
+              a.VanityHouse
+            FROM artists_group AS a
+              LEFT JOIN wiki_artists AS wiki ON wiki.RevisionID = a.RevisionID
+            WHERE a.ArtistID = '$ArtistID' ";
+        */
+        $sql = "
+      SELECT
+        a.Name,
+        wiki.Image,
+        wiki.body
+      FROM artists_group AS a
+        LEFT JOIN wiki_artists AS wiki ON wiki.RevisionID = a.RevisionID
+      WHERE a.ArtistID = '$ArtistID' ";
+    }
+    $sql .= " GROUP BY a.ArtistID";
+    $DB->query($sql);
+
+    if (!$DB->has_results()) {
+        json_die('failure');
+    }
+
+    //  list($Name, $Image, $Body, $VanityHouseArtist) = $DB->next_record(MYSQLI_NUM, array(0));
+    list($Name, $Image, $Body) = $DB->next_record(MYSQLI_NUM, array(0));
+}
+
+// Requests
+$Requests = [];
+if (empty($LoggedUser['DisableRequests'])) {
+    $Requests = $Cache->get_value("artists_requests_$ArtistID");
+    if (!is_array($Requests)) {
+        $DB->query("
+      SELECT
+        r.ID,
+        r.CategoryID,
+        r.Title,
+        r.Year,
+        r.TimeAdded,
+        COUNT(rv.UserID) AS Votes,
+        SUM(rv.Bounty) AS Bounty
+      FROM requests AS r
+        LEFT JOIN requests_votes AS rv ON rv.RequestID = r.ID
+        LEFT JOIN requests_artists AS ra ON r.ID = ra.RequestID
+      WHERE ra.ArtistID = $ArtistID
+        AND r.TorrentID = 0
+      GROUP BY r.ID
+      ORDER BY Votes DESC");
+
+        if ($DB->has_results()) {
+            $Requests = $DB->to_array('ID', MYSQLI_ASSOC, false);
+        } else {
+            $Requests = [];
+        }
+        $Cache->cache_value("artists_requests_$ArtistID", $Requests);
+    }
+}
+$NumRequests = count($Requests);
+
+if (($Importances = $Cache->get_value("artist_groups_$ArtistID")) === false) {
+    $DB->query("
+    SELECT DISTINCTROW
+      ta.`GroupID`,
+      ta.`Importance`,
+      tg.`published`
+    FROM
+      `torrents_artists` AS ta
+    JOIN `torrents_group` AS tg
+    ON
+      tg.`id` = ta.`GroupID`
+    WHERE
+      ta.`ArtistID` = '$ArtistID'
+    ORDER BY
+      tg.`published`,
+      tg.`Name`
+    DESC
+    ");
+    
+    $GroupIDs = $DB->collect('GroupID');
+    $Importances = $DB->to_array(false, MYSQLI_BOTH, false);
+    $Cache->cache_value("artist_groups_$ArtistID", $Importances, 0);
+} else {
+    $GroupIDs = [];
+    foreach ($Importances as $Group) {
+        $GroupIDs[] = $Group['GroupID'];
+    }
+}
+if (count($GroupIDs) > 0) {
+    $TorrentList = Torrents::get_groups($GroupIDs, true, true);
+} else {
+    $TorrentList = [];
+}
+$NumGroups = count($TorrentList);
+
+//Get list of used release types
+$UsedReleases = [];
+foreach ($TorrentList as $GroupID=>$Group) {
+    if ($Importances[$GroupID]['Importance'] == '2') {
+        $TorrentList[$GroupID]['ReleaseType'] = 1024;
+        $GuestAlbums = true;
+    }
+    if ($Importances[$GroupID]['Importance'] == '3') {
+        $TorrentList[$GroupID]['ReleaseType'] = 1023;
+        $RemixerAlbums = true;
+    }
+    if ($Importances[$GroupID]['Importance'] == '4') {
+        $TorrentList[$GroupID]['ReleaseType'] = 1022;
+        $ComposerAlbums = true;
+    }
+    if ($Importances[$GroupID]['Importance'] == '7') {
+        $TorrentList[$GroupID]['ReleaseType'] = 1021;
+        $ProducerAlbums = true;
+    }
+    if (!in_array($TorrentList[$GroupID]['ReleaseType'], $UsedReleases)) {
+        $UsedReleases[] = $TorrentList[$GroupID]['ReleaseType'];
+    }
+}
+
+if (!empty($GuestAlbums)) {
+    $ReleaseTypes[1024] = 'Guest Appearance';
+}
+if (!empty($RemixerAlbums)) {
+    $ReleaseTypes[1023] = 'Remixed By';
+}
+if (!empty($ComposerAlbums)) {
+    $ReleaseTypes[1022] = 'Composition';
+}
+if (!empty($ProducerAlbums)) {
+    $ReleaseTypes[1021] = 'Produced By';
+}
+
+reset($TorrentList);
+
+$JsonTorrents = [];
+$Tags = [];
+$NumTorrents = $NumSeeders = $NumLeechers = $NumSnatches = 0;
+foreach ($GroupIDs as $GroupID) {
+    if (!isset($TorrentList[$GroupID])) {
+        continue;
+    }
+    $Group = $TorrentList[$GroupID];
+    extract(Torrents::array_group($Group));
+
+    foreach ($Artists as &$Artist) {
+        $Artist['id'] = (int)$Artist['id'];
+        $Artist['aliasid'] = (int)$Artist['aliasid'];
+    }
+
+    foreach ($ExtendedArtists as &$ArtistGroup) {
+        foreach ($ArtistGroup as &$Artist) {
+            $Artist['id'] = (int)$Artist['id'];
+            $Artist['aliasid'] = (int)$Artist['aliasid'];
+        }
+    }
+
+    $Found = Misc::search_array($Artists, 'id', $ArtistID);
+    if (isset($OnlyArtistReleases) && empty($Found)) {
+        continue;
+    }
+
+    $GroupVanityHouse = $Importances[$GroupID]['VanityHouse'];
+
+    $TagList = explode(' ', str_replace('_', '.', $TagList));
+
+    // $Tags array is for the sidebar on the right
+    foreach ($TagList as $Tag) {
+        if (!isset($Tags[$Tag])) {
+            $Tags[$Tag] = array('name' => $Tag, 'count' => 1);
+        } else {
+            $Tags[$Tag]['count']++;
+        }
+    }
+    $InnerTorrents = [];
+    foreach ($Torrents as $Torrent) {
+        $NumTorrents++;
+        $NumSeeders += $Torrent['Seeders'];
+        $NumLeechers += $Torrent['Leechers'];
+        $NumSnatches += $Torrent['Snatched'];
+
+        $InnerTorrents[] = array(
+      'id' => (int)$Torrent['ID'],
+      'groupId' => (int)$Torrent['GroupID'],
+      'media' => $Torrent['Media'],
+      'format' => $Torrent['Format'],
+      'encoding' => $Torrent['Encoding'],
+      'remasterYear' => (int)$Torrent['RemasterYear'],
+      'remastered' => $Torrent['Remastered'] == 1,
+      'remasterTitle' => $Torrent['RemasterTitle'],
+      'remasterRecordLabel' => $Torrent['RemasterRecordLabel'],
+      'scene' => $Torrent['Scene'] == 1,
+      'hasLog' => $Torrent['HasLog'] == 1,
+      'hasCue' => $Torrent['HasCue'] == 1,
+      'logScore' => (int)$Torrent['LogScore'],
+      'fileCount' => (int)$Torrent['FileCount'],
+      'freeTorrent' => $Torrent['FreeTorrent'] == 1,
+      'size' => (int)$Torrent['Size'],
+      'leechers' => (int)$Torrent['Leechers'],
+      'seeders' => (int)$Torrent['Seeders'],
+      'snatched' => (int)$Torrent['Snatched'],
+      'time' => $Torrent['Time'],
+      'hasFile' => (int)$Torrent['HasFile']
+    );
+    }
+    $JsonTorrents[] = array(
+    'groupId' => (int)$GroupID,
+    'groupName' => $GroupName,
+    'groupYear' => (int)$GroupYear,
+    'groupRecordLabel' => $GroupRecordLabel,
+    'groupCatalogueNumber' => $GroupCatalogueNumber,
+    'groupCategoryID' => $GroupCategoryID,
+    'tags' => $TagList,
+    'releaseType' => (int)$ReleaseType,
+    'wikiImage' => $WikiImage,
+    'groupVanityHouse' => $GroupVanityHouse == 1,
+    'hasBookmarked' => Bookmarks::has_bookmarked('torrent', $GroupID),
+    'artists' => $Artists,
+    'extendedArtists' => $ExtendedArtists,
+    'torrent' => $InnerTorrents,
+
+  );
+}
+
+$JsonRequests = [];
+foreach ($Requests as $RequestID => $Request) {
+    $JsonRequests[] = array(
+    'requestId' => (int)$RequestID,
+    'categoryId' => (int)$Request['CategoryID'],
+    'title' => $Request['Title'],
+    'year' => (int)$Request['Year'],
+    'timeAdded' => $Request['TimeAdded'],
+    'votes' => (int)$Request['Votes'],
+    'bounty' => (int)$Request['Bounty']
+  );
+}
+
+//notifications disabled by default
+$notificationsEnabled = false;
+if (check_perms('site_torrents_notify')) {
+    if (($Notify = $Cache->get_value('notify_artists_'.$LoggedUser['ID'])) === false) {
+        $DB->query("
+      SELECT ID, Artists
+      FROM users_notify_filters
+      WHERE UserID = '$LoggedUser[ID]'
+        AND Label = 'Artist notifications'
+      LIMIT 1");
+        $Notify = $DB->next_record(MYSQLI_ASSOC, false);
+        $Cache->cache_value('notify_artists_'.$LoggedUser['ID'], $Notify, 0);
+    }
+    if (stripos($Notify['Artists'], "|$Name|") === false) {
+        $notificationsEnabled = false;
+    } else {
+        $notificationsEnabled = true;
+    }
+}
+
+// Cache page for later use
+
+if ($RevisionID) {
+    $Key = "artist_$ArtistID"."_revision_$RevisionID";
+} else {
+    $Key = "artist_$ArtistID";
+}
+
+$Data = array(array($Name, $Image, $Body));
+
+$Cache->cache_value($Key, $Data, 3600);
+
+json_die('success', array(
+  'id' => (int)$ArtistID,
+  'name' => $Name,
+  'notificationsEnabled' => $notificationsEnabled,
+  'hasBookmarked' => Bookmarks::has_bookmarked('artist', $ArtistID),
+  'image' => $Image,
+  'body' => Text::full_format($Body),
+  'vanityHouse' => $VanityHouseArtist == 1,
+  'tags' => array_values($Tags),
+  'statistics' => array(
+    'numGroups' => $NumGroups,
+    'numTorrents' => $NumTorrents,
+    'numSeeders' => $NumSeeders,
+    'numLeechers' => $NumLeechers,
+    'numSnatches' => $NumSnatches
+  ),
+  'torrentgroup' => $JsonTorrents,
+  'requests' => $JsonRequests
+));

sections/api/autofill/doi.php

@@ -0,0 +1,14 @@
+<?php
+#declare(strict_types=1);
+
+if (!$_GET['doi']) {
+    json_die();
+}
+
+print
+    json_encode(
+        [
+            'status' => 'success',
+            'response' => ['loadAverage' => sys_getloadavg()]
+        ]
+    );

sections/api/better/index.php

@@ -0,0 +1,38 @@
+<?
+//Include all the basic stuff...
+
+enforce_login();
+if (isset($_GET['method'])) {
+  switch ($_GET['method']) {
+    case 'transcode':
+      include(SERVER_ROOT.'/sections/ajax/better/transcode.php');
+      break;
+    case 'single':
+      include(SERVER_ROOT.'/sections/ajax/better/single.php');
+      break;
+    case 'snatch':
+      include(SERVER_ROOT.'/sections/ajax/better/snatch.php');
+      break;
+    case 'artistless':
+      include(SERVER_ROOT.'/sections/ajax/better/artistless.php');
+      break;
+    case 'tags':
+      include(SERVER_ROOT.'/sections/ajax/better/tags.php');
+      break;
+    case 'folders':
+      include(SERVER_ROOT.'/sections/ajax/better/folders.php');
+      break;
+    case 'files':
+      include(SERVER_ROOT.'/sections/ajax/better/files.php');
+      break;
+    case 'upload':
+      include(SERVER_ROOT.'/sections/ajax/better/upload.php');
+      break;
+    default:
+      echo json_encode(array('status' => 'failure'));
+      break;
+  }
+} else {
+  echo json_encode(array('status' => 'failure'));
+}
+?>

sections/api/better/single.php

@@ -0,0 +1,55 @@
+<?
+if (($Results = $Cache->get_value('better_single_groupids')) === false) {
+  $DB->query("
+    SELECT
+      t.ID AS TorrentID,
+      t.GroupID AS GroupID
+    FROM xbt_files_users AS x
+      JOIN torrents AS t ON t.ID=x.fid
+    WHERE t.Format='FLAC'
+    GROUP BY x.fid
+    HAVING COUNT(x.uid) = 1
+    ORDER BY t.LogScore DESC, t.Time ASC
+    LIMIT 30");
+
+  $Results = $DB->to_pair('GroupID', 'TorrentID', false);
+  $Cache->cache_value('better_single_groupids', $Results, 30 * 60);
+}
+
+$Groups = Torrents::get_groups(array_keys($Results));
+
+$JsonResults = [];
+foreach ($Results as $GroupID => $FlacID) {
+  if (!isset($Groups[$GroupID])) {
+    continue;
+  }
+  $Group = $Groups[$GroupID];
+  extract(Torrents::array_group($Group));
+
+  $JsonArtists = [];
+  if (count($Artists) > 0) {
+    foreach ($Artists as $Artist) {
+      $JsonArtists[] = array(
+        'id' => (int)$Artist['id'],
+        'name' => $Artist['name'],
+        'aliasId' => (int)$Artist['aliasid']
+      );
+    }
+  }
+
+  $JsonResults[] = array(
+    'torrentId' => (int)$FlacID,
+    'groupId' => (int)$GroupID,
+    'artist' => $JsonArtists,
+    'groupName' => $GroupName,
+    'groupYear' => (int)$GroupYear,
+    'downloadUrl' => "torrents.php?action=download&id=$FlacID&authkey=".$LoggedUser['AuthKey'].'&torrent_pass='.$LoggedUser['torrent_pass']
+  );
+}
+
+echo json_encode(
+  array(
+    'status' => 'success',
+    'response' => $JsonResults
+  )
+);

sections/api/better/transcode.php

@@ -0,0 +1,131 @@
+<?
+if (!isset($_GET['type']) || !is_number($_GET['type']) || $_GET['type'] > 3) {
+  error(0);
+}
+
+$Options = array('v0', 'v2', '320');
+$Encodings = array('V0 (VBR)', 'V2 (VBR)', '320');
+$EncodingKeys = array_fill_keys($Encodings, true);
+
+if ($_GET['type'] === '3') {
+  $List = "!(v0 | v2 | 320)";
+} else {
+  $List = '!'.$Options[$_GET['type']];
+  if ($_GET['type'] !== '0') {
+    $_GET['type'] = display_str($_GET['type']);
+  }
+}
+$SphQL = new SphinxqlQuery();
+$SphQL->select('id, groupid')
+  ->from('better_transcode')
+  ->where('logscore', 100)
+  ->where_match('FLAC', 'format')
+  ->where_match($List, 'encoding', false)
+  ->order_by('RAND()')
+  ->limit(0, TORRENTS_PER_PAGE, TORRENTS_PER_PAGE);
+if (!empty($_GET['search'])) {
+  $SphQL->where_match($_GET['search'], '(groupname,artistname,year,taglist)');
+}
+
+$SphQLResult = $SphQL->query();
+$TorrentCount = $SphQLResult->get_meta('total');
+
+if ($TorrentCount == 0) {
+  error('No results found!');
+}
+
+$Results = $SphQLResult->to_array('groupid');
+$Groups = Torrents::get_groups(array_keys($Results));
+
+$TorrentGroups = [];
+foreach ($Groups as $GroupID => $Group) {
+  if (empty($Group['Torrents'])) {
+    unset($Groups[$GroupID]);
+    continue;
+  }
+  foreach ($Group['Torrents'] as $Torrent) {
+    $TorRemIdent = "$Torrent[Media] $Torrent[RemasterYear] $Torrent[RemasterTitle] $Torrent[RemasterRecordLabel] $Torrent[RemasterCatalogueNumber]";
+    if (!isset($TorrentGroups[$Group['ID']])) {
+      $TorrentGroups[$Group['ID']] = array(
+        $TorRemIdent => array(
+          'FlacID' => 0,
+          'Formats' => [],
+          'RemasterTitle' => $Torrent['RemasterTitle'],
+          'RemasterYear' => $Torrent['RemasterYear'],
+          'RemasterRecordLabel' => $Torrent['RemasterRecordLabel'],
+          'RemasterCatalogueNumber' => $Torrent['RemasterCatalogueNumber'],
+          'IsSnatched' => false
+        )
+      );
+    } elseif (!isset($TorrentGroups[$Group['ID']][$TorRemIdent])) {
+      $TorrentGroups[$Group['ID']][$TorRemIdent] = array(
+        'FlacID' => 0,
+        'Formats' => [],
+        'RemasterTitle' => $Torrent['RemasterTitle'],
+        'RemasterYear' => $Torrent['RemasterYear'],
+        'RemasterRecordLabel' => $Torrent['RemasterRecordLabel'],
+        'RemasterCatalogueNumber' => $Torrent['RemasterCatalogueNumber'],
+        'IsSnatched' => false
+      );
+    }
+    if (isset($EncodingKeys[$Torrent['Encoding']])) {
+      $TorrentGroups[$Group['ID']][$TorRemIdent]['Formats'][$Torrent['Encoding']] = true;
+    } elseif ($TorrentGroups[$Group['ID']][$TorRemIdent]['FlacID'] == 0 && $Torrent['Format'] == 'FLAC' && $Torrent['LogScore'] == 100) {
+      $TorrentGroups[$Group['ID']][$TorRemIdent]['FlacID'] = $Torrent['ID'];
+      $TorrentGroups[$Group['ID']][$TorRemIdent]['IsSnatched'] = $Torrent['IsSnatched'];
+    }
+  }
+}
+
+$JsonResults = [];
+foreach ($TorrentGroups as $GroupID => $Editions) {
+  $GroupInfo = $Groups[$GroupID];
+  $GroupYear = $GroupInfo['Year'];
+  $ExtendedArtists = $GroupInfo['ExtendedArtists'];
+  $GroupCatalogueNumber = $GroupInfo['CatalogueNumber'];
+  $GroupName = $GroupInfo['Name'];
+  $GroupRecordLabel = $GroupInfo['RecordLabel'];
+  $ReleaseType = $GroupInfo['ReleaseType'];
+
+  if (!empty($ExtendedArtists[1]) || !empty($ExtendedArtists[4]) || !empty($ExtendedArtists[5]) || !empty($ExtendedArtists[6])) {
+    unset($ExtendedArtists[2]);
+    unset($ExtendedArtists[3]);
+    $ArtistNames = Artists::display_artists($ExtendedArtists, false, false, false);
+  } else {
+    $ArtistNames = '';
+  }
+
+  $TagList = [];
+  $TagList = explode(' ', str_replace('_', '.', $GroupInfo['TagList']));
+  $TorrentTags = [];
+  foreach ($TagList as $Tag) {
+    $TorrentTags[] = "<a href=\"torrents.php?taglist=$Tag\">$Tag</a>";
+  }
+  $TorrentTags = implode(', ', $TorrentTags);
+  foreach ($Editions as $RemIdent => $Edition) {
+    if (!$Edition['FlacID']
+        || !empty($Edition['Formats']) && $_GET['type'] === '3'
+        || $Edition['Formats'][$Encodings[$_GET['type']]] == true) {
+      continue;
+    }
+
+    $JsonResults[] = array(
+      'torrentId' => (int)$Edition['FlacID'],
+      'groupId' => (int)$GroupID,
+      'artist' => $ArtistNames,
+      'groupName' => $GroupName,
+      'groupYear' => (int)$GroupYear,
+      'missingV2' => !isset($Edition['Formats']['V2 (VBR)']),
+      'missingV0' => !isset($Edition['Formats']['V0 (VBR)']),
+      'missing320' => !isset($Encodings['Formats']['320']),
+      'downloadUrl' => 'torrents.php?action=download&id='.$Edition['FlacID'].'&authkey='.$LoggedUser['AuthKey'].'&torrent_pass='.$LoggedUser['torrent_pass']
+    );
+  }
+}
+
+echo json_encode(
+  array(
+    'status' => 'success',
+    'response' => $JsonResults
+  )
+);

sections/api/bookmarks/artists.php

@@ -0,0 +1,63 @@
+<?php
+#declare(strict_types=1);
+
+if (!empty($_GET['userid'])) {
+    if (!check_perms('users_override_paranoia')) {
+        json_die('failure');
+    }
+   
+    $UserID = $_GET['userid'];
+    $Sneaky = ($UserID !== $LoggedUser['ID']);
+
+    if (!is_number($UserID)) {
+        json_die('failure');
+    }
+
+    $DB->query("
+    SELECT
+      `Username`
+    FROM
+      `users_main`
+    WHERE
+      `ID` = '$UserID'
+    ");
+    list($Username) = $DB->next_record();
+} else {
+    $UserID = $LoggedUser['ID'];
+}
+
+//$ArtistList = Bookmarks::all_bookmarks('artist', $UserID);
+
+$DB->query("
+SELECT
+  ag.`ArtistID`,
+  ag.`Name`
+FROM
+  `bookmarks_artists` AS ba
+INNER JOIN `artists_group` AS ag
+ON
+  ba.`ArtistID` = ag.`ArtistID`
+WHERE
+  ba.`UserID` = $UserID
+");
+
+$ArtistList = $DB->to_array();
+$JsonArtists = [];
+
+foreach ($ArtistList as $Artist) {
+    list($ArtistID, $Name) = $Artist;
+    $JsonArtists[] = array(
+      'artistId'   => (int) $ArtistID,
+      'artistName' => $Name
+  );
+}
+
+print
+  json_encode(
+      array(
+      'status' => 'success',
+      'response' => array(
+        'artists' => $JsonArtists
+      )
+    )
+  );

sections/api/bookmarks/index.php

@@ -0,0 +1,47 @@
+<?php
+#declare(strict_types=1);
+
+// Number of users per page
+define('BOOKMARKS_PER_PAGE', '20');
+
+if (empty($_REQUEST['type'])) {
+    $_REQUEST['type'] = 'torrents';
+}
+
+switch ($_REQUEST['type']) {
+  case 'torrents':
+    require SERVER_ROOT.'/sections/ajax/bookmarks/torrents.php';
+    break;
+
+  case 'artists':
+    require SERVER_ROOT.'/sections/ajax/bookmarks/artists.php';
+    break;
+
+  /*
+  case 'collages':
+    $_GET['bookmarks'] = 1;
+    require SERVER_ROOT.'/sections/ajax/collages/browse.php';
+    break;
+  */
+
+  /*
+  case 'requests':
+    $_GET['type'] = 'bookmarks';
+    require SERVER_ROOT.'/sections/ajax/requests/requests.php';
+    break;
+  */
+
+  default:
+    json_die('failure');
+    break;
+
+    /*
+    print
+      json_encode(
+          array(
+          'status' => 'failure'
+        )
+      );
+    error();
+    */
+}

sections/api/bookmarks/torrents.php

@@ -0,0 +1,124 @@
+<?php
+#declare(strict_types=1);
+
+ini_set('memory_limit', -1);
+
+function compare($X, $Y)
+{
+    return($Y['count'] - $X['count']);
+}
+
+if (!empty($_GET['userid'])) {
+    if (!check_perms('users_override_paranoia')) {
+        error(403);
+    }
+
+    $UserID = $_GET['userid'];
+    if (!is_number($UserID)) {
+        error(404);
+    }
+
+    $DB->query("
+    SELECT
+      `Username`
+    FROM
+      `users_main`
+    WHERE
+      `ID` = '$UserID'
+    ");
+    list($Username) = $DB->next_record();
+} else {
+    $UserID = $LoggedUser['ID'];
+}
+
+$Sneaky = ($UserID !== $LoggedUser['ID']);
+$JsonBookmarks = [];
+
+list($GroupIDs, $CollageDataList, $GroupList) = Users::get_bookmarks($UserID);
+foreach ($GroupIDs as $GroupID) {
+    if (!isset($GroupList[$GroupID])) {
+        continue;
+    }
+
+    $Group = $GroupList[$GroupID];
+    $JsonTorrents = [];
+
+    foreach ($Group['Torrents'] as $Torrent) {
+        $JsonTorrents[] = array(
+          'id'          => (int) $Torrent['ID'],
+          'groupId'     => (int) $Torrent['GroupID'],
+          'platform'    => $Torrent['Media'],
+          'fileCount'   => (int) $Torrent['FileCount'],
+          'freeTorrent' => $Torrent['FreeTorrent'] === 1,
+          'size'        => (float) $Torrent['Size'],
+          'leechers'    => (int) $Torrent['Leechers'],
+          'seeders'     => (int) $Torrent['Seeders'],
+          'snatched'    => (int) $Torrent['Snatched'],
+          'time'        => $Torrent['Time'],
+          'hasFile'     => (int) $Torrent['HasFile']
+        );
+
+        /*
+        $JsonTorrents[] = array(
+          'id'                      => (int) $Torrent['ID'],
+          'groupId'                 => (int) $Torrent['GroupID'],
+          'media'                   => $Torrent['Media'],
+          'format'                  => $Torrent['Format'],
+          'encoding'                => $Torrent['Encoding'],
+          'remasterYear'            => (int) $Torrent['RemasterYear'],
+          'remastered'              => $Torrent['Remastered'] == 1,
+          'remasterTitle'           => $Torrent['RemasterTitle'],
+          'remasterRecordLabel'     => $Torrent['RemasterRecordLabel'],
+          'remasterCatalogueNumber' => $Torrent['RemasterCatalogueNumber'],
+          'scene'                   => $Torrent['Scene'] === 1,
+          'hasLog'                  => $Torrent['HasLog'] === 1,
+          'hasCue'                  => $Torrent['HasCue'] === 1,
+          'logScore'                => (float) $Torrent['LogScore'],
+          'fileCount'               => (int) $Torrent['FileCount'],
+          'freeTorrent'             => $Torrent['FreeTorrent'] === 1,
+          'size'                    => (float) $Torrent['Size'],
+          'leechers'                => (int) $Torrent['Leechers'],
+          'seeders'                 => (int) $Torrent['Seeders'],
+          'snatched'                => (int) $Torrent['Snatched'],
+          'time'                    => $Torrent['Time'],
+          'hasFile'                 => (int) $Torrent['HasFile']
+        );
+        */
+    }
+
+    $JsonBookmarks[] = array(
+    'id'          => (int) $Group['ID'],
+    'name'        => $Group['Name'],
+    'year'        => (int) $Group['Year'],
+    'accession'   => $Group['CatalogueNumber'],
+    'tagList'     => $Group['TagList'],
+    'vanityHouse' => $Group['VanityHouse'] === 1,
+    'picture'     => $Group['WikiImage'],
+    'torrents'    => $JsonTorrents
+  );
+
+    /*
+    $JsonBookmarks[] = array(
+      'id'              => (int) $Group['ID'],
+      'name'            => $Group['Name'],
+      'year'            => (int) $Group['Year'],
+      'recordLabel'     => $Group['RecordLabel'],
+      'catalogueNumber' => $Group['CatalogueNumber'],
+      'tagList'         => $Group['TagList'],
+      'releaseType'     => $Group['ReleaseType'],
+      'vanityHouse'     => $Group['VanityHouse'] === 1,
+      'image'           => $Group['WikiImage'],
+      'torrents'        => $JsonTorrents
+    );
+    */
+}
+
+print
+  json_encode(
+      array(
+      'status' => 'success',
+      'response' => array(
+        'bookmarks' => $JsonBookmarks
+      )
+    )
+  );

sections/api/browse.php

@@ -0,0 +1,132 @@
+<?php
+#declare(strict_types=1);
+
+include SERVER_ROOT.'/sections/torrents/functions.php';
+
+if (!empty($_GET['order_way']) && $_GET['order_way'] === 'asc') {
+    $OrderWay = 'asc';
+} else {
+    $OrderWay = 'desc';
+}
+
+if (empty($_GET['order_by']) || !isset(TorrentSearch::$SortOrders[$_GET['order_by']])) {
+    $OrderBy = 'time';
+} else {
+    $OrderBy = $_GET['order_by'];
+}
+
+$GroupResults = !isset($_GET['group_results']) || (int) $_GET['group_results'] !== 0;
+$Page = !empty($_GET['page']) ? (int) $_GET['page'] : 1;
+
+$Search = new TorrentSearch($GroupResults, $OrderBy, $OrderWay, $Page, TORRENTS_PER_PAGE);
+$Results = $Search->query($_GET);
+
+$Groups = $Search->get_groups();
+$NumResults = $Search->record_count();
+
+if ($Results === false) {
+    json_die('error', 'Search returned an error. Make sure all parameters are valid and of the expected types.');
+}
+
+if ($NumResults === 0) {
+    json_die('success', [
+    'results' => []
+  ]);
+}
+
+$Bookmarks = Bookmarks::all_bookmarks('torrent');
+
+$JsonGroups = [];
+foreach ($Results as $Key => $GroupID) {
+    $GroupInfo = $Groups[$GroupID];
+    if (empty($GroupInfo['Torrents'])) {
+        continue;
+    }
+
+    $CategoryID = $GroupInfo['CategoryID'];
+    $Artists = $GroupInfo['Artists'];
+    $GroupCatalogueNumber = $GroupInfo['CatalogueNumber'];
+    $GroupName = $GroupInfo['Name'];
+
+    if ($GroupResults) {
+        $Torrents = $GroupInfo['Torrents'];
+        $GroupTime = $MaxSize = $TotalLeechers = $TotalSeeders = $TotalSnatched = 0;
+
+        foreach ($Torrents as $T) {
+            $GroupTime = max($GroupTime, strtotime($T['Time']));
+            $MaxSize = max($MaxSize, $T['Size']);
+            $TotalLeechers += $T['Leechers'];
+            $TotalSeeders += $T['Seeders'];
+            $TotalSnatched += $T['Snatched'];
+        }
+    } else {
+        $TorrentID = $Key;
+        $Torrents = [$TorrentID => $GroupInfo['Torrents'][$TorrentID]];
+    }
+
+    $TagList = explode(' ', str_replace('_', '.', $GroupInfo['TagList']));
+    $JsonArtists = [];
+    $DisplayName = '';
+
+    if (!empty($Artists)) {
+        $DisplayName = Artists::display_artists($Artists, false, false, false);
+        foreach ($Artists as $Artist) {
+            $JsonArtists[] = [
+              'id' => (int) $Artist['id'],
+              'name' => $Artist['name']
+            ];
+        }
+    }
+
+    $JsonTorrents = [];
+    foreach ($Torrents as $TorrentID => $Data) {
+        // All of the individual torrents in the group
+
+        $JsonTorrents[] = [
+          'torrentId'           => (int) $TorrentID,
+          'authors'             => $JsonArtists,
+          'platform'            => $Data['Media'],
+          'format'              => $Data['Container'],
+          'license'             => $Data['Codec'],
+          'scope'               => $Data['Resolution'],
+          'annotated'           => $Data['Censored'],
+          'archive'             => $Data['Archive'],
+          'fileCount'           => (int) $Data['FileCount'],
+          'time'                => $Data['Time'],
+          'size'                => (int) $Data['Size'],
+          'snatches'            => (int) $Data['Snatched'],
+          'seeders'             => (int) $Data['Seeders'],
+          'leechers'            => (int) $Data['Leechers'],
+          'isFreeleech'         => (int) $Data['FreeTorrent'] === 1,
+          'isNeutralLeech'      => (int) $Data['FreeTorrent'] === 2,
+          'isPersonalFreeleech' => $Data['PersonalFL'],
+          'canUseToken'         => Torrents::can_use_token($Data),
+          'hasSnatched'         => $Data['IsSnatched']
+        ];
+    }
+
+    $JsonGroups[] = [
+      'groupId'       => (int) $GroupID,
+      'groupName'     => $GroupName,
+      'author'        => $DisplayName,
+      'picture'       => $GroupInfo['WikiImage'],
+      'tags'          => $TagList,
+      'bookmarked'    => (in_array($GroupID, $Bookmarks)),
+      'groupYear'     => (int) $GroupInfo['Year'],
+      'groupTime'     => (int) $GroupTime,
+      'accession'     => $GroupInfo['CatalogueNumber'],
+      'lab'           => $GroupInfo['Studio'],
+      'location'      => $GroupInfo['Series'],
+      'maxSize'       => (int) $MaxSize,
+      'totalSnatched' => (int) $TotalSnatched,
+      'totalSeeders'  => (int) $TotalSeeders,
+      'totalLeechers' => (int) $TotalLeechers,
+      'torrents'      => $JsonTorrents
+    ];
+}
+
+json_print('success', [
+  'currentPage' => intval($Page),
+  'pages' => ceil($NumResults / TORRENTS_PER_PAGE),
+  'results' => $JsonGroups
+]);

sections/api/clear_user_notification.php

@@ -0,0 +1,49 @@
+<?php
+#declare(strict_types=1);
+
+$Type = $_POST['type'];
+
+switch ($Type) {
+  case NotificationsManager::INBOX:
+    NotificationsManager::clear_inbox();
+    break;
+
+  case NotificationsManager::NEWS:
+    NotificationsManager::clear_news(false);
+    break;
+
+  case NotificationsManager::BLOG:
+    NotificationsManager::clear_blog(false);
+    break;
+
+  case NotificationsManager::STAFFPM:
+    NotificationsManager::clear_staff_pms();
+    break;
+
+  case NotificationsManager::TORRENTS:
+    NotificationsManager::clear_torrents();
+    break;
+
+  case NotificationsManager::QUOTES:
+    NotificationsManager::clear_quotes();
+    break;
+
+  case NotificationsManager::SUBSCRIPTIONS:
+    NotificationsManager::clear_subscriptions();
+    break;
+
+  case NotificationsManager::COLLAGES:
+    NotificationsManager::clear_collages();
+    break;
+
+  case NotificationsManager::GLOBALNOTICE:
+    NotificationsManager::clear_global_notification();
+    break;
+    
+  default:
+    break;
+}
+
+if (strpos($Type, "oneread_") === 0) {
+    NotificationsManager::clear_one_read($Type);
+}

sections/api/collage.php

@@ -0,0 +1,174 @@
+<?php
+#declare(strict_types=1);
+
+define('ARTIST_COLLAGE', 'Artists');
+
+if (empty($_GET['id']) || !is_number($_GET['id'])) {
+    json_die('failure', 'bad parameters');
+}
+
+$CollageID = $_GET['id'];
+$CacheKey = "collage_$CollageID";
+$CollageData = $Cache->get_value($CacheKey);
+
+if ($CollageData) {
+    list($Name, $Description, $CommentList, $Deleted, $CollageCategoryID, $CreatorID, $Locked, $MaxGroups, $MaxGroupsPerUser, $Updated, $Subscribers) = $CollageData;
+} else {
+    $DB->query("
+    SELECT
+      `Name`,
+      `Description`,
+      `UserID`,
+      `Deleted`,
+      `CategoryID`,
+      `Locked`,
+      `MaxGroups`,
+      `MaxGroupsPerUser`,
+      `Updated`,
+      `Subscribers`
+    FROM
+      `collages`
+    WHERE
+      `ID` = '$CollageID'
+    ");
+
+    if (!$DB->has_results()) {
+        json_die("failure");
+    }
+
+    list($Name, $Description, $CreatorID, $Deleted, $CollageCategoryID, $Locked, $MaxGroups, $MaxGroupsPerUser, $Updated, $Subscribers) = $DB->next_record(MYSQLI_NUM);
+    $CommentList = null;
+    $SetCache = true;
+}
+
+// todo: Cache this
+$DB->query("
+SELECT
+  `GroupID`
+FROM
+  `collages_torrents`
+WHERE
+  `CollageID` = $CollageID
+");
+$TorrentGroups = $DB->collect('GroupID');
+
+$JSON = array(
+  'id'                  => (int) $CollageID,
+  'name'                => $Name,
+  'description'         => Text::full_format($Description),
+  'creatorID'           => (int) $CreatorID,
+  'deleted'             => (bool) $Deleted,
+  'collageCategoryID'   => (int) $CollageCategoryID,
+  'collageCategoryName' => $CollageCats[(int) $CollageCategoryID],
+  'locked'              => (bool) $Locked,
+  'maxGroups'           => (int) $MaxGroups,
+  'maxGroupsPerUser'    => (int) $MaxGroupsPerUser,
+  'hasBookmarked'       => Bookmarks::has_bookmarked('collage', $CollageID),
+  'subscriberCount'     => (int) $Subscribers,
+  'torrentGroupIDList'  => $TorrentGroups
+);
+
+if ($CollageCategoryID !== array_search(ARTIST_COLLAGE, $CollageCats)) {
+    // Torrent collage
+    $TorrentGroups = [];
+    $DB->query("
+    SELECT
+      ct.`GroupID`
+    FROM
+      `collages_torrents` AS ct
+    JOIN `torrents_group` AS tg
+    ON
+      tg.`ID` = ct.`GroupID`
+    WHERE
+      ct.`CollageID` = '$CollageID'
+    ORDER BY
+      ct.`Sort`
+    ");
+
+    $GroupIDs = $DB->collect('GroupID');
+    $GroupList = Torrents::get_groups($GroupIDs);
+
+    foreach ($GroupIDs as $GroupID) {
+        if (!empty($GroupList[$GroupID])) {
+            $GroupDetails = Torrents::array_group($GroupList[$GroupID]);
+            $TorrentList = [];
+
+            foreach ($GroupDetails['Torrents'] as $Torrent) {
+                $TorrentList[] = array(
+                  'torrentid'   => (int)$Torrent['ID'],
+                  'platform'    => $Torrent['Media'],
+                  'fileCount'   => (int)$Torrent['FileCount'],
+                  'size'        => (int)$Torrent['Size'],
+                  'seeders'     => (int)$Torrent['Seeders'],
+                  'leechers'    => (int)$Torrent['Leechers'],
+                  'snatched'    => (int)$Torrent['Snatched'],
+                  'freeTorrent' => ($Torrent['FreeTorrent'] === 1),
+                  'reported'    => (count(Torrents::get_reports((int)$Torrent['ID'])) > 0),
+                  'time'        => $Torrent['Time']
+                );
+            }
+
+            $TorrentGroups[] = array(
+              'id'          => $GroupDetails['GroupID'],
+              'name'        => $GroupDetails['GroupName'],
+              'year'        => $GroupDetails['GroupYear'],
+              'categoryId'  => $GroupDetails['GroupCategoryID'],
+              'accession'   => $GroupDetails['GroupCatalogueNumber'],
+              'vanityHouse' => $GroupDetails['GroupVanityHouse'],
+              'tagList'     => $GroupDetails['TagList'],
+              'picture'     => $GroupDetails['WikiImage'],
+              'torrents'    => $TorrentList
+            );
+        }
+    }
+    $JSON['torrentgroups'] = $TorrentGroups;
+} else {
+    // Artist collage
+    $DB->query("
+    SELECT
+      ca.`ArtistID`,
+      ag.`Name`,
+      aw.`Image`
+    FROM
+      `collages_artists` AS ca
+    JOIN `artists_group` AS ag
+    ON
+      ag.`ArtistID` = ca.`ArtistID`
+    LEFT JOIN `wiki_artists` AS aw
+    ON
+      aw.`RevisionID` = ag.`RevisionID`
+    WHERE
+      ca.`CollageID` = '$CollageID'
+    ORDER BY
+      ca.`Sort`
+    ");
+
+    $Artists = [];
+    while (list($ArtistID, $ArtistName, $ArtistImage) = $DB->next_record()) {
+        $Artists[] = array(
+          'id'      => (int) $ArtistID,
+          'name'    => $ArtistName,
+          'picture' => $ArtistImage
+        );
+    }
+    $JSON['artists'] = $Artists;
+}
+
+if (isset($SetCache)) {
+    $CollageData = array(
+      $Name,
+      $Description,
+      $CommentList,
+      (bool) $Deleted,
+      (int) $CollageCategoryID,
+      (int) $CreatorID,
+      (bool) $Locked,
+      (int) $MaxGroups,
+      (int) $MaxGroupsPerUser,
+      $Updated,
+      (int) $Subscribers
+    );
+    $Cache->cache_value($CacheKey, $CollageData, 3600);
+}
+
+json_print('success', $JSON);

sections/api/community_stats.php

@@ -0,0 +1,70 @@
+<?php
+#declare(strict_types=1);
+
+if (!isset($_GET['userid']) || !is_number($_GET['userid'])) {
+    json_die('failure');
+}
+
+$UserID = $_GET['userid'];
+$CommStats = array(
+  'leeching' => false,
+  'seeding' => false,
+  'snatched' => false,
+  'usnatched' => false,
+  'downloaded' => false,
+  'udownloaded' => false,
+  'seedingperc' => false,
+);
+
+$User = Users::user_info($UserID);
+
+function check_paranoia_here($Setting)
+{
+    global $User;
+    return check_paranoia($Setting, $User['Paranoia'], $User['Class'], $User['ID']);
+}
+
+if (check_paranoia_here('seeding+') || check_paranoia_here('leeching+')) {
+    $DB->query("
+    SELECT IF(remaining = 0, 'Seeding', 'Leeching') AS Type, COUNT(x.uid)
+    FROM xbt_files_users AS x
+      INNER JOIN torrents AS t ON t.ID = x.fid
+    WHERE x.uid = '$UserID'
+      AND x.active = 1
+    GROUP BY Type");
+    $PeerCount = $DB->to_array(0, MYSQLI_NUM, false);
+    if (check_paranoia('seeding+')) {
+        $Seeding = isset($PeerCount['Seeding']) ? $PeerCount['Seeding'][1] : 0;
+        $CommStats['seeding'] = number_format($Seeding);
+    }
+    if (check_paranoia('leeching+')) {
+        $CommStats['leeching'] = isset($PeerCount['Leeching']) ? number_format($PeerCount['Leeching'][1]) : 0;
+    }
+}
+if (check_paranoia_here('snatched+')) {
+    $DB->query("
+    SELECT COUNT(x.uid), COUNT(DISTINCT x.fid)
+    FROM xbt_snatched AS x
+      INNER JOIN torrents AS t ON t.ID = x.fid
+    WHERE x.uid = '$UserID'");
+    list($Snatched, $UniqueSnatched) = $DB->next_record(MYSQLI_NUM, false);
+    $CommStats['snatched'] = number_format($Snatched);
+    if (check_perms('site_view_torrent_snatchlist', $User['Class'])) {
+        $CommStats['usnatched'] = number_format($UniqueSnatched);
+    }
+    if (check_paranoia_here('seeding+') && check_paranoia_here('snatched+') && $UniqueSnatched > 0) {
+        $CommStats['seedingperc'] = 100 * min(1, round($Seeding / $UniqueSnatched, 2));
+    }
+}
+if (check_perms('site_view_torrent_snatchlist', $Class)) {
+    $DB->query("
+    SELECT COUNT(ud.UserID), COUNT(DISTINCT ud.TorrentID)
+    FROM users_downloads AS ud
+      JOIN torrents AS t ON t.ID = ud.TorrentID
+    WHERE ud.UserID = '$UserID'");
+    list($NumDownloads, $UniqueDownloads) = $DB->next_record(MYSQLI_NUM, false);
+    $CommStats['downloaded'] = number_format($NumDownloads);
+    $CommStats['udownloaded'] = number_format($UniqueDownloads);
+}
+
+json_die('success', $CommStats);

sections/api/forum/forum.php

@@ -0,0 +1,180 @@
+<?php
+#declare(strict_types=1);
+
+# todo: Go through line by line
+
+/**********|| Page to show individual forums || ********************************\
+
+Things to expect in $_GET:
+  ForumID: ID of the forum curently being browsed
+  page: The page the user's on.
+  page = 1 is the same as no page
+
+********************************************************************************/
+
+//---------- Things to sort out before it can start printing/generating content
+
+// Check for lame SQL injection attempts
+$ForumID = $_GET['forumid'];
+if (!is_number($ForumID)) {
+    echo json_encode(array('status' => 'failure'));
+    error();
+}
+
+if (isset($_GET['pp'])) {
+    $PerPage = intval($_GET['pp']);
+} elseif (isset($LoggedUser['PostsPerPage'])) {
+    $PerPage = $LoggedUser['PostsPerPage'];
+} else {
+    $PerPage = POSTS_PER_PAGE;
+}
+
+list($Page, $Limit) = Format::page_limit(TOPICS_PER_PAGE);
+
+//---------- Get some data to start processing
+
+// Caching anything beyond the first page of any given forum is just wasting ram
+// users are more likely to search then to browse to page 2
+if ($Page === 1) {
+    list($Forum, , , $Stickies) = $Cache->get_value("forums_$ForumID");
+}
+if (!isset($Forum) || !is_array($Forum)) {
+    $DB->query("
+    SELECT
+      ID,
+      Title,
+      AuthorID,
+      IsLocked,
+      IsSticky,
+      NumPosts,
+      LastPostID,
+      LastPostTime,
+      LastPostAuthorID
+    FROM forums_topics
+    WHERE ForumID = '$ForumID'
+    ORDER BY IsSticky DESC, LastPostTime DESC
+    LIMIT $Limit"); // Can be cached until someone makes a new post
+    $Forum = $DB->to_array('ID', MYSQLI_ASSOC, false);
+    if ($Page === 1) {
+        $DB->query("
+      SELECT COUNT(ID)
+      FROM forums_topics
+      WHERE ForumID = '$ForumID'
+        AND IsSticky = '1'");
+        list($Stickies) = $DB->next_record();
+        $Cache->cache_value("forums_$ForumID", array($Forum, '', 0, $Stickies), 0);
+    }
+}
+
+if (!isset($Forums[$ForumID])) {
+    json_die("failure");
+}
+// Make sure they're allowed to look at the page
+if (!check_perms('site_moderate_forums')) {
+    if (isset($LoggedUser['CustomForums'][$ForumID]) && $LoggedUser['CustomForums'][$ForumID] === 0) {
+        json_die("failure", "insufficient permissions to view page");
+    }
+}
+if ($LoggedUser['CustomForums'][$ForumID] != 1 && $Forums[$ForumID]['MinClassRead'] > $LoggedUser['Class']) {
+    json_die("failure", "insufficient permissions to view page");
+}
+
+$ForumName = display_str($Forums[$ForumID]['Name']);
+$JsonSpecificRules = [];
+foreach ($Forums[$ForumID]['SpecificRules'] as $ThreadIDs) {
+    $Thread = Forums::get_thread_info($ThreadIDs);
+    $JsonSpecificRules[] = array(
+    'threadId' => (int)$ThreadIDs,
+    'thread' => display_str($Thread['Title'])
+  );
+}
+
+$Pages = Format::get_pages($Page, $Forums[$ForumID]['NumTopics'], TOPICS_PER_PAGE, 9);
+
+if (count($Forum) === 0) {
+    print
+    json_encode(
+        array(
+        'status' => 'success',
+        'forumName' => $ForumName,
+        'threads' => []
+      )
+    );
+} else {
+    // forums_last_read_topics is a record of the last post a user read in a topic, and what page that was on
+    $DB->query("
+    SELECT
+      l.TopicID,
+      l.PostID,
+      CEIL(
+        (
+          SELECT COUNT(p.ID)
+          FROM forums_posts AS p
+          WHERE p.TopicID = l.TopicID
+            AND p.ID <= l.PostID
+        ) / $PerPage
+      ) AS Page
+    FROM forums_last_read_topics AS l
+    WHERE l.TopicID IN(".implode(', ', array_keys($Forum)).')
+      AND l.UserID = \''.$LoggedUser['ID'].'\'');
+
+    // Turns the result set into a multi-dimensional array, with
+    // forums_last_read_topics.TopicID as the key.
+    // This is done here so we get the benefit of the caching, and we
+    // don't have to make a database query for each topic on the page
+    $LastRead = $DB->to_array('TopicID');
+
+    $JsonTopics = [];
+    foreach ($Forum as $Topic) {
+        list($TopicID, $Title, $AuthorID, $Locked, $Sticky, $PostCount, $LastID, $LastTime, $LastAuthorID) = array_values($Topic);
+
+        // Handle read/unread posts - the reason we can't cache the whole page
+        if ((!$Locked || $Sticky)
+        && ((empty($LastRead[$TopicID]) || $LastRead[$TopicID]['PostID'] < $LastID)
+          && strtotime($LastTime) > $LoggedUser['CatchupTime'])
+    ) {
+            $Read = 'unread';
+        } else {
+            $Read = 'read';
+        }
+        $UserInfo = Users::user_info($AuthorID);
+        $AuthorName = $UserInfo['Username'];
+        $UserInfo = Users::user_info($LastAuthorID);
+        $LastAuthorName = $UserInfo['Username'];
+        // Bug fix for no last time available
+        if (!$LastTime) {
+            $LastTime = '';
+        }
+
+        $JsonTopics[] = array(
+      'topicId' => (int)$TopicID,
+      'title' => display_str($Title),
+      'authorId' => (int)$AuthorID,
+      'authorName' => $AuthorName,
+      'locked' => $Locked === 1,
+      'sticky' => $Sticky === 1,
+      'postCount' => (int)$PostCount,
+      'lastID' => ($LastID === null) ? 0 : (int)$LastID,
+      'lastTime' => $LastTime,
+      'lastAuthorId' => ($LastAuthorID === null) ? 0 : (int)$LastAuthorID,
+      'lastAuthorName' => ($LastAuthorName === null) ? '' : $LastAuthorName,
+      'lastReadPage' => ($LastRead[$TopicID]['Page'] === null) ? 0 : (int)$LastRead[$TopicID]['Page'],
+      'lastReadPostId' => ($LastRead[$TopicID]['PostID'] === null) ? 0 : (int)$LastRead[$TopicID]['PostID'],
+      'read' => $Read === 'read'
+    );
+    }
+
+    print
+    json_encode(
+        array(
+        'status' => 'success',
+        'response' => array(
+          'forumName' => $ForumName,
+          'specificRules' => $JsonSpecificRules,
+          'currentPage' => (int)$Page,
+          'pages' => ceil($Forums[$ForumID]['NumTopics'] / TOPICS_PER_PAGE),
+          'threads' => $JsonTopics
+        )
+      )
+    );
+}

sections/api/forum/index.php

@@ -0,0 +1,34 @@
+<?php
+#declare(strict_types=1);
+
+// Already done in /sections/ajax/index.php
+//enforce_login();
+
+if (!empty($LoggedUser['DisableForums'])) {
+    echo json_encode(array('status' => 'failure'));
+    error();
+} else {
+    // Replace the old hard-coded forum categories
+    $ForumCats = Forums::get_forum_categories();
+
+    // This variable contains all our lovely forum data
+    $Forums = Forums::get_forums();
+
+    if (empty($_GET['type']) || $_GET['type'] === 'main') {
+        include SERVER_ROOT.'/sections/ajax/forum/main.php';
+    } else {
+        switch ($_GET['type']) {
+        case 'viewforum':
+          include SERVER_ROOT.'/sections/ajax/forum/forum.php';
+          break;
+
+        case 'viewthread':
+          include SERVER_ROOT.'/sections/ajax/forum/thread.php';
+          break;
+
+        default:
+          echo json_encode(array('status' => 'failure'));
+          break;
+        }
+    }
+}

sections/api/forum/main.php

@@ -0,0 +1,117 @@
+<?php
+#declare(strict_types=1);
+
+# todo: Go through line by line
+if (isset($LoggedUser['PostsPerPage'])) {
+    $PerPage = $LoggedUser['PostsPerPage'];
+} else {
+    $PerPage = POSTS_PER_PAGE;
+}
+
+// We have to iterate here because if one is empty it breaks the query
+$TopicIDs = [];
+foreach ($Forums as $Forum) {
+    if (!empty($Forum['LastPostTopicID'])) {
+        $TopicIDs[] = $Forum['LastPostTopicID'];
+    }
+}
+
+// Now if we have IDs' we run the query
+if (!empty($TopicIDs)) {
+    $DB->query("
+    SELECT
+      l.TopicID,
+      l.PostID,
+      CEIL(
+        (
+          SELECT COUNT(p.ID)
+          FROM forums_posts AS p
+          WHERE p.TopicID = l.TopicID
+            AND p.ID <= l.PostID
+        ) / $PerPage
+      ) AS Page
+    FROM forums_last_read_topics AS l
+    WHERE l.TopicID IN(".implode(',', $TopicIDs).")
+      AND l.UserID = '$LoggedUser[ID]'");
+    $LastRead = $DB->to_array('TopicID', MYSQLI_ASSOC);
+} else {
+    $LastRead = [];
+}
+
+$DB->query("
+  SELECT RestrictedForums
+  FROM users_info
+  WHERE UserID = ".$LoggedUser['ID']);
+list($RestrictedForums) = $DB->next_record();
+$RestrictedForums = explode(',', $RestrictedForums);
+$PermittedForums = array_keys($LoggedUser['PermittedForums']);
+
+$JsonCategories = [];
+$JsonCategory = [];
+$JsonForums = [];
+foreach ($Forums as $Forum) {
+    list($ForumID, $CategoryID, $ForumName, $ForumDescription, $MinRead, $MinWrite, $MinCreate, $NumTopics, $NumPosts, $LastPostID, $LastAuthorID, $LastTopicID, $LastTime, $SpecificRules, $LastTopic, $Locked, $Sticky) = array_values($Forum);
+    if ($LoggedUser['CustomForums'][$ForumID] != 1
+      && ($MinRead > $LoggedUser['Class']
+      || array_search($ForumID, $RestrictedForums) !== false)
+  ) {
+        continue;
+    }
+    $ForumDescription = display_str($ForumDescription);
+
+    if ($CategoryID != $LastCategoryID) {
+        if (!empty($JsonForums) && !empty($JsonCategory)) {
+            $JsonCategory['forums'] = $JsonForums;
+            $JsonCategories[] = $JsonCategory;
+        }
+        $LastCategoryID = $CategoryID;
+        $JsonCategory = array(
+      'categoryID' => (int)$CategoryID,
+      'categoryName' => $ForumCats[$CategoryID]
+    );
+        $JsonForums = [];
+    }
+
+    if ((!$Locked || $Sticky)
+      && $LastPostID != 0
+      && ((empty($LastRead[$LastTopicID]) || $LastRead[$LastTopicID]['PostID'] < $LastPostID)
+        && strtotime($LastTime) > $LoggedUser['CatchupTime'])
+  ) {
+        $Read = 'unread';
+    } else {
+        $Read = 'read';
+    }
+    $UserInfo = Users::user_info($LastAuthorID);
+
+    $JsonForums[] = array(
+    'forumId' => (int)$ForumID,
+    'forumName' => $ForumName,
+    'forumDescription' => $ForumDescription,
+    'numTopics' => (float)$NumTopics,
+    'numPosts' => (float)$NumPosts,
+    'lastPostId' => (float)$LastPostID,
+    'lastAuthorId' => (float)$LastAuthorID,
+    'lastPostAuthorName' => $UserInfo['Username'],
+    'lastTopicId' => (float)$LastTopicID,
+    'lastTime' => $LastTime,
+    'specificRules' => $SpecificRules,
+    'lastTopic' => display_str($LastTopic),
+    'read' => $Read === 1,
+    'locked' => $Locked === 1,
+    'sticky' => $Sticky === 1
+  );
+}
+// ...And an extra one to catch the last category.
+if (!empty($JsonForums) && !empty($JsonCategory)) {
+    $JsonCategory['forums'] = $JsonForums;
+    $JsonCategories[] = $JsonCategory;
+}
+
+echo json_encode(
+    array(
+    'status' => 'success',
+    'response' => array(
+      'categories' => $JsonCategories
+    )
+  )
+);

sections/api/forum/thread.php

@@ -0,0 +1,291 @@
+<?php
+#declare(strict_types=1);
+
+# todo: Go through line by line
+// todo: Normalize thread_*_info don't need to waste all that ram on things that are already in other caches
+
+/**********|| Page to show individual threads || ********************************\
+
+Things to expect in $_GET:
+  ThreadID: ID of the forum curently being browsed
+  page: The page the user's on.
+  page = 1 is the same as no page
+
+********************************************************************************/
+
+//---------- Things to sort out before it can start printing/generating content
+
+// Check for lame SQL injection attempts
+if (!isset($_GET['threadid']) || !is_number($_GET['threadid'])) {
+    if (isset($_GET['topicid']) && is_number($_GET['topicid'])) {
+        $ThreadID = $_GET['topicid'];
+    } elseif (isset($_GET['postid']) && is_number($_GET['postid'])) {
+        $DB->query("
+        SELECT TopicID
+        FROM forums_posts
+          WHERE ID = $_GET[postid]");
+        list($ThreadID) = $DB->next_record();
+
+        if ($ThreadID) {
+            // Redirect postid to threadid when necessary
+            header("Location: ajax.php?action=forum&type=viewthread&threadid=$ThreadID&postid=$_GET[postid]");
+            error();
+        } else {
+            echo json_encode(array('status' => 'failure'));
+            error();
+        }
+    } else {
+        echo json_encode(array('status' => 'failure'));
+        error();
+    }
+} else {
+    $ThreadID = $_GET['threadid'];
+}
+
+if (isset($_GET['pp'])) {
+    $PerPage = $_GET['pp'];
+} elseif (isset($LoggedUser['PostsPerPage'])) {
+    $PerPage = $LoggedUser['PostsPerPage'];
+} else {
+    $PerPage = POSTS_PER_PAGE;
+}
+
+//---------- Get some data to start processing
+
+// Thread information, constant across all pages
+$ThreadInfo = Forums::get_thread_info($ThreadID, true, true);
+if ($ThreadInfo === null) {
+    json_die('failure', 'no such thread exists');
+}
+$ForumID = $ThreadInfo['ForumID'];
+
+// Make sure they're allowed to look at the page
+if (!Forums::check_forumperm($ForumID)) {
+    echo json_encode(array('status' => 'failure'));
+    error();
+}
+
+// Post links utilize the catalogue & key params to prevent issues with custom posts per page
+if ($ThreadInfo['Posts'] > $PerPage) {
+    if (isset($_GET['post']) && is_number($_GET['post'])) {
+        $PostNum = $_GET['post'];
+    } elseif (isset($_GET['postid']) && is_number($_GET['postid'])) {
+        $DB->query("
+        SELECT COUNT(ID)
+        FROM forums_posts
+          WHERE TopicID = $ThreadID
+          AND ID <= $_GET[postid]");
+        list($PostNum) = $DB->next_record();
+    } else {
+        $PostNum = 1;
+    }
+} else {
+    $PostNum = 1;
+}
+list($Page, $Limit) = Format::page_limit($PerPage, min($ThreadInfo['Posts'], $PostNum));
+if (($Page - 1) * $PerPage > $ThreadInfo['Posts']) {
+    $Page = ceil($ThreadInfo['Posts'] / $PerPage);
+}
+list($CatalogueID, $CatalogueLimit) = Format::catalogue_limit($Page, $PerPage, THREAD_CATALOGUE);
+
+// Cache catalogue from which the page is selected, allows block caches and future ability to specify posts per page
+if (!$Catalogue = $Cache->get_value("thread_$ThreadID"."_catalogue_$CatalogueID")) {
+    $DB->query("
+    SELECT
+      p.ID,
+      p.AuthorID,
+      p.AddedTime,
+      p.Body,
+      p.EditedUserID,
+      p.EditedTime
+    FROM forums_posts AS p
+    WHERE p.TopicID = '$ThreadID'
+      AND p.ID != '".$ThreadInfo['StickyPostID']."'
+    LIMIT $CatalogueLimit");
+    $Catalogue = $DB->to_array(false, MYSQLI_ASSOC);
+    if (!$ThreadInfo['IsLocked'] || $ThreadInfo['IsSticky']) {
+        $Cache->cache_value("thread_$ThreadID"."_catalogue_$CatalogueID", $Catalogue, 0);
+    }
+}
+$Thread = Format::catalogue_select($Catalogue, $Page, $PerPage, THREAD_CATALOGUE);
+
+if ($_GET['updatelastread'] !== '0') {
+    $LastPost = end($Thread);
+    $LastPost = $LastPost['ID'];
+    reset($Thread);
+    if ($ThreadInfo['Posts'] <= $PerPage * $Page && $ThreadInfo['StickyPostID'] > $LastPost) {
+        $LastPost = $ThreadInfo['StickyPostID'];
+    }
+    // Handle last read
+    if (!$ThreadInfo['IsLocked'] || $ThreadInfo['IsSticky']) {
+        $DB->query("
+        SELECT PostID
+        FROM forums_last_read_topics
+          WHERE UserID = '$LoggedUser[ID]'
+          AND TopicID = '$ThreadID'");
+        list($LastRead) = $DB->next_record();
+
+        if ($LastRead < $LastPost) {
+            $DB->query("
+            INSERT INTO forums_last_read_topics
+              (UserID, TopicID, PostID)
+            VALUES
+              ('$LoggedUser[ID]', '$ThreadID', '".db_string($LastPost)."')
+            ON DUPLICATE KEY UPDATE
+              PostID = '$LastPost'");
+        }
+    }
+}
+
+// Handle subscriptions
+$UserSubscriptions = Subscriptions::get_subscriptions();
+
+if (empty($UserSubscriptions)) {
+    $UserSubscriptions = [];
+}
+
+if (in_array($ThreadID, $UserSubscriptions)) {
+    $Cache->delete_value('subscriptions_user_new_'.$LoggedUser['ID']);
+}
+
+$JsonPoll = [];
+if ($ThreadInfo['NoPoll'] === 0) {
+    if (!list($Question, $Answers, $Votes, $Featured, $Closed) = $Cache->get_value("polls_$ThreadID")) {
+        $DB->query("
+        SELECT Question, Answers, Featured, Closed
+        FROM forums_polls
+          WHERE TopicID = '$ThreadID'");
+        list($Question, $Answers, $Featured, $Closed) = $DB->next_record(MYSQLI_NUM, array(1));
+        $Answers = unserialize($Answers);
+        $DB->query("
+        SELECT Vote, COUNT(UserID)
+        FROM forums_polls_votes
+          WHERE TopicID = '$ThreadID'
+        GROUP BY Vote");
+        $VoteArray = $DB->to_array(false, MYSQLI_NUM);
+
+        $Votes = [];
+        foreach ($VoteArray as $VoteSet) {
+            list($Key, $Value) = $VoteSet;
+            $Votes[$Key] = $Value;
+        }
+
+        foreach (array_keys($Answers) as $i) {
+            if (!isset($Votes[$i])) {
+                $Votes[$i] = 0;
+            }
+        }
+        $Cache->cache_value("polls_$ThreadID", array($Question, $Answers, $Votes, $Featured, $Closed), 0);
+    }
+
+    if (!empty($Votes)) {
+        $TotalVotes = array_sum($Votes);
+        $MaxVotes = max($Votes);
+    } else {
+        $TotalVotes = 0;
+        $MaxVotes = 0;
+    }
+
+    #$RevealVoters = in_array($ForumID, FORUMS_TO_REVEAL_VOTERS);
+
+    // Polls lose the you voted arrow thingy
+    $DB->query("
+    SELECT Vote
+    FROM forums_polls_votes
+      WHERE UserID = '".$LoggedUser['ID']."'
+      AND TopicID = '$ThreadID'");
+    list($UserResponse) = $DB->next_record();
+    if (!empty($UserResponse) && $UserResponse !== 0) {
+        $Answers[$UserResponse] = '&rsaquo; '.$Answers[$UserResponse];
+    } /* else {
+        if (!empty($UserResponse) && $RevealVoters) {
+            $Answers[$UserResponse] = '&rsaquo; '.$Answers[$UserResponse];
+        }
+    }
+    */
+
+    $JsonPoll['closed'] = ($Closed === 1);
+    $JsonPoll['featured'] = $Featured;
+    $JsonPoll['question'] = $Question;
+    $JsonPoll['maxVotes'] = (int)$MaxVotes;
+    $JsonPoll['totalVotes'] = $TotalVotes;
+    $JsonPollAnswers = [];
+
+    foreach ($Answers as $i => $Answer) {
+        if (!empty($Votes[$i]) && $TotalVotes > 0) {
+            $Ratio = $Votes[$i] / $MaxVotes;
+            $Percent = $Votes[$i] / $TotalVotes;
+        } else {
+            $Ratio = 0;
+            $Percent = 0;
+        }
+        $JsonPollAnswers[] = array(
+            'answer' => $Answer,
+            'ratio' => $Ratio,
+            'percent' => $Percent
+    );
+    }
+
+    if ($UserResponse !== null || $Closed || $ThreadInfo['IsLocked'] || $LoggedUser['Class'] < $Forums[$ForumID]['MinClassWrite']) {
+        $JsonPoll['voted'] = true;
+    } else {
+        $JsonPoll['voted'] = false;
+    }
+
+    $JsonPoll['answers'] = $JsonPollAnswers;
+}
+
+// Sqeeze in stickypost
+if ($ThreadInfo['StickyPostID']) {
+    if ($ThreadInfo['StickyPostID'] !== $Thread[0]['ID']) {
+        array_unshift($Thread, $ThreadInfo['StickyPost']);
+    }
+    if ($ThreadInfo['StickyPostID'] !== $Thread[count($Thread) - 1]['ID']) {
+        $Thread[] = $ThreadInfo['StickyPost'];
+    }
+}
+
+$JsonPosts = [];
+foreach ($Thread as $Key => $Post) {
+    list($PostID, $AuthorID, $AddedTime, $Body, $EditedUserID, $EditedTime) = array_values($Post);
+    list($AuthorID, $Username, $PermissionID, $Paranoia, $Artist, $Donor, $Warned, $Avatar, $Enabled, $UserTitle) = array_values(Users::user_info($AuthorID));
+
+    $UserInfo = Users::user_info($EditedUserID);
+    $JsonPosts[] = [
+    'postId' => (int)$PostID,
+    'addedTime' => $AddedTime,
+    'bbBody' => $Body,
+    'body' => Text::full_format($Body),
+    'editedUserId' => (int)$EditedUserID,
+    'editedTime' => $EditedTime,
+    'editedUsername' => $UserInfo['Username'],
+    'author' => [
+      'authorId' => (int)$AuthorID,
+      'authorName' => $Username,
+      'paranoia' => $Paranoia,
+      'artist' => $Artist === '1',
+      'donor' => $Donor === '1',
+      'warned' => (bool)$Warned,
+      'avatar' => $Avatar,
+      'enabled' => $Enabled === '2' ? false : true,
+      'userTitle' => $UserTitle
+    ]
+  ];
+}
+
+echo json_encode([
+  'status' => 'success',
+  'response' => [
+    'forumId' => (int)$ForumID,
+    'forumName' => $Forums[$ForumID]['Name'],
+    'threadId' => (int)$ThreadID,
+    'threadTitle' => display_str($ThreadInfo['Title']),
+    'subscribed' => in_array($ThreadID, $UserSubscriptions),
+    'locked' => $ThreadInfo['IsLocked'] === 1,
+    'sticky' => $ThreadInfo['IsSticky'] === 1,
+    'currentPage' => (int)$Page,
+    'pages' => ceil($ThreadInfo['Posts'] / $PerPage),
+    'poll' => empty($JsonPoll) ? null : $JsonPoll,
+    'posts' => $JsonPosts
+  ]
+]);

sections/api/get_friends.php

@@ -0,0 +1,21 @@
+<?php
+#declare(strict_types=1);
+
+$DB->query("
+SELECT
+  f.FriendID,
+  u.Username
+FROM friends AS f
+  RIGHT JOIN users_enable_recommendations AS r
+  ON r.ID = f.FriendID
+    AND r.Enable = 1
+  RIGHT JOIN users_main AS u
+  ON u.ID = f.FriendID
+WHERE f.UserID = '$LoggedUser[ID]'
+ORDER BY u.Username ASC
+");
+
+json_die('success', json_encode($DB->to_array(false, MYSQLI_ASSOC)));
+
+#echo json_encode($DB->to_array(false, MYSQLI_ASSOC));
+#die();

sections/api/get_user_notifications.php

@@ -0,0 +1,8 @@
+<?php
+#declare(strict_types=1);
+
+$Skip = [];
+$Skip[] = db_string($_GET['skip']);
+
+$NotificationsManager = new NotificationsManager($LoggedUser['ID'], $Skip);
+json_die('success', $NotificationsManager->get_notifications());

sections/api/inbox/inbox.php

@@ -0,0 +1,118 @@
+<?php
+#declare(strict_types=1);
+
+$UserID = $LoggedUser['ID'];
+
+
+if (empty($_GET['type'])) {
+  $Section = 'inbox';
+} else {
+  $Section = $_GET['type']; // either 'inbox' or 'sentbox'
+}
+if (!in_array($Section, array('inbox', 'sentbox'))) {
+  print
+    json_encode(
+      array(
+        'status' => 'failure'
+      )
+    );
+  error();
+}
+
+list($Page, $Limit) = Format::page_limit(MESSAGES_PER_PAGE);
+
+$Sort = empty($_GET['sort']) || $_GET['sort'] != "unread" ? "Date DESC" : "cu.Unread = '1' DESC, DATE DESC";
+
+$sql = "
+  SELECT
+    SQL_CALC_FOUND_ROWS
+    c.ID,
+    c.Subject,
+    cu.Unread,
+    cu.Sticky,
+    cu.ForwardedTo,
+    um2.Username AS ForwardedName,
+    cu2.UserID,
+    um.Username,
+    ui.Donor,
+    ui.Warned,
+    um.Enabled,
+    ui.Avatar,";
+$sql .= $Section === 'sentbox' ? ' cu.SentDate ' : ' cu.ReceivedDate ';
+$sql .= "AS Date
+  FROM pm_conversations AS c
+    LEFT JOIN pm_conversations_users AS cu ON cu.ConvID = c.ID AND cu.UserID = '$UserID'
+    LEFT JOIN pm_conversations_users AS cu2 ON cu2.ConvID = c.ID AND cu2.UserID != '$UserID' AND cu2.ForwardedTo = 0
+    LEFT JOIN users_main AS um ON um.ID = cu2.UserID
+    LEFT JOIN users_info AS ui ON ui.UserID = um.ID
+    LEFT JOIN users_main AS um2 ON um2.ID = cu.ForwardedTo";
+
+if (!empty($_GET['search']) && $_GET['searchtype'] === 'message') {
+  $sql .= ' JOIN pm_messages AS m ON c.ID = m.ConvID';
+}
+$sql .= " WHERE ";
+if (!empty($_GET['search'])) {
+  $Search = db_string($_GET['search']);
+  if ($_GET['searchtype'] === 'user') {
+    $sql .= "um.Username LIKE '$Search' AND ";
+  } elseif ($_GET['searchtype'] === 'subject') {
+    $Words = explode(' ', $Search);
+    $sql .= "c.Subject LIKE '%".implode("%' AND c.Subject LIKE '%", $Words)."%' AND ";
+  } elseif ($_GET['searchtype'] === 'message') {
+    $Words = explode(' ', $Search);
+    $sql .= "m.Body LIKE '%".implode("%' AND m.Body LIKE '%", $Words)."%' AND ";
+  }
+}
+$sql .= $Section === 'sentbox' ? ' cu.InSentbox' : ' cu.InInbox';
+$sql .= " = '1'";
+
+$sql .= "
+  GROUP BY c.ID
+  ORDER BY cu.Sticky, $Sort
+  LIMIT $Limit";
+$Results = $DB->query($sql);
+$DB->query('SELECT FOUND_ROWS()');
+list($NumResults) = $DB->next_record();
+$DB->set_query_id($Results);
+
+$CurURL = Format::get_url(array('sort'));
+if (empty($CurURL)) {
+  $CurURL = "inbox.php?";
+} else {
+  $CurURL = "inbox.php?".$CurURL."&";
+}
+
+$Pages = Format::get_pages($Page, $NumResults, MESSAGES_PER_PAGE, 9);
+
+$JsonMessages = [];
+while (list($ConvID, $Subject, $Unread, $Sticky, $ForwardedID, $ForwardedName, $SenderID, $Username, $Donor, $Warned, $Enabled, $Avatar, $Date) = $DB->next_record()) {
+  $JsonMessage = array(
+    'convId' => (int)$ConvID,
+    'subject' => $Subject,
+    'unread' => $Unread == 1,
+    'sticky' => $Sticky == 1,
+    'forwardedId' => (int)$ForwardedID,
+    'forwardedName' => $ForwardedName,
+    'senderId' => (int)$SenderID,
+    'username' => $Username,
+    'avatar' => $Avatar,
+    'donor' => $Donor == 1,
+    'warned' => $Warned == 1,
+    'enabled' => $Enabled == 2 ? false : true,
+    'date' => $Date
+  );
+  $JsonMessages[] = $JsonMessage;
+}
+
+print
+  json_encode(
+    array(
+      'status' => 'success',
+      'response' => array(
+        'currentPage' => (int)$Page,
+        'pages' => ceil($NumResults / MESSAGES_PER_PAGE),
+        'messages' => $JsonMessages
+      )
+    )
+  );
+?>

sections/api/inbox/index.php

@@ -0,0 +1,13 @@
+<?php
+#declare(strict_types=1);
+
+if (empty($_GET['type']) || $_GET['type'] == 'inbox' || $_GET['type'] == 'sentbox') {
+  require(SERVER_ROOT.'/sections/ajax/inbox/inbox.php');
+} elseif ($_GET['type'] == 'viewconv') {
+  require(SERVER_ROOT.'/sections/ajax/inbox/viewconv.php');
+} else {
+  echo json_encode(array('status' => 'failure'));
+  error();
+}
+
+?>

sections/api/inbox/viewconv.php

@@ -0,0 +1,106 @@
+<?
+$ConvID = $_GET['id'];
+if (!$ConvID || !is_number($ConvID)) {
+  echo json_encode(array('status' => 'failure'));
+  error();
+}
+
+
+
+$UserID = $LoggedUser['ID'];
+$DB->query("
+  SELECT InInbox, InSentbox
+  FROM pm_conversations_users
+  WHERE UserID = '$UserID'
+    AND ConvID = '$ConvID'");
+if (!$DB->has_results()) {
+  echo json_encode(array('status' => 'failure'));
+  error();
+}
+list($InInbox, $InSentbox) = $DB->next_record();
+
+
+
+
+if (!$InInbox && !$InSentbox) {
+  echo json_encode(array('status' => 'failure'));
+  error();
+}
+
+// Get information on the conversation
+$DB->query("
+  SELECT
+    c.Subject,
+    cu.Sticky,
+    cu.UnRead,
+    cu.ForwardedTo,
+    um.Username
+  FROM pm_conversations AS c
+    JOIN pm_conversations_users AS cu ON c.ID = cu.ConvID
+    LEFT JOIN users_main AS um ON um.ID = cu.ForwardedTo
+  WHERE c.ID = '$ConvID'
+    AND UserID = '$UserID'");
+list($Subject, $Sticky, $UnRead, $ForwardedID, $ForwardedName) = $DB->next_record();
+
+$DB->query("
+  SELECT um.ID, Username
+  FROM pm_messages AS pm
+    JOIN users_main AS um ON um.ID = pm.SenderID
+  WHERE pm.ConvID = '$ConvID'");
+
+while (list($PMUserID, $Username) = $DB->next_record()) {
+  $PMUserID = (int)$PMUserID;
+  $Users[$PMUserID]['UserStr'] = Users::format_username($PMUserID, true, true, true, true);
+  $Users[$PMUserID]['Username'] = $Username;
+  $UserInfo = Users::user_info($PMUserID);
+  $Users[$PMUserID]['Avatar'] = $UserInfo['Avatar'];
+}
+$Users[0]['UserStr'] = 'System'; // in case it's a message from the system
+$Users[0]['Username'] = 'System';
+$Users[0]['Avatar'] = '';
+
+if ($UnRead == '1') {
+  $DB->query("
+    UPDATE pm_conversations_users
+    SET UnRead = '0'
+    WHERE ConvID = '$ConvID'
+      AND UserID = '$UserID'");
+  // Clear the caches of the inbox and sentbox
+  $Cache->decrement("inbox_new_$UserID");
+}
+
+// Get messages
+$DB->query("
+  SELECT SentDate, SenderID, Body, ID
+  FROM pm_messages
+  WHERE ConvID = '$ConvID'
+  ORDER BY ID");
+
+$JsonMessages = [];
+while (list($SentDate, $SenderID, $Body, $MessageID) = $DB->next_record()) {
+  $Body = apcu_exists('DBKEY') ? Crypto::decrypt($Body) : '[Encrypted]';
+  $JsonMessage = array(
+    'messageId' => (int)$MessageID,
+    'senderId' => (int)$SenderID,
+    'senderName' => $Users[(int)$SenderID]['Username'],
+    'sentDate' => $SentDate,
+    'avatar' => $Users[(int)$SenderID]['Avatar'],
+    'bbBody' => $Body,
+    'body' => Text::full_format($Body)
+  );
+  $JsonMessages[] = $JsonMessage;
+}
+
+print
+  json_encode(
+    array(
+      'status' => 'success',
+      'response' => array(
+        'convId' => (int)$ConvID,
+        'subject' => $Subject.($ForwardedID > 0 ? " (Forwarded to $ForwardedName)" : ''),
+        'sticky' => $Sticky == 1,
+        'messages' => $JsonMessages
+      )
+    )
+  );
+?>

sections/api/index.php

@@ -0,0 +1,287 @@
+<?php
+declare(strict_types = 1);
+
+/**
+ * AJAX switch center
+ *
+ * This page acts as an AJAX "switch" - it's called by scripts, and it includes the required pages.
+ * The required page is determined by $_GET['action'].
+ */
+
+$ENV = ENV::go();
+
+# $_POST login cookie
+if (!isset($FullToken)) {
+    enforce_login();
+}
+
+
+/**
+ * These users aren't rate limited.
+ * This array should contain user IDs.
+ */
+
+# Get people with Donor permissions
+$Donors = $DB->query("
+SELECT
+  `ID`
+FROM
+  `users_main`
+WHERE
+  `PermissionID` = 20
+");
+
+# Add Donors to $UserExceptions or define manually
+if ($DB->record_count()) {
+    $UserExceptions = array_unique($DB->collect('ID'));
+} else {
+    $UserExceptions = array(
+      # 1, 2, 3, etc.
+    );
+}
+
+# System and admin fix
+array_push($UserExceptions, 0, 1);
+
+
+/**
+ * $AjaxLimit = array($x, $y) = $x requests every $y seconds,
+ * e.g., array(5, 10) = 5 requests every 10 seconds.
+ */
+$AjaxLimit = array(1, 6);
+$UserID = $LoggedUser['ID'];
+
+# Set proper headers for JSON output
+# https://github.com/OPSnet/Gazelle/blob/master/sections/api/index.php
+if (!empty($_SERVER['CONTENT_TYPE']) && substr($_SERVER['CONTENT_TYPE'], 0, 16) === 'application/json') {
+    $_POST = json_decode(file_get_contents('php://input'), true);
+}
+header('Content-Type: application/json; charset=utf-8');
+
+# Enforce rate limiting everywhere
+if (!in_array($UserID, $UserExceptions) && isset($_GET['action'])) {
+    if (!$UserRequests = $Cache->get_value("ajax_requests_$UserID")) {
+        $UserRequests = 0;
+        $Cache->cache_value("ajax_requests_$UserID", '0', $AjaxLimit[1]);
+    }
+
+    if ($UserRequests > $AjaxLimit[0]) {
+        json_die('failure', 'rate limit exceeded');
+    } else {
+        $Cache->increment_value("ajax_requests_$UserID");
+    }
+}
+
+
+/**
+ * Actions
+ */
+
+switch ($_GET['action']) {
+    /**
+     * Torrents
+     */
+    case 'torrent':
+      require_once "$ENV->SERVER_ROOT/sections/api/torrents/torrent.php";
+      break;
+
+    case 'group':
+      require_once "$ENV->SERVER_ROOT/sections/api/torrents/group.php";
+      break;
+
+  // So the album art script can function without breaking the rate limit
+  case 'torrentgroupalbumart':
+    require_once "$ENV->SERVER_ROOT/sections/api/torrentgroupalbumart.php";
+    break;
+
+  case 'browse':
+    require_once "$ENV->SERVER_ROOT/sections/api/browse.php";
+    break;
+  
+   case 'tcomments':
+    require_once "$ENV->SERVER_ROOT/sections/api/tcomments.php";
+    break;
+
+  /**
+   * Features
+   */
+  case 'collage':
+    require_once "$ENV->SERVER_ROOT/sections/api/collage.php";
+    break;
+  
+  case 'artist':
+    require_once "$ENV->SERVER_ROOT/sections/api/artist.php";
+    break;
+
+  case 'request':
+    require_once "$ENV->SERVER_ROOT/sections/api/request.php";
+    break;
+
+  case 'requests':
+    require_once "$ENV->SERVER_ROOT/sections/api/requests.php";
+    break;
+
+  case 'top10':
+    require_once "$ENV->SERVER_ROOT/sections/api/top10/index.php";
+    break;
+
+  /**
+   * Users
+   */
+  case 'user':
+    require_once "$ENV->SERVER_ROOT/sections/api/user.php";
+    break;
+
+  case 'usersearch':
+    require_once "$ENV->SERVER_ROOT/sections/api/usersearch.php";
+    break;
+  
+  case 'community_stats':
+    require_once "$ENV->SERVER_ROOT/sections/api/community_stats.php";
+    break;
+
+  case 'user_recents':
+    require_once "$ENV->SERVER_ROOT/sections/api/user_recents.php";
+    break;
+
+  case 'userhistory':
+    require_once "$ENV->SERVER_ROOT/sections/api/userhistory/index.php";
+    break;
+
+  /**
+   * Account
+   */
+  case 'inbox':
+    require_once "$ENV->SERVER_ROOT/sections/api/inbox/index.php";
+    break;
+
+  case 'bookmarks':
+    require_once "$ENV->SERVER_ROOT/sections/api/bookmarks/index.php";
+    break;
+
+  case 'notifications':
+    require_once "$ENV->SERVER_ROOT/sections/api/notifications.php";
+    break;
+
+  case 'get_user_notifications':
+    require_once "$ENV->SERVER_ROOT/sections/api/get_user_notifications.php";
+    break;
+
+  case 'clear_user_notification':
+    require_once "$ENV->SERVER_ROOT/sections/api/clear_user_notification.php";
+    break;
+
+  /**
+   * Forums
+   */
+  case 'forum':
+    require_once "$ENV->SERVER_ROOT/sections/api/forum/index.php";
+    break;
+
+  case 'subscriptions':
+    require_once "$ENV->SERVER_ROOT/sections/api/subscriptions.php";
+    break;
+
+  case 'raw_bbcode':
+    require_once "$ENV->SERVER_ROOT/sections/api/raw_bbcode.php";
+    break;
+
+  /**
+   * Meta
+   */
+  case 'index':
+    require_once "$ENV->SERVER_ROOT/sections/api/info.php";
+    break;
+
+  case 'manifest':
+    require_once "$ENV->SERVER_ROOT/manifest.php";
+    json_die('success', manifest());
+    break;
+
+  case 'stats':
+    require_once "$ENV->SERVER_ROOT/sections/api/stats.php";
+    break;
+
+  case 'loadavg':
+    require_once "$ENV->SERVER_ROOT/sections/api/loadavg.php";
+    break;
+
+  case 'announcements':
+    require_once "$ENV->SERVER_ROOT/sections/api/announcements.php";
+    break;
+
+  case 'wiki':
+    require_once "$ENV->SERVER_ROOT/sections/api/wiki.php";
+    break;
+  
+  case 'ontology':
+    require_once "$ENV->SERVER_ROOT/sections/api/ontology.php";
+    break;
+  
+  /**
+   * Under construction
+   */
+  case 'preview':
+    require_once "$ENV->SERVER_ROOT/sections/api/preview.php";
+    break;
+
+  case 'better':
+    require_once "$ENV->SERVER_ROOT/sections/api/better/index.php";
+    break;
+
+  case 'get_friends':
+    require_once "$ENV->SERVER_ROOT/sections/api/get_friends.php";
+    break;
+
+  case 'news_ajax':
+    require_once "$ENV->SERVER_ROOT/sections/api/news_ajax.php";
+    break;
+
+  case 'send_recommendation':
+    require_once "$ENV->SERVER_ROOT/sections/api/send_recommendation.php";
+    break;
+
+  /*
+  case 'similar_artists':
+    require_once "$ENV->SERVER_ROOT/sections/api/similar_artists.php";
+    break;
+  */
+
+  /*
+  case 'votefavorite':
+    require_once "$ENV->SERVER_ROOT/sections/api/takevote.php";
+    break;
+  */
+
+  /*
+  case 'torrent_info':
+    require_once "$ENV->SERVER_ROOT/sections/api/torrent_info.php";
+    break;
+  */
+
+  /*
+  case 'checkprivate':
+    include "$ENV->SERVER_ROOT/sections/api/checkprivate.php";
+    break;
+  */
+
+  case 'autofill':
+    /*
+    if ($_GET['cat'] === 'anime') {
+        require_once "$ENV->SERVER_ROOT/sections/api/autofill/anime.php";
+    }
+
+    if ($_GET['cat'] === 'jav') {
+        require_once "$ENV->SERVER_ROOT/sections/api/autofill/jav.php";
+    }
+
+    if ($_GET['cat'] === 'manga') {
+        require_once "$ENV->SERVER_ROOT/sections/api/autofill/manga.php";
+    }
+    */
+    break;
+
+  default:
+    // If they're screwing around with the query string
+    json_die('failure');
+}

sections/api/info.php

@@ -0,0 +1,117 @@
+<?
+//calculate ratio
+//returns 0 for DNE and -1 for infinity, because we don't want strings being returned for a numeric value in our java
+$Ratio = 0;
+if ($LoggedUser['BytesUploaded'] == 0 && $LoggedUser['BytesDownloaded'] == 0) {
+  $Ratio = 0;
+} elseif ($LoggedUser['BytesDownloaded'] == 0) {
+  $Ratio = -1;
+} else {
+  $Ratio = number_format(max($LoggedUser['BytesUploaded'] / $LoggedUser['BytesDownloaded'] - 0.005, 0), 2); //Subtract .005 to floor to 2 decimals
+}
+
+$MyNews = $LoggedUser['LastReadNews'];
+$CurrentNews = $Cache->get_value('news_latest_id');
+if ($CurrentNews === false) {
+  $DB->query("
+    SELECT ID
+    FROM news
+    ORDER BY Time DESC
+    LIMIT 1");
+  if ($DB->record_count() === 1) {
+    list($CurrentNews) = $DB->next_record();
+  } else {
+    $CurrentNews = -1;
+  }
+  $Cache->cache_value('news_latest_id', $CurrentNews, 0);
+}
+
+$NewMessages = $Cache->get_value('inbox_new_' . $LoggedUser['ID']);
+if ($NewMessages === false) {
+  $DB->query("
+    SELECT COUNT(UnRead)
+    FROM pm_conversations_users
+    WHERE UserID = '" . $LoggedUser['ID'] . "'
+      AND UnRead = '1'
+      AND InInbox = '1'");
+  list($NewMessages) = $DB->next_record();
+  $Cache->cache_value('inbox_new_' . $LoggedUser['ID'], $NewMessages, 0);
+}
+
+if (check_perms('site_torrents_notify')) {
+  $NewNotifications = $Cache->get_value('notifications_new_' . $LoggedUser['ID']);
+  if ($NewNotifications === false) {
+    $DB->query("
+      SELECT COUNT(UserID)
+      FROM users_notify_torrents
+      WHERE UserID = '$LoggedUser[ID]'
+        AND UnRead = '1'");
+    list($NewNotifications) = $DB->next_record();
+    /* if ($NewNotifications && !check_perms('site_torrents_notify')) {
+        $DB->query("DELETE FROM users_notify_torrents WHERE UserID='$LoggedUser[ID]'");
+        $DB->query("DELETE FROM users_notify_filters WHERE UserID='$LoggedUser[ID]'");
+    } */
+    $Cache->cache_value('notifications_new_' . $LoggedUser['ID'], $NewNotifications, 0);
+  }
+}
+
+// News
+$MyNews = $LoggedUser['LastReadNews'];
+$CurrentNews = $Cache->get_value('news_latest_id');
+if ($CurrentNews === false) {
+  $DB->query("
+    SELECT ID
+    FROM news
+    ORDER BY Time DESC
+    LIMIT 1");
+  if ($DB->record_count() === 1) {
+    list($CurrentNews) = $DB->next_record();
+  } else {
+    $CurrentNews = -1;
+  }
+  $Cache->cache_value('news_latest_id', $CurrentNews, 0);
+}
+
+// Blog
+$MyBlog = $LoggedUser['LastReadBlog'];
+$CurrentBlog = $Cache->get_value('blog_latest_id');
+if ($CurrentBlog === false) {
+  $DB->query("
+    SELECT ID
+    FROM blog
+    WHERE Important = 1
+    ORDER BY Time DESC
+    LIMIT 1");
+  if ($DB->record_count() === 1) {
+    list($CurrentBlog) = $DB->next_record();
+  } else {
+    $CurrentBlog = -1;
+  }
+  $Cache->cache_value('blog_latest_id', $CurrentBlog, 0);
+}
+
+// Subscriptions
+$NewSubscriptions = Subscriptions::has_new_subscriptions();
+
+json_die("success", array(
+  'username' => $LoggedUser['Username'],
+  'id' => (int)$LoggedUser['ID'],
+  'authkey' => $LoggedUser['AuthKey'],
+  'passkey' => $LoggedUser['torrent_pass'],
+  'notifications' => array(
+    'messages' => (int)$NewMessages,
+    'notifications' => (int)$NewNotifications,
+    'newAnnouncement' => $MyNews < $CurrentNews,
+    'newBlog' => $MyBlog < $CurrentBlog,
+    'newSubscriptions' => $NewSubscriptions == 1
+  ),
+  'userstats' => array(
+    'uploaded' => (int)$LoggedUser['BytesUploaded'],
+    'downloaded' => (int)$LoggedUser['BytesDownloaded'],
+    'ratio' => (float)$Ratio,
+    'requiredratio' => (float)$LoggedUser['RequiredRatio'],
+    'class' => $ClassLevels[$LoggedUser['Class']]['Name']
+  )
+));
+
+?>

sections/api/loadavg.php

@@ -0,0 +1,14 @@
+<?php
+declare(strict_types=1);
+
+#authorize();
+
+print
+  json_encode(
+      array(
+        'status' => 'success',
+        'response' => array(
+          'loadAverage' => sys_getloadavg()
+        )
+      )
+  );

sections/api/news_ajax.php

@@ -0,0 +1,42 @@
+<?php
+#declare(strict_types=1);
+
+// Don't allow bigger queries than specified below regardless of called function
+$SizeLimit = 10;
+
+$Count = (int)$_GET['count'];
+$Offset = (int)$_GET['offset'];
+
+if (!isset($_GET['count']) || !isset($_GET['offset']) || $Count <= 0 || $Offset < 0 || $Count > $SizeLimit) {
+    json_die('failure');
+}
+
+Text::$TOC = true;
+
+global $DB;
+$DB->query("
+    SELECT
+      ID,
+      Title,
+      Body,
+      Time
+    FROM news
+    ORDER BY Time DESC
+    LIMIT $Offset, $Count");
+$News = $DB->to_array(false, MYSQLI_NUM, false);
+
+$NewsResponse = [];
+foreach ($News as $NewsItem) {
+    list($NewsID, $Title, $Body, $NewsTime) = $NewsItem;
+    array_push(
+        $NewsResponse,
+        array(
+      $NewsID,
+      Text::full_format($Title),
+      time_diff($NewsTime),
+      Text::full_format($Body)
+    )
+    );
+}
+
+json_die('success', json_encode($NewsResponse));

sections/api/notifications.php

@@ -0,0 +1,110 @@
+<?php
+#declare(strict_types=1);
+
+# todo: Go through line by line
+if (!check_perms('site_torrents_notify')) {
+    json_die('failure');
+}
+
+define('NOTIFICATIONS_PER_PAGE', 50);
+list($Page, $Limit) = Format::page_limit(NOTIFICATIONS_PER_PAGE);
+
+$Results = $DB->query("
+    SELECT
+      SQL_CALC_FOUND_ROWS
+      unt.TorrentID,
+      unt.UnRead,
+      unt.FilterID,
+      unf.Label,
+      t.GroupID
+    FROM users_notify_torrents AS unt
+      JOIN torrents AS t ON t.ID = unt.TorrentID
+      LEFT JOIN users_notify_filters AS unf ON unf.ID = unt.FilterID
+    WHERE unt.UserID = $LoggedUser[ID]".
+    ((!empty($_GET['filterid']) && is_number($_GET['filterid']))
+      ? " AND unf.ID = '$_GET[filterid]'"
+      : '')."
+    ORDER BY TorrentID DESC
+    LIMIT $Limit");
+$GroupIDs = array_unique($DB->collect('GroupID'));
+
+$DB->query('SELECT FOUND_ROWS()');
+list($TorrentCount) = $DB->next_record();
+
+if (count($GroupIDs)) {
+    $TorrentGroups = Torrents::get_groups($GroupIDs);
+    $DB->query("
+    UPDATE users_notify_torrents
+    SET UnRead = '0'
+    WHERE UserID = $LoggedUser[ID]");
+    $Cache->delete_value("notifications_new_$LoggedUser[ID]");
+}
+
+$DB->set_query_id($Results);
+
+$JsonNotifications = [];
+$NumNew = 0;
+
+$FilterGroups = [];
+while ($Result = $DB->next_record(MYSQLI_ASSOC)) {
+    if (!$Result['FilterID']) {
+        $Result['FilterID'] = 0;
+    }
+    if (!isset($FilterGroups[$Result['FilterID']])) {
+        $FilterGroups[$Result['FilterID']] = [];
+        $FilterGroups[$Result['FilterID']]['FilterLabel'] = ($Result['Label'] ? $Result['Label'] : false);
+    }
+    array_push($FilterGroups[$Result['FilterID']], $Result);
+}
+unset($Result);
+
+foreach ($FilterGroups as $FilterID => $FilterResults) {
+    unset($FilterResults['FilterLabel']);
+    foreach ($FilterResults as $Result) {
+        $TorrentID = $Result['TorrentID'];
+//    $GroupID = $Result['GroupID'];
+
+        $GroupInfo = $TorrentGroups[$Result['GroupID']];
+        extract(Torrents::array_group($GroupInfo)); // all group data
+        $TorrentInfo = $GroupInfo['Torrents'][$TorrentID];
+
+        if ($Result['UnRead'] == 1) {
+            $NumNew++;
+        }
+
+        $JsonNotifications[] = array(
+      'torrentId' => (int)$TorrentID,
+      'groupId' => (int)$GroupID,
+      'groupName' => $GroupName,
+      'groupCategoryId' => (int)$GroupCategoryID,
+      'wikiImage' => $WikiImage,
+      'torrentTags' => $TagList,
+      'size' => (float)$TorrentInfo['Size'],
+      'fileCount' => (int)$TorrentInfo['FileCount'],
+      'format' => $TorrentInfo['Format'],
+      'encoding' => $TorrentInfo['Encoding'],
+      'media' => $TorrentInfo['Media'],
+      'scene' => $TorrentInfo['Scene'] == 1,
+      'groupYear' => (int)$GroupYear,
+      'remasterYear' => (int)$TorrentInfo['RemasterYear'],
+      'remasterTitle' => $TorrentInfo['RemasterTitle'],
+      'snatched' => (int)$TorrentInfo['Snatched'],
+      'seeders' => (int)$TorrentInfo['Seeders'],
+      'leechers' => (int)$TorrentInfo['Leechers'],
+      'notificationTime' => $TorrentInfo['Time'],
+      'hasLog' => $TorrentInfo['HasLog'] == 1,
+      'hasCue' => $TorrentInfo['HasCue'] == 1,
+      'logScore' => (float)$TorrentInfo['LogScore'],
+      'freeTorrent' => $TorrentInfo['FreeTorrent'] == 1,
+      'logInDb' => $TorrentInfo['HasLog'] == 1,
+      'unread' => $Result['UnRead'] == 1
+    );
+    }
+}
+
+json_die('success', array(
+  'currentPages' => intval($Page),
+  'pages' => ceil($TorrentCount / NOTIFICATIONS_PER_PAGE),
+  'numNew' => $NumNew,
+  'results' => $JsonNotifications
+));

sections/api/ontology.php

@@ -0,0 +1,12 @@
+<?php
+declare(strict_types = 1);
+
+# Quick proof-of-concept
+$ENV = ENV::go();
+print
+  json_encode(
+      array(
+        'status' => 'success',
+        'response' => $ENV->CATS
+      )
+  );

sections/api/preview.php

@@ -0,0 +1,12 @@
+<?php
+#declare(strict_types=1);
+
+/* AJAX previews, simple stuff */
+Text::$TOC = true;
+
+if (!empty($_POST['AdminComment'])) {
+    echo Text::full_format($_POST['AdminComment']);
+} else {
+    $Content = $_REQUEST['body']; // Don't use URL decode
+    echo Text::full_format($Content);
+}

sections/api/raw_bbcode.php

@@ -0,0 +1,32 @@
+<?php
+#declare(strict_types=1);
+
+$PostID = (int) $_GET['postid'];
+
+if (empty($PostID)) {
+    json_die('error', 'empty postid');
+}
+
+$DB->query("
+SELECT
+  t.`ForumID`,
+  p.`Body`
+FROM
+  `forums_posts` AS p
+JOIN `forums_topics` AS t
+ON
+  p.`TopicID` = t.`ID`
+WHERE
+  p.`ID` = '$PostID'
+");
+
+if (!$DB->has_results()) {
+    json_die('error', 'no results');
+}
+
+list($ForumID, $Body) = $DB->next_record();
+if (!Forums::check_forumperm($ForumID)) {
+    json_die('error', 'assholes');
+}
+
+json_die('success', array('body' => nl2br($Body)));

sections/api/request.php

@@ -0,0 +1,119 @@
+<?php
+#declare(strict_types=1);
+
+$RequestTax = 0.1;
+
+// Minimum and default amount of upload to remove from the user when they vote.
+// Also change in static/functions/requests.js
+$MinimumVote = 20 * 1024 * 1024;
+
+/*
+ * This is the page that displays the request to the end user after being created.
+ */
+
+if (empty($_GET['id']) || !is_number($_GET['id'])) {
+    json_die("failure");
+}
+
+$RequestID = (int)$_GET['id'];
+
+//First things first, lets get the data for the request.
+
+$Request = Requests::get_request($RequestID);
+if ($Request === false) {
+    json_die("failure");
+}
+
+$CategoryID = $Request['CategoryID'];
+$Requestor = Users::user_info($Request['UserID']);
+$Filler = $Request['FillerID'] ? Users::user_info($Request['FillerID']) : null;
+//Convenience variables
+$IsFilled = !empty($Request['TorrentID']);
+$CanVote = !$IsFilled && check_perms('site_vote');
+
+if ($CategoryID == 0) {
+    $CategoryName = 'Unknown';
+} else {
+    $CategoryName = $Categories[$CategoryID - 1];
+}
+
+$JsonArtists = Requests::get_artists($RequestID);
+
+//Votes time
+$RequestVotes = Requests::get_votes_array($RequestID);
+$VoteCount = count($RequestVotes['Voters']);
+$ProjectCanEdit = (check_perms('project_team') && !$IsFilled && (($CategoryID == 0) || ($CategoryName == 'Music' && $Request['Year'] == 0)));
+$UserCanEdit = (!$IsFilled && $LoggedUser['ID'] == $Request['UserID'] && $VoteCount < 2);
+$CanEdit = ($UserCanEdit || $ProjectCanEdit || check_perms('site_moderate_requests'));
+
+$JsonTopContributors = [];
+$VoteMax = ($VoteCount < 5 ? $VoteCount : 5);
+for ($i = 0; $i < $VoteMax; $i++) {
+    $User = array_shift($RequestVotes['Voters']);
+    $JsonTopContributors[] = array(
+    'userId'   => (int)$User['UserID'],
+    'userName' => $User['Username'],
+    'bounty'   => (int)$User['Bounty']
+  );
+}
+reset($RequestVotes['Voters']);
+
+list($NumComments, $Page, $Thread) = Comments::load('requests', $RequestID, false);
+
+$JsonRequestComments = [];
+foreach ($Thread as $Key => $Post) {
+    list($PostID, $AuthorID, $AddedTime, $Body, $EditedUserID, $EditedTime, $EditedUsername) = array_values($Post);
+    list($AuthorID, $Username, $PermissionID, $Paranoia, $Artist, $Donor, $Warned, $Avatar, $Enabled, $UserTitle) = array_values(Users::user_info($AuthorID));
+    $JsonRequestComments[] = array(
+    'postId'          => (int)$PostID,
+    'authorId'        => (int)$AuthorID,
+    'name'            => $Username,
+    'donor'           => ($Donor == 1),
+    'warned'          => (bool)$Warned,
+    'enabled'         => ($Enabled == 2 ? false : true),
+    'class'           => Users::make_class_string($PermissionID),
+    'addedTime'       => $AddedTime,
+    'avatar'          => $Avatar,
+    'comment'         => Text::full_format($Body),
+    'editedUserId'    => (int)$EditedUserID,
+    'editedUsername'  => $EditedUsername,
+    'editedTime'      => $EditedTime
+  );
+}
+
+$JsonTags = [];
+foreach ($Request['Tags'] as $Tag) {
+    $JsonTags[] = $Tag;
+}
+json_die('success', array(
+  'requestId'       => (int)$RequestID,
+  'requestorId'     => (int)$Request['UserID'],
+  'requestorName'   => $Requestor['Username'],
+  'isBookmarked'    => Bookmarks::has_bookmarked('request', $RequestID),
+  'requestTax'      => (float)$RequestTax,
+  'timeAdded'       => $Request['TimeAdded'],
+  'canEdit'         => (bool)$CanEdit,
+  'canVote'         => (bool)$CanVote,
+  'minimumVote'     => (int)$MinimumVote,
+  'voteCount'       => (int)$VoteCount,
+  'lastVote'        => $Request['LastVote'],
+  'topContributors' => $JsonTopContributors,
+  'totalBounty'     => (int)$RequestVotes['TotalBounty'],
+  'categoryId'      => (int)$CategoryID,
+  'categoryName'    => $CategoryName,
+  'title'           => $Request['Title'],
+  'year'            => (int)$Request['Year'],
+  'image'           => $Request['Image'],
+  'bbDescription'   => $Request['Description'],
+  'description'     => Text::full_format($Request['Description']),
+  'artists'         => $JsonArtists,
+  'isFilled'        => (bool)$IsFilled,
+  'fillerId'        => (int)$Request['FillerID'],
+  'fillerName'      => $Filler ? $Filler['Username'] : '',
+  'torrentId'       => (int)$Request['TorrentID'],
+  'timeFilled'      => $Request['TimeFilled'],
+  'tags'            => $JsonTags,
+  'comments'        => $JsonRequestComments,
+  'commentPage'     => (int)$Page,
+  'commentPages'    => (int)ceil($NumComments / TORRENT_COMMENTS_PER_PAGE)
+));

sections/api/requests.php

@@ -0,0 +1,369 @@
+<?php
+#declare(strict_types=1);
+
+# todo: Go through line by line
+$SphQL = new SphinxqlQuery();
+$SphQL->select('id, votes, bounty')->from('requests, requests_delta');
+
+$SortOrders = array(
+  'votes' => 'votes',
+  'bounty' => 'bounty',
+  'lastvote' => 'lastvote',
+  'filled' => 'timefilled',
+  'year' => 'year',
+  'created' => 'timeadded',
+  'random' => false);
+
+if (empty($_GET['order']) || !isset($SortOrders[$_GET['order']])) {
+    $_GET['order'] = 'created';
+}
+$OrderBy = $_GET['order'];
+
+if (!empty($_GET['sort']) && $_GET['sort'] === 'asc') {
+    $OrderWay = 'asc';
+} else {
+    $_GET['sort'] = 'desc';
+    $OrderWay = 'desc';
+}
+$NewSort = $_GET['sort'] === 'asc' ? 'desc' : 'asc';
+
+if ($OrderBy === 'random') {
+    $SphQL->order_by('RAND()', '');
+    unset($_GET['page']);
+} else {
+    $SphQL->order_by($SortOrders[$OrderBy], $OrderWay);
+}
+
+$Submitted = !empty($_GET['submit']);
+
+//Paranoia
+if (!empty($_GET['userid'])) {
+    if (!is_number($_GET['userid'])) {
+        json_die("failure");
+    }
+    $UserInfo = Users::user_info($_GET['userid']);
+    if (empty($UserInfo)) {
+        json_die("failure");
+    }
+    $Perms = Permissions::get_permissions($UserInfo['PermissionID']);
+    $UserClass = $Perms['Class'];
+}
+$BookmarkView = false;
+
+if (empty($_GET['type'])) {
+    $Title = 'Requests';
+    if (empty($_GET['showall'])) {
+        $SphQL->where('visible', 1);
+    }
+} else {
+    switch ($_GET['type']) {
+    case 'created':
+      if (!empty($UserInfo)) {
+          if (!check_paranoia('requestsvoted_list', $UserInfo['Paranoia'], $Perms['Class'], $UserInfo['ID'])) {
+              json_die("failure");
+          }
+          $Title = "Requests created by $UserInfo[Username]";
+          $SphQL->where('userid', $UserInfo['ID']);
+      } else {
+          $Title = 'My requests';
+          $SphQL->where('userid', $LoggedUser['ID']);
+      }
+      break;
+    case 'voted':
+      if (!empty($UserInfo)) {
+          if (!check_paranoia('requestsvoted_list', $UserInfo['Paranoia'], $Perms['Class'], $UserInfo['ID'])) {
+              json_die("failure");
+          }
+          $Title = "Requests voted for by $UserInfo[Username]";
+          $SphQL->where('voter', $UserInfo['ID']);
+      } else {
+          $Title = 'Requests I have voted on';
+          $SphQL->where('voter', $LoggedUser['ID']);
+      }
+      break;
+    case 'filled':
+      if (!empty($UserInfo)) {
+          if (!check_paranoia('requestsfilled_list', $UserInfo['Paranoia'], $Perms['Class'], $UserInfo['ID'])) {
+              json_die("failure");
+          }
+          $Title = "Requests filled by $UserInfo[Username]";
+          $SphQL->where('fillerid', $UserInfo['ID']);
+      } else {
+          $Title = 'Requests I have filled';
+          $SphQL->where('fillerid', $LoggedUser['ID']);
+      }
+      break;
+    case 'bookmarks':
+      $Title = 'Your bookmarked requests';
+      $BookmarkView = true;
+      $SphQL->where('bookmarker', $LoggedUser['ID']);
+      break;
+    default:
+      json_die("failure");
+  }
+}
+
+if ($Submitted && empty($_GET['show_filled'])) {
+    $SphQL->where('torrentid', 0);
+}
+
+if (!empty($_GET['formats'])) {
+    $FormatArray = $_GET['formats'];
+    if (count($FormatArray) !== count($Formats)) {
+        $FormatNameArray = [];
+        foreach ($FormatArray as $Index => $MasterIndex) {
+            if (isset($Formats[$MasterIndex])) {
+                $FormatNameArray[$Index] = '"' . strtr(Sphinxql::sph_escape_string($Formats[$MasterIndex]), '-.', '  ') . '"';
+            }
+        }
+        if (count($FormatNameArray) >= 1) {
+            if (!empty($_GET['formats_strict'])) {
+                $SearchString = '(' . implode(' | ', $FormatNameArray) . ')';
+            } else {
+                $SearchString = '(any | ' . implode(' | ', $FormatNameArray) . ')';
+            }
+            $SphQL->where_match($SearchString, 'formatlist', false);
+        }
+    }
+}
+
+if (!empty($_GET['media'])) {
+    $MediaArray = $_GET['media'];
+    if (count($MediaArray) !== count($Media)) {
+        $MediaNameArray = [];
+        foreach ($MediaArray as $Index => $MasterIndex) {
+            if (isset($Media[$MasterIndex])) {
+                $MediaNameArray[$Index] = '"' . strtr(Sphinxql::sph_escape_string($Media[$MasterIndex]), '-.', '  ') . '"';
+            }
+        }
+
+        if (count($MediaNameArray) >= 1) {
+            if (!empty($_GET['media_strict'])) {
+                $SearchString = '(' . implode(' | ', $MediaNameArray) . ')';
+            } else {
+                $SearchString = '(any | ' . implode(' | ', $MediaNameArray) . ')';
+            }
+            $SphQL->where_match($SearchString, 'medialist', false);
+        }
+    }
+}
+
+if (!empty($_GET['bitrates'])) {
+    $BitrateArray = $_GET['bitrates'];
+    if (count($BitrateArray) !== count($Bitrates)) {
+        $BitrateNameArray = [];
+        foreach ($BitrateArray as $Index => $MasterIndex) {
+            if (isset($Bitrates[$MasterIndex])) {
+                $BitrateNameArray[$Index] = '"' . strtr(Sphinxql::sph_escape_string($Bitrates[$MasterIndex]), '-.', '  ') . '"';
+            }
+        }
+
+        if (count($BitrateNameArray) >= 1) {
+            if (!empty($_GET['bitrate_strict'])) {
+                $SearchString = '(' . implode(' | ', $BitrateNameArray) . ')';
+            } else {
+                $SearchString = '(any | ' . implode(' | ', $BitrateNameArray) . ')';
+            }
+            $SphQL->where_match($SearchString, 'bitratelist', false);
+        }
+    }
+}
+
+if (!empty($_GET['search'])) {
+    $SearchString = trim($_GET['search']);
+    if ($SearchString !== '') {
+        $SearchWords = array('include' => [], 'exclude' => []);
+        $Words = explode(' ', $SearchString);
+        foreach ($Words as $Word) {
+            $Word = trim($Word);
+            // Skip isolated hyphens to enable "Artist - Title" searches
+            if ($Word === '-') {
+                continue;
+            }
+            if ($Word[0] === '!' && strlen($Word) >= 2) {
+                if (strpos($Word, '!', 1) === false) {
+                    $SearchWords['exclude'][] = $Word;
+                } else {
+                    $SearchWords['include'][] = $Word;
+                }
+            } elseif ($Word !== '') {
+                $SearchWords['include'][] = $Word;
+            }
+        }
+    }
+}
+
+if (!isset($_GET['tags_type']) || $_GET['tags_type'] === '1') {
+    $TagType = 1;
+    $_GET['tags_type'] = '1';
+} else {
+    $TagType = 0;
+    $_GET['tags_type'] = '0';
+}
+if (!empty($_GET['tags'])) {
+    $SearchTags = array('include' => [], 'exclude' => []);
+    $Tags = explode(',', $_GET['tags']);
+    foreach ($Tags as $Tag) {
+        $Tag = trim($Tag);
+        if ($Tag[0] === '!' && strlen($Tag) >= 2) {
+            if (strpos($Tag, '!', 1) === false) {
+                $SearchTags['exclude'][] = $Tag;
+            } else {
+                $SearchTags['include'][] = $Tag;
+            }
+        } elseif ($Tag !== '') {
+            $SearchTags['include'][] = $Tag;
+        }
+    }
+
+    $TagFilter = Tags::tag_filter_sph($SearchTags, $TagType);
+
+    if (!empty($TagFilter['predicate'])) {
+        $SphQL->where_match($TagFilter['predicate'], 'taglist', false);
+    }
+} elseif (!isset($_GET['tags_type']) || $_GET['tags_type'] !== '0') {
+    $_GET['tags_type'] = 1;
+} else {
+    $_GET['tags_type'] = 0;
+}
+
+if (isset($SearchWords)) {
+    $QueryParts = [];
+    foreach ($SearchWords['include'] as $Word) {
+        $QueryParts[] = Sphinxql::sph_escape_string($Word);
+    }
+    if (!empty($SearchWords['exclude'])) {
+        foreach ($SearchWords['exclude'] as $Word) {
+            $QueryParts[] = '!' . Sphinxql::sph_escape_string(substr($Word, 1));
+        }
+    }
+    if (!empty($QueryParts)) {
+        $SearchString = implode(' ', $QueryParts);
+        $SphQL->where_match($SearchString, '*', false);
+    }
+}
+
+if (!empty($_GET['filter_cat'])) {
+    $CategoryArray = array_keys($_GET['filter_cat']);
+    if (count($CategoryArray) !== count($Categories)) {
+        foreach ($CategoryArray as $Key => $Index) {
+            if (!isset($Categories[$Index - 1])) {
+                unset($CategoryArray[$Key]);
+            }
+        }
+        if (count($CategoryArray) >= 1) {
+            $SphQL->where('categoryid', $CategoryArray);
+        }
+    }
+}
+
+if (!empty($_GET['releases'])) {
+    $ReleaseArray = $_GET['releases'];
+    if (count($ReleaseArray) !== count($ReleaseTypes)) {
+        foreach ($ReleaseArray as $Index => $Value) {
+            if (!isset($ReleaseTypes[$Value])) {
+                unset($ReleaseArray[$Index]);
+            }
+        }
+        if (count($ReleaseArray) >= 1) {
+            $SphQL->where('releasetype', $ReleaseArray);
+        }
+    }
+}
+
+if (!empty($_GET['requestor'])) {
+    if (is_number($_GET['requestor'])) {
+        $SphQL->where('userid', $_GET['requestor']);
+    } else {
+        error(404);
+    }
+}
+
+if (isset($_GET['year'])) {
+    if (is_number($_GET['year']) || $_GET['year'] === '0') {
+        $SphQL->where('year', $_GET['year']);
+    } else {
+        error(404);
+    }
+}
+
+if (!empty($_GET['page']) && is_number($_GET['page']) && $_GET['page'] > 0) {
+    $Page = $_GET['page'];
+    $Offset = ($Page - 1) * REQUESTS_PER_PAGE;
+    $SphQL->limit($Offset, REQUESTS_PER_PAGE, $Offset + REQUESTS_PER_PAGE);
+} else {
+    $Page = 1;
+    $SphQL->limit(0, REQUESTS_PER_PAGE, REQUESTS_PER_PAGE);
+}
+
+$SphQLResult = $SphQL->query();
+$NumResults = (int)$SphQLResult->get_meta('total_found');
+if ($NumResults > 0) {
+    $SphRequests = $SphQLResult->to_array('id');
+    if ($OrderBy === 'random') {
+        $NumResults = count($RequestIDs);
+    }
+    if ($NumResults > REQUESTS_PER_PAGE) {
+        if (($Page - 1) * REQUESTS_PER_PAGE > $NumResults) {
+            $Page = 0;
+        }
+    }
+}
+
+if ($NumResults == 0) {
+    json_die("success", array(
+    'currentPage' => 1,
+    'pages'       => 1,
+    'results'     => []
+  ));
+} else {
+    $JsonResults = [];
+    $Requests = Requests::get_requests(array_keys($SphRequests));
+    foreach ($SphRequests as $RequestID => $SphRequest) {
+        $Request = $Requests[$RequestID];
+        $VoteCount = $SphRequest['votes'];
+        $Bounty = $SphRequest['bounty'] * 1024; // Sphinx stores bounty in kB
+        $Requestor = Users::user_info($Request['UserID']);
+        $Filler = $Request['FillerID'] ? Users::user_info($Request['FillerID']) : null;
+
+        if ($Request['CategoryID'] == 0) {
+            $CategoryName = 'Unknown';
+        } else {
+            $CategoryName = $Categories[$Request['CategoryID'] - 1];
+        }
+
+        $JsonArtists = Requests::get_artists($RequestID);
+
+        $Tags = $Request['Tags'];
+
+        $JsonResults[] = array(
+      'requestId'     => (int)$RequestID,
+      'requestorId'   => (int)$Requestor['ID'],
+      'requestorName' => $Requestor['Username'],
+      'timeAdded'     => $Request['TimeAdded'],
+      'lastVote'      => $Request['LastVote'],
+      'voteCount'     => (int)$VoteCount,
+      'bounty'        => (int)$Bounty,
+      'categoryId'    => (int)$Request['CategoryID'],
+      'categoryName'  => $CategoryName,
+      'authors'       => $JsonArtists,
+      #'artists'       => $JsonArtists,
+      'title'         => $Request['Title'],
+      'year'          => (int)$Request['Year'],
+      'picture'         => $Request['Image'],
+      #'image'         => $Request['Image'],
+      'description'   => $Request['Description'],
+      'isFilled'      => ($Request['TorrentID'] > 0),
+      'fillerId'      => (int)$Request['FillerID'],
+      'fillerName'    => $Filler ? $Filler['Username'] : '',
+      'torrentId'     => (int)$Request['TorrentID'],
+      'timeFilled'    => $Request['TimeFilled'] == 0 ? '' : $Request['TimeFilled']
+    );
+    }
+
+    json_die("success", array(
+    'currentPage' => intval($Page),
+    'pages'       => ceil($NumResults / REQUESTS_PER_PAGE),
+    'results'     => $JsonResults
+  ));
+}

sections/api/send_recommendation.php

@@ -0,0 +1,90 @@
+<?php
+#declare(strict_types=1);
+
+$FriendID = (int) $_POST['friend'];
+$Type = $_POST['type'];
+$ID = (int) $_POST['id'];
+$Note = $_POST['note'];
+
+if (empty($FriendID) || empty($Type) || empty($ID)) {
+    echo json_encode(array('status' => 'error', 'response' => 'Error.'));
+    error();
+}
+
+// Make sure the recipient is on your friends list and not some random dude.
+$DB->query("
+SELECT
+  f.`FriendID`,
+  u.`Username`
+FROM
+  `friends` AS f
+RIGHT JOIN `users_enable_recommendations` AS r
+ON
+  r.`ID` = f.`FriendID` AND r.`Enable` = 1
+RIGHT JOIN `users_main` AS u
+ON
+  u.`ID` = f.`FriendID`
+WHERE
+  f.`UserID` = '$LoggedUser[ID]' AND f.`FriendID` = '$FriendID'
+");
+
+if (!$DB->has_results()) {
+    echo json_encode(array('status' => 'error', 'response' => 'Not on friend list.'));
+    error();
+}
+
+$Type = strtolower($Type);
+$Link = '';
+// "a" vs "an", english language is so confusing.
+// https://en.wikipedia.org/wiki/English_articles#Distinction_between_a_and_an
+$Article = 'a';
+switch ($Type) {
+    case 'torrent':
+    $Link = "torrents.php?id=$ID";
+    $DB->query("
+    SELECT
+      `title`
+    FROM
+      `torrents_group`
+    WHERE
+      `id` = '$ID'
+    ");
+      break;
+
+    case 'artist':
+    $Article = 'an';
+    $Link = "artist.php?id=$ID";
+    $DB->query("
+    SELECT
+      `Name`
+    FROM
+      `artists_group`
+    WHERE
+      `ArtistID` = '$ID'
+    ");
+    break;
+
+    case 'collage':
+    $Link = "collages.php?id=$ID";
+    $DB->query("
+    SELECT
+      `Name`
+    FROM
+      `collages`
+    WHERE
+      `ID` = '$ID'
+    ");
+    break;
+}
+
+list($Name) = $DB->next_record();
+$Subject = $LoggedUser['Username'] . " recommended you $Article $Type!";
+$Body = $LoggedUser['Username'] . " recommended you the $Type [url=".site_url()."$Link]$Name".'[/url].';
+
+if (!empty($Note)) {
+    $Body = "$Body\n\n$Note";
+}
+
+Misc::send_pm($FriendID, $LoggedUser['ID'], $Subject, $Body);
+echo json_encode(array('status' => 'success', 'response' => 'Sent!'));
+die();

sections/api/stats.php

@@ -0,0 +1,165 @@
+<?php
+declare(strict_types=1);
+
+// Begin user stats
+if (($UserCount = $Cache->get_value('stats_user_count')) === false) {
+    $DB->query("
+    SELECT
+      COUNT(`ID`)
+    FROM
+      `users_main`
+    WHERE
+      `Enabled` = '1'
+    ");
+    list($UserCount) = $DB->next_record();
+    $Cache->cache_value('stats_user_count', $UserCount, 0); // inf cache
+}
+
+if (($UserStats = $Cache->get_value('stats_users')) === false) {
+    $DB->query("
+    SELECT
+      COUNT(`ID`)
+    FROM
+      `users_main`
+    WHERE
+      `Enabled` = '1'
+    AND `LastAccess` > '".time_minus(3600 * 24)."'
+    ");
+    list($UserStats['Day']) = $DB->next_record();
+
+    $DB->query("
+    SELECT
+      COUNT(`ID`)
+    FROM
+      `users_main`
+    WHERE
+      `Enabled` = '1'
+    AND `LastAccess` > '".time_minus(3600 * 24 * 7)."'
+    ");
+    list($UserStats['Week']) = $DB->next_record();
+
+    $DB->query("
+    SELECT
+      COUNT(`ID`)
+    FROM
+      `users_main`
+    WHERE
+      `Enabled` = '1'
+    AND LastAccess > '".time_minus(3600 * 24 * 30)."'
+    ");
+    list($UserStats['Month']) = $DB->next_record();
+
+    $Cache->cache_value('stats_users', $UserStats, 0);
+}
+
+// Begin torrent stats
+if (($TorrentCount = $Cache->get_value('stats_torrent_count')) === false) {
+    $DB->query("
+    SELECT
+      COUNT(`ID`)
+    FROM
+      `torrents`
+    ");
+    list($TorrentCount) = $DB->next_record();
+    $Cache->cache_value('stats_torrent_count', $TorrentCount, 604800); // staggered 1 week cache
+}
+
+if (($AlbumCount = $Cache->get_value('stats_album_count')) === false) {
+    $DB->query("
+    SELECT
+      COUNT(`id`)
+    FROM
+      `torrents_group`
+    WHERE
+      `category_id` = '1'
+    ");
+
+    list($AlbumCount) = $DB->next_record();
+    $Cache->cache_value('stats_album_count', $AlbumCount, 604830); // staggered 1 week cache
+}
+
+if (($ArtistCount = $Cache->get_value('stats_artist_count')) === false) {
+    $DB->query("
+    SELECT
+      COUNT(`ArtistID`)
+    FROM
+      `artists_group`
+    ");
+    
+    list($ArtistCount) = $DB->next_record();
+    $Cache->cache_value('stats_artist_count', $ArtistCount, 604860); // staggered 1 week cache
+}
+
+// Begin request stats
+if (($RequestStats = $Cache->get_value('stats_requests')) === false) {
+    $DB->query("
+    SELECT
+      COUNT(`ID`)
+    FROM
+      `requests`
+    ");
+    list($RequestCount) = $DB->next_record();
+
+    $DB->query("
+    SELECT
+      COUNT(`ID`)
+    FROM
+      `requests`
+    WHERE
+      `FillerID` > 0
+    ");
+    list($FilledCount) = $DB->next_record();
+    $Cache->cache_value('stats_requests', array($RequestCount, $FilledCount), 11280);
+} else {
+    list($RequestCount, $FilledCount) = $RequestStats;
+}
+
+// Begin swarm stats
+if (($PeerStats = $Cache->get_value('stats_peers')) === false) {
+    // Cache lock!
+    if ($Cache->get_query_lock('peer_stats')) {
+        $DB->query("
+        SELECT
+        IF(
+          `remaining` = 0,
+          'Seeding',
+          'Leeching'
+        ) AS `Type`,
+        COUNT(`uid`)
+        FROM
+          `xbt_files_users`
+        WHERE
+          `active` = 1
+        GROUP BY
+          `Type`
+        ");
+
+        $PeerCount = $DB->to_array(0, MYSQLI_NUM, false);
+        $LeecherCount = isset($PeerCount['Leeching']) ? $PeerCount['Leeching'][1] : 0;
+        $SeederCount = isset($PeerCount['Seeding']) ? $PeerCount['Seeding'][1] : 0;
+        $Cache->cache_value('stats_peers', array($LeecherCount, $SeederCount), 1209600); // 2 week cache
+        $Cache->clear_query_lock('peer_stats');
+    } else {
+        $LeecherCount = $SeederCount = 0;
+    }
+} else {
+    list($LeecherCount, $SeederCount) = $PeerStats;
+}
+
+json_print('success', array(
+  'maxUsers' => USER_LIMIT,
+  'enabledUsers' => (int) $UserCount,
+  'usersActiveThisDay' => (int) $UserStats['Day'],
+  'usersActiveThisWeek' => (int) $UserStats['Week'],
+  'usersActiveThisMonth' => (int) $UserStats['Month'],
+
+  'torrentCount' => (int) $TorrentCount,
+  'groupCount' => (int) $AlbumCount,
+  'artistCount' => (int) $ArtistCount,
+
+  'requestCount' => (int) $RequestCount,
+  'filledRequestCount' => (int) $FilledCount,
+
+  'seederCount' => (int) $SeederCount,
+  'leecherCount' => (int) $LeecherCount
+));

sections/api/subscriptions.php

@@ -0,0 +1,92 @@
+<?php
+/*
+User topic subscription page
+*/
+
+if (!empty($LoggedUser['DisableForums'])) {
+  json_die('failure');
+}
+
+if (isset($LoggedUser['PostsPerPage'])) {
+  $PerPage = $LoggedUser['PostsPerPage'];
+} else {
+  $PerPage = POSTS_PER_PAGE;
+}
+list($Page, $Limit) = Format::page_limit($PerPage);
+
+$ShowUnread = (!isset($_GET['showunread']) && !isset($HeavyInfo['SubscriptionsUnread']) || isset($HeavyInfo['SubscriptionsUnread']) && !!$HeavyInfo['SubscriptionsUnread'] || isset($_GET['showunread']) && !!$_GET['showunread']);
+$ShowCollapsed = (!isset($_GET['collapse']) && !isset($HeavyInfo['SubscriptionsCollapse']) || isset($HeavyInfo['SubscriptionsCollapse']) && !!$HeavyInfo['SubscriptionsCollapse'] || isset($_GET['collapse']) && !!$_GET['collapse']);
+$sql = '
+  SELECT
+    SQL_CALC_FOUND_ROWS
+    MAX(p.ID) AS ID
+  FROM forums_posts AS p
+    LEFT JOIN forums_topics AS t ON t.ID = p.TopicID
+    JOIN users_subscriptions AS s ON s.TopicID = t.ID
+    LEFT JOIN forums AS f ON f.ID = t.ForumID
+    LEFT JOIN forums_last_read_topics AS l ON p.TopicID = l.TopicID AND l.UserID = s.UserID
+  WHERE s.UserID = '.$LoggedUser['ID'].'
+    AND p.ID <= IFNULL(l.PostID, t.LastPostID)
+    AND ' . Forums::user_forums_sql();
+if ($ShowUnread) {
+  $sql .= '
+    AND IF(l.PostID IS NULL OR (t.IsLocked = \'1\' && t.IsSticky = \'0\'), t.LastPostID, l.PostID) < t.LastPostID';
+}
+$sql .= "
+  GROUP BY t.ID
+  ORDER BY t.LastPostID DESC
+  LIMIT $Limit";
+$PostIDs = $DB->query($sql);
+$DB->query('SELECT FOUND_ROWS()');
+list($NumResults) = $DB->next_record();
+
+if ($NumResults > $PerPage * ($Page - 1)) {
+  $DB->set_query_id($PostIDs);
+  $PostIDs = $DB->collect('ID');
+  $sql = '
+    SELECT
+      f.ID AS ForumID,
+      f.Name AS ForumName,
+      p.TopicID,
+      t.Title,
+      p.Body,
+      t.LastPostID,
+      t.IsLocked,
+      t.IsSticky,
+      p.ID,
+      um.ID,
+      um.Username,
+      ui.Avatar,
+      p.EditedUserID,
+      p.EditedTime,
+      ed.Username AS EditedUsername
+    FROM forums_posts AS p
+      LEFT JOIN forums_topics AS t ON t.ID = p.TopicID
+      LEFT JOIN forums AS f ON f.ID = t.ForumID
+      LEFT JOIN users_main AS um ON um.ID = p.AuthorID
+      LEFT JOIN users_info AS ui ON ui.UserID = um.ID
+      LEFT JOIN users_main AS ed ON ed.ID = um.ID
+    WHERE p.ID IN ('.implode(',', $PostIDs).')
+    ORDER BY f.Name ASC, t.LastPostID DESC';
+  $DB->query($sql);
+}
+
+$JsonPosts = [];
+while (list($ForumID, $ForumName, $TopicID, $ThreadTitle, $Body, $LastPostID, $Locked, $Sticky, $PostID, $AuthorID, $AuthorName, $AuthorAvatar, $EditedUserID, $EditedTime, $EditedUsername) = $DB->next_record()) {
+  $JsonPost = array(
+    'forumId' => (int)$ForumID,
+    'forumName' => $ForumName,
+    'threadId' => (int)$TopicID,
+    'threadTitle' => $ThreadTitle,
+    'postId' => (int)$PostID,
+    'lastPostId' => (int)$LastPostID,
+    'locked' => $Locked == 1,
+    'new' => ($PostID < $LastPostID && !$Locked)
+  );
+  $JsonPosts[] = $JsonPost;
+}
+
+json_die('success', array(
+  'threads' => $JsonPosts
+));
+?>

sections/api/tcomments.php

@@ -0,0 +1,42 @@
+<?php
+#declare(strict_types=1);
+
+if (empty($_GET['id']) || !is_number($_GET['id'])) {
+    json_die('failure');
+}
+
+list($NumComments, $Page, $Thread) = Comments::load('torrents', (int)$_GET['id'], false);
+
+# Begin printing
+$JsonComments = [];
+foreach ($Thread as $Key => $Post) {
+    list($PostID, $AuthorID, $AddedTime, $Body, $EditedUserID, $EditedTime, $EditedUsername) = array_values($Post);
+    list($AuthorID, $Username, $PermissionID, $Paranoia, $Artist, $Donor, $Warned, $Avatar, $Enabled, $UserTitle) = array_values(Users::user_info($AuthorID));
+
+    $JsonComments[] = [
+      'postId' => (int) $PostID,
+      'addedTime' => $AddedTime,
+      'bbBody' => $Body,
+      'body' => Text::full_format($Body),
+      'editedUserId' => (int) $EditedUserID,
+      'editedTime' => $EditedTime,
+      'editedUsername' => $EditedUsername,
+
+      'userinfo' => [
+        'authorId' => (int) $AuthorID,
+        'authorName' => $Username,
+        'artist' => $Artist === 1,
+        'donor' => $Donor === 1,
+        'warned' => (bool) $Warned,
+        'avatar' => $Avatar,
+        'enabled' => ($Enabled === 2 ? false : true),
+        'userTitle' => $UserTitle
+      ]
+    ];
+}
+
+json_die('success', [
+  'page' => (int) $Page,
+  'pages' => ceil($NumComments / TORRENT_COMMENTS_PER_PAGE),
+  'comments' => $JsonComments
+]);

sections/api/top10/index.php

@@ -0,0 +1,32 @@
+<?php
+#declare(strict_types=1);
+
+// Already done in /sections/ajax/index.php
+//enforce_login();
+
+if (!check_perms('site_top10')) {
+    echo json_encode(array('status' => 'failure'));
+    error();
+}
+
+if (empty($_GET['type']) || $_GET['type'] === 'torrents') {
+    include SERVER_ROOT.'/sections/ajax/top10/torrents.php';
+} else {
+    switch ($_GET['type']) {
+    case 'users':
+      include SERVER_ROOT.'/sections/ajax/top10/users.php';
+      break;
+
+    case 'tags':
+      include SERVER_ROOT.'/sections/ajax/top10/tags.php';
+      break;
+
+    case 'history':
+      include SERVER_ROOT.'/sections/ajax/top10/history.php';
+      break;
+
+    default:
+      echo json_encode(array('status' => 'failure'));
+      break;
+  }
+}

sections/api/top10/tags.php

@@ -0,0 +1,83 @@
+<?php
+#declare(strict_types=1);
+
+# todo: Go through line by line
+
+// Error out on invalid requests (before caching)
+if (isset($_GET['details'])) {
+    if (in_array($_GET['details'], ['ut','ur'])) {
+        $Details = $_GET['details'];
+    } else {
+        echo json_encode(['status' => 'failure']);
+        error();
+    }
+} else {
+    $Details = 'all';
+}
+
+// Defaults to 10 (duh)
+$Limit = isset($_GET['limit']) ? intval($_GET['limit']) : 10;
+$Limit = in_array($Limit, [10, 100, 250]) ? $Limit : 10;
+$OuterResults = [];
+
+if ($Details == 'all' || $Details == 'ut') {
+    if (!$TopUsedTags = $Cache->get_value("topusedtag_$Limit")) {
+        $DB->query("
+      SELECT
+        t.ID,
+        t.Name,
+        COUNT(tt.GroupID) AS Uses
+      FROM tags AS t
+        JOIN torrents_tags AS tt ON tt.TagID = t.ID
+      GROUP BY tt.TagID
+      ORDER BY Uses DESC
+      LIMIT $Limit");
+        $TopUsedTags = $DB->to_array();
+        $Cache->cache_value("topusedtag_$Limit", $TopUsedTags, 3600 * 12);
+    }
+
+    $OuterResults[] = generate_tag_json('Most Used Torrent Tags', 'ut', $TopUsedTags, $Limit);
+}
+
+if ($Details == 'all' || $Details == 'ur') {
+    if (!$TopRequestTags = $Cache->get_value("toprequesttag_$Limit")) {
+        $DB->query("
+      SELECT
+        t.ID,
+        t.Name,
+        COUNT(r.RequestID) AS Uses,
+        '',''
+      FROM tags AS t
+        JOIN requests_tags AS r ON r.TagID = t.ID
+      GROUP BY r.TagID
+      ORDER BY Uses DESC
+      LIMIT $Limit");
+        $TopRequestTags = $DB->to_array();
+        $Cache->cache_value("toprequesttag_$Limit", $TopRequestTags, 3600 * 12);
+    }
+
+    $OuterResults[] = generate_tag_json('Most Used Request Tags', 'ur', $TopRequestTags, $Limit);
+}
+
+echo json_encode([
+  'status' => 'success',
+  'response' => $OuterResults
+]);
+
+function generate_tag_json($Caption, $Tag, $Details, $Limit)
+{
+    $results = [];
+    foreach ($Details as $Detail) {
+        $results[] = [
+      'name' => $Detail['Name'],
+      'uses' => (int)$Detail['Uses']
+    ];
+    }
+
+    return [
+    'caption' => $Caption,
+    'tag' => $Tag,
+    'limit' => (int)$Limit,
+    'results' => $results
+  ];
+}

sections/api/top10/torrents.php

@@ -0,0 +1,185 @@
+<?php
+#declare(strict_types=1);
+
+# todo: Go through line by line
+if (isset($_GET['details'])) {
+    if (in_array($_GET['details'], array('day','week','overall','snatched','data','seeded'))) {
+        $Details = $_GET['details'];
+    } else {
+        echo json_encode(array('status' => 'failure'));
+        error();
+    }
+} else {
+    $Details = 'all';
+}
+
+// Defaults to 10 (duh)
+$Limit = isset($_GET['limit']) ? intval($_GET['limit']) : 10;
+$Limit = in_array($Limit, array(10, 100, 250)) ? $Limit : 10;
+
+$WhereSum = (empty($Where)) ? '' : md5($Where);
+$BaseQuery = "
+SELECT
+  t.`ID`,
+  g.`id`,
+  g.`title`,
+  g.`category_id`,
+  g.`picture`,
+  g.`tag_list`,
+  t.`Media`,
+  g.`published`,
+  t.`Snatched`,
+  t.`Seeders`,
+  t.`Leechers`,
+  (
+    (t.`Size` * t.`Snatched`) +(t.`Size` * 0.5 * t.`Leechers`)
+  ) AS `Data`,
+  t.`Size`
+FROM
+  `torrents` AS t
+LEFT JOIN `torrents_group` AS g
+ON
+  g.`id` = t.`GroupID`
+";
+
+$OuterResults = [];
+
+if ($Details == 'all' || $Details == 'day') {
+    if (!$TopTorrentsActiveLastDay = $Cache->get_value('top10tor_day_'.$Limit.$WhereSum)) {
+        $DayAgo = time_minus(86400);
+        $Query = $BaseQuery.' WHERE t.Seeders>0 AND ';
+        if (!empty($Where)) {
+            $Query .= $Where.' AND ';
+        }
+        $Query .= "
+      t.Time>'$DayAgo'
+      ORDER BY (t.Seeders + t.Leechers) DESC
+      LIMIT $Limit;";
+        $DB->query($Query);
+        $TopTorrentsActiveLastDay = $DB->to_array(false, MYSQLI_NUM);
+        $Cache->cache_value('top10tor_day_'.$Limit.$WhereSum, $TopTorrentsActiveLastDay, 3600 * 2);
+    }
+    $OuterResults[] = generate_torrent_json('Most Active Torrents Uploaded in the Past Day', 'day', $TopTorrentsActiveLastDay, $Limit);
+}
+if ($Details == 'all' || $Details == 'week') {
+    if (!$TopTorrentsActiveLastWeek = $Cache->get_value('top10tor_week_'.$Limit.$WhereSum)) {
+        $WeekAgo = time_minus(604800);
+        $Query = $BaseQuery.' WHERE ';
+        if (!empty($Where)) {
+            $Query .= $Where.' AND ';
+        }
+        $Query .= "
+      t.Time>'$WeekAgo'
+      ORDER BY (t.Seeders + t.Leechers) DESC
+      LIMIT $Limit;";
+        $DB->query($Query);
+        $TopTorrentsActiveLastWeek = $DB->to_array(false, MYSQLI_NUM);
+        $Cache->cache_value('top10tor_week_'.$Limit.$WhereSum, $TopTorrentsActiveLastWeek, 3600*6);
+    }
+    $OuterResults[] = generate_torrent_json('Most Active Torrents Uploaded in the Past Week', 'week', $TopTorrentsActiveLastWeek, $Limit);
+}
+
+if ($Details == 'all' || $Details == 'overall') {
+    if (!$TopTorrentsActiveAllTime = $Cache->get_value("top10tor_overall_$Limit$WhereSum")) {
+        $Query = $BaseQuery;
+        if (!empty($Where)) {
+            $Query .= " WHERE $Where";
+        }
+        $Query .= "
+      ORDER BY (t.Seeders + t.Leechers) DESC
+      LIMIT $Limit;";
+        $DB->query($Query);
+        $TopTorrentsActiveAllTime = $DB->to_array(false, MYSQLI_NUM);
+        $Cache->cache_value("top10tor_overall_$Limit$WhereSum", $TopTorrentsActiveAllTime, 3600 * 6);
+    }
+    $OuterResults[] = generate_torrent_json('Most Active Torrents of All Time', 'overall', $TopTorrentsActiveAllTime, $Limit);
+}
+
+if (($Details == 'all' || $Details == 'snatched') && empty($Where)) {
+    if (!$TopTorrentsSnatched = $Cache->get_value("top10tor_snatched_$Limit$WhereSum")) {
+        $Query = $BaseQuery;
+        $Query .= "
+      ORDER BY t.Snatched DESC
+      LIMIT $Limit;";
+        $DB->query($Query);
+        $TopTorrentsSnatched = $DB->to_array(false, MYSQLI_NUM);
+        $Cache->cache_value("top10tor_snatched_$Limit$WhereSum", $TopTorrentsSnatched, 3600 * 6);
+    }
+    $OuterResults[] = generate_torrent_json('Most Snatched Torrents', 'snatched', $TopTorrentsSnatched, $Limit);
+}
+
+if (($Details == 'all' || $Details == 'data') && empty($Where)) {
+    if (!$TopTorrentsTransferred = $Cache->get_value("top10tor_data_$Limit$WhereSum")) {
+        $Query = $BaseQuery;
+        $Query .= "
+      ORDER BY Data DESC
+      LIMIT $Limit;";
+        $DB->query($Query);
+        $TopTorrentsTransferred = $DB->to_array(false, MYSQLI_NUM);
+        $Cache->cache_value("top10tor_data_$Limit$WhereSum", $TopTorrentsTransferred, 3600 * 6);
+    }
+    $OuterResults[] = generate_torrent_json('Most Data Transferred Torrents', 'data', $TopTorrentsTransferred, $Limit);
+}
+
+if (($Details == 'all' || $Details == 'seeded') && empty($Where)) {
+    if (!$TopTorrentsSeeded = $Cache->get_value("top10tor_seeded_$Limit$WhereSum")) {
+        $Query = $BaseQuery."
+      ORDER BY t.Seeders DESC
+      LIMIT $Limit;";
+        $DB->query($Query);
+        $TopTorrentsSeeded = $DB->to_array(false, MYSQLI_NUM);
+        $Cache->cache_value("top10tor_seeded_$Limit$WhereSum", $TopTorrentsSeeded, 3600 * 6);
+    }
+    $OuterResults[] = generate_torrent_json('Best Seeded Torrents', 'seeded', $TopTorrentsSeeded, $Limit);
+}
+
+json_print("success", $OuterResults);
+
+function generate_torrent_json($Caption, $Tag, $Details, $Limit)
+{
+    global $LoggedUser, $Categories;
+    $results = [];
+    foreach ($Details as $Detail) {
+        list($TorrentID, $GroupID, $GroupName, $GroupCategoryID, $WikiImage, $TorrentTags,
+      $Media, $GroupYear,
+      $Snatched, $Seeders, $Leechers, $Data, $Size) = $Detail;
+
+        # todo: Make JSON object if multiple artists
+        $Artist = Artists::display_artists(Artists::get_artist($GroupID), false, false);
+
+        $TagList = [];
+
+        if ($TorrentTags != '') {
+            $TorrentTags = explode(' ', $TorrentTags);
+            foreach ($TorrentTags as $TagKey => $TagName) {
+                $TagName = str_replace('_', '.', $TagName);
+                $TagList[] = $TagName;
+            }
+        }
+
+        // Append to the existing array
+        $results[] = array(
+          'torrentId'     => (int) $TorrentID,
+          'groupId'       => (int) $GroupID,
+          'author'        => $Artist, # todo
+          'groupName'     => $GroupName,
+          'groupCategory' => (int) $GroupCategoryID,
+          'groupYear'     => (int) $GroupYear,
+          'platform'      => $Media,
+          'tags'          => $TagList,
+          'snatched'      => (int) $Snatched,
+          'seeders'       => (int) $Seeders,
+          'leechers'      => (int) $Leechers,
+          'data'          => (int) $Data,
+          'size'          => (int) $Size,
+          'picture'       => $WikiImage,
+        );
+    }
+
+    return array(
+      'caption' => $Caption,
+      'tag'     => $Tag,
+      'limit'   => (int)$Limit,
+      'results' => $results
+    );
+}

sections/api/top10/users.php

@@ -0,0 +1,130 @@
+<?php
+#declare(strict_types=1);
+
+# todo: Go through line by line
+if (isset($_GET['details'])) {
+    if (in_array($_GET['details'], array('ul','dl','numul','uls','dls'))) {
+        $Details = $_GET['details'];
+    } else {
+        echo json_encode(array('status' => 'failure'));
+        error();
+    }
+} else {
+    $Details = 'all';
+}
+
+// Defaults to 10 (duh)
+$Limit = isset($_GET['limit']) ? intval($_GET['limit']) : 10;
+$Limit = in_array($Limit, array(10,100,250)) ? $Limit : 10;
+
+$BaseQuery = "
+  SELECT
+    u.ID,
+    u.Username,
+    ui.JoinDate,
+    u.Uploaded,
+    u.Downloaded,
+    ABS(u.Uploaded-524288000) / (".time()." - UNIX_TIMESTAMP(ui.JoinDate)) AS UpSpeed,
+    u.Downloaded / (".time()." - UNIX_TIMESTAMP(ui.JoinDate)) AS DownSpeed,
+    COUNT(t.ID) AS NumUploads
+  FROM users_main AS u
+    JOIN users_info AS ui ON ui.UserID = u.ID
+    LEFT JOIN torrents AS t ON t.UserID = u.ID
+  WHERE u.Enabled = '1'
+    AND Uploaded > '". 5 * 1024 * 1024 * 1024 ."'
+    AND Downloaded > '". 5 * 1024 * 1024 * 1024 ."'
+    AND (Paranoia IS NULL OR (Paranoia NOT LIKE '%\"uploaded\"%' AND Paranoia NOT LIKE '%\"downloaded\"%'))
+  GROUP BY u.ID";
+
+$OuterResults = [];
+
+if ($Details == 'all' || $Details == 'ul') {
+    if (!$TopUserUploads = $Cache->get_value("topuser_ul_$Limit")) {
+        $DB->query("
+      $BaseQuery
+      ORDER BY u.Uploaded DESC
+      LIMIT $Limit;");
+        $TopUserUploads = $DB->to_array();
+        $Cache->cache_value("topuser_ul_$Limit", $TopUserUploads, 3600 * 12);
+    }
+    $OuterResults[] = generate_user_json('Uploaders', 'ul', $TopUserUploads, $Limit);
+}
+
+if ($Details == 'all' || $Details == 'dl') {
+    if (!$TopUserDownloads = $Cache->get_value("topuser_dl_$Limit")) {
+        $DB->query("
+      $BaseQuery
+      ORDER BY u.Downloaded DESC
+      LIMIT $Limit;");
+        $TopUserDownloads = $DB->to_array();
+        $Cache->cache_value("topuser_dl_$Limit", $TopUserDownloads, 3600 * 12);
+    }
+    $OuterResults[] = generate_user_json('Downloaders', 'dl', $TopUserDownloads, $Limit);
+}
+
+if ($Details == 'all' || $Details == 'numul') {
+    if (!$TopUserNumUploads = $Cache->get_value("topuser_numul_$Limit")) {
+        $DB->query("
+      $BaseQuery
+      ORDER BY NumUploads DESC
+      LIMIT $Limit;");
+        $TopUserNumUploads = $DB->to_array();
+        $Cache->cache_value("topuser_numul_$Limit", $TopUserNumUploads, 3600 * 12);
+    }
+    $OuterResults[] = generate_user_json('Torrents Uploaded', 'numul', $TopUserNumUploads, $Limit);
+}
+
+if ($Details == 'all' || $Details == 'uls') {
+    if (!$TopUserUploadSpeed = $Cache->get_value("topuser_ulspeed_$Limit")) {
+        $DB->query("
+      $BaseQuery
+      ORDER BY UpSpeed DESC
+      LIMIT $Limit;");
+        $TopUserUploadSpeed = $DB->to_array();
+        $Cache->cache_value("topuser_ulspeed_$Limit", $TopUserUploadSpeed, 3600 * 12);
+    }
+    $OuterResults[] = generate_user_json('Fastest Uploaders', 'uls', $TopUserUploadSpeed, $Limit);
+}
+
+if ($Details == 'all' || $Details == 'dls') {
+    if (!$TopUserDownloadSpeed = $Cache->get_value("topuser_dlspeed_$Limit")) {
+        $DB->query("
+      $BaseQuery
+      ORDER BY DownSpeed DESC
+      LIMIT $Limit;");
+        $TopUserDownloadSpeed = $DB->to_array();
+        $Cache->cache_value("topuser_dlspeed_$Limit", $TopUserDownloadSpeed, 3600 * 12);
+    }
+    $OuterResults[] = generate_user_json('Fastest Downloaders', 'dls', $TopUserDownloadSpeed, $Limit);
+}
+
+print
+  json_encode(
+      array(
+      'status' => 'success',
+      'response' => $OuterResults
+    )
+  );
+
+function generate_user_json($Caption, $Tag, $Details, $Limit)
+{
+    $results = [];
+    foreach ($Details as $Detail) {
+        $results[] = array(
+      'id' => (int)$Detail['ID'],
+      'username' => $Detail['Username'],
+      'uploaded' => (float)$Detail['Uploaded'],
+      'upSpeed' => (float)$Detail['UpSpeed'],
+      'downloaded' => (float)$Detail['Downloaded'],
+      'downSpeed' => (float)$Detail['DownSpeed'],
+      'numUploads' => (int)$Detail['NumUploads'],
+      'joinDate' => $Detail['JoinDate']
+    );
+    }
+    return array(
+    'caption' => $Caption,
+    'tag' => $Tag,
+    'limit' => (int)$Limit,
+    'results' => $results
+    );
+}

sections/api/torrents/group.php

@@ -0,0 +1,166 @@
+<?php
+#declare(strict_types=1);
+
+$ENV = ENV::go();
+require_once "$ENV->SERVER_ROOT/sections/torrents/functions.php";
+
+# Either id or hash
+$GroupID = (int) $_GET['id'];
+$TorrentHash = (string) $_GET['hash'];
+
+# Error if both supplied
+if ($GroupID && $TorrentHash) {
+    json_die('failure', 'bad parameters');
+}
+
+# Get id from hash
+if ($TorrentHash) {
+    if (!is_valid_torrenthash($TorrentHash)) {
+        json_die('failure', 'bad hash parameter');
+    } else {
+        $GroupID = (int) torrenthash_to_groupid($TorrentHash);
+        if (!$GroupID) {
+            json_die('failure', 'bad hash parameter');
+        }
+    }
+}
+
+# Error if bad id
+if ($GroupID <= 0) {
+    json_die('failure', 'bad id parameter');
+}
+
+$TorrentCache = get_group_info($GroupID, true, 0, true, true);
+if (!$TorrentCache) {
+    json_die('failure', 'bad id parameter');
+}
+
+# Get torrent details (group, torrents, artists)
+list($TorrentDetails, $TorrentList) = $TorrentCache;
+$Artists = Artists::get_artist($GroupID);
+
+# Get category name if possible
+if ($TorrentDetails['category_id'] === 0) {
+    $CategoryName = 'Unknown';
+} else {
+    $CategoryName = $Categories[$TorrentDetails['category_id'] - 1];
+}
+
+# Get tag list (name and id)
+$TagIDs = explode('|', $TorrentDetails["GROUP_CONCAT(DISTINCT tags.`ID` SEPARATOR '|')"]);
+$TagNames= explode('|', $TorrentDetails["GROUP_CONCAT(DISTINCT tags.`Name` SEPARATOR '|')"]);
+
+$TagList = [];
+foreach ($TagIDs as $Key => $ID) {
+    array_push(
+        $TagList,
+        [
+            'id'   => $ID,
+            'name' => $TagNames[$Key],
+        ]
+    );
+}
+
+# Get citation list (doi and id)
+# todo: Update DB schema
+$Citations = [];
+foreach ($TorrentDetails['Screenshots'] as $Citation) {
+    array_push(
+        $Citations,
+        [
+            'id'        => $Citation['ID'],
+            'doi'       => $Citation['URI'],
+           #'timestamp' => $Citation['Time'],
+        ]
+    );
+}
+
+# Torrent group response
+# todo: Add seeding, leeching, snatched
+$JsonTorrentDetails = [
+    'id'            => (int) $TorrentDetails['id'],
+    'identifier'    => $TorrentDetails['identifier'],
+
+    'category_id'   => (int) $TorrentDetails['category_id'],
+    'category_name' => $CategoryName,
+
+    'title'         => $TorrentDetails['title'],
+    'subject'       => $TorrentDetails['subject'],
+    'object'        => $TorrentDetails['object'],
+
+    'authors'       => $Artists,
+    'published'     => (int) $TorrentDetails['published'],
+    'workgroup'     => $TorrentDetails['workgroup'],
+    'location'      => $TorrentDetails['location'],
+
+    'citations'     => $Citations,
+    'mirrors'       => ($TorrentDetails['Mirrors']) ?: false,
+  
+    'description'   => $TorrentDetails['description'],
+   #'description'   => Text::full_format($TorrentDetails['description']),
+    'picture'       => $TorrentDetails['picture'],
+    'tag_list'      => $TagList,
+
+    'bookmarked'    => Bookmarks::has_bookmarked('torrent', $GroupID),
+    'timestamp'     => $TorrentDetails['timestamp'],
+];
+
+# Torrents in group
+$JsonTorrentList = [];
+foreach ($TorrentList as $Torrent) {
+    # Convert file list back to the old format
+    $FileList = explode("\n", $Torrent['FileList']);
+
+    foreach ($FileList as &$File) {
+        $File = Torrents::filelist_old_format($File);
+    }
+
+    # todo: Make a nested object
+    # todo: Limit to 100 files
+    unset($File);
+    $FileList = implode('|||', $FileList);
+    $Userinfo = Users::user_info($Torrent['UserID']);
+
+    $Reports = Torrents::get_reports($Torrent['ID']);
+    $Torrent['Reported'] = count($Reports) > 0;
+
+    # Torrent details response
+    # todo: Update DB schema
+    $JsonTorrentList[] = [
+        'id'           => (int) $Torrent['ID'],
+        'info_hash'    => $Torrent['InfoHash'],
+        'description'  => $Torrent['Description'],
+
+        'platform'     => $Torrent['Media'],
+        'format'       => $Torrent['Container'],
+        'scope'        => $Torrent['Resolution'],
+        'annotated'    => (bool) $Torrent['Censored'],
+        'license'      => $Torrent['Codec'],
+
+        'size'         => (int) $Torrent['Size'],
+        'archive'      => $Torrent['Archive'],
+        'file_count'   => (int) $Torrent['FileCount'],
+        'file_path'    => $Torrent['FilePath'],
+        'file_list'    => $FileList,
+
+        'seeders'      => (int) $Torrent['Seeders'],
+        'leechers'     => (int) $Torrent['Leechers'],
+        'snatched'     => (int) $Torrent['Snatched'],
+        'free_torrent' => ($Torrent['FreeTorrent'] === 1),
+
+        'reported'     => (bool) $Torrent['Reported'],
+        'time'         => $Torrent['Time'],
+
+        'user_id'      => (int) ($Torrent['Anonymous'] ? 0 : $Torrent['UserID']),
+        'username'     => ($Torrent['Anonymous'] ? 'Anonymous' : $Userinfo['Username']),
+    ];
+}
+
+# Print response
+json_die(
+    'success',
+    [
+        'group' => $JsonTorrentDetails,
+        'torrents' => $JsonTorrentList,
+    ]
+);

sections/api/torrents/torrent.php

@@ -0,0 +1,105 @@
+<?php
+declare(strict_types=1);
+
+require_once SERVER_ROOT.'/sections/torrents/functions.php';
+
+$TorrentID = (int) $_GET['id'];
+$TorrentHash = (string) $_GET['hash'];
+
+if ($TorrentID && $TorrentHash) {
+    json_die('failure', 'bad parameters');
+}
+
+if ($TorrentHash) {
+    if (!is_valid_torrenthash($TorrentHash)) {
+        json_die('failure', 'bad hash parameter');
+    } else {
+        $TorrentID = (int) torrenthash_to_torrentid($TorrentHash);
+        if (!$TorrentID) {
+            json_die('failure', 'bad hash parameter');
+        }
+    }
+}
+
+if ($TorrentID <= 0) {
+    json_die('failure', 'bad id parameter');
+}
+
+$TorrentCache = get_torrent_info($TorrentID, true, 0, true, true);
+if (!$TorrentCache) {
+    json_die('failure', 'bad id parameter');
+}
+
+list($TorrentDetails, $TorrentList) = $TorrentCache;
+if (!isset($TorrentList[$TorrentID])) {
+    json_die('failure', 'bad id parameter');
+}
+
+$GroupID = $TorrentDetails['ID'];
+$Artists = Artists::get_artist($GroupID);
+
+if ($TorrentDetails['category_id'] === 0) {
+    $CategoryName = 'Unknown';
+} else {
+    $CategoryName = $Categories[$TorrentDetails['category_id'] - 1];
+}
+
+$TagList = explode('|', $TorrentDetails['GROUP_CONCAT(DISTINCT tags.Name SEPARATOR \'|\')']);
+
+$JsonTorrentDetails = [
+  'description'  => Text::full_format($TorrentDetails['description']),
+  'picture'      => $TorrentDetails['picture'],
+  'id'           => (int) $TorrentDetails['id'],
+  'title'         => $TorrentDetails['title'],
+  'subject'     => $TorrentDetails['subject'],
+  'object'       => $TorrentDetails['object'],
+  'authors'      => $Artists,
+  'published'         => (int) $TorrentDetails['published'],
+  'identifier'    => $TorrentDetails['identifier'],
+  'category_id'   => (int) $TorrentDetails['category_id'],
+  'icategory_name' => $CategoryName,
+  'timestamp'         => $TorrentDetails['timestamp'],
+  'bookmarked' => Bookmarks::has_bookmarked('torrent', $GroupID),
+  'tag_list'         => $TagList
+];
+
+$Torrent = $TorrentList[$TorrentID];
+
+$Reports = Torrents::get_reports($TorrentID);
+$Torrent['Reported'] = (count($Reports) > 0);
+
+// Convert file list back to the old format
+$FileList = explode("\n", $Torrent['FileList']);
+foreach ($FileList as &$File) {
+    $File = Torrents::filelist_old_format($File);
+}
+
+unset($File);
+$FileList = implode('|||', $FileList);
+$Userinfo = Users::user_info($Torrent['UserID']);
+
+$JsonTorrentList[] = [
+  'id'          => (int) $Torrent['ID'],
+  'infoHash'    => $Torrent['InfoHash'],
+  'platform'    => $Torrent['Media'],
+  'format'      => $Torrent['Container'],
+  'license'     => $Torrent['Codec'],
+  'scope'       => $Torrent['Resolution'],
+  'annotated'   => (bool) $Torrent['Censored'],
+  'archive'     => $Torrent['Archive'],
+  'fileCount'   => (int) $Torrent['FileCount'],
+  'size'        => (int) $Torrent['Size'],
+  'seeders'     => (int) $Torrent['Seeders'],
+  'leechers'    => (int) $Torrent['Leechers'],
+  'snatched'    => (int) $Torrent['Snatched'],
+  'freeTorrent' => ($Torrent['FreeTorrent'] == 1),
+  'reported'    => (bool) $Torrent['Reported'],
+  'time'        => $Torrent['Time'],
+  'description' => $Torrent['Description'],
+  'fileList'    => $FileList,
+  'filePath'    => $Torrent['FilePath'],
+  'userId'      => (int) ($Torrent['Anonymous'] ? 0 : $Torrent['UserID']),
+  'username'    => ($Torrent['Anonymous'] ? 'Anonymous' : $Userinfo['Username'])
+];
+
+json_die('success', ['group' => $JsonTorrentDetails, 'torrent' => array_pop($JsonTorrentList)]);

sections/api/torrents/torrentgroupalbumart.php

@@ -0,0 +1,22 @@
+<?php
+declare(strict_types=1);
+
+require SERVER_ROOT.'/sections/torrents/functions.php';
+
+$GroupID = (int) $_GET['id'];
+if ($GroupID === 0) {
+    error('Bad ID parameter', true);
+}
+
+$TorrentDetails = get_group_info($GroupID, true, 0, false);
+$TorrentDetails = $TorrentDetails[0];
+$Image = $TorrentDetails['WikiImage'];
+
+// Handle no artwork
+if (!$Image) {
+    $Image = STATIC_SERVER.'common/noartwork/music.png';
+}
+
+json_die('success', array(
+  'picture' => $Image
+));

sections/api/user.php

@@ -0,0 +1,485 @@
+<?php
+#declare(strict_types=1);
+
+if (empty($_GET['id']) || !is_numeric($_GET['id'])) {
+    json_die('failure', 'bad id parameter');
+}
+
+$UserID = $_GET['id'];
+if ($UserID === $LoggedUser['ID']) {
+    $OwnProfile = true;
+} else {
+    $OwnProfile = false;
+}
+
+// Always view as a normal user
+$DB->query("
+SELECT
+  m.`Username`,
+  m.`Email`,
+  m.`LastAccess`,
+  m.`IP`,
+  p.`Level` AS Class,
+  m.`Uploaded`,
+  m.`Downloaded`,
+  m.`RequiredRatio`,
+  m.`Enabled`,
+  m.`Paranoia`,
+  m.`Invites`,
+  m.`Title`,
+  m.`torrent_pass`,
+  m.`can_leech`,
+  i.`JoinDate`,
+  i.`Info`,
+  i.`Avatar`,
+  i.`Donor`,
+  i.`Warned`,
+COUNT(posts.`id`) AS ForumPosts,
+  i.`Inviter`,
+  i.`DisableInvites`,
+  inviter.`username`
+FROM
+  `users_main` AS m
+JOIN `users_info` AS i
+ON
+  i.`UserID` = m.`ID`
+LEFT JOIN `permissions` AS p
+ON
+  p.`ID` = m.`PermissionID`
+LEFT JOIN `users_main` AS inviter
+ON
+  i.`Inviter` = inviter.`ID`
+LEFT JOIN `forums_posts` AS posts
+ON
+  posts.`AuthorID` = m.`ID`
+WHERE
+  m.`ID` = $UserID
+GROUP BY
+  `AuthorID`
+");
+
+// If user doesn't exist
+if (!$DB->has_results()) {
+    json_die('failure', 'no such user');
+}
+
+list($Username, $Email, $LastAccess, $IP, $Class, $Uploaded, $Downloaded, $RequiredRatio, $Enabled, $Paranoia, $Invites, $CustomTitle, $torrent_pass, $DisableLeech, $JoinDate, $Info, $Avatar, $Donor, $Warned, $ForumPosts, $InviterID, $DisableInvites, $InviterName) = $DB->next_record(MYSQLI_NUM, array(9, 11));
+
+$Paranoia = unserialize($Paranoia);
+if (!is_array($Paranoia)) {
+    $Paranoia = [];
+}
+
+$ParanoiaLevel = 0;
+foreach ($Paranoia as $P) {
+    $ParanoiaLevel++;
+    if (strpos($P, '+') !== false) {
+        $ParanoiaLevel++;
+    }
+}
+
+// Raw time is better for JSON
+//$JoinedDate = time_diff($JoinDate);
+//$LastAccess = time_diff($LastAccess);
+
+function check_paranoia_here($Setting)
+{
+    global $Paranoia, $Class, $UserID;
+    return check_paranoia($Setting, $Paranoia, $Class, $UserID);
+}
+
+$Friend = false;
+$DB->query("
+SELECT
+  `FriendID`
+FROM
+  `friends`
+WHERE
+  `UserID` = '$LoggedUser[ID]'
+  AND `FriendID` = '$UserID'
+");
+
+if ($DB->has_results()) {
+    $Friend = true;
+}
+
+if (check_paranoia_here('requestsfilled_count') || check_paranoia_here('requestsfilled_bounty')) {
+    $DB->query("
+    SELECT
+      COUNT(DISTINCT r.`ID`),
+      SUM(rv.`Bounty`)
+    FROM
+      `requests` AS r
+    LEFT JOIN `requests_votes` AS rv
+    ON
+      r.`ID` = rv.`RequestID`
+    WHERE
+      r.`FillerID` = $UserID
+    ");
+    list($RequestsFilled, $TotalBounty) = $DB->next_record();
+
+    $DB->query("
+    SELECT
+      COUNT(`RequestID`),
+      SUM(`Bounty`)
+    FROM
+      `requests_votes`
+    WHERE
+      `UserID` = $UserID
+    ");
+    list($RequestsVoted, $TotalSpent) = $DB->next_record();
+
+    $DB->query("
+    SELECT
+      COUNT(`ID`)
+    FROM
+      `torrents`
+    WHERE
+      `UserID` = '$UserID'
+    ");
+    list($Uploads) = $DB->next_record();
+} else {
+    $RequestsFilled = null;
+    $TotalBounty = null;
+    $RequestsVoted = 0;
+    $TotalSpent = 0;
+}
+
+if (check_paranoia_here('uploads+')) {
+    $DB->query("
+    SELECT
+      COUNT(`ID`)
+    FROM
+      `torrents`
+    WHERE
+      `UserID` = '$UserID'
+    ");
+    list($Uploads) = $DB->next_record();
+} else {
+    $Uploads = null;
+}
+
+if (check_paranoia_here('artistsadded')) {
+    $DB->query("
+    SELECT
+      COUNT(`ArtistID`)
+    FROM
+      `torrents_artists`
+    WHERE
+      `UserID` = $UserID
+    ");
+    list($ArtistsAdded) = $DB->next_record();
+} else {
+    $ArtistsAdded = null;
+}
+
+// Do the ranks
+if (check_paranoia_here('uploaded')) {
+    $UploadedRank = UserRank::get_rank('uploaded', $Uploaded);
+} else {
+    $UploadedRank = null;
+}
+
+if (check_paranoia_here('downloaded')) {
+    $DownloadedRank = UserRank::get_rank('downloaded', $Downloaded);
+} else {
+    $DownloadedRank = null;
+}
+
+if (check_paranoia_here('uploads+')) {
+    $UploadsRank = UserRank::get_rank('uploads', $Uploads);
+} else {
+    $UploadsRank = null;
+}
+
+if (check_paranoia_here('requestsfilled_count')) {
+    $RequestRank = UserRank::get_rank('requests', $RequestsFilled);
+} else {
+    $RequestRank = null;
+}
+
+$PostRank = UserRank::get_rank('posts', $ForumPosts);
+
+if (check_paranoia_here('requestsvoted_bounty')) {
+    $BountyRank = UserRank::get_rank('bounty', $TotalSpent);
+} else {
+    $BountyRank = null;
+}
+
+if (check_paranoia_here('artistsadded')) {
+    $ArtistsRank = UserRank::get_rank('artists', $ArtistsAdded);
+} else {
+    $ArtistsRank = null;
+}
+
+if ($Downloaded === 0) {
+    $Ratio = 1;
+} elseif ($Uploaded === 0) {
+    $Ratio = 0.5;
+} else {
+    $Ratio = round($Uploaded / $Downloaded, 2);
+}
+
+if (check_paranoia_here(array('uploaded', 'downloaded', 'uploads+', 'requestsfilled_count', 'requestsvoted_bounty', 'artistsadded'))) {
+    $OverallRank = floor(UserRank::overall_score($UploadedRank, $DownloadedRank, $UploadsRank, $RequestRank, $PostRank, $BountyRank, $ArtistsRank, $Ratio));
+} else {
+    $OverallRank = null;
+}
+
+// Community section
+if (check_paranoia_here('snatched+')) {
+    $DB->query("
+    SELECT
+      COUNT(x.`uid`),
+      COUNT(DISTINCT x.`fid`)
+    FROM
+      `xbt_snatched` AS x
+    INNER JOIN `torrents` AS t
+    ON
+      t.`ID` = x.`fid`
+    WHERE
+      x.`uid` = '$UserID'
+    ");
+    list($Snatched, $UniqueSnatched) = $DB->next_record();
+}
+
+if (check_paranoia_here('torrentcomments+')) {
+    $DB->query("
+    SELECT
+      COUNT(`ID`)
+    FROM
+      `comments`
+    WHERE
+      `Page` = 'torrents'
+      AND `AuthorID` = '$UserID'
+    ");
+    list($NumComments) = $DB->next_record();
+}
+
+if (check_paranoia_here('torrentcomments+')) {
+    $DB->query("
+    SELECT
+      COUNT(`ID`)
+    FROM
+      `comments`
+    WHERE
+      `Page` = 'artist'
+      AND `AuthorID` = '$UserID'
+    ");
+    list($NumArtistComments) = $DB->next_record();
+}
+
+if (check_paranoia_here('torrentcomments+')) {
+    $DB->query("
+    SELECT
+      COUNT(`ID`)
+    FROM
+      `comments`
+    WHERE
+      `Page` = 'collages'
+      AND `AuthorID` = '$UserID'
+    ");
+    list($NumCollageComments) = $DB->next_record();
+}
+
+if (check_paranoia_here('torrentcomments+')) {
+    $DB->query("
+    SELECT
+      COUNT(`ID`)
+    FROM
+      `comments`
+    WHERE
+      `Page` = 'requests'
+      AND `AuthorID` = '$UserID'
+    ");
+    list($NumRequestComments) = $DB->next_record();
+}
+
+if (check_paranoia_here('collages+')) {
+    $DB->query("
+    SELECT
+      COUNT(`ID`)
+    FROM
+      `collages`
+    WHERE
+      `Deleted` = '0'
+      AND `UserID` = '$UserID'
+    ");
+    list($NumCollages) = $DB->next_record();
+}
+
+if (check_paranoia_here('collagecontribs+')) {
+    $DB->query("
+    SELECT
+      COUNT(DISTINCT ct.`CollageID`)
+    FROM
+      `collages_torrents` AS ct
+    JOIN `collages` AS c
+    ON
+      ct.`CollageID` = c.`ID`
+    WHERE
+      c.`Deleted` = '0'
+      AND ct.`UserID` = '$UserID'
+    ");
+    list($NumCollageContribs) = $DB->next_record();
+}
+
+if (check_paranoia_here('uniquegroups+')) {
+    $DB->query("
+    SELECT
+      COUNT(DISTINCT `GroupID`)
+    FROM
+      `torrents`
+    WHERE
+      `UserID` = '$UserID'
+    ");
+    list($UniqueGroups) = $DB->next_record();
+}
+
+if (check_paranoia_here('seeding+')) {
+    $DB->query("
+    SELECT
+      COUNT(x.`uid`)
+    FROM
+      `xbt_files_users` AS x
+    INNER JOIN `torrents` AS t
+    ON
+      t.`ID` = x.`fid`
+    WHERE
+      x.`uid` = '$UserID'
+      AND x.`remaining` = 0
+    ");
+    list($Seeding) = $DB->next_record();
+}
+
+if (check_paranoia_here('leeching+')) {
+    $DB->query("
+    SELECT
+      COUNT(x.`uid`)
+    FROM
+      `xbt_files_users` AS x
+    INNER JOIN `torrents` AS t
+    ON
+      t.`ID` = x.`fid`
+    WHERE
+      x.`uid` = '$UserID'
+      AND x.`remaining` > 0
+    ");
+    list($Leeching) = $DB->next_record();
+}
+
+if (check_paranoia_here('invitedcount')) {
+    $DB->query("
+    SELECT
+      COUNT(`UserID`)
+    FROM
+      `users_info`
+    WHERE
+      `Inviter` = '$UserID'
+    ");
+    list($Invited) = $DB->next_record();
+}
+
+if (!$OwnProfile) {
+    $torrent_pass = '';
+}
+
+// Run through some paranoia stuff to decide what we can send out
+if (!check_paranoia_here('lastseen')) {
+    $LastAccess = '';
+}
+
+if (check_paranoia_here('ratio')) {
+    $Ratio = Format::get_ratio($Uploaded, $Downloaded, 5);
+} else {
+    $Ratio = null;
+}
+
+if (!check_paranoia_here('uploaded')) {
+    $Uploaded = null;
+}
+
+if (!check_paranoia_here('downloaded')) {
+    $Downloaded = null;
+}
+
+if (isset($RequiredRatio) && !check_paranoia_here('requiredratio')) {
+    $RequiredRatio = null;
+}
+
+if ($ParanoiaLevel === 0) {
+    $ParanoiaLevelText = 'Off';
+} elseif ($ParanoiaLevel === 1) {
+    $ParanoiaLevelText = 'Very Low';
+} elseif ($ParanoiaLevel <= 5) {
+    $ParanoiaLevelText = 'Low';
+} elseif ($ParanoiaLevel <= 20) {
+    $ParanoiaLevelText = 'High';
+} else {
+    $ParanoiaLevelText = 'Very high';
+}
+
+// Bugfix for no access time available
+if (!$LastAccess) {
+    $LastAccess = '';
+}
+
+header('Content-Type: text/plain; charset=utf-8');
+
+json_print('success', [
+  'username'    => $Username,
+  'avatar'      => $Avatar,
+  'isFriend'    => (bool) $Friend,
+  'profileText' => Text::full_format($Info),
+
+  'stats' => [
+    'joinedDate'    => $JoinDate,
+    'lastAccess'    => $LastAccess,
+    'uploaded'      => (int) $Uploaded,
+    'downloaded'    => (int) $Downloaded,
+    'ratio'         => (float) $Ratio,
+    'requiredRatio' => (float) $RequiredRatio
+  ],
+
+  'ranks' => [
+    'uploaded'   => (int) $UploadedRank,
+    'downloaded' => (int) $DownloadedRank,
+    'uploads'    => (int) $UploadsRank,
+    'requests'   => (int) $RequestRank,
+    'bounty'     => (int) $BountyRank,
+    'posts'      => (int) $PostRank,
+    'artists'    => (int) $ArtistsRank,
+    'overall'    => (int) $OverallRank
+  ],
+
+  'personal' => [
+    'class'        => $ClassLevels[$Class]['Name'],
+    'paranoia'     => (int) $ParanoiaLevel,
+    'paranoiaText' => $ParanoiaLevelText,
+    'donor'        => ($Donor === 1),
+    'warned'       => (bool) $Warned,
+    'enabled'      => ((int) $Enabled === 1 || (int) $Enabled === 0 || !$Enabled),
+    'passkey'      => $torrent_pass
+  ],
+
+  'community' => [
+    'posts'           => (int) $ForumPosts,
+    'torrentComments' => (int) $NumComments,
+    'artistComments'  => (int) $NumArtistComments,
+    'collageComments' => (int) $NumCollageComments,
+    'requestComments' => (int) $NumRequestComments,
+    'collagesStarted' => (int) $NumCollages,
+    'collagesContrib' => (int) $NumCollageContribs,
+    'requestsFilled'  => (int) $RequestsFilled,
+    'bountyEarned'    => (int) $TotalBounty,
+    'requestsVoted'   => (int) $RequestsVoted,
+    'bountySpent'     => (int) $TotalSpent,
+    'uploaded'        => (int) $Uploads,
+    'groups'          => (int) $UniqueGroups,
+    'seeding'         => (int) $Seeding,
+    'leeching'        => (int) $Leeching,
+    'snatched'        => (int) $Snatched,
+    'invited'         => (int) $Invited,
+    'artistsAdded'    => (int) $ArtistsAdded
+  ]
+]);

sections/api/user_recents.php

@@ -0,0 +1,96 @@
+<?php
+#declare(strict_types=1);
+
+# todo: Go through line by line
+$UserID = (int) $_GET['userid'];
+$Limit = (int) $_GET['limit'];
+
+if (empty($UserID) || $Limit > 50) {
+    json_die('failure', 'bad parameters');
+}
+
+if (empty($Limit)) {
+    $Limit = 15;
+}
+
+$Results = [];
+if (check_paranoia_here('snatched')) {
+    $DB->query("
+    SELECT
+      g.`id`,
+      g.`title`,
+      g.`picture`
+    FROM
+      `xbt_snatched` AS s
+    INNER JOIN `torrents` AS t
+    ON
+      t.`ID` = s.`fid`
+    INNER JOIN `torrents_group` AS g
+    ON
+      t.`GroupID` = g.`id`
+    WHERE
+      s.`uid` = '$UserID' AND g.`category_id` = '1' AND g.`picture` != ''
+    GROUP BY
+      g.`id`
+    ORDER BY
+      s.`tstamp`
+    DESC
+    LIMIT $Limit
+    ");
+
+    $RecentSnatches = $DB->to_array(false, MYSQLI_ASSOC);
+    $Artists = Artists::get_artists($DB->collect('ID'));
+
+    foreach ($RecentSnatches as $Key => $SnatchInfo) {
+        $RecentSnatches[$Key]['artists'][] = $Artists[$SnatchInfo['ID']];
+        $RecentSnatches[$Key]['ID'] = (int)$RecentSnatches[$Key]['ID'];
+    }
+    $Results['snatches'] = $RecentSnatches;
+} else {
+    $Results['snatches'] = 'hidden';
+}
+
+if (check_paranoia_here('uploads')) {
+    $DB->query("
+    SELECT
+      g.`id`,
+      g.`title`,
+      g.`picture`
+    FROM
+      `torrents_group` AS g
+    INNER JOIN `torrents` AS t
+    ON
+      t.`GroupID` = g.`id`
+    WHERE
+      t.`UserID` = '$UserID' AND g.`category_id` = '1' AND g.`picture` != ''
+    GROUP BY
+      g.`id`
+    ORDER BY
+      t.`Time`
+    DESC
+    LIMIT $Limit
+    ");
+
+    $RecentUploads = $DB->to_array(false, MYSQLI_ASSOC);
+    $Artists = Artists::get_artists($DB->collect('ID'));
+
+    foreach ($RecentUploads as $Key => $UploadInfo) {
+        $RecentUploads[$Key]['artists'][] = $Artists[$UploadInfo['ID']];
+        $RecentUploads[$Key]['ID'] = (int)$RecentUploads[$Key]['ID'];
+    }
+    $Results['uploads'] = $RecentUploads;
+} else {
+    $Results['uploads'] = 'hidden';
+}
+
+json_die('success', $Results);
+
+function check_paranoia_here($Setting)
+{
+    global $Paranoia, $Class, $UserID, $Preview;
+    if ($Preview == 1) {
+        return check_paranoia($Setting, $Paranoia, $Class);
+    } else {
+        return check_paranoia($Setting, $Paranoia, $Class, $UserID);
+    }
+}

sections/api/userhistory/index.php

@@ -0,0 +1,20 @@
+<?php
+#declare(strict_types=1);
+
+if ($_GET['type']) {
+    switch ($_GET['type']) {
+    case 'posts':
+      // Load post history page
+      include('post_history.php');
+      break;
+
+    default:
+      echo json_encode(
+          array('status' => 'failure')
+      );
+  }
+} else {
+    echo json_encode(
+        array('status' => 'failure')
+    );
+}

sections/api/userhistory/post_history.php

@@ -0,0 +1,186 @@
+<?php
+#declare(strict_types=1);
+
+# todo: Go through line by line
+function error_out($reason = '')
+{
+    $error = array('status' => 'failure');
+    if ($reason !== '') {
+        $error['reason'] = $reason;
+    }
+    echo $error;
+    error();
+}
+
+if (!empty($LoggedUser['DisableForums'])) {
+    error_out('You do not have access to the forums!');
+}
+
+$UserID = empty($_GET['userid']) ? $LoggedUser['ID'] : $_GET['userid'];
+if (!is_number($UserID)) {
+    error_out('User does not exist!');
+}
+
+if (isset($LoggedUser['PostsPerPage'])) {
+    $PerPage = $LoggedUser['PostsPerPage'];
+} else {
+    $PerPage = POSTS_PER_PAGE;
+}
+
+list($Page, $Limit) = Format::page_limit($PerPage);
+
+$UserInfo = Users::user_info($UserID);
+extract(array_intersect_key($UserInfo, array_flip(array('Username', 'Enabled', 'Title', 'Avatar', 'Donor', 'Warned'))));
+
+$ViewingOwn = ($UserID === $LoggedUser['ID']);
+$ShowUnread = ($ViewingOwn && (!isset($_GET['showunread']) || !!$_GET['showunread']));
+$ShowGrouped = ($ViewingOwn && (!isset($_GET['group']) || !!$_GET['group']));
+if ($ShowGrouped) {
+    $SQL = '
+    SELECT
+      SQL_CALC_FOUND_ROWS
+      MAX(p.ID) AS ID
+    FROM forums_posts AS p
+      LEFT JOIN forums_topics AS t ON t.ID = p.TopicID';
+    if ($ShowUnread) {
+        $SQL .= '
+      LEFT JOIN forums_last_read_topics AS l ON l.TopicID = t.ID AND l.UserID = '.$LoggedUser['ID'];
+    }
+    $SQL .= '
+      LEFT JOIN forums AS f ON f.ID = t.ForumID
+    WHERE p.AuthorID = '.$UserID.'
+      AND ' . Forums::user_forums_sql();
+    if ($ShowUnread) {
+        $SQL .= '
+      AND ((t.IsLocked = \'0\' OR t.IsSticky = \'1\')
+      AND (l.PostID < t.LastPostID OR l.PostID IS NULL))';
+    }
+    $SQL .= "
+    GROUP BY t.ID
+    ORDER BY p.ID DESC
+    LIMIT $Limit";
+    $PostIDs = $DB->query($SQL);
+    $DB->query('SELECT FOUND_ROWS()');
+    list($Results) = $DB->next_record();
+
+    if ($Results > $PerPage * ($Page - 1)) {
+        $DB->set_query_id($PostIDs);
+        $PostIDs = $DB->collect('ID');
+        $SQL = "
+      SELECT
+        p.ID,
+        p.AddedTime,
+        p.Body,
+        p.EditedUserID,
+        p.EditedTime,
+        ed.Username,
+        p.TopicID,
+        t.Title,
+        t.LastPostID,
+        l.PostID AS LastRead,
+        t.IsLocked,
+        t.IsSticky
+      FROM forums_posts AS p
+        LEFT JOIN users_main AS um ON um.ID = p.AuthorID
+        LEFT JOIN users_info AS ui ON ui.UserID = p.AuthorID
+        LEFT JOIN users_main AS ed ON ed.ID = p.EditedUserID
+        JOIN forums_topics AS t ON t.ID = p.TopicID
+        JOIN forums AS f ON f.ID = t.ForumID
+        LEFT JOIN forums_last_read_topics AS l ON l.UserID = $UserID AND l.TopicID = t.ID
+      WHERE p.ID IN (".implode(',', $PostIDs).')
+      ORDER BY p.ID DESC';
+        $Posts = $DB->query($SQL);
+    }
+} else {
+    $SQL = '
+    SELECT
+      SQL_CALC_FOUND_ROWS';
+    if ($ShowGrouped) {
+        $SQL .= '
+      *
+    FROM (
+      SELECT';
+    }
+    $SQL .= '
+        p.ID,
+        p.AddedTime,
+        p.Body,
+        p.EditedUserID,
+        p.EditedTime,
+        ed.Username,
+        p.TopicID,
+        t.Title,
+        t.LastPostID,';
+    if ($UserID === $LoggedUser['ID']) {
+        $SQL .= '
+        l.PostID AS LastRead,';
+    }
+    $SQL .= "
+        t.IsLocked,
+        t.IsSticky
+      FROM forums_posts AS p
+        LEFT JOIN users_main AS um ON um.ID = p.AuthorID
+        LEFT JOIN users_info AS ui ON ui.UserID = p.AuthorID
+        LEFT JOIN users_main AS ed ON ed.ID = p.EditedUserID
+        JOIN forums_topics AS t ON t.ID = p.TopicID
+        JOIN forums AS f ON f.ID = t.ForumID
+        LEFT JOIN forums_last_read_topics AS l ON l.UserID = $UserID AND l.TopicID = t.ID
+      WHERE p.AuthorID = $UserID
+        AND " . Forums::user_forums_sql();
+
+    if ($ShowUnread) {
+        $SQL .= '
+        AND ((t.IsLocked = \'0\' OR t.IsSticky = \'1\')
+          AND (l.PostID < t.LastPostID OR l.PostID IS NULL)
+        ) ';
+    }
+
+    $SQL .= '
+      ORDER BY p.ID DESC';
+
+    if ($ShowGrouped) {
+        $SQL .= '
+    ) AS sub
+    GROUP BY TopicID
+    ORDER BY ID DESC';
+    }
+
+    $SQL .= "
+    LIMIT $Limit";
+    $Posts = $DB->query($SQL);
+
+    $DB->query('SELECT FOUND_ROWS()');
+    list($Results) = $DB->next_record();
+
+    $DB->set_query_id($Posts);
+}
+
+$JsonResults = [];
+while (list($PostID, $AddedTime, $Body, $EditedUserID, $EditedTime, $EditedUsername, $TopicID, $ThreadTitle, $LastPostID, $LastRead, $Locked, $Sticky) = $DB->next_record()) {
+    $JsonResults[] = array(
+    'postId' => (int)$PostID,
+    'topicId' => (int)$TopicID,
+    'threadTitle' => $ThreadTitle,
+    'lastPostId' => (int)$LastPostID,
+    'lastRead' => (int)$LastRead,
+    'locked' => $Locked === '1',
+    'sticky' => $Sticky === '1',
+    'addedTime' => $AddedTime,
+    'body' => Text::full_format($Body),
+    'bbbody' => $Body,
+    'editedUserId' => (int)$EditedUserID,
+    'editedTime' => $EditedTime,
+    'editedUsername' => $EditedUsername
+    );
+}
+
+echo json_encode(
+    array(
+    'status' => 'success',
+    'response' => array(
+      'currentPage' => (int)$Page,
+      'pages' => ceil($Results / $PerPage),
+      'threads' => $JsonResults
+      )
+    )
+);

sections/api/usersearch.php

@@ -0,0 +1,58 @@
+<?php
+/**********************************************************************
+ *>>>>>>>>>>>>>>>>>>>>>>>>>>> User search <<<<<<<<<<<<<<<<<<<<<<<<<<<<*
+ **********************************************************************/
+
+if (empty($_GET['search'])) {
+  json_die("failure", "no search terms");
+} else {
+  $_GET['username'] = $_GET['search'];
+}
+
+define('USERS_PER_PAGE', 30);
+
+if (isset($_GET['username'])) {
+  $_GET['username'] = trim($_GET['username']);
+
+  list($Page, $Limit) = Format::page_limit(USERS_PER_PAGE);
+  $DB->query("
+    SELECT
+      SQL_CALC_FOUND_ROWS
+      ID,
+      Username,
+      Enabled,
+      PermissionID,
+      Donor,
+      Warned,
+      Avatar
+    FROM users_main AS um
+      JOIN users_info AS ui ON ui.UserID = um.ID
+    WHERE Username LIKE '%".db_string($_GET['username'])."%'
+    ORDER BY Username
+    LIMIT $Limit");
+  $Results = $DB->to_array();
+  $DB->query('SELECT FOUND_ROWS();');
+  list($NumResults) = $DB->next_record();
+
+}
+
+$JsonUsers = [];
+foreach ($Results as $Result) {
+  list($UserID, $Username, $Enabled, $PermissionID, $Donor, $Warned, $Avatar) = $Result;
+
+  $JsonUsers[] = [
+    'userId' => (int)$UserID,
+    'username' => $Username,
+    'donor' => $Donor == 1,
+    'warned' => (bool)$Warned,
+    'enabled' => ($Enabled == 2 ? false : true),
+    'class' => Users::make_class_string($PermissionID),
+    'avatar' => $Avatar
+  ];
+}
+
+json_die("success", [
+  'currentPage' => (int)$Page,
+  'pages' => ceil($NumResults / USERS_PER_PAGE),
+  'results' => $JsonUsers
+]);

sections/api/wiki.php

@@ -0,0 +1,41 @@
+<?php
+#declare(strict_types=1);
+
+if (!empty($_GET['id']) && is_number($_GET['id'])) {
+    // Visiting article via ID
+    $ArticleID = $_GET['id'];
+} elseif ($_GET['name'] !== '') {
+    // Retrieve article ID via alias
+    $ArticleID = Wiki::alias_to_id($_GET['name']);
+} else {
+    json_die('failure');
+}
+
+// No article found
+if (!$ArticleID) {
+    json_die('failure', 'article not found');
+}
+
+$Article = Wiki::get_article($ArticleID, false);
+if (!$Article) {
+    json_die('failure', 'article not found');
+}
+
+list($Revision, $Title, $Body, $Read, $Edit, $Date, $AuthorID, $AuthorName, $Aliases, $UserIDs) = array_shift($Article);
+if ($Read > $LoggedUser['EffectiveClass']) {
+    json_die('failure', 'higher user class required to view article');
+}
+
+Text::$TOC = true;
+$TextBody = Text::full_format($Body, false);
+
+json_die('success', array(
+  'title'      => $Title,
+  'bbBody'     => $Body,
+  'body'       => $TextBody,
+  'aliases'    => $Aliases,
+  'authorID'   => (int) $AuthorID,
+  'authorName' => $AuthorName,
+  'date'       => $Date,
+  'revision'   => (int) $Revision
+));

sections/artist/add_alias.php

@@ -1,23 +1,25 @@
-<?
+<?php
+#declare(strict_types=1);
+
 authorize();
 
 if (!check_perms('torrents_edit')) {
-  error(403);
+    error(403);
 }
 $ArtistID = $_POST['artistid'];
 $Redirect = $_POST['redirect'];
 $AliasName = Artists::normalise_artist_name($_POST['name']);
 $DBAliasName = db_string($AliasName);
 if (!$Redirect) {
-  $Redirect = 0;
+    $Redirect = 0;
 }
 
 if (!is_number($ArtistID) || !($Redirect === 0 || is_number($Redirect)) || !$ArtistID) {
-  error(0);
+    error(0);
 }
 
 if ($AliasName == '') {
-  error('Blank artist name.');
+    error('Blank artist name.');
 }
 
 /*
@@ -33,58 +35,57 @@ $DB->query("
   FROM artists_alias
   WHERE Name = '$DBAliasName'");
 if ($DB->has_results()) {
-  while (list($CloneAliasID, $CloneArtistID, $CloneAliasName, $CloneRedirect) = $DB->next_record(MYSQLI_NUM, false)) {
-    if (!strcasecmp($CloneAliasName, $AliasName)) {
-      break;
+    while (list($CloneAliasID, $CloneArtistID, $CloneAliasName, $CloneRedirect) = $DB->next_record(MYSQLI_NUM, false)) {
+        if (!strcasecmp($CloneAliasName, $AliasName)) {
+            break;
+        }
     }
-  }
-  if ($CloneAliasID) {
-    if ($ArtistID == $CloneArtistID && $Redirect == 0) {
-      if ($CloneRedirect != 0) {
-        $DB->query("
+    if ($CloneAliasID) {
+        if ($ArtistID == $CloneArtistID && $Redirect == 0) {
+            if ($CloneRedirect != 0) {
+                $DB->query("
           UPDATE artists_alias
           SET ArtistID = '$ArtistID', Redirect = 0
           WHERE AliasID = '$CloneAliasID'");
-        Misc::write_log("Redirection for the alias $CloneAliasID ($DBAliasName) for the artist $ArtistID was removed by user $LoggedUser[ID] ($LoggedUser[Username])");
-      } else {
-        error('No changes were made as the target alias did not redirect anywhere.');
-      }
-    } else {
-      error('An alias by that name already exists <a href="artist.php?id='.$CloneArtistID.'">here</a>. You can try renaming that artist to this one.');
+                Misc::write_log("Redirection for the alias $CloneAliasID ($DBAliasName) for the artist $ArtistID was removed by user $LoggedUser[ID] ($LoggedUser[Username])");
+            } else {
+                error('No changes were made as the target alias did not redirect anywhere.');
+            }
+        } else {
+            error('An alias by that name already exists <a href="artist.php?id='.$CloneArtistID.'">here</a>. You can try renaming that artist to this one.');
+        }
     }
-  }
 }
 if (!$CloneAliasID) {
-  if ($Redirect) {
-    $DB->query("
+    if ($Redirect) {
+        $DB->query("
       SELECT ArtistID, Redirect
       FROM artists_alias
       WHERE AliasID = $Redirect");
-    if (!$DB->has_results()) {
-      error('Cannot redirect to a nonexistent artist alias.');
+        if (!$DB->has_results()) {
+            error('Cannot redirect to a nonexistent artist alias.');
+        }
+        list($FoundArtistID, $FoundRedirect) = $DB->next_record();
+        if ($ArtistID != $FoundArtistID) {
+            error('Redirection must target an alias for the current artist.');
+        }
+        if ($FoundRedirect != 0) {
+            $Redirect = $FoundRedirect;
+        }
     }
-    list($FoundArtistID, $FoundRedirect) = $DB->next_record();
-    if ($ArtistID != $FoundArtistID) {
-      error('Redirection must target an alias for the current artist.');
-    }
-    if ($FoundRedirect != 0) {
-      $Redirect = $FoundRedirect;
-    }
-  }
-  $DB->query("
+    $DB->query("
     INSERT INTO artists_alias
       (ArtistID, Name, Redirect, UserID)
     VALUES
       ($ArtistID, '$DBAliasName', $Redirect, ".$LoggedUser['ID'].')');
-  $AliasID = $DB->inserted_id();
+    $AliasID = $DB->inserted_id();
 
-  $DB->query("
+    $DB->query("
     SELECT Name
     FROM artists_group
     WHERE ArtistID = $ArtistID");
-  list($ArtistName) = $DB->next_record(MYSQLI_NUM, false);
+    list($ArtistName) = $DB->next_record(MYSQLI_NUM, false);
 
-  Misc::write_log("The alias $AliasID ($DBAliasName) was added to the artist $ArtistID (".db_string($ArtistName).') by user '.$LoggedUser['ID'].' ('.$LoggedUser['Username'].')');
+    Misc::write_log("The alias $AliasID ($DBAliasName) was added to the artist $ArtistID (".db_string($ArtistName).') by user '.$LoggedUser['ID'].' ('.$LoggedUser['Username'].')');
 }
 header('Location: '.$_SERVER['HTTP_REFERER']);
-?>

sections/artist/artist.php

@@ -191,7 +191,7 @@ $OldGroupID = 0;
     <?php
 
 foreach ($TorrentList as $Group) {
-    extract(Torrents::array_group($TorrentList[$Group['ID']]), EXTR_OVERWRITE);
+    extract(Torrents::array_group($TorrentList[$Group['id']]), EXTR_OVERWRITE);
 
     if ($GroupID === $OldGroupID) {
         continue;

sections/artist/change_artistid.php

@@ -1,11 +1,13 @@
-<?
+<?php
+#declare(strict_types=1);
+
 authorize();
 
 if (!check_perms('torrents_edit')) {
-  error(403);
+    error(403);
 }
 if (!empty($_POST['newartistid']) && !empty($_POST['newartistname'])) {
-  error('Please enter a valid artist ID number or a valid artist name.');
+    error('Please enter a valid artist ID number or a valid artist name.');
 }
 $ArtistID = (int)$_POST['artistid'];
 $NewArtistID = (int)$_POST['newartistid'];
@@ -13,10 +15,10 @@ $NewArtistName = $_POST['newartistname'];
 
 
 if (!is_number($ArtistID) || !$ArtistID) {
-  error('Please select a valid artist to change.');
+    error('Please select a valid artist to change.');
 }
 if (empty($NewArtistName) && (!$NewArtistID || !is_number($NewArtistID))) {
-  error('Please enter a valid artist ID number or a valid artist name.');
+    error('Please enter a valid artist ID number or a valid artist name.');
 }
 
 $DB->query("
@@ -25,171 +27,173 @@ $DB->query("
   WHERE ArtistID = $ArtistID
   LIMIT 1");
 if (!(list($ArtistName) = $DB->next_record(MYSQLI_NUM, false))) {
-  error('An error has occurred.');
+    error('An error has occurred.');
 }
 
 if ($NewArtistID > 0) {
-  // Make sure that's a real artist ID number, and grab the name
-  $DB->query("
+    // Make sure that's a real artist ID number, and grab the name
+    $DB->query("
     SELECT Name
     FROM artists_group
     WHERE ArtistID = $NewArtistID
     LIMIT 1");
-  if (!(list($NewArtistName) = $DB->next_record())) {
-    error('Please enter a valid artist ID number.');
-  }
+    if (!(list($NewArtistName) = $DB->next_record())) {
+        error('Please enter a valid artist ID number.');
+    }
 } else {
-  // Didn't give an ID, so try to grab based on the name
-  $DB->query("
+    // Didn't give an ID, so try to grab based on the name
+    $DB->query("
     SELECT ArtistID
     FROM artists_alias
     WHERE Name = '".db_string($NewArtistName)."'
     LIMIT 1");
-  if (!(list($NewArtistID) = $DB->next_record())) {
-    error('No artist by that name was found.');
-  }
+    if (!(list($NewArtistID) = $DB->next_record())) {
+        error('No artist by that name was found.');
+    }
 }
 
 if ($ArtistID == $NewArtistID) {
-  error('You cannot merge an artist with itself.');
+    error('You cannot merge an artist with itself.');
 }
 if (isset($_POST['confirm'])) {
-  // Get the information for the cache update
-  $DB->query("
+    // Get the information for the cache update
+    $DB->query("
     SELECT DISTINCT GroupID
     FROM torrents_artists
     WHERE ArtistID = $ArtistID");
-  $Groups = $DB->collect('GroupID');
-  $DB->query("
+    $Groups = $DB->collect('GroupID');
+    $DB->query("
     SELECT DISTINCT RequestID
     FROM requests_artists
     WHERE ArtistID = $ArtistID");
-  $Requests = $DB->collect('RequestID');
-  $DB->query("
+    $Requests = $DB->collect('RequestID');
+    $DB->query("
     SELECT DISTINCT UserID
     FROM bookmarks_artists
     WHERE ArtistID = $ArtistID");
-  $BookmarkUsers = $DB->collect('UserID');
-  $DB->query("
+    $BookmarkUsers = $DB->collect('UserID');
+    $DB->query("
     SELECT DISTINCT ct.CollageID
     FROM collages_torrents AS ct
       JOIN torrents_artists AS ta ON ta.GroupID = ct.GroupID
     WHERE ta.ArtistID = $ArtistID");
-  $Collages = $DB->collect('CollageID');
+    $Collages = $DB->collect('CollageID');
 
-  // And the info to avoid double-listing an artist if it and the target are on the same group
-  $DB->query("
+    // And the info to avoid double-listing an artist if it and the target are on the same group
+    $DB->query("
     SELECT DISTINCT GroupID
     FROM torrents_artists
     WHERE ArtistID = $NewArtistID");
-  $NewArtistGroups = $DB->collect('GroupID');
-  $NewArtistGroups[] = '0';
-  $NewArtistGroups = implode(',', $NewArtistGroups);
+    $NewArtistGroups = $DB->collect('GroupID');
+    $NewArtistGroups[] = '0';
+    $NewArtistGroups = implode(',', $NewArtistGroups);
 
-  $DB->query("
+    $DB->query("
     SELECT DISTINCT RequestID
     FROM requests_artists
     WHERE ArtistID = $NewArtistID");
-  $NewArtistRequests = $DB->collect('RequestID');
-  $NewArtistRequests[] = '0';
-  $NewArtistRequests = implode(',', $NewArtistRequests);
+    $NewArtistRequests = $DB->collect('RequestID');
+    $NewArtistRequests[] = '0';
+    $NewArtistRequests = implode(',', $NewArtistRequests);
 
-  $DB->query("
+    $DB->query("
     SELECT DISTINCT UserID
     FROM bookmarks_artists
     WHERE ArtistID = $NewArtistID");
-  $NewArtistBookmarks = $DB->collect('UserID');
-  $NewArtistBookmarks[] = '0';
-  $NewArtistBookmarks = implode(',', $NewArtistBookmarks);
+    $NewArtistBookmarks = $DB->collect('UserID');
+    $NewArtistBookmarks[] = '0';
+    $NewArtistBookmarks = implode(',', $NewArtistBookmarks);
 
-  // Merge all of this artist's aliases onto the new artist
-  $DB->query("
+    // Merge all of this artist's aliases onto the new artist
+    $DB->query("
     UPDATE artists_alias
     SET ArtistID = $NewArtistID
     WHERE ArtistID = $ArtistID");
 
-  // Update the torrent groups, requests, and bookmarks
-  $DB->query("
+    // Update the torrent groups, requests, and bookmarks
+    $DB->query("
     UPDATE IGNORE torrents_artists
     SET ArtistID = $NewArtistID
     WHERE ArtistID = $ArtistID
       AND GroupID NOT IN ($NewArtistGroups)");
-  $DB->query("
+    $DB->query("
     DELETE FROM torrents_artists
     WHERE ArtistID = $ArtistID");
-  $DB->query("
+    $DB->query("
     UPDATE IGNORE requests_artists
     SET ArtistID = $NewArtistID
     WHERE ArtistID = $ArtistID
       AND RequestID NOT IN ($NewArtistRequests)");
-  $DB->query("
+    $DB->query("
     DELETE FROM requests_artists
     WHERE ArtistID = $ArtistID");
-  $DB->query("
+    $DB->query("
     UPDATE IGNORE bookmarks_artists
     SET ArtistID = $NewArtistID
     WHERE ArtistID = $ArtistID
       AND UserID NOT IN ($NewArtistBookmarks)");
-  $DB->query("
+    $DB->query("
     DELETE FROM bookmarks_artists
     WHERE ArtistID = $ArtistID");
 
-  // Cache clearing
-  if (!empty($Groups)) {
-    foreach ($Groups as $GroupID) {
-      $Cache->delete_value("groups_artists_$GroupID");
-      Torrents::update_hash($GroupID);
+    // Cache clearing
+    if (!empty($Groups)) {
+        foreach ($Groups as $GroupID) {
+            $Cache->delete_value("groups_artists_$GroupID");
+            Torrents::update_hash($GroupID);
+        }
     }
-  }
-  if (!empty($Requests)) {
-    foreach ($Requests as $RequestID) {
-      $Cache->delete_value("request_artists_$RequestID");
-      Requests::update_sphinx_requests($RequestID);
+    if (!empty($Requests)) {
+        foreach ($Requests as $RequestID) {
+            $Cache->delete_value("request_artists_$RequestID");
+            Requests::update_sphinx_requests($RequestID);
+        }
     }
-  }
-  if (!empty($BookmarkUsers)) {
-    foreach ($BookmarkUsers as $UserID) {
-      $Cache->delete_value("notify_artists_$UserID");
+    if (!empty($BookmarkUsers)) {
+        foreach ($BookmarkUsers as $UserID) {
+            $Cache->delete_value("notify_artists_$UserID");
+        }
     }
-  }
-  if (!empty($Collages)) {
-    foreach ($Collages as $CollageID) {
-      $Cache->delete_value("collage_$CollageID");
+    if (!empty($Collages)) {
+        foreach ($Collages as $CollageID) {
+            $Cache->delete_value("collage_$CollageID");
+        }
     }
-  }
 
-  $Cache->delete_value("artist_$ArtistID");
-  $Cache->delete_value("artist_$NewArtistID");
-  $Cache->delete_value("artist_groups_$ArtistID");
-  $Cache->delete_value("artist_groups_$NewArtistID");
+    $Cache->delete_value("artist_$ArtistID");
+    $Cache->delete_value("artist_$NewArtistID");
+    $Cache->delete_value("artist_groups_$ArtistID");
+    $Cache->delete_value("artist_groups_$NewArtistID");
 
-  // Delete the old artist
-  $DB->query("
+    // Delete the old artist
+    $DB->query("
     DELETE FROM artists_group
     WHERE ArtistID = $ArtistID");
 
-  Misc::write_log("The artist $ArtistID ($ArtistName) was made into a non-redirecting alias of artist $NewArtistID ($NewArtistName) by user ".$LoggedUser['ID']." (".$LoggedUser['Username'].')');
+    Misc::write_log("The artist $ArtistID ($ArtistName) was made into a non-redirecting alias of artist $NewArtistID ($NewArtistName) by user ".$LoggedUser['ID']." (".$LoggedUser['Username'].')');
 
-  header("Location: artist.php?action=edit&artistid=$NewArtistID");
+    header("Location: artist.php?action=edit&artistid=$NewArtistID");
 } else {
-  View::show_header('Merging Artists');
-?>
-  <div class="header">
-    <h2>Confirm merge</h2>
+    View::show_header('Merging Artists'); ?>
+<div class="header">
+  <h2>Confirm merge</h2>
+</div>
+<form class="merge_form" name="artist" action="artist.php" method="post">
+  <input type="hidden" name="action" value="change_artistid" />
+  <input type="hidden" name="auth"
+    value="<?=$LoggedUser['AuthKey']?>" />
+  <input type="hidden" name="artistid" value="<?=$ArtistID?>" />
+  <input type="hidden" name="newartistid"
+    value="<?=$NewArtistID?>" />
+  <input type="hidden" name="confirm" value="1" />
+  <div style="text-align: center;">
+    <p>Please confirm that you wish to make <a
+        href="artist.php?id=<?=$ArtistID?>"><?=display_str($ArtistName)?> (<?=$ArtistID?>)</a> into a non-redirecting alias of <a
+        href="artist.php?id=<?=$NewArtistID?>"><?=display_str($NewArtistName)?> (<?=$NewArtistID?>)</a>.</p>
+    <br />
+    <input type="submit" value="Confirm" />
   </div>
-  <form class="merge_form" name="artist" action="artist.php" method="post">
-    <input type="hidden" name="action" value="change_artistid" />
-    <input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
-    <input type="hidden" name="artistid" value="<?=$ArtistID?>" />
-    <input type="hidden" name="newartistid" value="<?=$NewArtistID?>" />
-    <input type="hidden" name="confirm" value="1" />
-    <div style="text-align: center;">
-      <p>Please confirm that you wish to make <a href="artist.php?id=<?=$ArtistID?>"><?=display_str($ArtistName)?> (<?=$ArtistID?>)</a> into a non-redirecting alias of <a href="artist.php?id=<?=$NewArtistID?>"><?=display_str($NewArtistName)?> (<?=$NewArtistID?>)</a>.</p>
-      <br />
-      <input type="submit" value="Confirm" />
-    </div>
-  </form>
-<?
+</form>
+<?php
   View::show_footer();
 }
-?>

sections/artist/delete.php

@@ -1,11 +1,13 @@
-<?
+<?php
+
+/*
 /************************************************************************
 ||------------|| Delete artist ||--------------------------------------||
 
 This is a very powerful page - it deletes an artist, and all associated
 requests and torrents. It is called when $_GET['action'] == 'delete'.
 
-************************************************************************/
+************************************************************************
 
 authorize();
 
@@ -34,23 +36,26 @@ $DB->query("
 $Count = $DB->record_count();
 if ($DB->has_results()) {
 ?>
-  <div>
-    There are still torrents that have <a href="artist.php?id=<?=$ArtistID?>" class="tooltip" title="View artist" dir="ltr"><?=$Name?></a> as an artist.<br />
-    Please remove the artist from these torrents manually before attempting to delete.<br />
-    <div class="box pad">
-      <ul>
-<?
+<div>
+  There are still torrents that have <a
+    href="artist.php?id=<?=$ArtistID?>" class="tooltip"
+    title="View artist" dir="ltr"><?=$Name?></a> as an artist.<br />
+  Please remove the artist from these torrents manually before attempting to delete.<br />
+  <div class="box pad">
+    <ul>
+      <?
   while (list($GroupName, $GroupID) = $DB->next_record(MYSQLI_NUM, true)) {
 ?>
-        <li>
-          <a href="torrents.php?id=<?=$GroupID?>" class="tooltip" title="View torrent group" dir="ltr"><?=$GroupName?></a>
-        </li>
-<?
+      <li>
+        <a href="torrents.php?id=<?=$GroupID?>" class="tooltip"
+          title="View torrent group" dir="ltr"><?=$GroupName?></a>
+      </li>
+      <?
   }
 ?>
-      </ul>
-    </div>
+    </ul>
   </div>
+</div>
 <?
 }
 
@@ -62,32 +67,36 @@ $DB->query("
 $Count += $DB->record_count();
 if ($DB->has_results()) {
 ?>
-  <div>
-    There are still requests that have <a href="artist.php?id=<?=$ArtistID?>" class="tooltip" title="View artist" dir="ltr"><?=$Name?></a> as an artist.<br />
-    Please remove the artist from these requests manually before attempting to delete.<br />
-    <div class="box pad">
-      <ul>
-<?
+<div>
+  There are still requests that have <a
+    href="artist.php?id=<?=$ArtistID?>" class="tooltip"
+    title="View artist" dir="ltr"><?=$Name?></a> as an artist.<br />
+  Please remove the artist from these requests manually before attempting to delete.<br />
+  <div class="box pad">
+    <ul>
+      <?
   while (list($RequestName, $RequestID) = $DB->next_record(MYSQLI_NUM, true)) {
 ?>
-        <li>
-          <a href="requests.php?action=view&amp;id=<?=$RequestID?>" class="tooltip" title="View request" dir="ltr"><?=$RequestName?></a>
-        </li>
-<?
+      <li>
+        <a href="requests.php?action=view&amp;id=<?=$RequestID?>"
+          class="tooltip" title="View request" dir="ltr"><?=$RequestName?></a>
+      </li>
+      <?
   }
 ?>
-      </ul>
-    </div>
+    </ul>
   </div>
+</div>
 <?
 }
 
 if ($Count == 0) {
   Artists::delete_artist($ArtistID);
 ?>
-  <div class="box pad">
-    Artist "<?=$Name?>" deleted!
-  </div>
+<div class="box pad">
+  Artist "<?=$Name?>" deleted!
+</div>
 <?
 }
 View::show_footer();?>
+*/

sections/forums/thread.php

@@ -516,7 +516,7 @@ foreach ($Thread as $Key => $Post) {
     <td colspan="<?=Users::has_avatars_enabled() ? 2 : 1?>">
       <div class="float_left"><a class="post_id"
           href="forums.php?action=viewthread&amp;threadid=<?=$ThreadID?>&amp;postid=<?=$PostID?>#post<?=$PostID?>">#<?=$PostID?></a>
-        <?=Users::format_username($AuthorID, true, true, true, true, true, $IsDonorForum);
+        <?=Users::format_username($AuthorID, true, true, true, true, true);
     echo "\n"; ?>
         <?=time_diff($AddedTime, 2);
     echo "\n"; ?>
@@ -598,7 +598,7 @@ foreach ($Thread as $Key => $Post) {
             onclick="LoadEdit('forums', <?=$PostID?>, 1); return false;">&laquo;</a>
           <?php } ?>
           Last edited by
-          <?=Users::format_username($EditedUserID, false, false, false, false, false, $IsDonorForum) ?>
+          <?=Users::format_username($EditedUserID, false, false, false, false, false) ?>
           <?=time_diff($EditedTime, 2, true, true)?>
         </div>
         <?php } ?>

sections/index/private.php

@@ -93,15 +93,26 @@ for ($i = 0; $i < $Limit; $i++) {
 if (($Freeleeches = $Cache->get_value('shop_freeleech_list')) === false) {
     $DB->query("
     SELECT
-      TorrentID,
-      UNIX_TIMESTAMP(ExpiryTime),
-      COALESCE(NULLIF(Name,''), NULLIF(Title2,''), NameJP) AS Name,
-      WikiImage
-    FROM shop_freeleeches AS sf
-    LEFT JOIN torrents AS t on sf.TorrentID=t.ID
-    LEFT JOIN torrents_group AS tg ON tg.ID=t.GroupID
-    ORDER BY ExpiryTime ASC
-    LIMIT 10");
+      `TorrentID`,
+      UNIX_TIMESTAMP(`ExpiryTime`),
+      COALESCE(
+        NULLIF(`title`, ''),
+        NULLIF(`subject`, ''),
+        `object`
+      ) AS `Name`,
+      `picture`
+    FROM
+      `shop_freeleeches` AS sf
+    LEFT JOIN `torrents` AS t
+    ON
+      sf.`TorrentID` = t.`ID`
+    LEFT JOIN `torrents_group` AS tg
+    ON
+      tg.`id` = t.`GroupID`
+    ORDER BY
+      `ExpiryTime` ASC
+    LIMIT 10
+    ");
     $Freeleeches = $DB->to_array();
     $Cache->cache_value('shop_freeleech_list', $Freeleeches, 1209600);
 }
@@ -447,16 +458,25 @@ $Recommend_artists = $Cache->get_value('recommend_artists');
 if (!is_array($Recommend) || !is_array($Recommend_artists)) {
     $DB->query("
     SELECT
-      tr.GroupID,
-      tr.UserID,
-      u.Username,
-      tg.Name,
-      tg.TagList
-    FROM torrents_recommended AS tr
-      JOIN torrents_group AS tg ON tg.ID = tr.GroupID
-      LEFT JOIN users_main AS u ON u.ID = tr.UserID
-    ORDER BY tr.Time DESC
-    LIMIT 10");
+      tr.`GroupID`,
+      tr.`UserID`,
+      u.`Username`,
+      tg.`title`,
+      tg.`tag_list`
+    FROM
+      `torrents_recommended` AS tr
+    JOIN `torrents_group` AS tg
+    ON
+      tg.`id` = tr.`GroupID`
+    LEFT JOIN `users_main` AS u
+    ON
+      u.`ID` = tr.`UserID`
+    ORDER BY
+      tr.`Time`
+    DESC
+    LIMIT 10
+    ");
+    
     $Recommend = $DB->to_array();
     $Cache->cache_value('recommend', $Recommend, 1209600);
 

sections/locked/index.php

@@ -1,5 +1,5 @@
 <?php
-#declare(strict_types=1);
+declare(strict_types=1);
 
 enforce_login();
 
@@ -7,4 +7,4 @@ if (!check_perms('users_mod') && !isset(G::$LoggedUser['LockedAccount'])) {
     error(404);
 }
 
-include 'default.php';
+require_once 'default.php';

sections/rules/chat.php

@@ -13,30 +13,6 @@ View::show_header('Chat Rules');
 
 /*
 echo '<pre>';
-/*
-# https://github.com/J7mbo/twitter-api-php
-require_once('TwitterAPIExchange.php');
-
-$settings = array(
-  'oauth_access_token' => "YOUR_OAUTH_ACCESS_TOKEN",
-  'oauth_access_token_secret' => "YOUR_OAUTH_ACCESS_TOKEN_SECRET",
-  'consumer_key' => "YOUR_CONSUMER_KEY",
-  'consumer_secret' => "YOUR_CONSUMER_SECRET"
-);
-
-$url = 'https://api.twitter.com/1.1/blocks/create.json';
-$requestMethod = 'POST';
-
-$postfields = array(
-  'screen_name' => 'usernameToBlock',
-  'skip_status' => '1'
-);
-
-$twitter = new TwitterAPIExchange($settings);
-echo $twitter->buildOauth($url, $requestMethod)
-    ->setPostfields($postfields)
-    ->performRequest();
-* /
 
 #var_dump();
 #var_dump();

sections/schedule/daily/top10_daily.php

@@ -9,25 +9,33 @@ $HistoryID = $DB->inserted_id();
 $Top10 = $Cache->get_value('top10tor_day_10');
 if ($Top10 === false) {
     $DB->query("
-      SELECT
-        t.ID,
-        g.ID,
-        g.Name,
-        g.CategoryID,
-        g.WikiImage,
-        g.TagList,
-        t.Media,
-        g.Year,
-        t.Snatched,
-        t.Seeders,
-        t.Leechers,
-        ((t.Size * t.Snatched) + (t.Size * 0.5 * t.Leechers)) AS Data
-      FROM torrents AS t
-        LEFT JOIN torrents_group AS g ON g.ID = t.GroupID
-      WHERE t.Seeders > 0
-        AND t.Time > ('$sqltime' - INTERVAL 1 DAY)
-      ORDER BY (t.Seeders + t.Leechers) DESC
-      LIMIT 10;");
+    SELECT
+      t.`ID`,
+      g.`id`,
+      g.`title`,
+      g.`category_id`,
+      g.`picture`,
+      g.`tag_list`,
+      t.`Media`,
+      g.`published`,
+      t.`Snatched`,
+      t.`Seeders`,
+      t.`Leechers`,
+      (
+        (t.`Size` * t.`Snatched`) +(t.`Size` * 0.5 * t.`Leechers`)
+      ) AS `Data`
+    FROM
+      `torrents` AS t
+    LEFT JOIN `torrents_group` AS g
+    ON
+      g.`id` = t.`GroupID`
+    WHERE
+      t.`Seeders` > 0 AND t.`Time` >('$sqltime' - INTERVAL 1 DAY)
+    ORDER BY
+      (t.`Seeders` + t.`Leechers`)
+    DESC
+    LIMIT 10;
+    ");
     $Top10 = $DB->to_array();
 }
 

sections/schedule/weekly/top10_weekly.php

@@ -9,25 +9,33 @@ $HistoryID = $DB->inserted_id();
 $Top10 = $Cache->get_value('top10tor_week_10');
 if ($Top10 === false) {
     $DB->query("
-      SELECT
-        t.ID,
-        g.ID,
-        g.Name,
-        g.CategoryID,
-        g.WikiImage,
-        g.TagList,
-        t.Media,
-        g.Year,
-        t.Snatched,
-        t.Seeders,
-        t.Leechers,
-        ((t.Size * t.Snatched) + (t.Size * 0.5 * t.Leechers)) AS Data
-      FROM torrents AS t
-        LEFT JOIN torrents_group AS g ON g.ID = t.GroupID
-      WHERE t.Seeders > 0
-        AND t.Time > ('$sqltime' - INTERVAL 1 WEEK)
-      ORDER BY (t.Seeders + t.Leechers) DESC
-      LIMIT 10;");
+    SELECT
+      t.`ID`,
+      g.`id`,
+      g.`title`,
+      g.`category_id`,
+      g.`picture`,
+      g.`tag_list`,
+      t.`Media`,
+      g.`published`,
+      t.`Snatched`,
+      t.`Seeders`,
+      t.`Leechers`,
+      (
+        (t.`Size` * t.`Snatched`) +(t.`Size` * 0.5 * t.`Leechers`)
+      ) AS `Data`
+    FROM
+      `torrents` AS t
+    LEFT JOIN `torrents_group` AS g
+    ON
+      g.`id` = t.`GroupID`
+    WHERE
+      t.`Seeders` > 0 AND t.`Time` >('$sqltime' - INTERVAL 1 WEEK)
+    ORDER BY
+      (t.`Seeders` + t.`Leechers`)
+    DESC
+    LIMIT 10;
+    ");
 
     $Top10 = $DB->to_array();
 }

sections/slaves/index.php

@@ -1,16 +0,0 @@
-<?
-enforce_login();
-
-if (isset($_REQUEST['action'])) {
-  switch ($_REQUEST['action']) {
-    case '':
-      include('upload_1GB.php');
-      break;
-    default:
-      error(404);
-      break;
-  }
-} else {
-  require(SERVER_ROOT.'/sections/slaves/slaves.php');
-}
-?>

sections/slaves/slaves.php

@@ -1,60 +0,0 @@
-<?
-$DB->query("SELECT OwnerID FROM slaves WHERE UserID = $UserID");
-if ($DB->has_results()) {
-  list($Owner) = $DB->next_record();
-}
-
-$UserLevel = Slaves::get_level($UserID);
-
-$DB->query("SELECT UserID FROM slaves WHERE OwnerID = $UserID");
-$Slaves = $DB->collect('UserID');
-
-if (isset($_POST['release'])) {
-  if (in_array($_POST['release'], $Slaves)) {
-    $DB->query("
-      DELETE FROM slaves
-      WHERE UserID = ".db_string($_POST['release'])."
-      AND OwnerID = '$UserID'");
-  }
-  $Slaves = array_diff($Slaves, [$_POST['release']]);
-}
-
-foreach ($Slaves as $i => $Slave) {
-  $Level = slaves::get_level($Slave);
-  $Slaves[$i] = ['ID' => $Slave, 'Level' => $Level];
-}
-
-View::show_header('Slaves');
-?>
-<div>
-  <h2>Slavery</h2>
-  <div class="box pad">
-<?php if (isset($Owner)) { ?>
-    <h3>You are owned by <?=Users::format_username($Owner, false, true, true)?></h3>
-<?php } else { ?>
-    <h3>You are free</h3>
-<?php } ?>
-  </div>
-<?php if (sizeof($Slaves) == 0) { ?>
-  <h3>You have no slaves</h3>
-<?php } else { ?>
-  <h2>Your slaves</h2>
-  <div class="box">
-    <table>
-      <tr class="colhead">
-        <td>Slave</td>
-        <td>Level</td>
-        <td>Release</td>
-      </tr>
-<?php foreach ($Slaves as $Slave) { ?>
-      <tr>
-        <td><?=Users::format_username($Slave['ID'], false, true, true)?></td>
-        <td><?=number_format($Slave['Level'])?></td>
-        <td><form method="post"><button type="submit" name="release" value=<?=$Slave['ID']?>>Release</button></form></td>
-      </tr>
-<?php } ?>
-    </table>
-  </div>
-<?php } ?>
-</div>
-<? View::show_footer(); ?>

sections/stats/torrents.php

@@ -53,15 +53,15 @@ if (!list($Labels, $InFlow, $OutFlow, $Max) = $Cache->get_value('torrents_timeli
 if (!$CategoryDistribution = $Cache->get_value('category_distribution')) {
     $DB->query("
     SELECT
-      tg.`CategoryID`,
+      tg.`category_id`,
       COUNT(t.`ID`) AS Torrents
     FROM
       `torrents` AS t
     JOIN `torrents_group` AS tg
     ON
-      tg.`ID` = t.`GroupID`
+      tg.`id` = t.`GroupID`
     GROUP BY
-      tg.`CategoryID`
+      tg.`category_id`
     ORDER BY
       `Torrents`
     DESC

sections/store/capture_user.php

@@ -1,110 +0,0 @@
-<?php
-#declare(strict_types=1);
-
-if (isset($_POST['target']) && isset($_POST['amount'])) {
-    $TargetID = abs(intval($_POST['target']));
-    $Amount = abs(intval($_POST['amount']));
-    $UserID = $LoggedUser['ID'];
-
-    $DB->query("
-      SELECT u.BonusPoints, p.Level
-      FROM users_main AS u
-      LEFT JOIN permissions AS p ON u.PermissionID=p.ID
-      WHERE u.ID = $UserID");
-
-    if ($DB->has_results()) {
-        list($Points, $PLevel) = $DB->next_record();
-
-        if ($Points < $Amount) {
-            error('Not enough points!');
-        }
-
-        if ($UserID == $TargetID) {
-            error("You can't capture yourself!");
-        }
-
-        if ($PLevel < 200) {
-            error('Insufficient class');
-        }
-
-        $DB->query("SELECT COUNT(*) FROM slaves WHERE OwnerID = $UserID");
-        if ($DB->next_record()[0] >= 6) {
-            error('You own too many users already');
-        }
-
-        // Logic for capture success
-        $DB->query("
-          SELECT u.Uploaded,
-            u.Downloaded,
-            u.BonusPoints,
-            COUNT(t.UserID)
-          FROM users_main AS u
-          LEFT JOIN torrents AS t ON u.ID=t.UserID
-          WHERE u.ID = $TargetID");
-
-        if (!$DB->has_results()) {
-            error('User does not exist');
-        }
-
-        list($Upload, $Download, $Points, $Uploads) = $DB->next_record();
-        $AdjLevel = intval(((($Uploads**0.35)*1.5)+1) * max(($Upload+($Points*1000000)-$Download)/(1024**3), 1) * 1000);
-
-        if ($Amount <= $AdjLevel) {
-            error('You need to spend more points to have any chance of catching this user!');
-        }
-
-        $Captured = (rand(0, $Amount) >= $AdjLevel);
-        $DB->query("
-          UPDATE users_main
-          SET BonusPoints = BonusPoints - $Amount
-          WHERE ID = $UserID");
-        $Cache->delete_value('user_info_heavy_'.$UserID);
-
-        if ($Captured) {
-            $DB->query("
-              INSERT INTO slaves
-                (UserID, OwnerID)
-              Values($TargetID, $UserID)");
-        }
-    }
-
-    View::show_header('Store'); ?>
-<div>
-  <h2>Capture <?=($Captured?'Successful':'Failed')?>
-  </h2>
-  <div class="box">
-    <p>
-      <?=($Captured?'You successfully captured your target':'Your target eluded capture')?>
-    </p>
-    <p>
-      <a href="/store.php">Back to Store</a>
-      | <a href="/user.php?id=<?=$TargetID?>">Back to Profile</a>
-    </p>
-  </div>
-</div>
-<?php View::show_footer();
-} else {
-    View::show_header('Store'); ?>
-<div>
-  <div class="box text-align: center;">
-
-    <form action="store.php" method="POST">
-      <input type="hidden" name="item" value="capture_user">
-      <strong>
-        Enter the name of the user you want to capture and the <?=BONUS_POINTS?> you want to spend
-      </strong>
-      <br />
-      <input type="text" name="target_name" placeholder="Username">
-      <input type="text" name="amount"
-        placeholder="<?=BONUS_POINTS?>">
-      <input type="submit">
-    </form>
-
-    <p>
-      <a href="/store.php">Back to Store</a>
-    </p>
-  </div>
-</div>
-<?php
-View::show_footer();
-}

sections/top10/torrents.php

@@ -164,48 +164,32 @@ if (!empty($Where)) {
     $WhereSum = '';
 }
 
-$BaseQuery = '
-  SELECT
-    t.ID,
-    g.ID,
-    g.Name,
-    g.Title2,
-    g.NameJP,
-    g.CategoryID,
-    g.WikiImage,
-    g.TagList,
-    t.Media,
-    g.Year,
-    g.Studio,
-    t.Snatched,
-    t.Seeders,
-    t.Leechers,
-    ((t.Size * t.Snatched) + (t.Size * 0.5 * t.Leechers)) AS Data,
-    t.Size
-  FROM torrents AS t
-    LEFT JOIN torrents_group AS g ON g.ID = t.GroupID';
-
-/*
-$BaseQuery = '
-  SELECT
-    t.ID,
-    g.ID,
-    g.Name,
-    g.Title2,
-    g.NameJP,
-    g.CategoryID,
-    g.WikiImage,
-    g.TagList,
-    t.Media,
-    g.Year,
-    t.Snatched,
-    t.Seeders,
-    t.Leechers,
-    ((t.Size * t.Snatched) + (t.Size * 0.5 * t.Leechers)) AS Data,
-    t.Size
-  FROM torrents AS t
-    LEFT JOIN torrents_group AS g ON g.ID = t.GroupID';
-*/
+$BaseQuery = "
+SELECT
+  t.`ID`,
+  g.`id`,
+  g.`title`,
+  g.`subject`,
+  g.`object`,
+  g.`category_id`,
+  g.`picture`,
+  g.`tag_list`,
+  t.`Media`,
+  g.`published`,
+  g.`workgroup`,
+  t.`Snatched`,
+  t.`Seeders`,
+  t.`Leechers`,
+  (
+    (t.`Size` * t.`Snatched`) +(t.`Size` * 0.5 * t.`Leechers`)
+  ) AS `Data`,
+  t.`Size`
+FROM
+  `torrents` AS t
+LEFT JOIN `torrents_group` AS g
+ON
+  g.`id` = t.`GroupID`
+";
 
 if ($Details === 'all' || $Details === 'day') {
     $TopTorrentsActiveLastDay = $Cache->get_value('top10tor_day_'.$Limit.$WhereSum.$GroupBySum);
@@ -447,26 +431,32 @@ function generate_torrent_table($Caption, $Tag, $Details, $Limit)
         <?php
     switch ($Limit) {
       case 100: ?>
-        &ndash; <a href="top10.php?details=<?=$Tag?>" class="brackets">Top
+        &ndash; <a href="top10.php?details=<?=$Tag?>"
+            class="brackets">Top
             10</a>
         &ndash; <span class="brackets">Top 100</span>
-        &ndash; <a href="top10.php?type=torrents&amp;limit=250&amp;details=<?=$Tag?>"
+        &ndash; <a
+            href="top10.php?type=torrents&amp;limit=250&amp;details=<?=$Tag?>"
             class="brackets">Top 250</a>
         <?php break;
 
       case 250: ?>
-        &ndash; <a href="top10.php?details=<?=$Tag?>" class="brackets">Top
+        &ndash; <a href="top10.php?details=<?=$Tag?>"
+            class="brackets">Top
             10</a>
-        &ndash; <a href="top10.php?type=torrents&amp;limit=100&amp;details=<?=$Tag?>"
+        &ndash; <a
+            href="top10.php?type=torrents&amp;limit=100&amp;details=<?=$Tag?>"
             class="brackets">Top 100</a>
         &ndash; <span class="brackets">Top 250</span>
         <?php break;
 
       default: ?>
         &ndash; <span class="brackets">Top 10</span>
-        &ndash; <a href="top10.php?type=torrents&amp;limit=100&amp;details=<?=$Tag?>"
+        &ndash; <a
+            href="top10.php?type=torrents&amp;limit=100&amp;details=<?=$Tag?>"
             class="brackets">Top 100</a>
-        &ndash; <a href="top10.php?type=torrents&amp;limit=250&amp;details=<?=$Tag?>"
+        &ndash; <a
+            href="top10.php?type=torrents&amp;limit=250&amp;details=<?=$Tag?>"
             class="brackets">Top 250</a>
         <?php } ?>
     </small>
@@ -481,13 +471,13 @@ function generate_torrent_table($Caption, $Tag, $Details, $Limit)
         <td style="text-align: right;">Size</td>
         <td style="text-align: right;">Data</td>
         <td style="text-align: right;" class="sign snatches">
-        ↻
+            ↻
         </td>
         <td style="text-align: right;" class="sign seeders">
-        &uarr;
+            &uarr;
         </td>
         <td style="text-align: right;" class="sign leechers">
-        &darr;
+            &darr;
         </td>
         <td style="text-align: right;">Peers</td>
     </tr>

sections/torrents/browse.php

@@ -1,7 +1,7 @@
 <?php
 #declare(strict_types = 1);
 
-include SERVER_ROOT.'/sections/torrents/functions.php';
+require_once SERVER_ROOT.'/sections/torrents/functions.php';
 
 // The "order by x" links on columns headers
 function header_link($SortKey, $DefaultWay = 'desc')
@@ -805,8 +805,7 @@ die();
               # Emoji in classes/astists.class.php
               $Label = '&ensp;';
               $DisplayName .= $Label.'<div class="torrent_artists">'.Artists::display_artists($Artists).'</div>';
-          }
-         ?>
+          } ?>
   <tr class="group<?=$SnatchedGroupClass?>">
     <?php
       $ShowGroups = !(!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGrouping'] === 1); ?>

sections/torrents/edit.php

@@ -32,14 +32,14 @@ SELECT
   t.`FreeLeechType`,
   t.`Description` AS TorrentDescription,
   t.`FileList`,
-  tg.`CategoryID`,
-  tg.`Name` AS Title,
-  tg.`Title2` AS Title2,
-  tg.`NameJP` AS TitleJP,
-  tg.`Year`,
-  tg.`Studio`,
-  tg.`Series`,
-  tg.`CatalogueNumber`,
+  tg.`category_id`,
+  tg.`title` AS title,
+  tg.`subject` AS subject,
+  tg.`object` AS object,
+  tg.`published`,
+  tg.`workgroup`,
+  tg.`location`,
+  tg.`identifier`,
   ag.`Name` AS ArtistName,
   t.`GroupID`,
   t.`UserID`,
@@ -50,10 +50,10 @@ FROM
   `torrents` AS t
 LEFT JOIN `torrents_group` AS tg
 ON
-  tg.`ID` = t.`GroupID`
+  tg.`id` = t.`GroupID`
 LEFT JOIN `torrents_artists` AS ta
 ON
-  tg.`ID` = ta.`GroupID`
+  tg.`id` = ta.`GroupID`
 LEFT JOIN `artists_group` AS ag
 ON
   ag.`ArtistID` = ta.`ArtistID`

sections/torrents/editgroup.php

@@ -9,30 +9,30 @@ declare(strict_types = 1);
  */
 
 $GroupID = $_GET['groupid'];
-Security::CheckID($GroupID);
+Security::checkInt($GroupID);
 
 // Get the torrent group name and the body of the last revision
 $DB->prepare_query("
 SELECT
-  tg.`Name`,
-  tg.`Title2`,
-  tg.`NameJP`,
+  tg.`title`,
+  tg.`subject`,
+  tg.`object`,
   wt.`Image`,
   wt.`Body`,
-  tg.`WikiImage`,
-  tg.`WikiBody`,
-  tg.`Year`,
-  tg.`Studio`,
-  tg.`Series`,
-  tg.`CatalogueNumber`,
-  tg.`CategoryID`
+  tg.`picture`,
+  tg.`description`,
+  tg.`year`,
+  tg.`labratory`,
+  tg.`location`,
+  tg.`identifier`,
+  tg.`category_id`
 FROM
   `torrents_group` AS tg
 LEFT JOIN `wiki_torrents` AS wt
 ON
-  wt.`RevisionID` = tg.`RevisionID`
+  wt.`RevisionID` = tg.`revision_id`
 WHERE
-  tg.`ID` = '$GroupID'
+  tg.`id` = '$GroupID'
 ");
 $DB->exec_prepared_query();
 

sections/torrents/functions.php

@@ -14,40 +14,40 @@ function get_group_info($GroupID, $Return = true, $RevisionID = 0, $PersonalProp
 
         if (!$RevisionID) {
             $SQL .= '
-              g.WikiBody,
-              g.WikiImage, ';
+            g.`description`,
+            g.`picture`, ';
         } else {
             $SQL .= '
-              w.Body,
-              w.Image, ';
+            w.`Body`,
+            w.`Image`, ';
         }
 
         $SQL .= "
-          g.ID,
-          g.Name,
-          g.Title2,
-          g.NameJP,
-          g.Year,
-          g.Studio,
-          g.Series,
-          g.CatalogueNumber,
-          g.CategoryID,
-          g.Time,
-            GROUP_CONCAT(DISTINCT tags.Name SEPARATOR '|'),
-            GROUP_CONCAT(DISTINCT tags.ID SEPARATOR '|'),
-            GROUP_CONCAT(tt.UserID SEPARATOR '|')
-          FROM torrents_group AS g
-            LEFT JOIN torrents_tags AS tt ON tt.GroupID = g.ID
-            LEFT JOIN tags ON tags.ID = tt.TagID";
+          g.`id`,
+          g.`title`,
+          g.`subject`,
+          g.`object`,
+          g.`published`,
+          g.`workgroup`,
+          g.`location`,
+          g.`identifier`,
+          g.`category_id`,
+          g.`timestamp`,
+            GROUP_CONCAT(DISTINCT tags.`Name` SEPARATOR '|'),
+            GROUP_CONCAT(DISTINCT tags.`ID` SEPARATOR '|'),
+            GROUP_CONCAT(tt.`UserID` SEPARATOR '|')
+          FROM `torrents_group` AS g
+            LEFT JOIN `torrents_tags` AS tt ON tt.`GroupID` = g.`id`
+            LEFT JOIN `tags` ON tags.`ID` = tt.`TagID`";
 
         if ($RevisionID) {
             $SQL .= "
-              LEFT JOIN wiki_torrents AS w ON w.PageID = '".db_string($GroupID)."'
-                AND w.RevisionID = '".db_string($RevisionID)."' ";
+              LEFT JOIN `wiki_torrents` AS w ON w.`PageID` = '".db_string($GroupID)."'
+                AND w.`RevisionID` = '".db_string($RevisionID)."' ";
         }
 
         $SQL .= "
-          WHERE g.ID = '".db_string($GroupID)."'
+          WHERE g.`id` = '".db_string($GroupID)."'
             GROUP BY NULL";
 
         $DB->query($SQL);

sections/torrents/nonwikiedit.php

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-Security::CheckID($_POST['groupid']);
+Security::checkInt($_POST['groupid']);
 authorize();
 
 // Usual perm checks

sections/torrents/takechangecategory.php

@@ -20,80 +20,6 @@ if (!is_number($OldGroupID) || !is_number($TorrentID) || !$OldGroupID || !$Torre
     error(0);
 }
 
-/*
-switch ($Categories[$NewCategoryID-1]) {
-  case 'Music':
-    $ArtistName = db_string(trim($_POST['artist']));
-    $Year = trim($_POST['year']);
-    $ReleaseType = trim($_POST['releasetype']);
-
-    if (empty($Year) || empty($ArtistName) || !is_number($Year) || empty($ReleaseType) || !is_number($ReleaseType)) {
-        error(0);
-    }
-
-    $DB->query("
-      SELECT ArtistID, AliasID, Redirect, Name
-      FROM artists_alias
-      WHERE Name LIKE '$ArtistName'");
-
-    if (!$DB->has_results()) {
-        $Redirect = 0;
-        $DB->query("
-        INSERT INTO artists_group (Name)
-        VALUES ('$ArtistName')");
-        $ArtistID = $DB->inserted_id();
-        $DB->query("
-        INSERT INTO artists_alias (ArtistID, Name)
-        VALUES ('$ArtistID', '$ArtistName')");
-        $AliasID = $DB->inserted_id();
-    } else {
-        list($ArtistID, $AliasID, $Redirect, $ArtistName) = $DB->next_record();
-        if ($Redirect) {
-            $AliasID = $ArtistID;
-        }
-    }
-
-    $DB->query("
-      INSERT INTO torrents_group
-        (ArtistID, CategoryID, Name, Year, ReleaseType, Time, WikiBody, WikiImage)
-      VALUES
-        ($ArtistID, '1', '$Title', '$Year', '$ReleaseType', NOW(), '', '')");
-    $GroupID = $DB->inserted_id();
-
-    $DB->query("
-      INSERT INTO torrents_artists
-        (GroupID, ArtistID, AliasID, Importance, UserID)
-      VALUES
-        ('$GroupID', '$ArtistID', '$AliasID', '1', '$LoggedUser[ID]')");
-    break;
-
-  case 'Audiobooks':
-  case 'Comedy':
-    $Year = trim($_POST['year']);
-    if (empty($Year) || !is_number($Year)) {
-        error(0);
-    }
-    $DB->query("
-      INSERT INTO torrents_group
-        (CategoryID, Name, Year, Time, WikiBody, WikiImage)
-      VALUES
-        ($NewCategoryID, '$Title', '$Year', NOW(), '', '')");
-    $GroupID = $DB->inserted_id();
-    break;
-  case 'Applications':
-  case 'Comics':
-  case 'E-Books':
-  case 'E-Learning Videos':
-    $DB->query("
-      INSERT INTO torrents_group
-        (CategoryID, Name, Time, WikiBody, WikiImage)
-      VALUES
-        ($NewCategoryID, '$Title', NOW(), '', '')");
-    $GroupID = $DB->inserted_id();
-    break;
-}
-*/
-
 $DB->query("
   UPDATE torrents
   SET GroupID = '$GroupID'

sections/torrents/takenewgroup.php

@@ -1,4 +1,4 @@
-<?
+<?php
 #declare(strict_types = 1);
 
 /***************************************************************
@@ -9,7 +9,7 @@
 authorize();
 
 if (!check_perms('torrents_edit')) {
-  error(403);
+    error(403);
 }
 
 $OldGroupID = $_POST['oldgroupid'];
@@ -19,91 +19,102 @@ $Title = db_string(trim($_POST['title']));
 $Year = db_string(trim($_POST['year']));
 
 if (!is_number($OldGroupID) || !is_number($TorrentID) || !is_number($Year) || !$OldGroupID || !$TorrentID || !$Year || empty($Title) || empty($ArtistName)) {
-  error(0);
+    error(0);
 }
 
-//Everything is legit, let's just confim they're not retarded
+// Everything is legit, let's just confim they're not retarded
 if (empty($_POST['confirm'])) {
-  View::show_header();
-?>
-  <div class="center">
+    View::show_header(); ?>
+
+<div class="center">
   <div class="header">
     <h2>Split Confirm!</h2>
   </div>
+
   <div class="box pad">
     <form class="confirm_form" name="torrent_group" action="torrents.php" method="post">
       <input type="hidden" name="action" value="newgroup" />
-      <input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
+      <input type="hidden" name="auth"
+        value="<?=$LoggedUser['AuthKey']?>" />
       <input type="hidden" name="confirm" value="true" />
-      <input type="hidden" name="torrentid" value="<?=$TorrentID?>" />
-      <input type="hidden" name="oldgroupid" value="<?=$OldGroupID?>" />
-      <input type="hidden" name="artist" value="<?=display_str($_POST['artist'])?>" />
-      <input type="hidden" name="title" value="<?=display_str($_POST['title'])?>" />
+      <input type="hidden" name="torrentid"
+        value="<?=$TorrentID?>" />
+      <input type="hidden" name="oldgroupid"
+        value="<?=$OldGroupID?>" />
+      <input type="hidden" name="artist"
+        value="<?=display_str($_POST['artist'])?>" />
+      <input type="hidden" name="title"
+        value="<?=display_str($_POST['title'])?>" />
       <input type="hidden" name="year" value="<?=$Year?>" />
-      <h3>You are attempting to split the torrent <a href="torrents.php?torrentid=<?=$TorrentID?>"><?=$TorrentID?></a> off into a new group:</h3>
-      <ul><li><?=display_str($_POST['artist'])?> - <?=display_str($_POST['title'])?> [<?=$Year?>]</li></ul>
+      <h3>You are attempting to split the torrent <a
+          href="torrents.php?torrentid=<?=$TorrentID?>"><?=$TorrentID?></a> off into a new group:</h3>
+      <ul>
+        <li><?=display_str($_POST['artist'])?> -
+          <?=display_str($_POST['title'])?>
+          [<?=$Year?>]
+        </li>
+      </ul>
       <input type="submit" value="Confirm" />
     </form>
   </div>
-  </div>
-<?
+</div>
+<?php
   View::show_footer();
 } else {
-  $DB->query("
+    $DB->query("
     SELECT ArtistID,  Name
     FROM artists_group
     WHERE Name = '$ArtistName'");
-  if (!$DB->has_results()) {
-    $DB->query("
+    if (!$DB->has_results()) {
+        $DB->query("
       INSERT INTO artists_group (Name)
       VALUES ('$ArtistName')");
-    $ArtistID = $DB->inserted_id();
-  } else {
-    list($ArtistID, $ArtistName) = $DB->next_record();
-  }
+        $ArtistID = $DB->inserted_id();
+    } else {
+        list($ArtistID, $ArtistName) = $DB->next_record();
+    }
 
-  $DB->query("
+    $DB->query("
     SELECT CategoryID
     FROM torrents_group
     WHERE ID = $OldGroupID");
 
-  list($CategoryID) = $DB->next_record();
+    list($CategoryID) = $DB->next_record();
 
-  $DB->query("
+    $DB->query("
     INSERT INTO torrents_group
       (CategoryID, Name, Year, Time, WikiBody, WikiImage)
     VALUES
       ('$CategoryID', '$Title', '$Year', NOW(), '', '')");
-  $GroupID = $DB->inserted_id();
+    $GroupID = $DB->inserted_id();
 
-  $DB->query("
+    $DB->query("
     INSERT INTO torrents_artists
       (GroupID, ArtistID, UserID)
     VALUES
       ('$GroupID', '$ArtistID', '$LoggedUser[ID]')");
 
-  $DB->query("
+    $DB->query("
     UPDATE torrents
     SET GroupID = '$GroupID'
     WHERE ID = '$TorrentID'");
 
-  // Delete old group if needed
-  $DB->query("
+    // Delete old group if needed
+    $DB->query("
     SELECT ID
     FROM torrents
     WHERE GroupID = '$OldGroupID'");
-  if (!$DB->has_results()) {
-    Torrents::delete_group($OldGroupID);
-  } else {
-    Torrents::update_hash($OldGroupID);
-  }
+    if (!$DB->has_results()) {
+        Torrents::delete_group($OldGroupID);
+    } else {
+        Torrents::update_hash($OldGroupID);
+    }
 
-  Torrents::update_hash($GroupID);
+    Torrents::update_hash($GroupID);
 
-  $Cache->delete_value("torrent_download_$TorrentID");
+    $Cache->delete_value("torrent_download_$TorrentID");
 
-  Misc::write_log("Torrent $TorrentID was edited by " . $LoggedUser['Username']);
+    Misc::write_log("Torrent $TorrentID was edited by " . $LoggedUser['Username']);
 
-  header("Location: torrents.php?id=$GroupID");
+    header("Location: torrents.php?id=$GroupID");
 }
-?>

sections/upload/upload.php

@@ -1,17 +1,19 @@
 <?php
-#declare(strict_types=1);
+declare(strict_types=1);
 
-//**********************************************************************//
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Upload form ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~//
-// This page relies on the TorrentForm class. All it does is call      //
-// the necessary functions.                                             //
-//----------------------------------------------------------------------//
-// $Properties, $Err and $UploadForm are set in takeupload.php, and     //
-// are only used when the form doesn't validate and this page must be   //
-// called again.                                                        //
-//**********************************************************************//
+/**
+ * Upload form
+ *
+ * This page relies on the TorrentForm class.
+ * All it does is call the necessary functions.
+ *
+ * $Properties, $Err and $UploadForm are set in takeupload.php,
+ * and are only used when the form doesn't validate
+ * and this page must be called again.
+ */
 
 ini_set('max_file_uploads', '100');
+
 View::show_header(
     'Upload',
     'upload,bbcode,vendor/easymde.min',
@@ -19,23 +21,25 @@ View::show_header(
 );
 
 if (empty($Properties) && !empty($_GET['groupid']) && is_number($_GET['groupid'])) {
-    $DB->query('
+    $GroupID = $_GET['groupid'];
+    $DB->query("
       SELECT
-        tg.ID as GroupID,
-        tg.CategoryID,
-        tg.Name AS Title,
-        tg.Title2,
-        tg.NameJP AS TitleJP,
-        tg.Year,
-        tg.Studio,
-        tg.Series,
-        tg.CatalogueNumber,
-        tg.WikiImage AS Image,
-        tg.WikiBody AS GroupDescription
-      FROM torrents_group AS tg
-        LEFT JOIN torrents AS t ON t.GroupID = tg.ID
-      WHERE tg.ID = '.$_GET['groupid'].'
-      GROUP BY tg.ID');
+        tg.`id` as GroupID,
+        tg.`category_id`,
+        tg.`title` AS Title,
+        tg.`subject`,
+        tg.`object` AS TitleJP,
+        tg.`published`,
+        tg.`workgroup`,
+        tg.`location`,
+        tg.`identifier`,
+        tg.`picture` AS Image,
+        tg.`description` AS GroupDescription
+      FROM `torrents_group` AS tg
+        LEFT JOIN `torrents` AS t ON t.`GroupID` = tg.`id`
+      WHERE tg.`id` = '$GroupID'
+      GROUP BY tg.`id`
+      ");
 
     if ($DB->has_results()) {
         list($Properties) = $DB->to_array(false, MYSQLI_BOTH);
@@ -44,11 +48,14 @@ if (empty($Properties) && !empty($_GET['groupid']) && is_number($_GET['groupid']
         $Properties['Artists'] = Artists::get_artist($_GET['groupid']);
 
         $DB->query("
-          SELECT
-            GROUP_CONCAT(tags.Name SEPARATOR ', ') AS TagList
-          FROM torrents_tags AS tt
-            JOIN tags ON tags.ID = tt.TagID
-          WHERE tt.GroupID = '$_GET[groupid]'");
+        SELECT
+          GROUP_CONCAT(tags.`Name` SEPARATOR ', ') AS TagList
+        FROM
+          `torrents_tags` AS tt
+        JOIN `tags` ON tags.`ID` = tt.`TagID`
+        WHERE
+          tt.`GroupID` = '$_GET[groupid]'
+        ");
         list($Properties['TagList']) = $DB->next_record();
     } else {
         unset($_GET['groupid']);
@@ -58,19 +65,23 @@ if (empty($Properties) && !empty($_GET['groupid']) && is_number($_GET['groupid']
         $Properties['RequestID'] = $_GET['requestid'];
     }
 } elseif (empty($Properties) && isset($_GET['requestid']) && is_number($_GET['requestid'])) {
-    $DB->query('
-      SELECT
-        ID AS RequestID,
-        CategoryID,
-        Title AS Title,
-        Title2,
-        TitleJP AS TitleJP,
-        CatalogueNumber,
-        Image
-      FROM requests
-      WHERE ID = '.$_GET['requestid']);
-
+    $RequestID = $_GET['requestid'];
+    $DB->query("
+    SELECT
+      `ID` AS RequestID,
+      `CategoryID`,
+      `Title` AS Title,
+      `Title2`,
+      `TitleJP` AS TitleJP,
+      `CatalogueNumber`,
+      `Image`
+    FROM
+      `requests`
+    WHERE
+      `ID` = '$RequestID'
+    ");
     list($Properties) = $DB->to_array(false, MYSQLI_BOTH);
+
     $UploadForm = $Categories[$Properties['CategoryID'] - 1];
     $Properties['CategoryName'] = $Categories[$Properties['CategoryID'] - 1];
     $Properties['Artists'] = Requests::get_artists($_GET['requestid']);
@@ -93,10 +104,15 @@ $TorrentForm = new TorrentForm($Properties ?? false, $Err ?? false);
 $GenreTags = $Cache->get_value('genre_tags');
 if (!$GenreTags) {
     $DB->query("
-      SELECT Name
-      FROM tags
-      WHERE TagType = 'genre'
-        ORDER BY Name");
+    SELECT
+      `Name`
+    FROM
+      `tags`
+    WHERE
+      `TagType` = 'genre'
+    ORDER BY
+      `Name`
+    ");
     
     $GenreTags = $DB->collect('Name');
     $Cache->cache_value('genre_tags', $GenreTags, 3600 * 6);
@@ -111,4 +127,5 @@ echo $TorrentForm->error();
 echo $TorrentForm->head();
 echo $TorrentForm->basicInfo();
 echo $TorrentForm->upload_form();
+
 View::show_footer();

sections/user/edit.php

@@ -86,7 +86,6 @@ if ($DonorIsVisible === null) {
 extract(Donations::get_enabled_rewards($UserID));
 $Rewards = Donations::get_rewards($UserID);
 $ProfileRewards = Donations::get_profile_rewards($UserID);
-$DonorTitles = Donations::get_titles($UserID);
 ?>
 
 <div>
@@ -748,47 +747,6 @@ HTML;
               value="<?=$Rewards['CustomIcon']?>" />
           </td>
         </tr>
-        <?php }
-
-# Donor forum honorific
-  if ($HasDonorForum) { ?>
-        <tr id="pers_donorforum_tr">
-          <td class="label">
-            <strong>Donor forum honorific</strong>
-          </td>
-
-          <td>
-            <div>
-              <label>
-                <strong>Prefix</strong>
-                <input type="text" size="30" maxlength="30" name="donor_title_prefix" id="donor_title_prefix"
-                  value="<?=$DonorTitles['Prefix']?>" />
-              </label>
-            </div>
-
-            <div>
-              <label>
-                <strong>Suffix</strong>
-                <input type="text" size="30" maxlength="30" name="donor_title_suffix" id="donor_title_suffix"
-                  value="<?=$DonorTitles['Suffix']?>" />
-              </label>
-            </div>
-
-            <div>
-              <label>
-                <strong>Hide comma</strong>
-                <input type="checkbox" id="donor_title_comma" name="donor_title_comma" <?=!$DonorTitles['UseComma'] ? ' checked="checked"' : '' ?>
-                />
-              </label>
-            </div>
-
-            <strong>Preview</strong>
-            <span id="donor_title_prefix_preview"></span>
-            <?=$Username?>
-            <span id="donor_title_comma_preview">,</span>
-            <span id="donor_title_suffix_preview"></span>
-          </td>
-        </tr>
         <?php } ?>
 
         <!-- Profile title 1 -->

sections/user/user.php

@@ -365,46 +365,9 @@ if (!$OwnProfile && !$LoggedUser['DisablePoints']) { ?>
         <p>Note: 10% of your gift is taken as tax.</p>
       </div>
     </div>
-    <?php
-}
-$DB->query("
-  SELECT u.Username
-  FROM slaves AS s
-  LEFT JOIN users_main AS u ON u.ID = s.OwnerID
-  WHERE s.UserID = $UserID");
-if ($LoggedUser['Class'] >= 200 || $DB->has_results()) { ?>
-    <div class='box ownership_box'>
-      <div class='head colhead_dark'>Ownership</div>
-      <div class="pad">
-        <?php if ($DB->has_results()) { ?>
-        <p>This user is owned by <?=($DB->next_record()['Username'])?>
-        </p>
-        <?php } else {
-    $DB->query("
-      SELECT u.Uploaded, u.Downloaded, u.BonusPoints, COUNT(t.UserID)
-      FROM users_main AS u
-      LEFT JOIN torrents AS t ON u.ID=t.UserID
-      WHERE u.ID = $UserID");
-    list($Upload, $Download, $Points, $Uploads) = $DB->next_record();
-    $Level = intval(((($Uploads**0.35)*1.5)+1) * max(($Upload+($Points*1000000)-$Download)/(1024**3), 1)); ?>
-        <p>This user is wild and level <?=$Level?>
-        </p>
-        <?php if (!$OwnProfile) { ?>
-        <p>Try to capture them with <?=BONUS_POINTS?>? The more you
-          spend, the higher the chance of capture</p>
-        <form action='store.php' method='post'>
-          <input type='hidden' name='item' value='capture_user' />
-          <input type='hidden' name='target' value='<?=$UserID?>' />
-          <input type='text' name='amount'
-            placeholder='<?=BONUS_POINTS?>' /><input type='submit'
-            value='Capture' />
-        </form>
-        <?php }
-} ?>
-      </div>
-    </div>
     <?php } ?>
-    <div class="box box_info box_userinfo_stats">
+
+<div class="box box_info box_userinfo_stats">
       <div class="head colhead_dark">Statistics</div>
       <ul class="stats nobullet">
         <li>Joined: <?=$JoinedDate?>
@@ -837,17 +800,17 @@ if (check_paranoia_here('snatched')) {
     if ($RecentSnatches === false) {
         $DB->query("
       SELECT
-        g.ID,
-        g.Name,
-        g.Title2,
-        g.NameJP,
-        g.WikiImage
+        g.`id`,
+        g.`title`,
+        g.`subject`,
+        g.`object`,
+        g.`picture`
       FROM xbt_snatched AS s
         INNER JOIN torrents AS t ON t.ID = s.fid
-        INNER JOIN torrents_group AS g ON t.GroupID = g.ID
+        INNER JOIN torrents_group AS g ON t.GroupID = g.`id`
       WHERE s.uid = '$UserID'
-        AND g.WikiImage != ''
-      GROUP BY g.ID,s.tstamp
+        AND g.`picture` != ''
+      GROUP BY g.`id`,s.tstamp
       ORDER BY s.tstamp DESC
       LIMIT 5");
         $RecentSnatches = $DB->to_array();
@@ -893,16 +856,16 @@ if (check_paranoia_here('uploads')) {
     if ($RecentUploads === false) {
         $DB->query("
       SELECT
-        g.ID,
-        g.Name,
-        g.Title2,
-        g.NameJP,
-        g.WikiImage
+        g.`id`,
+        g.`title`,
+        g.`subject`,
+        g.`object`,
+        g.`picture`
       FROM torrents_group AS g
-        INNER JOIN torrents AS t ON t.GroupID = g.ID
+        INNER JOIN torrents AS t ON t.GroupID = g.`id`
       WHERE t.UserID = '$UserID'
-        AND g.WikiImage != ''
-      GROUP BY g.ID,t.Time
+        AND g.`picture` != ''
+      GROUP BY g.`id`,t.Time
       ORDER BY t.Time DESC
       LIMIT 5");
         $RecentUploads = $DB->to_array();
@@ -955,10 +918,10 @@ foreach ($Collages as $CollageInfo) {
     list($CollageID, $CName) = $CollageInfo;
     $DB->query("
     SELECT ct.GroupID,
-      tg.WikiImage,
-      tg.CategoryID
+      tg.`picture`,
+      tg.`category_id`
     FROM collages_torrents AS ct
-      JOIN torrents_group AS tg ON tg.ID = ct.GroupID
+      JOIN torrents_group AS tg ON tg.`id` = ct.GroupID
     WHERE ct.CollageID = '$CollageID'
     ORDER BY ct.Sort
     LIMIT 5");
@@ -1020,6 +983,7 @@ if ((check_perms('users_view_invites')) && $Invited > 0) {
         <?php $Tree->make_tree(); ?>
       </div>
     </div>
+</div>
     <?php
 }
 

sections/userhistory/token_history.php

@@ -1,152 +1,186 @@
 <?php
-/************************************************************************
-||------------------|| User token history page ||-----------------------||
-This page lists the torrents a user has spent his tokens on. It
-gets called if $_GET['action'] == 'token_history'.
+declare(strict_types=1);
 
-Using $_GET['userid'] allows a mod to see any user's token history.
-Nonmods and empty userid show $LoggedUser['ID']'s history
-************************************************************************/
+/**
+ * User token history page
+ * This page lists the torrents a user has spent his tokens on.
+ * It gets called if $_GET['action'] === 'token_history.'
+ *
+ * Using $_GET['userid'] allows a mod to see any user's token history.
+ * Non-mods and empty userid show $LoggedUser['ID']'s history.
+ */
 
+# Validate user ID
 if (isset($_GET['userid'])) {
-  $UserID = $_GET['userid'];
+    $UserID = $_GET['userid'];
 } else {
-  $UserID = $LoggedUser['ID'];
-}
-if (!is_number($UserID)) {
-  error(404);
+    $UserID = $LoggedUser['ID'];
 }
 
+Security::checkInt($UserID);
+
+# Get user info
 $UserInfo = Users::user_info($UserID);
 $Perms = Permissions::get_permissions($UserInfo['PermissionID']);
 $UserClass = $Perms['Class'];
 
+# Validate mod permissions
 if (!check_perms('users_mod')) {
-  if ($LoggedUser['ID'] != $UserID && !check_paranoia(false, $User['Paranoia'], $UserClass, $UserID)) {
-    error(403);
-  }
+    if ($LoggedUser['ID'] !== $UserID && !check_paranoia(false, $User['Paranoia'], $UserClass, $UserID)) {
+        error(403);
+    }
 }
 
 if (isset($_GET['expire'])) {
-  if (!check_perms('users_mod')) {
-    error(403);
-  }
-  $UserID = $_GET['userid'];
-  $TorrentID = $_GET['torrentid'];
-
-  if (!is_number($UserID) || !is_number($TorrentID)) {
-    error(403);
-  }
-  $DB->query("
-    SELECT HEX(info_hash)
-    FROM torrents
-    WHERE ID = $TorrentID");
-  if (list($InfoHash) = $DB->next_record(MYSQLI_NUM, FALSE)) {
+    if (!check_perms('users_mod')) {
+        error(403);
+    }
+
+    $UserID = $_GET['userid'];
+    $TorrentID = $_GET['torrentid'];
+
+    if (!is_number($UserID) || !is_number($TorrentID)) {
+        error(403);
+    }
+
     $DB->query("
-      UPDATE users_freeleeches
-      SET Expired = TRUE
-      WHERE UserID = $UserID
-        AND TorrentID = $TorrentID");
-    $Cache->delete_value("users_tokens_$UserID");
-    Tracker::update_tracker('remove_token', ['info_hash' => substr('%'.chunk_split($InfoHash,2,'%'),0,-1), 'userid' => $UserID]);
-  }
-  header("Location: userhistory.php?action=token_history&userid=$UserID");
+    SELECT
+      HEX(`info_hash`)
+    FROM
+      `torrents`
+    WHERE
+      `ID` = '$TorrentID'
+    ");
+
+    if (list($InfoHash) = $DB->next_record(MYSQLI_NUM, false)) {
+        $DB->query("
+        UPDATE
+          `users_freeleeches`
+        SET
+          `Expired` = TRUE
+        WHERE
+          `UserID` = '$UserID' AND `TorrentID` = '$TorrentID'
+        ");
+
+        $Cache->delete_value("users_tokens_$UserID");
+        Tracker::update_tracker(
+            'remove_token',
+            ['info_hash' => substr('%'.chunk_split($InfoHash, 2, '%'), 0, -1), 'userid' => $UserID]
+        );
+    }
+    header("Location: userhistory.php?action=token_history&userid=$UserID");
 }
 
+# Render HTML
 View::show_header('Freeleech token history');
-
 list($Page, $Limit) = Format::page_limit(25);
 
-/*
-$DB->query("
-  SELECT
-    SQL_CALC_FOUND_ROWS
-    f.TorrentID,
-    t.GroupID,
-    f.Time,
-    f.Expired,
-    f.Downloaded,
-    f.Uses,
-    g.Name,
-    t.Format,
-    t.Encoding
-  FROM users_freeleeches AS f
-    JOIN torrents AS t ON t.ID = f.TorrentID
-    JOIN torrents_group AS g ON g.ID = t.GroupID
-  WHERE f.UserID = $UserID
-  ORDER BY f.Time DESC
-  LIMIT $Limit");
-*/
 $DB->query("
-  SELECT
-    SQL_CALC_FOUND_ROWS
-    f.TorrentID,
-    t.GroupID,
-    f.Time,
-    f.Expired,
-    f.Downloaded,
-    f.Uses,
-    g.Name
-  FROM users_freeleeches AS f
-    JOIN torrents AS t ON t.ID = f.TorrentID
-    JOIN torrents_group AS g ON g.ID = t.GroupID
-  WHERE f.UserID = $UserID
-  ORDER BY f.Time DESC
-  LIMIT $Limit");
-$Tokens = $DB->to_array();
+SELECT SQL_CALC_FOUND_ROWS
+  f.`TorrentID`,
+  t.`GroupID`,
+  f.`Time`,
+  f.`Expired`,
+  f.`Downloaded`,
+  f.`Uses`,
+  g.`title`
+FROM
+  `users_freeleeches` AS f
+JOIN `torrents` AS t
+ON
+  t.`ID` = f.`TorrentID`
+JOIN `torrents_group` AS g
+ON
+  g.`id` = t.`GroupID`
+WHERE
+  f.`UserID` = '$UserID'
+ORDER BY
+  f.`Time`
+DESC
+LIMIT $Limit
+");
 
+$Tokens = $DB->to_array();
 $DB->query('SELECT FOUND_ROWS()');
 list($NumResults) = $DB->next_record();
 $Pages = Format::get_pages($Page, $NumResults, 25);
-
 ?>
+
 <div class="header">
-  <h2>Freeleech token history for <?=Users::format_username($UserID, false, false, false)?></h2>
+  <h2>
+    Freeleech token history for
+    <?= Users::format_username($UserID, false, false, false) ?>
+  </h2>
 </div>
-<div class="linkbox"><?=$Pages?></div>
+
+<div class="linkbox">
+  <?= $Pages ?>
+</div>
+
 <table>
   <tr class="colhead_dark">
-    <td>Torrent</td>
-    <td>Time</td>
-    <td>Expired</td>
-<? if (check_perms('users_mod')) { ?>
-    <td>Downloaded</td>
-    <td>Tokens used</td>
-<? } ?>
+    <th>Torrent</th>
+    <th>Time</th>
+    <th>Expired</th>
+
+    <?php if (check_perms('users_mod')) { ?>
+    <th>Downloaded</th>
+    <th>Tokens used</th>
+    <?php } ?>
   </tr>
-<?
+
+  <?php
 foreach ($Tokens as $Token) {
-  $GroupIDs[] = $Token['GroupID'];
+    $GroupIDs[] = $Token['GroupID'];
 }
 $Artists = Artists::get_artists($GroupIDs);
 
 foreach ($Tokens as $Token) {
-  list($TorrentID, $GroupID, $Time, $Expired, $Downloaded, $Uses, $Name) = $Token;
-  if ($Name != '') {
-    $Name = "<a href=\"torrents.php?torrentid=$TorrentID\">$Name</a>";
-  } else {
-    $Name = "(<i>Deleted torrent <a href=\"log.php?search=Torrent+$TorrentID\">$TorrentID</a></i>)";
-  }
-  $ArtistName = Artists::display_artists($Artists[$GroupID]);
-  if ($ArtistName) {
-    $Name = $ArtistName.$Name;
-  }
-?>
+    list($TorrentID, $GroupID, $Time, $Expired, $Downloaded, $Uses, $Name) = $Token;
+
+    if ($Name !== '') {
+        $Name = "<a href='torrents.php?torrentid=$TorrentID'>$Name</a>";
+    } else {
+        $Name = "(<i>Deleted torrent <a href='log.php?search=Torrent+$TorrentID'>$TorrentID</a></i>)";
+    }
+
+    $ArtistName = Artists::display_artists($Artists[$GroupID]);
+    if ($ArtistName) {
+        $Name = $ArtistName.$Name;
+    } ?>
+
   <tr class="row">
-    <td><?=$Name?></td>
-    <td><?=time_diff($Time)?></td>
-    <td><?=($Expired ? 'Yes' : 'No')?><?=(check_perms('users_mod') && !$Expired) ? " <a href=\"userhistory.php?action=token_history&amp;expire=1&amp;userid=$UserID&amp;torrentid=$TorrentID\">(expire)</a>" : ''; ?>
+    <td>
+      <?= $Name ?>
+    </td>
+
+    <td>
+      <?= time_diff($Time) ?>
+    </td>
+
+    <td>
+      <?= ($Expired ? 'Yes' : 'No') ?>
+      <?= (check_perms('users_mod') && !$Expired)
+        ? " <a href='userhistory.php?action=token_history&amp;expire=1&amp;userid=$UserID&amp;torrentid=$TorrentID'>(expire)</a>"
+        : ''; ?>
+    </td>
+
+    <?php if (check_perms('users_mod')) { ?>
+    <td>
+      <?= Format::get_size($Downloaded) ?>
+    </td>
+
+    <td>
+      <?= $Uses ?>
     </td>
-<?php if (check_perms('users_mod')) { ?>
-    <td><?=Format::get_size($Downloaded)?></td>
-    <td><?=$Uses?></td>
-<?php } ?>
+    <?php } ?>
   </tr>
-<?
-}
-?>
+  <?php
+} ?>
 </table>
-<div class="linkbox"><?=$Pages?></div>
-<?
-View::show_footer();
-?>
+
+<div class="linkbox">
+  <?= $Pages ?>
+</div>
+
+<?php View::show_footer();

signup.php

@@ -1,4 +0,0 @@
-<?php
-declare(strict_types=1);
-
-header('Location: register.php');