Upload files to 'classes'

classes/file_checker.class.php

@@ -1,78 +1,86 @@
 <?php
 $ComicsExtensions = array_fill_keys(array('cbr', 'cbz', 'gif', 'jpeg', 'jpg', 'pdf', 'png'), true);
 $MusicExtensions = array_fill_keys(
-  array(
+    array(
     'ac3', 'accurip', 'azw3', 'chm', 'cue', 'djv', 'djvu', 'doc', 'dts', 'epub', 'ffp',
     'flac', 'gif', 'htm', 'html', 'jpeg', 'jpg', 'lit', 'log', 'm3u', 'm3u8', 'm4a', 'm4b',
     'md5', 'mobi', 'mp3', 'mp4', 'nfo', 'pdf', 'pls', 'png', 'rtf', 'sfv', 'txt'),
-  true);
+    true
+);
 $Keywords = array(
   'ahashare.com', 'demonoid.com', 'demonoid.me', 'djtunes.com', 'h33t', 'housexclusive.net',
   'limetorrents.com', 'mixesdb.com', 'mixfiend.blogstop', 'mixtapetorrent.blogspot',
   'plixid.com', 'reggaeme.com' , 'scc.nfo', 'thepiratebay.org', 'torrentday');
 
-function check_file($Type, $Name) {
-  check_name($Name);
-  check_extensions($Type, $Name);
+function check_file($Type, $Name)
+{
+    check_name($Name);
+    check_extensions($Type, $Name);
 }
 
-function check_name($Name) {
-  global $Keywords;
-  $NameLC = strtolower($Name);
-  foreach ($Keywords as &$Value) {
-    if (strpos($NameLC, $Value) !== false) {
-      forbidden_error($Name);
+function check_name($Name)
+{
+    global $Keywords;
+    $NameLC = strtolower($Name);
+    foreach ($Keywords as &$Value) {
+        if (strpos($NameLC, $Value) !== false) {
+            forbidden_error($Name);
+        }
+    }
+    if (preg_match('/INCOMPLETE~\*/i', $Name)) {
+        forbidden_error($Name);
     }
-  }
-  if (preg_match('/INCOMPLETE~\*/i', $Name)) {
-    forbidden_error($Name);
-  }
 
-  /*
-   * These characters are invalid in NTFS on Windows systems:
-   *    : ? / < > \ * | "
-   *
-   * TODO: Add "/" to the blacklist. Adding "/" to the blacklist causes problems with nested dirs, apparently.
-   *
-   * Only the following characters need to be escaped (see the link below):
-   *    \ - ^ ]
-   *
-   * http://www.php.net/manual/en/regexp.reference.character-classes.php
-   */
-  $AllBlockedChars = ' : ? < > \ * | " ';
-  if (preg_match('/[\\:?<>*|"]/', $Name, $Matches)) {
-    character_error($Matches[0], $AllBlockedChars);
-  }
+    /*
+     * These characters are invalid in NTFS on Windows systems:
+     *    : ? / < > \ * | "
+     *
+     * TODO: Add "/" to the blacklist. Adding "/" to the blacklist causes problems with nested dirs, apparently.
+     *
+     * Only the following characters need to be escaped (see the link below):
+     *    \ - ^ ]
+     *
+     * http://www.php.net/manual/en/regexp.reference.character-classes.php
+     */
+    $AllBlockedChars = ' : ? < > \ * | " ';
+    if (preg_match('/[\\:?<>*|"]/', $Name, $Matches)) {
+        character_error($Matches[0], $AllBlockedChars);
+    }
 }
 
-function check_extensions($Type, $Name) {
-  global $MusicExtensions, $ComicsExtensions;
-  if ($Type == 'Music' || $Type == 'Audiobooks' || $Type == 'Comedy' || $Type == 'E-Books') {
-    if (!isset($MusicExtensions[get_file_extension($Name)])) {
-      invalid_error($Name);
-    }
-  } elseif ($Type == 'Comics') {
-    if (!isset($ComicsExtensions[get_file_extension($Name)])) {
-      invalid_error($Name);
+function check_extensions($Type, $Name)
+{
+    global $MusicExtensions, $ComicsExtensions;
+    if ($Type == 'Music' || $Type == 'Audiobooks' || $Type == 'Comedy' || $Type == 'E-Books') {
+        if (!isset($MusicExtensions[get_file_extension($Name)])) {
+            invalid_error($Name);
+        }
+    } elseif ($Type == 'Comics') {
+        if (!isset($ComicsExtensions[get_file_extension($Name)])) {
+            invalid_error($Name);
+        }
     }
-  }
 }
 
-function get_file_extension($FileName) {
-  return strtolower(substr(strrchr($FileName, '.'), 1));
+function get_file_extension($FileName)
+{
+    return strtolower(substr(strrchr($FileName, '.'), 1));
 }
 
-function invalid_error($Name) {
-  global $Err;
-  $Err = 'The torrent contained one or more invalid files (' . display_str($Name) . ')';
+function invalid_error($Name)
+{
+    global $Err;
+    $Err = 'The torrent contained one or more invalid files (' . display_str($Name) . ')';
 }
 
-function forbidden_error($Name) {
-  global $Err;
-  $Err = 'The torrent contained one or more forbidden files (' . display_str($Name) . ')';
+function forbidden_error($Name)
+{
+    global $Err;
+    $Err = 'The torrent contained one or more forbidden files (' . display_str($Name) . ')';
 }
 
-function character_error($Character, $AllBlockedChars) {
-  global $Err;
-  $Err = "One or more of the files or folders in the torrent has a name that contains the forbidden character '$Character'. Please rename the files as necessary and recreate the torrent.<br /><br />\nNote: The complete list of characters that are disallowed are shown below:<br />\n\t\t$AllBlockedChars";
+function character_error($Character, $AllBlockedChars)
+{
+    global $Err;
+    $Err = "One or more of the files or folders in the torrent has a name that contains the forbidden character '$Character'. Please rename the files as necessary and recreate the torrent.<br /><br />\nNote: The complete list of characters that are disallowed are shown below:<br />\n\t\t$AllBlockedChars";
 }

classes/forums.class.php

@@ -1,17 +1,19 @@
-<?
-class Forums {
-  /**
-   * Get information on a thread.
-   *
-   * @param int $ThreadID the thread ID.
-   * @param boolean $Return indicates whether thread info should be returned.
-   * @param Boolean $SelectiveCache cache thread info.
-   * @return array holding thread information.
-   */
-  public static function get_thread_info($ThreadID, $Return = true, $SelectiveCache = false) {
-    if ((!$ThreadInfo = G::$Cache->get_value('thread_' . $ThreadID . '_info')) || !isset($ThreadInfo['Ranking'])) {
-      $QueryID = G::$DB->get_query_id();
-      G::$DB->query("
+<?php
+class Forums
+{
+    /**
+     * Get information on a thread.
+     *
+     * @param int $ThreadID the thread ID.
+     * @param boolean $Return indicates whether thread info should be returned.
+     * @param Boolean $SelectiveCache cache thread info.
+     * @return array holding thread information.
+     */
+    public static function get_thread_info($ThreadID, $Return = true, $SelectiveCache = false)
+    {
+        if ((!$ThreadInfo = G::$Cache->get_value('thread_' . $ThreadID . '_info')) || !isset($ThreadInfo['Ranking'])) {
+            $QueryID = G::$DB->get_query_id();
+            G::$DB->query("
         SELECT
           t.Title,
           t.ForumID,
@@ -28,15 +30,15 @@ class Forums {
           LEFT JOIN forums_polls AS p ON p.TopicID = t.ID
         WHERE t.ID = ?
         GROUP BY fp.TopicID", $ThreadID);
-      if (!G::$DB->has_results()) {
-        G::$DB->set_query_id($QueryID);
-        return null;
-      }
-      $ThreadInfo = G::$DB->next_record(MYSQLI_ASSOC, false);
-      if ($ThreadInfo['StickyPostID']) {
-        $ThreadInfo['Posts']--;
-        G::$DB->query(
-          "SELECT
+            if (!G::$DB->has_results()) {
+                G::$DB->set_query_id($QueryID);
+                return null;
+            }
+            $ThreadInfo = G::$DB->next_record(MYSQLI_ASSOC, false);
+            if ($ThreadInfo['StickyPostID']) {
+                $ThreadInfo['Posts']--;
+                G::$DB->query(
+                    "SELECT
             p.ID,
             p.AuthorID,
             p.AddedTime,
@@ -47,53 +49,58 @@ class Forums {
             FROM forums_posts AS p
               LEFT JOIN users_main AS ed ON ed.ID = p.EditedUserID
             WHERE p.TopicID = ?
-              AND p.ID = ?", $ThreadID, $ThreadInfo['StickyPostID']);
-        list ($ThreadInfo['StickyPost']) = G::$DB->to_array(false, MYSQLI_ASSOC);
-      }
-      G::$DB->set_query_id($QueryID);
-      if (!$SelectiveCache || !$ThreadInfo['IsLocked'] || $ThreadInfo['IsSticky']) {
-        G::$Cache->cache_value('thread_' . $ThreadID . '_info', $ThreadInfo, 0);
-      }
-    }
-    if ($Return) {
-      return $ThreadInfo;
+              AND p.ID = ?",
+                    $ThreadID,
+                    $ThreadInfo['StickyPostID']
+                );
+                list($ThreadInfo['StickyPost']) = G::$DB->to_array(false, MYSQLI_ASSOC);
+            }
+            G::$DB->set_query_id($QueryID);
+            if (!$SelectiveCache || !$ThreadInfo['IsLocked'] || $ThreadInfo['IsSticky']) {
+                G::$Cache->cache_value('thread_' . $ThreadID . '_info', $ThreadInfo, 0);
+            }
+        }
+        if ($Return) {
+            return $ThreadInfo;
+        }
     }
-  }
 
-  /**
-   * Checks whether user has permissions on a forum.
-   *
-   * @param int $ForumID the forum ID.
-   * @param string $Perm the permissision to check, defaults to 'Read'
-   * @return boolean true if user has permission
-   */
-  public static function check_forumperm($ForumID, $Perm = 'Read') {
-    $Forums = self::get_forums();
-    if (isset(G::$LoggedUser['CustomForums'][$ForumID]) && G::$LoggedUser['CustomForums'][$ForumID] == 1) {
-      return true;
-    }
-    if ($ForumID == DONOR_FORUM && Donations::has_donor_forum(G::$LoggedUser['ID'])) {
-      return true;
-    }
-    if ($Forums[$ForumID]['MinClass' . $Perm] > G::$LoggedUser['Class'] && (!isset(G::$LoggedUser['CustomForums'][$ForumID]) || G::$LoggedUser['CustomForums'][$ForumID] == 0)) {
-      return false;
-    }
-    if (isset(G::$LoggedUser['CustomForums'][$ForumID]) && G::$LoggedUser['CustomForums'][$ForumID] == 0) {
-      return false;
+    /**
+     * Checks whether user has permissions on a forum.
+     *
+     * @param int $ForumID the forum ID.
+     * @param string $Perm the permissision to check, defaults to 'Read'
+     * @return boolean true if user has permission
+     */
+    public static function check_forumperm($ForumID, $Perm = 'Read')
+    {
+        $Forums = self::get_forums();
+        if (isset(G::$LoggedUser['CustomForums'][$ForumID]) && G::$LoggedUser['CustomForums'][$ForumID] == 1) {
+            return true;
+        }
+        if ($ForumID == DONOR_FORUM && Donations::has_donor_forum(G::$LoggedUser['ID'])) {
+            return true;
+        }
+        if ($Forums[$ForumID]['MinClass' . $Perm] > G::$LoggedUser['Class'] && (!isset(G::$LoggedUser['CustomForums'][$ForumID]) || G::$LoggedUser['CustomForums'][$ForumID] == 0)) {
+            return false;
+        }
+        if (isset(G::$LoggedUser['CustomForums'][$ForumID]) && G::$LoggedUser['CustomForums'][$ForumID] == 0) {
+            return false;
+        }
+        return true;
     }
-    return true;
-  }
 
-  /**
-   * Gets basic info on a forum.
-   *
-   * @param int $ForumID the forum ID.
-   */
-  public static function get_forum_info($ForumID) {
-    $Forum = G::$Cache->get_value("ForumInfo_$ForumID");
-    if (!$Forum) {
-      $QueryID = G::$DB->get_query_id();
-      G::$DB->query("
+    /**
+     * Gets basic info on a forum.
+     *
+     * @param int $ForumID the forum ID.
+     */
+    public static function get_forum_info($ForumID)
+    {
+        $Forum = G::$Cache->get_value("ForumInfo_$ForumID");
+        if (!$Forum) {
+            $QueryID = G::$DB->get_query_id();
+            G::$DB->query("
         SELECT
           Name,
           MinClassRead,
@@ -104,48 +111,50 @@ class Forums {
           LEFT JOIN forums_topics ON forums_topics.ForumID = forums.ID
         WHERE forums.ID = ?
         GROUP BY ForumID", $ForumID);
-      if (!G::$DB->has_results()) {
-        return false;
-      }
-      // Makes an array, with $Forum['Name'], etc.
-      $Forum = G::$DB->next_record(MYSQLI_ASSOC);
+            if (!G::$DB->has_results()) {
+                return false;
+            }
+            // Makes an array, with $Forum['Name'], etc.
+            $Forum = G::$DB->next_record(MYSQLI_ASSOC);
 
-      G::$DB->set_query_id($QueryID);
+            G::$DB->set_query_id($QueryID);
 
-      G::$Cache->cache_value("ForumInfo_$ForumID", $Forum, 86400);
+            G::$Cache->cache_value("ForumInfo_$ForumID", $Forum, 86400);
+        }
+        return $Forum;
     }
-    return $Forum;
-  }
 
-  /**
-   * Get the forum categories
-   * @return array ForumCategoryID => Name
-   */
-  public static function get_forum_categories() {
-    $ForumCats = G::$Cache->get_value('forums_categories');
-    if ($ForumCats === false) {
-      $QueryID = G::$DB->get_query_id();
-      G::$DB->query("
+    /**
+     * Get the forum categories
+     * @return array ForumCategoryID => Name
+     */
+    public static function get_forum_categories()
+    {
+        $ForumCats = G::$Cache->get_value('forums_categories');
+        if ($ForumCats === false) {
+            $QueryID = G::$DB->get_query_id();
+            G::$DB->query("
         SELECT ID, Name
         FROM forums_categories");
-      $ForumCats = [];
-      while (list ($ID, $Name) = G::$DB->next_record()) {
-        $ForumCats[$ID] = $Name;
-      }
-      G::$DB->set_query_id($QueryID);
-      G::$Cache->cache_value('forums_categories', $ForumCats, 0);
+            $ForumCats = [];
+            while (list($ID, $Name) = G::$DB->next_record()) {
+                $ForumCats[$ID] = $Name;
+            }
+            G::$DB->set_query_id($QueryID);
+            G::$Cache->cache_value('forums_categories', $ForumCats, 0);
+        }
+        return $ForumCats;
     }
-    return $ForumCats;
-  }
 
-  /**
-   * Get the forums
-   * @return array ForumID => (various information about the forum)
-   */
-  public static function get_forums() {
-    if (!$Forums = G::$Cache->get_value('forums_list')) {
-      $QueryID = G::$DB->get_query_id();
-      G::$DB->query("
+    /**
+     * Get the forums
+     * @return array ForumID => (various information about the forum)
+     */
+    public static function get_forums()
+    {
+        if (!$Forums = G::$Cache->get_value('forums_list')) {
+            $QueryID = G::$DB->get_query_id();
+            G::$DB->query("
         SELECT
           f.ID,
           f.CategoryID,
@@ -169,72 +178,75 @@ class Forums {
           LEFT JOIN forums_topics AS t ON t.ID = f.LastPostTopicID
         GROUP BY f.ID
         ORDER BY fc.Sort, fc.Name, f.CategoryID, f.Sort");
-      $Forums = G::$DB->to_array('ID', MYSQLI_ASSOC, false);
+            $Forums = G::$DB->to_array('ID', MYSQLI_ASSOC, false);
 
-      G::$DB->query("
+            G::$DB->query("
         SELECT ForumID, ThreadID
         FROM forums_specific_rules");
-      $SpecificRules = [];
-      while (list($ForumID, $ThreadID) = G::$DB->next_record(MYSQLI_NUM, false)) {
-        $SpecificRules[$ForumID][] = $ThreadID;
-      }
-      G::$DB->set_query_id($QueryID);
-      foreach ($Forums as $ForumID => &$Forum) {
-        if (isset($SpecificRules[$ForumID])) {
-          $Forum['SpecificRules'] = $SpecificRules[$ForumID];
-        } else {
-          $Forum['SpecificRules'] = [];
+            $SpecificRules = [];
+            while (list($ForumID, $ThreadID) = G::$DB->next_record(MYSQLI_NUM, false)) {
+                $SpecificRules[$ForumID][] = $ThreadID;
+            }
+            G::$DB->set_query_id($QueryID);
+            foreach ($Forums as $ForumID => &$Forum) {
+                if (isset($SpecificRules[$ForumID])) {
+                    $Forum['SpecificRules'] = $SpecificRules[$ForumID];
+                } else {
+                    $Forum['SpecificRules'] = [];
+                }
+            }
+            G::$Cache->cache_value('forums_list', $Forums, 0);
         }
-      }
-      G::$Cache->cache_value('forums_list', $Forums, 0);
+        return $Forums;
     }
-    return $Forums;
-  }
 
-  /**
-   * Get all forums that the current user has special access to ("Extra forums" in the profile)
-   * @return array Array of ForumIDs
-   */
-  public static function get_permitted_forums() {
-    if (isset(G::$LoggedUser['CustomForums'])) {
-      return (array)array_keys(G::$LoggedUser['CustomForums'], 1);
-    } else {
-      return [];
+    /**
+     * Get all forums that the current user has special access to ("Extra forums" in the profile)
+     * @return array Array of ForumIDs
+     */
+    public static function get_permitted_forums()
+    {
+        if (isset(G::$LoggedUser['CustomForums'])) {
+            return (array)array_keys(G::$LoggedUser['CustomForums'], 1);
+        } else {
+            return [];
+        }
     }
-  }
 
-  /**
-   * Get all forums that the current user does not have access to ("Restricted forums" in the profile)
-   * @return array Array of ForumIDs
-   */
-  public static function get_restricted_forums() {
-    if (isset(G::$LoggedUser['CustomForums'])) {
-      return (array)array_keys(G::$LoggedUser['CustomForums'], 0);
-    } else {
-      return [];
+    /**
+     * Get all forums that the current user does not have access to ("Restricted forums" in the profile)
+     * @return array Array of ForumIDs
+     */
+    public static function get_restricted_forums()
+    {
+        if (isset(G::$LoggedUser['CustomForums'])) {
+            return (array)array_keys(G::$LoggedUser['CustomForums'], 0);
+        } else {
+            return [];
+        }
     }
-  }
 
-  /**
-   * Get the last read posts for the current user
-   * @param array $Forums Array of forums as returned by self::get_forums()
-   * @return array TopicID => array(TopicID, PostID, Page) where PostID is the ID of the last read post and Page is the page on which that post is
-   */
-  public static function get_last_read($Forums) {
-    if (isset(G::$LoggedUser['PostsPerPage'])) {
-      $PerPage = G::$LoggedUser['PostsPerPage'];
-    } else {
-      $PerPage = POSTS_PER_PAGE;
-    }
-    $TopicIDs = [];
-    foreach ($Forums as $Forum) {
-      if (!empty($Forum['LastPostTopicID'])) {
-        $TopicIDs[] = $Forum['LastPostTopicID'];
-      }
-    }
-    if (!empty($TopicIDs)) {
-      $QueryID = G::$DB->get_query_id();
-      G::$DB->query("
+    /**
+     * Get the last read posts for the current user
+     * @param array $Forums Array of forums as returned by self::get_forums()
+     * @return array TopicID => array(TopicID, PostID, Page) where PostID is the ID of the last read post and Page is the page on which that post is
+     */
+    public static function get_last_read($Forums)
+    {
+        if (isset(G::$LoggedUser['PostsPerPage'])) {
+            $PerPage = G::$LoggedUser['PostsPerPage'];
+        } else {
+            $PerPage = POSTS_PER_PAGE;
+        }
+        $TopicIDs = [];
+        foreach ($Forums as $Forum) {
+            if (!empty($Forum['LastPostTopicID'])) {
+                $TopicIDs[] = $Forum['LastPostTopicID'];
+            }
+        }
+        if (!empty($TopicIDs)) {
+            $QueryID = G::$DB->get_query_id();
+            G::$DB->query("
         SELECT
           l.TopicID,
           l.PostID,
@@ -250,70 +262,73 @@ class Forums {
         FROM forums_last_read_topics AS l
         WHERE l.TopicID IN(" . implode(',', $TopicIDs) . ") AND
           l.UserID = ?", $PerPage, G::$LoggedUser['ID']);
-      $LastRead = G::$DB->to_array('TopicID', MYSQLI_ASSOC);
-      G::$DB->set_query_id($QueryID);
-    } else {
-      $LastRead = [];
+            $LastRead = G::$DB->to_array('TopicID', MYSQLI_ASSOC);
+            G::$DB->set_query_id($QueryID);
+        } else {
+            $LastRead = [];
+        }
+        return $LastRead;
     }
-    return $LastRead;
-  }
 
-  /**
-   * Add a note to a topic.
-   * @param int $TopicID
-   * @param string $Note
-   * @param int|null $UserID
-   * @return boolean
-   */
-  public static function add_topic_note($TopicID, $Note, $UserID = null) {
-    if ($UserID === null) {
-      $UserID = G::$LoggedUser['ID'];
-    }
-    $QueryID = G::$DB->get_query_id();
-    G::$DB->query("
+    /**
+     * Add a note to a topic.
+     * @param int $TopicID
+     * @param string $Note
+     * @param int|null $UserID
+     * @return boolean
+     */
+    public static function add_topic_note($TopicID, $Note, $UserID = null)
+    {
+        if ($UserID === null) {
+            $UserID = G::$LoggedUser['ID'];
+        }
+        $QueryID = G::$DB->get_query_id();
+        G::$DB->query("
       INSERT INTO forums_topic_notes
         (TopicID, AuthorID, AddedTime, Body)
       VALUES
         (?, ?, NOW(), ?)", $TopicID, $UserID, $Note);
-    G::$DB->set_query_id($QueryID);
-    return (bool)G::$DB->affected_rows();
-  }
-
-  /**
-   * Determine if a thread is unread
-   * @param bool $Locked
-   * @param bool $Sticky
-   * @param int $LastPostID
-   * @param array $LastRead An array as returned by self::get_last_read
-   * @param int $LastTopicID TopicID of the thread where the most recent post was made
-   * @param string $LastTime Datetime of the last post
-   * @return bool
-   */
-  public static function is_unread($Locked, $Sticky, $LastPostID, $LastRead, $LastTopicID, $LastTime) {
-    return (!$Locked || $Sticky) && $LastPostID != 0 && ((empty($LastRead[$LastTopicID]) || $LastRead[$LastTopicID]['PostID'] < $LastPostID) && strtotime($LastTime) > G::$LoggedUser['CatchupTime']);
-  }
-
-  /**
-   * Create the part of WHERE in the sql queries used to filter forums for a
-   * specific user (MinClassRead, restricted and permitted forums).
-   * @return string
-   */
-  public static function user_forums_sql() {
-    // I couldn't come up with a good name, please rename this if you can. -- Y
-    $RestrictedForums = self::get_restricted_forums();
-    $PermittedForums = self::get_permitted_forums();
-    if (Donations::has_donor_forum(G::$LoggedUser['ID']) && !in_array(DONOR_FORUM, $PermittedForums)) {
-      $PermittedForums[] = DONOR_FORUM;
+        G::$DB->set_query_id($QueryID);
+        return (bool)G::$DB->affected_rows();
     }
-    $SQL = "((f.MinClassRead <= '" . G::$LoggedUser['Class'] . "'";
-    if (count($RestrictedForums)) {
-      $SQL .= " AND f.ID NOT IN ('" . implode("', '", $RestrictedForums) . "')";
+
+    /**
+     * Determine if a thread is unread
+     * @param bool $Locked
+     * @param bool $Sticky
+     * @param int $LastPostID
+     * @param array $LastRead An array as returned by self::get_last_read
+     * @param int $LastTopicID TopicID of the thread where the most recent post was made
+     * @param string $LastTime Datetime of the last post
+     * @return bool
+     */
+    public static function is_unread($Locked, $Sticky, $LastPostID, $LastRead, $LastTopicID, $LastTime)
+    {
+        return (!$Locked || $Sticky) && $LastPostID != 0 && ((empty($LastRead[$LastTopicID]) || $LastRead[$LastTopicID]['PostID'] < $LastPostID) && strtotime($LastTime) > G::$LoggedUser['CatchupTime']);
     }
-    $SQL .= ')';
-    if (count($PermittedForums)) {
-      $SQL .= " OR f.ID IN ('" . implode("', '", $PermittedForums) . "')";
+
+    /**
+     * Create the part of WHERE in the sql queries used to filter forums for a
+     * specific user (MinClassRead, restricted and permitted forums).
+     * @return string
+     */
+    public static function user_forums_sql()
+    {
+        // I couldn't come up with a good name, please rename this if you can. -- Y
+        $RestrictedForums = self::get_restricted_forums();
+        $PermittedForums = self::get_permitted_forums();
+        if (Donations::has_donor_forum(G::$LoggedUser['ID']) && !in_array(DONOR_FORUM, $PermittedForums)) {
+            $PermittedForums[] = DONOR_FORUM;
+        }
+        $SQL = "((f.MinClassRead <= '" . G::$LoggedUser['Class'] . "'";
+        if (count($RestrictedForums)) {
+            $SQL .= " AND f.ID NOT IN ('" . implode("', '", $RestrictedForums) . "')";
+        }
+        $SQL .= ')';
+        if (count($PermittedForums)) {
+            $SQL .= " OR f.ID IN ('" . implode("', '", $PermittedForums) . "')";
+        }
+        $SQL .= ')';
+        return $SQL;
     }
-    $SQL .= ')';
-    return $SQL;
-  }
 }

classes/g.class.php

@@ -1,13 +1,15 @@
-<?
-class G {
-  public static $DB;
-  public static $Cache;
-  public static $LoggedUser;
+<?php
+class G
+{
+    public static $DB;
+    public static $Cache;
+    public static $LoggedUser;
 
-  public static function initialize() {
-    global $DB, $Cache, $LoggedUser;
-    self::$DB = $DB;
-    self::$Cache = $Cache;
-    self::$LoggedUser =& $LoggedUser;
-  }
-}
+    public static function initialize()
+    {
+        global $DB, $Cache, $LoggedUser;
+        self::$DB = $DB;
+        self::$Cache = $Cache;
+        self::$LoggedUser =& $LoggedUser;
+    }
+}

classes/image.class.php

@@ -1,58 +1,62 @@
-<?
+<?php
 if (!extension_loaded('gd')) {
-  error('GD Extension not loaded.');
+    error('GD Extension not loaded.');
 }
 
-class IMAGE {
-  var $Image = false;
-  var $FontSize = 10;
-  var $Font = '';
-  var $TextAngle = 0;
-
-  function create($Width, $Height) {
-    $this->Image = imagecreate($Width, $Height);
-    $this->Font = SERVER_ROOT.'/classes/fonts/VERDANA.TTF';
-    if (function_exists('imageantialias')) {
-      imageantialias($this->Image, true);
+class IMAGE
+{
+    public $Image = false;
+    public $FontSize = 10;
+    public $Font = '';
+    public $TextAngle = 0;
+
+    public function create($Width, $Height)
+    {
+        $this->Image = imagecreate($Width, $Height);
+        $this->Font = SERVER_ROOT.'/classes/fonts/VERDANA.TTF';
+        if (function_exists('imageantialias')) {
+            imageantialias($this->Image, true);
+        }
     }
-  }
-
-  function color($Red, $Green, $Blue, $Alpha = 0) {
-    return imagecolorallocatealpha($this->Image, $Red, $Green, $Blue, $Alpha);
-  }
 
-  function line($x1, $y1, $x2, $y2, $Color, $Thickness = 1) {
-    if ($Thickness == 1) {
-      return imageline($this->Image, $x1, $y1, $x2, $y2, $Color);
+    public function color($Red, $Green, $Blue, $Alpha = 0)
+    {
+        return imagecolorallocatealpha($this->Image, $Red, $Green, $Blue, $Alpha);
     }
-    $t = $Thickness / 2 - 0.5;
-    if ($x1 == $x2 || $y1 == $y2) {
-      return imagefilledrectangle($this->Image, round(min($x1, $x2) - $t), round(min($y1, $y2) - $t), round(max($x1, $x2) + $t), round(max($y1, $y2) + $t), $color);
-    }
-    $k = ($y2 - $y1) / ($x2 - $x1); //y = kx + q
-    $a = $t / sqrt(1 + pow($k, 2));
-    $Points = array(
-      round($x1 - (1 + $k) * $a), round($y1 + (1 - $k) * $a),
-      round($x1 - (1 - $k) * $a), round($y1 - (1 + $k) * $a),
-      round($x2 + (1 + $k) * $a), round($y2 - (1 - $k) * $a),
-      round($x2 + (1 - $k) * $a), round($y2 + (1 + $k) * $a),
-    );
-    imagefilledpolygon($this->Image, $Points, 4, $Color);
-    return imagepolygon($this->Image, $Points, 4, $Color);
-  }
-
-  function ellipse($x, $y, $Width, $Height, $Color) {
-    return imageEllipse($this->Image, $x, $y, $Width, $Height, $Color);
-  }
 
-  function text($x, $y, $Color, $Text) {
-    return imagettftext ($this->Image, $this->FontSize, $this->TextAngle, $x, $y, $Color, $this->Font, $Text);
-  }
+    public function line($x1, $y1, $x2, $y2, $Color, $Thickness = 1)
+    {
+        if ($Thickness == 1) {
+            return imageline($this->Image, $x1, $y1, $x2, $y2, $Color);
+        }
+        $t = $Thickness / 2 - 0.5;
+        if ($x1 == $x2 || $y1 == $y2) {
+            return imagefilledrectangle($this->Image, round(min($x1, $x2) - $t), round(min($y1, $y2) - $t), round(max($x1, $x2) + $t), round(max($y1, $y2) + $t), $color);
+        }
+        $k = ($y2 - $y1) / ($x2 - $x1); //y = kx + q
+        $a = $t / sqrt(1 + pow($k, 2));
+        $Points = array(
+        round($x1 - (1 + $k) * $a), round($y1 + (1 - $k) * $a),
+        round($x1 - (1 - $k) * $a), round($y1 - (1 + $k) * $a),
+        round($x2 + (1 + $k) * $a), round($y2 - (1 - $k) * $a),
+        round($x2 + (1 - $k) * $a), round($y2 + (1 + $k) * $a),
+        );
+        imagefilledpolygon($this->Image, $Points, 4, $Color);
+        return imagepolygon($this->Image, $Points, 4, $Color);
+    }
 
-  function make_png($FileName = null) {
-    return imagepng($this->Image, $FileName);
-  }
+    public function ellipse($x, $y, $Width, $Height, $Color)
+    {
+        return imageEllipse($this->Image, $x, $y, $Width, $Height, $Color);
+    }
 
+    public function text($x, $y, $Color, $Text)
+    {
+        return imagettftext($this->Image, $this->FontSize, $this->TextAngle, $x, $y, $Color, $this->Font, $Text);
+    }
 
+    public function make_png($FileName = null)
+    {
+        return imagepng($this->Image, $FileName);
+    }
 }
-?>