Upload files to 'classes'

classes/revisionhistory.class.php

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

classes/revisionhistoryview.class.php

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

classes/rules.class.php

@@ -1,12 +1,14 @@
 <?php
-class Rules {
+class Rules
+{
 
   /**
    * Displays the site's "Golden Rules".
    *
    */
-  public static function display_golden_rules() {
-    ?>
+    public static function display_golden_rules()
+    {
+        ?>
     <ol>
       <li>Staff can do anything to anyone for any reason (or no reason). If you take issue with a decision, you must do so privately with the staff member who issued the decision or with an administrator of the site.</li>
       <li>One account per person per lifetime.</li>
@@ -16,16 +18,17 @@ class Rules {
       <li>Attempting to find a bug in the site code is allowed and sometimes even rewarded. Follow proper disclosure procedures by contacting staff about the issue well before disclosing it publicly. Do not misuse any bugs you may discover. Do not attempt to portray abuse as a bug in the hopes of a reward.</li>
       <li>Don't reveal the criteria for hidden badges or events.</li>
     </ol>
-<?
-  }
-
-  /**
-   * Displays the site's rules for tags.
-   *
-   * @param boolean $OnUpload - whether it's being displayed on a torrent upload form
-   */
-  public static function display_site_tag_rules($OnUpload = false) {
-    ?>
+        <?php
+    }
+
+    /**
+     * Displays the site's rules for tags.
+     *
+     * @param boolean $OnUpload - whether it's being displayed on a torrent upload form
+     */
+    public static function display_site_tag_rules($OnUpload = false)
+    {
+        ?>
     <ul>
       <li>Tags should be comma-separated, and you should use a period (".") to separate words inside a tag &mdash; e.g. "<strong class="important_text_alt">big.breasts</strong>".</li>
 
@@ -60,15 +63,16 @@ class Rules {
 
       <li><strong>You should be able to build up a list of tags using only the official tags <?=($OnUpload ? 'to the left of the text box' : 'on <a href="upload.php">the torrent upload page</a>')?>.</strong> If you are in any doubt about whether or not a tag is acceptable, do not add it.</li>
     </ul>
-<?
-  }
-
-  /**
-   * Displays the site's rules for the forum
-   *
-   */
-  public static function display_forum_rules() {
-    ?>
+        <?php
+    }
+
+    /**
+     * Displays the site's rules for the forum
+     *
+     */
+    public static function display_forum_rules()
+    {
+        ?>
     <ol>
       <li>Many forums have their own set of rules. Make sure you read and take note of these rules before you attempt to post in one of these forums.</li>
       <li>No commercial advertising or referral schemes. This includes any scheme in which the poster gets personal gain from users clicking a link. You will be immediately banned for this, no questions asked.</li>
@@ -85,15 +89,16 @@ class Rules {
       <li>No language other than English (and Japanese, when relevant) is permitted in the forums.</li>
       <li>Some things that <em>are</em> allowed include mature and graphic content, political and religious discussions, and insults. You are welcome to express whatever inflammatory opinions you want as long as you don't go overboard with it.</li>
     </ol>
-<?
-  }
-
-  /**
-   * Displays the site's rules for conversing on its IRC network
-   *
-   */
-  public static function display_irc_chat_rules() {
-    ?>
+        <?php
+    }
+
+    /**
+     * Displays the site's rules for conversing on its IRC network
+     *
+     */
+    public static function display_irc_chat_rules()
+    {
+        ?>
     <ol>
       <li>Staff have the final decision. If a staff member says stop and you continue, expect repercussions.</li>
       <li>Do not leave Caps Lock enabled all the time. It gets annoying, and you will likely get yourself kicked.</li>
@@ -110,6 +115,6 @@ class Rules {
       <li>Unofficial channels are <em>not</em> policed by staff. Any content or discussion that goes on in unofficial channels shoud be treated as part of an unrelated public irc network.</li>
       <li><strong>Read the channel topic before asking questions.</strong></li>
     </ol>
-<?
-  }
+        <?php
+    }
 }

classes/script_start.php

@@ -12,12 +12,16 @@
 require 'config.php'; //The config contains all site wide configuration information
 
 // Check for common setup pitfalls
-if (!ini_get('short_open_tag')) { die('short_open_tag must be On in php.ini'); }
-if (!extension_loaded('apcu')) { die('APCu extension not loaded'); }
+if (!ini_get('short_open_tag')) {
+    die('short_open_tag must be On in php.ini');
+}
+if (!extension_loaded('apcu')) {
+    die('APCu extension not loaded');
+}
 
 // Deal with dumbasses
 if (isset($_REQUEST['info_hash']) && isset($_REQUEST['peer_id'])) {
-  die('d14:failure reason40:Invalid .torrent, try downloading again.e');
+    die('d14:failure reason40:Invalid .torrent, try downloading again.e');
 }
 
 require(SERVER_ROOT.'/classes/proxies.class.php');
@@ -25,30 +29,33 @@ require(SERVER_ROOT.'/classes/proxies.class.php');
 // Get the user's actual IP address if they're proxied.
 // Or if cloudflare is used
 if (isset($_SERVER['HTTP_CF_CONNECTING_IP'])) {
-  $_SERVER['REMOTE_ADDR'] = $_SERVER['HTTP_CF_CONNECTING_IP'];
+    $_SERVER['REMOTE_ADDR'] = $_SERVER['HTTP_CF_CONNECTING_IP'];
 }
 if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])
     && proxyCheck($_SERVER['REMOTE_ADDR'])
-    && filter_var($_SERVER['HTTP_X_FORWARDED_FOR'],
+    && filter_var(
+        $_SERVER['HTTP_X_FORWARDED_FOR'],
         FILTER_VALIDATE_IP,
-        FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE)) {
-  $_SERVER['REMOTE_ADDR'] = $_SERVER['HTTP_X_FORWARDED_FOR'];
+        FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE
+    )) {
+    $_SERVER['REMOTE_ADDR'] = $_SERVER['HTTP_X_FORWARDED_FOR'];
 }
 
 if (!isset($argv) && !empty($_SERVER['HTTP_HOST'])) {
-  // Skip this block if running from cli or if the browser is old and shitty
-  // This should really be done in nginx config TODO: Remove
-  if ($_SERVER['HTTP_HOST'] == 'www.'.SITE_DOMAIN) {
-    header('Location: https://'.SITE_DOMAIN.$_SERVER['REQUEST_URI']); die();
-  }
+    // Skip this block if running from cli or if the browser is old and shitty
+    // This should really be done in nginx config TODO: Remove
+    if ($_SERVER['HTTP_HOST'] == 'www.'.SITE_DOMAIN) {
+        header('Location: https://'.SITE_DOMAIN.$_SERVER['REQUEST_URI']);
+        die();
+    }
 }
 
 
 
 $ScriptStartTime = microtime(true); //To track how long a page takes to create
 if (!defined('PHP_WINDOWS_VERSION_MAJOR')) {
-  $RUsage = getrusage();
-  $CPUTimeStart = $RUsage['ru_utime.tv_sec'] * 1000000 + $RUsage['ru_utime.tv_usec'];
+    $RUsage = getrusage();
+    $CPUTimeStart = $RUsage['ru_utime.tv_sec'] * 1000000 + $RUsage['ru_utime.tv_usec'];
 }
 ob_start(); //Start a buffer, mainly in case there is a mysql error
 
@@ -97,19 +104,19 @@ list($Classes, $ClassLevels) = Users::get_classes();
 // Permissions
 
 if (isset($_COOKIE['session']) && isset($_COOKIE['userid'])) {
-  $SessionID = $_COOKIE['session'];
-  $LoggedUser['ID'] = (int)$_COOKIE['userid'];
+    $SessionID = $_COOKIE['session'];
+    $LoggedUser['ID'] = (int)$_COOKIE['userid'];
 
-  $UserID = $LoggedUser['ID']; //TODO: UserID should not be LoggedUser
+    $UserID = $LoggedUser['ID']; //TODO: UserID should not be LoggedUser
 
-  if (!$LoggedUser['ID'] || !$SessionID) {
-    logout();
-  }
+    if (!$LoggedUser['ID'] || !$SessionID) {
+        logout();
+    }
 
-  $UserSessions = $Cache->get_value("users_sessions_$UserID");
-  if (!is_array($UserSessions)) {
-    $DB->query(
-     "SELECT
+    $UserSessions = $Cache->get_value("users_sessions_$UserID");
+    if (!is_array($UserSessions)) {
+        $DB->query(
+            "SELECT
         SessionID,
         Browser,
         OperatingSystem,
@@ -118,169 +125,167 @@ if (isset($_COOKIE['session']) && isset($_COOKIE['userid'])) {
       FROM users_sessions
       WHERE UserID = '$UserID'
         AND Active = 1
-      ORDER BY LastUpdate DESC");
-    $UserSessions = $DB->to_array('SessionID',MYSQLI_ASSOC);
-    $Cache->cache_value("users_sessions_$UserID", $UserSessions, 0);
-  }
+      ORDER BY LastUpdate DESC"
+        );
+        $UserSessions = $DB->to_array('SessionID', MYSQLI_ASSOC);
+        $Cache->cache_value("users_sessions_$UserID", $UserSessions, 0);
+    }
 
-  if (!array_key_exists($SessionID, $UserSessions)) {
-    logout();
-  }
+    if (!array_key_exists($SessionID, $UserSessions)) {
+        logout();
+    }
 
-  // Check if user is enabled
-  $Enabled = $Cache->get_value('enabled_'.$LoggedUser['ID']);
-  if ($Enabled === false) {
-    $DB->query("
+    // Check if user is enabled
+    $Enabled = $Cache->get_value('enabled_'.$LoggedUser['ID']);
+    if ($Enabled === false) {
+        $DB->query("
       SELECT Enabled
       FROM users_main
       WHERE ID = '$LoggedUser[ID]'");
-    list($Enabled) = $DB->next_record();
-    $Cache->cache_value('enabled_'.$LoggedUser['ID'], $Enabled, 0);
-  }
-  if ($Enabled == 2) {
-    logout();
-  }
+        list($Enabled) = $DB->next_record();
+        $Cache->cache_value('enabled_'.$LoggedUser['ID'], $Enabled, 0);
+    }
+    if ($Enabled == 2) {
+        logout();
+    }
 
-  // Up/Down stats
-  $UserStats = $Cache->get_value('user_stats_'.$LoggedUser['ID']);
-  if (!is_array($UserStats)) {
-    $DB->query("
+    // Up/Down stats
+    $UserStats = $Cache->get_value('user_stats_'.$LoggedUser['ID']);
+    if (!is_array($UserStats)) {
+        $DB->query("
       SELECT Uploaded AS BytesUploaded, Downloaded AS BytesDownloaded, RequiredRatio
       FROM users_main
       WHERE ID = '$LoggedUser[ID]'");
-    $UserStats = $DB->next_record(MYSQLI_ASSOC);
-    $Cache->cache_value('user_stats_'.$LoggedUser['ID'], $UserStats, 3600);
-  }
+        $UserStats = $DB->next_record(MYSQLI_ASSOC);
+        $Cache->cache_value('user_stats_'.$LoggedUser['ID'], $UserStats, 3600);
+    }
 
-  // Get info such as username
-  $LightInfo = Users::user_info($LoggedUser['ID']);
-  $HeavyInfo = Users::user_heavy_info($LoggedUser['ID']);
+    // Get info such as username
+    $LightInfo = Users::user_info($LoggedUser['ID']);
+    $HeavyInfo = Users::user_heavy_info($LoggedUser['ID']);
 
-  // Create LoggedUser array
-  $LoggedUser = array_merge($HeavyInfo, $LightInfo, $UserStats);
+    // Create LoggedUser array
+    $LoggedUser = array_merge($HeavyInfo, $LightInfo, $UserStats);
 
-  $LoggedUser['RSS_Auth'] = md5($LoggedUser['ID'] . RSS_HASH . $LoggedUser['torrent_pass']);
+    $LoggedUser['RSS_Auth'] = md5($LoggedUser['ID'] . RSS_HASH . $LoggedUser['torrent_pass']);
 
-  // $LoggedUser['RatioWatch'] as a bool to disable things for users on Ratio Watch
-  $LoggedUser['RatioWatch'] = (
-    $LoggedUser['RatioWatchEnds']
+    // $LoggedUser['RatioWatch'] as a bool to disable things for users on Ratio Watch
+    $LoggedUser['RatioWatch'] = (
+        $LoggedUser['RatioWatchEnds']
     && time() < strtotime($LoggedUser['RatioWatchEnds'])
     && ($LoggedUser['BytesDownloaded'] * $LoggedUser['RequiredRatio']) > $LoggedUser['BytesUploaded']
-  );
+    );
 
-  // Load in the permissions
-  $LoggedUser['Permissions'] = Permissions::get_permissions_for_user($LoggedUser['ID'], $LoggedUser['CustomPermissions']);
-  $LoggedUser['Permissions']['MaxCollages'] += Donations::get_personal_collages($LoggedUser['ID']);
+    // Load in the permissions
+    $LoggedUser['Permissions'] = Permissions::get_permissions_for_user($LoggedUser['ID'], $LoggedUser['CustomPermissions']);
+    $LoggedUser['Permissions']['MaxCollages'] += Donations::get_personal_collages($LoggedUser['ID']);
 
-  // Change necessary triggers in external components
-  $Cache->CanClear = check_perms('admin_clear_cache');
+    // Change necessary triggers in external components
+    $Cache->CanClear = check_perms('admin_clear_cache');
 
-  // Because we <3 our staff
-  if (check_perms('site_disable_ip_history')) {
-    $_SERVER['REMOTE_ADDR'] = '127.0.0.1';
-  }
+    // Because we <3 our staff
+    if (check_perms('site_disable_ip_history')) {
+        $_SERVER['REMOTE_ADDR'] = '127.0.0.1';
+    }
 
-  // Update LastUpdate every 10 minutes
-  if (strtotime($UserSessions[$SessionID]['LastUpdate']) + 600 < time()) {
-    $DB->query("
+    // Update LastUpdate every 10 minutes
+    if (strtotime($UserSessions[$SessionID]['LastUpdate']) + 600 < time()) {
+        $DB->query("
       UPDATE users_main
       SET LastAccess = NOW()
       WHERE ID = '$LoggedUser[ID]'");
-    $SessionQuery =
-     "UPDATE users_sessions
+        $SessionQuery =
+        "UPDATE users_sessions
       SET ";
-    // Only update IP if we have an encryption key in memory
-    if (apcu_exists('DBKEY')) {
-      $SessionQuery .= "IP = '".Crypto::encrypt($_SERVER['REMOTE_ADDR'])."', ";
-    }
-    $SessionQuery .=
-       "Browser = '$Browser',
+        // Only update IP if we have an encryption key in memory
+        if (apcu_exists('DBKEY')) {
+            $SessionQuery .= "IP = '".Crypto::encrypt($_SERVER['REMOTE_ADDR'])."', ";
+        }
+        $SessionQuery .=
+         "Browser = '$Browser',
         OperatingSystem = '$OperatingSystem',
         LastUpdate = NOW()
       WHERE UserID = '$LoggedUser[ID]'
         AND SessionID = '".db_string($SessionID)."'";
-    $DB->query($SessionQuery);
-    $Cache->begin_transaction("users_sessions_$UserID");
-    $Cache->delete_row($SessionID);
-    $UsersSessionCache = array(
+        $DB->query($SessionQuery);
+        $Cache->begin_transaction("users_sessions_$UserID");
+        $Cache->delete_row($SessionID);
+        $UsersSessionCache = array(
         'SessionID' => $SessionID,
         'Browser' => $Browser,
         'OperatingSystem' => $OperatingSystem,
         'IP' => (apcu_exists('DBKEY') ? Crypto::encrypt($_SERVER['REMOTE_ADDR']) : $UserSessions[$SessionID]['IP']),
         'LastUpdate' => sqltime() );
-    $Cache->insert_front($SessionID, $UsersSessionCache);
-    $Cache->commit_transaction(0);
-  }
-
-  // Notifications
-  if (isset($LoggedUser['Permissions']['site_torrents_notify'])) {
-    $LoggedUser['Notify'] = $Cache->get_value('notify_filters_'.$LoggedUser['ID']);
-    if (!is_array($LoggedUser['Notify'])) {
-      $DB->query("
+        $Cache->insert_front($SessionID, $UsersSessionCache);
+        $Cache->commit_transaction(0);
+    }
+
+    // Notifications
+    if (isset($LoggedUser['Permissions']['site_torrents_notify'])) {
+        $LoggedUser['Notify'] = $Cache->get_value('notify_filters_'.$LoggedUser['ID']);
+        if (!is_array($LoggedUser['Notify'])) {
+            $DB->query("
         SELECT ID, Label
         FROM users_notify_filters
         WHERE UserID = '$LoggedUser[ID]'");
-      $LoggedUser['Notify'] = $DB->to_array('ID');
-      $Cache->cache_value('notify_filters_'.$LoggedUser['ID'], $LoggedUser['Notify'], 2592000);
+            $LoggedUser['Notify'] = $DB->to_array('ID');
+            $Cache->cache_value('notify_filters_'.$LoggedUser['ID'], $LoggedUser['Notify'], 2592000);
+        }
     }
-  }
-
-  // We've never had to disable the wiki privs of anyone.
-  if ($LoggedUser['DisableWiki']) {
-    unset($LoggedUser['Permissions']['site_edit_wiki']);
-  }
 
-  // IP changed
+    // We've never had to disable the wiki privs of anyone.
+    if ($LoggedUser['DisableWiki']) {
+        unset($LoggedUser['Permissions']['site_edit_wiki']);
+    }
 
-  if (apcu_exists('DBKEY') && Crypto::decrypt($LoggedUser['IP']) != $_SERVER['REMOTE_ADDR'] && !check_perms('site_disable_ip_history')) {
+    // IP changed
 
-    if (Tools::site_ban_ip($_SERVER['REMOTE_ADDR'])) {
-      error('Your IP address has been banned.');
-    }
+    if (apcu_exists('DBKEY') && Crypto::decrypt($LoggedUser['IP']) != $_SERVER['REMOTE_ADDR'] && !check_perms('site_disable_ip_history')) {
+        if (Tools::site_ban_ip($_SERVER['REMOTE_ADDR'])) {
+            error('Your IP address has been banned.');
+        }
 
-    $CurIP = db_string($LoggedUser['IP']);
-    $NewIP = db_string($_SERVER['REMOTE_ADDR']);
-    $DB->query("
+        $CurIP = db_string($LoggedUser['IP']);
+        $NewIP = db_string($_SERVER['REMOTE_ADDR']);
+        $DB->query("
       SELECT IP
       FROM users_history_ips
       WHERE EndTime IS NULL
         AND UserID = '$LoggedUser[ID]'");
-    while (list($EncIP) = $DB->next_record()) {
-      if (Crypto::decrypt($EncIP) == $CurIP) {
-        $CurIP = $EncIP;
-        // CurIP is now the encrypted IP that was already in the database (for matching)
-        break;
-      }
-    }
-    $DB->query("
+        while (list($EncIP) = $DB->next_record()) {
+            if (Crypto::decrypt($EncIP) == $CurIP) {
+                $CurIP = $EncIP;
+                // CurIP is now the encrypted IP that was already in the database (for matching)
+                break;
+            }
+        }
+        $DB->query("
       UPDATE users_history_ips
       SET EndTime = NOW()
       WHERE EndTime IS NULL
         AND UserID = '$LoggedUser[ID]'
         AND IP = '$CurIP'");
-    $DB->query("
+        $DB->query("
       INSERT IGNORE INTO users_history_ips
         (UserID, IP, StartTime)
       VALUES
         ('$LoggedUser[ID]', '".Crypto::encrypt($NewIP)."', NOW())");
 
-    $ipcc = Tools::geoip($NewIP);
-    $DB->query("
+        $ipcc = Tools::geoip($NewIP);
+        $DB->query("
       UPDATE users_main
       SET IP = '".Crypto::encrypt($NewIP)."', ipcc = '$ipcc'
       WHERE ID = '$LoggedUser[ID]'");
-    $Cache->begin_transaction('user_info_heavy_'.$LoggedUser['ID']);
-    $Cache->update_row(false, array('IP' => Crypto::encrypt($_SERVER['REMOTE_ADDR'])));
-    $Cache->commit_transaction(0);
-
-
-  }
+        $Cache->begin_transaction('user_info_heavy_'.$LoggedUser['ID']);
+        $Cache->update_row(false, array('IP' => Crypto::encrypt($_SERVER['REMOTE_ADDR'])));
+        $Cache->commit_transaction(0);
+    }
 
 
-  // Get stylesheets
-  $Stylesheets = $Cache->get_value('stylesheets');
-  if (!is_array($Stylesheets)) {
-    $DB->query('
+    // Get stylesheets
+    $Stylesheets = $Cache->get_value('stylesheets');
+    if (!is_array($Stylesheets)) {
+        $DB->query('
       SELECT
         ID,
         LOWER(REPLACE(Name, " ", "_")) AS Name,
@@ -288,16 +293,16 @@ if (isset($_COOKIE['session']) && isset($_COOKIE['userid'])) {
         LOWER(REPLACE(Additions, " ", "_")) AS Additions,
         Additions AS ProperAdditions
       FROM stylesheets');
-    $Stylesheets = $DB->to_array('ID', MYSQLI_BOTH);
-    $Cache->cache_value('stylesheets', $Stylesheets, 0);
-  }
+        $Stylesheets = $DB->to_array('ID', MYSQLI_BOTH);
+        $Cache->cache_value('stylesheets', $Stylesheets, 0);
+    }
 
-  //A9 TODO: Clean up this messy solution
-  $LoggedUser['StyleName'] = $Stylesheets[$LoggedUser['StyleID']]['Name'];
+    //A9 TODO: Clean up this messy solution
+    $LoggedUser['StyleName'] = $Stylesheets[$LoggedUser['StyleID']]['Name'];
 
-  if (empty($LoggedUser['Username'])) {
-    logout(); // Ghost
-  }
+    if (empty($LoggedUser['Username'])) {
+        logout(); // Ghost
+    }
 }
 G::initialize();
 $Debug->set_flag('end user handling');
@@ -307,48 +312,50 @@ $Debug->set_flag('start function definitions');
 /**
  * Log out the current session
  */
-function logout() {
-  global $SessionID;
-  setcookie('session', '', time() - 60 * 60 * 24 * 365, '/', '', false);
-  setcookie('userid', '', time() - 60 * 60 * 24 * 365, '/', '', false);
-  setcookie('keeplogged', '', time() - 60 * 60 * 24 * 365, '/', '', false);
-  if ($SessionID) {
-
-    G::$DB->query("
+function logout()
+{
+    global $SessionID;
+    setcookie('session', '', time() - 60 * 60 * 24 * 365, '/', '', false);
+    setcookie('userid', '', time() - 60 * 60 * 24 * 365, '/', '', false);
+    setcookie('keeplogged', '', time() - 60 * 60 * 24 * 365, '/', '', false);
+    if ($SessionID) {
+        G::$DB->query("
       DELETE FROM users_sessions
       WHERE UserID = '" . G::$LoggedUser['ID'] . "'
         AND SessionID = '".db_string($SessionID)."'");
 
-    G::$Cache->begin_transaction('users_sessions_' . G::$LoggedUser['ID']);
-    G::$Cache->delete_row($SessionID);
-    G::$Cache->commit_transaction(0);
-  }
-  G::$Cache->delete_value('user_info_' . G::$LoggedUser['ID']);
-  G::$Cache->delete_value('user_stats_' . G::$LoggedUser['ID']);
-  G::$Cache->delete_value('user_info_heavy_' . G::$LoggedUser['ID']);
+        G::$Cache->begin_transaction('users_sessions_' . G::$LoggedUser['ID']);
+        G::$Cache->delete_row($SessionID);
+        G::$Cache->commit_transaction(0);
+    }
+    G::$Cache->delete_value('user_info_' . G::$LoggedUser['ID']);
+    G::$Cache->delete_value('user_stats_' . G::$LoggedUser['ID']);
+    G::$Cache->delete_value('user_info_heavy_' . G::$LoggedUser['ID']);
 
-  header('Location: login.php');
+    header('Location: login.php');
 
-  die();
+    die();
 }
 
-function logout_all_sessions() {
-  $UserID = G::$LoggedUser['ID'];
+function logout_all_sessions()
+{
+    $UserID = G::$LoggedUser['ID'];
 
-  G::$DB->query("
+    G::$DB->query("
     DELETE FROM users_sessions
     WHERE UserID = '$UserID'");
 
-  G::$Cache->delete_value('users_sessions_' . $UserID);
-  logout();
+    G::$Cache->delete_value('users_sessions_' . $UserID);
+    logout();
 }
 
-function enforce_login() {
-  global $SessionID;
-  if (!$SessionID || !G::$LoggedUser) {
-    setcookie('redirect', $_SERVER['REQUEST_URI'], time() + 60 * 30, '/', '', false);
-    logout();
-  }
+function enforce_login()
+{
+    global $SessionID;
+    if (!$SessionID || !G::$LoggedUser) {
+        setcookie('redirect', $_SERVER['REQUEST_URI'], time() + 60 * 30, '/', '', false);
+        logout();
+    }
 }
 
 /**
@@ -358,20 +365,21 @@ function enforce_login() {
  * @param Are we using ajax?
  * @return authorisation status. Prints an error message to LAB_CHAN on IRC on failure.
  */
-function authorize($Ajax = false) {
-  if (empty($_REQUEST['auth']) || $_REQUEST['auth'] != G::$LoggedUser['AuthKey']) {
-    send_irc("PRIVMSG ".LAB_CHAN." :".G::$LoggedUser['Username']." just failed authorize on ".$_SERVER['REQUEST_URI'].(!empty($_SERVER['HTTP_REFERER']) ? " coming from ".$_SERVER['HTTP_REFERER'] : ""));
-    error('Invalid authorization key. Go back, refresh, and try again.', $Ajax);
-    return false;
-  }
-  return true;
+function authorize($Ajax = false)
+{
+    if (empty($_REQUEST['auth']) || $_REQUEST['auth'] != G::$LoggedUser['AuthKey']) {
+        send_irc("PRIVMSG ".LAB_CHAN." :".G::$LoggedUser['Username']." just failed authorize on ".$_SERVER['REQUEST_URI'].(!empty($_SERVER['HTTP_REFERER']) ? " coming from ".$_SERVER['HTTP_REFERER'] : ""));
+        error('Invalid authorization key. Go back, refresh, and try again.', $Ajax);
+        return false;
+    }
+    return true;
 }
 
 $Debug->set_flag('ending function definitions');
 //Include /sections/*/index.php
 $Document = basename(parse_url($_SERVER['SCRIPT_FILENAME'], PHP_URL_PATH), '.php');
 if (!preg_match('/^[a-z0-9]+$/i', $Document)) {
-  error(404);
+    error(404);
 }
 
 $StripPostKeys = array_fill_keys(array('password', 'cur_pass', 'new_pass_1', 'new_pass_2', 'verifypassword', 'confirm_password', 'ChangePassword', 'Password'), true);
@@ -388,9 +396,9 @@ define('STAFF_LOCKED', 1);
 $AllowedPages = ['staffpm', 'ajax', 'locked', 'logout', 'login'];
 
 if (isset(G::$LoggedUser['LockedAccount']) && !in_array($Document, $AllowedPages)) {
-  require(SERVER_ROOT . '/sections/locked/index.php');
+    require(SERVER_ROOT . '/sections/locked/index.php');
 } else {
-  require(SERVER_ROOT . '/sections/' . $Document . '/index.php');
+    require(SERVER_ROOT . '/sections/' . $Document . '/index.php');
 }
 
 $Debug->set_flag('completed module execution');
@@ -401,8 +409,8 @@ upon hit rather than being browser cached for changing content.
 Old versions of Internet Explorer choke when downloading binary files over HTTPS with disabled cache.
 Define the following constant in files that handle file downloads */
 if (!defined('SKIP_NO_CACHE_HEADERS')) {
-  header('Cache-Control: no-cache, must-revalidate, post-check=0, pre-check=0');
-  header('Pragma: no-cache');
+    header('Cache-Control: no-cache, must-revalidate, post-check=0, pre-check=0');
+    header('Pragma: no-cache');
 }
 
 //Flush to user

classes/sitehistory.class.php

@@ -1,9 +1,10 @@
-<?
+<?php
 
-class SiteHistory {
-  private static $Categories = array(1 => "Code", "Event", "Milestone", "Policy", "Release", "Staff Change");
-  private static $SubCategories = array(1 => "Announcement", "Blog Post", "Change Log", "Forum Post", "Wiki", "Other", "External Source");
-  private static $Tags = array(
+class SiteHistory
+{
+    private static $Categories = array(1 => "Code", "Event", "Milestone", "Policy", "Release", "Staff Change");
+    private static $SubCategories = array(1 => "Announcement", "Blog Post", "Change Log", "Forum Post", "Wiki", "Other", "External Source");
+    private static $Tags = array(
                 "api",
                 "celebration",
                 "class.primary",
@@ -64,170 +65,176 @@ class SiteHistory {
                 "whitelist",
                 "wiki");
 
-  public static function get_months() {
-    $Results = G::$Cache->get_value("site_history_months");
-    if (!$Results) {
-      $QueryID = G::$DB->get_query_id();
-      G::$DB->query("
+    public static function get_months()
+    {
+        $Results = G::$Cache->get_value("site_history_months");
+        if (!$Results) {
+            $QueryID = G::$DB->get_query_id();
+            G::$DB->query("
           SELECT DISTINCT
             YEAR(DATE) AS Year, MONTH(Date) AS Month, MONTHNAME(Date) AS MonthName
           FROM site_history
           ORDER BY Date DESC");
-      $Results = G::$DB->to_array();
-      G::$DB->set_query_id($QueryID);
-      G::$Cache->cache_value("site_history_months", $Results, 0);
+            $Results = G::$DB->to_array();
+            G::$DB->set_query_id($QueryID);
+            G::$Cache->cache_value("site_history_months", $Results, 0);
+        }
+        return $Results;
     }
-    return $Results;
-  }
 
-  public static function get_event($ID) {
-    if (!empty($ID)) {
-      $QueryID = G::$DB->get_query_id();
-      G::$DB->query("
+    public static function get_event($ID)
+    {
+        if (!empty($ID)) {
+            $QueryID = G::$DB->get_query_id();
+            G::$DB->query("
           SELECT
             ID, Title, Url, Category, SubCategory, Tags, Body, AddedBy, Date
           FROM site_history
           WHERE ID = '$ID'
           ORDER BY Date DESC");
-      $Event = G::$DB->next_record();
-      G::$DB->set_query_id($QueryID);
-      return $Event;
+            $Event = G::$DB->next_record();
+            G::$DB->set_query_id($QueryID);
+            return $Event;
+        }
     }
-  }
 
-  public static function get_latest_events($Limit) {
-    self::get_events(null, null, null, null, null, null, $Limit);
-  }
-
-  public static function get_events($Month, $Year, $Title, $Category, $SubCategory, $Tags, $Limit) {
-    $Month = (int)$Month;
-    $Year = (int)$Year;
-    $Title = db_string($Title);
-    $Category = (int)$Category;
-    $SubCategory = (int)$SubCategory;
-    $Tags = db_string($Tags);
-    $Limit = (int)$Limit;
-    $Where = [];
-    if (!empty($Month)) {
-      $Where[] = " MONTH(Date) = '$Month' ";
-    }
-    if (!empty($Year)) {
-      $Where[] = " YEAR(Date) = '$Year' ";
-    }
-    if (!empty($Title)) {
-      $Where[] = " Title LIKE '%$Title%' ";
-    }
-    if (!empty($Category)) {
-      $Where[] = " Category = '$Category '";
-    }
-    if (!empty($SubCategory)) {
-      $Where[] = " SubCategory = '$SubCategory '";
-    }
-    if (!empty($Tags)) {
-      $Tags = explode(',', $Tags);
-      $Or = '(';
-      foreach ($Tags as $Tag) {
-        $Tag = trim($Tag);
-        $Or .= " Tags LIKE '%$Tag%' OR ";
-      }
-      if (strlen($Or) > 1) {
-        $Or = rtrim($Or, 'OR ');
-        $Or .= ')';
-        $Where[] = $Or;
-      }
-    }
-    if (!empty($Limit)) {
-      $Limit = " LIMIT $Limit";
-    } else {
-      $Limit = '';
-    }
-    if (count($Where) > 0) {
-      $Query = ' WHERE ' . implode('AND', $Where);
-    } else {
-      $Query = '';
+    public static function get_latest_events($Limit)
+    {
+        self::get_events(null, null, null, null, null, null, $Limit);
     }
 
-    $QueryID = G::$DB->get_query_id();
-    G::$DB->query("
+    public static function get_events($Month, $Year, $Title, $Category, $SubCategory, $Tags, $Limit)
+    {
+        $Month = (int)$Month;
+        $Year = (int)$Year;
+        $Title = db_string($Title);
+        $Category = (int)$Category;
+        $SubCategory = (int)$SubCategory;
+        $Tags = db_string($Tags);
+        $Limit = (int)$Limit;
+        $Where = [];
+        if (!empty($Month)) {
+            $Where[] = " MONTH(Date) = '$Month' ";
+        }
+        if (!empty($Year)) {
+            $Where[] = " YEAR(Date) = '$Year' ";
+        }
+        if (!empty($Title)) {
+            $Where[] = " Title LIKE '%$Title%' ";
+        }
+        if (!empty($Category)) {
+            $Where[] = " Category = '$Category '";
+        }
+        if (!empty($SubCategory)) {
+            $Where[] = " SubCategory = '$SubCategory '";
+        }
+        if (!empty($Tags)) {
+            $Tags = explode(',', $Tags);
+            $Or = '(';
+            foreach ($Tags as $Tag) {
+                $Tag = trim($Tag);
+                $Or .= " Tags LIKE '%$Tag%' OR ";
+            }
+            if (strlen($Or) > 1) {
+                $Or = rtrim($Or, 'OR ');
+                $Or .= ')';
+                $Where[] = $Or;
+            }
+        }
+        if (!empty($Limit)) {
+            $Limit = " LIMIT $Limit";
+        } else {
+            $Limit = '';
+        }
+        if (count($Where) > 0) {
+            $Query = ' WHERE ' . implode('AND', $Where);
+        } else {
+            $Query = '';
+        }
+
+        $QueryID = G::$DB->get_query_id();
+        G::$DB->query("
         SELECT
           ID, Title, Url, Category, SubCategory, Tags, Body, AddedBy, Date
         FROM site_history
         $Query
         ORDER BY Date DESC
         $Limit");
-    $Events = G::$DB->to_array();
-    G::$DB->set_query_id($QueryID);
-    return $Events;
-  }
-
-  public static function add_event($Date, $Title, $Link, $Category, $SubCategory, $Tags, $Body, $UserID) {
-    if (empty($Date)) {
-      $Date = sqltime();
-    } else {
-      list($Y, $M, $D) = explode('-', $Date);
-      if (!checkdate($M, $D, $Y)) {
-        error("Error");
-      }
-    }
-    $Title = db_string($Title);
-    $Link = db_string($Link);
-    $Category = (int)$Category;
-    $SubCategory = (int)$SubCategory;
-    $Tags = db_string(strtolower((preg_replace('/\s+/', '', $Tags))));
-    $ExplodedTags = explode(',', $Tags);
-    foreach ($ExplodedTags as $Tag) {
-      if (!in_array($Tag, self::get_tags())) {
-        error("Invalid tag");
-      }
+        $Events = G::$DB->to_array();
+        G::$DB->set_query_id($QueryID);
+        return $Events;
     }
-    $Body = db_string($Body);
-    $UserID = (int)$UserID;
 
-    if (empty($Title) || empty($Category) || empty($SubCategory)) {
-      error("Error");
-    }
+    public static function add_event($Date, $Title, $Link, $Category, $SubCategory, $Tags, $Body, $UserID)
+    {
+        if (empty($Date)) {
+            $Date = sqltime();
+        } else {
+            list($Y, $M, $D) = explode('-', $Date);
+            if (!checkdate($M, $D, $Y)) {
+                error("Error");
+            }
+        }
+        $Title = db_string($Title);
+        $Link = db_string($Link);
+        $Category = (int)$Category;
+        $SubCategory = (int)$SubCategory;
+        $Tags = db_string(strtolower((preg_replace('/\s+/', '', $Tags))));
+        $ExplodedTags = explode(',', $Tags);
+        foreach ($ExplodedTags as $Tag) {
+            if (!in_array($Tag, self::get_tags())) {
+                error("Invalid tag");
+            }
+        }
+        $Body = db_string($Body);
+        $UserID = (int)$UserID;
 
-    $QueryID = G::$DB->get_query_id();
-    G::$DB->query("
+        if (empty($Title) || empty($Category) || empty($SubCategory)) {
+            error("Error");
+        }
+
+        $QueryID = G::$DB->get_query_id();
+        G::$DB->query("
         INSERT INTO site_history
           (Title, Url, Category, SubCategory, Tags, Body, AddedBy, Date)
         VALUES
           ('$Title', '$Link', '$Category', '$SubCategory', '$Tags', '$Body', '$UserID', '$Date')");
-    G::$DB->set_query_id($QueryID);
-    G::$Cache->delete_value("site_history_months");
-  }
-
-  public static function update_event($ID, $Date, $Title, $Link, $Category, $SubCategory, $Tags, $Body, $UserID) {
-    if (empty($Date)) {
-      $Date = sqltime();
-    } else {
-      $Date = db_string($Date);
-      list($Y, $M, $D) = explode('-', $Date);
-      if (!checkdate($M, $D, $Y)) {
-        error("Error");
-      }
-    }
-    $ID = (int)$ID;
-    $Title = db_string($Title);
-    $Link = db_string($Link);
-    $Category = (int)$Category;
-    $SubCategory = (int)$SubCategory;
-    $Tags = db_string(strtolower((preg_replace('/\s+/', '', $Tags))));
-    $ExplodedTags = explode(",", $Tags);
-    foreach ($ExplodedTags as $Tag) {
-      if (!in_array($Tag, self::get_tags())) {
-        error("Invalid tag");
-      }
+        G::$DB->set_query_id($QueryID);
+        G::$Cache->delete_value("site_history_months");
     }
-    $Body = db_string($Body);
-    $UserID = (int)$UserID;
 
-    if (empty($ID) || empty($Title) || empty($Category) || empty($SubCategory)) {
-      error("Error");
-    }
+    public static function update_event($ID, $Date, $Title, $Link, $Category, $SubCategory, $Tags, $Body, $UserID)
+    {
+        if (empty($Date)) {
+            $Date = sqltime();
+        } else {
+            $Date = db_string($Date);
+            list($Y, $M, $D) = explode('-', $Date);
+            if (!checkdate($M, $D, $Y)) {
+                error("Error");
+            }
+        }
+        $ID = (int)$ID;
+        $Title = db_string($Title);
+        $Link = db_string($Link);
+        $Category = (int)$Category;
+        $SubCategory = (int)$SubCategory;
+        $Tags = db_string(strtolower((preg_replace('/\s+/', '', $Tags))));
+        $ExplodedTags = explode(",", $Tags);
+        foreach ($ExplodedTags as $Tag) {
+            if (!in_array($Tag, self::get_tags())) {
+                error("Invalid tag");
+            }
+        }
+        $Body = db_string($Body);
+        $UserID = (int)$UserID;
+
+        if (empty($ID) || empty($Title) || empty($Category) || empty($SubCategory)) {
+            error("Error");
+        }
 
-    $QueryID = G::$DB->get_query_id();
-    G::$DB->query("
+        $QueryID = G::$DB->get_query_id();
+        G::$DB->query("
         UPDATE site_history
         SET
           Title = '$Title',
@@ -239,31 +246,35 @@ class SiteHistory {
           AddedBy = '$UserID',
           Date = '$Date'
         WHERE ID = '$ID'");
-    G::$DB->set_query_id($QueryID);
-    G::$Cache->delete_value("site_history_months");
-  }
-
-  public static function delete_event($ID) {
-    if (!is_numeric($ID)) {
-      error(404);
+        G::$DB->set_query_id($QueryID);
+        G::$Cache->delete_value("site_history_months");
     }
-    $QueryID = G::$DB->get_query_id();
-    G::$DB->query("
+
+    public static function delete_event($ID)
+    {
+        if (!is_numeric($ID)) {
+            error(404);
+        }
+        $QueryID = G::$DB->get_query_id();
+        G::$DB->query("
         DELETE FROM site_history
         WHERE ID = '$ID'");
-    G::$DB->set_query_id($QueryID);
-    G::$Cache->delete_value("site_history_months");
-  }
+        G::$DB->set_query_id($QueryID);
+        G::$Cache->delete_value("site_history_months");
+    }
 
-  public static function get_categories() {
-    return self::$Categories;
-  }
+    public static function get_categories()
+    {
+        return self::$Categories;
+    }
 
-  public static function get_sub_categories() {
-    return self::$SubCategories;
-  }
+    public static function get_sub_categories()
+    {
+        return self::$SubCategories;
+    }
 
-  public static function get_tags() {
-    return self::$Tags;
-  }
+    public static function get_tags()
+    {
+        return self::$Tags;
+    }
 }