Empty commit

.gitignore

@@ -1,3 +1,4 @@
 _packages/**/.git/**
 classes/config.php
 .DS_Store
+*.sw*

ajax.php

@@ -1,2 +1,3 @@
 <?php
-require('classes/script_start.php');
+
+require 'classes/script_start.php';

artist.php

@@ -1,3 +1,4 @@
 <?php
+
 define('ERROR_EXCEPTION', true);
-require('classes/script_start.php');
+require 'classes/script_start.php';

better.php

@@ -1,3 +1,4 @@
 <?php
+
 define('ERROR_EXCEPTION', true);
-require('classes/script_start.php');
+require 'classes/script_start.php';

blog.php

@@ -1,2 +1,3 @@
 <?php
-require('classes/script_start.php');
+
+require 'classes/script_start.php';

bookmarks.php

@@ -1,3 +1,4 @@
 <?php
+
 define('ERROR_EXCEPTION', true);
-require('classes/script_start.php');
+require 'classes/script_start.php';

browse.php

@@ -1,2 +1,3 @@
 <?php
+
 header('Location: torrents.php');

chat.php

@@ -1,2 +1,3 @@
 <?php
-require('classes/script_start.php');
+
+require 'classes/script_start.php';

classes/feed.class.php

@@ -1,4 +1,5 @@
 <?php
+
 class Feed
 {
     public function open_feed()
@@ -25,12 +26,14 @@ class Feed
     }
 
     public function item($Title, $Description, $Page, $Creator, $Comments = '', $Category = '', $Date = '')
-    { // Escape with CDATA, otherwise the feed breaks.
+    {
+        // Escape with CDATA, otherwise the feed breaks.
         if ($Date === '') {
             $Date = date('r');
         } else {
             $Date = date('r', strtotime($Date));
         }
+
         $Site = site_url();
         $Item = "\t\t<item>\n";
         $Item .= "\t\t\t<title><![CDATA[$Title]]></title>\n";
@@ -38,12 +41,15 @@ class Feed
         $Item .= "\t\t\t<pubDate>$Date</pubDate>\n";
         $Item .= "\t\t\t<link>$Site$Page</link>\n";
         $Item .= "\t\t\t<guid>$Site$Page</guid>\n";
+
         if ($Comments !== '') {
             $Item .= "\t\t\t<comments>$Site$Comments</comments>\n";
         }
+
         if ($Category !== '') {
             $Item .= "\t\t\t<category><![CDATA[$Category]]></category>\n";
         }
+
         $Item .= "\t\t\t<dc:creator>$Creator</dc:creator>\n\t\t</item>\n";
         return $Item;
     }
@@ -52,6 +58,7 @@ class Feed
     {
         global $Cache;
         $Entries = $Cache->get_value($CacheKey);
+
         if (!$Entries) {
             $Entries = [];
         } else {
@@ -65,6 +72,7 @@ class Feed
     {
         global $Cache;
         $Entries = $Cache->get_value($CacheKey, true);
+
         if (!$Entries) {
             $Entries = [];
         } else {
@@ -72,6 +80,7 @@ class Feed
                 array_pop($Entries);
             }
         }
+        
         array_unshift($Entries, $Item);
         $Cache->cache_value($CacheKey, $Entries, 0); // inf cache
     }

classes/notificationsmanagerview.class.php

@@ -1,114 +1,122 @@
-<?
+<?php
 
-class NotificationsManagerView {
-  private static $Settings;
+class NotificationsManagerView
+{
+    private static $Settings;
 
-  public static function load_js() {
-    $JSIncludes = array(
-      'noty/noty.js',
-      'noty/layouts/bottomRight.js',
-      'noty/themes/default.js',
-      'user_notifications.js');
-    foreach ($JSIncludes as $JSInclude) {
-      $Path = STATIC_SERVER."functions/$JSInclude";
-?>
-  <script src="<?=$Path?>?v=<?=filemtime(SERVER_ROOT."/$Path")?>" type="text/javascript"></script>
-<?
-    }
-  }
-
-  public static function render_settings($Settings) {
-    self::$Settings = $Settings;
-?>
-    <tr>
-      <td class="label">
-        <strong>News announcements</strong>
-      </td>
-      <td>
-<?        self::render_checkbox(NotificationsManager::NEWS); ?>
-      </td>
-    </tr>
-    <tr>
-      <td class="label">
-        <strong>Blog announcements</strong>
-      </td>
-      <td>
-<?        self::render_checkbox(NotificationsManager::BLOG); ?>
-      </td>
-    </tr>
-    <tr>
-      <td class="label">
-        <strong>Inbox messages</strong>
-      </td>
-      <td>
-<?        self::render_checkbox(NotificationsManager::INBOX, true); ?>
-      </td>
-    </tr>
-    <tr>
-      <td class="label tooltip" title="Enabling this will give you a notification when you receive a new private message from a member of the <?=SITE_NAME?> staff.">
-        <strong>Staff messages</strong>
-      </td>
-      <td>
-<?        self::render_checkbox(NotificationsManager::STAFFPM, false, false); ?>
-      </td>
-    </tr>
-    <tr>
-      <td class="label">
-        <strong>Thread subscriptions</strong>
-      </td>
-      <td>
-<?        self::render_checkbox(NotificationsManager::SUBSCRIPTIONS, false, false); ?>
-      </td>
-    </tr>
-    <tr>
-      <td class="label tooltip" title="Enabling this will give you a notification whenever someone quotes you in the forums.">
-        <strong>Quote notifications</strong>
-      </td>
-      <td>
-<?        self::render_checkbox(NotificationsManager::QUOTES); ?>
-      </td>
-    </tr>
-<?    if (check_perms('site_torrents_notify')) { ?>
-      <tr>
-        <td class="label tooltip" title="Enabling this will give you a notification when the torrent notification filters you have established are triggered.">
-          <strong>Torrent notifications</strong>
-        </td>
-        <td>
-<?          self::render_checkbox(NotificationsManager::TORRENTS, true, false); ?>
-        </td>
-      </tr>
-<?    } ?>
+    public static function load_js()
+    {
+        $JSIncludes = array(
+            'noty/noty.js',
+            'noty/layouts/bottomRight.js',
+            'noty/themes/default.js',
+            'user_notifications.js');
 
-    <tr>
-      <td class="label tooltip" title="Enabling this will give you a notification when a torrent is added to a collage you are subscribed to.">
-        <strong>Collage subscriptions</strong>
-      </td>
-      <td>
-<?        self::render_checkbox(NotificationsManager::COLLAGES. false, false); ?>
-      </td>
-    </tr>
-<?  }
+        foreach ($JSIncludes as $JSInclude) {
+            $Path = STATIC_SERVER."functions/$JSInclude"; ?>
+<script
+  src="<?=$Path?>?v=<?=filemtime(SERVER_ROOT."/$Path")?>"
+  type="text/javascript"></script>
+<?php
+        }
+    }
 
-  private static function render_checkbox($Name, $Traditional = false) {
-    $Checked = self::$Settings[$Name];
-    $PopupChecked = $Checked == NotificationsManager::OPT_POPUP || !isset($Checked) ? ' checked="checked"' : '';
-    $TraditionalChecked = $Checked == NotificationsManager::OPT_TRADITIONAL ? ' checked="checked"' : '';
+    public static function render_settings($Settings)
+    {
+        self::$Settings = $Settings; ?>
+<tr>
+  <td class="label">
+    <strong>News Announcements</strong>
+  </td>
+  <td>
+    <?php self::render_checkbox(NotificationsManager::NEWS); ?>
+  </td>
+</tr>
+<tr>
+  <td class="label">
+    <strong>Blog Announcements</strong>
+  </td>
+  <td>
+    <?php self::render_checkbox(NotificationsManager::BLOG); ?>
+  </td>
+</tr>
+<tr>
+  <td class="label">
+    <strong>Inbox Messages</strong>
+  </td>
+  <td>
+    <?php self::render_checkbox(NotificationsManager::INBOX, true); ?>
+  </td>
+</tr>
+<tr>
+  <td class="label tooltip"
+    title="Notify when you receive a new private message from <?=SITE_NAME?> staff">
+    <strong>Staff Messages</strong>
+  </td>
+  <td>
+    <?php self::render_checkbox(NotificationsManager::STAFFPM, false, false); ?>
+  </td>
+</tr>
+<tr>
+  <td class="label">
+    <strong>Thread Subscriptions</strong>
+  </td>
+  <td>
+    <?php self::render_checkbox(NotificationsManager::SUBSCRIPTIONS, false, false); ?>
+  </td>
+</tr>
+<tr>
+  <td class="label tooltip" title="Notify whenever someone quotes you in the forums">
+    <strong>Quote Notifications</strong>
+  </td>
+  <td>
+    <?php self::render_checkbox(NotificationsManager::QUOTES); ?>
+  </td>
+</tr>
+<?php if (check_perms('site_torrents_notify')) { ?>
+<tr>
+  <td class="label tooltip" title="Notify when your torrent notification filters are triggered">
+    <strong>Torrent Notifications</strong>
+  </td>
+  <td>
+    <?php self::render_checkbox(NotificationsManager::TORRENTS, true, false); ?>
+  </td>
+</tr>
+<?php } ?>
 
-?>
-    <label>
-      <input type="checkbox" name="notifications_<?=$Name?>_popup" id="notifications_<?=$Name?>_popup"<?=$PopupChecked?> />
-      Pop-up
-    </label>
-<?    if ($Traditional) { ?>
-    <label>
-      <input type="checkbox" name="notifications_<?=$Name?>_traditional" id="notifications_<?=$Name?>_traditional"<?=$TraditionalChecked?> />
-      Traditional
-    </label>
-<?    }
-  }
+<tr>
+  <td class="label tooltip" title="Notify when a torrent is added to a subscribed collage">
+    <strong>Collage Subscriptions</strong>
+  </td>
+  <td>
+    <?php self::render_checkbox(NotificationsManager::COLLAGES. false, false); ?>
+  </td>
+</tr>
+<?php
+    }
 
-  public static function format_traditional($Contents) {
-    return "<a href=\"$Contents[url]\">$Contents[message]</a>";
-  }
+    private static function render_checkbox($Name, $Traditional = false)
+    {
+        $Checked = self::$Settings[$Name];
+        $PopupChecked = $Checked === NotificationsManager::OPT_POPUP || !isset($Checked) ? ' checked="checked"' : '';
+        $TraditionalChecked = $Checked === NotificationsManager::OPT_TRADITIONAL ? ' checked="checked"' : ''; ?>
+<label>
+  <input type="checkbox" name="notifications_<?=$Name?>_popup"
+    id="notifications_<?=$Name?>_popup" <?=$PopupChecked?> />
+  Pop-up
+</label>
+<?php if ($Traditional) { ?>
+<label>
+  <input type="checkbox" name="notifications_<?=$Name?>_traditional"
+    id="notifications_<?=$Name?>_traditional" <?=$TraditionalChecked?> />
+  Traditional
+</label>
+<?php
+      }
+    }
 
+    public static function format_traditional($Contents)
+    {
+        return "<a href=\"$Contents[url]\">$Contents[message]</a>";
+    }
 }

collage.php

@@ -1,4 +1,5 @@
 <?php
+
 $_SERVER['SCRIPT_FILENAME'] = 'collages.php'; // CLI fix
 define('ERROR_EXCEPTION', true);
-require('classes/script_start.php');
+require 'classes/script_start.php';

collages.php

@@ -1,3 +1,4 @@
 <?php
+
 define('ERROR_EXCEPTION', true);
-require('classes/script_start.php');
+require 'classes/script_start.php';

comments.php

@@ -1,3 +1,4 @@
 <?php
+
 define('ERROR_EXCEPTION', true);
-require('classes/script_start.php');
+require 'classes/script_start.php';

contest.php

@@ -1,3 +1,4 @@
 <?php
+
 define('ERROR_EXCEPTION', true);
-require('classes/script_start.php');
+require 'classes/script_start.php';

delete.php

@@ -1,2 +1,3 @@
 <?php
-require('classes/script_start.php');
+
+require 'classes/script_start.php';

donate.php

@@ -1,2 +1,3 @@
 <?php
-require('classes/script_start.php');
+
+require 'classes/script_start.php';

enable.php

@@ -1,2 +1,3 @@
 <?php
-require('classes/script_start.php');
+
+require 'classes/script_start.php';

error.php

@@ -1,2 +1,3 @@
 <?php
-require('classes/script_start.php');
+
+require 'classes/script_start.php';

feeds.php

@@ -1,4 +1,5 @@
 <?php
+
 /*-- Feed Start Class ----------------------------------*/
 /*------------------------------------------------------*/
 /* Simplified version of script_start, used for the     */
