Upload files to 'classes'

classes/subscriptions.class.php

@@ -1,43 +1,45 @@
-<?
-class Subscriptions {
-  /**
-   * Parse a post/comment body for quotes and notify all quoted users that have quote notifications enabled.
-   * @param string $Body
-   * @param int $PostID
-   * @param string $Page
-   * @param int $PageID
-   */
-  public static function quote_notify($Body, $PostID, $Page, $PageID) {
-    $QueryID = G::$DB->get_query_id();
-    /*
-     * Explanation of the parameters PageID and Page: Page contains where
-     * this quote comes from and can be forums, artist, collages, requests
-     * or torrents. The PageID contains the additional value that is
-     * necessary for the users_notify_quoted table. The PageIDs for the
-     * different Page are: forums: TopicID artist: ArtistID collages:
-     * CollageID requests: RequestID torrents: GroupID
+<?php
+class Subscriptions
+{
+    /**
+     * Parse a post/comment body for quotes and notify all quoted users that have quote notifications enabled.
+     * @param string $Body
+     * @param int $PostID
+     * @param string $Page
+     * @param int $PageID
      */
-    $Matches = [];
-    preg_match_all('/\[quote(?:=(.*)(?:\|.*)?)?]|\[\/quote]/iU', $Body, $Matches, PREG_SET_ORDER);
+    public static function quote_notify($Body, $PostID, $Page, $PageID)
+    {
+        $QueryID = G::$DB->get_query_id();
+        /*
+         * Explanation of the parameters PageID and Page: Page contains where
+         * this quote comes from and can be forums, artist, collages, requests
+         * or torrents. The PageID contains the additional value that is
+         * necessary for the users_notify_quoted table. The PageIDs for the
+         * different Page are: forums: TopicID artist: ArtistID collages:
+         * CollageID requests: RequestID torrents: GroupID
+         */
+        $Matches = [];
+        preg_match_all('/\[quote(?:=(.*)(?:\|.*)?)?]|\[\/quote]/iU', $Body, $Matches, PREG_SET_ORDER);
 
-    if (count($Matches)) {
-      $Usernames = [];
-      $Level = 0;
-      foreach ($Matches as $M) {
-        if ($M[0] != '[/quote]') {
-          if ($Level == 0 && isset($M[1]) && strlen($M[1]) > 0 && preg_match(USERNAME_REGEX, $M[1])) {
-            $Usernames[] = preg_replace('/(^[.,]*)|([.,]*$)/', '', $M[1]); // wut?
-          }
-          ++$Level;
-        } else {
-          --$Level;
+        if (count($Matches)) {
+            $Usernames = [];
+            $Level = 0;
+            foreach ($Matches as $M) {
+                if ($M[0] != '[/quote]') {
+                    if ($Level == 0 && isset($M[1]) && strlen($M[1]) > 0 && preg_match(USERNAME_REGEX, $M[1])) {
+                        $Usernames[] = preg_replace('/(^[.,]*)|([.,]*$)/', '', $M[1]); // wut?
+                    }
+                    ++$Level;
+                } else {
+                    --$Level;
+                }
+            }
         }
-      }
-    }
-    // remove any dupes in the array (the fast way)
-    $Usernames = array_flip(array_flip($Usernames));
+        // remove any dupes in the array (the fast way)
+        $Usernames = array_flip(array_flip($Usernames));
 
-    G::$DB->query("
+        G::$DB->query("
       SELECT m.ID
       FROM users_main AS m
         LEFT JOIN users_info AS i ON i.UserID = m.ID
@@ -45,152 +47,163 @@ class Subscriptions {
         AND i.NotifyOnQuote = '1'
         AND i.UserID != " . G::$LoggedUser['ID']);
 
-    $Results = G::$DB->to_array();
-    foreach ($Results as $Result) {
-      $UserID = db_string($Result['ID']);
-      $QuoterID = db_string(G::$LoggedUser['ID']);
-      $Page = db_string($Page);
-      $PageID = db_string($PageID);
-      $PostID = db_string($PostID);
+        $Results = G::$DB->to_array();
+        foreach ($Results as $Result) {
+            $UserID = db_string($Result['ID']);
+            $QuoterID = db_string(G::$LoggedUser['ID']);
+            $Page = db_string($Page);
+            $PageID = db_string($PageID);
+            $PostID = db_string($PostID);
 
-      G::$DB->query("
+            G::$DB->query(
+                "
         INSERT IGNORE INTO users_notify_quoted
           (UserID, QuoterID, Page, PageID, PostID, Date)
         VALUES
           (    ?,               ?,               ?,      ?,       ?,   NOW())",
-          $Result['ID'], G::$LoggedUser['ID'], $Page, $PageID, $PostID);
-      G::$Cache->delete_value("notify_quoted_$UserID");
-      if ($Page == 'forums') {
-        $URL = site_url() . "forums.php?action=viewthread&postid=$PostID";
-      } else {
-        $URL = site_url() . "comments.php?action=jump&postid=$PostID";
-      }
+                $Result['ID'],
+                G::$LoggedUser['ID'],
+                $Page,
+                $PageID,
+                $PostID
+            );
+            G::$Cache->delete_value("notify_quoted_$UserID");
+            if ($Page == 'forums') {
+                $URL = site_url() . "forums.php?action=viewthread&postid=$PostID";
+            } else {
+                $URL = site_url() . "comments.php?action=jump&postid=$PostID";
+            }
+        }
+        G::$DB->set_query_id($QueryID);
     }
-    G::$DB->set_query_id($QueryID);
-  }
 
-  /**
-   * (Un)subscribe from a forum thread.
-   * If UserID == 0, G::$LoggedUser[ID] is used
-   * @param int $TopicID
-   * @param int $UserID
-   */
-  public static function subscribe($TopicID, $UserID = 0) {
-    if ($UserID == 0) {
-      $UserID = G::$LoggedUser['ID'];
-    }
-    $QueryID = G::$DB->get_query_id();
-    $UserSubscriptions = self::get_subscriptions();
-    $Key = self::has_subscribed($TopicID);
-    if ($Key !== false) {
-      G::$DB->query('
+    /**
+     * (Un)subscribe from a forum thread.
+     * If UserID == 0, G::$LoggedUser[ID] is used
+     * @param int $TopicID
+     * @param int $UserID
+     */
+    public static function subscribe($TopicID, $UserID = 0)
+    {
+        if ($UserID == 0) {
+            $UserID = G::$LoggedUser['ID'];
+        }
+        $QueryID = G::$DB->get_query_id();
+        $UserSubscriptions = self::get_subscriptions();
+        $Key = self::has_subscribed($TopicID);
+        if ($Key !== false) {
+            G::$DB->query('
         DELETE FROM users_subscriptions
         WHERE UserID = ' . db_string($UserID) . '
           AND TopicID = ' . db_string($TopicID));
-      unset($UserSubscriptions[$Key]);
-    } else {
-      G::$DB->query("
+            unset($UserSubscriptions[$Key]);
+        } else {
+            G::$DB->query("
         INSERT IGNORE INTO users_subscriptions (UserID, TopicID)
         VALUES ($UserID, " . db_string($TopicID) . ")");
-      array_push($UserSubscriptions, $TopicID);
+            array_push($UserSubscriptions, $TopicID);
+        }
+        G::$Cache->replace_value("subscriptions_user_$UserID", $UserSubscriptions, 0);
+        G::$Cache->delete_value("subscriptions_user_new_$UserID");
+        G::$DB->set_query_id($QueryID);
     }
-    G::$Cache->replace_value("subscriptions_user_$UserID", $UserSubscriptions, 0);
-    G::$Cache->delete_value("subscriptions_user_new_$UserID");
-    G::$DB->set_query_id($QueryID);
-  }
 
-  /**
-   * (Un)subscribe from comments.
-   * If UserID == 0, G::$LoggedUser[ID] is used
-   * @param string $Page 'artist', 'collages', 'requests' or 'torrents'
-   * @param int $PageID ArtistID, CollageID, RequestID or GroupID
-   * @param int $UserID
-   */
-  public static function subscribe_comments($Page, $PageID, $UserID = 0) {
-    if ($UserID == 0) {
-      $UserID = G::$LoggedUser['ID'];
-    }
-    $QueryID = G::$DB->get_query_id();
-    $UserCommentSubscriptions = self::get_comment_subscriptions();
-    $Key = self::has_subscribed_comments($Page, $PageID);
-    if ($Key !== false) {
-      G::$DB->query("
+    /**
+     * (Un)subscribe from comments.
+     * If UserID == 0, G::$LoggedUser[ID] is used
+     * @param string $Page 'artist', 'collages', 'requests' or 'torrents'
+     * @param int $PageID ArtistID, CollageID, RequestID or GroupID
+     * @param int $UserID
+     */
+    public static function subscribe_comments($Page, $PageID, $UserID = 0)
+    {
+        if ($UserID == 0) {
+            $UserID = G::$LoggedUser['ID'];
+        }
+        $QueryID = G::$DB->get_query_id();
+        $UserCommentSubscriptions = self::get_comment_subscriptions();
+        $Key = self::has_subscribed_comments($Page, $PageID);
+        if ($Key !== false) {
+            G::$DB->query("
         DELETE FROM users_subscriptions_comments
         WHERE UserID = " . db_string($UserID) . "
           AND Page = '" . db_string($Page) . "'
           AND PageID = " . db_string($PageID));
-      unset($UserCommentSubscriptions[$Key]);
-    } else {
-      G::$DB->query("
+            unset($UserCommentSubscriptions[$Key]);
+        } else {
+            G::$DB->query("
         INSERT IGNORE INTO users_subscriptions_comments
           (UserID, Page, PageID)
         VALUES
           ($UserID, '" . db_string($Page) . "', " . db_string($PageID) . ")");
-      array_push($UserCommentSubscriptions, array($Page, $PageID));
+            array_push($UserCommentSubscriptions, array($Page, $PageID));
+        }
+        G::$Cache->replace_value("subscriptions_comments_user_$UserID", $UserCommentSubscriptions, 0);
+        G::$Cache->delete_value("subscriptions_comments_user_new_$UserID");
+        G::$DB->set_query_id($QueryID);
     }
-    G::$Cache->replace_value("subscriptions_comments_user_$UserID", $UserCommentSubscriptions, 0);
-    G::$Cache->delete_value("subscriptions_comments_user_new_$UserID");
-    G::$DB->set_query_id($QueryID);
-  }
 
-  /**
-   * Read $UserID's subscriptions. If the cache key isn't set, it gets filled.
-   * If UserID == 0, G::$LoggedUser[ID] is used
-   * @param int $UserID
-   * @return array Array of TopicIDs
-   */
-  public static function get_subscriptions($UserID = 0) {
-    if ($UserID == 0) {
-      $UserID = G::$LoggedUser['ID'];
-    }
-    $QueryID = G::$DB->get_query_id();
-    $UserSubscriptions = G::$Cache->get_value("subscriptions_user_$UserID");
-    if ($UserSubscriptions === false) {
-      G::$DB->query('
+    /**
+     * Read $UserID's subscriptions. If the cache key isn't set, it gets filled.
+     * If UserID == 0, G::$LoggedUser[ID] is used
+     * @param int $UserID
+     * @return array Array of TopicIDs
+     */
+    public static function get_subscriptions($UserID = 0)
+    {
+        if ($UserID == 0) {
+            $UserID = G::$LoggedUser['ID'];
+        }
+        $QueryID = G::$DB->get_query_id();
+        $UserSubscriptions = G::$Cache->get_value("subscriptions_user_$UserID");
+        if ($UserSubscriptions === false) {
+            G::$DB->query('
         SELECT TopicID
         FROM users_subscriptions
         WHERE UserID = ' . db_string($UserID));
-      $UserSubscriptions = G::$DB->collect(0);
-      G::$Cache->cache_value("subscriptions_user_$UserID", $UserSubscriptions, 0);
+            $UserSubscriptions = G::$DB->collect(0);
+            G::$Cache->cache_value("subscriptions_user_$UserID", $UserSubscriptions, 0);
+        }
+        G::$DB->set_query_id($QueryID);
+        return $UserSubscriptions;
     }
-    G::$DB->set_query_id($QueryID);
-    return $UserSubscriptions;
-  }
 
-  /**
-   * Same as self::get_subscriptions, but for comment subscriptions
-   * @param int $UserID
-   * @return array Array of ($Page, $PageID)
-   */
-  public static function get_comment_subscriptions($UserID = 0) {
-    if ($UserID == 0) {
-      $UserID = G::$LoggedUser['ID'];
-    }
-    $QueryID = G::$DB->get_query_id();
-    $UserCommentSubscriptions = G::$Cache->get_value("subscriptions_comments_user_$UserID");
-    if ($UserCommentSubscriptions === false) {
-      G::$DB->query('
+    /**
+     * Same as self::get_subscriptions, but for comment subscriptions
+     * @param int $UserID
+     * @return array Array of ($Page, $PageID)
+     */
+    public static function get_comment_subscriptions($UserID = 0)
+    {
+        if ($UserID == 0) {
+            $UserID = G::$LoggedUser['ID'];
+        }
+        $QueryID = G::$DB->get_query_id();
+        $UserCommentSubscriptions = G::$Cache->get_value("subscriptions_comments_user_$UserID");
+        if ($UserCommentSubscriptions === false) {
+            G::$DB->query('
         SELECT Page, PageID
         FROM users_subscriptions_comments
         WHERE UserID = ' . db_string($UserID));
-      $UserCommentSubscriptions = G::$DB->to_array(false, MYSQLI_NUM);
-      G::$Cache->cache_value("subscriptions_comments_user_$UserID", $UserCommentSubscriptions, 0);
+            $UserCommentSubscriptions = G::$DB->to_array(false, MYSQLI_NUM);
+            G::$Cache->cache_value("subscriptions_comments_user_$UserID", $UserCommentSubscriptions, 0);
+        }
+        G::$DB->set_query_id($QueryID);
+        return $UserCommentSubscriptions;
     }
-    G::$DB->set_query_id($QueryID);
-    return $UserCommentSubscriptions;
-  }
 
-  /**
-   * Returns whether or not the current user has new subscriptions. This handles both forum and comment subscriptions.
-   * @return int Number of unread subscribed threads/comments
-   */
-  public static function has_new_subscriptions() {
-    $QueryID = G::$DB->get_query_id();
+    /**
+     * Returns whether or not the current user has new subscriptions. This handles both forum and comment subscriptions.
+     * @return int Number of unread subscribed threads/comments
+     */
+    public static function has_new_subscriptions()
+    {
+        $QueryID = G::$DB->get_query_id();
 
-    $NewSubscriptions = G::$Cache->get_value('subscriptions_user_new_' . G::$LoggedUser['ID']);
-    if ($NewSubscriptions === false) {
-      // forum subscriptions
-      G::$DB->query("
+        $NewSubscriptions = G::$Cache->get_value('subscriptions_user_new_' . G::$LoggedUser['ID']);
+        if ($NewSubscriptions === false) {
+            // forum subscriptions
+            G::$DB->query("
           SELECT COUNT(1)
           FROM users_subscriptions AS s
             LEFT JOIN forums_last_read_topics AS l ON l.UserID = s.UserID AND l.TopicID = s.TopicID
@@ -199,10 +212,10 @@ class Subscriptions {
           WHERE " . Forums::user_forums_sql() . "
             AND IF(t.IsLocked = '1' AND t.IsSticky = '0'" . ", t.LastPostID, IF(l.PostID IS NULL, 0, l.PostID)) < t.LastPostID
             AND s.UserID = " . G::$LoggedUser['ID']);
-      list($NewForumSubscriptions) = G::$DB->next_record();
+            list($NewForumSubscriptions) = G::$DB->next_record();
 
-      // comment subscriptions
-      G::$DB->query("
+            // comment subscriptions
+            G::$DB->query("
           SELECT COUNT(1)
           FROM users_subscriptions_comments AS s
             LEFT JOIN users_comments_last_read AS lr ON lr.UserID = s.UserID AND lr.Page = s.Page AND lr.PageID = s.PageID
@@ -211,23 +224,24 @@ class Subscriptions {
           WHERE s.UserID = " . G::$LoggedUser['ID'] . "
             AND (s.Page != 'collages' OR co.Deleted = '0')
             AND IF(lr.PostID IS NULL, 0, lr.PostID) < c.ID");
-      list($NewCommentSubscriptions) = G::$DB->next_record();
+            list($NewCommentSubscriptions) = G::$DB->next_record();
 
-      $NewSubscriptions = $NewForumSubscriptions + $NewCommentSubscriptions;
-      G::$Cache->cache_value('subscriptions_user_new_' . G::$LoggedUser['ID'], $NewSubscriptions, 0);
+            $NewSubscriptions = $NewForumSubscriptions + $NewCommentSubscriptions;
+            G::$Cache->cache_value('subscriptions_user_new_' . G::$LoggedUser['ID'], $NewSubscriptions, 0);
+        }
+        G::$DB->set_query_id($QueryID);
+        return (int)$NewSubscriptions;
     }
-    G::$DB->set_query_id($QueryID);
-    return (int)$NewSubscriptions;
-  }
 
-  /**
-   * Returns whether or not the current user has new quote notifications.
-   * @return int Number of unread quote notifications
-   */
-  public static function has_new_quote_notifications() {
-    $QuoteNotificationsCount = G::$Cache->get_value('notify_quoted_' . G::$LoggedUser['ID']);
-    if ($QuoteNotificationsCount === false) {
-      $sql = "
+    /**
+     * Returns whether or not the current user has new quote notifications.
+     * @return int Number of unread quote notifications
+     */
+    public static function has_new_quote_notifications()
+    {
+        $QuoteNotificationsCount = G::$Cache->get_value('notify_quoted_' . G::$LoggedUser['ID']);
+        if ($QuoteNotificationsCount === false) {
+            $sql = "
         SELECT COUNT(1)
         FROM users_notify_quoted AS q
           LEFT JOIN forums_topics AS t ON t.ID = q.PageID
@@ -237,166 +251,171 @@ class Subscriptions {
           AND q.UnRead
           AND (q.Page != 'forums' OR " . Forums::user_forums_sql() . ")
           AND (q.Page != 'collages' OR c.Deleted = '0')";
-      $QueryID = G::$DB->get_query_id();
-      G::$DB->query($sql);
-      list($QuoteNotificationsCount) = G::$DB->next_record();
-      G::$DB->set_query_id($QueryID);
-      G::$Cache->cache_value('notify_quoted_' . G::$LoggedUser['ID'], $QuoteNotificationsCount, 0);
+            $QueryID = G::$DB->get_query_id();
+            G::$DB->query($sql);
+            list($QuoteNotificationsCount) = G::$DB->next_record();
+            G::$DB->set_query_id($QueryID);
+            G::$Cache->cache_value('notify_quoted_' . G::$LoggedUser['ID'], $QuoteNotificationsCount, 0);
+        }
+        return (int)$QuoteNotificationsCount;
     }
-    return (int)$QuoteNotificationsCount;
-  }
 
-  /**
-   * Returns the key which holds this $TopicID in the subscription array.
-   * Use type-aware comparison operators with this! (ie. if (self::has_subscribed($TopicID) !== false) { ... })
-   * @param int $TopicID
-   * @return bool|int
-   */
-  public static function has_subscribed($TopicID) {
-    $UserSubscriptions = self::get_subscriptions();
-    return array_search($TopicID, $UserSubscriptions);
-  }
+    /**
+     * Returns the key which holds this $TopicID in the subscription array.
+     * Use type-aware comparison operators with this! (ie. if (self::has_subscribed($TopicID) !== false) { ... })
+     * @param int $TopicID
+     * @return bool|int
+     */
+    public static function has_subscribed($TopicID)
+    {
+        $UserSubscriptions = self::get_subscriptions();
+        return array_search($TopicID, $UserSubscriptions);
+    }
 
-  /**
-   * Same as has_subscribed, but for comment subscriptions.
-   * @param string $Page 'artist', 'collages', 'requests' or 'torrents'
-   * @param int $PageID
-   * @return bool|int
-   */
-  public static function has_subscribed_comments($Page, $PageID) {
-    $UserCommentSubscriptions = self::get_comment_subscriptions();
-    return array_search(array($Page, $PageID), $UserCommentSubscriptions);
-  }
+    /**
+     * Same as has_subscribed, but for comment subscriptions.
+     * @param string $Page 'artist', 'collages', 'requests' or 'torrents'
+     * @param int $PageID
+     * @return bool|int
+     */
+    public static function has_subscribed_comments($Page, $PageID)
+    {
+        $UserCommentSubscriptions = self::get_comment_subscriptions();
+        return array_search(array($Page, $PageID), $UserCommentSubscriptions);
+    }
 
-  /**
-   * Clear the subscription cache for all subscribers of a forum thread or artist/collage/request/torrent comments.
-   * @param type $Page 'forums', 'artist', 'collages', 'requests' or 'torrents'
-   * @param type $PageID TopicID, ArtistID, CollageID, RequestID or GroupID, respectively
-   */
-  public static function flush_subscriptions($Page, $PageID) {
-    $QueryID = G::$DB->get_query_id();
-    if ($Page == 'forums') {
-      G::$DB->query("
+    /**
+     * Clear the subscription cache for all subscribers of a forum thread or artist/collage/request/torrent comments.
+     * @param type $Page 'forums', 'artist', 'collages', 'requests' or 'torrents'
+     * @param type $PageID TopicID, ArtistID, CollageID, RequestID or GroupID, respectively
+     */
+    public static function flush_subscriptions($Page, $PageID)
+    {
+        $QueryID = G::$DB->get_query_id();
+        if ($Page == 'forums') {
+            G::$DB->query("
         SELECT UserID
         FROM users_subscriptions
         WHERE TopicID = '$PageID'");
-    } else {
-      G::$DB->query("
+        } else {
+            G::$DB->query("
         SELECT UserID
         FROM users_subscriptions_comments
         WHERE Page = '$Page'
           AND PageID = '$PageID'");
+        }
+        $Subscribers = G::$DB->collect('UserID');
+        foreach ($Subscribers as $Subscriber) {
+            G::$Cache->delete_value("subscriptions_user_new_$Subscriber");
+        }
+        G::$DB->set_query_id($QueryID);
     }
-    $Subscribers = G::$DB->collect('UserID');
-    foreach ($Subscribers as $Subscriber) {
-      G::$Cache->delete_value("subscriptions_user_new_$Subscriber");
-    }
-    G::$DB->set_query_id($QueryID);
-  }
 
-  /**
-   * Move all $Page subscriptions from $OldPageID to $NewPageID (for example when merging torrent groups).
-   * Passing $NewPageID = null will delete the subscriptions.
-   * @param string $Page 'forums', 'artist', 'collages', 'requests' or 'torrents'
-   * @param int $OldPageID TopicID, ArtistID, CollageID, RequestID or GroupID, respectively
-   * @param int|null $NewPageID As $OldPageID, or null to delete the subscriptions
-   */
-  public static function move_subscriptions($Page, $OldPageID, $NewPageID) {
-    self::flush_subscriptions($Page, $OldPageID);
-    $QueryID = G::$DB->get_query_id();
-    if ($Page == 'forums') {
-      if ($NewPageID !== null) {
-        G::$DB->query("
+    /**
+     * Move all $Page subscriptions from $OldPageID to $NewPageID (for example when merging torrent groups).
+     * Passing $NewPageID = null will delete the subscriptions.
+     * @param string $Page 'forums', 'artist', 'collages', 'requests' or 'torrents'
+     * @param int $OldPageID TopicID, ArtistID, CollageID, RequestID or GroupID, respectively
+     * @param int|null $NewPageID As $OldPageID, or null to delete the subscriptions
+     */
+    public static function move_subscriptions($Page, $OldPageID, $NewPageID)
+    {
+        self::flush_subscriptions($Page, $OldPageID);
+        $QueryID = G::$DB->get_query_id();
+        if ($Page == 'forums') {
+            if ($NewPageID !== null) {
+                G::$DB->query("
           UPDATE IGNORE users_subscriptions
           SET TopicID = '$NewPageID'
           WHERE TopicID = '$OldPageID'");
-        // explanation see below
-        G::$DB->query("
+                // explanation see below
+                G::$DB->query("
           UPDATE IGNORE forums_last_read_topics
           SET TopicID = $NewPageID
           WHERE TopicID = $OldPageID");
-        G::$DB->query("
+                G::$DB->query("
           SELECT UserID, MIN(PostID)
           FROM forums_last_read_topics
           WHERE TopicID IN ($OldPageID, $NewPageID)
           GROUP BY UserID
           HAVING COUNT(1) = 2");
-        $Results = G::$DB->to_array(false, MYSQLI_NUM);
-        foreach ($Results as $Result) {
-          G::$DB->query("
+                $Results = G::$DB->to_array(false, MYSQLI_NUM);
+                foreach ($Results as $Result) {
+                    G::$DB->query("
             UPDATE forums_last_read_topics
             SET PostID = $Result[1]
             WHERE TopicID = $NewPageID
               AND UserID = $Result[0]");
-        }
-      }
-      G::$DB->query("
+                }
+            }
+            G::$DB->query("
         DELETE FROM users_subscriptions
         WHERE TopicID = '$OldPageID'");
-      G::$DB->query("
+            G::$DB->query("
         DELETE FROM forums_last_read_topics
         WHERE TopicID = $OldPageID");
-    } else {
-      if ($NewPageID !== null) {
-        G::$DB->query("
+        } else {
+            if ($NewPageID !== null) {
+                G::$DB->query("
           UPDATE IGNORE users_subscriptions_comments
           SET PageID = '$NewPageID'
           WHERE Page = '$Page'
             AND PageID = '$OldPageID'");
-        // last read handling
-        // 1) update all rows that have no key collisions (i.e. users that haven't previously read both pages or if there are only comments on one page)
-        G::$DB->query("
+                // last read handling
+                // 1) update all rows that have no key collisions (i.e. users that haven't previously read both pages or if there are only comments on one page)
+                G::$DB->query("
           UPDATE IGNORE users_comments_last_read
           SET PageID = '$NewPageID'
           WHERE Page = '$Page'
             AND PageID = $OldPageID");
-        // 2) get all last read records with key collisions (i.e. there are records for one user for both PageIDs)
-        G::$DB->query("
+                // 2) get all last read records with key collisions (i.e. there are records for one user for both PageIDs)
+                G::$DB->query("
           SELECT UserID, MIN(PostID)
           FROM users_comments_last_read
           WHERE Page = '$Page'
             AND PageID IN ($OldPageID, $NewPageID)
           GROUP BY UserID
           HAVING COUNT(1) = 2");
-        $Results = G::$DB->to_array(false, MYSQLI_NUM);
-        // 3) update rows for those people found in 2) to the earlier post
-        foreach ($Results as $Result) {
-          G::$DB->query("
+                $Results = G::$DB->to_array(false, MYSQLI_NUM);
+                // 3) update rows for those people found in 2) to the earlier post
+                foreach ($Results as $Result) {
+                    G::$DB->query("
             UPDATE users_comments_last_read
             SET PostID = $Result[1]
             WHERE Page = '$Page'
               AND PageID = $NewPageID
               AND UserID = $Result[0]");
-        }
-      }
-      G::$DB->query("
+                }
+            }
+            G::$DB->query("
         DELETE FROM users_subscriptions_comments
         WHERE Page = '$Page'
           AND PageID = '$OldPageID'");
-      G::$DB->query("
+            G::$DB->query("
         DELETE FROM users_comments_last_read
         WHERE Page = '$Page'
           AND PageID = '$OldPageID'");
+        }
+        G::$DB->set_query_id($QueryID);
     }
-    G::$DB->set_query_id($QueryID);
-  }
 
-  /**
-   * Clear the quote notification cache for all subscribers of a forum thread or artist/collage/request/torrent comments.
-   * @param string $Page 'forums', 'artist', 'collages', 'requests' or 'torrents'
-   * @param int $PageID TopicID, ArtistID, CollageID, RequestID or GroupID, respectively
-   */
-  public static function flush_quote_notifications($Page, $PageID) {
-    $QueryID = G::$DB->get_query_id();
-    G::$DB->query("
+    /**
+     * Clear the quote notification cache for all subscribers of a forum thread or artist/collage/request/torrent comments.
+     * @param string $Page 'forums', 'artist', 'collages', 'requests' or 'torrents'
+     * @param int $PageID TopicID, ArtistID, CollageID, RequestID or GroupID, respectively
+     */
+    public static function flush_quote_notifications($Page, $PageID)
+    {
+        $QueryID = G::$DB->get_query_id();
+        G::$DB->query("
       SELECT UserID
       FROM users_notify_quoted
       WHERE Page = '$Page'
         AND PageID = $PageID");
-    $Subscribers = G::$DB->collect('UserID');
-    foreach ($Subscribers as $Subscriber) {
-      G::$Cache->delete_value("notify_quoted_$Subscriber");
+        $Subscribers = G::$DB->collect('UserID');
+        foreach ($Subscribers as $Subscriber) {
+            G::$Cache->delete_value("notify_quoted_$Subscriber");
+        }
+        G::$DB->set_query_id($QueryID);
     }
-    G::$DB->set_query_id($QueryID);
-  }
 }

classes/tags.class.php

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

classes/templates.class.php

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

classes/testing.class.php

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

classes/testingview.class.php

@@ -1,24 +1,30 @@
-<?
+<?php
 
-class TestingView {
-  /**
-   * Render the linkbox
-   */
-  public static function render_linkbox($Page) { ?>
+class TestingView
+{
+    /**
+     * Render the linkbox
+     */
+    public static function render_linkbox($Page)
+    {
+        ?>
     <div class="linkbox">
-<?      if ($Page != "classes") { ?>
+        <?php      if ($Page != "classes") { ?>
         <a href="testing.php" class="brackets">Classes</a>
-<?      }
-      if ($Page != "comments") { ?>
+        <?php      }
+        if ($Page != "comments") { ?>
         <a href="testing.php?action=comments" class="brackets">Comments</a>
-<?      } ?>
+        <?php      } ?>
     </div>
-<?  }
+        <?php
+    }
 
-  /**
-   * Render a list of classes
-   */
-  public static function render_classes($Classes) { ?>
+    /**
+     * Render a list of classes
+     */
+    public static function render_classes($Classes)
+    {
+        ?>
     <table>
       <tr class="colhead">
         <td>
@@ -28,10 +34,9 @@ class TestingView {
           Testable functions
         </td>
       </tr>
-<?      foreach($Classes as $Key => $Value) {
-        $Doc = Testing::get_class_comment($Key);
-        $Methods = count(Testing::get_testable_methods($Key));
-?>
+        <?php      foreach ($Classes as $Key => $Value) {
+            $Doc = Testing::get_class_comment($Key);
+            $Methods = count(Testing::get_testable_methods($Key)); ?>
         <tr>
           <td>
             <a href="testing.php?action=class&amp;name=<?=$Key?>" class="tooltip" title="<?=$Doc?>"><?=$Key?></a>
@@ -40,18 +45,20 @@ class TestingView {
             <?=$Methods?>
           </td>
         </tr>
-<?      } ?>
+            <?php
+        } ?>
     </table>
-<?  }
+        <?php
+    }
 
-  /**
-   * Render functions in a class
-   */
-  public static function render_functions($Methods) {
-    foreach($Methods as $Index => $Method) {
-      $ClassName = $Method->getDeclaringClass()->getName();
-      $MethodName = $Method->getName();
-?>
+    /**
+     * Render functions in a class
+     */
+    public static function render_functions($Methods)
+    {
+        foreach ($Methods as $Index => $Method) {
+            $ClassName = $Method->getDeclaringClass()->getName();
+            $MethodName = $Method->getName(); ?>
       <div class="box box2">
         <div class="head">
           <span><?=self::render_method_definition($Method)?></span>
@@ -61,62 +68,68 @@ class TestingView {
           </span>
         </div>
         <div class="pad hidden" id="method_params_<?=$Index?>">
-          <?self::render_method_params($Method);?>
+            <?php self::render_method_params($Method); ?>
         </div>
         <div class="pad hidden" id="method_results_<?=$Index?>">
         </div>
       </div>
-<?    }
-  }
+            <?php
+        }
+    }
 
-  /**
-   * Render method parameters
-   */
-  private static function render_method_params($Method) { ?>
+    /**
+     * Render method parameters
+     */
+    private static function render_method_params($Method)
+    {
+        ?>
     <table>
-<?    foreach($Method->getParameters() as $Parameter) {
-      $DefaultValue = $Parameter->isDefaultValueAvailable() ? $Parameter->getDefaultValue() : "";
-?>
+        <?php    foreach ($Method->getParameters() as $Parameter) {
+            $DefaultValue = $Parameter->isDefaultValueAvailable() ? $Parameter->getDefaultValue() : ""; ?>
       <tr>
         <td class="label">
-          <?=$Parameter->getName()?>
+            <?=$Parameter->getName()?>
         </td>
         <td>
           <input type="text" name="<?=$Parameter->getName()?>" value="<?=$DefaultValue?>"/>
         </td>
       </tr>
-<?    } ?>
+            <?php
+        } ?>
     </table>
-<?  }
-
-  /**
-   * Render the method definition
-   */
-  private static function render_method_definition($Method) {
-    $Title = "<span class='tooltip' title='" . Testing::get_method_comment($Method) . "'>" . $Method->getName() . "</span> (";
-    foreach($Method->getParameters() as $Parameter) {
-      $Color = "red";
-      if ($Parameter->isDefaultValueAvailable()) {
-        $Color = "green";
-      }
-      $Title .= "<span style='color: $Color'>";
-      $Title .= "$" . $Parameter->getName();
-      if ($Parameter->isDefaultValueAvailable()) {
-        $Title .= " = " . $Parameter->getDefaultValue();
-      }
-      $Title .= "</span>";
-      $Title .= ", ";
+        <?php
+    }
 
+    /**
+     * Render the method definition
+     */
+    private static function render_method_definition($Method)
+    {
+        $Title = "<span class='tooltip' title='" . Testing::get_method_comment($Method) . "'>" . $Method->getName() . "</span> (";
+        foreach ($Method->getParameters() as $Parameter) {
+            $Color = "red";
+            if ($Parameter->isDefaultValueAvailable()) {
+                $Color = "green";
+            }
+            $Title .= "<span style='color: $Color'>";
+            $Title .= "$" . $Parameter->getName();
+            if ($Parameter->isDefaultValueAvailable()) {
+                $Title .= " = " . $Parameter->getDefaultValue();
+            }
+            $Title .= "</span>";
+            $Title .= ", ";
+        }
+        $Title = rtrim($Title, ", ");
+        $Title .= ")";
+        return $Title;
     }
-    $Title = rtrim($Title, ", ");
-    $Title .= ")";
-    return $Title;
-  }
 
-  /**
-   * Renders class documentation stats
-   */
-  public static function render_missing_documentation($Classes) { ?>
+    /**
+     * Renders class documentation stats
+     */
+    public static function render_missing_documentation($Classes)
+    {
+        ?>
     <table>
       <tr class="colhead">
         <td>
@@ -132,9 +145,8 @@ class TestingView {
           Documented functions
         </td>
       </tr>
-<?      foreach($Classes as $Key => $Value) {
-        $ClassComment = Testing::get_class_comment($Key);
-?>
+        <?php      foreach ($Classes as $Key => $Value) {
+            $ClassComment = Testing::get_class_comment($Key); ?>
         <tr>
           <td>
             <?=$Key?>
@@ -148,28 +160,30 @@ class TestingView {
             <?=count(Testing::get_documented_methods($Key))?>
           </td>
         </tr>
-<?      } ?>
+            <?php
+        } ?>
     </table>
-<?  }
+        <?php
+    }
 
-  /**
-   * Pretty print any data
-   */
-  public static function render_results($Data) {
-    $Results = '<pre><ul style="list-style-type: none">';
-    if (is_array($Data)) {
-      foreach ($Data as $Key => $Value){
-        if (is_array($Value)){
-          $Results .= '<li>' . $Key . ' => ' . self::render_results($Value) . '</li>';
-        } else{
-          $Results .= '<li>' . $Key . ' => ' . $Value . '</li>';
+    /**
+     * Pretty print any data
+     */
+    public static function render_results($Data)
+    {
+        $Results = '<pre><ul style="list-style-type: none">';
+        if (is_array($Data)) {
+            foreach ($Data as $Key => $Value) {
+                if (is_array($Value)) {
+                    $Results .= '<li>' . $Key . ' => ' . self::render_results($Value) . '</li>';
+                } else {
+                    $Results .= '<li>' . $Key . ' => ' . $Value . '</li>';
+                }
+            }
+        } else {
+            $Results .= '<li>' . $Data . '</li>';
         }
-      }
-    } else {
-      $Results .= '<li>' . $Data . '</li>';
+        $Results .= '</ul></pre>';
+        echo $Results;
     }
-    $Results .= '</ul></pre>';
-    echo $Results;
-  }
-
 }