Upload files to 'classes'

classes/permissions_form.php

@@ -1,4 +1,4 @@
-<?
+<?php
 
 /********************************************************************************
  ************ Permissions form ********************** user.php and tools.php ****
@@ -112,8 +112,9 @@ $PermissionsArray = array(
   'site_tag_aliases_read' => 'Can view the list of tag aliases.'
 );
 
-function permissions_form() {
-?>
+function permissions_form()
+{
+    ?>
 <div class="permissions">
   <div class="permission_container">
     <table>
@@ -122,48 +123,47 @@ function permissions_form() {
       </tr>
       <tr>
         <td>
-<?
-          display_perm('site_leech','Can leech.');
-          display_perm('site_upload','Can upload.');
-          display_perm('site_vote','Can vote on requests.');
-          display_perm('site_submit_requests','Can submit requests.');
-          display_perm('site_advanced_search','Can use advanced search.');
-          display_perm('site_top10','Can access top 10.');
-          display_perm('site_torrents_notify','Can access torrents notifications system.');
-          display_perm('site_collages_create','Can create collages.');
-          display_perm('site_collages_manage','Can manage collages (add torrents, sorting).');
-          display_perm('site_collages_delete','Can delete collages.');
-          display_perm('site_collages_subscribe','Can access collage subscriptions.');
-          display_perm('site_collages_personal','Can have a personal collage.');
-          display_perm('site_collages_renamepersonal','Can rename own personal collages.');
-          display_perm('site_advanced_top10','Can access advanced top 10.');
-          display_perm('site_make_bookmarks','Can make bookmarks.');
-          display_perm('site_edit_wiki','Can edit wiki pages.');
-          display_perm('site_can_invite_always', 'Can invite users even when invites are closed.');
-          display_perm('site_send_unlimited_invites', 'Can send unlimited invites.');
-          display_perm('site_moderate_requests', 'Can moderate any request.');
-          display_perm('site_delete_artist', 'Can delete artists (must be able to delete torrents+requests).');
-          display_perm('forums_polls_create','Can create polls in the forums.');
-          display_perm('forums_polls_moderate','Can feature and close polls.');
-          display_perm('site_moderate_forums', 'Can moderate the forums.');
-          display_perm('site_admin_forums', 'Can administrate the forums.');
-          display_perm('site_view_flow', 'Can view site stats and data pools.');
-          display_perm('site_view_full_log', 'Can view the full site log.');
-          display_perm('site_view_torrent_snatchlist', 'Can view torrent snatch lists.');
-          display_perm('site_recommend_own', 'Can add own torrents to recommendations list.');
-          display_perm('site_manage_recommendations', 'Can edit recommendations list.');
-          display_perm('site_delete_tag', 'Can delete tags.');
-          display_perm('site_disable_ip_history', 'Disable IP history.');
-          display_perm('zip_downloader', 'Download multiple torrents at once.');
-          display_perm('site_debug', 'View site debug tables.');
-          display_perm('site_proxy_images', 'Proxy images through the server.');
-          display_perm('site_search_many', 'Can go past low limit of search results.');
-          display_perm('site_collages_recover', 'Can recover \'deleted\' collages.');
-          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.');
-?>
+    <?php
+          display_perm('site_leech', 'Can leech.');
+    display_perm('site_upload', 'Can upload.');
+    display_perm('site_vote', 'Can vote on requests.');
+    display_perm('site_submit_requests', 'Can submit requests.');
+    display_perm('site_advanced_search', 'Can use advanced search.');
+    display_perm('site_top10', 'Can access top 10.');
+    display_perm('site_torrents_notify', 'Can access torrents notifications system.');
+    display_perm('site_collages_create', 'Can create collages.');
+    display_perm('site_collages_manage', 'Can manage collages (add torrents, sorting).');
+    display_perm('site_collages_delete', 'Can delete collages.');
+    display_perm('site_collages_subscribe', 'Can access collage subscriptions.');
+    display_perm('site_collages_personal', 'Can have a personal collage.');
+    display_perm('site_collages_renamepersonal', 'Can rename own personal collages.');
+    display_perm('site_advanced_top10', 'Can access advanced top 10.');
+    display_perm('site_make_bookmarks', 'Can make bookmarks.');
+    display_perm('site_edit_wiki', 'Can edit wiki pages.');
+    display_perm('site_can_invite_always', 'Can invite users even when invites are closed.');
+    display_perm('site_send_unlimited_invites', 'Can send unlimited invites.');
+    display_perm('site_moderate_requests', 'Can moderate any request.');
+    display_perm('site_delete_artist', 'Can delete artists (must be able to delete torrents+requests).');
+    display_perm('forums_polls_create', 'Can create polls in the forums.');
+    display_perm('forums_polls_moderate', 'Can feature and close polls.');
+    display_perm('site_moderate_forums', 'Can moderate the forums.');
+    display_perm('site_admin_forums', 'Can administrate the forums.');
+    display_perm('site_view_flow', 'Can view site stats and data pools.');
+    display_perm('site_view_full_log', 'Can view the full site log.');
+    display_perm('site_view_torrent_snatchlist', 'Can view torrent snatch lists.');
+    display_perm('site_recommend_own', 'Can add own torrents to recommendations list.');
+    display_perm('site_manage_recommendations', 'Can edit recommendations list.');
+    display_perm('site_delete_tag', 'Can delete tags.');
+    display_perm('site_disable_ip_history', 'Disable IP history.');
+    display_perm('zip_downloader', 'Download multiple torrents at once.');
+    display_perm('site_debug', 'View site debug tables.');
+    display_perm('site_proxy_images', 'Proxy images through the server.');
+    display_perm('site_search_many', 'Can go past low limit of search results.');
+    display_perm('site_collages_recover', 'Can recover \'deleted\' collages.');
+    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>
@@ -175,40 +175,39 @@ function permissions_form() {
       </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.');
-          display_perm('users_edit_titles', 'Can edit titles.');
-          display_perm('users_edit_avatars', 'Can edit avatars.');
-          display_perm('users_edit_invites', 'Can edit invite numbers and cancel sent invites.');
-          display_perm('users_edit_watch_hours', 'Can edit contrib watch hours.');
-          display_perm('users_edit_reset_keys', 'Can reset any passkey/authkey.');
-          display_perm('users_edit_profiles', 'Can edit anyone\'s profile.');
-          display_perm('users_edit_badges', 'Can edit anyone\'s badges.');
-          display_perm('users_view_friends', 'Can view anyone\'s friends.');
-          display_perm('users_reset_own_keys', 'Can reset own passkey/authkey.');
-          display_perm('users_edit_password', 'Can change password.');
-          display_perm('users_promote_below', 'Can promote users to below current level.');
-          display_perm('users_promote_to', 'Can promote users up to current level.');
-          display_perm('users_give_donor', 'Can give donor access.');
-          display_perm('users_warn', 'Can warn users.');
-          display_perm('users_disable_users', 'Can disable users.');
-          display_perm('users_disable_posts', 'Can disable users\' posting privileges.');
-          display_perm('users_disable_any', 'Can disable any users\' rights.');
-          display_perm('users_delete_users', 'Can delete anyone\'s account');
-          display_perm('users_view_invites', 'Can view who user has invited');
-          display_perm('users_view_seedleech', 'Can view what a user is seeding or leeching');
-          display_perm('users_view_uploaded', 'Can view a user\'s uploads, regardless of privacy level');
-          display_perm('users_view_keys', 'Can view passkeys');
-          display_perm('users_view_ips', 'Can view IP addresses');
-          display_perm('users_view_email', 'Can view email addresses');
-          display_perm('users_invite_notes', 'Can add a staff note when inviting someone.');
-          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)');
-?>
+    display_perm('users_edit_ratio', 'Can edit anyone\'s upload/download amounts.');
+    display_perm('users_edit_own_ratio', 'Can edit own upload/download amounts.');
+    display_perm('users_edit_titles', 'Can edit titles.');
+    display_perm('users_edit_avatars', 'Can edit avatars.');
+    display_perm('users_edit_invites', 'Can edit invite numbers and cancel sent invites.');
+    display_perm('users_edit_watch_hours', 'Can edit contrib watch hours.');
+    display_perm('users_edit_reset_keys', 'Can reset any passkey/authkey.');
+    display_perm('users_edit_profiles', 'Can edit anyone\'s profile.');
+    display_perm('users_edit_badges', 'Can edit anyone\'s badges.');
+    display_perm('users_view_friends', 'Can view anyone\'s friends.');
+    display_perm('users_reset_own_keys', 'Can reset own passkey/authkey.');
+    display_perm('users_edit_password', 'Can change password.');
+    display_perm('users_promote_below', 'Can promote users to below current level.');
+    display_perm('users_promote_to', 'Can promote users up to current level.');
+    display_perm('users_give_donor', 'Can give donor access.');
+    display_perm('users_warn', 'Can warn users.');
+    display_perm('users_disable_users', 'Can disable users.');
+    display_perm('users_disable_posts', 'Can disable users\' posting privileges.');
+    display_perm('users_disable_any', 'Can disable any users\' rights.');
+    display_perm('users_delete_users', 'Can delete anyone\'s account');
+    display_perm('users_view_invites', 'Can view who user has invited');
+    display_perm('users_view_seedleech', 'Can view what a user is seeding or leeching');
+    display_perm('users_view_uploaded', 'Can view a user\'s uploads, regardless of privacy level');
+    display_perm('users_view_keys', 'Can view passkeys');
+    display_perm('users_view_ips', 'Can view IP addresses');
+    display_perm('users_view_email', 'Can view email addresses');
+    display_perm('users_invite_notes', 'Can add a staff note when inviting someone.');
+    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>
@@ -221,21 +220,20 @@ function permissions_form() {
       </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.');
-          display_perm('torrents_freeleech', 'Can make torrents freeleech');
-          display_perm('torrents_search_fast', 'Unlimit search frequency (for scripts).');
-          display_perm('torrents_add_artist', 'Can add artists to any group.');
-          display_perm('edit_unknowns', 'Can edit unknown release information.');
-          display_perm('torrents_edit_vanityhouse', 'Can mark groups as part of Vanity House.');
-          display_perm('artist_edit_vanityhouse', 'Can mark artists as part of Vanity House.');
-          display_perm('torrents_hide_dnu', 'Hide the Do Not Upload list by default.');
-          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.');
-?>
+    display_perm('torrents_delete', 'Can delete torrents');
+    display_perm('torrents_delete_fast', 'Can delete more than 3 torrents at a time.');
+    display_perm('torrents_freeleech', 'Can make torrents freeleech');
+    display_perm('torrents_search_fast', 'Unlimit search frequency (for scripts).');
+    display_perm('torrents_add_artist', 'Can add artists to any group.');
+    display_perm('edit_unknowns', 'Can edit unknown release information.');
+    display_perm('torrents_edit_vanityhouse', 'Can mark groups as part of Vanity House.');
+    display_perm('artist_edit_vanityhouse', 'Can mark artists as part of Vanity House.');
+    display_perm('torrents_hide_dnu', 'Hide the Do Not Upload list by default.');
+    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>
@@ -247,31 +245,30 @@ function permissions_form() {
       </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');
-          display_perm('admin_manage_forums', 'Can manage forums (add/edit/delete)');
-          display_perm('admin_manage_fls', 'Can manage FLS');
-          display_perm('admin_reports', 'Can access reports system');
-          display_perm('admin_advanced_user_search', 'Can access advanced user search');
-          display_perm('admin_create_users', 'Can create users through an administrative form');
-          display_perm('admin_donor_log', 'Can view the donor log');
-          display_perm('admin_manage_ipbans', 'Can manage IP bans');
-          display_perm('admin_dnu', 'Can manage do not upload list');
-          display_perm('admin_clear_cache', 'Can clear cached pages');
-          display_perm('admin_whitelist', 'Can manage the list of allowed clients.');
-          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.');
-          display_perm('admin_update_geoip', 'Can update geoIP data.');
-?>
+    display_perm('admin_manage_blog', 'Can manage the site blog');
+    display_perm('admin_manage_polls', 'Can manage polls');
+    display_perm('admin_manage_forums', 'Can manage forums (add/edit/delete)');
+    display_perm('admin_manage_fls', 'Can manage FLS');
+    display_perm('admin_reports', 'Can access reports system');
+    display_perm('admin_advanced_user_search', 'Can access advanced user search');
+    display_perm('admin_create_users', 'Can create users through an administrative form');
+    display_perm('admin_donor_log', 'Can view the donor log');
+    display_perm('admin_manage_ipbans', 'Can manage IP bans');
+    display_perm('admin_dnu', 'Can manage do not upload list');
+    display_perm('admin_clear_cache', 'Can clear cached pages');
+    display_perm('admin_whitelist', 'Can manage the list of allowed clients.');
+    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.');
+    display_perm('admin_update_geoip', 'Can update geoIP data.'); ?>
         </td>
       </tr>
     </table>
   </div>
   <div class="submit_container"><input type="submit" name="submit" value="Save Permission Class" /></div>
 </div>
-<?
+    <?php
 }

classes/proxies.class.php

@@ -1,4 +1,4 @@
-<?
+<?php
 //Useful: http://www.robtex.com/cnet/
 $AllowedProxies = array(
   //Opera Turbo (may include Opera-owned IP addresses that aren't used for Turbo, but shouldn't run much risk of exploitation)
@@ -13,31 +13,32 @@ $AllowedProxies = array(
   '195.189.143.*', //Norway
 );
 
-function proxyCheck($IP) {
-  global $AllowedProxies;
-  for ($i = 0, $il = count($AllowedProxies); $i < $il; ++$i) {
-    //based on the wildcard principle it should never be shorter
-    if (strlen($IP) < strlen($AllowedProxies[$i])) {
-      continue;
-    }
+function proxyCheck($IP)
+{
+    global $AllowedProxies;
+    for ($i = 0, $il = count($AllowedProxies); $i < $il; ++$i) {
+        //based on the wildcard principle it should never be shorter
+        if (strlen($IP) < strlen($AllowedProxies[$i])) {
+            continue;
+        }
 
-    //since we're matching bit for bit iterating from the start
-    for ($j = 0, $jl = strlen($IP); $j < $jl; ++$j) {
-      //completed iteration and no inequality
-      if ($j == $jl - 1 && $IP[$j] === $AllowedProxies[$i][$j]) {
-        return true;
-      }
+        //since we're matching bit for bit iterating from the start
+        for ($j = 0, $jl = strlen($IP); $j < $jl; ++$j) {
+            //completed iteration and no inequality
+            if ($j == $jl - 1 && $IP[$j] === $AllowedProxies[$i][$j]) {
+                return true;
+            }
 
-      //wildcard
-      if ($AllowedProxies[$i][$j] === '*') {
-        return true;
-      }
+            //wildcard
+            if ($AllowedProxies[$i][$j] === '*') {
+                return true;
+            }
 
-      //inequality found
-      if ($IP[$j] !== $AllowedProxies[$i][$j]) {
-        break;
-      }
+            //inequality found
+            if ($IP[$j] !== $AllowedProxies[$i][$j]) {
+                break;
+            }
+        }
     }
-  }
-  return false;
+    return false;
 }

classes/regex.php

@@ -1,4 +1,4 @@
-<?
+<?php
 //resource_type://username:password@domain:port/path?query_string#anchor
 define('RESOURCE_REGEX', '(https?|ftps?):\/\/');
 define('IP_REGEX', '(\d{1,3}\.){3}\d{1,3}');
@@ -6,7 +6,7 @@ define('DOMAIN_REGEX', '([a-z0-9\-\_]+\.)*[a-z0-9\-\_]+');
 define('PORT_REGEX', ':\d{1,5}');
 define('URL_REGEX', '('.RESOURCE_REGEX.')('.IP_REGEX.'|'.DOMAIN_REGEX.')('.PORT_REGEX.')?(\/\S*)*');
 define('USERNAME_REGEX', '/^[a-z0-9_]{2,20}$/iD');
-define('EMAIL_REGEX','[_a-z0-9-]+([.+][_a-z0-9-]+)*@'.DOMAIN_REGEX);
+define('EMAIL_REGEX', '[_a-z0-9-]+([.+][_a-z0-9-]+)*@'.DOMAIN_REGEX);
 define('IMAGE_REGEX', URL_REGEX.'\/\S+\.(jpg|jpeg|tif|tiff|png|gif|bmp)(\?\S*)?');
 define('VIDEO_REGEX', URL_REGEX.'\/\S+\.(webm)(\?\S*)?');
 define('CSS_REGEX', URL_REGEX.'\/\S+\.css(\?\S*)?');

classes/reports.class.php

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

classes/requests.class.php

@@ -1,22 +1,24 @@
-<?
-class Requests {
-  /**
-   * Update the sphinx requests delta table for a request.
-   *
-   * @param $RequestID
-   */
-  public static function update_sphinx_requests($RequestID) {
-    $QueryID = G::$DB->get_query_id();
-
-    G::$DB->query("
+<?php
+class Requests
+{
+    /**
+     * Update the sphinx requests delta table for a request.
+     *
+     * @param $RequestID
+     */
+    public static function update_sphinx_requests($RequestID)
+    {
+        $QueryID = G::$DB->get_query_id();
+
+        G::$DB->query("
       SELECT REPLACE(t.Name, '.', '_')
       FROM tags AS t
         JOIN requests_tags AS rt ON t.ID = rt.TagID
       WHERE rt.RequestID = $RequestID");
-    $TagList = G::$DB->collect(0, false);
-    $TagList = db_string(implode(' ', $TagList));
+        $TagList = G::$DB->collect(0, false);
+        $TagList = db_string(implode(' ', $TagList));
 
-    G::$DB->query("
+        G::$DB->query("
       REPLACE INTO sphinx_requests_delta (
         ID, UserID, TimeAdded, LastVote, CategoryID, Title, TagList,
         CatalogueNumber, DLSiteID, FillerID, TorrentID,
@@ -31,7 +33,7 @@ class Requests {
         LEFT JOIN requests_votes AS rv ON rv.RequestID = r.ID
       WHERE ID = $RequestID
       GROUP BY r.ID");
-    G::$DB->query("
+        G::$DB->query("
       UPDATE sphinx_requests_delta
       SET ArtistList = (
           SELECT GROUP_CONCAT(ag.Name SEPARATOR ' ')
@@ -41,52 +43,53 @@ class Requests {
           GROUP BY NULL
           )
       WHERE ID = $RequestID");
-    G::$DB->set_query_id($QueryID);
-
-    G::$Cache->delete_value("request_$RequestID");
-  }
-
-
-
-  /**
-   * Function to get data from an array of $RequestIDs. Order of keys doesn't matter (let's keep it that way).
-   *
-   * @param array $RequestIDs
-   * @param boolean $Return if set to false, data won't be returned (ie. if we just want to prime the cache.)
-   * @return The array of requests.
-   * Format: array(RequestID => Associative array)
-   * To see what's exactly inside each associate array, peek inside the function. It won't bite.
-   */
-  //
-  //In places where the output from this is merged with sphinx filters, it will be in a different order.
-  public static function get_requests($RequestIDs, $Return = true) {
-    $Found = $NotFound = array_fill_keys($RequestIDs, false);
-    // Try to fetch the requests from the cache first.
-    foreach ($RequestIDs as $i => $RequestID) {
-      if (!is_number($RequestID)) {
-        unset($RequestIDs[$i], $Found[$GroupID], $NotFound[$GroupID]);
-        continue;
-      }
-      $Data = G::$Cache->get_value("request_$RequestID");
-      if (!empty($Data)) {
-        unset($NotFound[$RequestID]);
-        $Found[$RequestID] = $Data;
-      }
-    }
-    // Make sure there's something in $RequestIDs, otherwise the SQL will break
-    if (count($RequestIDs) === 0) {
-      return [];
+        G::$DB->set_query_id($QueryID);
+
+        G::$Cache->delete_value("request_$RequestID");
     }
-    $IDs = implode(',', array_keys($NotFound));
 
-    /*
-      Don't change without ensuring you change everything else that uses get_requests()
-    */
 
-    if (count($NotFound) > 0) {
-      $QueryID = G::$DB->get_query_id();
 
-      G::$DB->query("
+    /**
+     * Function to get data from an array of $RequestIDs. Order of keys doesn't matter (let's keep it that way).
+     *
+     * @param array $RequestIDs
+     * @param boolean $Return if set to false, data won't be returned (ie. if we just want to prime the cache.)
+     * @return The array of requests.
+     * Format: array(RequestID => Associative array)
+     * To see what's exactly inside each associate array, peek inside the function. It won't bite.
+     */
+    //
+    //In places where the output from this is merged with sphinx filters, it will be in a different order.
+    public static function get_requests($RequestIDs, $Return = true)
+    {
+        $Found = $NotFound = array_fill_keys($RequestIDs, false);
+        // Try to fetch the requests from the cache first.
+        foreach ($RequestIDs as $i => $RequestID) {
+            if (!is_number($RequestID)) {
+                unset($RequestIDs[$i], $Found[$GroupID], $NotFound[$GroupID]);
+                continue;
+            }
+            $Data = G::$Cache->get_value("request_$RequestID");
+            if (!empty($Data)) {
+                unset($NotFound[$RequestID]);
+                $Found[$RequestID] = $Data;
+            }
+        }
+        // Make sure there's something in $RequestIDs, otherwise the SQL will break
+        if (count($RequestIDs) === 0) {
+            return [];
+        }
+        $IDs = implode(',', array_keys($NotFound));
+
+        /*
+        Don't change without ensuring you change everything else that uses get_requests()
+        */
+
+        if (count($NotFound) > 0) {
+            $QueryID = G::$DB->get_query_id();
+
+            G::$DB->query("
         SELECT
           ID,
           UserID,
@@ -107,60 +110,64 @@ class Requests {
         FROM requests
         WHERE ID IN ($IDs)
         ORDER BY ID");
-      $Requests = G::$DB->to_array(false, MYSQLI_ASSOC, true);
-      $Tags = self::get_tags(G::$DB->collect('ID', false));
-      foreach ($Requests as $Request) {
-        $Request['AnonymousFill'] = false;
-        if ($Request['FillerID']) {
-          G::$DB->query("
+            $Requests = G::$DB->to_array(false, MYSQLI_ASSOC, true);
+            $Tags = self::get_tags(G::$DB->collect('ID', false));
+            foreach ($Requests as $Request) {
+                $Request['AnonymousFill'] = false;
+                if ($Request['FillerID']) {
+                    G::$DB->query("
             SELECT Anonymous
             FROM torrents
             WHERE ID = ".$Request['TorrentID']);
-          list($Anonymous) = G::$DB->next_record();
-          if ($Anonymous) $Request['AnonymousFill'] = true;
+                    list($Anonymous) = G::$DB->next_record();
+                    if ($Anonymous) {
+                        $Request['AnonymousFill'] = true;
+                    }
+                }
+                unset($NotFound[$Request['ID']]);
+                $Request['Tags'] = isset($Tags[$Request['ID']]) ? $Tags[$Request['ID']] : [];
+                $Found[$Request['ID']] = $Request;
+                G::$Cache->cache_value('request_'.$Request['ID'], $Request, 0);
+            }
+            G::$DB->set_query_id($QueryID);
+
+            // Orphan requests. There shouldn't ever be any
+            if (count($NotFound) > 0) {
+                foreach (array_keys($NotFound) as $GroupID) {
+                    unset($Found[$GroupID]);
+                }
+            }
         }
-        unset($NotFound[$Request['ID']]);
-        $Request['Tags'] = isset($Tags[$Request['ID']]) ? $Tags[$Request['ID']] : [];
-        $Found[$Request['ID']] = $Request;
-        G::$Cache->cache_value('request_'.$Request['ID'], $Request, 0);
-      }
-      G::$DB->set_query_id($QueryID);
-
-      // Orphan requests. There shouldn't ever be any
-      if (count($NotFound) > 0) {
-        foreach (array_keys($NotFound) as $GroupID) {
-          unset($Found[$GroupID]);
+
+        if ($Return) { // If we're interested in the data, and not just caching it
+            return $Found;
         }
-      }
     }
 
-    if ($Return) { // If we're interested in the data, and not just caching it
-      return $Found;
-    }
-  }
-
-  /**
-   * Return a single request. Wrapper for get_requests
-   *
-   * @param int $RequestID
-   * @return request array or false if request doesn't exist. See get_requests for a description of the format
-   */
-  public static function get_request($RequestID) {
-    $Request = self::get_requests(array($RequestID));
-    if (isset($Request[$RequestID])) {
-      return $Request[$RequestID];
+    /**
+     * Return a single request. Wrapper for get_requests
+     *
+     * @param int $RequestID
+     * @return request array or false if request doesn't exist. See get_requests for a description of the format
+     */
+    public static function get_request($RequestID)
+    {
+        $Request = self::get_requests(array($RequestID));
+        if (isset($Request[$RequestID])) {
+            return $Request[$RequestID];
+        }
+        return false;
     }
-    return false;
-  }
-
-  public static function get_artists($RequestID) {
-    $Artists = G::$Cache->get_value("request_artists_$RequestID");
-    if (is_array($Artists)) {
-      $Results = $Artists;
-    } else {
-      $Results = [];
-      $QueryID = G::$DB->get_query_id();
-      G::$DB->query("
+
+    public static function get_artists($RequestID)
+    {
+        $Artists = G::$Cache->get_value("request_artists_$RequestID");
+        if (is_array($Artists)) {
+            $Results = $Artists;
+        } else {
+            $Results = [];
+            $QueryID = G::$DB->get_query_id();
+            G::$DB->query("
         SELECT
           ra.ArtistID,
           ag.Name
@@ -168,26 +175,27 @@ class Requests {
           JOIN artists_group AS ag ON ra.ArtistID = ag.ArtistID
         WHERE ra.RequestID = $RequestID
         ORDER BY ag.Name ASC;");
-      $ArtistRaw = G::$DB->to_array();
-      G::$DB->set_query_id($QueryID);
-      foreach ($ArtistRaw as $ArtistRow) {
-        list($ArtistID, $ArtistName) = $ArtistRow;
-        $Results[] = array('id' => $ArtistID, 'name' => $ArtistName);
-      }
-      G::$Cache->cache_value("request_artists_$RequestID", $Results);
+            $ArtistRaw = G::$DB->to_array();
+            G::$DB->set_query_id($QueryID);
+            foreach ($ArtistRaw as $ArtistRow) {
+                list($ArtistID, $ArtistName) = $ArtistRow;
+                $Results[] = array('id' => $ArtistID, 'name' => $ArtistName);
+            }
+            G::$Cache->cache_value("request_artists_$RequestID", $Results);
+        }
+        return $Results;
     }
-    return $Results;
-  }
 
-  public static function get_tags($RequestIDs) {
-    if (empty($RequestIDs)) {
-      return [];
-    }
-    if (is_array($RequestIDs)) {
-      $RequestIDs = implode(',', $RequestIDs);
-    }
-    $QueryID = G::$DB->get_query_id();
-    G::$DB->query("
+    public static function get_tags($RequestIDs)
+    {
+        if (empty($RequestIDs)) {
+            return [];
+        }
+        if (is_array($RequestIDs)) {
+            $RequestIDs = implode(',', $RequestIDs);
+        }
+        $QueryID = G::$DB->get_query_id();
+        G::$DB->query("
       SELECT
         rt.RequestID,
         rt.TagID,
@@ -196,21 +204,22 @@ class Requests {
         JOIN tags AS t ON rt.TagID = t.ID
       WHERE rt.RequestID IN ($RequestIDs)
       ORDER BY rt.TagID ASC");
-    $Tags = G::$DB->to_array(false, MYSQLI_NUM, false);
-    G::$DB->set_query_id($QueryID);
-    $Results = [];
-    foreach ($Tags as $TagsRow) {
-      list($RequestID, $TagID, $TagName) = $TagsRow;
-      $Results[$RequestID][$TagID] = $TagName;
+        $Tags = G::$DB->to_array(false, MYSQLI_NUM, false);
+        G::$DB->set_query_id($QueryID);
+        $Results = [];
+        foreach ($Tags as $TagsRow) {
+            list($RequestID, $TagID, $TagName) = $TagsRow;
+            $Results[$RequestID][$TagID] = $TagName;
+        }
+        return $Results;
     }
-    return $Results;
-  }
-
-  public static function get_votes_array($RequestID) {
-    $RequestVotes = G::$Cache->get_value("request_votes_$RequestID");
-    if (!is_array($RequestVotes)) {
-      $QueryID = G::$DB->get_query_id();
-      G::$DB->query("
+
+    public static function get_votes_array($RequestID)
+    {
+        $RequestVotes = G::$Cache->get_value("request_votes_$RequestID");
+        if (!is_array($RequestVotes)) {
+            $QueryID = G::$DB->get_query_id();
+            G::$DB->query("
         SELECT
           rv.UserID,
           rv.Bounty,
@@ -219,27 +228,26 @@ class Requests {
           LEFT JOIN users_main AS u ON u.ID = rv.UserID
         WHERE rv.RequestID = $RequestID
         ORDER BY rv.Bounty DESC");
-      if (!G::$DB->has_results()) {
-        return array(
-          'TotalBounty' => 0,
-          'Voters' => []);
-      }
-      $Votes = G::$DB->to_array();
-
-      $RequestVotes = [];
-      $RequestVotes['TotalBounty'] = array_sum(G::$DB->collect('Bounty'));
-
-      foreach ($Votes as $Vote) {
-        list($UserID, $Bounty, $Username) = $Vote;
-        $VoteArray = [];
-        $VotesArray[] = array('UserID' => $UserID, 'Username' => $Username, 'Bounty' => $Bounty);
-      }
-
-      $RequestVotes['Voters'] = $VotesArray;
-      G::$Cache->cache_value("request_votes_$RequestID", $RequestVotes);
-      G::$DB->set_query_id($QueryID);
+            if (!G::$DB->has_results()) {
+                return array(
+                    'TotalBounty' => 0,
+                    'Voters' => []);
+            }
+            $Votes = G::$DB->to_array();
+
+            $RequestVotes = [];
+            $RequestVotes['TotalBounty'] = array_sum(G::$DB->collect('Bounty'));
+
+            foreach ($Votes as $Vote) {
+                list($UserID, $Bounty, $Username) = $Vote;
+                $VoteArray = [];
+                $VotesArray[] = array('UserID' => $UserID, 'Username' => $Username, 'Bounty' => $Bounty);
+            }
+
+            $RequestVotes['Voters'] = $VotesArray;
+            G::$Cache->cache_value("request_votes_$RequestID", $RequestVotes);
+            G::$DB->set_query_id($QueryID);
+        }
+        return $RequestVotes;
     }
-    return $RequestVotes;
-  }
-
 }