@@ -11,11 +12,11 @@ if (isset($_GET['clearcache'])) {
     unset($_GET['clearcache']);
 }
 
-require_once('classes/config.php'); // The config contains all site-wide configuration information as well as memcached rules
+require_once 'classes/config.php'; // The config contains all site-wide configuration information as well as memcached rules
+require_once SERVER_ROOT.'/classes/misc.class.php'; // Require the misc class
+require_once SERVER_ROOT.'/classes/cache.class.php'; // Require the caching class
+require_once SERVER_ROOT.'/classes/feed.class.php'; // Require the feeds class
 
-require_once(SERVER_ROOT.'/classes/misc.class.php'); // Require the misc class
-require_once(SERVER_ROOT.'/classes/cache.class.php'); // Require the caching class
-require_once(SERVER_ROOT.'/classes/feed.class.php'); // Require the feeds class
 $Cache = new Cache(MEMCACHED_SERVERS); // Load the caching class
 $Feed = new Feed; // Load the time class
 
@@ -29,6 +30,7 @@ function is_number($Str)
     if ($Str < 0) {
         return false;
     }
+
     // We're converting input to an int, then string, and comparing to the original
     return ($Str === strval(intval($Str)));
 }
@@ -41,20 +43,20 @@ function display_str($Str)
         $Str = preg_replace('/&(?![A-Za-z]{0,4}\w{2,3};|#[0-9]{2,5};)/m', '&amp;', $Str);
 
         $Replace = array(
-      "'",'"','<','>',
-      '&#128;','&#130;','&#131;','&#132;','&#133;','&#134;','&#135;','&#136;',
-      '&#137;','&#138;','&#139;','&#140;','&#142;','&#145;','&#146;','&#147;',
-      '&#148;','&#149;','&#150;','&#151;','&#152;','&#153;','&#154;','&#155;',
-      '&#156;','&#158;','&#159;'
-    );
+            "'",'"','<','>',
+            '&#128;','&#130;','&#131;','&#132;','&#133;','&#134;','&#135;','&#136;',
+            '&#137;','&#138;','&#139;','&#140;','&#142;','&#145;','&#146;','&#147;',
+            '&#148;','&#149;','&#150;','&#151;','&#152;','&#153;','&#154;','&#155;',
+            '&#156;','&#158;','&#159;'
+        );
 
         $With = array(
-      '&#39;','&quot;','&lt;','&gt;',
-      '&#8364;','&#8218;','&#402;','&#8222;','&#8230;','&#8224;','&#8225;','&#710;',
-      '&#8240;','&#352;','&#8249;','&#338;','&#381;','&#8216;','&#8217;','&#8220;',
-      '&#8221;','&#8226;','&#8211;','&#8212;','&#732;','&#8482;','&#353;','&#8250;',
-      '&#339;','&#382;','&#376;'
-    );
+            '&#39;','&quot;','&lt;','&gt;',
+            '&#8364;','&#8218;','&#402;','&#8222;','&#8230;','&#8224;','&#8225;','&#710;',
+            '&#8240;','&#352;','&#8249;','&#338;','&#381;','&#8216;','&#8217;','&#8220;',
+            '&#8221;','&#8226;','&#8211;','&#8212;','&#732;','&#8482;','&#353;','&#8250;',
+            '&#339;','&#382;','&#376;'
+        );
 
         $Str = str_replace($Replace, $With, $Str);
     }
