if if if

classes/bencodetorrent.class.php

@@ -1,5 +1,7 @@
 <?php
 
+# todo: Replace this with https://github.com/OPSnet/bencode-torrent
+
 /**
  * Torrent class that contains some convenient functions related to torrent meta data
  */
@@ -34,7 +36,7 @@ class BencodeTorrent extends BencodeDecode
             if (isset($InfoDict['path.utf-8']['files'][0])) {
                 $this->PathKey = 'path.utf-8';
             }
-            
+
             foreach ($InfoDict['files'] as $File) {
                 $TmpPath = [];
                 foreach ($File[$this->PathKey] as $SubPath) {

classes/commentsview.class.php

@@ -1,96 +1,116 @@
-<?
-class CommentsView {
-  /**
-   * Render a thread of comments
-   * @param array $Thread An array as returned by Comments::load
-   * @param int $LastRead PostID of the last read post
-   * @param string $Baselink Link to the site these comments are on
-   */
-  public static function render_comments($Thread, $LastRead, $Baselink) {
-    foreach ($Thread as $Post) {
-      list($PostID, $AuthorID, $AddedTime, $CommentBody, $EditedUserID, $EditedTime, $EditedUsername) = array_values($Post);
-      self::render_comment($AuthorID, $PostID, $CommentBody, $AddedTime, $EditedUserID, $EditedTime, $Baselink . "&amp;postid=$PostID#post$PostID", ($PostID > $LastRead));
+<?php
+
+class CommentsView
+{
+    /**
+     * Render a thread of comments
+     * @param array $Thread An array as returned by Comments::load
+     * @param int $LastRead PostID of the last read post
+     * @param string $Baselink Link to the site these comments are on
+     */
+    public static function render_comments($Thread, $LastRead, $Baselink)
+    {
+        foreach ($Thread as $Post) {
+            list($PostID, $AuthorID, $AddedTime, $CommentBody, $EditedUserID, $EditedTime, $EditedUsername) = array_values($Post);
+            self::render_comment($AuthorID, $PostID, $CommentBody, $AddedTime, $EditedUserID, $EditedTime, $Baselink . "&amp;postid=$PostID#post$PostID", ($PostID > $LastRead));
+        }
     }
-  }
 
-  /**
-   * Render one comment
-   * @param int $AuthorID
-   * @param int $PostID
-   * @param string $Body
-   * @param string $AddedTime
-   * @param int $EditedUserID
-   * @param string $EditedTime
-   * @param string $Link The link to the post elsewhere on the site
-   * @param string $Header The header used in the post
-   * @param bool $Tools Whether or not to show [Edit], [Report] etc.
-   * 
-   * todo: Find a better way to pass the page (artist, collages, requests, torrents) to this function than extracting it from $Link
-   */
-  static function render_comment($AuthorID, $PostID, $Body, $AddedTime, $EditedUserID, $EditedTime, $Link, $Unread = false, $Header = '', $Tools = true) {
-    $UserInfo = Users::user_info($AuthorID);
-    $Header = Users::format_username($AuthorID, true, true, true, true, true) . time_diff($AddedTime) . $Header;
-?>
-    <table class="forum_post box vertical_margin<?=(!Users::has_avatars_enabled() ? ' noavatar' : '') . ($Unread ? ' forum_unread' : '')?>" id="post<?=$PostID?>">
-      <colgroup>
-<?    if (Users::has_avatars_enabled()) { ?>
-        <col class="col_avatar" />
-<?    } ?>
-        <col class="col_post_body" />
-      </colgroup>
-      <tr class="colhead_dark">
-        <td colspan="<?=(Users::has_avatars_enabled() ? 2 : 1)?>">
-          <div class="float_left"><a class="post_id" href="<?=$Link?>">#<?=$PostID?></a>
-            <?=$Header?>
-<?    if ($Tools) { ?>
-            - <a href="#quickpost" onclick="Quote('<?=$PostID?>','<?=$UserInfo['Username']?>', true);" class="brackets">Quote</a>
-<?      if ($AuthorID == G::$LoggedUser['ID'] || check_perms('site_moderate_forums')) { ?>
-            - <a href="#post<?=$PostID?>" onclick="Edit_Form('<?=$PostID?>','');" class="brackets">Edit</a>
-<?      }
+    /**
+     * Render one comment
+     * @param int $AuthorID
+     * @param int $PostID
+     * @param string $Body
+     * @param string $AddedTime
+     * @param int $EditedUserID
+     * @param string $EditedTime
+     * @param string $Link The link to the post elsewhere on the site
+     * @param string $Header The header used in the post
+     * @param bool $Tools Whether or not to show [Edit], [Report] etc.
+     *
+     * todo: Find a better way to pass the page (artist, collages, requests, torrents) to this function than extracting it from $Link
+     */
+    public static function render_comment($AuthorID, $PostID, $Body, $AddedTime, $EditedUserID, $EditedTime, $Link, $Unread = false, $Header = '', $Tools = true)
+    {
+        $UserInfo = Users::user_info($AuthorID);
+        $Header = Users::format_username($AuthorID, true, true, true, true, true) . time_diff($AddedTime) . $Header; ?>
+<table
+  class="forum_post box vertical_margin<?=(!Users::has_avatars_enabled() ? ' noavatar' : '') . ($Unread ? ' forum_unread' : '')?>"
+  id="post<?=$PostID?>">
+  <colgroup>
+    <?php if (Users::has_avatars_enabled()) { ?>
+    <col class="col_avatar" />
+    <?php } ?>
+    <col class="col_post_body" />
+  </colgroup>
+  <tr class="colhead_dark">
+    <td colspan="<?=(Users::has_avatars_enabled() ? 2 : 1)?>">
+      <div class="float_left"><a class="post_id"
+          href="<?=$Link?>">#<?=$PostID?></a>
+        <?=$Header?>
+        <?php if ($Tools) { ?>
+        - <a href="#quickpost"
+          onclick="Quote('<?=$PostID?>','<?=$UserInfo['Username']?>', true);"
+          class="brackets">Quote</a>
+        <?php if ($AuthorID == G::$LoggedUser['ID'] || check_perms('site_moderate_forums')) { ?>
+        - <a href="#post<?=$PostID?>"
+          onclick="Edit_Form('<?=$PostID?>','');"
+          class="brackets">Edit</a>
+        <?php }
       if (check_perms('site_moderate_forums')) { ?>
-            - <a href="#post<?=$PostID?>" onclick="Delete('<?=$PostID?>');" class="brackets">Delete</a>
-<?      } ?>
-          </div>
-          <div id="bar<?=$PostID?>" class="float_right">
-            <a href="reports.php?action=report&amp;type=comment&amp;id=<?=$PostID?>" class="brackets">Report</a>
-<?
+        - <a href="#post<?=$PostID?>"
+          onclick="Delete('<?=$PostID?>');"
+          class="brackets">Delete</a>
+        <?php } ?>
+      </div>
+      <div id="bar<?=$PostID?>" class="float_right">
+        <a href="reports.php?action=report&amp;type=comment&amp;id=<?=$PostID?>"
+          class="brackets">Report</a>
+        <?php
       if (check_perms('users_warn') && $AuthorID != G::$LoggedUser['ID'] && G::$LoggedUser['Class'] >= $UserInfo['Class']) {
-?>
-            <form class="manage_form hidden" name="user" id="warn<?=$PostID?>" action="comments.php" method="post">
-              <input type="hidden" name="action" value="warn" />
-              <input type="hidden" name="postid" value="<?=$PostID?>" />
-            </form>
-            - <a href="#" onclick="$('#warn<?=$PostID?>').raw().submit(); return false;" class="brackets">Warn</a>
-<?      } ?>
-            &nbsp;
-            <a href="#">&uarr;</a>
-<?    } ?>
-          </div>
-        </td>
-      </tr>
-      <tr>
-<?    if (Users::has_avatars_enabled()) { ?>
-        <td class="avatar" valign="top">
-        <?=Users::show_avatar($UserInfo['Avatar'], $AuthorID, $UserInfo['Username'], G::$LoggedUser['DisableAvatars'])?>
-        </td>
-<?    } ?>
-        <td class="body" valign="top">
-          <div id="content<?=$PostID?>">
-            <?=Text::full_format($Body)?>
-<?    if ($EditedUserID) { ?>
-            <br />
-            <br />
-            <div class="last_edited">
-<?      if (check_perms('site_admin_forums')) { ?>
-              <a href="#content<?=$PostID?>" onclick="LoadEdit('<?=substr($Link, 0, strcspn($Link, '.'))?>', <?=$PostID?>, 1); return false;">&laquo;</a>
-<?      } ?>
-              Last edited by
-              <?=Users::format_username($EditedUserID, false, false, false) ?> <?=time_diff($EditedTime, 2, true, true)?>
-<?    } ?>
-            </div>
-          </div>
-        </td>
-      </tr>
-    </table>
-<?  }
+          ?>
+        <form class="manage_form hidden" name="user"
+          id="warn<?=$PostID?>" action="comments.php" method="post">
+          <input type="hidden" name="action" value="warn" />
+          <input type="hidden" name="postid" value="<?=$PostID?>" />
+        </form>
+        - <a href="#"
+          onclick="$('#warn<?=$PostID?>').raw().submit(); return false;"
+          class="brackets">Warn</a>
+        <?php
+      } ?>
+        &nbsp;
+        <a href="#">&uarr;</a>
+        <?php } ?>
+      </div>
+    </td>
+  </tr>
+  <tr>
+    <?php if (Users::has_avatars_enabled()) { ?>
+    <td class="avatar" valign="top">
+      <?=Users::show_avatar($UserInfo['Avatar'], $AuthorID, $UserInfo['Username'], G::$LoggedUser['DisableAvatars'])?>
+    </td>
+    <?php } ?>
+    <td class="body" valign="top">
+      <div id="content<?=$PostID?>">
+        <?=Text::full_format($Body)?>
+        <?php if ($EditedUserID) { ?>
+        <br />
+        <br />
+        <div class="last_edited">
+          <?php if (check_perms('site_admin_forums')) { ?>
+          <a href="#content<?=$PostID?>"
+            onclick="LoadEdit('<?=substr($Link, 0, strcspn($Link, '.'))?>', <?=$PostID?>, 1); return false;">&laquo;</a>
+          <?php } ?>
+          Last edited by
+          <?=Users::format_username($EditedUserID, false, false, false) ?>
+          <?=time_diff($EditedTime, 2, true, true)?>
+          <?php } ?>
+        </div>
+      </div>
+    </td>
+  </tr>
+</table>
+<?php
+    }
 }

classes/donationsview.class.php

@@ -1,214 +1,227 @@
-<?
+<?php
 
-class DonationsView {
-  public static function render_mod_donations($UserID) {
-?>
-    <table class="layout box" id="donation_box">
-      <tr class="colhead">
-        <td colspan="2">
-          Donor System (add points)
-        </td>
-      </tr>
-      <tr>
-        <td class="label">Value:</td>
-        <td>
-          <input type="text" name="donation_value" onkeypress="return isNumberKey(event);" />
-          <select name="donation_currency">
-            <option value="EUR">EUR</option>
-            <option value="USD">USD</option>
-            <option value="BTC">BTC</option>
-          </select>
-        </td>
-      </tr>
-      <tr>
-        <td class="label">Reason:</td>
-        <td><input type="text" class="wide_input_text" name="donation_reason" /></td>
-      </tr>
-      <tr>
-        <td align="right" colspan="2">
-          <input type="submit" name="donor_points_submit" value="Add donor points" />
-        </td>
-      </tr>
-    </table>
+class DonationsView
+{
+    public static function render_mod_donations($UserID)
+    {
+        ?>
+<table class="layout box" id="donation_box">
+  <tr class="colhead">
+    <td colspan="2">
+      Donor System (add points)
+    </td>
+  </tr>
+  <tr>
+    <td class="label">Value:</td>
+    <td>
+      <input type="text" name="donation_value" onkeypress="return isNumberKey(event);" />
+      <select name="donation_currency">
+        <option value="EUR">EUR</option>
+        <option value="USD">USD</option>
+        <option value="BTC">BTC</option>
+      </select>
+    </td>
+  </tr>
+  <tr>
+    <td class="label">Reason:</td>
+    <td><input type="text" class="wide_input_text" name="donation_reason" /></td>
+  </tr>
+  <tr>
+    <td align="right" colspan="2">
+      <input type="submit" name="donor_points_submit" value="Add donor points" />
+    </td>
+  </tr>
+</table>
 
-    <table class="layout box" id="donor_points_box">
-      <tr class="colhead">
-        <td colspan="3" class="tooltip" title='Use this tool only when manually correcting values. If crediting donations normally, use the "Donor System (add points)" tool'>
-          Donor System (modify values)
-        </td>
-      </tr>
-      <tr>
-        <td class="label tooltip" title="Active points determine a user's Donor Rank and do expire.">Active points:</td>
-        <td><input type="text" name="donor_rank" onkeypress="return isNumberKey(event);" value="<?=Donations::get_rank($UserID)?>" /></td>
-      </tr>
-      <tr>
-        <td class="label tooltip" title="Total points represent a user's overall total and never expire. Total points determines a user's Special Rank and Donor Leaderboard placement.">Total points:</td>
-        <td><input type="text" name="total_donor_rank" onkeypress="return isNumberKey(event);" value="<?=Donations::get_total_rank($UserID)?>" /></td>
-      </tr>
-      <tr>
-        <td class="label">Reason:</td>
-        <td><input type="text" class="wide_input_text" name="reason" /></td>
-      </tr>
-      <tr>
-        <td align="right" colspan="2">
-          <input type="submit" name="donor_values_submit" value="Change point values" />
-        </td>
-      </tr>
-    </table>
-<?
-  }
+<table class="layout box" id="donor_points_box">
+  <tr class="colhead">
+    <td colspan="3" class="tooltip"
+      title='Use this tool only when manually correcting values. If crediting donations normally, use the "Donor System (add points)" tool'>
+      Donor System (modify values)
+    </td>
+  </tr>
+  <tr>
+    <td class="label tooltip" title="Active points determine a user's Donor Rank and do expire.">Active points:</td>
+    <td><input type="text" name="donor_rank" onkeypress="return isNumberKey(event);"
+        value="<?=Donations::get_rank($UserID)?>" /></td>
+  </tr>
+  <tr>
+    <td class="label tooltip"
+      title="Total points represent a user's overall total and never expire. Total points determines a user's Special Rank and Donor Leaderboard placement.">
+      Total points:</td>
+    <td><input type="text" name="total_donor_rank" onkeypress="return isNumberKey(event);"
+        value="<?=Donations::get_total_rank($UserID)?>" /></td>
+  </tr>
+  <tr>
+    <td class="label">Reason:</td>
+    <td><input type="text" class="wide_input_text" name="reason" /></td>
+  </tr>
+  <tr>
+    <td align="right" colspan="2">
+      <input type="submit" name="donor_values_submit" value="Change point values" />
+    </td>
+  </tr>
+</table>
+<?php
+    }
 
-  public static function render_donor_stats($UserID) {
-    $OwnProfile = G::$LoggedUser['ID'] == $UserID;
-    if (check_perms("users_mod") || $OwnProfile || Donations::is_visible($UserID)) {
-?>
-      <div class="box box_info box_userinfo_donor_stats">
-        <div class="head colhead_dark">Donor Statistics</div>
-        <ul class="stats nobullet">
-<?
+    public static function render_donor_stats($UserID)
+    {
+        $OwnProfile = G::$LoggedUser['ID'] === $UserID;
+        if (check_perms("users_mod") || $OwnProfile || Donations::is_visible($UserID)) {
+            ?>
+<div class="box box_info box_userinfo_donor_stats">
+  <div class="head colhead_dark">Donor Statistics</div>
+  <ul class="stats nobullet">
+    <?php
       if (Donations::is_donor($UserID)) {
-        if (check_perms('users_mod') || $OwnProfile) {
-?>
-          <li>
-            Total donor points: <?=Donations::get_total_rank($UserID)?>
-          </li>
-<?        } ?>
-          <li>
-            Current donor rank: <?=self::render_rank(Donations::get_rank($UserID), Donations::get_special_rank($UserID), true)?>
-          </li>
-          <li>
-            Leaderboard position: <?=Donations::get_leaderboard_position($UserID)?>
-          </li>
-          <li>
-            Last donated: <?=time_diff(Donations::get_donation_time($UserID))?>
-          </li>
-          <li>
-            Rank expires: <?=(Donations::get_rank_expiration($UserID))?>
-          </li>
-<?      } else { ?>
-          <li>
-            This user hasn't donated.
-          </li>
-<?      } ?>
-        </ul>
-      </div>
-<?
+          if (check_perms('users_mod') || $OwnProfile) {
+              ?>
+    <li>
+      Total donor points: <?=Donations::get_total_rank($UserID)?>
+    </li>
+    <?php
+          } ?>
+    <li>
+      Current donor rank: <?=self::render_rank(Donations::get_rank($UserID), Donations::get_special_rank($UserID), true)?>
+    </li>
+    <li>
+      Leaderboard position: <?=Donations::get_leaderboard_position($UserID)?>
+    </li>
+    <li>
+      Last donated: <?=time_diff(Donations::get_donation_time($UserID))?>
+    </li>
+    <li>
+      Rank expires: <?=(Donations::get_rank_expiration($UserID))?>
+    </li>
+    <?php
+      } else { ?>
+    <li>
+      This user hasn't donated.
+    </li>
+    <?php      } ?>
+  </ul>
+</div>
+<?php
+        }
     }
-  }
 
-  public static function render_profile_rewards($EnabledRewards, $ProfileRewards) {
-    for ($i = 1; $i <= 4; $i++) {
-      if ($EnabledRewards['HasProfileInfo' . $i] && $ProfileRewards['ProfileInfo' . $i]) {
-?>
-      <div class="box">
-        <div class="head">
-          <span><?=!empty($ProfileRewards['ProfileInfoTitle' . $i]) ? display_str($ProfileRewards['ProfileInfoTitle' . $i]) : "Extra Profile " . ($i + 1)?></span>
-          <span class="float_right"><a data-toggle-target="#profilediv_<?=$i?>" data-toggle-replace="Show" class="brackets">Hide</a></span>
-        </div>
-        <div class="pad profileinfo" id="profilediv_<?=$i?>">
-<?          echo Text::full_format($ProfileRewards['ProfileInfo' . $i]); ?>
-        </div>
-      </div>
-<?
-      }
+    public static function render_profile_rewards($EnabledRewards, $ProfileRewards)
+    {
+        for ($i = 1; $i <= 4; $i++) {
+            if ($EnabledRewards['HasProfileInfo' . $i] && $ProfileRewards['ProfileInfo' . $i]) {
+                ?>
+<div class="box">
+  <div class="head">
+    <span><?=!empty($ProfileRewards['ProfileInfoTitle' . $i]) ? display_str($ProfileRewards['ProfileInfoTitle' . $i]) : "Extra Profile " . ($i + 1)?></span>
+    <span class="float_right"><a
+        data-toggle-target="#profilediv_<?=$i?>"
+        data-toggle-replace="Show" class="brackets">Hide</a></span>
+  </div>
+  <div class="pad profileinfo" id="profilediv_<?=$i?>">
+    <?php          echo Text::full_format($ProfileRewards['ProfileInfo' . $i]); ?>
+  </div>
+</div>
+<?php
+            }
+        }
     }
-  }
 
-  public static function render_donation_history($DonationHistory) {
-    if (empty($DonationHistory)) {
-      return;
-    }
-?>
-    <div class="box box2" id="donation_history_box">
-      <div class="head">
-        Donation History <a data-toggle-target="#donation_history" class="brackets" style="float_right">Toggle</a>
-      </div>
-      <div class="hidden" id="donation_history">
-        <table cellpadding="6" cellspacing="1" border="0" class="border" width="100%">
-          <tbody>
-          <tr class="colhead_dark">
-            <td>
-              <strong>Source</strong>
-            </td>
-            <td>
-              <strong>Date</strong>
-            </td>
-            <td>
-              <strong>Amount (EUR)</strong>
-            </td>
-            <td>
-              <strong>Added Points</strong>
-            </td>
-            <td>
-              <strong>Total Points</strong>
-            </td>
-            <td>
-              <strong>Email</strong>
-            </td>
-            <td style="width: 30%;">
-              <strong>Reason</strong>
-            </td>
-          </tr>
-<?    foreach ($DonationHistory as $Donation) { ?>
-          <tr class="row">
-            <td>
-              <?=display_str($Donation['Source'])?> (<?=Users::format_username($Donation['AddedBy'])?>)
-            </td>
-            <td>
-              <?=$Donation['Time']?>
-            </td>
-            <td>
-              <?=$Donation['Amount']?>
-            </td>
-            <td>
-              <?=$Donation['Rank']?>
-            </td>
-            <td>
-              <?=$Donation['TotalRank']?>
-            </td>
-            <td>
-              <?=display_str($Donation['Email'])?>
-            </td>
-            <td>
-              <?=display_str($Donation['Reason'])?>
-            </td>
-          </tr>
-<?
+    public static function render_donation_history($DonationHistory)
+    {
+        if (empty($DonationHistory)) {
+            return;
+        } ?>
+<div class="box box2" id="donation_history_box">
+  <div class="head">
+    Donation History <a data-toggle-target="#donation_history" class="brackets" style="float_right">Toggle</a>
+  </div>
+  <div class="hidden" id="donation_history">
+    <table cellpadding="6" cellspacing="1" border="0" class="border" width="100%">
+      <tbody>
+        <tr class="colhead_dark">
+          <td>
+            <strong>Source</strong>
+          </td>
+          <td>
+            <strong>Date</strong>
+          </td>
+          <td>
+            <strong>Amount (EUR)</strong>
+          </td>
+          <td>
+            <strong>Added Points</strong>
+          </td>
+          <td>
+            <strong>Total Points</strong>
+          </td>
+          <td>
+            <strong>Email</strong>
+          </td>
+          <td style="width: 30%;">
+            <strong>Reason</strong>
+          </td>
+        </tr>
+        <?php    foreach ($DonationHistory as $Donation) { ?>
+        <tr class="row">
+          <td>
+            <?=display_str($Donation['Source'])?>
+            (<?=Users::format_username($Donation['AddedBy'])?>)
+          </td>
+          <td>
+            <?=$Donation['Time']?>
+          </td>
+          <td>
+            <?=$Donation['Amount']?>
+          </td>
+          <td>
+            <?=$Donation['Rank']?>
+          </td>
+          <td>
+            <?=$Donation['TotalRank']?>
+          </td>
+          <td>
+            <?=display_str($Donation['Email'])?>
+          </td>
+          <td>
+            <?=display_str($Donation['Reason'])?>
+          </td>
+        </tr>
+        <?php
+    } ?>
+      </tbody>
+    </table>
+  </div>
+</div>
+<?php
     }
-?>
-          </tbody>
-        </table>
-      </div>
-    </div>
-<?
-  }
 
-  public static function render_rank($Rank, $SpecialRank, $ShowOverflow = false) {
-    if ($SpecialRank == 3) {
-      $Display = '∞ [Diamond]';
-    } else {
-      $CurrentRank = $Rank >= MAX_RANK ? MAX_RANK : $Rank;
-      $Overflow = $Rank - $CurrentRank;
-      $Display = $CurrentRank;
-      if ($Display == 5 || $Display == 6) {
-        $Display--;
-      }
-      if ($ShowOverflow && $Overflow) {
-        $Display .= " (+$Overflow)";
-      }
-      if ($Rank >= 6) {
-        $Display .= ' [Gold]';
-      } elseif ($Rank >= 4) {
-        $Display .= ' [Silver]';
-      } elseif ($Rank >= 3) {
-        $Display .= ' [Bronze]';
-      } elseif ($Rank >= 2) {
-        $Display .= ' [Copper]';
-      } elseif ($Rank >= 1) {
-        $Display .= ' [Red]';
-      }
+    public static function render_rank($Rank, $SpecialRank, $ShowOverflow = false)
+    {
+        if ($SpecialRank === 3) {
+            $Display = '∞ [Diamond]';
+        } else {
+            $CurrentRank = $Rank >= MAX_RANK ? MAX_RANK : $Rank;
+            $Overflow = $Rank - $CurrentRank;
+            $Display = $CurrentRank;
+            if ($Display === 5 || $Display === 6) {
+                $Display--;
+            }
+            if ($ShowOverflow && $Overflow) {
+                $Display .= " (+$Overflow)";
+            }
+            if ($Rank >= 6) {
+                $Display .= ' [Gold]';
+            } elseif ($Rank >= 4) {
+                $Display .= ' [Silver]';
+            } elseif ($Rank >= 3) {
+                $Display .= ' [Bronze]';
+            } elseif ($Rank >= 2) {
+                $Display .= ' [Copper]';
+            } elseif ($Rank >= 1) {
+                $Display .= ' [Red]';
+            }
+        }
+        echo $Display;
     }
-    echo $Display;
-  }
-
 }

classes/format.class.php

@@ -2,39 +2,38 @@
 
 class Format
 {
-
-  /**
-   * Torrent Labels
-   * Map a common display string to a CSS class
-   * Indexes are lower case
-   * Note the "tl_" prefix for "torrent label"
-   *
-   * There are five basic types:
-   * * tl_free (leech status)
-   * * tl_snatched
-   * * tl_reported
-   * * tl_approved
-   * * tl_notice (default)
-   *
-   * @var array Strings
-   */
+    /**
+     * Torrent Labels
+     * Map a common display string to a CSS class
+     * Indexes are lower case
+     * Note the "tl_" prefix for "torrent label"
+     *
+     * There are five basic types:
+     * * tl_free (leech status)
+     * * tl_snatched
+     * * tl_reported
+     * * tl_approved
+     * * tl_notice (default)
+     *
+     * @var array Strings
+     */
     private static $TorrentLabels = array(
-    'default'  => 'tl_notice',
-    'snatched' => 'tl_snatched',
-    'seeding'  => 'tl_seeding',
-    'leeching' => 'tl_leeching',
+        'default'  => 'tl_notice',
+        'snatched' => 'tl_snatched',
+        'seeding'  => 'tl_seeding',
+        'leeching' => 'tl_leeching',
 
-    'freeleech'          => 'tl_free',
-    'neutral leech'      => 'tl_free tl_neutral',
-    'personal freeleech' => 'tl_free tl_personal',
+        'freeleech'          => 'tl_free',
+        'neutral leech'      => 'tl_free tl_neutral',
+        'personal freeleech' => 'tl_free tl_personal',
 
-    'reported'       => 'tl_reported',
-    'bad tags'       => 'tl_reported tl_bad_tags',
-    'bad folders'    => 'tl_reported tl_bad_folders',
-    'bad file names' => 'tl_reported tl_bad_file_names',
+        'reported'       => 'tl_reported',
+        'bad tags'       => 'tl_reported tl_bad_tags',
+        'bad folders'    => 'tl_reported tl_bad_folders',
+        'bad file names' => 'tl_reported tl_bad_file_names',
 
-    'uncensored' => 'tl_notice'
-  );
+        'uncensored' => 'tl_notice'
+    );
 
     /**
      * Shorten a string
@@ -82,36 +81,47 @@ class Format
         if ($Ratio < 0.1) {
             return 'r00';
         }
+
         if ($Ratio < 0.2) {
             return 'r01';
         }
+
         if ($Ratio < 0.3) {
             return 'r02';
         }
+
         if ($Ratio < 0.4) {
             return 'r03';
         }
+
         if ($Ratio < 0.5) {
             return 'r04';
         }
+
         if ($Ratio < 0.6) {
             return 'r05';
         }
+
         if ($Ratio < 0.7) {
             return 'r06';
         }
+
         if ($Ratio < 0.8) {
             return 'r07';
         }
+
         if ($Ratio < 0.9) {
             return 'r08';
         }
+
         if ($Ratio < 1) {
             return 'r09';
         }
+
         if ($Ratio < 2) {
             return 'r10';
         }
+
         if ($Ratio < 5) {
             return 'r20';
         }
@@ -133,9 +143,11 @@ class Format
         if ($Ratio === false) {
             return '&ndash;';
         }
+
         if ($Ratio === '∞') {
             return '<span class="tooltip r99" title="Infinite">∞</span>';
         }
+
         if ($Color) {
             $Ratio = sprintf(
                 '<span class="tooltip %s" title="%s">%s</span>',
@@ -144,7 +156,6 @@ class Format
                 $Ratio
             );
         }
-
         return $Ratio;
     }
 
@@ -160,6 +171,7 @@ class Format
         if ($Divisor === 0 && $Dividend === 0) {
             return false;
         }
+
         if ($Divisor === 0) {
             return '∞';
         }
@@ -180,9 +192,11 @@ class Format
             $Separator = $Escape ? '&amp;' : '&';
             $QueryItems = null;
             parse_str($_SERVER['QUERY_STRING'], $QueryItems);
+
             foreach ($Exclude as $Key) {
                 unset($QueryItems[$Key]);
             }
+
             if ($Sort) {
                 ksort($QueryItems);
             }
@@ -217,6 +231,7 @@ class Format
                 error(0);
             }
             $Page = $_GET['page'];
+
             if ($Page <= 0) {
                 $Page = 1;
             }
@@ -262,6 +277,7 @@ class Format
         $Location = "$Document.php";
         $StartPage = ceil($StartPage);
         $TotalPages = 0;
+
         if ($TotalRecords > 0) {
             $StartPage = min($StartPage, ceil($TotalRecords / $ItemsPerPage));
 
@@ -305,6 +321,7 @@ class Format
                     if ($i !== $StartPage) {
                         $Pages .= "<a href=\"$Location?page=$i$QueryString$Anchor\">";
                     }
+
                     $Pages .= '<strong>';
                     if ($i * $ItemsPerPage > $TotalRecords) {
                         $Pages .= ((($i - 1) * $ItemsPerPage) + 1)."-$TotalRecords";
@@ -316,6 +333,7 @@ class Format
                     if ($i !== $StartPage) {
                         $Pages .= '</a>';
                     }
+
                     if ($i < $StopPage) {
                         $Pages .= ' | ';
                     }
@@ -329,6 +347,7 @@ class Format
                 $Pages .= "<a href=\"$Location?page=$TotalPages$QueryString$Anchor\"><strong> Last »</strong></a>";
             }
         }
+
         if ($TotalPages > 1) {
             return $Pages;
         }
@@ -347,8 +366,10 @@ class Format
     {
         $Units = array('B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB');
         $Size = (double)$Size;
+
         for ($Steps = 0; abs($Size) >= 1024 && $Steps < count($Units); $Size /= 1024, $Steps++) {
         }
+
         if (func_num_args() === 1 && $Steps >= 4) {
             $Levels++;
         }
@@ -369,15 +390,15 @@ class Format
             $Number = $Number / 1000;
         }
         switch ($Steps) {
-      case 0: return round($Number); break;
-      case 1: return round($Number, 2).'k'; break;
-      case 2: return round($Number, 2).'M'; break;
-      case 3: return round($Number, 2).'G'; break;
-      case 4: return round($Number, 2).'T'; break;
-      case 5: return round($Number, 2).'P'; break;
-      default:
-        return round($Number, 2).'E + '.$Steps * 3;
-    }
+          case 0: return round($Number); break;
+          case 1: return round($Number, 2).'k'; break;
+          case 2: return round($Number, 2).'M'; break;
+          case 3: return round($Number, 2).'G'; break;
+          case 4: return round($Number, 2).'T'; break;
+          case 5: return round($Number, 2).'P'; break;
+          default:
+            return round($Number, 2).'E + '.$Steps * 3;
+        }
     }
 
     /**
@@ -393,13 +414,14 @@ class Format
         if (empty($Unit)) {
             return $Value ? round($Value) : 0;
         }
+
         switch (strtolower($Unit[0])) {
-      case 'k': return round($Value * 1024);
-      case 'm': return round($Value * 1048576);
-      case 'g': return round($Value * 1073741824);
-      case 't': return round($Value * 1099511627776);
-      default: return 0;
-    }
+          case 'k': return round($Value * 1024);
+          case 'm': return round($Value * 1048576);
+          case 'g': return round($Value * 1073741824);
+          case 't': return round($Value * 1099511627776);
+          default: return 0;
+        }
     }
 
     /**
@@ -447,6 +469,7 @@ class Format
         if (empty($Array)) {
             $Array = $_GET;
         }
+
         if (isset($Array[$Name]) && $Array[$Name] !== '') {
             if ($Array[$Name] === $Value) {
                 echo " $Attribute=\"$Attribute\"";
@@ -473,6 +496,7 @@ class Format
         if ($UserIDKey && isset($_REQUEST[$UserIDKey]) && G::$LoggedUser['ID'] != $_REQUEST[$UserIDKey]) {
             return '';
         }
+
         $Pass = true;
         if (!is_array($Tests)) {
             // Scalars are nice and easy
@@ -489,6 +513,7 @@ class Format
             // Loop to the end of the array or until we find a matching test
             foreach ($Tests as $Test) {
                 $Pass = true;
+
                 // If $Pass remains true after this test, it's a match
                 foreach ($Test as $Type => $Part) {
                     if (!isset($Target[$Type]) || $Target[$Type] !== $Part) {
@@ -496,14 +521,17 @@ class Format
                         break;
                     }
                 }
+
                 if ($Pass) {
                     break;
                 }
             }
         }
+
         if (!$Pass) {
             return '';
         }
+
         if ($AddAttribute) {
             return " class=\"$ClassName\"";
         }
@@ -522,12 +550,15 @@ class Format
             if (self::is_utf8($Str)) {
                 $Encoding = 'UTF-8';
             }
+
             if (empty($Encoding)) {
                 $Encoding = mb_detect_encoding($Str, 'UTF-8, ISO-8859-1');
             }
+
             if (empty($Encoding)) {
                 $Encoding = 'ISO-8859-1';
             }
+
             if ($Encoding === 'UTF-8') {
                 return $Str;
             } else {
@@ -592,6 +623,7 @@ class Format
         if (empty($Class)) {
             $Class = self::find_torrent_label_class($Text);
         }
+        
         return sprintf(
             '<strong class="torrent_label tooltip %1$s" title="%2$s" style="white-space: nowrap;">%2$s</strong>',
             display_str($Class),

classes/image.class.php

@@ -15,6 +15,7 @@ class IMAGE
     {
         $this->Image = imagecreate($Width, $Height);
         $this->Font = SERVER_ROOT.'/classes/fonts/VERDANA.TTF';
+
         if (function_exists('imageantialias')) {
             imageantialias($this->Image, true);
         }
@@ -27,21 +28,24 @@ class IMAGE
 
     public function line($x1, $y1, $x2, $y2, $Color, $Thickness = 1)
     {
-        if ($Thickness == 1) {
+        if ($Thickness === 1) {
             return imageline($this->Image, $x1, $y1, $x2, $y2, $Color);
         }
         $t = $Thickness / 2 - 0.5;
-        if ($x1 == $x2 || $y1 == $y2) {
+
+        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),
-    );
+            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);
     }

classes/irc.class.php

@@ -1,4 +1,5 @@
 <?php
+
 class IRC_DB extends DB_MYSQL
 {
     public function halt($Msg)
@@ -35,6 +36,7 @@ abstract class IRC_BOT
       if (isset($_SERVER['HOME']) && is_dir($_SERVER['HOME']) && getcwd() !== $_SERVER['HOME']) {
           chdir($_SERVER['HOME']);
       }
+
       ob_end_clean();
       restore_error_handler(); // Avoid PHP error logging
       set_time_limit(0);
@@ -56,11 +58,14 @@ abstract class IRC_BOT
         } else {
             $IrcAddress = 'tcp://' . BOT_SERVER . ':' . BOT_PORT;
         }
+
         while (!$this->Socket = stream_socket_client($IrcAddress, $ErrNr, $ErrStr)) {
             sleep(15);
         }
+
         stream_set_blocking($this->Socket, 0);
         $this->Connecting = false;
+
         if ($Reconnect) {
             $this->post_connect();
         }
@@ -147,6 +152,7 @@ abstract class IRC_BOT
         // This is used to prevent messages from getting truncated
         $Text = wordwrap($Text, 460, "\n", true);
         $TextArray = explode("\n", $Text);
+
         foreach ($TextArray as $Text) {
             $this->send_raw("PRIVMSG $Channel :$Text");
         }
@@ -181,12 +187,15 @@ abstract class IRC_BOT
     {
         G::$Cache->InternalCache = false;
         stream_set_timeout($this->Socket, 10000000000);
+
         while ($this->State === 1) {
             $NullSock = null;
             $Sockets = array($this->Socket, $this->ListenSocket);
+
             if (stream_select($Sockets, $NullSock, $NullSock, null) === false) {
                 die();
             }
+
             foreach ($Sockets as $Socket) {
                 if ($Socket === $this->Socket) {
                     $this->irc_events();
@@ -195,6 +204,7 @@ abstract class IRC_BOT
                     $this->listener_events();
                 }
             }
+            
             G::$DB->LinkID = false;
             G::$DB->Queries = [];
         }

classes/lockedaccounts.class.php

@@ -1,4 +1,4 @@
-<?
+<?php
 
 /**
  * Class to manage locked accounts
@@ -17,8 +17,7 @@ class LockedAccounts
      */
     public static function lock_account($UserID, $Type, $Message, $Reason, $LockedByUserID)
     {
-
-        if ($LockedByUserID == 0) {
+        if ($LockedByUserID === 0) {
             $Username = "System";
         } else {
             G::$DB->query("SELECT Username FROM users_main WHERE ID = '" . $LockedByUserID . "'");
@@ -26,8 +25,9 @@ class LockedAccounts
         }
 
         G::$DB->query("
-                INSERT INTO locked_accounts (UserID, Type)
-                VALUES ('" . $UserID . "', " . $Type . ")");
+        INSERT INTO locked_accounts (UserID, Type)
+          VALUES ('" . $UserID . "', " . $Type . ")");
+          
         Tools::update_user_notes($UserID, sqltime() . " - " . db_string($Message) . " by $Username\nReason: " . db_string($Reason) . "\n\n");
         G::$Cache->delete_value('user_info_' . $UserID);
     }
@@ -43,7 +43,7 @@ class LockedAccounts
      */
     public static function unlock_account($UserID, $Type, $Message, $Reason, $UnlockedByUserID)
     {
-        if ($UnlockedByUserID == 0) {
+        if ($UnlockedByUserID === 0) {
             $Username = "System";
         } else {
             G::$DB->query("SELECT Username FROM users_main WHERE ID = '" . $UnlockedByUserID . "'");
@@ -52,7 +52,7 @@ class LockedAccounts
 
         G::$DB->query("DELETE FROM locked_accounts WHERE UserID = '$UserID' AND Type = '". $Type ."'");
 
-        if (G::$DB->affected_rows() == 1) {
+        if (G::$DB->affected_rows() === 1) {
             G::$Cache->delete_value("user_info_" . $UserID);
             Tools::update_user_notes($UserID, sqltime() . " - " . db_string($Message) . " by $Username\nReason: " . db_string($Reason) . "\n\n");
         }

classes/mass_user_torrents_editor.class.php

@@ -13,49 +13,54 @@
  *
  * It could also be used for other types like collages.
  */
-abstract class MASS_USER_TORRENTS_EDITOR {
-  /**
-   * The affected DB table
-   * @var string $Table
-   */
-  protected $Table;
+abstract class MASS_USER_TORRENTS_EDITOR
+{
+    /**
+     * The affected DB table
+     * @var string $Table
+     */
+    protected $Table;
 
-  /**
-   * Set the Table
-   * @param string $Table
-   */
-  final public function set_table($Table) {
-    $this->Table = db_string($Table);
-  }
+    /**
+     * Set the Table
+     * @param string $Table
+     */
+    final public function set_table($Table)
+    {
+        $this->Table = db_string($Table);
+    }
 
-  /**
-   * Get the Table
-   * @return string $Table
-   */
-  final public function get_table() {
-    return $this->Table;
-  }
+    /**
+     * Get the Table
+     * @return string $Table
+     */
+    final public function get_table()
+    {
+        return $this->Table;
+    }
 
-  /**
-   * The extending class must provide a method to send a query and clear the cache
-   */
-  abstract protected function query_and_clear_cache($sql);
+    /**
+     * The extending class must provide a method to send a query and clear the cache
+     */
+    abstract protected function query_and_clear_cache($sql);
 
-  /**
-   * A method to insert many rows into a single table
-   * Not required in subsequent classes
-   */
-  public function mass_add() {}
+    /**
+     * A method to insert many rows into a single table
+     * Not required in subsequent classes
+     */
+    public function mass_add()
+    {
+    }
 
-  /**
-   * A method to remove many rows from a table
-   * The extending class must have a mass_remove method
-   */
-  abstract public function mass_remove();
+    /**
+     * A method to remove many rows from a table
+     * The extending class must have a mass_remove method
+     */
+    abstract public function mass_remove();
 
-  /**
-   * A method to update many rows in a table
-   * The extending class must have a mass_update method
-   */
-  abstract public function mass_update();
-}
+    /**
+     * A method to update many rows in a table
+     * The extending class must have a mass_update method
+     */
+    abstract public function mass_update();
+}

classes/sphinxqlresult.class.php

@@ -57,6 +57,7 @@ class SphinxqlResult
         while ($Row = $this->fetch_array()) {
             $Return[] = $Row[$Key];
         }
+
         $this->data_seek(0);
         return $Return;
     }
@@ -78,6 +79,7 @@ class SphinxqlResult
                 $Return[] = $Row;
             }
         }
+
         $this->data_seek(0);
         return $Return;
     }
@@ -95,6 +97,7 @@ class SphinxqlResult
         while ($Row = $this->fetch_array()) {
             $Return[$Row[$Key1]] = $Row[$Key2];
         }
+        
         $this->data_seek(0);
         return $Return;
     }

classes/subscriptions.class.php

@@ -1,43 +1,46 @@
-<?
-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 +48,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 +213,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 +225,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 +252,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/textarea_preview.class.php

@@ -43,6 +43,7 @@ class TEXTAREA_PREVIEW_SUPER
         if (self::$Textareas === 0) {
             return;
         }
+
         if (self::$Exectuted === false && $all) {
             View::parse('generic/textarea/script.phtml');
         }
@@ -70,6 +71,7 @@ class TEXTAREA_PREVIEW_SUPER
             }
             $script[] = sprintf('[%s]', $a);
         }
+
         if (!empty($script)) {
             View::parse('generic/textarea/script_factory.phtml', array('script' => join(', ', $script)));
         }
@@ -155,16 +157,16 @@ class TEXTAREA_PREVIEW extends TEXTAREA_PREVIEW_SUPER
      * It's important to have the right IDs as they make the JS function properly.
      */
     public function __construct(
-      $Name,
-      $ID = '',
-      $Value = '',
-      $Cols = 50,
-      $Rows = 10,
-      $Preview = true,
-      $Buttons = true,
-      $Buffer = false,
-      array $ExtraAttributes = []
-  ) {
+        $Name,
+        $ID = '',
+        $Value = '',
+        $Cols = 50,
+        $Rows = 10,
+        $Preview = true,
+        $Buttons = true,
+        $Buffer = false,
+        array $ExtraAttributes = []
+    ) {
         $this->id = parent::$Textareas;
         parent::$Textareas += 1;
         array_push(parent::$_ID, $ID);
@@ -184,14 +186,14 @@ class TEXTAREA_PREVIEW extends TEXTAREA_PREVIEW_SUPER
         }
 
         $this->buffer = View::parse('generic/textarea/textarea.phtml', array(
-      'ID' => $ID,
-      'NID' => $this->id,
-      'Name' => &$Name,
-      'Value' => &$Value,
-      'Cols' => &$Cols,
-      'Rows' => &$Rows,
-      'Attributes' => &$Attributes
-    ), $Buffer);
+            'ID' => $ID,
+            'NID' => $this->id,
+            'Name' => &$Name,
+            'Value' => &$Value,
+            'Cols' => &$Cols,
+            'Rows' => &$Rows,
+            'Attributes' => &$Attributes
+        ), $Buffer);
 
         if ($Buttons === true) {
             $this->buttons();

classes/top10view.class.php

@@ -5,7 +5,6 @@ class Top10View
     public static function render_linkbox($Selected)
     {
         ?>
-
 <div class="linkbox">
   <a href="top10.php?type=torrents" class="brackets"><?=self::get_selected_link("Torrents", $Selected === "torrents")?></a>
   <a href="top10.php?type=users" class="brackets"><?=self::get_selected_link("Users", $Selected === "users")?></a>
@@ -14,7 +13,6 @@ class Top10View
   <a href="top10.php?type=donors" class="brackets"><?=self::get_selected_link("Donors", $Selected === "donors")?></a>
   <?php } ?>
 </div>
-
 <?php
     }
 
@@ -45,7 +43,6 @@ class Top10View
     {
         if (!empty($Image)) {
             $Name = display_str($Name); ?>
-
 <li>
   <a
     href="<?=$Url?><?=$Name?>">

classes/torrent_32bit.class.php

@@ -1,4 +1,7 @@
-<?
+<?php
+
+# todo: Replace this with https://github.com/OPSnet/bencode-torrent
+
 /*******************************************************************************
 |~~~~ Gazelle bencode parser                                               ~~~~|
 --------------------------------------------------------------------------------
@@ -72,248 +75,257 @@ coded up in around 4 minutes for STC when we discovered this problem, then
 discovered that floats aren't accurate enough to use. :(
 
 *******************************************************************************/
-class BENCODE2 {
-  var $Val; // Decoded array
-  var $Pos = 1; // Pointer that indicates our position in the string
-  var $Str = ''; // Torrent string
-
-  function __construct($Val, $IsParsed = false) {
-    if (!$IsParsed) {
-      $this->Str = $Val;
-      $this->dec();
-    } else {
-      $this->Val = $Val;
-    }
-  }
-
-  // Decode an element based on the type
-  function decode($Type, $Key) {
-    if (ctype_digit($Type)) { // Element is a string
-      // Get length of string
-      $StrLen = $Type;
-      while ($this->Str[$this->Pos + 1] != ':') {
-        $this->Pos++;
-        $StrLen.=$this->Str[$this->Pos];
+class BENCODE2
+{
+    public $Val; // Decoded array
+  public $Pos = 1; // Pointer that indicates our position in the string
+  public $Str = ''; // Torrent string
+
+  public function __construct($Val, $IsParsed = false)
+  {
+      if (!$IsParsed) {
+          $this->Str = $Val;
+          $this->dec();
+      } else {
+          $this->Val = $Val;
       }
-      $this->Val[$Key] = substr($this->Str, $this->Pos + 2, $StrLen);
-
-      $this->Pos += $StrLen;
-      $this->Pos += 2;
-
-    } elseif ($Type == 'i') { // Element is an int
-      $this->Pos++;
-
-      // Find end of integer (first occurance of 'e' after position)
-      $End = strpos($this->Str, 'e', $this->Pos);
-
-      // Get the integer, and mark it as an int (on our version 64 bit box, we cast it to an int)
-      $this->Val[$Key] = '[*INT*]'.substr($this->Str, $this->Pos, $End-$this->Pos);
-      $this->Pos = $End + 1;
-
-    } elseif ($Type == 'l') { // Element is a list
-      $this->Val[$Key] = new BENCODE_LIST(substr($this->Str, $this->Pos));
-      $this->Pos += $this->Val[$Key]->Pos;
-
-    } elseif ($Type == 'd') { // Element is a dictionary
-      $this->Val[$Key] = new BENCODE_DICT(substr($this->Str, $this->Pos));
-      $this->Pos += $this->Val[$Key]->Pos;
-      // Sort by key to respect spec
-      ksort($this->Val[$Key]->Val);
+  }
 
-    } else {
-      die('Invalid torrent file');
+    // Decode an element based on the type
+    public function decode($Type, $Key)
+    {
+        if (ctype_digit($Type)) { // Element is a string
+            // Get length of string
+            $StrLen = $Type;
+            while ($this->Str[$this->Pos + 1] != ':') {
+                $this->Pos++;
+                $StrLen.=$this->Str[$this->Pos];
+            }
+            $this->Val[$Key] = substr($this->Str, $this->Pos + 2, $StrLen);
+
+            $this->Pos += $StrLen;
+            $this->Pos += 2;
+        } elseif ($Type == 'i') { // Element is an int
+            $this->Pos++;
+
+            // Find end of integer (first occurance of 'e' after position)
+            $End = strpos($this->Str, 'e', $this->Pos);
+
+            // Get the integer, and mark it as an int (on our version 64 bit box, we cast it to an int)
+            $this->Val[$Key] = '[*INT*]'.substr($this->Str, $this->Pos, $End-$this->Pos);
+            $this->Pos = $End + 1;
+        } elseif ($Type == 'l') { // Element is a list
+            $this->Val[$Key] = new BENCODE_LIST(substr($this->Str, $this->Pos));
+            $this->Pos += $this->Val[$Key]->Pos;
+        } elseif ($Type == 'd') { // Element is a dictionary
+            $this->Val[$Key] = new BENCODE_DICT(substr($this->Str, $this->Pos));
+            $this->Pos += $this->Val[$Key]->Pos;
+            // Sort by key to respect spec
+            ksort($this->Val[$Key]->Val);
+        } else {
+            die('Invalid torrent file');
+        }
     }
-  }
 
-  function encode($Val) {
-    if (is_string($Val)) {
-      if (substr($Val, 0, 7) == '[*INT*]') {
-        return 'i'.substr($Val,7).'e';
-      } else {
-        return strlen($Val).':'.$Val;
-      }
-    } elseif (is_object($Val)) {
-      return $Val->enc();
-    } else {
-      return 'fail';
+    public function encode($Val)
+    {
+        if (is_string($Val)) {
+            if (substr($Val, 0, 7) == '[*INT*]') {
+                return 'i'.substr($Val, 7).'e';
+            } else {
+                return strlen($Val).':'.$Val;
+            }
+        } elseif (is_object($Val)) {
+            return $Val->enc();
+        } else {
+            return 'fail';
+        }
     }
-  }
 }
 
-class BENCODE_LIST extends BENCODE2 {
-  function enc() {
-    $Str = 'l';
-    foreach ($this->Val as $Value) {
-      $Str.=$this->encode($Value);
+class BENCODE_LIST extends BENCODE2
+{
+    public function enc()
+    {
+        $Str = 'l';
+        foreach ($this->Val as $Value) {
+            $Str.=$this->encode($Value);
+        }
+        return $Str.'e';
     }
-    return $Str.'e';
-  }
 
-  // Decode a list
-  function dec() {
-    $Key = 0; // Array index
-    $Length = strlen($this->Str);
-    while ($this->Pos<$Length) {
-      $Type = $this->Str[$this->Pos];
-      // $Type now indicates what type of element we're dealing with
-      // It's either an integer (string), 'i' (an integer), 'l' (a list), 'd' (a dictionary), or 'e' (end of dictionary/list)
-
-      if ($Type == 'e') { // End of list
-        $this->Pos += 1;
-        unset($this->Str); // Since we're finished parsing the string, we don't need to store it anymore. Benchmarked - this makes the parser run way faster.
-        return;
-      }
-
-      // Decode the bencoded element.
-      // This function changes $this->Pos and $this->Val, so you don't have to.
-      $this->decode($Type, $Key);
-      ++ $Key;
+    // Decode a list
+    public function dec()
+    {
+        $Key = 0; // Array index
+        $Length = strlen($this->Str);
+        while ($this->Pos<$Length) {
+            $Type = $this->Str[$this->Pos];
+            // $Type now indicates what type of element we're dealing with
+            // It's either an integer (string), 'i' (an integer), 'l' (a list), 'd' (a dictionary), or 'e' (end of dictionary/list)
+
+            if ($Type == 'e') { // End of list
+                $this->Pos += 1;
+                unset($this->Str); // Since we're finished parsing the string, we don't need to store it anymore. Benchmarked - this makes the parser run way faster.
+                return;
+            }
+
+            // Decode the bencoded element.
+            // This function changes $this->Pos and $this->Val, so you don't have to.
+            $this->decode($Type, $Key);
+            ++ $Key;
+        }
+        return true;
     }
-    return true;
-  }
 }
 
-class BENCODE_DICT extends BENCODE2 {
-  function enc() {
-    $Str = 'd';
-    foreach ($this->Val as $Key => $Value) {
-      $Str.=strlen($Key).':'.$Key.$this->encode($Value);
+class BENCODE_DICT extends BENCODE2
+{
+    public function enc()
+    {
+        $Str = 'd';
+        foreach ($this->Val as $Key => $Value) {
+            $Str.=strlen($Key).':'.$Key.$this->encode($Value);
+        }
+        return $Str.'e';
     }
-    return $Str.'e';
-  }
-
-  // Decode a dictionary
-  function dec() {
-    $Length = strlen($this->Str);
-    while ($this->Pos < $Length) {
-
-      if ($this->Str[$this->Pos] == 'e') { // End of dictionary
-        $this->Pos += 1;
-        unset($this->Str); // Since we're finished parsing the string, we don't need to store it anymore. Benchmarked - this makes the parser run way faster.
-        return;
-      }
-
-      // Get the dictionary key
-      // Length of the key, in bytes
-      $KeyLen = $this->Str[$this->Pos];
-
-      // Allow for multi-digit lengths
-      while ($this->Str[$this->Pos + 1] != ':' && $this->Pos + 1 < $Length) {
-        $this->Pos++;
-        $KeyLen.=$this->Str[$this->Pos];
-      }
-      // $this->Pos is now on the last letter of the key length
-      // Adding 2 brings it past that character and the ':' to the beginning of the string
-      $this->Pos+=2;
-
-      // Get the name of the key
-      $Key = substr($this->Str, $this->Pos, $KeyLen);
-
-      // Move the position past the key to the beginning of the element
-      $this->Pos += $KeyLen;
-      $Type = $this->Str[$this->Pos];
-      // $Type now indicates what type of element we're dealing with
-      // It's either an integer (string), 'i' (an integer), 'l' (a list), 'd' (a dictionary), or 'e' (end of dictionary/list)
-
-      // Decode the bencoded element.
-      // This function changes $this->Pos and $this->Val, so you don't have to.
-      $this->decode($Type, $Key);
-
 
+    // Decode a dictionary
+    public function dec()
+    {
+        $Length = strlen($this->Str);
+        while ($this->Pos < $Length) {
+            if ($this->Str[$this->Pos] == 'e') { // End of dictionary
+                $this->Pos += 1;
+                unset($this->Str); // Since we're finished parsing the string, we don't need to store it anymore. Benchmarked - this makes the parser run way faster.
+                return;
+            }
+
+            // Get the dictionary key
+            // Length of the key, in bytes
+            $KeyLen = $this->Str[$this->Pos];
+
+            // Allow for multi-digit lengths
+            while ($this->Str[$this->Pos + 1] != ':' && $this->Pos + 1 < $Length) {
+                $this->Pos++;
+                $KeyLen.=$this->Str[$this->Pos];
+            }
+            // $this->Pos is now on the last letter of the key length
+            // Adding 2 brings it past that character and the ':' to the beginning of the string
+            $this->Pos+=2;
+
+            // Get the name of the key
+            $Key = substr($this->Str, $this->Pos, $KeyLen);
+
+            // Move the position past the key to the beginning of the element
+            $this->Pos += $KeyLen;
+            $Type = $this->Str[$this->Pos];
+            // $Type now indicates what type of element we're dealing with
+            // It's either an integer (string), 'i' (an integer), 'l' (a list), 'd' (a dictionary), or 'e' (end of dictionary/list)
+
+            // Decode the bencoded element.
+            // This function changes $this->Pos and $this->Val, so you don't have to.
+            $this->decode($Type, $Key);
+        }
+        return true;
     }
-    return true;
-  }
 }
 
 
-class TORRENT extends BENCODE_DICT {
-  function dump() {
-    // Convenience function used for testing and figuring out how we store the data
-    print_r($this->Val);
-  }
-
-  function dump_data() {
-    // Function which serializes $this->Val for storage
-    return base64_encode(serialize($this->Val));
-  }
+class TORRENT extends BENCODE_DICT
+{
+    public function dump()
+    {
+        // Convenience function used for testing and figuring out how we store the data
+        print_r($this->Val);
+    }
 
-  function set_announce_url($Announce) {
-    $this->Val['announce'] = $Announce;
-    ksort($this->Val);
-  }
+    public function dump_data()
+    {
+        // Function which serializes $this->Val for storage
+        return base64_encode(serialize($this->Val));
+    }
 
-  // Returns an array of:
-  //  * the files in the torrent
-  //  * the total size of files described therein
-  function file_list() {
-    $FileList = [];
-    if (!isset($this->Val['info']->Val['files'])) { // Single file mode
-      $TotalSize = substr($this->Val['info']->Val['length'],7);
-      $FileList[] = array($TotalSize, $this->get_name());
-    } else { // Multiple file mode
-      $FileNames = [];
-      $FileSizes = [];
-      $TotalSize = 0;
-      $Files = $this->Val['info']->Val['files']->Val;
-      if (isset($Files[0]->Val['path.utf-8'])) {
-        $PathKey = 'path.utf-8';
-      } else {
-        $PathKey = 'path';
-      }
-      foreach ($Files as $File) {
-        $FileSize = substr($File->Val['length'], 7);
-        $TotalSize += $FileSize;
+    public function set_announce_url($Announce)
+    {
+        $this->Val['announce'] = $Announce;
+        ksort($this->Val);
+    }
 
-        $FileName = ltrim(implode('/', $File->Val[$PathKey]->Val), '/');
-        $FileSizes[] = $FileSize;
-        $FileNames[] = $FileName;
-      }
-      natcasesort($FileNames);
-      foreach ($FileNames as $Index => $FileName) {
-        $FileList[] = array($FileSizes[$Index], $FileName);
-      }
+    // Returns an array of:
+    //  * the files in the torrent
+    //  * the total size of files described therein
+    public function file_list()
+    {
+        $FileList = [];
+        if (!isset($this->Val['info']->Val['files'])) { // Single file mode
+            $TotalSize = substr($this->Val['info']->Val['length'], 7);
+            $FileList[] = array($TotalSize, $this->get_name());
+        } else { // Multiple file mode
+            $FileNames = [];
+            $FileSizes = [];
+            $TotalSize = 0;
+            $Files = $this->Val['info']->Val['files']->Val;
+            if (isset($Files[0]->Val['path.utf-8'])) {
+                $PathKey = 'path.utf-8';
+            } else {
+                $PathKey = 'path';
+            }
+            foreach ($Files as $File) {
+                $FileSize = substr($File->Val['length'], 7);
+                $TotalSize += $FileSize;
+
+                $FileName = ltrim(implode('/', $File->Val[$PathKey]->Val), '/');
+                $FileSizes[] = $FileSize;
+                $FileNames[] = $FileName;
+            }
+            natcasesort($FileNames);
+            foreach ($FileNames as $Index => $FileName) {
+                $FileList[] = array($FileSizes[$Index], $FileName);
+            }
+        }
+        return array($TotalSize, $FileList);
     }
-    return array($TotalSize, $FileList);
-  }
 
-  function get_name() {
-    if (isset($this->Val['info']->Val['name.utf-8'])) {
-      return $this->Val['info']->Val['name.utf-8'];
-    } else {
-      return $this->Val['info']->Val['name'];
+    public function get_name()
+    {
+        if (isset($this->Val['info']->Val['name.utf-8'])) {
+            return $this->Val['info']->Val['name.utf-8'];
+        } else {
+            return $this->Val['info']->Val['name'];
+        }
     }
-  }
 
-  function make_private() {
-    //----- The following properties do not affect the infohash:
+    public function make_private()
+    {
+        //----- The following properties do not affect the infohash:
 
-    // anounce-list is an unofficial extension to the protocol
-    // that allows for multiple trackers per torrent
-    unset($this->Val['announce-list']);
+        // anounce-list is an unofficial extension to the protocol
+        // that allows for multiple trackers per torrent
+        unset($this->Val['announce-list']);
 
-    // Bitcomet & Azureus cache peers in here
-    unset($this->Val['nodes']);
+        // Bitcomet & Azureus cache peers in here
+        unset($this->Val['nodes']);
 
-    // Azureus stores the dht_backup_enable flag here
-    unset($this->Val['azureus_properties']);
+        // Azureus stores the dht_backup_enable flag here
+        unset($this->Val['azureus_properties']);
 
-    // Remove web-seeds
-    unset($this->Val['url-list']);
+        // Remove web-seeds
+        unset($this->Val['url-list']);
 
-    // Remove libtorrent resume info
-    unset($this->Val['libtorrent_resume']);
+        // Remove libtorrent resume info
+        unset($this->Val['libtorrent_resume']);
 
-    //----- End properties that do not affect the infohash
+        //----- End properties that do not affect the infohash
 
-    if (!empty($this->Val['info']->Val['private']) && $this->Val['info']->Val['private'] == '[*INT*]1') {
-      return true;
-    } else {
-      // Torrent is not private!
-      // add private tracker flag and sort info dictionary
-      $this->Val['info']->Val['private'] = '[*INT*]1';
-      ksort($this->Val['info']->Val);
-      return false;
+        if (!empty($this->Val['info']->Val['private']) && $this->Val['info']->Val['private'] == '[*INT*]1') {
+            return true;
+        } else {
+            // Torrent is not private!
+            // add private tracker flag and sort info dictionary
+            $this->Val['info']->Val['private'] = '[*INT*]1';
+            ksort($this->Val['info']->Val);
+            return false;
+        }
     }
-  }
 }
-?>

classes/useragent.class.php

@@ -3,7 +3,7 @@
 class UserAgent
 {
     private static $Browsers = array(
-    //Less popular
+    // Less popular
     'Shiira'     => 'Shiira',
     'Songbird'   => 'Songbird',
     'SeaMonkey'  => 'SeaMonkey',
@@ -18,25 +18,25 @@ class UserAgent
     'libcurl'    => 'cURL',
     'midori'     => 'Midori',
     'Blackberry' => 'BlackBerry Browser',
-    //Big names
+    // Big names
     'Firefox' => 'Firefox',
     'OPR'     => 'Opera Blink', # Opera 15+ (the version running Blink)
     'Opera'   => 'Opera',
     'Chrome'  => 'Chrome',
     'Safari'  => 'Safari',
-    //Put Chrome Frame above IE
+    // Put Chrome Frame above IE
     'chromeframe' => 'Chrome Frame',
     'x-clock'     => 'Chrome Frame',
     'MSIE'        => 'Internet Explorer',
     'Trident'     => 'Internet Explorer',
-    //Firefox versions
+    // Firefox versions
     'Shiretoko'    => 'Firefox (Experimental)',
     'Minefield'    => 'Firefox (Experimental)',
     'GranParadiso' => 'Firefox (Experimental)',
     'Namoroka'     => 'Firefox (Experimental)',
     'AppleWebKit'  => 'WebKit',
     'Mozilla'      => 'Mozilla'
-    //Weird shit
+    // Weird shit
     /*
     'WWW-Mechanize' => 'Perl',
     'Wget'          => 'Wget',
@@ -48,7 +48,7 @@ class UserAgent
   );
 
     private static $OperatingSystems = array(
-    //Mobile
+    // Mobile
     'SymbianOS'    => 'Symbian',
     'blackberry'   => 'BlackBerry',
     'iphone'       => 'iPhone',
@@ -58,7 +58,7 @@ class UserAgent
     'mot-razr'     => 'Motorola Razr',
   //'tablet PC'    => 'Windows RT',
   //'ARM; Trident' => 'Windows RT',
-    //Windows
+    // Windows
     'Windows NT 10.0' => 'Windows 10',
     'Windows NT 6.4'  => 'Windows 10',
     'Windows NT 6.3'  => 'Windows 8.1',
@@ -88,11 +88,11 @@ class UserAgent
     'win16'           => 'Windows 3.1',
   //'windows'         => 'Windows',
     'cros'            => 'Chrome OS',
-    //OS X
+    // OS X
     'os x'      => 'Mac OS X',
     'macintosh' => 'Mac OS X',
     'darwin'    => 'Mac OS X',
-    //Less popular
+    // Less popular
     'ubuntu'  => 'Ubuntu',
     'debian'  => 'Debian',
     'fedora'  => 'Fedora',
@@ -105,7 +105,7 @@ class UserAgent
     'unix'    => 'Unix',
     'Sun OS'  => 'Sun',
     'Sun'     => 'Sun',
-    //Weird shit
+    // Weird shit
     /*
     'WWW-Mechanize' => 'Perl',
     'Wget'          => 'Wget',
@@ -114,7 +114,7 @@ class UserAgent
     'Java'          => 'Java',
     'RSS'           => 'RSS Downloader',
     */
-    //Catch-all
+    // Catch-all
     'win' => 'Windows',
     'mac' => 'Mac OS X'
   );
@@ -124,6 +124,7 @@ class UserAgent
         if (empty($UserAgentString)) {
             return 'Hidden';
         }
+
         foreach (self::$OperatingSystems as $String => $OperatingSystem) {
             if (stripos($UserAgentString, $String) !== false) {
                 return $OperatingSystem;
@@ -150,6 +151,7 @@ class UserAgent
         if (empty($UserAgentString)) {
             return 'Hidden';
         }
+
         $Return = 'Unknown';
         foreach (self::$Browsers as $String => $Browser) {
             if (strpos($UserAgentString, $String) !== false) {
@@ -157,6 +159,7 @@ class UserAgent
                 break;
             }
         }
+        
         if (self::mobile($UserAgentString)) {
             $Return .= ' Mobile';
         }