@@ -85,15 +87,15 @@ function is_utf8($Str)
 {
     return preg_match(
         '%^(?:
-    [\x09\x0A\x0D\x20-\x7E]             // ASCII
-    | [\xC2-\xDF][\x80-\xBF]            // non-overlong 2-byte
-    | \xE0[\xA0-\xBF][\x80-\xBF]        // excluding overlongs
-    | [\xE1-\xEC\xEE\xEF][\x80-\xBF]{2} // straight 3-byte
-    | \xED[\x80-\x9F][\x80-\xBF]        // excluding surrogates
-    | \xF0[\x90-\xBF][\x80-\xBF]{2}     // planes 1-3
-    | [\xF1-\xF3][\x80-\xBF]{3}         // planes 4-15
-    | \xF4[\x80-\x8F][\x80-\xBF]{2}     // plane 16
-    )*$%xs',
+        [\x09\x0A\x0D\x20-\x7E]             // ASCII
+        | [\xC2-\xDF][\x80-\xBF]            // Non-overlong 2-byte
+        | \xE0[\xA0-\xBF][\x80-\xBF]        // Excluding overlongs
+        | [\xE1-\xEC\xEE\xEF][\x80-\xBF]{2} // Straight 3-byte
+        | \xED[\x80-\x9F][\x80-\xBF]        // Excluding surrogates
+        | \xF0[\x90-\xBF][\x80-\xBF]{2}     // Planes 1-3
+        | [\xF1-\xF3][\x80-\xBF]{3}         // Planes 4-15
+        | \xF4[\x80-\x8F][\x80-\xBF]{2}     // Plane 16
+        )*$%xs',
         $Str
     );
 }
@@ -121,4 +123,4 @@ header('Pragma:');
 header('Expires: '.date('D, d M Y H:i:s', time() + (2 * 60 * 60)).' GMT');
 header('Last-Modified: '.date('D, d M Y H:i:s').' GMT');
 
-require(SERVER_ROOT.'/sections/feeds/index.php');
+require SERVER_ROOT.'/sections/feeds/index.php';

flush.php

@@ -1,4 +1,5 @@
 <?php
+
 ob_start();
 
 echo '0';

forums.php

@@ -1,3 +1,4 @@
 <?php
+
 define('ERROR_EXCEPTION', true);
-require('classes/script_start.php');
+require 'classes/script_start.php';

friends.php

@@ -1,3 +1,4 @@
 <?php
+
 define('ERROR_EXCEPTION', true);
-require('classes/script_start.php');
+require 'classes/script_start.php';

image.php

@@ -1,4 +1,5 @@
 <?php
+
 // Functions and headers needed by the image proxy
 error_reporting(E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR);
 
@@ -105,4 +106,4 @@ function image_height($Type, $Data)
 }
 
 define('SKIP_NO_CACHE_HEADERS', 1);
-require('classes/script_start.php'); // script_start contains all we need and includes sections/image/index.php
+require 'classes/script_start.php'; // script_start.php contains all we need and includes sections/image/index.php

inbox.php

@@ -1,2 +1,3 @@
 <?php
-require('classes/script_start.php');
+
+require 'classes/script_start.php';

index.php

@@ -1,2 +1,3 @@
 <?php
-require('classes/script_start.php');
+
+require 'classes/script_start.php';

irc.php

@@ -1,3 +1,4 @@
 <?php
+
 $_SERVER['SCRIPT_FILENAME'] = 'irc.php'; // CLI fix
-require('classes/script_start.php');
+require 'classes/script_start.php';

locked.php

@@ -1,2 +1,3 @@
 <?php
-require('classes/script_start.php');
+
+require 'classes/script_start.php';

log.php

@@ -1,2 +1,3 @@
 <?php
+
 require 'classes/script_start.php';

login.php

@@ -1,2 +1,3 @@
 <?php
-require('classes/script_start.php');
+
+require 'classes/script_start.php';

logout.php

@@ -1,2 +1,3 @@
 <?php
-require('classes/script_start.php');
+
+require 'classes/script_start.php';

manifest.php

@@ -1,9 +1,10 @@
 <?php
+
 require 'classes/config.php'; ?>
 
 {
-  "name": "<?= SITE_NAME ?>",
-  "short_name": "<?= SITE_NAME ?>",
+  "name": "<?=SITE_NAME?>",
+  "short_name": "<?=SITE_NAME?>",
   "start_url": "index.php",
   "display": "standalone",
   "background_color": "#FCC2E6",

peerupdate.php

@@ -1,6 +1,8 @@
 <?php
+
 define('MEMORY_EXCEPTION', true);
 define('TIME_EXCEPTION', true);
 define('ERROR_EXCEPTION', true);
+
 $_SERVER['SCRIPT_FILENAME'] = 'peerupdate.php';
-require('classes/script_start.php');
+require 'classes/script_start.php';

questions.php

@@ -1,2 +1,3 @@
 <?php
-require('classes/script_start.php');
+
+require 'classes/script_start.php';

register.php

@@ -1,2 +1,3 @@
 <?php
-require('classes/script_start.php');
+
+require 'classes/script_start.php';

reports.php

@@ -1,2 +1,3 @@
 <?php
-require('classes/script_start.php');
+
+require 'classes/script_start.php';

reportsv2.php

@@ -1,2 +1,3 @@
 <?php
+
 require 'classes/script_start.php';

requests.php

@@ -1,2 +1,3 @@
 <?php
-require('classes/script_start.php');
+
+require 'classes/script_start.php';

robots.txt

@@ -1,5 +1,6 @@
 User-agent: *
+Disallow: /
+
 Allow: /index.php
 Allow: /login.php
 Allow: /register.php
-Disallow: /

rules.php

@@ -1,2 +1,3 @@
 <?php
-require('classes/script_start.php');
+
+require 'classes/script_start.php';

schedule.php

@@ -1,6 +1,8 @@
 <?php
+
 define('MEMORY_EXCEPTION', true);
 define('TIME_EXCEPTION', true);
 define('ERROR_EXCEPTION', true);
+
 $_SERVER['SCRIPT_FILENAME'] = 'schedule.php'; // CLI fix
-require('classes/script_start.php');
+require 'classes/script_start.php';

signup.php

@@ -1,2 +1,3 @@
 <?php
+
 header('Location: register.php');

sitehistory.php

@@ -1,2 +1,3 @@
 <?php
-require('classes/script_start.php');
+
+require 'classes/script_start.php';

slaves.php

@@ -1,3 +1,4 @@
 <?php
+
 define('ERROR_EXCEPTION', true);
-require('classes/script_start.php');
+require 'classes/script_start.php';

snatchlist.php

@@ -1,3 +1,4 @@
 <?php
+
 define('ERROR_EXCEPTION', true);
-require('classes/script_start.php');
+require 'classes/script_start.php';

staff.php

@@ -1,2 +1,3 @@
 <?php
-require('classes/script_start.php');
+
+require 'classes/script_start.php';

staffblog.php

@@ -1,3 +1,4 @@
 <?php
+
 define('ERROR_EXCEPTION', true);
-require('classes/script_start.php');
+require 'classes/script_start.php';

staffpm.php

@@ -1,2 +1,3 @@
 <?php
-require('classes/script_start.php');
+
+require 'classes/script_start.php';

stats.php

@@ -1,2 +1,3 @@
 <?php
-require('classes/script_start.php');
+
+require 'classes/script_start.php';

store.php

@@ -1,3 +1,4 @@
 <?php
+
 define('ERROR_EXCEPTION', true);
-require('classes/script_start.php');
+require 'classes/script_start.php';

testing.php

@@ -1,2 +1,3 @@
 <?php
-require('classes/script_start.php');
+
+require 'classes/script_start.php';

tools.php

@@ -1,3 +1,4 @@
-<?
+<?php
+
 $_SERVER['SCRIPT_FILENAME'] = 'tools.php'; // CLI fix
-require('classes/script_start.php');
+require 'classes/script_start.php';

top10.php

@@ -1,2 +1,3 @@
 <?php
-require('classes/script_start.php');
+
+require 'classes/script_start.php';

torrents.php

@@ -1,3 +1,4 @@
 <?php
+
 define('ERROR_EXCEPTION', true);
-require('classes/script_start.php');
+require 'classes/script_start.php';

upload.php

@@ -1,3 +1,4 @@
 <?php
+
 define('ERROR_EXCEPTION', true);
-require('classes/script_start.php');
+require 'classes/script_start.php';

user.php

@@ -1,3 +1,4 @@
 <?php
+
 define('ERROR_EXCEPTION', true);
-require('classes/script_start.php');
+require 'classes/script_start.php';

userhistory.php

@@ -1,3 +1,4 @@
 <?php
+
 define('ERROR_EXCEPTION', true);
-require('classes/script_start.php');
+require 'classes/script_start.php';

whitelist.php

@@ -1,2 +1,3 @@
 <?php
+
 header('Location: rules.php?p=clients');

wiki.php

@@ -1,3 +1,4 @@
 <?php
+
 define('ERROR_EXCEPTION', true);
-require('classes/script_start.php');
+require 'classes/script_start.php';