From c2746069c183484bf0f3eff54d8a27db1b738509 Mon Sep 17 00:00:00 2001
From: Git <git@what.cd>
Date: Fri, 22 Feb 2013 08:00:24 +0000
Subject: [PATCH] Empty commit

---
 COPYING.txt                                   |   6 +-
 INSTALL.txt                                   |  12 +-
 cheaters.php                                  |   2 +-
 classes/class_alias.php                       |   4 +-
 classes/class_cache.php                       |   2 +-
 classes/class_charts.php                      |  32 +--
 classes/class_cookie.php                      |  10 +-
 classes/class_file_checker.php                |   2 +-
 classes/class_format.php                      |   6 +-
 classes/class_image.php                       |  16 +-
 classes/class_image_tools.php                 |   8 +-
 classes/class_invite_tree.php                 |  42 ++--
 .../class_mass_user_torrents_table_view.php   |   2 +-
 classes/class_misc.php                        |   2 +-
 classes/class_mysql.php                       |  22 +-
 classes/class_paranoia.php                    |  14 +-
 classes/class_proxies.php                     |   6 +-
 classes/class_search.php                      |  58 ++---
 classes/class_time.php                        |   8 +-
 classes/class_torrent.php                     |  92 ++++----
 classes/class_torrent_32bit.php               |  74 +++----
 classes/class_torrents.php                    |   4 +-
 classes/class_torrentsdl.php                  |   7 +-
 classes/class_user_rank.php                   |  30 +--
 classes/class_useragent.php                   |  10 +-
 classes/class_users.php                       |   6 +-
 classes/class_view.php                        |   2 +-
 classes/class_wiki.php                        |  22 +-
 classes/class_zip.php                         |  38 ++--
 classes/permissions_form.php                  |  10 +-
 classes/sphinxapi.php                         |  40 ++--
 delays.php                                    |   2 +-
 design/privatefooter.php                      |   2 +-
 design/privateheader.php                      |   8 +-
 design/publicheader.php                       |   4 +-
 forums.php                                    |   2 +-
 irc_raw.php                                   |   4 +-
 opensearch.php                                |  14 +-
 sections/ajax/announcements.php               |   4 +-
 sections/ajax/better/index.php                |   4 +-
 sections/ajax/better/single.php               |   4 +-
 sections/ajax/bookmarks/artists.php           |   4 +-
 sections/ajax/bookmarks/index.php             |   4 +-
 sections/ajax/bookmarks/torrents.php          |   6 +-
 sections/ajax/forum/forum.php                 |   4 +-
 sections/ajax/forum/index.php                 |   4 +-
 sections/ajax/forum/main.php                  |   4 +-
 sections/ajax/forum/thread.php                |  22 +-
 sections/ajax/index.php                       |   4 +-
 sections/ajax/notifications.php               |   2 +-
 sections/ajax/request.php                     |  14 +-
 sections/ajax/requests.php                    |  34 +--
 sections/ajax/takevote.php                    |  30 +--
 sections/ajax/torrentgroup.php                |   2 +-
 sections/ajax/upload.php                      |   4 +-
 sections/ajax/userhistory/post_history.php    |  12 +-
 sections/ajax/usersearch.php                  |   4 +-
 sections/api/access_state.php                 |   2 +-
 sections/api/index.php                        |  12 +-
 sections/artist/add_similar.php               |  12 +-
 sections/artist/autocomplete.php              |  16 +-
 sections/artist/change_artistid.php           |  18 +-
 sections/artist/delete.php                    |  14 +-
 sections/artist/delete_alias.php              |   4 +-
 sections/artist/download.php                  |   2 -
 sections/artist/edit.php                      |  18 +-
 sections/artist/history.php                   |   4 +-
 sections/artist/index.php                     |   6 +-
 sections/artist/rename.php                    |   2 +-
 sections/artist/take_warn.php                 |   2 +-
 sections/artist/takeedit.php                  |  12 +-
 sections/better/files.php                     |   6 +-
 sections/better/folders.php                   |   4 +-
 sections/better/index.php                     |   4 +-
 sections/better/tags.php                      |   2 +-
 sections/blog/index.php                       |  32 +--
 sections/bookmarks/functions.php              |   2 +-
 sections/captcha/index.php                    |  14 +-
 sections/collages/add_comment.php             |   4 +-
 sections/collages/add_torrent.php             |  16 +-
 sections/collages/all_comments.php            |   6 +-
 sections/collages/browse.php                  |  22 +-
 sections/collages/delete.php                  |   4 +-
 sections/collages/get_post.php                |  10 +-
 sections/collages/index.php                   |   6 +-
 sections/collages/manage_handle.php           |   2 +-
 sections/collages/new.php                     |  10 +-
 sections/collages/new_handle.php              |   4 +-
 sections/collages/take_delete.php             |   4 +-
 sections/collages/takeedit_comment.php        |   2 +-
 sections/comments/artistcomments.php          |   4 +-
 sections/comments/index.php                   |   8 +-
 sections/comments/post.php                    |   8 +-
 sections/donate/ipn.php                       |  10 +-
 sections/feeds/index.php                      |  74 +++----
 sections/forums/ajax_get_edit.php             |   4 +-
 sections/forums/change_vote.php               |   2 +-
 sections/forums/delete.php                    |   2 +-
 sections/forums/delete_poll_option.php        |   2 +-
 sections/forums/forum.php                     |  16 +-
 sections/forums/get_post.php                  |  10 +-
 sections/forums/index.php                     |   2 +-
 sections/forums/mod_thread.php                |  98 ++++-----
 sections/forums/poll_mod.php                  |   6 +-
 sections/forums/poll_vote.php                 |  16 +-
 sections/forums/quote_notify.php              |   2 +-
 sections/forums/search.php                    |  36 +--
 sections/forums/subscribe.php                 |   2 +-
 sections/forums/take_new_thread.php           |  24 +-
 sections/forums/take_reply.php                |  34 +--
 sections/forums/take_warn.php                 |  10 +-
 sections/forums/takeedit.php                  |  16 +-
 sections/friends/friends.php                  |  18 +-
 sections/inbox/compose.php                    |   2 +-
 sections/inbox/conversation.php               |   2 +-
 sections/inbox/get_post.php                   |  10 +-
 sections/inbox/index.php                      |   2 +-
 sections/index/feat_album.php                 |   2 +-
 sections/login/index.php                      |  88 ++++----
 sections/login/login.php                      |   2 +-
 sections/peerupdate/index.php                 |   4 +-
 sections/register/index.php                   |  90 ++++----
 sections/reports/ajax_claim_report.php        |   2 +-
 sections/reports/ajax_resolve_report.php      |   2 +-
 sections/reports/report.php                   |  30 +--
 sections/reports/reports.php                  |  22 +-
 sections/reports/takereport.php               |   2 +-
 sections/reports/takeresolve.php              |   2 +-
 sections/reportsv2/ajax_change_resolve.php    |   2 +-
 sections/reportsv2/ajax_grab_report.php       |   4 +-
 sections/reportsv2/ajax_new_report.php        |  68 +++---
 sections/reportsv2/ajax_report.php            |   4 +-
 sections/reportsv2/array.php                  |   2 +-
 sections/reportsv2/index.php                  |   2 +-
 sections/reportsv2/report.php                 |  10 +-
 sections/reportsv2/static.php                 |  90 ++++----
 sections/reportsv2/takereport.php             |   6 +-
 sections/reportsv2/takeresolve.php            |  50 ++---
 sections/reportsv2/views.php                  |  10 +-
 sections/requests/functions.php               |  30 +--
 sections/requests/index.php                   |  54 ++---
 sections/requests/interim.php                 |   8 +-
 sections/rules/clients.php                    |   6 +-
 sections/rules/collages.php                   |   4 +-
 sections/rules/jump.php                       |  12 +-
 sections/schedule/index.php                   | 206 +++++++++---------
 sections/staff/index.php                      |   4 +-
 sections/staffblog/index.php                  |  18 +-
 sections/staffpm/ajax_delete_response.php     |   4 +-
 sections/staffpm/ajax_edit_response.php       |   2 +-
 sections/staffpm/ajax_get_response.php        |   2 +-
 sections/staffpm/assign.php                   |  16 +-
 sections/staffpm/common_responses.php         |  18 +-
 sections/staffpm/get_post.php                 |  10 +-
 sections/staffpm/index.php                    |   2 +-
 sections/staffpm/makedonor.php                |  16 +-
 sections/staffpm/multiresolve.php             |   8 +-
 sections/staffpm/resolve.php                  |   2 +-
 sections/staffpm/takepost.php                 |  22 +-
 sections/staffpm/unresolve.php                |   6 +-
 sections/staffpm/user_inbox.php               |  22 +-
 sections/staffpm/viewconv.php                 |   4 +-
 sections/stats/users.php                      |   6 +-
 sections/tools/data/database_specifics.php    |   2 +-
 sections/tools/data/donation_log.php          |  14 +-
 sections/tools/data/economic_stats.php        |   2 +-
 sections/tools/data/invite_pool.php           |   4 +-
 sections/tools/data/opcode_stats.php          |   6 +-
 sections/tools/data/registration_log.php      |   8 +-
 sections/tools/data/service_stats.php         |   4 +-
 sections/tools/data/suggestions.php           |  16 +-
 sections/tools/data/torrent_stats.php         |   2 +-
 sections/tools/data/upscale_pool.php          |   4 +-
 sections/tools/data/user_flow.php             |   2 +-
 sections/tools/index.php                      |  28 +--
 sections/tools/managers/bans.php              |   4 +-
 sections/tools/managers/dnu_alter.php         |   2 +-
 sections/tools/managers/eb.php                |   4 +-
 sections/tools/managers/eb_alter.php          |   2 +-
 sections/tools/managers/eb_search.php         |   2 +-
 sections/tools/managers/forum_list.php        |  18 +-
 sections/tools/managers/login_watch.php       |   4 +-
 sections/tools/managers/news.php              |   2 +-
 sections/tools/managers/ocelot.php            |   4 +-
 sections/tools/managers/recommend_add.php     |   2 +-
 sections/tools/managers/recommend_list.php    |   8 +-
 sections/tools/managers/tokens.php            |  10 +-
 sections/tools/managers/whitelist_alter.php   |   8 +-
 sections/tools/managers/whitelist_list.php    |   4 +-
 sections/tools/misc/create_user.php           |  40 ++--
 sections/tools/misc/dupe_ip.php               |   4 +-
 sections/tools/misc/manipulate_tree.php       |  28 +--
 sections/tools/misc/update_geoip.php          |   2 +-
 sections/tools/tools.php                      |   2 +-
 sections/torrents/add_alias.php               |  30 +--
 sections/torrents/add_tag.php                 |  14 +-
 sections/torrents/browse.php                  |  68 +++---
 sections/torrents/delete.php                  |  36 +--
 sections/torrents/delete_alias.php            |  20 +-
 sections/torrents/delete_tag.php              |   2 +-
 sections/torrents/download.php                |  14 +-
 sections/torrents/downloadlist.php            |  12 +-
 sections/torrents/edit.php                    |  34 +--
 sections/torrents/editgroup.php               |  30 +--
 sections/torrents/editgroupid.php             |  16 +-
 sections/torrents/functions.php               |   2 +-
 sections/torrents/history.php                 |   4 +-
 sections/torrents/index.php                   | 110 +++++-----
 sections/torrents/merge.php                   |  22 +-
 sections/torrents/nonwikiedit.php             |   4 +-
 sections/torrents/redownload.php              |   2 +-
 sections/torrents/reseed.php                  |  12 +-
 sections/torrents/snatchlist.php              |  10 +-
 sections/torrents/takedelete.php              |   4 +-
 sections/torrents/takegroupedit.php           |  10 +-
 sections/torrents/takemasspm.php              |   4 +-
 sections/torrents/takenewgroup.php            |   8 +-
 sections/torrents/vote_ranks.php              |   6 +-
 sections/torrents/voter_picks.php             |   4 +-
 sections/upload/insert_extra_torrents.php     |   6 +-
 sections/upload/upload.php                    |  32 +--
 sections/upload/upload_handle.php             |  22 +-
 sections/user/advancedsearch.php              |  42 ++--
 sections/user/connchecker.php                 |   4 +-
 sections/user/index.php                       |   6 +-
 sections/user/invite.php                      |  14 +-
 sections/user/invitetree.php                  |   4 +-
 sections/user/manage_linked.php               |  14 +-
 sections/user/notify_handle.php               |   2 +-
 sections/user/permissions.php                 |   8 +-
 sections/user/search.php                      |   4 +-
 sections/user/subscribe.php                   |   2 +-
 sections/user/takeedit.php                    |  22 +-
 sections/user/takeinvite.php                  |  10 +-
 sections/user/takemoderate.php                |  38 ++--
 sections/userhistory/email_history.php        |   8 +-
 sections/userhistory/index.php                |   8 +-
 sections/userhistory/ip_history.php           |  20 +-
 sections/userhistory/ip_tracker_history.php   |   2 +-
 sections/userhistory/passkey_history.php      |   8 +-
 sections/userhistory/password_history.php     |   6 +-
 sections/userhistory/post_history.php         |  20 +-
 sections/userhistory/subscriptions.php        |   4 +-
 sections/userhistory/token_history.php        |   4 +-
 sections/wiki/aliases.php                     |   2 +-
 sections/wiki/compare.php                     |  28 +--
 sections/wiki/edit.php                        |   2 +-
 sections/wiki/revisions.php                   |   8 +-
 sections/wiki/search.php                      |   8 +-
 sections/wiki/takecreate.php                  |   2 +-
 sections/wiki/wiki_browse.php                 |   6 +-
 staffblog.php                                 |   2 +-
 static/functions/artist_cloud.js              |   8 +-
 static/functions/artists.js                   |  86 ++++----
 static/functions/browse.js                    |   2 +-
 static/functions/class_ajax.js                |  14 +-
 static/functions/class_cookie.js              |   4 +-
 static/functions/class_countdown.js           |   8 +-
 static/functions/class_storage.js             |   4 +-
 static/functions/class_textareapreview.js     |   4 +-
 static/functions/collage.js                   |  14 +-
 static/functions/comments.js                  |  10 +-
 static/functions/delays.js                    |   4 +-
 static/functions/global.js                    |   8 +-
 static/functions/iphone.js                    |  20 +-
 static/functions/musicbrainz.js               |  62 +++---
 static/functions/password_validate.js         |   2 +-
 static/functions/release_sort.js              |  10 +-
 static/functions/reportsv2.js                 |   6 +-
 static/functions/requests.js                  |  24 +-
 static/functions/script_start.js              |  14 +-
 static/functions/staffpm.js                   |   4 +-
 static/functions/tagcanvas.js                 |   2 +-
 static/functions/torrent.js                   |   6 +-
 static/functions/transitions.js               |  12 +-
 static/functions/upload.js                    |  48 ++--
 static/functions/user.js                      |  10 +-
 static/functions/valid_tags.js                |   2 +-
 static/functions/validate.js                  |   4 +-
 static/styles/global.css                      |   4 +-
 static/styles/hydro/style.css                 |   2 +-
 static/styles/layer_cake/style.css            |   2 +-
 static/styles/public/style.css                |   2 +-
 static/styles/shiro/style.css                 |   2 +-
 static/styles/whatlove/style.css              |   2 +-
 torrents.php                                  |   2 +-
 286 files changed, 1982 insertions(+), 1979 deletions(-)

diff --git a/COPYING.txt b/COPYING.txt
index a176c22b..60dd1024 100644
--- a/COPYING.txt
+++ b/COPYING.txt
@@ -38,17 +38,17 @@ terms of Sections 1 and 2 above provided that you also do one of the
 following:
 
     3.1:  Accompany it with the complete corresponding machine-readable source
-code, which must be distributed under the terms of Sections 1 and 2 above on 
+code, which must be distributed under the terms of Sections 1 and 2 above on
 a medium customarily used for software interchange; or,
 
     3.2:  Accompany it with a written offer, valid for at least one year, to
-give any third party, for a charge no more than your cost of physically 
+give any third party, for a charge no more than your cost of physically
 performing source distribution, a complete machine-readable copy of the
 corresponding source code, to be distributed under the terms of Sections 1 and
 2 above on a medium customarily used for software interchange; or,
 
     3.3:  Accompany it with the information you received as to the offer to
-distribute corresponding source code.  (This alternative is allowed only for 
+distribute corresponding source code.  (This alternative is allowed only for
 noncommercial distribution and only if you received the Software in object
 code or executable form with such an offer, in accord with Subsection 3.2
 above.)
diff --git a/INSTALL.txt b/INSTALL.txt
index 55d5b8d6..5d3bcf26 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -5,16 +5,16 @@ INSTALLATION NOTES
 2. Run gazelle.sql (preferably as root) to create the database, the table, and the default data.
 3. Install sphinx - we recommend you use the included sphinx.conf
 	For documentation, read http://www.sphinxsearch.com/docs/current.html
-	
+
 	After you've installed sphinx, create the indices:
 	/usr/local/bin/indexer -c /etc/sphinx/sphinx.conf --all
-	
-4. Move classes/config.template to classes/config.php. Edit the config.php as needed. 
+
+4. Move classes/config.template to classes/config.php. Edit the config.php as needed.
 	We use http://grc.com/passwords.html for our passwords - you'll be generating a lot of these.
 5. Sign up. The first user is made a SysOp!
-6. Set up cron jobs. You need a cron job for the schedule, a cron job for 
-the peerupdate (all groups are cached, but the peer counts change often, 
-so peerupdate is a script to update them), and the two sphinx indices. 
+6. Set up cron jobs. You need a cron job for the schedule, a cron job for
+the peerupdate (all groups are cached, but the peer counts change often,
+so peerupdate is a script to update them), and the two sphinx indices.
 These are our cron jobs:
 
 0,15,30,45 *    *       *       *       /usr/local/bin/php /var/www/vhosts/what/schedule.php SCHEDULE_KEY >> /root/schedule.log
diff --git a/cheaters.php b/cheaters.php
index d63c1d97..172ee44a 100644
--- a/cheaters.php
+++ b/cheaters.php
@@ -1,2 +1,2 @@
-<? 
+<?
 require('classes/script_start.php');
diff --git a/classes/class_alias.php b/classes/class_alias.php
index 23b39ca4..113fff38 100644
--- a/classes/class_alias.php
+++ b/classes/class_alias.php
@@ -11,7 +11,7 @@ function flush() {
 		$Aliases = $DB->to_array('Alias');
 		$Cache->cache_value('wiki_aliases', $Aliases, 3600*24*14);
 	}
-	
+
 	function to_id($Alias) {
 		global $Cache, $DB;
 		$Aliases = $Cache->get_value('wiki_aliases');
@@ -26,7 +26,7 @@ function to_id($Alias) {
 	function flush() {
 
 	}
-	
+
 	function to_id($Alias) {
 		global $DB;
 		$Alias = $this->convert($Alias);
diff --git a/classes/class_cache.php b/classes/class_cache.php
index 33375f4d..a6f14146 100644
--- a/classes/class_cache.php
+++ b/classes/class_cache.php
@@ -155,7 +155,7 @@ public function delete_value($Key) {
 		}
 		$this->Time+=(microtime(true)-$StartTime)*1000;
 	}
-	
+
 	public function increment_value($Key,$Value=1) {
 		$StartTime=microtime(true);
 		$this->increment($Key,$Value);
diff --git a/classes/class_charts.php b/classes/class_charts.php
index 683f1532..10b3e4c6 100644
--- a/classes/class_charts.php
+++ b/classes/class_charts.php
@@ -4,7 +4,7 @@ class GOOGLE_CHARTS {
 	protected $Labels = array();
 	protected $Data = array();
 	protected $Options = array();
-	
+
 	public function __construct($Type, $Width, $Height, $Options) {
 		if ($Width * $Height > 300000 || $Height > 1000 || $Width > 1000) {
 			trigger_error('Tried to make chart too large.');
@@ -12,7 +12,7 @@ public function __construct($Type, $Width, $Height, $Options) {
 		$this->URL .= '?cht='.$Type.'&amp;chs='.$Width.'x'.$Height;
 		$this->Options = $Options;
 	}
-	
+
 	protected function encode($Number) {
 		if ($Number == -1) {
 			return '__';
@@ -20,15 +20,15 @@ protected function encode($Number) {
 		$CharKey = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-.';
 		return $CharKey[floor($Number/64)].$CharKey[floor($Number%64)];
 	}
-		
+
 	public function color($Colors) {
 		$this->URL .= '&amp;chco='.$Colors;
 	}
-	
+
 	public function lines($Thickness, $Solid=1, $Blank=0) {
 		$this->URL .= '&amp;chls='.$Thickness.','.$Solid.','.$Blank;
 	}
-	
+
 	public function title($Title, $Color='', $Size='') {
 		$this->URL .= '&amp;chtt='.str_replace(array(' ',"\n"), array('+','|'), $Title);
 		if (!empty($Color)) {
@@ -38,7 +38,7 @@ public function title($Title, $Color='', $Size='') {
 			$this->URL .= ','.$Size;
 		}
 	}
-	
+
 	public function legend($Items, $Placement='') {
 		$this->URL .= '&amp;chdl='.str_replace(' ', '+', implode('|', $Items));
 		if (!empty($Placement)) {
@@ -48,24 +48,24 @@ public function legend($Items, $Placement='') {
 			$this->URL .= '&amp;chdlp='.$Placement;
 		}
 	}
-	
+
 	public function add($Label, $Data) {
 		if ($Label !== false) {
 			$this->Labels[] = $Label;
 		}
 		$this->Data[] = $Data;
 	}
-		
+
 	public function grid_lines($SpacingX=0, $SpacingY=-1, $Solid=1, $Blank=1) {
 		//Can take 2 more parameters for offset, but we're not bothering with that right now
 		$this->URL .= '&amp;chg='.$SpacingX.','.$SpacingY.','.$Solid.','.$Blank.'';
 	}
-	
+
 	public function transparent() {
 		$this->URL .= '&amp;chf=bg,s,FFFFFF00';
 	}
-	
-	
+
+
 	public function url() {
 		return $this->URL;
 	}
@@ -79,7 +79,7 @@ public function __construct ($Width, $Height, $Options=array()) {
 	public function color ($Color) {
 		$this->URL .= '&amp;chco='.$Color.'&amp;chm=B,'.$Color.'50,0,0,0';
 	}
-	
+
 	public function generate() {
 		$Max = max($this->Data);
 		$Min = (isset($this->Options['Break']))?$Min=min($this->Data):0;
@@ -109,12 +109,12 @@ public function generate() {
 			sort($this->Data);
 			$this->Data = array_reverse($this->Data);
 		}
-		
+
 		$Data = array();
 		$Labels = $this->Labels;
 		$OtherPercentage = 0.00;
 		$OtherData = 0;
-		
+
 		foreach ($this->Data as $Key => $Value) {
 			$ThisPercentage = number_format(($Value/$Sum)*100, 2);
 			$ThisData = ($Value/$Sum)*4095;
@@ -152,7 +152,7 @@ public function __construct ($Base, $Width, $Height, $Options=array()) {
 	public function color ($Color) {
 		$this->URL .= '&amp;chco='.$Color.'&amp;chm=B,'.$Color.'50,0,0,0';
 	}
-	
+
 	public function generate() {
 		$Max = max($this->Data);
 		$Min = (isset($this->Options['Break']))?$Min=min($this->Data):0;
@@ -175,7 +175,7 @@ public function add($Label, $Data) {
 		}
 		$this->Data[] = $Data;
 	}
-	
+
 	public function generate() {
 		$Count = count($this->Data);
 		$Height = (30*$Count)+20;
diff --git a/classes/class_cookie.php b/classes/class_cookie.php
index 365de3e4..1fc3bf72 100644
--- a/classes/class_cookie.php
+++ b/classes/class_cookie.php
@@ -14,7 +14,7 @@ interface COOKIE_INTERFACE {
 	public function get($Key);
 	public function set($Key,$Value,$Seconds,$LimitAccess);
 	public function del($Key);
-	
+
 	public function flush();
 }
 */
@@ -22,23 +22,23 @@ public function flush();
 class COOKIE /*implements COOKIE_INTERFACE*/ {
 	const LIMIT_ACCESS = true; //If true, blocks JS cookie API access by default (can be overridden case by case)
 	const PREFIX = ''; //In some cases you may desire to prefix your cookies
-	
+
 	public function get($Key) {
 		if (!isset($_COOKIE[SELF::PREFIX.$Key])) {
 			return false;
 		}
 		return $_COOKIE[SELF::PREFIX.$Key];
 	}
-	
+
 	//Pass the 4th optional param as false to allow JS access to the cookie
 	public function set($Key,$Value,$Seconds = 86400,$LimitAccess = SELF::LIMIT_ACCESS) {
 		setcookie(SELF::PREFIX.$Key,$Value,time()+$Seconds,'/',SITE_URL,$_SERVER['SERVER_PORT'] === '443',$LimitAccess,false);
 	}
-	
+
 	public function del($Key) {
 		setcookie(SELF::PREFIX.$Key,'',time()-24*3600); //3600 vs 1 second to account for potential clock desyncs
 	}
-	
+
 	public function flush() {
 		$Cookies = array_keys($_COOKIE);
 		foreach ($Cookies as $Cookie) {
diff --git a/classes/class_file_checker.php b/classes/class_file_checker.php
index 67a4c84d..452016ea 100644
--- a/classes/class_file_checker.php
+++ b/classes/class_file_checker.php
@@ -17,7 +17,7 @@ function check_file($Type, $Name) {
 
 function check_name($Name) {
 	global $keywords;
-	foreach ($keywords as &$value) { 
+	foreach ($keywords as &$value) {
 		if(preg_match('/'.$value.'/i', $Name)) {
 			forbidden_error($Name);
        		}
diff --git a/classes/class_format.php b/classes/class_format.php
index 6075c0bf..307c8e37 100644
--- a/classes/class_format.php
+++ b/classes/class_format.php
@@ -33,7 +33,7 @@ class Format
 		'lossy master approved' => 'tl_approved tl_lossy_master',
 		'lossy web approved'    => 'tl_approved tl_lossy_web'
 	);
-	
+
 	/**
 	 * Shorten a string
 	 *
@@ -499,9 +499,9 @@ public static function is_utf8($Str) {
 
 	/**
 	 * Modified accessor for the $TorrentLabels array
-	 * 
+	 *
 	 * Converts $text to lowercase and strips non-word characters
-	 * 
+	 *
 	 * @param string $text Search string
 	 * @return string CSS class(es)
 	 */
diff --git a/classes/class_image.php b/classes/class_image.php
index 24ec44d4..13b402c4 100644
--- a/classes/class_image.php
+++ b/classes/class_image.php
@@ -8,7 +8,7 @@ class IMAGE {
 	var $FontSize = 10;
 	var $Font = '';
 	var $TextAngle = 0;
-	
+
 	function create($Width, $Height) {
 		$this->Image = imagecreate($Width, $Height);
 		$this->Font = SERVER_ROOT.'/classes/fonts/VERDANA.TTF';
@@ -16,11 +16,11 @@ function create($Width, $Height) {
 			imageantialias($this->Image, true);
 		}
 	}
-	
+
 	function color($Red, $Green, $Blue, $Alpha=0){
 		return imagecolorallocatealpha($this->Image, $Red, $Green, $Blue, $Alpha);
 	}
-	
+
 	function line($x1, $y1, $x2, $y2, $Color, $Thickness = 1){
 		if($Thickness == 1){
 			return imageline($this->Image, $x1, $y1, $x2, $y2, $Color);
@@ -40,19 +40,19 @@ function line($x1, $y1, $x2, $y2, $Color, $Thickness = 1){
 		imagefilledpolygon($this->Image, $Points, 4, $Color);
 		return imagepolygon($this->Image, $Points, 4, $Color);
 	}
-	
+
 	function ellipse($x, $y, $Width, $Height, $Color){
 		return imageEllipse($this->Image, $x, $y, $Width, $Height, $Color);
 	}
-	
+
 	function text($x, $y, $Color, $Text){
 		return imagettftext ($this->Image, $this->FontSize,$this->TextAngle, $x, $y, $Color, $this->Font, $Text);
 	}
-	
+
 	function make_png($FileName = NULL){
 		return imagepng($this->Image, $FileName);
 	}
-	
-	
+
+
 }
 ?>
diff --git a/classes/class_image_tools.php b/classes/class_image_tools.php
index ec22e932..000a11a6 100644
--- a/classes/class_image_tools.php
+++ b/classes/class_image_tools.php
@@ -5,14 +5,14 @@
  **/
 
  $blacklist = array("tinypic", "dsimg");
- 
+
  /**
   * Checks if image host is good, otherwise displays an error.
   */
  function check_imagehost($url) {
     global $blacklist;
-    
-    foreach ($blacklist as &$value) { 
+
+    foreach ($blacklist as &$value) {
         if(strpos(strtolower($url), $value)) {
             $parsed_url = parse_url($url);
             error($parsed_url['host'] . " is not an allowed imagehost. Please use a different imagehost.");
@@ -20,7 +20,7 @@ function check_imagehost($url) {
         }
     }
  }
- 
+
 /**
  * The main function, called to get the thumbnail url.
  */
diff --git a/classes/class_invite_tree.php b/classes/class_invite_tree.php
index 1e33262e..4a8791e4 100644
--- a/classes/class_invite_tree.php
+++ b/classes/class_invite_tree.php
@@ -9,7 +9,7 @@
 class INVITE_TREE {
 	var $UserID = 0;
 	var $Visible = true;
-	
+
 	// Set things up
 	function INVITE_TREE($UserID, $Options = array()){
 		$this->UserID = $UserID;
@@ -17,7 +17,7 @@ function INVITE_TREE($UserID, $Options = array()){
 			$this->Visible = false;
 		}
 	}
-	
+
 	function make_tree() {
 		$UserID = $this->UserID;
 		global $DB;
@@ -39,7 +39,7 @@ function make_tree() {
 		} else {
 			$MaxPosition = false;
 		}
-		$TreeQuery = $DB->query("SELECT 
+		$TreeQuery = $DB->query("SELECT
 			it.UserID,
 			Enabled,
 			PermissionID,
@@ -57,9 +57,9 @@ function make_tree() {
 			($MaxPosition ? " AND TreePosition<$MaxPosition" : "")."
 			AND TreeLevel>$TreeLevel
 			ORDER BY TreePosition");
-		
+
 		$PreviousTreeLevel = $TreeLevel;
-		
+
 		// Stats for the summary
 		$MaxTreeLevel = $TreeLevel; // The deepest level (this changes)
 		$OriginalTreeLevel = $TreeLevel; // The level of the user we're viewing
@@ -73,30 +73,30 @@ function make_tree() {
 		$TotalDownload = 0;
 		$TopLevelUpload = 0;
 		$TopLevelDownload = 0;
-		
+
 		$ClassSummary = array();
 		global $Classes;
 		foreach ($Classes as $ClassID => $Val) {
 			$ClassSummary[$ClassID] = 0;
 		}
-		
+
 		// We store this in an output buffer, so we can show the summary at the top without having to loop through twice
 		ob_start();
-		while(list($ID, $Enabled, $Class, $Donor, $Uploaded, $Downloaded, $Paranoia, $TreePosition, $TreeLevel) = $DB->next_record()){ 
-			
+		while(list($ID, $Enabled, $Class, $Donor, $Uploaded, $Downloaded, $Paranoia, $TreePosition, $TreeLevel) = $DB->next_record()){
+
 			// Do stats
 			$Count++;
-			
+
 			if($TreeLevel > $MaxTreeLevel){
 				$MaxTreeLevel = $TreeLevel;
 			}
-			
+
 			if($TreeLevel == $BaseTreeLevel){
 				$Branches++;
 				$TopLevelUpload += $Uploaded;
 				$TopLevelDownload += $Downloaded;
 			}
-			
+
 			$ClassSummary[$Class]++;
 			if($Enabled == 2){
 				$DisabledCount++;
@@ -104,7 +104,7 @@ function make_tree() {
 			if($Donor){
 				$DonorCount++;
 			}
-			
+
 			// Manage tree depth
 			if($TreeLevel > $PreviousTreeLevel){
 				for($i = 0; $i<$TreeLevel-$PreviousTreeLevel; $i++){ echo "<ul class=\"invitetree\"><li>"; }
@@ -133,7 +133,7 @@ function make_tree() {
 				&nbsp;Paranoia: <strong><?=number_format($Paranoia) ?></strong>
 <?
 			}
-?>			
+?>
 
 <?			$PreviousTreeLevel = $TreeLevel;
 			$DB->set_query_id($TreeQuery);
@@ -143,7 +143,7 @@ function make_tree() {
 		for($i = 0; $i<$PreviousTreeLevel-$OriginalTreeLevel; $i++){ $Tree .= "</li></ul>\n"; }
 
 		if($Count){
-		
+
 ?> 		<p style="font-weight: bold;">
 			This tree has <?=$Count?> entries, <?=$Branches?> branches, and a depth of <?=$MaxTreeLevel - $OriginalTreeLevel?>.
 			It has
@@ -152,15 +152,15 @@ function make_tree() {
 			foreach ($ClassSummary as $ClassID => $ClassCount) {
 				if($ClassCount == 0) { continue; }
 				$LastClass = Users::make_class_string($ClassID);
-				if($ClassCount>1) { 
+				if($ClassCount>1) {
 					if($LastClass == "Torrent Celebrity") {
 						 $LastClass = 'Torrent Celebrities';
 					} else {
-						$LastClass.='s'; 
+						$LastClass.='s';
 					}
 				}
 				$LastClass= $ClassCount.' '.$LastClass.' (' . number_format(($ClassCount/$Count)*100) . '%)';
-				
+
 				$ClassStrings []= $LastClass;
 			}
 			if(count($ClassStrings)>1){
@@ -183,13 +183,13 @@ function make_tree() {
 			if($DonorCount == 0) { echo '0%)'; }
 			else { echo number_format(($DonorCount/$Count)*100) . '%)';}
 			echo '. </p>';
-			
+
 			echo '<p style="font-weight: bold;">';
 			echo 'The total amount uploaded by the entire tree was '.Format::get_size($TotalUpload);
 			echo '; the total amount downloaded was '.Format::get_size($TotalDownload);
 			echo '; and the total ratio is '.Format::get_ratio_html($TotalUpload, $TotalDownload).'. ';
 			echo '</p>';
-			
+
 			echo '<p style="font-weight: bold;">';
 			echo 'The total amount uploaded by direct invitees (the top level) was '.Format::get_size($TopLevelUpload);
 			echo '; the total amount downloaded was '.Format::get_size($TopLevelDownload);
@@ -211,7 +211,7 @@ function make_tree() {
 				echo '</p>';
 			}
 		}
-		
+
 ?>
 		<br />
 		<?=$Tree?>
diff --git a/classes/class_mass_user_torrents_table_view.php b/classes/class_mass_user_torrents_table_view.php
index 74bc6148..d289ba07 100644
--- a/classes/class_mass_user_torrents_table_view.php
+++ b/classes/class_mass_user_torrents_table_view.php
@@ -168,7 +168,7 @@ public function header ()
 	 */
 	public function footer ()
 	{
-		if ($this->HasTorrents) :  
+		if ($this->HasTorrents) :
 ?>
 
 			</tbody>
diff --git a/classes/class_misc.php b/classes/class_misc.php
index 7a78bc3d..eb5d888f 100644
--- a/classes/class_misc.php
+++ b/classes/class_misc.php
@@ -88,7 +88,7 @@ public static function send_pm($ToID,$FromID,$Subject,$Body,$ConvID='') {
 			list($UnRead) = $DB->next_record();
 			$Cache->cache_value('inbox_new_'.$ID, $UnRead);
 		}
-		
+
 		$DB->query("SELECT Username FROM users_main WHERE ID = '$FromID'");
 		list($SenderName) = $DB->next_record();
 		foreach($ToID as $ID) {
diff --git a/classes/class_mysql.php b/classes/class_mysql.php
index bda757d0..c547fdd7 100644
--- a/classes/class_mysql.php
+++ b/classes/class_mysql.php
@@ -145,17 +145,17 @@ class DB_MYSQL {
 	protected $Row;
 	protected $Errno = 0;
 	protected $Error = '';
-	
+
 	public $Queries = array();
 	public $Time = 0.0;
-	
+
 	protected $Database = '';
 	protected $Server = '';
 	protected $User = '';
 	protected $Pass = '';
 	protected $Port = 0;
 	protected $Socket = '';
-	
+
 	function __construct($Database = SQLDB, $User = SQLLOGIN, $Pass = SQLPASS, $Server = SQLHOST, $Port = SQLPORT, $Socket = SQLSOCK) {
 		$this->Database = $Database;
 		$this->Server = $Server;
@@ -169,7 +169,7 @@ function halt($Msg) {
 		global $LoggedUser, $Cache, $Debug, $argv;
 		$DBError='MySQL: '.strval($Msg).' SQL error: '.strval($this->Errno).' ('.strval($this->Error).')';
 		if ($this->Errno == 1194) { send_irc('PRIVMSG '.ADMIN_CHAN.' :'.$this->Error); }
-		/*if ($this->Errno == 1194) { 
+		/*if ($this->Errno == 1194) {
 			preg_match("Table '(\S+)' is marked as crashed and should be repaired", $this->Error, $Matches);
 		} */
 		$Debug->analysis('!dev DB Error',$DBError,3600*24);
@@ -207,7 +207,7 @@ function query($Query,$AutoHandle=1) {
 			}
 			$Debug->analysis('Non-Fatal Deadlock:',$Query,3600*24);
 			trigger_error("Database deadlock, attempt $i");
-			
+
 			sleep($i*rand(2, 5)); // Wait longer as attempts increase
 		}
 		$QueryEndTime=microtime(true);
@@ -319,10 +319,14 @@ function to_array($Key = false, $Type = MYSQLI_BOTH, $Escape = true) {
 	function to_pair($KeyField, $ValField, $Escape = true) {
 		$Return = array();
 		while ($Row = mysqli_fetch_array($this->QueryID)) {
-			if ($Escape !== false) {
-				$Row = Misc::display_array($Row[$ValField], $Escape);
+			if ($Escape) {
+				$Key = display_str($Row[$KeyField]);
+				$Val = display_str($Row[$ValField]);
+			} else {
+				$Key = $Row[$KeyField];
+				$Val = $Row[$ValField];
 			}
-			$Return[$Row[$KeyField]] = $Row[$ValField];
+			$Return[$Key] = $Val;
 		}
 		mysqli_data_seek($this->QueryID, 0);
 		return $Return;
@@ -342,7 +346,7 @@ function set_query_id(&$ResultSet){
 		$this->QueryID = $ResultSet;
 		$this->Row = 0;
 	}
-	
+
 	function get_query_id() {
 		return $this->QueryID;
 	}
diff --git a/classes/class_paranoia.php b/classes/class_paranoia.php
index 361e4b42..b68b0bb4 100644
--- a/classes/class_paranoia.php
+++ b/classes/class_paranoia.php
@@ -44,7 +44,7 @@
 
 define("PARANOIA_ALLOWED", 1);
 define("PARANOIA_OVERRIDDEN", 2);
- 
+
 function check_paranoia($Property, $Paranoia, $UserClass, $UserID = false) {
 	global $LoggedUser, $Classes;
 	if ($Property == false) {
@@ -68,8 +68,8 @@ function check_paranoia($Property, $Paranoia, $UserClass, $UserID = false) {
 		$May = !in_array($Property, $Paranoia) && !in_array($Property . '+', $Paranoia);
 		if($May)
 			return PARANOIA_ALLOWED;
-			
-		if(check_perms('users_override_paranoia', $UserClass)) 
+
+		if(check_perms('users_override_paranoia', $UserClass))
 			return PARANOIA_OVERRIDDEN;
 		$Override=false;
 		switch ($Property) {
@@ -78,20 +78,20 @@ function check_paranoia($Property, $Paranoia, $UserClass, $UserID = false) {
 			case 'uploaded':
 			case 'lastseen':
 				if(check_perms('users_mod', $UserClass))
-					return PARANOIA_OVERRIDDEN;	
+					return PARANOIA_OVERRIDDEN;
 				break;
 			case 'snatched': case 'snatched+':
-				if(check_perms('users_view_torrents_snatchlist', $UserClass)) 
+				if(check_perms('users_view_torrents_snatchlist', $UserClass))
 					return PARANOIA_OVERRIDDEN;
 				break;
 			case 'uploads': case 'uploads+':
 			case 'seeding': case 'seeding+':
 			case 'leeching': case 'leeching+':
-				if(check_perms('users_view_seedleech', $UserClass)) 
+				if(check_perms('users_view_seedleech', $UserClass))
 					return PARANOIA_OVERRIDDEN;
 				break;
 			case 'invitedcount':
-				if(check_perms('users_view_invites', $UserClass)) 
+				if(check_perms('users_view_invites', $UserClass))
 					return PARANOIA_OVERRIDDEN;
 				break;
 		}
diff --git a/classes/class_proxies.php b/classes/class_proxies.php
index 9b4e563e..af3206b0 100644
--- a/classes/class_proxies.php
+++ b/classes/class_proxies.php
@@ -20,19 +20,19 @@ function proxyCheck($IP) {
 		if (strlen($IP) < strlen($AllowedProxies[$i])) {
 			continue;
 		}
-		
+
 		//since we're matching bit for bit iterating from the start
 		for ($j=0,$jl=strlen($IP);$j<$jl;++$j) {
 			//completed iteration and no inequality
 			if ($j == $jl-1 && $IP[$j] === $AllowedProxies[$i][$j]) {
 				return true;
 			}
-			
+
 			//wildcard
 			if ($AllowedProxies[$i][$j] === '*') {
 				return true;
 			}
-			
+
 			//inequality found
 			if ($IP[$j] !== $AllowedProxies[$i][$j]) {
 				break;
diff --git a/classes/class_search.php b/classes/class_search.php
index 1404726e..1c9f1331 100644
--- a/classes/class_search.php
+++ b/classes/class_search.php
@@ -10,30 +10,30 @@ class SPHINX_SEARCH extends SphinxClient {
 	public $Queries = array();
 	public $Time = 0.0;
 	public $Filters = array();
-	
+
 	function SPHINX_SEARCH() {
 		parent::__construct();
 		$this->SetServer(SPHINX_HOST, SPHINX_PORT);
 		$this->SetMatchMode(SPH_MATCH_EXTENDED2);
 	}
-	
+
 	/****************************************************************
 	/--- Search function --------------------------------------------
-	
-	This function queries sphinx for whatever is in $Query, in 
+
+	This function queries sphinx for whatever is in $Query, in
 	extended2 mode. It then fetches the records for each primary key
 	from memcached (by joining $CachePrefix and the primary key), and
-	fetches the fields needed ($ReturnData) from the memcached 
+	fetches the fields needed ($ReturnData) from the memcached
 	result.
-	
-	Any keys not found in memcached are then queried in MySQL, using 
+
+	Any keys not found in memcached are then queried in MySQL, using
 	$SQL. They are then cached, and merged with the memcached matches
 	and returned.
-	
+
 	$Query			- sphinx query
 	$CachePrefix	- Prefix for memcache key (no underscore)
 	$CacheLength	- How long to store data in the cache, if it's found by MySQL
-	$ReturnData	- Array of keys to the array in memcached to return. 
+	$ReturnData	- Array of keys to the array in memcached to return.
 					  If empty, return all.
 	$SQL			- SQL query to fetch results not found in memcached
 					- Should take the format of:
@@ -41,9 +41,9 @@ function SPHINX_SEARCH() {
 					  where %ids will be replaced by a list of IDs not found in memcached
 	$IDColumn		- The primary key of the SQL table - must be the
 					  same primary key returned by sphinx!
-	
+
 	****************************************************************/
-	
+
 	function search($Query='', $CachePrefix='', $CacheLength=0, $ReturnData=array(), $SQL = '', $IDColumn='ID') {
 		global $Cache, $DB;
 		$QueryStartTime=microtime(true);
@@ -59,7 +59,7 @@ function search($Query='', $CachePrefix='', $CacheLength=0, $ReturnData=array(),
 
 		$this->Queries[]=array('Params: '.$Query.' Filters: '.implode(", ", $Filters).' Indicies: '.$this->Index,($QueryEndTime-$QueryStartTime)*1000);
 		$this->Time+=($QueryEndTime-$QueryStartTime)*1000;
-		
+
 		if($Result === false) {
 			if($this->_connerror && !$Cache->get_value('sphinx_crash_reported')) {
 				send_irc('PRIVMSG '.ADMIN_CHAN.' :!dev Connection to searchd failed');
@@ -67,19 +67,19 @@ function search($Query='', $CachePrefix='', $CacheLength=0, $ReturnData=array(),
 			}
 			send_irc('PRIVMSG '.LAB_CHAN.' :Search for "'.$Query.'" ('.str_replace("\n",'',print_r($this->Filters, true)).') failed: '.$this->GetLastError());
 		}
-		
+
 		$this->TotalResults = $Result['total_found'];
 		$this->SearchTime = $Result['time'];
-		
+
 		if(empty($Result['matches'])) {
 			return false;
 		}
 		$Matches = $Result['matches'];
-		
+
 		$MatchIDs = array_keys($Matches);
-		
-		
-		
+
+
+
 		$NotFound = array();
 		$Skip = array();
 		if(!empty($ReturnData)) {
@@ -87,7 +87,7 @@ function search($Query='', $CachePrefix='', $CacheLength=0, $ReturnData=array(),
 		} else {
 			$AllFields = true;
 		}
-		
+
 		foreach($MatchIDs as $Match) {
 			$Matches[$Match] = $Matches[$Match]['attrs'];
 			if(!empty($CachePrefix)) {
@@ -120,7 +120,7 @@ function search($Query='', $CachePrefix='', $CacheLength=0, $ReturnData=array(),
 				$Matches[$Match] = array_merge($Matches[$Match], $Data);
 			}
 		}
-		
+
 		if($SQL!='') {
 			if(!empty($NotFound)) {
 				$DB->query(str_replace('%ids', implode(',',$NotFound), $SQL));
@@ -132,21 +132,21 @@ function search($Query='', $CachePrefix='', $CacheLength=0, $ReturnData=array(),
 		} else {
 			$Matches = array('matches'=>$Matches,'notfound'=>$NotFound);
 		}
-		
+
 		return $Matches;
 	}
-	
+
 	function limit($Start, $Length) {
 		$Start = (int)$Start;
 		$Length = (int)$Length;
 		$this->SetLimits($Start, $Length, $Start+$Length);
 	}
-	
-	
+
+
 	function set_index($Index) {
 		$this->Index = $Index;
 	}
-	
+
 	function set_filter($Name, $Vals, $Exclude=false) {
 		foreach($Vals as $Val) {
 			if($Exclude) {
@@ -157,12 +157,12 @@ function set_filter($Name, $Vals, $Exclude=false) {
 		}
 		$this->SetFilter($Name, $Vals, $Exclude);
 	}
-	
+
 	function set_filter_range($Name, $Min, $Max, $Exclude) {
 		$this->Filters[$Name] = array($Min.'-'.$Max);
 		$this->SetFilterRange($Name, $Min, $Max, $Exclude);
 	}
-	
+
 	function escape_string($String) {
 		return strtr($String, array(
 			'('=>'\(',
@@ -182,7 +182,7 @@ function escape_string($String) {
 			'$'=>'\$',
 			'='=>'\='));
 		}
-	
-	
+
+
 }
 ?>
diff --git a/classes/class_time.php b/classes/class_time.php
index 8032cd3a..ab43a279 100644
--- a/classes/class_time.php
+++ b/classes/class_time.php
@@ -23,7 +23,7 @@ function time_diff($TimeStamp, $Levels=2, $Span=true, $Lowercase=false) {
 	}
 	if($TimeStamp == 0) { return 'Never'; }
 	$Time = time()-$TimeStamp;
-	
+
 	// If the time is negative, then it expires in the future.
 	if($Time < 0) {
 		$Time = -$Time;
@@ -77,7 +77,7 @@ function time_diff($TimeStamp, $Levels=2, $Span=true, $Lowercase=false) {
 		if ($Return!="") {
 			$Return.=', ';
 		}
-		if ($Weeks>1) { 
+		if ($Weeks>1) {
 			$Return.=$Weeks.' weeks';
 		} else {
 			$Return.=$Weeks.' week';
@@ -120,7 +120,7 @@ function time_diff($TimeStamp, $Levels=2, $Span=true, $Lowercase=false) {
 		}
 		$Levels--;
 	}
-	
+
 	if($Return == '') {
 		$Return = 'Just now';
 	} elseif (!isset($HideAgo)) {
@@ -130,7 +130,7 @@ function time_diff($TimeStamp, $Levels=2, $Span=true, $Lowercase=false) {
 	if ($Lowercase) {
 		$Return = strtolower($Return);
 	}
-	
+
 	if ($Span) {
 		return '<span class="time" title="'.date('M d Y, H:i', $TimeStamp).'">'.$Return.'</span>';
 	} else {
diff --git a/classes/class_torrent.php b/classes/class_torrent.php
index e99f65c4..0b4ae334 100644
--- a/classes/class_torrent.php
+++ b/classes/class_torrent.php
@@ -11,7 +11,7 @@
 There are 4 data types in bencode:
 * String
 * Int
-* List - array without keys 
+* List - array without keys
 	- like array('value', 'value 2', 'value 3', 'etc')
 * Dictionary - array with string keys
 	- like array['key 1'] = 'value 1'; array['key 2'] = 'value 2';
@@ -25,22 +25,22 @@
 	- Stored as php strings. Not difficult to remember.
 
 * Integers
-	- Stored as php ints 
+	- Stored as php ints
 	- must be casted with (int)
 
 * Lists
-	- Stored as a BENCODE_LIST object. 
+	- Stored as a BENCODE_LIST object.
 	- The actual list is in BENCODE_LIST::$Val, as an array with incrementing integer indices
 	- The list in BENCODE_LIST::$Val is populated by the BENCODE_LIST::dec() function
 
 * Dictionaries
-	- Stored as a BENCODE_DICT object. 
+	- Stored as a BENCODE_DICT object.
 	- The actual list is in BENCODE_DICT::$Val, as an array with string indices
 	- The list in BENCODE_DICT::$Val is populated by the BENCODE_DICT::dec() function
 
 //----- BENCODE_* Objects -----//
 
-Lists and dictionaries are stored as objects. They each have the following 
+Lists and dictionaries are stored as objects. They each have the following
 functions:
 
 * decode(Type, $Key)
@@ -59,15 +59,15 @@ functions:
 	- Relies mostly on the encode() function
 
 Finally, as all torrents are just large dictionaries, the TORRENT class extends
-the BENCODE_DICT class. 
-	
+the BENCODE_DICT class.
+
 
 *******************************************************************************/
 class BENCODE {
 	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;
@@ -76,8 +76,8 @@ function __construct($Val, $IsParsed = false){
 			$this->Val = $Val;
 		}
 	}
-	
-	// Decode an element based on the type. The type is really just an indicator. 
+
+	// Decode an element based on the type. The type is really just an indicator.
 	function decode($Type, $Key){
 		if(is_number($Type)) { // Element is a string
 			// Get length of string
@@ -87,24 +87,24 @@ function decode($Type, $Key){
 				$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); 
-			
+			$End = strpos($this->Str, 'e', $this->Pos);
+
 			// Get the integer, and - IMPORTANT - cast it as an int, so we know later that it's an int and not a string
-			$this->Val[$Key] = (int)substr($this->Str, $this->Pos, $End-$this->Pos); 
+			$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;
@@ -112,12 +112,12 @@ function decode($Type, $Key){
 			if (!empty($this->Val[$Key]->Val)) {
 				ksort($this->Val[$Key]->Val);
 			}
-		
+
 		} else {
 			die('Invalid torrent file');
 		}
 	}
-	
+
 	function encode($Val){
 		if(is_int($Val)) { // Integer
 			return 'i'.$Val.'e';
@@ -143,7 +143,7 @@ function enc(){
 		}
 		return $Str.'e';
 	}
-	
+
 	// Decode a list
 	function dec(){
 		$Key = 0; // Array index
@@ -152,13 +152,13 @@ function dec(){
 			$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);
@@ -180,22 +180,22 @@ function enc(){
 		}
 		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++;
@@ -204,21 +204,21 @@ function dec(){
 			// $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); 
-			
+			$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;
 	}
@@ -230,12 +230,12 @@ 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));
 	}
-	
+
 	/*
 	To use this, please remove the announce-list unset in make_private and be sure to still set_announce_url for backwards compatibility
 	function set_multi_announce() {
@@ -249,14 +249,14 @@ function set_multi_announce() {
 		$this->Val['announce-list'] = $AnnounceList;
 	}
 	*/
-	
+
 	function set_announce_url($Announce) {
 		$this->Val['announce'] = $Announce;
 		ksort($this->Val);
 	}
-	
+
 	// Returns an array of:
-	// 	* the files in the torrent 
+	// 	* the files in the torrent
 	//	* the total size of files described therein
 	function file_list() {
 		$FileList = array();
@@ -276,7 +276,7 @@ function file_list() {
 			foreach ($Files as $File) {
 				$FileSize = $File->Val['length'];
 				$TotalSize += $FileSize;
-				
+
 				$FileName = ltrim(implode('/',$File->Val[$PathKey]->Val), '/');
 				$FileSizes[] = $FileSize;
 				$FileNames[] = $FileName;
@@ -296,26 +296,26 @@ function get_name() {
 			return $this->Val['info']->Val['name'];
 		}
 	}
-	
+
 	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']);
-	
+
 		// Bitcomet & Azureus cache peers in here
 		unset($this->Val['nodes']);
-		
+
 		// Azureus stores the dht_backup_enable flag here
 		unset($this->Val['azureus_properties']);
-		
+
 		// Remove web-seeds
 		unset($this->Val['url-list']);
-		
+
 		// Remove libtorrent resume info
 		unset($this->Val['libtorrent_resume']);
-		
+
 		//----- End properties that do not affect the infohash
 		if ($this->Val['info']->Val['private']) {
 			return true; // Torrent is private
diff --git a/classes/class_torrent_32bit.php b/classes/class_torrent_32bit.php
index 547a478c..e1c9a766 100644
--- a/classes/class_torrent_32bit.php
+++ b/classes/class_torrent_32bit.php
@@ -11,7 +11,7 @@
 There are 4 data types in bencode:
 * String
 * Int
-* List - array without keys 
+* List - array without keys
 	- like array('value', 'value 2', 'value 3', 'etc')
 * Dictionary - array with string keys
 	- like array['key 1'] = 'value 1'; array['key 2'] = 'value 2';
@@ -30,18 +30,18 @@
 	- If stored as an int on 32 bit boxes, it won't allow for any size over 2 gigs
 
 * Lists
-	- Stored as a BENCODE_LIST object. 
+	- Stored as a BENCODE_LIST object.
 	- The actual list is in BENCODE_LIST::$Val, as an array with incrementing integer indices
 	- The list in BENCODE_LIST::$Val is populated by the BENCODE_LIST::dec() function
 
 * Dictionaries
-	- Stored as a BENCODE_DICT object. 
+	- Stored as a BENCODE_DICT object.
 	- The actual list is in BENCODE_DICT::$Val, as an array with incrementing integer indices
 	- The list in BENCODE_DICT::$Val is populated by the BENCODE_DICT::dec() function
 
 //----- BENCODE_* Objects -----//
 
-Lists and dictionaries are stored as objects. They each have the following 
+Lists and dictionaries are stored as objects. They each have the following
 functions:
 
 * decode(Type, $Key)
@@ -60,15 +60,15 @@ functions:
 	- Relies mostly on the encode() function
 
 Finally, as all torrents are just large dictionaries, the TORRENT class extends
-the BENCODE_DICT class. 
+the BENCODE_DICT class.
 
 
 
 **Note** The version we run doesn't store ints as strings marked with [*INT*]
 We store them as php integers. You can do this too for added speed and reduced
 hackery, if you're running a 64 bit box, or if you're running a 32 bit box and
-don't care about files larger than 2 gigs. The system with the [*INT*]s was 
-coded up in around 4 minutes for STC when we discovered this problem, then 
+don't care about files larger than 2 gigs. The system with the [*INT*]s was
+coded up in around 4 minutes for STC when we discovered this problem, then
 discovered that floats aren't accurate enough to use. :(
 
 *******************************************************************************/
@@ -76,7 +76,7 @@ class BENCODE {
 	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;
@@ -96,35 +96,35 @@ function decode($Type, $Key){
 				$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); 
-			
+			$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->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*]') {
@@ -149,7 +149,7 @@ function enc(){
 		}
 		return $Str.'e';
 	}
-	
+
 	// Decode a list
 	function dec(){
 		$Key = 0; // Array index
@@ -158,13 +158,13 @@ function dec(){
 			$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);
@@ -183,22 +183,22 @@ function enc(){
 		}
 		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++;
@@ -207,21 +207,21 @@ function dec(){
 			// $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); 
-			
+			$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;
 	}
@@ -233,19 +233,19 @@ 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));
 	}
-	
+
 	function set_announce_url($Announce) {
 		$this->Val['announce'] = $Announce;
 		ksort($this->Val);
 	}
-	
+
 	// Returns an array of:
-	// 	* the files in the torrent 
+	// 	* the files in the torrent
 	//	* the total size of files described therein
 	function file_list() {
 		$FileList = array();
@@ -265,7 +265,7 @@ function file_list() {
 			foreach ($Files as $File) {
 				$FileSize = substr($File->Val['length'], 7);
 				$TotalSize += $FileSize;
-				
+
 				$FileName = ltrim(implode('/',$File->Val[$PathKey]->Val), '/');
 				$FileSizes[] = $FileSize;
 				$FileNames[] = $FileName;
@@ -285,7 +285,7 @@ function get_name() {
 			return $this->Val['info']->Val['name'];
 		}
 	}
-	
+
 	function make_private() {
 		//----- The following properties do not affect the infohash:
 
diff --git a/classes/class_torrents.php b/classes/class_torrents.php
index 0fa027fe..a6aabbca 100644
--- a/classes/class_torrents.php
+++ b/classes/class_torrents.php
@@ -103,7 +103,7 @@ public static function get_groups($GroupIDs, $Return = true, $GetArtists = true,
 				while($Torrent = $DB->next_record(MYSQLI_ASSOC, true)) {
 					$Found[$Torrent['GroupID']]['Torrents'][$Torrent['ID']] = $Torrent;
 				}
-				
+
 				// Cache it all
 				foreach ($Found as $GroupID=>$GroupInfo) {
 					$Cache->cache_value('torrent_group_'.$GroupID,
@@ -639,7 +639,7 @@ public static function can_use_token($Torrent) {
 			&& $LoggedUser['CanLeech'] == '1');
 	}
 
-	
+
 	public static function has_snatched($TorrentID) {
 		global $DB, $Cache, $LoggedUser;
 		if (empty($LoggedUser) || !$LoggedUser['ShowSnatched']) {
diff --git a/classes/class_torrentsdl.php b/classes/class_torrentsdl.php
index 1948e9ca..91dc60c6 100644
--- a/classes/class_torrentsdl.php
+++ b/classes/class_torrentsdl.php
@@ -21,6 +21,8 @@ class TorrentsDL {
 	 * @param string $Title name of the collection that will be created
 	 */
 	public function __construct(&$QueryResult, $Title) {
+		global $Cache;
+		$Cache->InternalCache = false; // The internal cache is almost completely useless for this
 		Zip::unlimit(); // Need more memory and longer timeout
 		$this->QueryResult = $QueryResult;
 		$this->Title = $Title;
@@ -168,6 +170,7 @@ public function errors() {
 	 * @return file name with at most 180 characters that is valid on most systems
 	 */
 	public static function construct_file_name($Artist, $Album, $Year, $Media, $Format, $Encoding, $TorrentID = false, $TxtExtension = false) {
+		$TorrentArtist = Misc::file_string($Artist);
 		$TorrentName = Misc::file_string($Album);
 		if ($Year > 0) {
 			$TorrentName .= " - $Year";
@@ -190,8 +193,8 @@ public static function construct_file_name($Artist, $Album, $Year, $Media, $Form
 
 		if (!$TorrentName) {
 			$TorrentName = "No Name";
-		} else if (strlen($TorrentName . $TorrentInfo) <= 197) {
-			$TorrentName = Misc::file_string($Artist) . $TorrentName;
+		} else if (strlen($Artist . $TorrentName . $TorrentInfo) <= 196) {
+			$TorrentName = $Artist . $TorrentName;
 		}
 
 		// Leave some room to the user in case the file system limits the path length
diff --git a/classes/class_user_rank.php b/classes/class_user_rank.php
index 0997744e..7b93acba 100644
--- a/classes/class_user_rank.php
+++ b/classes/class_user_rank.php
@@ -3,33 +3,33 @@
 define('PREFIX', 'percentiles_'); // Prefix for memcache keys, to make life easier
 
 class USER_RANK {
-	
+
 	// Returns a 101 row array (101 percentiles - 0 - 100), with the minimum value for that percentile as the value for each row
 	// BTW - ingenious
 	function build_table($MemKey, $Query) {
 		global $Cache,$DB;
-		
+
 		$DB->query("DROP TEMPORARY TABLE IF EXISTS temp_stats");
-		
+
 		$DB->query("CREATE TEMPORARY TABLE temp_stats
 			(ID int(10) NOT NULL PRIMARY KEY AUTO_INCREMENT,
 			Val bigint(20) NOT NULL);");
-		
+
 		$DB->query("INSERT INTO temp_stats (Val) ".$Query);
-		
+
 		$DB->query("SELECT COUNT(ID) FROM temp_stats");
 		list($UserCount) = $DB->next_record();
-		
+
 		$DB->query("SELECT MIN(Val) FROM temp_stats GROUP BY CEIL(ID/(".(int)$UserCount."/100));");
-		
+
 		$Table = $DB->to_array();
-		
+
 		// Give a little variation to the cache length, so all the tables don't expire at the same time
-		$Cache->cache_value($MemKey, $Table, 3600*24*rand(800,1000)*0.001); 
-		
+		$Cache->cache_value($MemKey, $Table, 3600*24*rand(800,1000)*0.001);
+
 		return $Table;
 	}
-	
+
 	function table_query($TableName) {
 		switch($TableName) {
 			case 'uploaded':
@@ -57,11 +57,11 @@ function table_query($TableName) {
 		}
 		return $Query;
 	}
-	
+
 	function get_rank($TableName, $Value) {
 		if($Value == 0) { return 0; }
 		global $Cache, $DB;
-			
+
 		$Table = $Cache->get_value(PREFIX.$TableName);
 		if(!$Table) {
 			//Cache lock!
@@ -84,7 +84,7 @@ function get_rank($TableName, $Value) {
 		}
 		return 100; // 100th percentile
 	}
-	
+
 	function overall_score($Uploaded, $Downloaded, $Uploads, $Requests, $Posts, $Bounty, $Artists, $Ratio){
 		// We can do this all in 1 line, but it's easier to read this way
 		if($Ratio>1) { $Ratio = 1; }
@@ -103,7 +103,7 @@ function overall_score($Uploaded, $Downloaded, $Uploads, $Requests, $Posts, $Bou
 		$TotalScore *= $Ratio;
 		return $TotalScore;
 	}
-	
+
 }
 
 
diff --git a/classes/class_useragent.php b/classes/class_useragent.php
index eb7185ad..ee1ac6fe 100644
--- a/classes/class_useragent.php
+++ b/classes/class_useragent.php
@@ -42,7 +42,7 @@ class USER_AGENT {
 		'RSS'				=> 'RSS Downloader'
 		*/
 	);
-	
+
 	var $OperatingSystems = array(
 		//Mobile
 		'SymbianOS'			=> 'Symbian',
@@ -105,7 +105,7 @@ class USER_AGENT {
 		'win'				=> 'Windows',
 		'mac'				=> 'Mac OS X'
 	);
-	
+
 	public function operating_system(&$UserAgentString) {
 		if (empty($UserAgentString)) {
 			return 'Hidden';
@@ -119,19 +119,19 @@ public function operating_system(&$UserAgentString) {
 		}
 		return $Return;
 	}
-	
+
 	public function mobile(&$UserAgentString) {
 		if (strpos($UserAgentString, 'iPad')) {
 			return false;
 		}
-		
+
 		//Mobi catches Mobile
 		if (/*strpos($UserAgentString, 'Mobile') || */strpos($UserAgentString, 'Device') || strpos($UserAgentString, 'Mobi') || strpos($UserAgentString, 'Mini') || strpos($UserAgentString, 'webOS')) {
 			return true;
 		}
 		return false;
 	}
-	
+
 	public function browser(&$UserAgentString) {
 		if (empty($UserAgentString)) {
 			return 'Hidden';
diff --git a/classes/class_users.php b/classes/class_users.php
index f7834f50..fc074fe4 100644
--- a/classes/class_users.php
+++ b/classes/class_users.php
@@ -450,9 +450,9 @@ public static function format_username($UserID, $Badges = false, $IsWarned = tru
 			$Str .= ($UserInfo['Donor'] == 1) ? '<a href="donate.php"><img src="'.STATIC_SERVER.'common/symbols/donor.png" alt="Donor" title="Donor" /></a>' : '';
         }
 
-        $Str .= ($IsWarned && $UserInfo['Warned'] != '0000-00-00 00:00:00') ? '<a href="wiki.php?action=article&amp;id=218"' 
-					. '><img src="'.STATIC_SERVER.'common/symbols/warned.png" alt="Warned" title="Warned' 
-					. ($LoggedUser['ID'] === $UserID ? ' - Expires ' . date('Y-m-d h:i', strtotime($UserInfo['Warned'])) : '') 
+        $Str .= ($IsWarned && $UserInfo['Warned'] != '0000-00-00 00:00:00') ? '<a href="wiki.php?action=article&amp;id=218"'
+					. '><img src="'.STATIC_SERVER.'common/symbols/warned.png" alt="Warned" title="Warned'
+					. ($LoggedUser['ID'] === $UserID ? ' - Expires ' . date('Y-m-d h:i', strtotime($UserInfo['Warned'])) : '')
 					. '" /></a>' : '';
 		$Str .= ($IsEnabled && $UserInfo['Enabled'] == 2) ? '<a href="rules.php"><img src="'.STATIC_SERVER.'common/symbols/disabled.png" alt="Banned" title="Be good, and you won\'t end up like this user" /></a>' : '';
 
diff --git a/classes/class_view.php b/classes/class_view.php
index 6c238476..440316e0 100644
--- a/classes/class_view.php
+++ b/classes/class_view.php
@@ -104,7 +104,7 @@ public static function render_template ($TemplateName, $Args)
 	 * @example <pre><?php
 	 *  // box.phtml
 	 *  <p id="<?=$id?>">Data</p>
-	 * 
+	 *
 	 *  // The variable $id within box.phtml will be filled by $some_id
 	 *	View::parse('section/box.phtml', array('id' => $some_id));
 	 *
diff --git a/classes/class_wiki.php b/classes/class_wiki.php
index e732491b..590f8c2a 100644
--- a/classes/class_wiki.php
+++ b/classes/class_wiki.php
@@ -3,11 +3,11 @@
 ##							 Wiki class									##
 ##########################################################################
 
-Seeing as each page has to manage its wiki separately (for performance 
+Seeing as each page has to manage its wiki separately (for performance
 reasons - JOINs instead of multiple queries), this class is rather bare.
 
-The only useful function in here is revision_history(). It creates a 
-table with the revision history for that particular wiki page. 
+The only useful function in here is revision_history(). It creates a
+table with the revision history for that particular wiki page.
 
 
 class_wiki depends on your wiki table being structured like this:
@@ -23,9 +23,9 @@ class_wiki depends on your wiki table being structured like this:
 | Time		 | datetime		| NO   | MUL | 0000-00-00 00:00:00  |		|
 +------------+--------------+------+-----+----------------------+-------+
 
-It is also recommended that you have a field in the main table for 
+It is also recommended that you have a field in the main table for
 whatever the page is (e.g. details.php main table = torrents), so you can
-do a JOIN. 
+do a JOIN.
 
 
 ########################################################################*/
@@ -39,13 +39,13 @@ function WIKI($Table, $PageID, $BaseURL = ''){
 		$this->PageID = $PageID;
 		$this->BaseURL = $BaseURL;
 	}
-	
+
 	function revision_history(){
 		global $DB;
-			
+
 		$BaseURL = $this->BaseURL;
-		$DB->query("SELECT 
-				RevisionID, 
+		$DB->query("SELECT
+				RevisionID,
 				Summary,
 				Time,
 				UserID
@@ -62,7 +62,7 @@ function revision_history(){
 		</tr>
 <? //-----------------------------------------
 		$Row = 'a';
-		while(list($RevisionID, $Summary, $Time, $UserID, $Username) = $DB->next_record()){ 
+		while(list($RevisionID, $Summary, $Time, $UserID, $Username) = $DB->next_record()){
 			$Row = ($Row == 'a') ? 'b' : 'a';
 //------------------------------------------------------ ?>
 		<tr class="row<?=$Row?>">
@@ -84,7 +84,7 @@ function revision_history(){
 //-------------------------------------------- ?>
 	</table>
 <?
-		
+
 	}
 } // class
 ?>
diff --git a/classes/class_zip.php b/classes/class_zip.php
index b3c1656c..2810117a 100644
--- a/classes/class_zip.php
+++ b/classes/class_zip.php
@@ -4,9 +4,9 @@
 |*************************************************************************|
 
 This class provides a convenient way for us to generate and serve zip
-archives to our end users, both from physical files, cached 
+archives to our end users, both from physical files, cached
 or already parsed data (torrent files). It's all done on the fly, due to
-the high probability that a filesystem stored archive will never be 
+the high probability that a filesystem stored archive will never be
 downloaded twice.
 
 Utilizes gzcompress, based upon RFC 1950
@@ -39,7 +39,7 @@
 $Zip->add_file($TorrentData, "Bookmarks/Artist - Album [2008].torrent");
 
 	Adds the parsed torrent to the archive in the Bookmarks folder (created simply by placing it in the path).
-	
+
 -----
 
 * Then, close the archive to the user:
@@ -96,12 +96,12 @@ class Zip {
 	private $Structure = ''; // Structure saved to memory
 	private $FileOffset = 0; // Offset to write data
 	private $Data = ''; //An idea
-	
+
 	public function __construct ($ArchiveName='Archive') {
 		header("Content-type: application/octet-stream"); //Stream download
 		header("Content-disposition: attachment; filename=\"$ArchiveName.zip\""); //Name the archive - Should not be urlencoded
 	}
-	
+
 	public static function unlimit () {
 		ob_end_clean();
 		set_time_limit(3600); //Limit 1 hour
@@ -121,7 +121,7 @@ public function add_file ($FileData, $ArchivePath, $TimeStamp = 0) {
 		$ZipData = gzcompress($FileData); // Ditto.
 		$ZipData = substr ($ZipData, 2,(strlen($ZipData) - 6)); // Checksum resolution
 		$ZipLength = strlen($ZipData); //Ditto.
-		$this->Data .= pack("V",$CRC32); // CRC-32 
+		$this->Data .= pack("V",$CRC32); // CRC-32
 		$this->Data .= pack("V",$ZipLength); // Compressed filesize
 		$this->Data .= pack("V",$DataLength); // Uncompressed filesize
 		$this->Data .= pack("v",strlen($ArchivePath)); // Pathname length
@@ -136,10 +136,10 @@ public function add_file ($FileData, $ArchivePath, $TimeStamp = 0) {
         /* Data descriptor
         Not needed (only needed when 3rd bitflag is set), causes problems with OS X archive utility
 		$this->Data .= pack("V",$CRC32); // CRC-32
-        $this->Data .= pack("V",$ZipLength); // Compressed filesize 
-        $this->Data .= pack("V",$DataLength); // Uncompressed filesize 
+        $this->Data .= pack("V",$ZipLength); // Compressed filesize
+        $this->Data .= pack("V",$DataLength); // Uncompressed filesize
 		END data descriptor */
-	
+
 		$FileDataLength = strlen($this->Data);
 		$this->ArchiveSize = $this->ArchiveSize + $FileDataLength; // All we really need is the size
 		$CurrentOffset = $this->ArchiveSize; // Update offsets
@@ -148,14 +148,14 @@ public function add_file ($FileData, $ArchivePath, $TimeStamp = 0) {
 		/* Central Directory Structure */
 		$CDS = "\x50\x4b\x01\x02"; // CDS signature
 		$CDS .="\x14\x00"; // Constructor version
-		$CDS .="\x14\x00"; // Version requirements 
+		$CDS .="\x14\x00"; // Version requirements
 		$CDS .="\x00\x08"; // Bit flag - 0x8 = UTF-8 file names
 		$CDS .="\x08\x00"; // Compression
-		$CDS .="\x00\x00\x00\x00"; // Last modified 
-		$CDS .= pack("V",$CRC32); // CRC-32 
-		$CDS .= pack("V",$ZipLength); // Compressed filesize 
-		$CDS .= pack("V",$DataLength); // Uncompressed filesize 
-		$CDS .= pack("v",strlen($ArchivePath)); // Pathname length 
+		$CDS .="\x00\x00\x00\x00"; // Last modified
+		$CDS .= pack("V",$CRC32); // CRC-32
+		$CDS .= pack("V",$ZipLength); // Compressed filesize
+		$CDS .= pack("V",$DataLength); // Uncompressed filesize
+		$CDS .= pack("v",strlen($ArchivePath)); // Pathname length
 		$CDS .="\x00\x00"; // Extra field length (0'd so we can ignore this)
 		$CDS .="\x00\x00"; // File comment length  (no comment, 0'd)
 		$CDS .="\x00\x00"; // Disk number start (0 seems valid)
@@ -171,14 +171,14 @@ public function add_file ($FileData, $ArchivePath, $TimeStamp = 0) {
 	}
 
 	public function close_stream() {
-		echo $this->Structure; // Structure Root 
+		echo $this->Structure; // Structure Root
 		echo "\x50\x4b\x05\x06"; // End of central directory signature
 		echo "\x00\x00"; // This disk
-		echo "\x00\x00"; // CDS start 
+		echo "\x00\x00"; // CDS start
 		echo pack("v", $this->ArchiveFiles); // Handle the numebr of entries
 		echo pack("v", $this->ArchiveFiles); // Ditto
-		echo pack("V", strlen($this->Structure)); //Size 
-		echo pack("V", $this->ArchiveSize); // Offset 
+		echo pack("V", strlen($this->Structure)); //Size
+		echo pack("V", $this->ArchiveSize); // Offset
 		echo "\x00\x00"; // No comment, close it off
 	}
 }
diff --git a/classes/permissions_form.php b/classes/permissions_form.php
index 4cd95ec2..63c2828d 100644
--- a/classes/permissions_form.php
+++ b/classes/permissions_form.php
@@ -6,7 +6,7 @@
  ** This function is used to create both the class permissions form, and the   **
  ** user custom permissions form.											  **
  ********************************************************************************/
- 
+
  $PermissionsArray = array(
 	'site_leech' => 'Can leech (Does this work?).',
 	'site_upload' => 'Upload torrent access.',
@@ -31,7 +31,7 @@
 	'site_moderate_requests' => 'Request moderation access.',
 	'site_delete_artist' => 'Can delete artists (must be able to delete torrents+requests).',
 	'site_moderate_forums' => 'Forum moderation access.',
-	
+
 	'site_admin_forums' => 'Forum administrator access.',
 	'site_forums_double_post' => 'Can double post in the forums.',
 	'site_view_flow' => 'Can view stats and data pools.',
@@ -113,7 +113,7 @@
 	'artist_edit_vanityhouse' => 'Can mark artists as part of Vanity House.'
 
  );
- 
+
 function permissions_form(){ ?>
 <div class="permissions">
 	<div class="permission_container">
@@ -216,9 +216,9 @@ function permissions_form(){ ?>
 			</tr>
 			<tr>
 				<td>
-			
+
 					<? display_perm('torrents_edit', 'Can edit any torrent'); ?>
-					
+
 					<? display_perm('torrents_delete', 'Can delete torrents'); ?>
 					<? display_perm('torrents_delete_fast', 'Can delete more than 3 torrents at a time.'); ?>
 					<? display_perm('torrents_freeleech', 'Can make torrents freeleech'); ?>
diff --git a/classes/sphinxapi.php b/classes/sphinxapi.php
index aa72a811..a9b5063e 100644
--- a/classes/sphinxapi.php
+++ b/classes/sphinxapi.php
@@ -125,7 +125,7 @@
 function sphPackI64 ( $v )
 {
 	assert ( is_numeric($v) );
-	
+
 	// x64
 	if ( PHP_INT_SIZE>=8 )
 	{
@@ -137,7 +137,7 @@ function sphPackI64 ( $v )
 	if ( is_int($v) )
 		return pack ( "NN", $v < 0 ? -1 : 0, $v );
 
-	// x32, bcmath	
+	// x32, bcmath
 	if ( function_exists("bcmul") )
 	{
 		if ( bccomp ( $v, 0 ) == -1 )
@@ -174,16 +174,16 @@ function sphPackI64 ( $v )
 function sphPackU64 ( $v )
 {
 	assert ( is_numeric($v) );
-	
+
 	// x64
 	if ( PHP_INT_SIZE>=8 )
 	{
 		assert ( $v>=0 );
-		
+
 		// x64, int
 		if ( is_int($v) )
 			return pack ( "NN", $v>>32, $v&0xFFFFFFFF );
-						  
+
 		// x64, bcmath
 		if ( function_exists("bcmul") )
 		{
@@ -191,12 +191,12 @@ function sphPackU64 ( $v )
 			$l = bcmod ( $v, 4294967296 );
 			return pack ( "NN", $h, $l );
 		}
-		
+
 		// x64, no-bcmath
 		$p = max ( 0, strlen($v) - 13 );
 		$lo = (int)substr ( $v, $p );
 		$hi = (int)substr ( $v, 0, $p );
-	
+
 		$m = $lo + $hi*1316134912;
 		$l = $m % 4294967296;
 		$h = $hi*2328 + (int)($m/4294967296);
@@ -207,7 +207,7 @@ function sphPackU64 ( $v )
 	// x32, int
 	if ( is_int($v) )
 		return pack ( "NN", 0, $v );
-	
+
 	// x32, bcmath
 	if ( function_exists("bcmul") )
 	{
@@ -220,7 +220,7 @@ function sphPackU64 ( $v )
 	$p = max(0, strlen($v) - 13);
 	$lo = (float)substr($v, $p);
 	$hi = (float)substr($v, 0, $p);
-	
+
 	$m = $lo + $hi*1316134912.0;
 	$q = floor($m / 4294967296.0);
 	$l = $m - ($q * 4294967296.0);
@@ -276,11 +276,11 @@ function sphUnpackU64 ( $v )
 	// x32, bcmath
 	if ( function_exists("bcmul") )
 		return bcadd ( $lo, bcmul ( $hi, "4294967296" ) );
-	
+
 	// x32, no-bcmath
 	$hi = (float)$hi;
 	$lo = (float)$lo;
-	
+
 	$q = floor($hi/10000000.0);
 	$r = $hi - $q*10000000.0;
 	$m = $lo + $r*4967296.0;
@@ -323,7 +323,7 @@ function sphUnpackI64 ( $v )
 			return $lo;
 		return sprintf ( "%.0f", $lo - 4294967296.0 );
 	}
-	
+
 	$neg = "";
 	$c = 0;
 	if ( $hi<0 )
@@ -332,7 +332,7 @@ function sphUnpackI64 ( $v )
 		$lo = ~$lo;
 		$c = 1;
 		$neg = "-";
-	}	
+	}
 
 	$hi = sprintf ( "%u", $hi );
 	$lo = sprintf ( "%u", $lo );
@@ -344,7 +344,7 @@ function sphUnpackI64 ( $v )
 	// x32, no-bcmath
 	$hi = (float)$hi;
 	$lo = (float)$lo;
-	
+
 	$q = floor($hi/10000000.0);
 	$r = $hi - $q*10000000.0;
 	$m = $lo + $r*4967296.0;
@@ -507,7 +507,7 @@ function SetServer ( $host, $port = 0 )
 			$this->_path = $host;
 			return;
 		}
-				
+
 		assert ( is_int($port) );
 		$this->_host = $host;
 		$this->_port = $port;
@@ -587,14 +587,14 @@ function _Connect ()
 			$fp = @fsockopen ( $host, $port, $errno, $errstr );
 		else
 			$fp = @fsockopen ( $host, $port, $errno, $errstr, $this->_timeout );
-		
+
 		if ( !$fp )
 		{
 			if ( $this->_path )
 				$location = $this->_path;
 			else
 				$location = "{$this->_host}:{$this->_port}";
-			
+
 			$errstr = trim ( $errstr );
 			$this->_error = "connection to $location failed (errno=$errno, msg=$errstr)";
 			$this->_connerror = true;
@@ -1228,7 +1228,7 @@ function _ParseSearchResponse ( $response, $nreqs )
 					if ( $type==SPH_ATTR_FLOAT )
 					{
 						list(,$uval) = unpack ( "N*", substr ( $response, $p, 4 ) ); $p += 4;
-						list(,$fval) = unpack ( "f*", pack ( "L", $uval ) ); 
+						list(,$fval) = unpack ( "f*", pack ( "L", $uval ) );
 						$attrvals[$attr] = $fval;
 						continue;
 					}
@@ -1257,7 +1257,7 @@ function _ParseSearchResponse ( $response, $nreqs )
 					} else if ( $type==SPH_ATTR_STRING )
 					{
 						$attrvals[$attr] = substr ( $response, $p, $val );
-						$p += $val;						
+						$p += $val;
 					} else
 					{
 						$attrvals[$attr] = sphFixUint($val);
@@ -1624,7 +1624,7 @@ function Close()
 
 		fclose ( $this->_socket );
 		$this->_socket = false;
-		
+
 		return true;
 	}
 
diff --git a/delays.php b/delays.php
index 663fc008..50e58b38 100644
--- a/delays.php
+++ b/delays.php
@@ -1,3 +1,3 @@
-<? 
+<?
 define('ERROR_EXCEPTION', true);
 require('classes/script_start.php');
diff --git a/design/privatefooter.php b/design/privatefooter.php
index c8aa1c2b..79e76324 100644
--- a/design/privatefooter.php
+++ b/design/privatefooter.php
@@ -16,7 +16,7 @@
 			}
 		}
 	}
-	
+
 	$Load = sys_getloadavg();
 ?>
 	<p>
diff --git a/design/privateheader.php b/design/privateheader.php
index bf1b8e99..23924c54 100644
--- a/design/privateheader.php
+++ b/design/privateheader.php
@@ -264,8 +264,6 @@
 		$Cache->cache_value('staff_blog_latest_time', $LatestSBlogTime, 1209600);
 	}
 	if ($SBlogReadTime < $LatestSBlogTime) {
-		global $Debug;
-		$Debug->log_var(array('b' => $SBlogReadTime, 'l' => $LatestSBlogTime), 'Times');
 		$Alerts[] = '<a href="staffblog.php">'.'New Staff Blog Post!'.'</a>';
 	}
 }
@@ -359,7 +357,7 @@
 		list($NumTorrentReports) = $DB->next_record();
 		$Cache->cache_value('num_torrent_reportsv2', $NumTorrentReports, 0);
 	}
-	
+
 	$ModBar[] = '<a href="reportsv2.php">'.$NumTorrentReports.(($NumTorrentReports == 1) ? ' Report' : ' Reports').'</a>';
 }
 
@@ -413,7 +411,7 @@
 <?
 }
 //Done handling alertbars
-	
+
 if(!$Mobile && $LoggedUser['Rippy'] != 'Off') {
 	switch($LoggedUser['Rippy']) {
 		case 'PM' :
@@ -446,7 +444,7 @@
 		</div>
 		<div class="rippy" onclick="rippyclick();"></div>
 	</div>
-	
+
 <?
 	}
 }
diff --git a/design/publicheader.php b/design/publicheader.php
index 1a7b37fd..cc6c6959 100644
--- a/design/publicheader.php
+++ b/design/publicheader.php
@@ -25,7 +25,7 @@
 	<script src="<?=STATIC_SERVER?>functions/global.js?v=<?=filemtime(SERVER_ROOT.'/static/functions/global.js')?>" type="text/javascript"></script>
 <? if ($Mobile) { ?>
 	<script src="<?=STATIC_SERVER?>styles/mobile/style.js?v=<?=filemtime(SERVER_ROOT.'/static/mobile/style.js')?>" type="text/javascript"></script>
-<? } 
+<? }
 
 ?>
 </head>
@@ -39,7 +39,7 @@
 				<ul>
 					<li><a href="index.php">Home</a></li>
 					<li><a href="login.php">Login</a></li>
-<? if (OPEN_REGISTRATION) { ?> 
+<? if (OPEN_REGISTRATION) { ?>
 					<li><a href="register.php">Register</a></li>
 <? } ?>
 				</ul>
diff --git a/forums.php b/forums.php
index 663fc008..50e58b38 100644
--- a/forums.php
+++ b/forums.php
@@ -1,3 +1,3 @@
-<? 
+<?
 define('ERROR_EXCEPTION', true);
 require('classes/script_start.php');
diff --git a/irc_raw.php b/irc_raw.php
index a6a2e04d..1126704b 100644
--- a/irc_raw.php
+++ b/irc_raw.php
@@ -26,7 +26,7 @@
 	if (preg_match('/PING :(.+)$/', $Line, $Ping)) {
 		fwrite($Socket, "PONG :$Ping[1]\n");
 	}
-	
+
 	// Example command
 	if(stripos('!mode', $Line)) {
 	fwrite($Socket, "PRIVMSG ".RELAY." :Mode command used\n");
@@ -34,6 +34,6 @@
 		fwrite($Socket, "WHOIS WhatMan\n");
 		fwrite($Socket, "MODE Orbulon\n");
 	}
-	
+
 	fwrite($Socket, "PRIVMSG ".RELAY." : -----".$Line."\n");
 }
diff --git a/opensearch.php b/opensearch.php
index 47cc0aa4..791b84fe 100644
--- a/opensearch.php
+++ b/opensearch.php
@@ -26,43 +26,43 @@
 	<Url type="text/html" method="get" template="http<?=($SSL?'s':'')?>://<?=SITE_URL?>/artist.php?artistname={searchTerms}"></Url>
 	<Url type="application/x-suggestions+json" template="http<?=($SSL?'s':'')?>://<?=SITE_URL?>/artist.php?action=autocomplete&amp;name={searchTerms}"/>
 	<moz:SearchForm>http<?=($SSL?'s':'')?>://<?=SITE_URL?>/torrents.php?action=advanced</moz:SearchForm>
-<? 
+<?
 		break;
 	case 'torrents':
 ?>
 	<Url type="text/html" method="get" template="http<?=($SSL?'s':'')?>://<?=SITE_URL?>/torrents.php?action=basic&amp;searchstr={searchTerms}"></Url>
 	<moz:SearchForm>http<?=($SSL?'s':'')?>://<?=SITE_URL?>/torrents.php</moz:SearchForm>
-<? 
+<?
 		break;
 	case 'requests':
 ?>
 	<Url type="text/html" method="get" template="http<?=($SSL?'s':'')?>://<?=SITE_URL?>/requests.php?search={searchTerms}"></Url>
 	<moz:SearchForm>http<?=($SSL?'s':'')?>://<?=SITE_URL?>/requests.php</moz:SearchForm>
-<? 
+<?
 		break;
 	case 'forums':
 ?>
 	<Url type="text/html" method="get" template="http<?=($SSL?'s':'')?>://<?=SITE_URL?>/forums.php?action=search&amp;search={searchTerms}"></Url>
 	<moz:SearchForm>http<?=($SSL?'s':'')?>://<?=SITE_URL?>/forums.php?action=search</moz:SearchForm>
-<? 
+<?
 		break;
 	case 'users':
 ?>
 	<Url type="text/html" method="get" template="http<?=($SSL?'s':'')?>://<?=SITE_URL?>/user.php?action=search&amp;search={searchTerms}"></Url>
 	<moz:SearchForm>http<?=($SSL?'s':'')?>://<?=SITE_URL?>/user.php?action=search</moz:SearchForm>
-<? 
+<?
 		break;
 	case 'wiki':
 ?>
 	<Url type="text/html" method="get" template="http<?=($SSL?'s':'')?>://<?=SITE_URL?>/wiki.php?action=search&amp;search={searchTerms}"></Url>
 	<moz:SearchForm>http<?=($SSL?'s':'')?>://<?=SITE_URL?>/wiki.php?action=search</moz:SearchForm>
-<? 
+<?
 		break;
 	case 'log':
 ?>
 	<Url type="text/html" method="get" template="http<?=($SSL?'s':'')?>://<?=SITE_URL?>/log.php?search={searchTerms}"></Url>
 	<moz:SearchForm>http<?=($SSL?'s':'')?>://<?=SITE_URL?>/log.php</moz:SearchForm>
-<? 
+<?
 		break;
 }
 ?>
diff --git a/sections/ajax/announcements.php b/sections/ajax/announcements.php
index ccc280a4..1aa4d617 100644
--- a/sections/ajax/announcements.php
+++ b/sections/ajax/announcements.php
@@ -60,14 +60,14 @@
 	if (strtotime($NewsTime) > time()) {
 		continue;
 	}
-	
+
 	$JsonAnnouncements[] = array(
 		'newsId' => (int) $NewsID,
 		'title' => $Title,
 		'body' => $Text->full_format($Body),
 		'newsTime' => $NewsTime
 	);
-	
+
 	if (++$Count > 4) {
 		break;
 	}
diff --git a/sections/ajax/better/index.php b/sections/ajax/better/index.php
index ca48fcf9..ecb78a25 100644
--- a/sections/ajax/better/index.php
+++ b/sections/ajax/better/index.php
@@ -15,10 +15,10 @@
 			break;
 		case 'artistless':
 			include(SERVER_ROOT.'/sections/ajax/better/artistless.php');
-			break;			
+			break;
 		case 'tags':
 			include(SERVER_ROOT.'/sections/ajax/better/tags.php');
-			break;			
+			break;
 		case 'folders':
 			include(SERVER_ROOT.'/sections/ajax/better/folders.php');
 			break;
diff --git a/sections/ajax/better/single.php b/sections/ajax/better/single.php
index 70a5ebba..553aa3c9 100644
--- a/sections/ajax/better/single.php
+++ b/sections/ajax/better/single.php
@@ -21,7 +21,7 @@
 foreach ($Results as $GroupID=>$Group) {
 	list($GroupID, $GroupName, $GroupYear, $GroupRecordLabel, $GroupCatalogueNumber, $TagList, $ReleaseType, $GroupVanityHouse, $Torrents, $Artists) = array_values($Group);
 	$FlacID = $GroupIDs[$GroupID]['TorrentID'];
-	
+
 	$JsonArtists = array();
 	if(count($Artists)>0) {
 		foreach ($Artists as $Artist) {
@@ -32,7 +32,7 @@
 			);
 		}
 	}
-	
+
 	$JsonResults[] = array(
 		'torrentId' => (int) $FlacID,
 		'groupId' => (int) $GroupID,
diff --git a/sections/ajax/bookmarks/artists.php b/sections/ajax/bookmarks/artists.php
index c8b6efad..13287b95 100644
--- a/sections/ajax/bookmarks/artists.php
+++ b/sections/ajax/bookmarks/artists.php
@@ -2,7 +2,7 @@
 
 if(!empty($_GET['userid'])) {
 	if(!check_perms('users_override_paranoia')) {
-		print 
+		print
 			json_encode(
 				array(
 					'status' => 'failure'
@@ -13,7 +13,7 @@
 	$UserID = $_GET['userid'];
 	$Sneaky = ($UserID != $LoggedUser['ID']);
 	if(!is_number($UserID)) {
-		print 
+		print
 			json_encode(
 				array(
 					'status' => 'failure'
diff --git a/sections/ajax/bookmarks/index.php b/sections/ajax/bookmarks/index.php
index 9d4f83ed..735428b1 100644
--- a/sections/ajax/bookmarks/index.php
+++ b/sections/ajax/bookmarks/index.php
@@ -1,7 +1,7 @@
 <?
 include(SERVER_ROOT.'/sections/bookmarks/functions.php');
 
-// Number of users per page 
+// Number of users per page
 define('BOOKMARKS_PER_PAGE', '20');
 
 if (empty($_REQUEST['type'])) { $_REQUEST['type'] = 'torrents'; }
@@ -22,7 +22,7 @@
 		require(SERVER_ROOT.'/sections/ajax/requests/requests.php');
 		break;
 	default:
-		print 
+		print
 			json_encode(
 				array(
 					'status' => 'failure'
diff --git a/sections/ajax/bookmarks/torrents.php b/sections/ajax/bookmarks/torrents.php
index 93443646..2b7e980a 100644
--- a/sections/ajax/bookmarks/torrents.php
+++ b/sections/ajax/bookmarks/torrents.php
@@ -28,8 +28,8 @@ function compare($X, $Y){
 	list($K, list($TorrentList, $CollageDataList)) = each($Data);
 } else {
 	// Build the data for the collage and the torrent list
-	$DB->query("SELECT 
-		bt.GroupID, 
+	$DB->query("SELECT
+		bt.GroupID,
 		tg.WikiImage,
 		tg.CategoryID,
 		bt.Time
@@ -37,7 +37,7 @@ function compare($X, $Y){
 		JOIN torrents_group AS tg ON tg.ID=bt.GroupID
 		WHERE bt.UserID='$UserID'
 		ORDER BY bt.Time");
-	
+
 	$GroupIDs = $DB->collect('GroupID');
 	$CollageDataList=$DB->to_array('GroupID', MYSQLI_ASSOC);
 	if(count($GroupIDs)>0) {
diff --git a/sections/ajax/forum/forum.php b/sections/ajax/forum/forum.php
index 6cddf24d..baca2afc 100644
--- a/sections/ajax/forum/forum.php
+++ b/sections/ajax/forum/forum.php
@@ -107,7 +107,7 @@
 	// This is done here so we get the benefit of the caching, and we
 	// don't have to make a database query for each topic on the page
 	$LastRead = $DB->to_array('TopicID');
-	
+
 	$JsonTopics = array();
 	foreach ($Forum as $Topic) {
 		list($TopicID, $Title, $AuthorID, $Locked, $Sticky, $PostCount, $LastID, $LastTime, $LastAuthorID) = array_values($Topic);
@@ -122,7 +122,7 @@
 		$AuthorName = $UserInfo['Username'];
 		$UserInfo = Users::user_info($LastAuthorID);
 		$LastAuthorName = $UserInfo['Username'];
-		
+
 		$JsonTopics[] = array(
 			'topicId' => (int) $TopicID,
 			'title' => display_str($Title),
diff --git a/sections/ajax/forum/index.php b/sections/ajax/forum/index.php
index 16dca4de..5249d35d 100644
--- a/sections/ajax/forum/index.php
+++ b/sections/ajax/forum/index.php
@@ -57,7 +57,7 @@
 		unset($ForumID, $Forum);
 		$Cache->cache_value('forums_list', $Forums, 0); //Inf cache.
 	}
-	
+
 	if(empty($_GET['type']) || $_GET['type'] == 'main') {
 		include(SERVER_ROOT.'/sections/ajax/forum/main.php');
 	} else {
@@ -96,7 +96,7 @@ function get_forum_info($ForumID) {
 		}
 		// Makes an array, with $Forum['Name'], etc.
 		$Forum = $DB->next_record(MYSQLI_ASSOC);
-		
+
 		$Cache->cache_value('ForumInfo_'.$ForumID, $Forum, 86400); // Cache for a day
 	}
 	return $Forum;
diff --git a/sections/ajax/forum/main.php b/sections/ajax/forum/main.php
index f7e219c2..101a9334 100644
--- a/sections/ajax/forum/main.php
+++ b/sections/ajax/forum/main.php
@@ -56,14 +56,14 @@
 		);
 		$JsonForums = array();
 	}
-	
+
 	if((!$Locked || $Sticky) && $LastPostID != 0 && ((empty($LastRead[$LastTopicID]) || $LastRead[$LastTopicID]['PostID'] < $LastPostID) && strtotime($LastTime)>$LoggedUser['CatchupTime'])) {
 		$Read = 'unread';
 	} else {
 		$Read = 'read';
 	}
 	$UserInfo = Users::user_info($LastAuthorID);
-	
+
 	$JsonForums[] = array(
 		'forumId' => (int) $ForumID,
 		'forumName' => $ForumName,
diff --git a/sections/ajax/forum/thread.php b/sections/ajax/forum/thread.php
index 46766ee3..e227b29c 100644
--- a/sections/ajax/forum/thread.php
+++ b/sections/ajax/forum/thread.php
@@ -141,13 +141,13 @@
 		$Answers = unserialize($Answers);
 		$DB->query("SELECT Vote, COUNT(UserID) FROM forums_polls_votes WHERE TopicID='$ThreadID' GROUP BY Vote");
 		$VoteArray = $DB->to_array(false, MYSQLI_NUM);
-		
+
 		$Votes = array();
 		foreach ($VoteArray as $VoteSet) {
-			list($Key,$Value) = $VoteSet; 
+			list($Key,$Value) = $VoteSet;
 			$Votes[$Key] = $Value;
 		}
-		
+
 		foreach(array_keys($Answers) as $i) {
 			if (!isset($Votes[$i])) {
 				$Votes[$i] = 0;
@@ -155,7 +155,7 @@
 		}
 		$Cache->cache_value('polls_'.$ThreadID, array($Question,$Answers,$Votes,$Featured,$Closed), 0);
 	}
-	
+
 	if (!empty($Votes)) {
 		$TotalVotes = array_sum($Votes);
 		$MaxVotes = max($Votes);
@@ -163,7 +163,7 @@
 		$TotalVotes = 0;
 		$MaxVotes = 0;
 	}
-	
+
 	$RevealVoters = in_array($ForumID, $ForumsRevealVoters);
 	//Polls lose the you voted arrow thingy
 	$DB->query("SELECT Vote FROM forums_polls_votes WHERE UserID='".$LoggedUser['ID']."' AND TopicID='$ThreadID'");
@@ -175,14 +175,14 @@
 			$Answers[$UserResponse] = '&raquo; '.$Answers[$UserResponse];
 		}
 	}
-	
+
 	$JsonPoll['closed'] = $Closed == 1;
 	$JsonPoll['featured'] = $Featured;
 	$JsonPoll['question'] = $Question;
 	$JsonPoll['maxVotes'] = (int) $MaxVotes;
 	$JsonPoll['totalVotes'] = $TotalVotes;
 	$JsonPollAnswers = array();
-	
+
 	foreach($Answers as $i => $Answer) {
 		if (!empty($Votes[$i]) && $TotalVotes > 0) {
 			$Ratio = $Votes[$i]/$MaxVotes;
@@ -197,13 +197,13 @@
 			'percent' => $Percent
 		);
 	}
-	
+
 	if ($UserResponse !== null || $Closed || $ThreadInfo['IsLocked'] || $LoggedUser['Class'] < $Forums[$ForumID]['MinClassWrite']) {
-		$JsonPoll['voted'] = True;	
+		$JsonPoll['voted'] = True;
 	} else {
 		$JsonPoll['voted'] = False;
 	}
-	
+
 	$JsonPoll['answers'] = $JsonPollAnswers;
 }
 
@@ -241,7 +241,7 @@
 			'enabled' => $Enabled == 2 ? false : true,
 			'userTitle' => $UserTitle
 		),
-		
+
 	);
 }
 
diff --git a/sections/ajax/index.php b/sections/ajax/index.php
index 9c1e72d8..999635de 100644
--- a/sections/ajax/index.php
+++ b/sections/ajax/index.php
@@ -2,9 +2,9 @@
 /*
 AJAX Switch Center
 
-This page acts as an AJAX "switch" - it's called by scripts, and it includes the required pages. 
+This page acts as an AJAX "switch" - it's called by scripts, and it includes the required pages.
 
-The required page is determined by $_GET['action']. 
+The required page is determined by $_GET['action'].
 
 */
 
diff --git a/sections/ajax/notifications.php b/sections/ajax/notifications.php
index e83f04c3..dc5ee5d0 100644
--- a/sections/ajax/notifications.php
+++ b/sections/ajax/notifications.php
@@ -69,7 +69,7 @@
 		$TorrentInfo = $GroupInfo['Torrents'][$TorrentID];
 
 		if ($Result['UnRead'] == 1) $NumNew++;
-		
+
 		$JsonNotifications[] = array(
 			'torrentId' => (int) $TorrentID,
 			'groupId' => (int) $GroupID,
diff --git a/sections/ajax/request.php b/sections/ajax/request.php
index 06fb9ce9..3c5c39a9 100644
--- a/sections/ajax/request.php
+++ b/sections/ajax/request.php
@@ -17,7 +17,7 @@
 include(SERVER_ROOT.'/classes/class_text.php');
 $Text = new TEXT;
 
-if(empty($_GET['id']) || !is_number($_GET['id'])) { 
+if(empty($_GET['id']) || !is_number($_GET['id'])) {
 	print
 		json_encode(
 			array(
@@ -31,7 +31,7 @@
 
 //First things first, lets get the data for the request.
 
-$Request = Requests::get_requests(array($RequestID));	
+$Request = Requests::get_requests(array($RequestID));
 $Request = $Request['matches'][$RequestID];
 if(empty($Request)) {
 	print
@@ -61,14 +61,14 @@
 	$ArtistForm = get_request_artists($RequestID);
 	$ArtistName = Artists::display_artists($ArtistForm, false, true);
 	$ArtistLink = Artists::display_artists($ArtistForm, true, true);
-	
+
 	if($IsFilled) {
 		$DisplayLink = $ArtistLink."<a href='torrents.php?torrentid=".$TorrentID."'>".$Title."</a> [".$Year."]";
 	} else {
 		$DisplayLink = $ArtistLink.$Title." [".$Year."]";
 	}
 	$FullName = $ArtistName.$Title." [".$Year."]";
-	
+
 	if($BitrateList != "") {
 		$BitrateString = implode(", ", explode("|", $BitrateList));
 		$FormatString = implode(", ", explode("|", $FormatList));
@@ -78,13 +78,13 @@
 		$FormatString = "Unknown, please read the description.";
 		$MediaString = "Unknown, please read the description.";
 	}
-	
+
 	if(empty($ReleaseType)) {
 		$ReleaseName = "Unknown";
 	} else {
 		$ReleaseName = $ReleaseTypes[$ReleaseType];
 	}
-	
+
 } else if($CategoryName == "Audiobooks" || $CategoryName == "Comedy") {
 	$FullName = $Title." [".$Year."]";
 	$DisplayLink = $Title." [".$Year."]";
@@ -121,7 +121,7 @@
 
 $JsonTopContributors = array();
 $VoteMax = ($VoteCount < 5 ? $VoteCount : 5);
-for($i = 0; $i < $VoteMax; $i++) { 
+for($i = 0; $i < $VoteMax; $i++) {
 	$User = array_shift($RequestVotes['Voters']);
 	$JsonTopContributors[] = array(
 		'userId' => (int) $User['UserID'],
diff --git a/sections/ajax/requests.php b/sections/ajax/requests.php
index a029743d..7e4bdf0e 100644
--- a/sections/ajax/requests.php
+++ b/sections/ajax/requests.php
@@ -7,15 +7,15 @@
 $OrderWays = array('year', 'votes', 'bounty', 'created', 'lastvote', 'filled');
 list($Page,$Limit) = Format::page_limit(REQUESTS_PER_PAGE);
 $Submitted = !empty($_GET['submit']);
-					
-//Paranoia					
+
+//Paranoia
 $UserInfo = Users::user_info((int)$_GET['userid']);
 $Perms = Permissions::get_permissions($UserInfo['PermissionID']);
 $UserClass = $Perms['Class'];
 
 $BookmarkView = false;
 
-if(empty($_GET['type'])) { 
+if(empty($_GET['type'])) {
 	$Title = 'Requests';
 	if(!check_perms('site_see_old_requests') || empty($_GET['showall'])) {
 		$SS->set_filter('visible', array(1));
@@ -137,7 +137,7 @@
 				unset($ReleaseArray[$Index]);
 			}
 		}
-		
+
 		if(count($ReleaseArray) >= 1) {
 			$SS->set_filter('releasetype', $ReleaseArray);
 		}
@@ -153,7 +153,7 @@
 				$FormatNameArray[$Index] = '"'.strtr($Formats[$MasterIndex], '-.', '  ').'"';
 			}
 		}
-		
+
 		if(count($FormatNameArray) >= 1) {
 			$Queries[]='@formatlist (any | '.implode(' | ', $FormatNameArray).')';
 		}
@@ -287,11 +287,11 @@
 			unset($SphinxResults['matches'][$ID]);
 		}
 	}
-	
+
 	// Merge SQL results with memcached results
 	foreach($SQLResults['matches'] as $ID => $SQLResult) {
 		$SphinxResults['matches'][$ID] = $SQLResult;
-		
+
 		//$Requests['matches'][$ID] = array_merge($Requests['matches'][$ID], $SQLResult);
 		//We ksort because depending on the filter modes, we're given our data in an unpredictable order
 		//ksort($Requests['matches'][$ID]);
@@ -316,24 +316,24 @@
 	$JsonResults = array();
 	$TimeCompare = 1267643718; // Requests v2 was implemented 2010-03-03 20:15:18
 	foreach ($Requests as $RequestID => $Request) {
-		
-		//list($BitrateList, $CatalogueNumber, $CategoryID, $Description, $FillerID, $FormatList, $RequestID, $Image, $LogCue, $MediaList, $ReleaseType, 
-		//	$Tags, $TimeAdded, $TimeFilled, $Title, $TorrentID, $RequestorID, $RequestorName, $Year, $RequestID, $Categoryid, $FillerID, $LastVote, 
+
+		//list($BitrateList, $CatalogueNumber, $CategoryID, $Description, $FillerID, $FormatList, $RequestID, $Image, $LogCue, $MediaList, $ReleaseType,
+		//	$Tags, $TimeAdded, $TimeFilled, $Title, $TorrentID, $RequestorID, $RequestorName, $Year, $RequestID, $Categoryid, $FillerID, $LastVote,
 		//	$ReleaseType, $TagIDs, $TimeAdded, $TimeFilled, $TorrentID, $RequestorID, $Voters) = array_values($Request);
-		
-		list($RequestID, $RequestorID, $RequestorName, $TimeAdded, $LastVote, $CategoryID, $Title, $Year, $Image, $Description, $CatalogueNumber, 
+
+		list($RequestID, $RequestorID, $RequestorName, $TimeAdded, $LastVote, $CategoryID, $Title, $Year, $Image, $Description, $CatalogueNumber,
 			$ReleaseType, $BitrateList, $FormatList, $MediaList, $LogCue, $FillerID, $FillerName, $TorrentID, $TimeFilled) = $Request;
-			
+
 		$RequestVotes = get_votes_array($RequestID);
-		
+
 		$VoteCount = count($RequestVotes['Voters']);
-		
+
 		if($CategoryID == 0) {
 			$CategoryName = "Unknown";
 		} else {
 			$CategoryName = $Categories[$CategoryID - 1];
 		}
-		
+
 		$JsonArtists = array();
 		if($CategoryName == "Music") {
 			$ArtistForm = get_request_artists($RequestID);
@@ -341,7 +341,7 @@
 		}
 
 		$Tags = $Request['Tags'];
-		
+
 		$JsonResults[] = array(
 			'requestId' => (int) $RequestID,
 			'requestorId' => (int) $RequestorID,
diff --git a/sections/ajax/takevote.php b/sections/ajax/takevote.php
index 81042302..151b7ea3 100644
--- a/sections/ajax/takevote.php
+++ b/sections/ajax/takevote.php
@@ -24,37 +24,37 @@
 		die();
 	}
 	$Type = ($_REQUEST['vote'] == 'up')?"Up":"Down";
-	
+
 	// Update the two votes tables if needed
 	$DB->query("INSERT IGNORE INTO users_votes (UserID, GroupID, Type) VALUES ($UserID, $GroupID, '$Type')");
 	if ($DB->affected_rows() == 0) {
 		echo 'noaction';
 		die();
 	}
-	
+
 	// Update the group's cache key
 	$GroupVotes['Total'] += 1;
 	if ($Type == "Up") {
 		$GroupVotes['Ups'] += 1;
 	}
 	$Cache->cache_value('votes_'.$GroupID, $GroupVotes);
-	
+
 	// If the group has no votes yet, we need an insert, otherwise an update
 	// so we can cut corners and use the magic of INSERT...ON DUPLICATE KEY UPDATE...
 	// to accomplish both in one query
 	$DB->query("INSERT INTO torrents_votes (GroupID, Total, Ups, Score)
 				VALUES ($GroupID, 1, ".($Type=='Up'?1:0).", 0)
-				ON DUPLICATE KEY UPDATE Total = Total + 1, 
+				ON DUPLICATE KEY UPDATE Total = Total + 1,
 				Score = IFNULL(binomial_ci(Ups".($Type=='Up'?'+1':'').",Total),0)".
 				($Type=='Up'?', Ups = Ups+1':''));
-	
+
 	$UserVotes[$GroupID] = array('GroupID' => $GroupID, 'Type' => $Type);
-	
+
 	// Update this guy's cache key
 	$Cache->cache_value('voted_albums_'.$LoggedUser['ID'], $UserVotes);
-		
+
 	// Update the paired cache keys for "people who liked"
-	// First update this album's paired votes.  If this keys is magically not set, 
+	// First update this album's paired votes.  If this keys is magically not set,
 	// our life just got a bit easier.  We're only tracking paired votes on upvotes.
 	if ($Type == 'Up') {
 		$VotePairs = $Cache->get_value('vote_pairs_'.$GroupID, true);
@@ -108,7 +108,7 @@
 		}
 	}
 
-	
+
 	echo 'success';
 } elseif ($_REQUEST['do'] == 'unvote') {
 	if (!isset($UserVotes[$GroupID])) {
@@ -116,13 +116,13 @@
 		die();
 	}
 	$Type = $UserVotes[$GroupID]['Type'];
-	
+
 	$DB->query("DELETE FROM users_votes WHERE UserID=$UserID AND GroupID=$GroupID");
-	
+
 	// Update personal cache key
 	unset($UserVotes[$GroupID]);
 	$Cache->cache_value('voted_albums_'.$LoggedUser['ID'], $UserVotes);
-	
+
 	// Update the group's cache key
 	$GroupVotes['Total'] -= 1;
 	if ($Type == "Up") {
@@ -135,7 +135,7 @@
 			    ($Type=='Up'?', Ups = GREATEST(0, Ups - 1)':'')."
 				WHERE GroupID=$GroupID");
 	// Update paired cache keys
-	// First update this album's paired votes.  If this keys is magically not set, 
+	// First update this album's paired votes.  If this keys is magically not set,
 	// our life just got a bit easier.  We're only tracking paired votes on upvotes.
 	if ($Type == 'Up') {
 		$VotePairs = $Cache->get_value('vote_pairs_'.$GroupID, true);
@@ -160,7 +160,7 @@
 		}
 		$Cache->cache_value('vote_pairs_'.$GroupID, $VotePairs);
 	}
-	
+
 	// Now do the paired votes keys for all of this guy's other votes
 	foreach ($UserVotes as $VGID => $Vote) {
 		if ($Vote['Type'] != 'Up') {
@@ -190,7 +190,7 @@
 			}
 		}
 	}
-	
+
 	// Let the script know what happened
 	if ($Type == 'Up') {
 		echo 'success-up';
diff --git a/sections/ajax/torrentgroup.php b/sections/ajax/torrentgroup.php
index 95385c1f..631d46d3 100644
--- a/sections/ajax/torrentgroup.php
+++ b/sections/ajax/torrentgroup.php
@@ -2,7 +2,7 @@
 
 
 require(SERVER_ROOT.'/sections/torrents/functions.php');
-include(SERVER_ROOT.'/sections/bookmarks/functions.php'); 
+include(SERVER_ROOT.'/sections/bookmarks/functions.php');
 include(SERVER_ROOT.'/classes/class_text.php'); // Text formatting class
 $Text = new TEXT;
 
diff --git a/sections/ajax/upload.php b/sections/ajax/upload.php
index d86e24a9..50db2480 100644
--- a/sections/ajax/upload.php
+++ b/sections/ajax/upload.php
@@ -19,12 +19,12 @@
 	case 'Music':
 		$TorrentForm->music_form($GenreTags);
 		break;
-		
+
 	case 'Audiobooks':
 	case 'Comedy':
 		$TorrentForm->audiobook_form();
 		break;
-	
+
 	case 'Applications':
 	case 'Comics':
 	case 'E-Books':
diff --git a/sections/ajax/userhistory/post_history.php b/sections/ajax/userhistory/post_history.php
index 91465f86..eea19c7d 100644
--- a/sections/ajax/userhistory/post_history.php
+++ b/sections/ajax/userhistory/post_history.php
@@ -45,7 +45,7 @@ function error_out($reason = "") {
 		FROM users_main AS m
 		JOIN users_info AS i ON i.UserID = m.ID
 		WHERE m.ID = $UserID");
-	
+
 	if($DB->record_count() == 0){ // If user doesn't exist
             error_out("User does not exist!");
 	}
@@ -170,22 +170,22 @@ function error_out($reason = "") {
 		$sql.='
 		AND ((t.IsLocked=\'0\' OR t.IsSticky=\'1\') AND (l.PostID<t.LastPostID OR l.PostID IS NULL)) ';
 	}
-	
+
 	$sql .= '
 		ORDER BY p.ID DESC';
-	
+
 	if($ShowGrouped) {
 		$sql.='
 		) AS sub
 		GROUP BY TopicID ORDER BY ID DESC';
 	}
-	
+
 	$sql.=' LIMIT '.$Limit;
 	$Posts = $DB->query($sql);
-	
+
 	$DB->query("SELECT FOUND_ROWS()");
 	list($Results) = $DB->next_record();
-	
+
 	$DB->set_query_id($Posts);
 }
 
diff --git a/sections/ajax/usersearch.php b/sections/ajax/usersearch.php
index 84c980f7..0b6b1566 100644
--- a/sections/ajax/usersearch.php
+++ b/sections/ajax/usersearch.php
@@ -4,10 +4,10 @@
  **********************************************************************/
 
 if (!empty($_GET['search'])) {
-	
+
 	$_GET['username'] = $_GET['search'];
 }
- 
+
 define('USERS_PER_PAGE', 30);
 
 if(isset($_GET['username'])){
diff --git a/sections/api/access_state.php b/sections/api/access_state.php
index b086cda6..d9dbd545 100644
--- a/sections/api/access_state.php
+++ b/sections/api/access_state.php
@@ -1,6 +1,6 @@
 <state><?
 switch ($User['State']) {
-	case 0: 
+	case 0:
 		echo 'pending';
 		break;
 	case 1:
diff --git a/sections/api/index.php b/sections/api/index.php
index b90f5530..2978ea89 100644
--- a/sections/api/index.php
+++ b/sections/api/index.php
@@ -2,18 +2,18 @@
 $Available = array(
 	'access_request',
 	'access_state',
-	
+
 	'user_stats_ratio',
 	'user_stats_torrent',
 	'user_stats_comumnity',
 );
 
 if (
-	empty($_GET['req']) || 
-	empty($_GET['uid']) || 
-	empty($_GET['aid']) || 
-	empty($_GET['key']) || 
-	!is_number($_GET['uid']) || 
+	empty($_GET['req']) ||
+	empty($_GET['uid']) ||
+	empty($_GET['aid']) ||
+	empty($_GET['key']) ||
+	!is_number($_GET['uid']) ||
 	!is_number($_GET['aid']) ||
 	!in_array($_GET['req'],$Available,true)
 ) {
diff --git a/sections/artist/add_similar.php b/sections/artist/add_similar.php
index a5007bb3..4d2166d9 100644
--- a/sections/artist/add_similar.php
+++ b/sections/artist/add_similar.php
@@ -17,15 +17,15 @@
 list($Artist2ID) = $DB->next_record();
 
 if(!empty($Artist2ID)) { // artist was found in the database
-	
+
 	// Let's see if there's already a similar artists field for these two
-	$DB->query("SELECT 
-		s1.SimilarID 
+	$DB->query("SELECT
+		s1.SimilarID
 		FROM artists_similar AS s1
 		JOIN artists_similar AS s2 ON s1.SimilarID=s2.SimilarID
 		WHERE s1.ArtistID='$Artist1ID' AND s2.ArtistID='$Artist2ID'");
 	list($SimilarID) = $DB->next_record();
-	
+
 	if($SimilarID){ // The similar artists field already exists, just update the score
 		$DB->query("UPDATE artists_similar_scores SET Score=Score+200 WHERE SimilarID='$SimilarID'");
 	} else { // No, it doesn't exist - create it
@@ -34,12 +34,12 @@
 		$DB->query("INSERT INTO artists_similar (ArtistID, SimilarID) VALUES ('$Artist1ID', '$SimilarID')");
 		$DB->query("INSERT INTO artists_similar (ArtistID, SimilarID) VALUES ('$Artist2ID', '$SimilarID')");
 	}
-	
+
 	$DB->query("SELECT SimilarID FROM artists_similar_votes WHERE SimilarID='$SimilarID' AND UserID='$UserID' AND Way='up'");
 	if($DB->record_count() == 0) {
 		$DB->query("INSERT INTO artists_similar_votes (SimilarID, UserID, way) VALUES ('$SimilarID', '$UserID', 'up')");
 	}
-	
+
 	$Cache->delete('artist_'.$Artist1ID); // Delete artist cache
 	$Cache->delete('artist_'.$Artist2ID); // Delete artist cache
 	$Cache->delete('similar_positions_'.$Artist1ID); // Delete artist's similar map cache
diff --git a/sections/artist/autocomplete.php b/sections/artist/autocomplete.php
index b25a7bb7..24155278 100644
--- a/sections/artist/autocomplete.php
+++ b/sections/artist/autocomplete.php
@@ -20,16 +20,16 @@
 		$DB=NEW DB_MYSQL; //Load the database wrapper
 	}
 	$Limit = (($KeySize === $MaxKeySize)?250:10);
-	$DB->query("SELECT 
+	$DB->query("SELECT
 		a.ArtistID,
-		a.Name, 
-		SUM(t.Snatched) AS Snatches 
-		FROM artists_group AS a 
-		INNER JOIN torrents_artists AS ta ON ta.ArtistID=a.ArtistID 
-		INNER JOIN torrents AS t ON t.GroupID=ta.GroupID 
+		a.Name,
+		SUM(t.Snatched) AS Snatches
+		FROM artists_group AS a
+		INNER JOIN torrents_artists AS ta ON ta.ArtistID=a.ArtistID
+		INNER JOIN torrents AS t ON t.GroupID=ta.GroupID
 		WHERE a.Name LIKE '".db_string(str_replace('\\','\\\\',$Letters),true)."%'
-		GROUP BY ta.ArtistID 
-		ORDER BY Snatches DESC 
+		GROUP BY ta.ArtistID
+		ORDER BY Snatches DESC
 		LIMIT $Limit");
 	$AutoSuggest = $DB->to_array(false,MYSQLI_NUM,false);
 	$Cache->cache_value('autocomplete_artist_'.$KeySize.'_'.$Letters,$AutoSuggest,1800+7200*($MaxKeySize-$KeySize)); // Can't cache things for too long in case names are edited
diff --git a/sections/artist/change_artistid.php b/sections/artist/change_artistid.php
index 131733fe..20bc7a5d 100644
--- a/sections/artist/change_artistid.php
+++ b/sections/artist/change_artistid.php
@@ -24,13 +24,13 @@
 
 if ($NewArtistID > 0) {
 	// Make sure that's a real artist ID number, and grab the name
-	$DB->query("SELECT Name FROM artists_group WHERE ArtistID = $NewArtistID LIMIT 1");	
+	$DB->query("SELECT Name FROM artists_group WHERE ArtistID = $NewArtistID LIMIT 1");
 	if(!(list($NewArtistName) = $DB->next_record())) {
 		error('Please enter a valid artist ID number.');
 	}
 } else {
 	// Didn't give an ID, so try to grab based on the name
-	$DB->query("SELECT ArtistID FROM artists_alias WHERE Name = '".db_string($NewArtistName)."' LIMIT 1");	
+	$DB->query("SELECT ArtistID FROM artists_alias WHERE Name = '".db_string($NewArtistName)."' LIMIT 1");
 	if(!(list($NewArtistID) = $DB->next_record())) {
 		error('No artist by that name was found.');
 	}
@@ -58,23 +58,23 @@
 	$NewArtistGroups = $DB->collect('GroupID');
 	$NewArtistGroups[] = '0';
 	$NewArtistGroups = implode(',',$NewArtistGroups);
-	
+
 	$DB->query("SELECT DISTINCT RequestID FROM requests_artists WHERE ArtistID = $NewArtistID");
 	$NewArtistRequests = $DB->collect('RequestID');
 	$NewArtistRequests[] = '0';
 	$NewArtistRequests = implode(',',$NewArtistRequests);
-	
+
 	$DB->query("SELECT DISTINCT UserID from bookmarks_artists WHERE ArtistID = $NewArtistID");
 	$NewArtistBookmarks = $DB->collect('UserID');
 	$NewArtistBookmarks[] = '0';
-	$NewArtistBookmarks = implode(',',$NewArtistBookmarks);				
-	
+	$NewArtistBookmarks = implode(',',$NewArtistBookmarks);
+
 	// Merge all of this artist's aliases onto the new artist
 	$DB->query("UPDATE artists_alias SET ArtistID = $NewArtistID WHERE ArtistID = $ArtistID");
-	
+
 	// Update the torrent groups, requests, and bookmarks
 	$DB->query("UPDATE IGNORE torrents_artists SET ArtistID = $NewArtistID
-				WHERE ArtistID = $ArtistID 
+				WHERE ArtistID = $ArtistID
 				  AND GroupID NOT IN ($NewArtistGroups)");
 	$DB->query("DELETE FROM torrents_artists WHERE ArtistID = $ArtistID");
 	$DB->query("UPDATE IGNORE requests_artists SET ArtistID = $NewArtistID
@@ -85,7 +85,7 @@
 				WHERE ArtistID = $ArtistID
 				  AND UserID NOT IN ($NewArtistBookmarks)");
 	$DB->query("DELETE FROM bookmarks_artists WHERE ArtistID = $ArtistID");
-	
+
 	// Cache clearing
 	if(!empty($Groups)) {
 		foreach($Groups as $GroupID) {
diff --git a/sections/artist/delete.php b/sections/artist/delete.php
index cb428014..947dcdf5 100644
--- a/sections/artist/delete.php
+++ b/sections/artist/delete.php
@@ -19,10 +19,10 @@
 $DB->query('SELECT Name FROM artists_group WHERE ArtistID='.$ArtistID);
 list($Name) = $DB->next_record();
 
-$DB->query('SELECT tg.Name, 
-					tg.ID 
-				FROM torrents_group AS tg 
-				LEFT JOIN torrents_artists AS ta ON ta.GroupID=tg.ID 
+$DB->query('SELECT tg.Name,
+					tg.ID
+				FROM torrents_group AS tg
+				LEFT JOIN torrents_artists AS ta ON ta.GroupID=tg.ID
 				WHERE ta.ArtistID='.$ArtistID);
 $Count = $DB->record_count();
 if($DB->record_count() > 0) {
@@ -47,10 +47,10 @@
 <?
 }
 
-$DB->query('SELECT r.Title, 
-					r.ID 
+$DB->query('SELECT r.Title,
+					r.ID
 				FROM requests AS r
-				LEFT JOIN requests_artists AS ra ON ra.RequestID=r.ID 
+				LEFT JOIN requests_artists AS ra ON ra.RequestID=r.ID
 				WHERE ra.ArtistID='.$ArtistID);
 $Count += $DB->record_count();
 if($DB->record_count() > 0) {
diff --git a/sections/artist/delete_alias.php b/sections/artist/delete_alias.php
index 21655132..87457d1c 100644
--- a/sections/artist/delete_alias.php
+++ b/sections/artist/delete_alias.php
@@ -9,8 +9,8 @@
 }
 
 $DB->query("SELECT aa.AliasID
-			FROM artists_alias AS aa 
-				JOIN artists_alias AS aa2 ON aa.ArtistID=aa2.ArtistID 
+			FROM artists_alias AS aa
+				JOIN artists_alias AS aa2 ON aa.ArtistID=aa2.ArtistID
 			WHERE aa.AliasID=".$AliasID);
 
 if($DB->record_count() == 1) {
diff --git a/sections/artist/download.php b/sections/artist/download.php
index 77bd2152..a4f66c25 100644
--- a/sections/artist/download.php
+++ b/sections/artist/download.php
@@ -135,8 +135,6 @@
 $Collector = new TorrentsDL($DownloadsQ, $ArtistName);
 
 while (list($Downloads, $GroupIDs) = $Collector->get_downloads('GroupID')) {
-	$Debug->log_var($Downloads, '$Downloads');
-	$Debug->log_var($GroupIDs, '$GroupIDs');
 	$Artists = Artists::get_artists($GroupIDs);
 	$TorrentFilesQ = $DB->query("SELECT TorrentID, File FROM torrents_files WHERE TorrentID IN (".implode(',', array_keys($GroupIDs)).")", false);
 	if (is_int($TorrentFilesQ)) {
diff --git a/sections/artist/edit.php b/sections/artist/edit.php
index f29be3d4..03a749fe 100644
--- a/sections/artist/edit.php
+++ b/sections/artist/edit.php
@@ -2,10 +2,10 @@
 /************************************************************************
 ||------------|| Edit artist wiki page ||------------------------------||
 
-This page is the page that is displayed when someone feels like editing 
+This page is the page that is displayed when someone feels like editing
 an artist's wiki page.
 
-It is called when $_GET['action'] == 'edit'. $_GET['artistid'] is the 
+It is called when $_GET['action'] == 'edit'. $_GET['artistid'] is the
 ID of the artist, and must be set.
 
 ************************************************************************/
@@ -55,7 +55,7 @@
 			</div>
 		</form>
 	</div>
-<? if(check_perms('torrents_edit')) { ?> 
+<? if(check_perms('torrents_edit')) { ?>
 	<h2>Rename</h2>
 	<div class="box pad">
 		<form class="rename_form" name="artist" action="artist.php" method="post">
@@ -67,11 +67,11 @@
 				<div style="text-align: center;">
 					<input type="submit" value="Rename" />
 				</div>
-				
+
 			</div>
 		</form>
 	</div>
-	
+
 	<h2>Make into non-redirecting alias</h2>
 	<div class="box pad">
 		<form class="merge_form" name="artist" action="artist.php" method="post">
@@ -90,14 +90,14 @@
 			</div>
 		</form>
 	</div>
-	
+
 	<h2>Aliases</h2>
 	<div class="box pad">
 		<ul>
-		
+
 <?
 	$DB->query("SELECT AliasID, Name, UserID, Redirect FROM artists_alias WHERE ArtistID='$ArtistID'");
-	while(list($AliasID, $AliasName, $User, $Redirect) = $DB->next_record(MYSQLI_NUM, true)) { 
+	while(list($AliasID, $AliasName, $User, $Redirect) = $DB->next_record(MYSQLI_NUM, true)) {
 		if($AliasName == $Name) { $DefaultRedirectID = $AliasID; }
 ?>
 			<li><?=$AliasID?>. <?=$AliasName?>
@@ -120,6 +120,6 @@
 			<input type="submit" value="Add alias" />
 		</form>
 	</div>
-<? } ?> 
+<? } ?>
 </div>
 <? View::show_footer() ?>
diff --git a/sections/artist/history.php b/sections/artist/history.php
index 6d16bb6c..34aa6178 100644
--- a/sections/artist/history.php
+++ b/sections/artist/history.php
@@ -2,8 +2,8 @@
 /************************************************************************
 ||------------|| Artist wiki history page ||---------------------------||
 
-This page lists previous revisions of the artists page. It gets called 
-if $_GET['action'] == 'history'. 
+This page lists previous revisions of the artists page. It gets called
+if $_GET['action'] == 'history'.
 
 It also requires $_GET['artistid'].
 
diff --git a/sections/artist/index.php b/sections/artist/index.php
index 05db0939..cc9f608e 100644
--- a/sections/artist/index.php
+++ b/sections/artist/index.php
@@ -2,11 +2,11 @@
 /**************************************************************************
 Artists Switch Center
 
-This page acts as a switch that includes the real artist pages (to keep 
+This page acts as a switch that includes the real artist pages (to keep
 the root less cluttered).
 
-enforce_login() is run here - the entire artist pages are off limits for 
-non members. 
+enforce_login() is run here - the entire artist pages are off limits for
+non members.
  ****************************************************************************/
 
 // Width and height of similar artist map
diff --git a/sections/artist/rename.php b/sections/artist/rename.php
index a010a1ca..9cd0ada5 100644
--- a/sections/artist/rename.php
+++ b/sections/artist/rename.php
@@ -81,7 +81,7 @@
 	} else {
 		$DB->query("UPDATE artists_group SET Name='".db_string($NewName)."' WHERE ArtistID='$ArtistID'");
 	}
-	
+
 	$DB->query("SELECT GroupID FROM torrents_artists WHERE AliasID='$OldAliasID'");
 	$Groups = $DB->collect('GroupID');
 	$DB->query("UPDATE IGNORE torrents_artists SET AliasID='$TargetAliasID',ArtistID='$TargetArtistID' WHERE AliasID='$OldAliasID'");
diff --git a/sections/artist/take_warn.php b/sections/artist/take_warn.php
index 2e08c035..375805a5 100644
--- a/sections/artist/take_warn.php
+++ b/sections/artist/take_warn.php
@@ -23,7 +23,7 @@
 	$Subject = "You have received a warning";
 	$PrivateMessage = "You have received a $Length week warning for [url=$URL]this artist comment.[/url]\n\n" . $PrivateMessage;
 	$WarnTime = time_plus($Time);
-	$AdminComment = date("Y-m-d").' - Warned until '.$WarnTime.' by '.$LoggedUser['Username']."\nReason: $URL - $Reason\n\n";   
+	$AdminComment = date("Y-m-d").' - Warned until '.$WarnTime.' by '.$LoggedUser['Username']."\nReason: $URL - $Reason\n\n";
 } else {
 	$Subject = "You have received a verbal warning";
 	$PrivateMessage = "You have received a verbal warning for [url=$URL]this post.[/url]\n\n" . $PrivateMessage;
diff --git a/sections/artist/takeedit.php b/sections/artist/takeedit.php
index a139e1ec..3e27572d 100644
--- a/sections/artist/takeedit.php
+++ b/sections/artist/takeedit.php
@@ -1,6 +1,6 @@
 <?
 /*********************************************************************\
-The page that handles the backend of the 'edit artist' function. 
+The page that handles the backend of the 'edit artist' function.
 \*********************************************************************/
 
 include(SERVER_ROOT.'/classes/class_image_tools.php');
@@ -40,18 +40,18 @@
 	$DB->query("INSERT INTO wiki_artists (PageID, Body, Image, UserID, Summary, Time)
 				VALUES ('$ArtistID', '$Body', '$Image', '$UserID', '$Summary', '".sqltime()."')");
 } else { // revert
-	$DB->query("INSERT INTO wiki_artists (PageID, Body, Image, UserID, Summary, Time) 
-		SELECT '$ArtistID', Body, Image, '$UserID', 'Reverted to revision $RevisionID', '".sqltime()."' 
+	$DB->query("INSERT INTO wiki_artists (PageID, Body, Image, UserID, Summary, Time)
+		SELECT '$ArtistID', Body, Image, '$UserID', 'Reverted to revision $RevisionID', '".sqltime()."'
 		FROM wiki_artists WHERE RevisionID='$RevisionID'");
 }
 
 $RevisionID=$DB->inserted_id();
 
 // Update artists table (technically, we don't need the RevisionID column, but we can use it for a join which is nice and fast)
-$DB->query("UPDATE artists_group 
-	SET 
+$DB->query("UPDATE artists_group
+	SET
 	".  ( isset($VanityHouse) ? "VanityHouse='$VanityHouse'," : '' ) ."
-	RevisionID='$RevisionID' 
+	RevisionID='$RevisionID'
 	WHERE ArtistID='$ArtistID'");
 
 // There we go, all done!
diff --git a/sections/better/files.php b/sections/better/files.php
index f26a6c37..86f9c569 100644
--- a/sections/better/files.php
+++ b/sections/better/files.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if(check_perms('admin_reports') && !empty($_GET['remove']) && is_number($_GET['remove'])) {
 	$DB->query("DELETE FROM torrents_bad_files WHERE TorrentID = ".$_GET['remove']);
@@ -56,12 +56,12 @@
 	$DisplayName.='<a href="torrents.php?id='.$GroupID.'" title="View Torrent">'.$GroupName.'</a>';
 	if($GroupYear>0) { $DisplayName.=" [".$GroupYear."]"; }
 	if($ReleaseType>0) { $DisplayName.=" [".$ReleaseTypes[$ReleaseType]."]"; }
-	
+
 	$ExtraInfo = Torrents::torrent_info($Torrents[$TorrentID]);
 	if($ExtraInfo) {
 		$DisplayName.=' - '.$ExtraInfo;
 	}
-	
+
 	$TagList=array();
 	if($TorrentTags!='') {
 		$TorrentTags=explode(' ',$TorrentTags);
diff --git a/sections/better/folders.php b/sections/better/folders.php
index c6c88cf6..b069c54f 100644
--- a/sections/better/folders.php
+++ b/sections/better/folders.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 
 if(check_perms('admin_reports') && !empty($_GET['remove']) && is_number($_GET['remove'])) {
 	$DB->query("DELETE FROM torrents_bad_folders WHERE TorrentID = ".$_GET['remove']);
@@ -61,7 +61,7 @@
 	if($ExtraInfo) {
 		$DisplayName.=' - '.$ExtraInfo;
 	}
-	
+
 	$TagList=array();
 	if($TorrentTags!='') {
 		$TorrentTags=explode(' ',$TorrentTags);
diff --git a/sections/better/index.php b/sections/better/index.php
index 0e021cd0..3133fc51 100644
--- a/sections/better/index.php
+++ b/sections/better/index.php
@@ -15,10 +15,10 @@
 			break;
 		case 'artistless':
 			include(SERVER_ROOT.'/sections/better/artistless.php');
-			break;			
+			break;
 		case 'tags':
 			include(SERVER_ROOT.'/sections/better/tags.php');
-			break;			
+			break;
 		case 'folders':
 			include(SERVER_ROOT.'/sections/better/folders.php');
 			break;
diff --git a/sections/better/tags.php b/sections/better/tags.php
index 3e4f2458..570158d2 100644
--- a/sections/better/tags.php
+++ b/sections/better/tags.php
@@ -62,7 +62,7 @@
 	if($ExtraInfo) {
 		$DisplayName.=' - '.$ExtraInfo;
 	}
-	
+
 	$TagList=array();
 	if($TorrentTags!='') {
 		$TorrentTags=explode(' ',$TorrentTags);
diff --git a/sections/blog/index.php b/sections/blog/index.php
index e9b2ec7c..869d990b 100644
--- a/sections/blog/index.php
+++ b/sections/blog/index.php
@@ -42,7 +42,7 @@
 				}
 				header('Location: blog.php');
 				break;
-		
+
 			case 'takenewblog':
 				authorize();
 				$Title = db_string($_POST['title']);
@@ -53,20 +53,20 @@
 					if($DB->record_count() < 1) {
 						error("No such thread exists!");
 						header('Location: blog.php');
-					} 
+					}
 				} else {
 					$ThreadID = Misc::create_thread(ANNOUNCEMENT_FORUM_ID, $LoggedUser[ID], $Title, $Body);
 					if($ThreadID < 1) {
 						error(0);
 					}
 				}
-				
-				$DB->query("INSERT INTO blog (UserID, Title, Body, Time, ThreadID, Important) 
-				                      VALUES ('".$LoggedUser['ID']."', 
-									          '".db_string($_POST['title'])."', 
-											  '".db_string($_POST['body'])."', 
-											  '".sqltime()."', 
-											  ".$ThreadID.", 
+
+				$DB->query("INSERT INTO blog (UserID, Title, Body, Time, ThreadID, Important)
+				                      VALUES ('".$LoggedUser['ID']."',
+									          '".db_string($_POST['title'])."',
+											  '".db_string($_POST['body'])."',
+											  '".sqltime()."',
+											  ".$ThreadID.",
 											  '".(($_POST['important']=='1')?'1':'0')."')");
 				$Cache->delete_value('blog');
 				if ($_POST['important']=='1') {
@@ -81,7 +81,7 @@
 				break;
 		}
 	}
-		
+
 	?>
 		<div class="box thin">
 			<div class="head">
@@ -91,9 +91,9 @@
 				<div class="pad">
 					<input type="hidden" name="action" value="<?=((empty($_GET['action'])) ? 'takenewblog' : 'takeeditblog')?>" />
 					<input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
-	<? if(!empty($_GET['action']) && $_GET['action'] == 'editblog'){?> 
+	<? if(!empty($_GET['action']) && $_GET['action'] == 'editblog'){?>
 					<input type="hidden" name="blogid" value="<?=$BlogID; ?>" />
-	<? }?> 
+	<? }?>
 					<h3>Title</h3>
 					<input type="text" name="title" size="95" <? if(!empty($Title)) { echo 'value="'.display_str($Title).'"'; } ?> /><br />
 					<h3>Body</h3>
@@ -113,7 +113,7 @@
 			</form>
 		</div>
 		<br />
-<? 
+<?
 }
 ?>
 <div class="thin">
@@ -147,7 +147,7 @@
 			<div id="blog<?=$BlogID?>" class="box">
 				<div class="head">
 					<strong><?=$Title?></strong> - posted <?=time_diff($BlogTime);?> by <?=$Author?>
-		<? if(check_perms('admin_manage_blog')) { ?> 
+		<? if(check_perms('admin_manage_blog')) { ?>
 					- <a href="blog.php?action=editblog&amp;id=<?=$BlogID?>" class="brackets">Edit</a>
 					<a href="blog.php?action=deleteblog&amp;id=<?=$BlogID?>&amp;auth=<?=$LoggedUser['AuthKey']?>" class="brackets">Delete</a>
 		 <? } ?>
@@ -157,14 +157,14 @@
 		<? if($ThreadID) { ?>
 					<br /><br />
 					<em><a href="forums.php?action=viewthread&amp;threadid=<?=$ThreadID?>">Discuss this post here</a></em>
-		<? 		if(check_perms('admin_manage_blog')) { ?> 
+		<? 		if(check_perms('admin_manage_blog')) { ?>
 					<a href="blog.php?action=deadthread&amp;id=<?=$BlogID?>&amp;auth=<?=$LoggedUser['AuthKey']?>" class="brackets">Remove link</a>
 		<? 		}
 			} ?>
 				</div>
 			</div>
 		<br />
-<? 
+<?
 }
 ?>
 </div>
diff --git a/sections/bookmarks/functions.php b/sections/bookmarks/functions.php
index 81daefb0..33d033e5 100644
--- a/sections/bookmarks/functions.php
+++ b/sections/bookmarks/functions.php
@@ -19,7 +19,7 @@ function bookmark_schema($Type) {
 			break;
 		case 'request':
 			return array('bookmarks_requests', 'RequestID');
-			break;			
+			break;
 		default:
 			die('HAX');
 	}
diff --git a/sections/captcha/index.php b/sections/captcha/index.php
index 990ee639..51f9cd89 100644
--- a/sections/captcha/index.php
+++ b/sections/captcha/index.php
@@ -8,29 +8,29 @@ function get_font() {
 
 function make_captcha_img() {
 	global $CaptchaBGs;
-	
+
 	$Length=6;
 	$ImageHeight=75;
 	$ImageWidth=300;
-	
+
 	$Chars='abcdefghjkmprstuvwxyzABCDEFGHJKLMPQRSTUVWXY23456789';
 	$CaptchaString='';
-	
+
 	for($i=0;$i<$Length;$i++) { $CaptchaString.=$Chars[mt_rand(0,strlen($Chars)-1)]; }
-	
+
 	for($x=0;$x<$Length;$x++) {
 		$FontDisplay[$x]['size']=mt_rand(24,32);
 		$FontDisplay[$x]['top']=mt_rand($FontDisplay[$x]['size']+5,$ImageHeight-($FontDisplay[$x]['size']/2));
 		$FontDisplay[$x]['angle']=mt_rand(-30,30);
 		$FontDisplay[$x]['font']=get_font();
 	}
-	
+
 	$Img=imagecreatetruecolor($ImageWidth,$ImageHeight);
 	$BGImg=imagecreatefrompng(SERVER_ROOT.'/captcha/'.$CaptchaBGs[mt_rand(0,count($CaptchaBGs)-1)]);
 	imagecopymerge($Img,$BGImg,0,0,0,0,300,75,50);
 
 	$ForeColor=imagecolorallocatealpha($Img,255,255,255,65);
-	
+
 	for($i=0;$i<strlen($CaptchaString);$i++) {
 		$CharX=(($ImageWidth/$Length)*($i+1))-(($ImageWidth/$Length)*.75);
 		imagettftext($Img,$FontDisplay[$i]['size'],$FontDisplay[$i]['angle'],$CharX,
@@ -42,7 +42,7 @@ function make_captcha_img() {
 	header('Content-type: image/png');
 	imagepng($Img);
 	imagedestroy($Img);
-	
+
 	return $CaptchaString;
 }
 
diff --git a/sections/collages/add_comment.php b/sections/collages/add_comment.php
index 3e550c68..b8764d8a 100644
--- a/sections/collages/add_comment.php
+++ b/sections/collages/add_comment.php
@@ -7,9 +7,9 @@
 if($LoggedUser['DisablePosting']) {
 	error('Your posting rights have been removed'); // Should this be logged?
 }
-		
+
 $DB->query("INSERT INTO collages_comments
-	(CollageID, Body, UserID, Time) 
+	(CollageID, Body, UserID, Time)
 	VALUES
 	('$CollageID', '".db_string($_POST['body'])."', '$LoggedUser[ID]', '".sqltime()."')");
 
diff --git a/sections/collages/add_torrent.php b/sections/collages/add_torrent.php
index 07e711a4..2189f996 100644
--- a/sections/collages/add_torrent.php
+++ b/sections/collages/add_torrent.php
@@ -15,17 +15,17 @@ function AddTorrent($CollageID, $GroupID) {
 	$DB->query("SELECT GroupID FROM collages_torrents WHERE CollageID='$CollageID' AND GroupID='$GroupID'");
 	if ($DB->record_count() == 0) {
 		$DB->query("INSERT IGNORE INTO collages_torrents
-			(CollageID, GroupID, UserID, Sort, AddedOn) 
+			(CollageID, GroupID, UserID, Sort, AddedOn)
 			VALUES
 			('$CollageID', '$GroupID', '$LoggedUser[ID]', '$Sort', NOW())");
-		
+
 		$DB->query("UPDATE collages SET NumTorrents=NumTorrents+1 WHERE ID='$CollageID'");
 
 		$Cache->delete_value('collage_'.$CollageID);
 		$Cache->delete_value('torrents_details_'.$GroupID);
 		$Cache->delete_value('torrent_collages_'.$GroupID);
 		$Cache->delete_value('torrent_collages_personal_'.$GroupID);
-		
+
 		$DB->query("SELECT UserID FROM users_collage_subs WHERE CollageID=$CollageID");
 		while (list($CacheUserID) = $DB->next_record()) {
 			$Cache->delete_value('collage_subs_user_new_'.$CacheUserID);
@@ -88,11 +88,11 @@ function AddTorrent($CollageID, $GroupID) {
 	if (!$GroupID) {
 		error('The torrent was not found in the database.');
 	}
-	
+
 	AddTorrent($CollageID, $GroupID);
 } else {
 	$URLRegex = '/^https?:\/\/(www\.|ssl\.)?'.NONSSL_SITE_URL.'\/torrents\.php\?(page=[0-9]+&)?id=([0-9]+)/i';
-	
+
 	$URLs = explode("\n",$_REQUEST['urls']);
 	$GroupIDs = array();
 	$Err = '';
@@ -122,20 +122,20 @@ function AddTorrent($CollageID, $GroupID) {
 			$Err = "One of the entered URLs ($URL) does not correspond to a torrent on the site.";
 			break;
 		}
-		
+
 		$DB->query("SELECT ID FROM torrents_group WHERE ID='$GroupID'");
 		if (!$DB->record_count()) {
 			$Err = "One of the entered URLs ($URL) does not correspond to a torrent on the site.";
 			break;
 		}
 	}
-	
+
 	if ($Err) {
 		error($Err);
 	}
 
 	foreach ($GroupIDs as $GroupID) {
 		AddTorrent($CollageID, $GroupID);
-	}	
+	}
 }
 header('Location: collages.php?id='.$CollageID);
diff --git a/sections/collages/all_comments.php b/sections/collages/all_comments.php
index 341be520..ddcd0746 100644
--- a/sections/collages/all_comments.php
+++ b/sections/collages/all_comments.php
@@ -3,7 +3,7 @@
 
 Things to expect in $_GET:
 	ThreadID: ID of the forum curently being browsed
-	page:	The page the user's on. 
+	page:	The page the user's on.
 	page = 1 is the same as no page
 
 ********************************************************************************/
@@ -15,7 +15,7 @@
 
 // Check for lame SQL injection attempts
 $CollageID = $_GET['collageid'];
-if(!is_number($CollageID)) { 
+if(!is_number($CollageID)) {
 	error(0);
 }
 
@@ -105,7 +105,7 @@
 		</td>
 	</tr>
 </table>
-<?	} 
+<?	}
 if(!$ThreadInfo['IsLocked'] || check_perms('site_moderate_forums')) {
 	if($ThreadInfo['MinClassWrite'] <= $LoggedUser['Class'] && !$LoggedUser['DisablePosting']) {
 
diff --git a/sections/collages/browse.php b/sections/collages/browse.php
index 86846b86..b4e5f231 100644
--- a/sections/collages/browse.php
+++ b/sections/collages/browse.php
@@ -68,14 +68,14 @@
 	$BookmarkJoin = '';
 }
 
-$BaseSQL = $SQL = "SELECT SQL_CALC_FOUND_ROWS 
-	c.ID, 
-	c.Name, 
+$BaseSQL = $SQL = "SELECT SQL_CALC_FOUND_ROWS
+	c.ID,
+	c.Name,
 	c.NumTorrents,
 	c.TagList,
 	c.CategoryID,
 	c.UserID
-	FROM collages AS c 
+	FROM collages AS c
 	$BookmarkJoin
 	WHERE Deleted = '0'";
 
@@ -214,7 +214,7 @@
 						<input type="submit" value="Search" />
 					</td>
 				</tr>
-			</table>	
+			</table>
 		</form>
 	</div>
 <? } // if (!$BookmarkView) ?>
@@ -222,12 +222,12 @@
 <? if (!$BookmarkView) {
 if (check_perms('site_collages_create')) { ?>
 		<a href="collages.php?action=new" class="brackets">New collage</a>
-<? } 
+<? }
 if (check_perms('site_collages_personal')) {
-	
+
  	$DB->query("SELECT ID FROM collages WHERE UserID='$LoggedUser[ID]' AND CategoryID='0' AND Deleted='0'");
 	$CollageCount = $DB->record_count();
-	
+
 	if ($CollageCount == 1) {
 		list($CollageID) = $DB->next_record();
 ?>
@@ -235,7 +235,7 @@
 <?	} elseif ($CollageCount > 1) { ?>
 		<a href="collages.php?action=mine" class="brackets">Personal collages</a>
 <?	}
-} 
+}
 if (check_perms('site_collages_subscribe')) { ?>
 		<a href="userhistory.php?action=subscribed_collages" class="brackets">Subscribed collages</a>
 <? } ?>
@@ -296,7 +296,7 @@
 			$Tags[]='<a href="collages.php?action=search&amp;tags='.$Tag.'">'.$Tag.'</a>';
 	}
 	$Tags = implode(', ', $Tags);
-	
+
 	//Print results
 ?>
 	<tr class="row<?=$Row?> <?=($BookmarkView)?'bookmark_'.$ID:''?>">
@@ -309,7 +309,7 @@
 			<span style="float:right">
 				<a href="#" onclick="Unbookmark('collage', <?=$ID?>,'');return false;" class="brackets">Remove bookmark</a>
 			</span>
-<?	} 
+<?	}
 		if(!empty($Tags)) {
 ?>
 			<div class="tags">
diff --git a/sections/collages/delete.php b/sections/collages/delete.php
index 7fc6c54c..dd957c6f 100644
--- a/sections/collages/delete.php
+++ b/sections/collages/delete.php
@@ -1,8 +1,8 @@
 <?
 
 $CollageID = $_GET['collageid'];
-if(!is_number($CollageID) || !$CollageID) { 
-	error(404); 
+if(!is_number($CollageID) || !$CollageID) {
+	error(404);
 }
 
 $DB->query("SELECT Name, UserID FROM collages WHERE ID='$CollageID'");
diff --git a/sections/collages/get_post.php b/sections/collages/get_post.php
index f1dfd7be..a250d502 100644
--- a/sections/collages/get_post.php
+++ b/sections/collages/get_post.php
@@ -2,10 +2,10 @@
 /*********************************************************************\
 //--------------Get Post--------------------------------------------//
 
-This gets the raw BBCode of a post. It's used for editing and 
-quoting posts. 
+This gets the raw BBCode of a post. It's used for editing and
+quoting posts.
 
-It gets called if $_GET['action'] == 'get_post'. It requires 
+It gets called if $_GET['action'] == 'get_post'. It requires
 $_GET['post'], which is the ID of the post.
 
 \*********************************************************************/
@@ -18,10 +18,10 @@
 // Variables for database input
 $PostID = $_GET['post'];
 
-// Mainly 
+// Mainly
 $DB->query("SELECT Body FROM collages_comments WHERE ID='$PostID'");
 list($Body) = $DB->next_record(MYSQLI_NUM);
 
-// This gets sent to the browser, which echoes it wherever 
+// This gets sent to the browser, which echoes it wherever
 
 echo trim($Body);
diff --git a/sections/collages/index.php b/sections/collages/index.php
index 48f4979f..51ff1116 100644
--- a/sections/collages/index.php
+++ b/sections/collages/index.php
@@ -66,11 +66,11 @@
 		if(!check_perms('site_collages_personal')) {
 			error(403);
 		}
-		
+
 		$DB->query("SELECT COUNT(ID) FROM collages WHERE UserID='$LoggedUser[ID]' AND CategoryID='0' AND Deleted='0'");
 		list($CollageCount) = $DB->next_record();
-				
-		if($CollageCount >= $LoggedUser['Permissions']['MaxCollages']) { 
+
+		if($CollageCount >= $LoggedUser['Permissions']['MaxCollages']) {
 			list($CollageID) = $DB->next_record();
 			header('Location: collage.php?id='.$CollageID);
 			die();
diff --git a/sections/collages/manage_handle.php b/sections/collages/manage_handle.php
index b2aff75a..9c66716d 100644
--- a/sections/collages/manage_handle.php
+++ b/sections/collages/manage_handle.php
@@ -44,6 +44,6 @@
 		if(!is_number($Sort)) { error(404); }
 		$DB->query("UPDATE collages_torrents SET Sort='$Sort' WHERE CollageID='$CollageID' AND GroupID='$GroupID'");
 	}
-	
+
 	$Cache->delete_value('collage_'.$CollageID);
 	header('Location: collages.php?action=manage&collageid='.$CollageID);
diff --git a/sections/collages/new.php b/sections/collages/new.php
index 101e3344..80cbba90 100644
--- a/sections/collages/new.php
+++ b/sections/collages/new.php
@@ -38,10 +38,10 @@
 					<select name="category" <?=$ChangeJS?>>
 <?
 array_shift($CollageCats);
-		
+
 foreach($CollageCats as $CatID=>$CatName) { ?>
 						<option value="<?=$CatID+1?>"<?=(($CatID+1 == $Category)?' selected':'')?>><?=$CatName?></option>
-<? } 
+<? }
 $DB->query("SELECT COUNT(ID) FROM collages WHERE UserID='$LoggedUser[ID]' AND CategoryID='0' AND Deleted='0'");
 list($CollageCount) = $DB->next_record();
 if(($CollageCount < $LoggedUser['Permissions']['MaxCollages']) && check_perms('site_collages_personal')) { ?>
@@ -50,7 +50,7 @@
 					</select>
 					<br />
 					<ul>
-						<li><strong>Theme</strong> - A collage containing releases that all relate to a certain theme (e.g. "Searching for the Perfect Beat", "Concept Albums", "Funky Groove", etc.).</li>	
+						<li><strong>Theme</strong> - A collage containing releases that all relate to a certain theme (e.g. "Searching for the Perfect Beat", "Concept Albums", "Funky Groove", etc.).</li>
 						<li><strong>Genre introduction</strong> - A subjective introduction to a genre composed by our own users.</li>
 						<li><strong>Discography</strong> - A collage containing all the releases of an artist. Useful for keeping track of side-projects.</li>
 						<li><strong>Label</strong> - A collage containing all the releases of a particular record label.</li>
@@ -58,8 +58,8 @@
 						<li><strong>Charts</strong> - Contains all the releases that comprise a certain type of chart (e.g. Billboard Top 100, Pitchfork Top 100, What.cd Top 10, etc.).</li>
 <?
    if(($CollageCount < $LoggedUser['Permissions']['MaxCollages']) && check_perms('site_collages_personal')) { ?>
-						<li><strong>Personal</strong> - You can put whatever you want here.  It's your own personal collage.</li>	
-<? } ?>					
+						<li><strong>Personal</strong> - You can put whatever you want here.  It's your own personal collage.</li>
+<? } ?>
 					</ul>
 				</td>
 			</tr>
diff --git a/sections/collages/new_handle.php b/sections/collages/new_handle.php
index b2f945ad..a01768a3 100644
--- a/sections/collages/new_handle.php
+++ b/sections/collages/new_handle.php
@@ -70,8 +70,8 @@
 }
 $TagList = implode(' ',$TagList);
 
-$DB->query("INSERT INTO collages 
-	(Name, Description, UserID, TagList, CategoryID) 
+$DB->query("INSERT INTO collages
+	(Name, Description, UserID, TagList, CategoryID)
 	VALUES
 	('$P[name]', '$P[description]', $LoggedUser[ID], '$TagList', '$P[category]')");
 
diff --git a/sections/collages/take_delete.php b/sections/collages/take_delete.php
index 6f5824bd..345ab93f 100644
--- a/sections/collages/take_delete.php
+++ b/sections/collages/take_delete.php
@@ -3,8 +3,8 @@
 
 
 $CollageID = $_POST['collageid'];
-if(!is_number($CollageID) || !$CollageID) { 
-	error(404); 
+if(!is_number($CollageID) || !$CollageID) {
+	error(404);
 }
 
 $DB->query("SELECT Name, CategoryID, UserID FROM collages WHERE ID='$CollageID'");
diff --git a/sections/collages/takeedit_comment.php b/sections/collages/takeedit_comment.php
index b0a620c7..5ac8618e 100644
--- a/sections/collages/takeedit_comment.php
+++ b/sections/collages/takeedit_comment.php
@@ -15,7 +15,7 @@
 $Body = db_string(urldecode($_POST['body']));
 $PostID = $_POST['post'];
 
-// Mainly 
+// Mainly
 $DB->query("SELECT cc.Body, cc.UserID, cc.CollageID, (SELECT COUNT(ID) FROM collages_comments WHERE ID <= ".$PostID." AND collages_comments.CollageID = cc.CollageID) FROM collages_comments AS cc WHERE cc.ID='$PostID'");
 list($OldBody, $AuthorID, $CollageID, $PostNum) = $DB->next_record();
 
diff --git a/sections/comments/artistcomments.php b/sections/comments/artistcomments.php
index 6986c8c5..69126b32 100644
--- a/sections/comments/artistcomments.php
+++ b/sections/comments/artistcomments.php
@@ -47,7 +47,7 @@
 			<?=$OtherLink?>
 		</div>
 <? } ?>
-	</div>  
+	</div>
 	<div class="linkbox">
 		<?=$Pages?>
 	</div>
@@ -62,7 +62,7 @@
 } /* end while loop*/ ?>
 	<div class="linkbox"><?= $Pages; ?></div>
 </div>
-<?  
+<?
 
   View::show_footer();
 
diff --git a/sections/comments/index.php b/sections/comments/index.php
index 3e8cab66..dbb11490 100644
--- a/sections/comments/index.php
+++ b/sections/comments/index.php
@@ -16,11 +16,11 @@
  */
 if(isset($_GET['id'])) {
 	$UserID = $_GET['id'];
-	if(!is_number($UserID)) 
+	if(!is_number($UserID))
 		error(404);
 
 	$UserInfo = Users::user_info($UserID);
-	
+
 	$Username = $UserInfo['Username'];
 	if($LoggedUser['ID'] == $UserID) {
 		$Self = true;
@@ -29,8 +29,8 @@
 	}
 	$Perms = Permissions::get_permissions($UserInfo['PermissionID']);
 	$UserClass = $Perms['Class'];
-	if (!check_paranoia('torrentcomments', $UserInfo['Paranoia'], $UserClass, $UserID)) 
-		error(403); 
+	if (!check_paranoia('torrentcomments', $UserInfo['Paranoia'], $UserClass, $UserID))
+		error(403);
 }  else {
 	$UserID = $LoggedUser['ID'];
 	$Username = $LoggedUser['Username'];
diff --git a/sections/comments/post.php b/sections/comments/post.php
index bcc57647..afb09d93 100644
--- a/sections/comments/post.php
+++ b/sections/comments/post.php
@@ -5,7 +5,7 @@
  *
  * @param $UserID UserID of the guy/gal who posted the comment
  * @param $PostID The post number
- * @param $postheader the header used in the post. 
+ * @param $postheader the header used in the post.
  * @param $permalink the link to the post elsewhere on the site (torrents.php)
  * @param $Body the post body
  * @param $EditorID the guy who last edited the post
@@ -15,7 +15,7 @@
 function comment_body($UserID, $PostID, $postheader, $permalink, $Body, $EditorID, $AddedTime, $EditedTime) {
   global $Text,$HeavyInfo;
   $UserInfo = Users::user_info($UserID);
-  $postheader =  "by <strong>" . Users::format_username($UserID, true, true, true, true, false) . "</strong> " 
+  $postheader =  "by <strong>" . Users::format_username($UserID, true, true, true, true, false) . "</strong> "
 	. time_diff($AddedTime) . $postheader;
 
 ?>
@@ -44,7 +44,7 @@ function comment_body($UserID, $PostID, $postheader, $permalink, $Body, $EditorI
 			</td>
   <? } ?>
 			<td class='body' valign="top">
-				<?=$Text->full_format($Body) ?> 
+				<?=$Text->full_format($Body) ?>
 				<? if($EditorID){ ?>
 				  <br /><br />
 				  Last edited by
@@ -53,4 +53,4 @@ function comment_body($UserID, $PostID, $postheader, $permalink, $Body, $EditorI
 			</td>
 		</tr>
 	</table>
-<? } 
+<? }
diff --git a/sections/donate/ipn.php b/sections/donate/ipn.php
index 82bd6433..d4cf3936 100644
--- a/sections/donate/ipn.php
+++ b/sections/donate/ipn.php
@@ -52,7 +52,7 @@
 						//Repeat donor
 						Misc::send_pm($_POST['custom'],0,db_string('Thank you for your donation'),db_string('Your donation from '.$_POST['payer_email'].' of '.$_POST['mc_gross'].' '.PAYPAL_CURRENCY.' has been successfully processed. Your continued support is highly appreciated and helps to make this place possible.'),'');
 					}
-					
+
 					
 				}
 			}
@@ -84,14 +84,14 @@
 				$Cache->update_row(false, array('Invites' => $Invites));
 				$Cache->commit_transaction(0);
 				Misc::send_pm($_POST['custom'],0,db_string('Notice of donation failure'),db_string('PapPal has just notified us that the donation you sent from '.$_POST['payer_email'].' of '.$TotalDonated.' '.PAYPAL_CURRENCY.' at '.$DonationTime.' UTC has been revoked. Because of this your special privileges have been revoked, and your invites removed.'),'');
-				
-				
+
+
 				send_irc("PRIVMSG ".BOT_REPORT_CHAN." :".$Message);
 			}
 		}
 	}
-	$DB->query("UPDATE users_info 
-		SET 
+	$DB->query("UPDATE users_info
+		SET
 		AdminComment=CONCAT('".sqltime()." - User donated ".db_string($_POST['mc_gross'])." ".db_string(PAYPAL_CURRENCY)." from ".db_string($_POST['payer_email']).".\n',AdminComment)
 		WHERE UserID='".$_POST['custom']."'");
 	$DB->query("INSERT INTO donations
diff --git a/sections/feeds/index.php b/sections/feeds/index.php
index d194a129..c84ff8b3 100644
--- a/sections/feeds/index.php
+++ b/sections/feeds/index.php
@@ -1,14 +1,14 @@
 <?
 // Main feeds page
 // The feeds don't use script_start.php, their code resides entirely in feeds.php in the document root
-// Bear this in mind when you try to use script_start functions. 
+// Bear this in mind when you try to use script_start functions.
 
 if (
-	empty($_GET['feed']) || 
-	empty($_GET['authkey']) || 
-	empty($_GET['auth']) || 
-	empty($_GET['passkey']) || 
-	empty($_GET['user']) || 
+	empty($_GET['feed']) ||
+	empty($_GET['authkey']) ||
+	empty($_GET['auth']) ||
+	empty($_GET['passkey']) ||
+	empty($_GET['user']) ||
 	!is_number($_GET['user']) ||
 	strlen($_GET['authkey']) != 32 ||
 	strlen($_GET['passkey']) != 32 ||
@@ -41,7 +41,7 @@
 
 $Feed->open_feed();
 switch($_GET['feed']) {
-	case 'feed_news': 
+	case 'feed_news':
 		include(SERVER_ROOT.'/classes/class_text.php');
 		$Text = new TEXT;
 		$Feed->channel('News', 'RSS feed for site news.');
@@ -71,7 +71,7 @@
 			}
 		}
 		break;
-	case 'feed_blog': 
+	case 'feed_blog':
 		include(SERVER_ROOT.'/classes/class_text.php');
 		$Text = new TEXT;
 		$Feed->channel('Blog', 'RSS feed for site blog.');
@@ -100,75 +100,75 @@
 			}
 		}
 		break;
-	case 'torrents_all': 
+	case 'torrents_all':
 		$Feed->channel('All Torrents', 'RSS feed for all new torrent uploads.');
 		$Feed->retrieve('torrents_all',$_GET['authkey'],$_GET['passkey']);
 		break;
-	case 'torrents_music': 
+	case 'torrents_music':
 		$Feed->channel('Music Torrents', 'RSS feed for all new music torrents.');
-		$Feed->retrieve('torrents_music',$_GET['authkey'],$_GET['passkey']); 
+		$Feed->retrieve('torrents_music',$_GET['authkey'],$_GET['passkey']);
 		break;
-	case 'torrents_apps': 
+	case 'torrents_apps':
 		$Feed->channel('Application Torrents', 'RSS feed for all new application torrents.');
-		$Feed->retrieve('torrents_apps',$_GET['authkey'],$_GET['passkey']); 
+		$Feed->retrieve('torrents_apps',$_GET['authkey'],$_GET['passkey']);
 		break;
-	case 'torrents_ebooks': 
+	case 'torrents_ebooks':
 		$Feed->channel('E-Book Torrents', 'RSS feed for all new e-book torrents.');
-		$Feed->retrieve('torrents_ebooks',$_GET['authkey'],$_GET['passkey']); 
+		$Feed->retrieve('torrents_ebooks',$_GET['authkey'],$_GET['passkey']);
 		break;
-	case 'torrents_abooks': 
+	case 'torrents_abooks':
 		$Feed->channel('Audiobook Torrents', 'RSS feed for all new audiobook torrents.');
-		$Feed->retrieve('torrents_abooks',$_GET['authkey'],$_GET['passkey']); 
+		$Feed->retrieve('torrents_abooks',$_GET['authkey'],$_GET['passkey']);
 		break;
-	case 'torrents_evids': 
+	case 'torrents_evids':
 		$Feed->channel('E-Learning Video Torrents', 'RSS feed for all new e-learning video torrents.');
-		$Feed->retrieve('torrents_evids',$_GET['authkey'],$_GET['passkey']); 
+		$Feed->retrieve('torrents_evids',$_GET['authkey'],$_GET['passkey']);
 		break;
-	case 'torrents_comedy': 
+	case 'torrents_comedy':
 		$Feed->channel('Comedy Torrents', 'RSS feed for all new comedy torrents.');
-		$Feed->retrieve('torrents_comedy',$_GET['authkey'],$_GET['passkey']); 
+		$Feed->retrieve('torrents_comedy',$_GET['authkey'],$_GET['passkey']);
 		break;
-	case 'torrents_comics': 
+	case 'torrents_comics':
 		$Feed->channel('Comic Torrents', 'RSS feed for all new comic torrents.');
-		$Feed->retrieve('torrents_comics',$_GET['authkey'],$_GET['passkey']); 
+		$Feed->retrieve('torrents_comics',$_GET['authkey'],$_GET['passkey']);
 		break;
-	case 'torrents_mp3': 
+	case 'torrents_mp3':
 		$Feed->channel('MP3 Torrents', 'RSS feed for all new mp3 torrents.');
-		$Feed->retrieve('torrents_mp3',$_GET['authkey'],$_GET['passkey']); 
+		$Feed->retrieve('torrents_mp3',$_GET['authkey'],$_GET['passkey']);
 		break;
-	case 'torrents_flac': 
+	case 'torrents_flac':
 		$Feed->channel('FLAC Torrents', 'RSS feed for all new FLAC torrents.');
-		$Feed->retrieve('torrents_flac',$_GET['authkey'],$_GET['passkey']); 
+		$Feed->retrieve('torrents_flac',$_GET['authkey'],$_GET['passkey']);
 		break;
-	case 'torrents_vinyl': 
+	case 'torrents_vinyl':
 		$Feed->channel('Vinyl Sourced Torrents', 'RSS feed for all new vinyl sourced torrents.');
-		$Feed->retrieve('torrents_vinyl',$_GET['authkey'],$_GET['passkey']); 
+		$Feed->retrieve('torrents_vinyl',$_GET['authkey'],$_GET['passkey']);
 		break;
-	case 'torrents_lossless': 
+	case 'torrents_lossless':
 		$Feed->channel('Lossless Torrents', 'RSS feed for all new lossless uploads.');
-		$Feed->retrieve('torrents_lossless',$_GET['authkey'],$_GET['passkey']); 
+		$Feed->retrieve('torrents_lossless',$_GET['authkey'],$_GET['passkey']);
 		break;
-	case 'torrents_lossless24': 
+	case 'torrents_lossless24':
 		$Feed->channel('24bit Lossless Torrents', 'RSS feed for all new 24bit uploads.');
-		$Feed->retrieve('torrents_lossless24',$_GET['authkey'],$_GET['passkey']); 
+		$Feed->retrieve('torrents_lossless24',$_GET['authkey'],$_GET['passkey']);
 		break;
 	default:
 		// Personalized torrents
 		if(empty($_GET['name']) && substr($_GET['feed'], 0, 16) == 'torrents_notify_'){
 			// All personalized torrent notifications
 			$Feed->channel('Personalized torrent notifications', 'RSS feed for personalized torrent notifications.');
-			$Feed->retrieve($_GET['feed'],$_GET['authkey'],$_GET['passkey']); 
+			$Feed->retrieve($_GET['feed'],$_GET['authkey'],$_GET['passkey']);
 		} elseif(!empty($_GET['name']) && substr($_GET['feed'], 0, 16) == 'torrents_notify_'){
 			// Specific personalized torrent notification channel
 			$Feed->channel(display_str($_GET['name']), 'Personal RSS feed: '.display_str($_GET['name']));
-			$Feed->retrieve($_GET['feed'],$_GET['authkey'],$_GET['passkey']); 
+			$Feed->retrieve($_GET['feed'],$_GET['authkey'],$_GET['passkey']);
 		} elseif(!empty($_GET['name']) && substr($_GET['feed'], 0, 21) == 'torrents_bookmarks_t_') {
 			// Bookmarks
 			$Feed->channel('Bookmarked torrent notifications', 'RSS feed for bookmarked torrents.');
-			$Feed->retrieve($_GET['feed'],$_GET['authkey'],$_GET['passkey']); 
+			$Feed->retrieve($_GET['feed'],$_GET['authkey'],$_GET['passkey']);
 		} else {
 			$Feed->channel('All Torrents', 'RSS feed for all new torrent uploads.');
-			$Feed->retrieve('torrents_all',$_GET['authkey'],$_GET['passkey']); 
+			$Feed->retrieve('torrents_all',$_GET['authkey'],$_GET['passkey']);
 		}
 }
 $Feed->close_feed();
diff --git a/sections/forums/ajax_get_edit.php b/sections/forums/ajax_get_edit.php
index 856aea61..23249268 100644
--- a/sections/forums/ajax_get_edit.php
+++ b/sections/forums/ajax_get_edit.php
@@ -26,13 +26,13 @@
 $Edits = $Cache->get_value($Type.'_edits_'.$PostID);
 if(!is_array($Edits)) {
 	$DB->query("SELECT ce.EditUser, ce.EditTime, ce.Body
-			FROM comments_edits AS ce 
+			FROM comments_edits AS ce
 			WHERE Page = '".$Type."' AND PostID = ".$PostID."
 			ORDER BY ce.EditTime DESC");
 	$Edits = $DB->to_array();
 	$Cache->cache_value($Type.'_edits_'.$PostID, $Edits, 0);
 }
-	
+
 list($UserID, $Time) = $Edits[$Depth];
 if($Depth != 0) {
 	list(,,$Body) = $Edits[$Depth - 1];
diff --git a/sections/forums/change_vote.php b/sections/forums/change_vote.php
index 5dd8783b..1e9ee145 100644
--- a/sections/forums/change_vote.php
+++ b/sections/forums/change_vote.php
@@ -16,7 +16,7 @@
 	$DB->query("UPDATE forums_polls_votes SET Vote = ".$NewVote." WHERE TopicID = ".$ThreadID." AND UserID = ".$LoggedUser['ID']);
 	$Cache->delete_value('polls_'.$ThreadID);
 	header("Location: forums.php?action=viewthread&threadid=".$ThreadID);
-	
+
 } else {
 	error(404);
 }
diff --git a/sections/forums/delete.php b/sections/forums/delete.php
index 610dccd4..f2237c73 100644
--- a/sections/forums/delete.php
+++ b/sections/forums/delete.php
@@ -10,7 +10,7 @@
 }
 
 // Get topicid, forumid, number of pages
-$DB->query("SELECT 
+$DB->query("SELECT
 	TopicID,
 	ForumID,
 	CEIL(COUNT(p.ID)/".POSTS_PER_PAGE.") AS Pages,
diff --git a/sections/forums/delete_poll_option.php b/sections/forums/delete_poll_option.php
index e67a971a..9edb7c11 100644
--- a/sections/forums/delete_poll_option.php
+++ b/sections/forums/delete_poll_option.php
@@ -29,7 +29,7 @@
 
 	$Cache->delete_value('polls_'.$ThreadID);
 	header("Location: forums.php?action=viewthread&threadid=".$ThreadID);
-	
+
 } else {
 	error(404);
 }
diff --git a/sections/forums/forum.php b/sections/forums/forum.php
index a6095837..02a5aac7 100644
--- a/sections/forums/forum.php
+++ b/sections/forums/forum.php
@@ -53,7 +53,7 @@
 		list($Stickies) = $DB->next_record();
 		$Cache->cache_value('forums_'.$ForumID, array($Forum,'',0,$Stickies), 0);
 	}
-} 
+}
 
 
 if(!isset($Forums[$ForumID])) { error(404); }
@@ -79,7 +79,7 @@
 			<div style="display: inline-block;">
 				<h3>Search this forum:</h3>
 				<form class="search_form" name="forum" action="forums.php" method="get">
-					<table cellpadding="6" cellspacing="1" border="0" class="layout border">	
+					<table cellpadding="6" cellspacing="1" border="0" class="layout border">
 						<tr>
 							<td>
 								<input type="hidden" name="action" value="search" />
@@ -93,9 +93,9 @@
 						<tr>
 							<td><strong>Search in:</strong></td>
 							<td>
-								<input type="radio" name="type" id="type_title" value="title" checked="checked" /> 
+								<input type="radio" name="type" id="type_title" value="title" checked="checked" />
 								<label for="type_title">Titles</label>
-								<input type="radio" name="type" id="type_body" value="body" /> 
+								<input type="radio" name="type" id="type_body" value="body" />
 								<label for="type_body">Post bodies</label>
 							</td>
 						</tr>
@@ -111,17 +111,17 @@
 				<br />
 			</div>
 		</div>
-		
 
-<?     
+
+<?
 /*
 	if(check_perms('users_mod')) {
 	$DB->query("SELECT ForumID from subscribed_forums WHERE ForumID='$ForumID' AND SubscriberID='$LoggedUser[ID]'");
         if($DB->record_count() == 0) { ?>
 		<a href="forums.php?action=forum_subscribe&amp;perform=add&amp;forumid=<?=$ForumID?>&amp;auth=<?=$LoggedUser['AuthKey']?>" class="brackets">Subscribe to forum</a>
-<?      } else { ?> 
+<?      } else { ?>
 		<a href="forums.php?action=forum_subscribe&amp;perform=remove&amp;forumid=<?=$ForumID?>&amp;auth=<?=$LoggedUser['AuthKey']?>" class="brackets">Unsubscribe from forum</a>
-<?      } 
+<?      }
 	}
  */
 ?>
diff --git a/sections/forums/get_post.php b/sections/forums/get_post.php
index 496efd44..2ab8fc18 100644
--- a/sections/forums/get_post.php
+++ b/sections/forums/get_post.php
@@ -3,10 +3,10 @@
 /*********************************************************************\
 //--------------Get Post--------------------------------------------//
 
-This gets the raw BBCode of a post. It's used for editing and 
-quoting posts. 
+This gets the raw BBCode of a post. It's used for editing and
+quoting posts.
 
-It gets called if $_GET['action'] == 'get_post'. It requires 
+It gets called if $_GET['action'] == 'get_post'. It requires
 $_GET['post'], which is the ID of the post.
 
 \*********************************************************************/
@@ -19,7 +19,7 @@
 // Variables for database input
 $PostID = $_GET['post'];
 
-// Mainly 
+// Mainly
 $DB->query("SELECT
 		p.Body, t.ForumID
 		FROM forums_posts as p JOIN forums_topics as t on p.TopicID = t.ID
@@ -31,7 +31,7 @@
 	error(0);
 }
 
-// This gets sent to the browser, which echoes it wherever 
+// This gets sent to the browser, which echoes it wherever
 
 echo trim($Body);
 
diff --git a/sections/forums/index.php b/sections/forums/index.php
index 7dd4f73b..d4f57b16 100644
--- a/sections/forums/index.php
+++ b/sections/forums/index.php
@@ -93,7 +93,7 @@
 			break;
 		case 'viewthread':
 		case 'viewtopic':
-			// Page that displays threads	
+			// Page that displays threads
 			require(SERVER_ROOT.'/sections/forums/thread.php');
 			break;
 		case 'ajax_get_edit':
diff --git a/sections/forums/mod_thread.php b/sections/forums/mod_thread.php
index 4c736f49..3f4549a2 100644
--- a/sections/forums/mod_thread.php
+++ b/sections/forums/mod_thread.php
@@ -2,11 +2,11 @@
 /*********************************************************************\
 //--------------Mod thread-------------------------------------------//
 
-This page gets called if we're editing a thread. 
+This page gets called if we're editing a thread.
 
 Known issues:
-If multiple threads are moved before forum activity occurs then 
-threads will linger with the 'Moved' flag until they're knocked off 
+If multiple threads are moved before forum activity occurs then
+threads will linger with the 'Moved' flag until they're knocked off
 the front page.
 
 \*********************************************************************/
@@ -58,37 +58,37 @@
 	if(check_perms('site_admin_forums')) {
 		$DB->query("DELETE FROM forums_posts WHERE TopicID='$TopicID'");
 		$DB->query("DELETE FROM forums_topics WHERE ID='$TopicID'");
-		
-		$DB->query("SELECT 
+
+		$DB->query("SELECT
 			t.ID,
 			t.LastPostID,
 			t.Title,
 			p.AuthorID,
 			um.Username,
-			p.AddedTime, 
+			p.AddedTime,
 			(SELECT COUNT(pp.ID) FROM forums_posts AS pp JOIN forums_topics AS tt ON pp.TopicID=tt.ID WHERE tt.ForumID='$ForumID'),
 			t.IsLocked,
 			t.IsSticky
-			FROM forums_topics AS t 
-			JOIN forums_posts AS p ON p.ID=t.LastPostID 
+			FROM forums_topics AS t
+			JOIN forums_posts AS p ON p.ID=t.LastPostID
 			LEFT JOIN users_main AS um ON um.ID=p.AuthorID
 			WHERE t.ForumID='$ForumID'
 			GROUP BY t.ID
 			ORDER BY t.LastPostID DESC LIMIT 1");
 		list($NewLastTopic, $NewLastPostID, $NewLastTitle, $NewLastAuthorID, $NewLastAuthorName, $NewLastAddedTime, $NumPosts, $NewLocked, $NewSticky) = $DB->next_record(MYSQLI_NUM, false);
-		
-		$DB->query("UPDATE forums SET 
-			NumTopics=NumTopics-1, 
+
+		$DB->query("UPDATE forums SET
+			NumTopics=NumTopics-1,
 			NumPosts=NumPosts-'$Posts',
 			LastPostTopicID='$NewLastTopic',
 			LastPostID='$NewLastPostID',
 			LastPostAuthorID='$NewLastAuthorID',
 			LastPostTime='$NewLastAddedTime'
 			WHERE ID='$ForumID'");
-		
+
 		$Cache->delete('thread_'.$TopicID);
-		
-		
+
+
 		$Cache->begin_transaction('forums_list');
 		$UpdateArray = array(
 			'NumPosts'=>$NumPosts,
@@ -101,7 +101,7 @@
 			'IsLocked'=>$NewLocked,
 			'IsSticky'=>$NewSticky
 			);
-		
+
 		$Cache->update_row($ForumID, $UpdateArray);
 		$Cache->commit_transaction(0);
 		$Cache->delete_value('thread_'.$TopicID.'_info');
@@ -122,17 +122,17 @@
 		);
 	$Cache->update_row(false, $UpdateArray);
 	$Cache->commit_transaction(0);
-	
+
 	$DB->query("UPDATE forums_topics SET
 		IsSticky = '$Sticky',
 		IsLocked = '$Locked',
 		Title = '$Title',
-		ForumID ='$ForumID' 
+		ForumID ='$ForumID'
 		WHERE ID='$TopicID'");
-	
-	
+
+
 	if($ForumID!=$OldForumID) { // If we're moving a thread, change the forum stats
-		
+
 		$DB->query("SELECT MinClassRead, MinClassWrite, Name FROM forums WHERE ID='$ForumID'");
 		list($MinClassRead, $MinClassWrite, $ForumName) = $DB->next_record(MYSQLI_NUM, false);
 		$Cache->begin_transaction('thread_'.$TopicID.'_info');
@@ -143,38 +143,38 @@
 			);
 		$Cache->update_row(false, $UpdateArray);
 		$Cache->commit_transaction(3600*24*5);
-		
+
 		$Cache->begin_transaction('forums_list');
-		
-		
+
+
 		// Forum we're moving from
-		$DB->query("SELECT 
+		$DB->query("SELECT
 			t.ID,
 			t.LastPostID,
 			t.Title,
 			p.AuthorID,
 			um.Username,
-			p.AddedTime, 
+			p.AddedTime,
 			(SELECT COUNT(pp.ID) FROM forums_posts AS pp JOIN forums_topics AS tt ON pp.TopicID=tt.ID WHERE tt.ForumID='$OldForumID'),
 			t.IsLocked,
 			t.IsSticky
-			FROM forums_topics AS t 
-			JOIN forums_posts AS p ON p.ID=t.LastPostID 
+			FROM forums_topics AS t
+			JOIN forums_posts AS p ON p.ID=t.LastPostID
 			LEFT JOIN users_main AS um ON um.ID=p.AuthorID
 			WHERE t.ForumID='$OldForumID'
 			ORDER BY t.LastPostID DESC LIMIT 1");
 		list($NewLastTopic, $NewLastPostID, $NewLastTitle, $NewLastAuthorID, $NewLastAuthorName, $NewLastAddedTime, $NumPosts, $NewLocked, $NewSticky) = $DB->next_record(MYSQLI_NUM, false);
-		
-		$DB->query("UPDATE forums SET 
-			NumTopics=NumTopics-1, 
+
+		$DB->query("UPDATE forums SET
+			NumTopics=NumTopics-1,
 			NumPosts=NumPosts-'$Posts',
 			LastPostTopicID='$NewLastTopic',
 			LastPostID='$NewLastPostID',
 			LastPostAuthorID='$NewLastAuthorID',
 			LastPostTime='$NewLastAddedTime'
 			WHERE ID='$OldForumID'");
-		
-		
+
+
 		$UpdateArray = array(
 			'NumPosts'=>$NumPosts,
 			'NumTopics'=>'-1',
@@ -186,37 +186,37 @@
 			'IsLocked'=>$NewLocked,
 			'IsSticky'=>$NewSticky
 			);
-		
-	
+
+
 		$Cache->update_row($OldForumID, $UpdateArray);
 
 		// Forum we're moving to
-		
-		$DB->query("SELECT 
+
+		$DB->query("SELECT
 			t.ID,
 			t.LastPostID,
 			t.Title,
 			p.AuthorID,
 			um.Username,
-			p.AddedTime, 
+			p.AddedTime,
 			(SELECT COUNT(pp.ID) FROM forums_posts AS pp JOIN forums_topics AS tt ON pp.TopicID=tt.ID WHERE tt.ForumID='$ForumID')
-			FROM forums_topics AS t 
-			JOIN forums_posts AS p ON p.ID=t.LastPostID 
+			FROM forums_topics AS t
+			JOIN forums_posts AS p ON p.ID=t.LastPostID
 			LEFT JOIN users_main AS um ON um.ID=p.AuthorID
 			WHERE t.ForumID='$ForumID'
 			ORDER BY t.LastPostID DESC LIMIT 1");
 		list($NewLastTopic, $NewLastPostID, $NewLastTitle, $NewLastAuthorID, $NewLastAuthorName, $NewLastAddedTime, $NumPosts) = $DB->next_record(MYSQLI_NUM, false);
-		
-		$DB->query("UPDATE forums SET 
-			NumTopics=NumTopics+1, 
+
+		$DB->query("UPDATE forums SET
+			NumTopics=NumTopics+1,
 			NumPosts=NumPosts+'$Posts',
 			LastPostTopicID='$NewLastTopic',
 			LastPostID='$NewLastPostID',
 			LastPostAuthorID='$NewLastAuthorID',
 			LastPostTime='$NewLastAddedTime'
 			WHERE ID='$ForumID'");
-		
-		
+
+
 		$UpdateArray = array(
 			'NumPosts'=>($NumPosts+$Posts),
 			'NumTopics'=>'+1',
@@ -226,12 +226,12 @@
 			'LastPostTime'=>$NewLastAddedTime,
 			'Title'=>$NewLastTitle
 			);
-		
-	
+
+
 		$Cache->update_row($ForumID, $UpdateArray);
-		
+
 		$Cache->commit_transaction(0);
-	} else { // Editing 
+	} else { // Editing
 		$DB->query("SELECT LastPostTopicID FROM forums WHERE ID='$ForumID'");
 		list($LastTopicID) = $DB->next_record();
 		if($LastTopicID == $TopicID) {
@@ -251,7 +251,7 @@
 			$Cache->expire_value('thread_'.$TopicID.'_catalogue_'.$i,3600*24*7);
 		}
 		$Cache->expire_value('thread_'.$TopicID.'_info',3600*24*7);
-		
+
 		$DB->query('UPDATE forums_polls SET Closed=\'0\' WHERE TopicID=\''.$TopicID.'\'');
 		$Cache->delete_value('polls_'.$TopicID);
 	}
diff --git a/sections/forums/poll_mod.php b/sections/forums/poll_mod.php
index df05a6e0..29358719 100644
--- a/sections/forums/poll_mod.php
+++ b/sections/forums/poll_mod.php
@@ -12,13 +12,13 @@
 	$Answers = unserialize($Answers);
 	$DB->query("SELECT Vote, COUNT(UserID) FROM forums_polls_votes WHERE TopicID='$TopicID' AND Vote <> '0' GROUP BY Vote");
 	$VoteArray = $DB->to_array(false, MYSQLI_NUM);
-	
+
 	$Votes = array();
 	foreach ($VoteArray as $VoteSet) {
-		list($Key,$Value) = $VoteSet; 
+		list($Key,$Value) = $VoteSet;
 		$Votes[$Key] = $Value;
 	}
-	
+
 	for ($i = 1, $il = count($Answers); $i <= $il; ++$i) {
 		if (!isset($Votes[$i])) {
 			$Votes[$i] = 0;
diff --git a/sections/forums/poll_vote.php b/sections/forums/poll_vote.php
index b5ae338b..9be170f6 100644
--- a/sections/forums/poll_vote.php
+++ b/sections/forums/poll_vote.php
@@ -37,13 +37,13 @@
 	$Answers = unserialize($Answers);
 	$DB->query("SELECT Vote, COUNT(UserID) FROM forums_polls_votes WHERE TopicID='$TopicID' AND Vote <> '0' GROUP BY Vote");
 	$VoteArray = $DB->to_array(false, MYSQLI_NUM);
-	
+
 	$Votes = array();
 	foreach ($VoteArray as $VoteSet) {
-		list($Key,$Value) = $VoteSet; 
+		list($Key,$Value) = $VoteSet;
 		$Votes[$Key] = $Value;
 	}
-	
+
 	for ($i = 1, $il = count($Answers); $i <= $il; ++$i) {
 		if (!isset($Votes[$i])) {
 			$Votes[$i] = 0;
@@ -112,7 +112,7 @@
 				} else {
 					$Ratio=0;
 					$Percent=0;
-				} 
+				}
 ?>
 					<li><?=display_str($Answers[$i])?> (<?=number_format($Percent*100,2)?>%)</li>
 					<li class="graph">
@@ -123,13 +123,13 @@
 <?			}
 		} else {
 			//Staff forum, output voters, not percentages
-			$DB->query("SELECT GROUP_CONCAT(um.Username SEPARATOR ', '), 
-							fpv.Vote 
-						FROM users_main AS um 
+			$DB->query("SELECT GROUP_CONCAT(um.Username SEPARATOR ', '),
+							fpv.Vote
+						FROM users_main AS um
 							JOIN forums_polls_votes AS fpv ON um.ID = fpv.UserID
 						WHERE TopicID = ".$TopicID."
 						GROUP BY fpv.Vote");
-			
+
 			$StaffVotes = $DB->to_array();
 			foreach($StaffVotes as $StaffVote) {
 				list($StaffString, $StaffVoted) = $StaffVote;
diff --git a/sections/forums/quote_notify.php b/sections/forums/quote_notify.php
index b617042b..8638739f 100644
--- a/sections/forums/quote_notify.php
+++ b/sections/forums/quote_notify.php
@@ -36,7 +36,7 @@
 	$ForumID = db_string($ForumID);
 	$TopicID = db_string($TopicID);
 	$PostID = db_string($PostID);
-	
+
 	$DB->query("INSERT IGNORE INTO users_notify_quoted (UserID, QuoterID, ForumID, TopicID, PostID, Date)
 		VALUES ('$UserID', '$QuoterID', '$ForumID', '$TopicID', '$PostID', '" . sqltime() . "')");
 	$Cache->delete_value('forums_quotes_' . $UserID);
diff --git a/sections/forums/search.php b/sections/forums/search.php
index 8e5d8393..69f3cc95 100644
--- a/sections/forums/search.php
+++ b/sections/forums/search.php
@@ -61,7 +61,7 @@
 if (!empty($_GET['threadid']) && is_number($_GET['threadid'])) {
 	$ThreadID = $_GET['threadid'];
 	$Type = 'body';
-	$SQL = "SELECT Title FROM forums_topics AS t 
+	$SQL = "SELECT Title FROM forums_topics AS t
 				JOIN forums AS f ON f.ID=t.ForumID
 				WHERE t.ID=$ThreadID
 				AND ((f.MinClassRead <= '$LoggedUser[Class]'";
@@ -98,13 +98,13 @@
 				</td>
 			</tr>
 <?
-if (empty($ThreadID)) { ?>			
+if (empty($ThreadID)) { ?>
 			<tr>
 				<td><strong>Search in:</strong></td>
 				<td>
-					<input type="radio" name="type" id="type_title" value="title" <? if($Type == 'title') { echo 'checked="checked" '; }?>/> 
+					<input type="radio" name="type" id="type_title" value="title" <? if($Type == 'title') { echo 'checked="checked" '; }?>/>
 					<label for="type_title">Titles</label>
-					<input type="radio" name="type" id="type_body" value="body" <? if($Type == 'body') { echo 'checked="checked" '; }?>/> 
+					<input type="radio" name="type" id="type_body" value="body" <? if($Type == 'body') { echo 'checked="checked" '; }?>/>
 					<label for="type_body">Post bodies</label>
 				</td>
 			</tr>
@@ -112,8 +112,8 @@
 				<td><strong>Forums:</strong></td>
 				<td>
 		<table class="cat_list layout">
-	
-							
+
+
 	<?// List of forums
 	$Open = false;
 	$LastCategoryID = -1;
@@ -123,20 +123,20 @@
 		if (!check_forumperm($Forum['ID'])) {
 			continue;
 		}
-		
+
 		$Columns++;
-		
+
 		if ($Forum['CategoryID'] != $LastCategoryID) {
 			$LastCategoryID = $Forum['CategoryID'];
 			if($Open) {
 				if ($Columns%5) { ?>
 				<td colspan="<?=(5-($Columns%5))?>"></td>
-<? 			
+<?
 				}
 
 ?>
 			</tr>
-<?		
+<?
 			}
 			$Columns = 0;
 			$Open = true;
@@ -175,7 +175,7 @@
 						<input type="submit" value="Search" />
 					</td>
 				</tr>
-			</table>	
+			</table>
 		</form>
 	<div class="linkbox">
 <?
@@ -184,7 +184,7 @@
 $Words = explode(' ',  db_string($Search));
 
 if($Type == 'body') {
-	
+
 	$sql = "SELECT SQL_CALC_FOUND_ROWS
 		t.ID,
 		".(!empty($ThreadID) ? "SUBSTRING_INDEX(p.Body, ' ', 40)":"t.Title").",
@@ -196,7 +196,7 @@
 		FROM forums_posts AS p
 		JOIN forums_topics AS t ON t.ID=p.TopicID
 		JOIN forums AS f ON f.ID=t.ForumID
-		WHERE 
+		WHERE
 		((f.MinClassRead<='$LoggedUser[Class]'";
 	if(!empty($RestrictedForums)) {
 		$sql.=" AND f.ID NOT IN ('".$RestrictedForums."')";
@@ -225,11 +225,11 @@
 	if(!empty($ThreadID)) {
 		$sql.=" AND t.ID='$ThreadID' ";
 	}
-	
+
 	$sql .= "ORDER BY p.AddedTime DESC LIMIT $Limit";
-	
+
 } else {
-	$sql = "SELECT SQL_CALC_FOUND_ROWS 
+	$sql = "SELECT SQL_CALC_FOUND_ROWS
 		t.ID,
 		t.Title,
 		t.ForumID,
@@ -237,9 +237,9 @@
 		t.LastPostTime,
 		'',
 		''
-		FROM forums_topics AS t 
+		FROM forums_topics AS t
 		JOIN forums AS f ON f.ID=t.ForumID
-		WHERE 
+		WHERE
 		((f.MinClassRead<='$LoggedUser[Class]'";
 	if(!empty($RestrictedForums)) {
 		$sql.=" AND f.ID NOT IN ('".$RestrictedForums."')";
diff --git a/sections/forums/subscribe.php b/sections/forums/subscribe.php
index 7bd71b93..a6a71d81 100644
--- a/sections/forums/subscribe.php
+++ b/sections/forums/subscribe.php
@@ -4,7 +4,7 @@
 
 $ForumID = db_string($_GET['forumid']);
 if($_GET['perform'] == 'add') {
-        $DB->query("INSERT IGNORE INTO subscribed_forums (ForumID, SubscriberID) VALUES ('$ForumID', '$LoggedUser[ID]')"); 
+        $DB->query("INSERT IGNORE INTO subscribed_forums (ForumID, SubscriberID) VALUES ('$ForumID', '$LoggedUser[ID]')");
 }
 elseif($_GET['perform'] == 'remove') {
         $DB->query("DELETE FROM subscribed_forums WHERE ForumID = '$ForumID' AND SubscriberID = '$LoggedUser[ID]'");
diff --git a/sections/forums/take_new_thread.php b/sections/forums/take_new_thread.php
index 897a414d..d001ad14 100644
--- a/sections/forums/take_new_thread.php
+++ b/sections/forums/take_new_thread.php
@@ -49,9 +49,9 @@
 if (!isset($Forums[$ForumID])) { error(404); }
 
 if(!check_forumperm($ForumID, 'Write') || !check_forumperm($ForumID, 'Create')) {
-	error(403); 
+	error(403);
 }
-	
+
 
 $DB->query("INSERT INTO forums_topics
 	(Title, AuthorID, ForumID, LastPostTime, LastPostAuthorID)
@@ -67,16 +67,16 @@
 $PostID = $DB->inserted_id();
 
 $DB->query("UPDATE forums SET
-		NumPosts		  = NumPosts+1, 
-		NumTopics		 = NumTopics+1, 
+		NumPosts		  = NumPosts+1,
+		NumTopics		 = NumTopics+1,
 		LastPostID		= '$PostID',
 		LastPostAuthorID  = '".$LoggedUser['ID']."',
 		LastPostTopicID   = '$TopicID',
 		LastPostTime	  = '".sqltime()."'
 		WHERE ID = '$ForumID'");
-			
+
 $DB->query("UPDATE forums_topics SET
-		NumPosts		  = NumPosts+1, 
+		NumPosts		  = NumPosts+1,
 		LastPostID		= '$PostID',
 		LastPostAuthorID  = '".$LoggedUser['ID']."',
 		LastPostTime	  = '".sqltime()."'
@@ -109,20 +109,20 @@
 	$Question = trim($_POST['question']);
 	$Answers = array();
 	$Votes = array();
-	
+
 	//This can cause polls to have answer ids of 1 3 4 if the second box is empty
 	foreach ($_POST['answers'] as $i => $Answer) {
 		if ($Answer == '') { continue; }
 		$Answers[$i+1] = $Answer;
 		$Votes[$i+1] = 0;
 	}
-	
+
 	if (count($Answers) < 2) {
 		error('You cannot create a poll with only one answer.');
 	} else if(count($Answers) > 25) {
 		error('You cannot create a poll with greater than 25 answers');
 	}
-	
+
 	$DB->query('INSERT INTO forums_polls (TopicID, Question, Answers) VALUES (\''.$TopicID.'\',\''.db_string($Question).'\',\''.db_string(serialize($Answers)).'\')');
 	$Cache->cache_value('polls_'.$TopicID, array($Question,$Answers,$Votes,'0000-00-00 00:00:00','0'), 0);
 
@@ -134,12 +134,12 @@
 //if cache exists modify it, if not, then it will be correct when selected next, and we can skip this block
 if ($Forum = $Cache->get_value('forums_'.$ForumID)) {
 	list($Forum,,,$Stickies) = $Forum;
-	
+
 	//Remove the last thread from the index
 	if (count($Forum) == TOPICS_PER_PAGE && $Stickies < TOPICS_PER_PAGE) {
 		array_pop($Forum);
 	}
-	
+
 	if ($Stickies > 0) {
 		$Part1 = array_slice($Forum,0,$Stickies,true); //Stikys
 		$Part3 = array_slice($Forum,$Stickies,TOPICS_PER_PAGE-$Stickies-1,true); //Rest of page
@@ -162,7 +162,7 @@
 	$Forum = $Part1 + $Part2 + $Part3;
 
 	$Cache->cache_value('forums_'.$ForumID, array($Forum,'',0,$Stickies), 0);
-	
+
 	//Update the forum root
 	$Cache->begin_transaction('forums_list');
 	$Cache->update_row($ForumID, array(
diff --git a/sections/forums/take_reply.php b/sections/forums/take_reply.php
index 60b3bcf1..6df2beb2 100644
--- a/sections/forums/take_reply.php
+++ b/sections/forums/take_reply.php
@@ -6,7 +6,7 @@
 //--------------Take Post--------------------------------------------//
 
 This page takes a forum post submission, validates it (TODO), and
-enters it into the database. The user is then redirected to their 
+enters it into the database. The user is then redirected to their
 post.
 
 $_POST['action'] is what the user is trying to do. It can be:
@@ -64,7 +64,7 @@
 	//Get the id for this post in the database to append
 	$DB->query("SELECT ID, Body FROM forums_posts WHERE TopicID='$TopicID' AND AuthorID='".$LoggedUser['ID']."' ORDER BY ID DESC LIMIT 1");
 	list($PostID, $OldBody) = $DB->next_record(MYSQLI_NUM, false);
-	
+
 	//Edit the post
 	$DB->query("UPDATE forums_posts SET Body = CONCAT(Body,'"."\n\n".db_string($Body)."'), EditedUserID = '".$LoggedUser['ID']."', EditedTime = '".$SQLTime."' WHERE ID='$PostID'");
 
@@ -72,7 +72,7 @@
 	$DB->query("INSERT INTO comments_edits (Page, PostID, EditUser, EditTime, Body)
 				VALUES ('forums', ".$PostID.", ".$LoggedUser['ID'].", '".$SQLTime."', '".db_string($OldBody)."')");
 	$Cache->delete_value("forums_edits_$PostID");
-	
+
 	//Get the catalogue it is in
 	$CatalogueID = floor((POSTS_PER_PAGE*ceil($ThreadInfo['Posts']/POSTS_PER_PAGE)-POSTS_PER_PAGE)/THREAD_CATALOGUE);
 
@@ -98,27 +98,27 @@
 			'Username'=>$LoggedUser['Username']
 			));
 	$Cache->commit_transaction(0);
-	
+
 //Now we're dealing with a normal post
 } else {
 	//Insert the post into the posts database
 	$DB->query("INSERT INTO forums_posts (TopicID, AuthorID, AddedTime, Body)
 			VALUES ('$TopicID', '".$LoggedUser['ID']."', '".$SQLTime."', '".db_string($Body)."')");
-	
+
 	$PostID = $DB->inserted_id();
 
 	//This updates the root index
 	$DB->query("UPDATE forums SET
-			NumPosts		  = NumPosts+1, 
+			NumPosts		  = NumPosts+1,
 			LastPostID		= '$PostID',
 			LastPostAuthorID  = '".$LoggedUser['ID']."',
 			LastPostTopicID   = '$TopicID',
 			LastPostTime	  = '".$SQLTime."'
 			WHERE ID = '$ForumID'");
-			
+
 	//Update the topic
 	$DB->query("UPDATE forums_topics SET
-			NumPosts		  = NumPosts+1, 
+			NumPosts		  = NumPosts+1,
 			LastPostID		= '$PostID',
 			LastPostAuthorID  = '".$LoggedUser['ID']."',
 			LastPostTime	  = '".$SQLTime."'
@@ -127,7 +127,7 @@
 	//if cache exists modify it, if not, then it will be correct when selected next, and we can skip this block
 	if ($Forum = $Cache->get_value('forums_'.$ForumID)) {
 		list($Forum,,,$Stickies) = $Forum;
-		
+
 		//if the topic is already on this page
 		if (array_key_exists($TopicID,$Forum)) {
 			$Thread = $Forum[$TopicID];
@@ -137,7 +137,7 @@
 			$Thread['LastPostTime'] = $SQLTime; //Time of last post
 			$Thread['LastPostAuthorID'] = $LoggedUser['ID']; //Last poster id
 			$Part2 = array($TopicID=>$Thread); //Bumped thread
-			
+
 		//if we're bumping from an older page
 		} else {
 			//Remove the last thread from the index
@@ -180,14 +180,14 @@
 			$Forum = $Part1 + $Part2 + $Part3; //Merge it
 		}
 		$Cache->cache_value('forums_'.$ForumID, array($Forum,'',0,$Stickies), 0);
-		
+
 		//Update the forum root
 		$Cache->begin_transaction('forums_list');
 		$Cache->update_row($ForumID, array(
-			'NumPosts'=>'+1', 
-			'LastPostID'=>$PostID, 
-			'LastPostAuthorID'=>$LoggedUser['ID'], 
-			'LastPostTopicID'=>$TopicID, 
+			'NumPosts'=>'+1',
+			'LastPostID'=>$PostID,
+			'LastPostAuthorID'=>$LoggedUser['ID'],
+			'LastPostTopicID'=>$TopicID,
 			'LastPostTime'=>$SQLTime,
 			'Title'=>$ThreadInfo['Title'],
 			'IsLocked'=>$ThreadInfo['IsLocked'],
@@ -202,7 +202,7 @@
 
 	//This calculates the block of 500 posts that this one will fall under
 	$CatalogueID = floor((POSTS_PER_PAGE*ceil($ThreadInfo['Posts']/POSTS_PER_PAGE)-POSTS_PER_PAGE)/THREAD_CATALOGUE);
-	
+
 	//Insert the post into the thread catalogue (block of 500 posts)
 	$Cache->begin_transaction('thread_'.$TopicID.'_catalogue_'.$CatalogueID);
 	$Cache->insert('', array(
@@ -220,7 +220,7 @@
 	$Cache->begin_transaction('thread_'.$TopicID.'_info');
 	$Cache->update_row(false, array('Posts'=>'+1', 'LastPostAuthorID'=>$LoggedUser['ID']));
 	$Cache->commit_transaction(0);
-	
+
 	//Increment this now to make sure we redirect to the correct page
 	$ThreadInfo['Posts']++;
 }
diff --git a/sections/forums/take_warn.php b/sections/forums/take_warn.php
index 1ad0ef55..32718e73 100644
--- a/sections/forums/take_warn.php
+++ b/sections/forums/take_warn.php
@@ -45,15 +45,15 @@
     p.AuthorID,
     p.TopicID,
     t.ForumID,
-    CEIL((SELECT COUNT(ID) 
-    FROM forums_posts 
-    WHERE forums_posts.TopicID = p.TopicID 
+    CEIL((SELECT COUNT(ID)
+    FROM forums_posts
+    WHERE forums_posts.TopicID = p.TopicID
     AND forums_posts.ID <= '$PostID')/" . POSTS_PER_PAGE
-				. ") 
+				. ")
     AS Page
     FROM forums_posts as p
     JOIN forums_topics as t on p.TopicID = t.ID
-    JOIN forums as f ON t.ForumID=f.ID 
+    JOIN forums as f ON t.ForumID=f.ID
     WHERE p.ID='$PostID'");
 list($OldBody, $AuthorID, $TopicID, $ForumID, $Page) = $DB->next_record();
 
diff --git a/sections/forums/takeedit.php b/sections/forums/takeedit.php
index 91bc2f72..f92935fb 100644
--- a/sections/forums/takeedit.php
+++ b/sections/forums/takeedit.php
@@ -4,7 +4,7 @@
 /*********************************************************************\
 //--------------Take Post--------------------------------------------//
 
-The page that handles the backend of the 'edit post' function. 
+The page that handles the backend of the 'edit post' function.
 
 $_GET['action'] must be "takeedit" for this page to work.
 
@@ -32,7 +32,7 @@
 $SQLTime = sqltime();
 $DoPM = isset($_POST['pm']) ? $_POST['pm'] : 0;
 
-// Mainly 
+// Mainly
 $DB->query("SELECT
 		p.Body,
 		p.AuthorID,
@@ -40,20 +40,20 @@
 		t.IsLocked,
 		t.ForumID,
 		f.MinClassWrite,
-		CEIL((SELECT COUNT(ID) 
-			FROM forums_posts 
-			WHERE forums_posts.TopicID = p.TopicID 
-			AND forums_posts.ID <= '$PostID')/".POSTS_PER_PAGE.") 
+		CEIL((SELECT COUNT(ID)
+			FROM forums_posts
+			WHERE forums_posts.TopicID = p.TopicID
+			AND forums_posts.ID <= '$PostID')/".POSTS_PER_PAGE.")
 			AS Page
 		FROM forums_posts as p
 		JOIN forums_topics as t on p.TopicID = t.ID
-		JOIN forums as f ON t.ForumID=f.ID 
+		JOIN forums as f ON t.ForumID=f.ID
 		WHERE p.ID='$PostID'");
 list($OldBody, $AuthorID, $TopicID, $IsLocked, $ForumID, $MinClassWrite, $Page) = $DB->next_record();
 
 // Make sure they aren't trying to edit posts they shouldn't
 // We use die() here instead of error() because whatever we spit out is displayed to the user in the box where his forum post is
-if(!check_forumperm($ForumID, 'Write') || ($IsLocked && !check_perms('site_moderate_forums'))) { 
+if(!check_forumperm($ForumID, 'Write') || ($IsLocked && !check_perms('site_moderate_forums'))) {
 	error('Either the thread is locked, or you lack the permission to edit this post.',true);
 }
 if($UserID != $AuthorID && !check_perms('site_moderate_forums')) {
diff --git a/sections/friends/friends.php b/sections/friends/friends.php
index 61625b6b..e9cc12bc 100644
--- a/sections/friends/friends.php
+++ b/sections/friends/friends.php
@@ -1,20 +1,20 @@
  <?
 /************************************************************************
 //------------// Main friends page //----------------------------------//
-This page lists a user's friends. 
+This page lists a user's friends.
 
-There's no real point in caching this page. I doubt users load it that 
+There's no real point in caching this page. I doubt users load it that
 much.
 ************************************************************************/
 
-// Number of users per page 
+// Number of users per page
 define('FRIENDS_PER_PAGE', '20');
 include_once(SERVER_ROOT.'/classes/class_paranoia.php');
 
 
 
 View::show_header('Friends');
- 
+
 
 $UserID = $LoggedUser['ID'];
 
@@ -22,7 +22,7 @@
 list($Page,$Limit) = Format::page_limit(FRIENDS_PER_PAGE);
 
 // Main query
-$DB->query("SELECT 
+$DB->query("SELECT
 	SQL_CALC_FOUND_ROWS
 	f.FriendID,
 	f.Comment,
@@ -95,12 +95,12 @@
 			if(check_perms('site_proxy_images')) {
 				$Avatar = 'http'.($SSL?'s':'').'://'.SITE_URL.'/image.php?c=1&amp;i='.urlencode($Avatar);
 			}
-	?> 
+	?>
 					<img src="<?=$Avatar?>" alt="<?=$Username?>'s avatar" width="50px" />
-	<?	} else { ?> 
+	<?	} else { ?>
 					<img src="<?=STATIC_SERVER?>common/avatars/default.png" width="50px" alt="Default avatar" />
-	<?	} 
-	}?> 
+	<?	}
+	}?>
 			</td>
 			<td valign="top">
 					<input type="hidden" name="friendid" value="<?=$FriendID?>" />
diff --git a/sections/inbox/compose.php b/sections/inbox/compose.php
index e7f95ce5..0cc643a9 100644
--- a/sections/inbox/compose.php
+++ b/sections/inbox/compose.php
@@ -36,7 +36,7 @@
 			</div>
 			<div id="preview" class="hidden"></div>
 			<div id="buttons" class="center">
-				<input type="button" value="Preview" onclick="Quick_Preview();" /> 
+				<input type="button" value="Preview" onclick="Quick_Preview();" />
 				<input type="submit" value="Send message" />
 			</div>
 		</div>
diff --git a/sections/inbox/conversation.php b/sections/inbox/conversation.php
index 32f8a0e3..210560ab 100644
--- a/sections/inbox/conversation.php
+++ b/sections/inbox/conversation.php
@@ -95,7 +95,7 @@
 			<textarea id="quickpost" name="body" cols="90" rows="10"></textarea> <br />
 			<div id="preview" class="box vertical_space body hidden"></div>
 			<div id="buttons" class="center">
-				<input type="button" value="Preview" onclick="Quick_Preview();" /> 
+				<input type="button" value="Preview" onclick="Quick_Preview();" />
 				<input type="submit" value="Send message" />
 			</div>
 		</div>
diff --git a/sections/inbox/get_post.php b/sections/inbox/get_post.php
index 2f74b74f..520619e5 100644
--- a/sections/inbox/get_post.php
+++ b/sections/inbox/get_post.php
@@ -3,10 +3,10 @@
 /*********************************************************************\
 //--------------Get Post--------------------------------------------//
 
-This gets the raw BBCode of a post. It's used for editing and 
-quoting posts. 
+This gets the raw BBCode of a post. It's used for editing and
+quoting posts.
 
-It gets called if $_GET['action'] == 'get_post'. It requires 
+It gets called if $_GET['action'] == 'get_post'. It requires
 $_GET['post'], which is the ID of the post.
 
 \*********************************************************************/
@@ -23,12 +23,12 @@
 $DB->query("SELECT
 		m.Body
 		FROM pm_messages as m
-		JOIN pm_conversations_users AS u ON m.ConvID=u.ConvID 
+		JOIN pm_conversations_users AS u ON m.ConvID=u.ConvID
 		WHERE m.ID='$PostID'
 		AND u.UserID=".$LoggedUser['ID']);
 list($Body) = $DB->next_record(MYSQLI_NUM);
 
-// This gets sent to the browser, which echoes it wherever 
+// This gets sent to the browser, which echoes it wherever
 
 echo trim($Body);
 
diff --git a/sections/inbox/index.php b/sections/inbox/index.php
index 8c6f4b90..b07e2566 100644
--- a/sections/inbox/index.php
+++ b/sections/inbox/index.php
@@ -33,7 +33,7 @@
 		break;
 	case 'get_post':
 		require('get_post.php');
-		break;		
+		break;
 	case 'forward':
 		require('forward.php');
 		break;
diff --git a/sections/index/feat_album.php b/sections/index/feat_album.php
index 63063e75..c1888b22 100644
--- a/sections/index/feat_album.php
+++ b/sections/index/feat_album.php
@@ -15,5 +15,5 @@
 			<div class="center pad"><a href="forums.php?action=viewthread&amp;threadid=<?=$FeaturedAlbum['ThreadID']?>"><em>Read the interview with the artist, discuss here</em></a></div>
 		</div>
 <?
-} 
+}
 ?>
\ No newline at end of file
diff --git a/sections/login/index.php b/sections/login/index.php
index 0573641d..1dbc6e18 100644
--- a/sections/login/index.php
+++ b/sections/login/index.php
@@ -30,15 +30,15 @@
 	// Recover password
 	if (!empty($_REQUEST['key'])) {
 		// User has entered a new password, use step 2
-		$DB->query("SELECT 
+		$DB->query("SELECT
 			m.ID,
 			m.Email,
 			m.ipcc,
-			i.ResetExpires 
-			FROM users_main AS m 
-			INNER JOIN users_info AS i ON i.UserID=m.ID 
-			WHERE i.ResetKey='".db_string($_REQUEST['key'])."' 
-			AND i.ResetKey<>'' 
+			i.ResetExpires
+			FROM users_main AS m
+			INNER JOIN users_info AS i ON i.UserID=m.ID
+			WHERE i.ResetKey='".db_string($_REQUEST['key'])."'
+			AND i.ResetKey<>''
 			AND m.Enabled='1'");
 		list($UserID,$Email,$Country,$Expires)=$DB->next_record();
 
@@ -48,38 +48,38 @@
 			$Validate->SetFields('verifypassword','1','compare','Your passwords did not match.',array('comparefield'=>'password'));
 
 			if (!empty($_REQUEST['password'])) {
-				// If the user has entered a password. 
+				// If the user has entered a password.
 				// If the user has not entered a password, $Reset is not set to 1, and the success message is not shown
 				$Err=$Validate->ValidateForm($_REQUEST);
 				if ($Err=='') {
-					// Form validates without error, set new secret and password. 
-					$DB->query("UPDATE 
+					// Form validates without error, set new secret and password.
+					$DB->query("UPDATE
 						users_main AS m,
-						users_info AS i 
+						users_info AS i
 						SET m.PassHash='".db_string(Users::make_crypt_hash($_REQUEST['password']))."',
 						i.ResetKey='',
-						i.ResetExpires='0000-00-00 00:00:00' 
-						WHERE m.ID='".db_string($UserID)."' 
+						i.ResetExpires='0000-00-00 00:00:00'
+						WHERE m.ID='".db_string($UserID)."'
 						AND i.UserID=m.ID");
 					$Reset = true; // Past tense form of "to reset", meaning that password has now been reset
-					
+
 					
 				}
 			}
-			
+
 			// Either a form asking for them to enter the password
 			// Or a success message if $Reset is 1
 			require('recover_step2.php');
 
 		} else {
 			// Either his key has expired, or he hasn't requested a pass change at all
-			
+
 			if (strtotime($Expires)<time() && $UserID) {
 				// If his key has expired, clear all the reset information
-				$DB->query("UPDATE 
-					users_info 
+				$DB->query("UPDATE
+					users_info
 					SET ResetKey='',
-					ResetExpires='0000-00-00 00:00:00' 
+					ResetExpires='0000-00-00 00:00:00'
 					WHERE UserID='$UserID'");
 				$_SESSION['reseterr']="The link you were given has expired."; // Error message to display on form
 			}
@@ -88,7 +88,7 @@
 		}
 
 	} // End step 2
-	
+
 	// User has not clicked the link in his email, use step 1
 	else {
 		$Validate->SetFields('email','1','email','You entered an invalid email address.');
@@ -99,12 +99,12 @@
 
 			if (!$Err) {
 				// Form validates correctly
-				$DB->query("SELECT 
+				$DB->query("SELECT
 					ID,
 					Username,
-					Email 
-					FROM users_main 
-					WHERE Email='".db_string($_REQUEST['email'])."' 
+					Email
+					FROM users_main
+					WHERE Email='".db_string($_REQUEST['email'])."'
 					AND Enabled='1'");
 				list($UserID,$Username,$Email)=$DB->next_record();
 
@@ -112,15 +112,15 @@
 					// Email exists in the database
 					// Set ResetKey, send out email, and set $Sent to 1 to show success page
 					$ResetKey=Users::make_secret();
-					$DB->query("UPDATE users_info SET 
+					$DB->query("UPDATE users_info SET
 						ResetKey='".db_string($ResetKey)."',
-						ResetExpires='".time_plus(60*60)."' 
+						ResetExpires='".time_plus(60*60)."'
 						WHERE UserID='$UserID'");
-					
+
 					require(SERVER_ROOT.'/classes/class_templates.php');
 					$TPL=NEW TEMPLATE;
 					$TPL->open(SERVER_ROOT.'/templates/password_reset.tpl'); // Password reset template
-					
+
 					$TPL->set('Username',$Username);
 					$TPL->set('ResetKey',$ResetKey);
 					$TPL->set('IP',$_SERVER['REMOTE_ADDR']);
@@ -129,7 +129,7 @@
 
 					Misc::send_email($Email,'Password reset information for '.SITE_NAME,$TPL->get(),'noreply');
 					$Sent=1; // If $Sent is 1, recover_step1.php displays a success message
-					
+
 					//Log out all of the users current sessions
 					$Cache->delete_value('user_info_'.$UserID);
 					$Cache->delete_value('user_info_heavy_'.$UserID);
@@ -142,7 +142,7 @@
 					}
 					$DB->query("UPDATE users_sessions SET Active = 0 WHERE UserID='$UserID' AND Active = 1");
 
-					
+
 				} else {
 					$Err="There is no user with that email address.";
 				}
@@ -150,12 +150,12 @@
 
 		} elseif (!empty($_SESSION['reseterr'])) {
 			// User has not entered email address, and there is an error set in session data
-			// This is typically because their key has expired. 
+			// This is typically because their key has expired.
 			// Stick the error into $Err so recover_step1.php can take care of it
 			$Err=$_SESSION['reseterr'];
 			unset($_SESSION['reseterr']);
 		}
-		
+
 		// Either a form for the user's email address, or a success message
 		require('recover_step1.php');
 	} // End if (step 1)
@@ -184,7 +184,7 @@ function log_attempt($UserID) {
 					LastAttempt='".sqltime()."',
 					Attempts='".db_string($Attempts)."',
 					BannedUntil='".db_string($BannedUntil)."',
-					Bans=Bans+1 
+					Bans=Bans+1
 					WHERE ID='".db_string($AttemptID)."'");
 				
 				if ($Bans>9) { // Automated bruteforce prevention
@@ -210,17 +210,17 @@ function log_attempt($UserID) {
 				$DB->query("UPDATE login_attempts SET
 					LastAttempt='".sqltime()."',
 					Attempts='".db_string($Attempts)."',
-					BannedUntil='0000-00-00 00:00:00' 
+					BannedUntil='0000-00-00 00:00:00'
 					WHERE ID='".db_string($AttemptID)."'");
 			}
 		} else { // User has not attempted to log in recently
 			$Attempts=1;
-			$DB->query("INSERT INTO login_attempts 
-				(UserID,IP,LastAttempt,Attempts) VALUES 
+			$DB->query("INSERT INTO login_attempts
+				(UserID,IP,LastAttempt,Attempts) VALUES
 				('".db_string($UserID)."','".db_string($IPStr)."','".sqltime()."',1)");
 		}
 	} // end log_attempt function
-	
+
 	// If user has submitted form
 	if(isset($_POST['username']) && !empty($_POST['username']) && isset($_POST['password']) && !empty($_POST['password'])) {
 		if (strtotime($BannedUntil) > time()) {
@@ -238,7 +238,7 @@ function log_attempt($UserID) {
 				PassHash,
 				Secret,
 				Enabled
-				FROM users_main WHERE Username='".db_string($_POST['username'])."' 
+				FROM users_main WHERE Username='".db_string($_POST['username'])."'
 				AND Username<>''");
 			list($UserID,$PermissionID,$CustomPermissions,$PassHash,$Secret,$Enabled)=$DB->next_record(MYSQLI_NUM, array(2));
 			if (strtotime($BannedUntil)<time()) {
@@ -258,18 +258,18 @@ function log_attempt($UserID) {
 							$KeepLogged = 0;
 							setcookie('session', $Cookie, 0, '/', '', $SSL, true);
 						}
-						
+
 						//TODO: another tracker might enable this for donors, I think it's too stupid to bother adding that
 						// Because we <3 our staff
 						$Permissions = Permissions::get_permissions($PermissionID);
 						$CustomPermissions = unserialize($CustomPermissions);
 						if (
-							isset($Permissions['Permissions']['site_disable_ip_history']) || 
+							isset($Permissions['Permissions']['site_disable_ip_history']) ||
 							isset($CustomPermissions['site_disable_ip_history'])
 						) { $_SERVER['REMOTE_ADDR'] = '127.0.0.1'; }
+
 						
-						
-						
+
 						$DB->query("INSERT INTO users_sessions
 							(UserID, SessionID, KeepLogged, Browser, OperatingSystem, IP, LastUpdate)
 							VALUES ('$UserID', '".db_string($SessionID)."', '$KeepLogged', '$Browser','$OperatingSystem', '".db_string($_SERVER['REMOTE_ADDR'])."', '".sqltime()."')");
@@ -283,9 +283,9 @@ function log_attempt($UserID) {
 								'LastUpdate'=>sqltime()
 								));
 						$Cache->commit_transaction(0);
-						
-						$Sql = "UPDATE users_main 
-							SET 
+
+						$Sql = "UPDATE users_main
+							SET
 								LastLogin='".sqltime()."',
 								LastAccess='".sqltime()."'";
 						
diff --git a/sections/login/login.php b/sections/login/login.php
index bfe3c74b..14bd53d5 100644
--- a/sections/login/login.php
+++ b/sections/login/login.php
@@ -1,6 +1,6 @@
 <? View::show_header('Login'); ?>
 	<span id="no-cookies" class="hidden warning">You appear to have cookies disabled.<br /><br /></span>
-	<noscript><span class="warning">You appear to have javascript disabled.</span><br /><br /></noscript> 
+	<noscript><span class="warning">You appear to have javascript disabled.</span><br /><br /></noscript>
 <?
 if(strtotime($BannedUntil)<time() && !$BanID) {
 ?>
diff --git a/sections/peerupdate/index.php b/sections/peerupdate/index.php
index 395ac154..a4465fee 100644
--- a/sections/peerupdate/index.php
+++ b/sections/peerupdate/index.php
@@ -1,5 +1,5 @@
 <?
-// We keep torrent groups cached. However, the peer counts change ofter, so our solutions are to not cache them for long, or to update them. Here is where we updated them. 
+// We keep torrent groups cached. However, the peer counts change ofter, so our solutions are to not cache them for long, or to update them. Here is where we updated them.
 
 if ((!isset($argv[1]) || $argv[1]!=SCHEDULE_KEY) && !check_perms('admin_schedule')) { // authorization, Fix to allow people with perms hit this page.
 	error(403);
@@ -74,7 +74,7 @@
 $DB->query("TRUNCATE TABLE torrents_peerlists");
 $DB->query("INSERT INTO torrents_peerlists SELECT * FROM torrents_peerlists_compare");
 
-if (check_perms('admin_schedule')) {	
+if (check_perms('admin_schedule')) {
 	echo '<pre>';
 	View::show_footer();
 }
diff --git a/sections/register/index.php b/sections/register/index.php
index 6eb40b0b..81868d84 100644
--- a/sections/register/index.php
+++ b/sections/register/index.php
@@ -17,13 +17,13 @@
 	// Confirm registration
 	$DB->query("SELECT ID FROM users_main WHERE torrent_pass='".db_string($_REQUEST['confirm'])."' AND Enabled='0'");
 	list($UserID)=$DB->next_record();
-	
+
 	if($UserID) {
 		$DB->query("UPDATE users_main SET Enabled='1' WHERE ID='$UserID'");
 		$Cache->increment('stats_user_count');
 		include('step2.php');
 	}
-	
+
 } elseif(OPEN_REGISTRATION || !empty($_REQUEST['invite'])) {
 	$Val->SetFields('username',true,'regex', 'You did not enter a valid username.',array('regex'=>'/^[a-z0-9_?]{1,20}$/iD'));
 	$Val->SetFields('email',true,'email', 'You did not enter a valid email address.');
@@ -39,19 +39,19 @@
 		$Err=$Val->ValidateForm($_REQUEST);
 		/*
 		if(!$Err && strtolower($_SESSION['captcha'])!=strtolower($_REQUEST['captcha'])) {
-			$Err="You did not enter the correct captcha code."; 
+			$Err="You did not enter the correct captcha code.";
 		}
 		*/
 		if(!$Err) {
-			
+
 			$DB->query("SELECT COUNT(ID) FROM users_main WHERE Username LIKE '".db_string(trim($_POST['username']))."'");
 			list($UserCount)=$DB->next_record();
-			
+
 			if($UserCount) {
 				$Err = "There is already someone registered with that username.";
 				$_REQUEST['username']='';
 			}
-			
+
 			if($_POST['invite']) {
 				$DB->query("SELECT InviterID, Email FROM invites WHERE InviteKey='".db_string($_REQUEST['invite'])."'");
 				if($DB->record_count() == 0) {
@@ -64,10 +64,10 @@
 				$InviterID=0;
 			}
 		}
-		
+
 		if(!$Err) {
 			$torrent_pass=Users::make_secret();
-			
+
 			// Previously SELECT COUNT(ID) FROM users_main, which is a lot slower.
 			$DB->query("SELECT ID FROM users_main LIMIT 1");
 			$UserCount = $DB->record_count();
@@ -84,87 +84,87 @@
 			$ipcc = Tools::geoip($_SERVER['REMOTE_ADDR']);
 			
 			
-			$DB->query("INSERT INTO users_main 
+			$DB->query("INSERT INTO users_main
 				(Username,Email,PassHash,torrent_pass,IP,PermissionID,Enabled,Invites,Uploaded,ipcc) VALUES
 				('".db_string(trim($_POST['username']))."','".db_string($_POST['email'])."','".db_string(Users::make_crypt_hash($_POST['password']))."','".db_string($torrent_pass)."','".db_string($_SERVER['REMOTE_ADDR'])."','".$Class."','".$Enabled."','".STARTING_INVITES."', '524288000', '$ipcc')");
 
 			$UserID = $DB->inserted_id();
 			
-			
+
 			// User created, delete invite. If things break after this point, then it's better to have a broken account to fix than a 'free' invite floating around that can be reused
 			$DB->query("DELETE FROM invites WHERE InviteKey='".db_string($_REQUEST['invite'])."'");
 
 			$DB->query("SELECT ID FROM stylesheets WHERE `Default`='1'");
 			list($StyleID) = $DB->next_record();
 			$AuthKey = Users::make_secret();
-			
+
 			$DB->query("INSERT INTO users_info (UserID,StyleID,AuthKey, Inviter, JoinDate) VALUES ('$UserID','$StyleID','".db_string($AuthKey)."', '$InviterID', '".sqltime()."')");
-			
+
 			$DB->query("INSERT INTO users_history_ips
 					(UserID, IP, StartTime) VALUES
 					('$UserID', '".db_string($_SERVER['REMOTE_ADDR'])."', '".sqltime()."')");
+
 			
-			
-			
-			
+
+
 			$DB->query("INSERT INTO users_history_emails
-				(UserID, Email, Time, IP) VALUES 
+				(UserID, Email, Time, IP) VALUES
 				('$UserID', '".db_string($_REQUEST['email'])."', '0000-00-00 00:00:00', '".db_string($_SERVER['REMOTE_ADDR'])."')");
-				
+
 			if ($_REQUEST['email'] != $InviteEmail) {
 				$DB->query("INSERT INTO users_history_emails
-					(UserID, Email, Time, IP) VALUES 
+					(UserID, Email, Time, IP) VALUES
 					('$UserID', '$InviteEmail', '".sqltime()."', '".db_string($_SERVER['REMOTE_ADDR'])."')");
 			}
+
 			
-			
-			
+
 			// Manage invite trees, delete invite
-			
+
 			if($InviterID !== NULL) {
-				$DB->query("SELECT 
-					TreePosition, TreeID, TreeLevel 
+				$DB->query("SELECT
+					TreePosition, TreeID, TreeLevel
 					FROM invite_tree WHERE UserID='$InviterID'");
 				list($InviterTreePosition, $TreeID, $TreeLevel) = $DB->next_record();
-				
+
 				// If the inviter doesn't have an invite tree
 				// Note: This should never happen unless you've transferred from another database, like What.CD did
 				if($DB->record_count() == 0) {
 					$DB->query("SELECT MAX(TreeID)+1 FROM invite_tree");
 					list($TreeID) = $DB->next_record();
-					
+
 					$DB->query("INSERT INTO invite_tree
 						(UserID, InviterID, TreePosition, TreeID, TreeLevel)
 						VALUES ('$InviterID', '0', '1', '$TreeID', '1')");
-					
+
 					$TreePosition = 2;
 					$TreeLevel = 2;
 				} else {
-					$DB->query("SELECT 
-						TreePosition 
-						FROM invite_tree 
+					$DB->query("SELECT
+						TreePosition
+						FROM invite_tree
 						WHERE TreePosition>'$InviterTreePosition'
-						AND TreeLevel<='$TreeLevel' 
+						AND TreeLevel<='$TreeLevel'
 						AND TreeID='$TreeID'
-						ORDER BY TreePosition 
+						ORDER BY TreePosition
 						LIMIT 1");
 					list($TreePosition) = $DB->next_record();
-					
+
 					if($TreePosition) {
 						$DB->query("UPDATE invite_tree SET TreePosition=TreePosition+1 WHERE TreeID='$TreeID' AND TreePosition>='$TreePosition'");
 					} else {
-						$DB->query("SELECT 
-							TreePosition+1 
-							FROM invite_tree 
+						$DB->query("SELECT
+							TreePosition+1
+							FROM invite_tree
 							WHERE TreeID='$TreeID'
-							ORDER BY TreePosition DESC 
+							ORDER BY TreePosition DESC
 							LIMIT 1");
 						list($TreePosition) = $DB->next_record();
 					}
 					$TreeLevel++;
-					
+
 					// Create invite tree record
-					$DB->query("INSERT INTO invite_tree 
+					$DB->query("INSERT INTO invite_tree
 						(UserID, InviterID, TreePosition, TreeID, TreeLevel) VALUES
 						('$UserID', '$InviterID', '$TreePosition', '$TreeID', '$TreeLevel')");
 				}
@@ -176,12 +176,12 @@
 				$TreePosition=1;
 				$TreeLevel=1;
 			}
-	
-			
+
+
 			include(SERVER_ROOT.'/classes/class_templates.php');
 			$TPL=NEW TEMPLATE;
 			$TPL->open(SERVER_ROOT.'/templates/new_registration.tpl');
-			
+
 			$TPL->set('Username',$_REQUEST['username']);
 			$TPL->set('TorrentKey',$torrent_pass);
 			$TPL->set('SITE_NAME',SITE_NAME);
@@ -190,10 +190,10 @@
 			Misc::send_email($_REQUEST['email'],'New account confirmation at '.SITE_NAME,$TPL->get(),'noreply');
 			Tracker::update_tracker('add_user', array('id' => $UserID, 'passkey' => $torrent_pass));
 			$Sent=1;
-			
+
 			
 		}
-		
+
 	} elseif($_GET['invite']) {
 		// If they haven't submitted the form, check to see if their invite is good
 		$DB->query("SELECT InviteKey FROM invites WHERE InviteKey='".db_string($_GET['invite'])."'");
@@ -201,9 +201,9 @@
 			error('Invite not found!');
 		}
 	}
-	
+
 	include('step1.php');
-	
+
 } elseif(!OPEN_REGISTRATION) {
 	if (isset($_GET['welcome'])) {
 		include('code.php');
diff --git a/sections/reports/ajax_claim_report.php b/sections/reports/ajax_claim_report.php
index 806bfc0e..db1063e2 100644
--- a/sections/reports/ajax_claim_report.php
+++ b/sections/reports/ajax_claim_report.php
@@ -32,4 +32,4 @@
 			)
 		);
 	die();
-}
\ No newline at end of file
+}
diff --git a/sections/reports/ajax_resolve_report.php b/sections/reports/ajax_resolve_report.php
index 184e0d2a..b79eeb5e 100644
--- a/sections/reports/ajax_resolve_report.php
+++ b/sections/reports/ajax_resolve_report.php
@@ -21,7 +21,7 @@
 	}
 }
 
-$DB->query("UPDATE reports 
+$DB->query("UPDATE reports
 			SET Status='Resolved',
 				ResolvedTime='".sqltime()."',
 				ResolverID='".$LoggedUser['ID']."'
diff --git a/sections/reports/report.php b/sections/reports/report.php
index 2c8f2023..4218ab0f 100644
--- a/sections/reports/report.php
+++ b/sections/reports/report.php
@@ -10,7 +10,7 @@
 	error(403);
 }
 $Short = $_GET['type'];
-$Type = $Types[$Short]; 
+$Type = $Types[$Short];
 
 $ID = $_GET['id'];
 
@@ -142,7 +142,7 @@
 		</tr>
 		<tr>
 			<td><?=display_str($Name)?></td>
-			<td><?=$Text->full_format($Desc)?></td>	
+			<td><?=$Text->full_format($Desc)?></td>
 			<td><strong><?=($Filled == 0 ? 'No' : 'Yes')?></strong></td>
 		</tr>
 	</table>
@@ -167,10 +167,10 @@
 					<td>
 						<select id="releasetype" name="releasetype">
 							<option value='0'>---</option>
-<?		
+<?
 		foreach ($ReleaseTypes as $Key => $Val) {
 ?>							<option value='<?=$Key?>' <?=(!empty($ReleaseType) ? ($Key == $ReleaseType ?" selected='selected'" : "") : '') ?>><?=$Val?></option>
-<?			
+<?
 		}
 ?>
 						</select>
@@ -201,11 +201,11 @@
 		</tr>
 		<tr>
 			<td><?=display_str($Name)?></td>
-			<td><?=$Text->full_format($Desc)?></td>	
+			<td><?=$Text->full_format($Desc)?></td>
 			<td><strong><?=($Filled == 0 ? 'No' : 'Yes')?></strong></td>
 		</tr>
 	</table>
-<?	
+<?
 		break;
 	case "collage" :
 ?>
@@ -216,11 +216,11 @@
 			<td>Description</td>
 		</tr>
 		<tr>
-			<td><?=display_str($Name)?></td>	
+			<td><?=display_str($Name)?></td>
 			<td><?=$Text->full_format($Desc)?></td>
 		</tr>
 	</table>
-<?	
+<?
 		break;
 	case "thread" :
 ?>
@@ -231,11 +231,11 @@
 			<td>Title</td>
 		</tr>
 		<tr>
-			<td><?=display_str($Username)?></td>	
+			<td><?=display_str($Username)?></td>
 			<td><?=display_str($Title)?></td>
 		</tr>
 	</table>
-<?	
+<?
 		break;
 	case "post" :
 ?>
@@ -246,11 +246,11 @@
 			<td>Body</td>
 		</tr>
 		<tr>
-			<td><?=display_str($Username)?></td>	
+			<td><?=display_str($Username)?></td>
 			<td><?=$Text->full_format($Body)?></td>
 		</tr>
 	</table>
-<?	
+<?
 		break;
 	case "requests_comment" :
     case "torrents_comment" :
@@ -264,12 +264,12 @@
 			<td>Body</td>
 		</tr>
 		<tr>
-			<td><?=display_str($Username)?></td>	
+			<td><?=display_str($Username)?></td>
 			<td><?=$Text->full_format($Body)?></td>
 		</tr>
 	</table>
-<?	
-	break;	   
+<?
+	break;
 }
 if(empty($NoReason)) {
 ?>
diff --git a/sections/reports/reports.php b/sections/reports/reports.php
index bf5ccae6..b797279a 100644
--- a/sections/reports/reports.php
+++ b/sections/reports/reports.php
@@ -45,22 +45,22 @@
 
 }
 
-$Reports = $DB->query("SELECT SQL_CALC_FOUND_ROWS 
-		r.ID, 
+$Reports = $DB->query("SELECT SQL_CALC_FOUND_ROWS
+		r.ID,
 		r.UserID,
-		um.Username, 
-		r.ThingID, 
-		r.Type, 
-		r.ReportedTime, 
-		r.Reason, 
+		um.Username,
+		r.ThingID,
+		r.Type,
+		r.ReportedTime,
+		r.Reason,
 		r.Status,
 		r.ClaimerID,
         r.Notes,
         r.ResolverID
-	FROM reports AS r 
+	FROM reports AS r
 	JOIN users_main AS um ON r.UserID=um.ID
 	WHERE " . $Where . "
-	ORDER BY ReportedTime 
+	ORDER BY ReportedTime
 	DESC LIMIT " . $Limit);
 
 // Number of results (for pagination)
@@ -219,7 +219,7 @@
 						<a href="#" id="claim_<?=$ReportID?>" onclick="claim(<?=$ReportID?>); return false;" class="brackets">Claim</a>
 						<? } ?>
 						&nbsp;&nbsp;
-						<a href="#" onclick="toggleNotes(<?=$ReportID?>); return false;" class="brackets">Toggle Notes</a>
+						<a href="#" onclick="toggleNotes(<?=$ReportID?>); return false;" class="brackets">Toggle notes</a>
 
 						<div id="notes_div_<?=$ReportID?>" style="display: <?=empty($Notes) ? "none" : "block"?>;">
 							<textarea cols="50" rows="3" id="notes_<?=$ReportID?>"><?=$Notes?></textarea>
@@ -238,7 +238,7 @@
 						</form>
 					</td>
 				</tr>
-                <? } else { 
+                <? } else {
                         $ResolverInfo = Users::user_info($ResolverID);
                     ?>
                     <tr>
diff --git a/sections/reports/takereport.php b/sections/reports/takereport.php
index 8fa5de13..54e7299d 100644
--- a/sections/reports/takereport.php
+++ b/sections/reports/takereport.php
@@ -11,7 +11,7 @@
 	error(403);
 }
 $Short = $_POST['type'];
-$Type = $Types[$Short]; 
+$Type = $Types[$Short];
 $ID = $_POST['id'];
 if($Short == "request_update") {
 	if(empty($_POST['year']) || !is_number($_POST['year'])) {
diff --git a/sections/reports/takeresolve.php b/sections/reports/takeresolve.php
index 2fd422df..d2ed2942 100644
--- a/sections/reports/takeresolve.php
+++ b/sections/reports/takeresolve.php
@@ -25,7 +25,7 @@
 	}
 }
 
-$DB->query("UPDATE reports 
+$DB->query("UPDATE reports
 			SET Status='Resolved',
 				ResolvedTime='".sqltime()."',
 				ResolverID='".$LoggedUser['ID']."'
diff --git a/sections/reportsv2/ajax_change_resolve.php b/sections/reportsv2/ajax_change_resolve.php
index 7d4570d5..44ea0ef3 100644
--- a/sections/reportsv2/ajax_change_resolve.php
+++ b/sections/reportsv2/ajax_change_resolve.php
@@ -1,7 +1,7 @@
 <?
 /*
  * This is the page that gets the values of whether to delete/disable upload/warning duration
- * every time you change the resolve type on one of the two reports pages. 
+ * every time you change the resolve type on one of the two reports pages.
  */
 
 if(!check_perms('admin_reports')){
diff --git a/sections/reportsv2/ajax_grab_report.php b/sections/reportsv2/ajax_grab_report.php
index 34115194..5f8818a8 100644
--- a/sections/reportsv2/ajax_grab_report.php
+++ b/sections/reportsv2/ajax_grab_report.php
@@ -1,8 +1,8 @@
 <?
 /*
- * This page simply assings a report to the person clicking on 
+ * This page simply assings a report to the person clicking on
  * the Grab / Grab All button.
- */ 
+ */
 if(!check_perms('admin_reports')){
 		//error(403);
 		echo '403';
diff --git a/sections/reportsv2/ajax_new_report.php b/sections/reportsv2/ajax_new_report.php
index 7b5cf7eb..2a9a08b0 100644
--- a/sections/reportsv2/ajax_new_report.php
+++ b/sections/reportsv2/ajax_new_report.php
@@ -69,7 +69,7 @@
 			LEFT JOIN users_main AS reporter ON reporter.ID=r.ReporterID
 			LEFT JOIN users_main AS uploader ON uploader.ID=t.UserID
 			WHERE r.Status = 'New'
-			GROUP BY r.ID 
+			GROUP BY r.ID
 			ORDER BY ReportedTime ASC
 			LIMIT 1");
 
@@ -79,8 +79,8 @@
 		}
 		
 		
-		list($ReportID, $ReporterID, $ReporterName, $TorrentID, $Type, $UserComment, $ResolverID, $ResolverName, $Status, $ReportedTime, $LastChangeTime, 
-			$ModComment, $Tracks, $Images, $ExtraIDs, $Links, $LogMessage, $GroupName, $GroupID, $ArtistID, $ArtistName, $Year, $CategoryID, $Time, $Remastered, $RemasterTitle, 
+		list($ReportID, $ReporterID, $ReporterName, $TorrentID, $Type, $UserComment, $ResolverID, $ResolverName, $Status, $ReportedTime, $LastChangeTime,
+			$ModComment, $Tracks, $Images, $ExtraIDs, $Links, $LogMessage, $GroupName, $GroupID, $ArtistID, $ArtistName, $Year, $CategoryID, $Time, $Remastered, $RemasterTitle,
 			$RemasterYear, $Media, $Format, $Encoding, $Size, $HasCue, $HasLog, $LogScore, $UploaderID, $UploaderName) = $DB->next_record(MYSQLI_BOTH, array("ModComment"));
 		
 		if(!$GroupID) {
@@ -102,12 +102,12 @@
 	</div>
 <?
 			die();
-		}		
+		}
 		$DB->query("UPDATE reportsv2 SET Status='InProgress',
 										ResolverID=".$LoggedUser['ID']."
 										WHERE ID=".$ReportID);
-		
-		
+
+
 		if (array_key_exists($Type, $Types[$CategoryID])) {
 			$ReportType = $Types[$CategoryID][$Type];
 		} else if(array_key_exists($Type,$Types['master'])) {
@@ -129,11 +129,11 @@
 			$RawName = "$ArtistName - $GroupName".($Year ? " ($Year)" : "")." [$Format/$Encoding/$Media]".($Remastered ? " &lt;$RemasterTitle - $RemasterYear&gt;" : "").($HasCue ? " (Cue)" : '').($HasLog ? " (Log: $LogScore %)" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
 			$LinkName = "<a href='artist.php?id=$ArtistID'>$ArtistName</a> - <a href='torrents.php?id=$GroupID'>$GroupName".($Year ? " ($Year)" : "")."</a> <a href='torrents.php?torrentid=$TorrentID'> [$Format/$Encoding/$Media]".($Remastered ? " &lt;$RemasterTitle - $RemasterYear&gt;" : "")."</a> ".($HasCue ? " (Cue)" : '').($HasLog ? " <a href='torrents.php?action=viewlog&amp;torrentid=$TorrentID&amp;groupid=$GroupID'>(Log: $LogScore %)</a>" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
 			$BBName = "[url=artist.php?id=$ArtistID]".$ArtistName."[/url] - [url=torrents.php?id=$GroupID]$GroupName".($Year ? " ($Year)" : "")."[/url] [url=torrents.php?torrentid=$TorrentID][$Format/$Encoding/$Media]".($Remastered ? " &lt;$RemasterTitle - $RemasterYear&gt;" : "")."[/url] ".($HasCue ? " (Cue)" : '').($HasLog ? " [url=torrents.php?action=viewlog&amp;torrentid=$TorrentID&amp;groupid=$GroupID'](Log: $LogScore %)[/url]" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
-		}	
-	?>	
+		}
+	?>
 		<div id="report<?=$ReportID?>">
 			<form class="edit_form" name="report" id="reportform_<?=$ReportID?>" action="reports.php" method="post">
-				<? 
+				<?
 					/*
 					* Some of these are for takeresolve, some for the JavaScript.
 					*/
@@ -162,20 +162,20 @@
 							uploaded by <a href="user.php?id=<?=$UploaderID?>"><?=$UploaderName?></a> <?=time_diff($Time)?>
 							<br />
 							<div style="text-align: right;">was reported by <a href="user.php?id=<?=$ReporterID?>"><?=$ReporterName?></a> <?=time_diff($ReportedTime)?> for the reason: <strong><?=$ReportType['title']?></strong></div>
-		<?		$DB->query("SELECT r.ID 
-							FROM reportsv2 AS r 
-							LEFT JOIN torrents AS t ON t.ID=r.TorrentID 
+		<?		$DB->query("SELECT r.ID
+							FROM reportsv2 AS r
+							LEFT JOIN torrents AS t ON t.ID=r.TorrentID
 							WHERE r.Status != 'Resolved'
 							AND t.GroupID=$GroupID");
 				$GroupOthers = ($DB->record_count() - 1);
-				
+
 				if($GroupOthers > 0) { ?>
 							<div style="text-align: right;">
 								<a href="reportsv2.php?view=group&amp;id=<?=$GroupID?>">There <?=(($GroupOthers > 1) ? "are $GroupOthers other reports" : "is 1 other report")?> for torrents in this group</a>
 							</div>
-		<? 		$DB->query("SELECT t.UserID 
-							FROM reportsv2 AS r 
-							JOIN torrents AS t ON t.ID=r.TorrentID 
+		<? 		$DB->query("SELECT t.UserID
+							FROM reportsv2 AS r
+							JOIN torrents AS t ON t.ID=r.TorrentID
 							WHERE r.Status != 'Resolved'
 							AND t.UserID=$UploaderID");
 				$UploaderOthers = ($DB->record_count() - 1);
@@ -185,12 +185,12 @@
 								<a href="reportsv2.php?view=uploader&amp;id=<?=$UploaderID?>">There <?=(($UploaderOthers > 1) ? "are $UploaderOthers other reports" : "is 1 other report")?> for torrents uploaded by this user</a>
 							</div>
 		<? 		}
-			
+
 				$DB->query("SELECT DISTINCT req.ID,
 							req.FillerID,
 							um.Username,
 							req.TimeFilled
-							FROM requests AS req 
+							FROM requests AS req
 							LEFT JOIN torrents AS t ON t.ID=req.TorrentID
 							LEFT JOIN reportsv2 AS rep ON rep.TorrentID=t.ID
 							JOIN users_main AS um ON um.ID=req.FillerID
@@ -198,7 +198,7 @@
 							AND req.TimeFilled > '2010-03-04 02:31:49'
 							AND req.TorrentID=$TorrentID");
 				$Requests = ($DB->record_count());
-				if($Requests > 0) { 
+				if($Requests > 0) {
 					while(list($RequestID, $FillerID, $FillerName, $FilledTime) = $DB->next_record()) {
 			?>
 								<div style="text-align: right;">
@@ -219,7 +219,7 @@
 						</td>
 					</tr>
 		<? }
-		
+
 			if($Links) {
 		?>
 					<tr>
@@ -228,7 +228,7 @@
 		<?
 				$Links = explode(" ", $Links);
 				foreach($Links as $Link) {
-				
+
 					if ($local_url = $Text->local_url($Link)) {
 						$Link = $local_url;
 					}
@@ -241,7 +241,7 @@
 					</tr>
 		<?
 			}
-		
+
 			if($ExtraIDs) {
 		?>
 					<tr>
@@ -253,7 +253,7 @@
 				foreach($Extras as $ExtraID) {
 
 
-						$DB->query("SELECT 
+						$DB->query("SELECT
 									tg.Name,
 									tg.ID,
 									CASE COUNT(ta.GroupID)
@@ -287,11 +287,11 @@
 									LEFT JOIN users_main AS uploader ON uploader.ID=t.UserID
 									WHERE t.ID='$ExtraID'
 									GROUP BY tg.ID");
-						
-						list($ExtraGroupName, $ExtraGroupID, $ExtraArtistID, $ExtraArtistName, $ExtraYear, $ExtraTime, $ExtraRemastered, $ExtraRemasterTitle, 
+
+						list($ExtraGroupName, $ExtraGroupID, $ExtraArtistID, $ExtraArtistName, $ExtraYear, $ExtraTime, $ExtraRemastered, $ExtraRemasterTitle,
 							$ExtraRemasterYear, $ExtraMedia, $ExtraFormat, $ExtraEncoding, $ExtraSize, $ExtraHasCue, $ExtraHasLog, $ExtraLogScore, $ExtraUploaderID, $ExtraUploaderName) = Misc::display_array($DB->next_record());
-						
-					
+
+
 					if($ExtraGroupName) {
 		if ($ArtistID == 0 && empty($ArtistName)) {
 			$ExtraLinkName = "<a href='torrents.php?id=$ExtraGroupID'>$ExtraGroupName".($ExtraYear ? " ($ExtraYear)" : "")."</a> <a href='torrents.php?torrentid=$ExtraID'> [$ExtraFormat/$ExtraEncoding/$ExtraMedia]".($ExtraRemastered ? " &lt;$ExtraRemasterTitle - $ExtraRemasterYear&gt;" : "")."</a> ".($ExtraHasLog == '1' ? " <a href='torrents.php?action=viewlog&amp;torrentid=$ExtraID&amp;groupid=$ExtraGroupID'>(Log: $ExtraLogScore %)</a>" : "")." (".number_format($ExtraSize/(1024*1024), 2)." MB)";
@@ -299,8 +299,8 @@
 			$ExtraLinkName = "Various Artists - <a href='torrents.php?id=$ExtraGroupID'>$ExtraGroupName".($ExtraYear ? " ($ExtraYear)" : "")."</a> <a href='torrents.php?torrentid=$ExtraID'> [$ExtraFormat/$ExtraEncoding/$ExtraMedia]".($ExtraRemastered ? " &lt;$ExtraRemasterTitle - $ExtraRemasterYear&gt;" : "")."</a> ".($ExtraHasLog == '1' ? " <a href='torrents.php?action=viewlog&amp;torrentid=$ExtraID&amp;groupid=$ExtraGroupID'>(Log: $ExtraLogScore %)</a>" : "")." (".number_format($ExtraSize/(1024*1024), 2)." MB)";
 		} else {
 			$ExtraLinkName = "<a href='artist.php?id=$ExtraArtistID'>$ExtraArtistName</a> - <a href='torrents.php?id=$ExtraGroupID'>$ExtraGroupName".($ExtraYear ? " ($ExtraYear)" : "")."</a> <a href='torrents.php?torrentid=$ExtraID'> [$ExtraFormat/$ExtraEncoding/$ExtraMedia]".($ExtraRemastered ? " &lt;$ExtraRemasterTitle - $ExtraRemasterYear&gt;" : "")."</a> ".($ExtraHasLog == '1' ? " <a href='torrents.php?action=viewlog&amp;torrentid=$ExtraID&amp;groupid=$ExtraGroupID'>(Log: $ExtraLogScore %)</a>" : "")." (".number_format($ExtraSize/(1024*1024), 2)." MB)";
-		}	
-						
+		}
+
 			?>
 								<?=($First ? "" : "<br />")?>
 								<?=$ExtraLinkName?>
@@ -315,7 +315,7 @@
 					</tr>
 		<?
 			}
-			
+
 			if($Images) {
 		?>
 					<tr>
@@ -327,12 +327,12 @@
 					$Image = 'http'.($SSL?'s':'').'://'.SITE_URL.'/image.php?c=1&amp;i='.urlencode($Image);
 		?>
 							<img style="max-width: 200px;" onclick="lightbox.init(this,200);" src="<?=$Image?>" alt="Relevant image" />
-		<? 
+		<?
 				}
 		?>
 						</td>
 					</tr>
-		<? 
+		<?
 			}
 		?>
 					<tr>
@@ -412,7 +412,7 @@
 						</td>
 					</tr>
 					<tr>
-						<td class="label"><strong>Extra</strong> Log Message:</td> 
+						<td class="label"><strong>Extra</strong> Log Message:</td>
 						<td>
 							<input type="text" name="log_message" id="log_message<?=$ReportID?>" size="40" <? if($ExtraIDs) {
 										$Extras = explode(" ", $ExtraIDs);
@@ -423,7 +423,7 @@
 										echo 'value="'.trim($Value).'"';
 									} ?>/>
 						</td>
-						<td class="label"><strong>Extra</strong> Staff Notes:</td> 
+						<td class="label"><strong>Extra</strong> Staff Notes:</td>
 						<td>
 							<input type="text" name="admin_message" id="admin_message<?=$ReportID?>" size="40" />
 						</td>
diff --git a/sections/reportsv2/ajax_report.php b/sections/reportsv2/ajax_report.php
index 91890371..ffe7170e 100644
--- a/sections/reportsv2/ajax_report.php
+++ b/sections/reportsv2/ajax_report.php
@@ -76,7 +76,7 @@
 			<input id="sitelink" type="text" name="sitelink" size="50" value="<?=(!empty($_POST['sitelink']) ? display_str($_POST['sitelink']) : '')?>" />
 		</td>
 	</tr>
-	
+
 <?
 }
 ?>
@@ -87,5 +87,5 @@
 		<td>
 			<textarea id="extra" rows="5" cols="60" name="extra"><?=display_str($_POST['extra'])?></textarea>
 		</td>
-	</tr>	
+	</tr>
 </table>
diff --git a/sections/reportsv2/array.php b/sections/reportsv2/array.php
index 1587f63c..a34d6a00 100644
--- a/sections/reportsv2/array.php
+++ b/sections/reportsv2/array.php
@@ -120,7 +120,7 @@
 				'report_fields' => array(
 					'sitelink' => '1'
 				),
-				
+
 				'resolve_options' => array(
 					'upload' => '0',
 					'warn' => '0',
diff --git a/sections/reportsv2/index.php b/sections/reportsv2/index.php
index 74028cf8..575598c6 100644
--- a/sections/reportsv2/index.php
+++ b/sections/reportsv2/index.php
@@ -27,7 +27,7 @@
 			break;
 		case 'new':
 			include(SERVER_ROOT.'/sections/reportsv2/reports.php');
-			break;	
+			break;
 		case 'ajax_new_report':
 			include('ajax_new_report.php');
 			break;
diff --git a/sections/reportsv2/report.php b/sections/reportsv2/report.php
index 44799e78..f6d34e32 100644
--- a/sections/reportsv2/report.php
+++ b/sections/reportsv2/report.php
@@ -54,20 +54,20 @@
 				</td>
 			</tr>
 		</table>
-			
+
 		<h3>Reporting guidelines</h3>
 		<div class="box pad">
 			<p>Fields that contain lists of values (for example, listing more than one track number) should be separated by a space.</p>
 			<br />
 			<p><strong>Following the below report type specific guidelines will help the moderators deal with your report in a timely fashion. </strong></p>
 			<br />
-			
+
 			<div id="dynamic_form">
-				<? 
+				<?
 				/*
 				 * THIS IS WHERE SEXY AJAX COMES IN
 				 * The following malarky is needed so that if you get sent back here the fields are filled in
-				 */ 
+				 */
 				?>
 				<input id="sitelink" type="hidden" name="sitelink" size="50" value="<?=(!empty($_POST['sitelink']) ? display_str($_POST['sitelink']) : '')?>" />
 				<input id="image" type="hidden" name="image" size="50" value="<?=(!empty($_POST['image']) ? display_str($_POST['image']) : '')?>" />
@@ -77,7 +77,7 @@
 
 				<script type="text/javascript">ChangeReportType();</script>
 			</div>
-			
+
 		</div>
 	<input type="submit" value="Submit report" />
 	</form>
diff --git a/sections/reportsv2/static.php b/sections/reportsv2/static.php
index 71b5c649..7f4712db 100644
--- a/sections/reportsv2/static.php
+++ b/sections/reportsv2/static.php
@@ -3,9 +3,9 @@
  * This page is used for viewing reports in every viewpoint except auto.
  * It doesn't AJAX grab a new report when you resolve each one, use auto
  * for that (reports.php). If you wanted to add a new view, you'd simply
- * add to the case statement(s) below and add an entry to views.php to 
+ * add to the case statement(s) below and add an entry to views.php to
  * explain it.
- * Any changes made to this page within the foreach() should probably be 
+ * Any changes made to this page within the foreach() should probably be
  * replicated on the auto page (reports.php).
  */
 
@@ -35,7 +35,7 @@
 } else {
 	$ID = '';
 }
-	
+
 $Order = "ORDER BY r.ReportedTime ASC";
 
 if(!$ID) {
@@ -90,7 +90,7 @@
 			break;
 		case "reporter" :
 			$DB->query("SELECT Username FROM users_main WHERE ID=".$ID);
-			list($Username) = $DB->next_record();			
+			list($Username) = $DB->next_record();
 			if($Username) {
 				$Title = "All torrents reported by ".$Username;
 			} else {
@@ -101,7 +101,7 @@
 			break;
 		case "uploader" :
 			$DB->query("SELECT Username FROM users_main WHERE ID=".$ID);
-			list($Username) = $DB->next_record();			
+			list($Username) = $DB->next_record();
 			if($Username) {
 				$Title = "All reports for torrents uploaded by ".$Username;
 			} else {
@@ -176,7 +176,7 @@
 			LEFT JOIN users_main AS reporter ON reporter.ID=r.ReporterID
 			LEFT JOIN users_main AS uploader ON uploader.ID=t.UserID "
 			.$Where."
-			GROUP BY r.ID " 
+			GROUP BY r.ID "
 			.$Order."
 			LIMIT ".$Limit);
 
@@ -223,8 +223,8 @@
 	foreach($Reports as $Report) {
 		
 		
-		list($ReportID, $ReporterID, $ReporterName, $TorrentID, $Type, $UserComment, $ResolverID, $ResolverName, $Status, $ReportedTime, $LastChangeTime, 
-			$ModComment, $Tracks, $Images, $ExtraIDs, $Links, $LogMessage, $GroupName, $GroupID, $ArtistID, $ArtistName, $Year, $CategoryID, $Time, $Remastered, $RemasterTitle, 
+		list($ReportID, $ReporterID, $ReporterName, $TorrentID, $Type, $UserComment, $ResolverID, $ResolverName, $Status, $ReportedTime, $LastChangeTime,
+			$ModComment, $Tracks, $Images, $ExtraIDs, $Links, $LogMessage, $GroupName, $GroupID, $ArtistID, $ArtistName, $Year, $CategoryID, $Time, $Remastered, $RemasterTitle,
 			$RemasterYear, $Media, $Format, $Encoding, $Size, $HasCue, $HasLog, $LogScore, $UploaderID, $UploaderName) = Misc::display_array($Report, array("ModComment"));
 		
 		if(!$GroupID && $Status != "Resolved") {
@@ -272,11 +272,11 @@
 				$RawName = "$ArtistName - $GroupName".($Year ? " ($Year)" : "")." [$Format/$Encoding/$Media]".($Remastered ? " &lt;$RemasterTitle - $RemasterYear&gt;" : "").($HasCue ? " (Cue)" : '').($HasLog ? " (Log: $LogScore %)" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
 				$LinkName = "<a href='artist.php?id=$ArtistID'>$ArtistName</a> - <a href='torrents.php?id=$GroupID'>$GroupName".($Year ? " ($Year)" : "")."</a> <a href='torrents.php?torrentid=$TorrentID'> [$Format/$Encoding/$Media]".($Remastered ? " &lt;$RemasterTitle - $RemasterYear&gt;" : "")."</a> ".($HasCue ? " (Cue)" : '').($HasLog ? " <a href='torrents.php?action=viewlog&amp;torrentid=$TorrentID&amp;groupid=$GroupID'>(Log: $LogScore %)</a>" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
 				$BBName = "[url=artist.php?id=$ArtistID]".$ArtistName."[/url] - [url=torrents.php?id=$GroupID]$GroupName".($Year ? " ($Year)" : "")."[/url] [url=torrents.php?torrentid=$TorrentID][$Format/$Encoding/$Media]".($Remastered ? " &lt;$RemasterTitle - $RemasterYear&gt;" : "")."[/url] ".($HasCue ? " (Cue)" : '').($HasLog ? " [url=torrents.php?action=viewlog&amp;torrentid=$TorrentID&amp;groupid=$GroupID'](Log: $LogScore %)[/url]" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
-			}	
-		?>	
+			}
+		?>
 			<div id="report<?=$ReportID?>">
 				<form class="manage_form" name="report" id="reportform_<?=$ReportID?>" action="reports.php" method="post">
-					<? 
+					<?
 						/*
 						* Some of these are for takeresolve, namely the ones that aren't inputs, some for the JavaScript.
 						*/
@@ -308,38 +308,38 @@
 								<? if ($ReporterName == "") { $ReporterName = "System"; } ?>
 								<div style="text-align: right;">was reported by <a href="user.php?id=<?=$ReporterID?>"><?=$ReporterName?></a> <?=time_diff($ReportedTime)?> for the reason: <strong><?=$ReportType['title']?></strong></div>
 			<?	if($Status != 'Resolved') {
-				
-					$DB->query("SELECT r.ID 
-								FROM reportsv2 AS r 
-								LEFT JOIN torrents AS t ON t.ID=r.TorrentID 
+
+					$DB->query("SELECT r.ID
+								FROM reportsv2 AS r
+								LEFT JOIN torrents AS t ON t.ID=r.TorrentID
 								WHERE r.Status != 'Resolved'
 								AND t.GroupID=$GroupID");
 					$GroupOthers = ($DB->record_count() - 1);
-					
+
 					if($GroupOthers > 0) { ?>
 								<div style="text-align: right;">
 									<a href="reportsv2.php?view=group&amp;id=<?=$GroupID?>">There <?=(($GroupOthers > 1) ? "are $GroupOthers other reports" : "is 1 other report")?> for torrent(s) in this group</a>
 								</div>
 			<? 		}
-					
-					$DB->query("SELECT t.UserID 
-								FROM reportsv2 AS r 
-								JOIN torrents AS t ON t.ID=r.TorrentID 
+
+					$DB->query("SELECT t.UserID
+								FROM reportsv2 AS r
+								JOIN torrents AS t ON t.ID=r.TorrentID
 								WHERE r.Status != 'Resolved'
 								AND t.UserID=$UploaderID");
 					$UploaderOthers = ($DB->record_count() - 1);
-	
+
 					if($UploaderOthers > 0) { ?>
 								<div style="text-align: right;">
 									<a href="reportsv2.php?view=uploader&amp;id=<?=$UploaderID?>">There <?=(($UploaderOthers > 1) ? "are $UploaderOthers other reports" : "is 1 other report")?> for torrent(s) uploaded by this user</a>
 								</div>
 			<? 		}
-				
+
 					$DB->query("SELECT DISTINCT req.ID,
 								req.FillerID,
 								um.Username,
 								req.TimeFilled
-								FROM requests AS req 
+								FROM requests AS req
 								LEFT JOIN torrents AS t ON t.ID=req.TorrentID
 								LEFT JOIN reportsv2 AS rep ON rep.TorrentID=t.ID
 								JOIN users_main AS um ON um.ID=req.FillerID
@@ -347,7 +347,7 @@
 								AND req.TimeFilled > '2010-03-04 02:31:49'
 								AND req.TorrentID = $TorrentID");
 					$Requests = ($DB->record_count());
-					if($Requests > 0) { 
+					if($Requests > 0) {
 						while(list($RequestID, $FillerID, $FillerName, $FilledTime) = $DB->next_record()) {
 				?>
 									<div style="text-align: right;">
@@ -368,7 +368,7 @@
 							</td>
 						</tr>
 			<? }
-			
+
 				if($Links) {
 			?>
 						<tr>
@@ -377,7 +377,7 @@
 			<?
 					$Links = explode(" ", $Links);
 					foreach($Links as $Link) {
-					
+
 						if ($local_url = $Text->local_url($Link)) {
 							$Link = $local_url;
 						}
@@ -390,7 +390,7 @@
 						</tr>
 			<?
 				}
-			
+
 				if($ExtraIDs) {
 			?>
 						<tr>
@@ -402,7 +402,7 @@
 					foreach($Extras as $ExtraID) {
 
 
-						$DB->query("SELECT 
+						$DB->query("SELECT
 									tg.Name,
 									tg.ID,
 									CASE COUNT(ta.GroupID)
@@ -436,10 +436,10 @@
 									LEFT JOIN users_main AS uploader ON uploader.ID=t.UserID
 									WHERE t.ID='$ExtraID'
 									GROUP BY tg.ID");
-						
-						list($ExtraGroupName, $ExtraGroupID, $ExtraArtistID, $ExtraArtistName, $ExtraYear, $ExtraTime, $ExtraRemastered, $ExtraRemasterTitle, 
+
+						list($ExtraGroupName, $ExtraGroupID, $ExtraArtistID, $ExtraArtistName, $ExtraYear, $ExtraTime, $ExtraRemastered, $ExtraRemasterTitle,
 							$ExtraRemasterYear, $ExtraMedia, $ExtraFormat, $ExtraEncoding, $ExtraSize, $ExtraHasCue, $ExtraHasLog, $ExtraLogScore, $ExtraUploaderID, $ExtraUploaderName) = Misc::display_array($DB->next_record());
-						
+
 						if($ExtraGroupName) {
 			if ($ArtistID == 0 && empty($ArtistName)) {
 				$ExtraLinkName = "<a href='torrents.php?id=$ExtraGroupID'>$ExtraGroupName".($ExtraYear ? " ($ExtraYear)" : "")."</a> <a href='torrents.php?torrentid=$ExtraID'> [$ExtraFormat/$ExtraEncoding/$ExtraMedia]".($ExtraRemastered ? " &lt;$ExtraRemasterTitle - $ExtraRemasterYear&gt;" : "")."</a> ".($ExtraHasCue == '1' ? " (Cue)" : '').($ExtraHasLog == '1' ? " <a href='torrents.php?action=viewlog&amp;torrentid=$ExtraID&amp;groupid=$ExtraGroupID'>(Log: $ExtraLogScore %)</a>" : "")." (".number_format($ExtraSize/(1024*1024), 2)." MB)";
@@ -447,7 +447,7 @@
 				$ExtraLinkName = "Various Artists - <a href='torrents.php?id=$ExtraGroupID'>$ExtraGroupName".($ExtraYear ? " ($ExtraYear)" : "")."</a> <a href='torrents.php?torrentid=$ExtraID'> [$ExtraFormat/$ExtraEncoding/$ExtraMedia]".($ExtraRemastered ? " &lt;$ExtraRemasterTitle - $ExtraRemasterYear&gt;" : "")."</a> ".($ExtraHasCue == '1' ? " (Cue)" : '').($ExtraHasLog == '1' ? " <a href='torrents.php?action=viewlog&amp;torrentid=$ExtraID&amp;groupid=$ExtraGroupID'>(Log: $ExtraLogScore %)</a>" : "")." (".number_format($ExtraSize/(1024*1024), 2)." MB)";
 			} else {
 				$ExtraLinkName = "<a href='artist.php?id=$ExtraArtistID'>$ExtraArtistName</a> - <a href='torrents.php?id=$ExtraGroupID'>$ExtraGroupName".($ExtraYear ? " ($ExtraYear)" : "")."</a> <a href='torrents.php?torrentid=$ExtraID'> [$ExtraFormat/$ExtraEncoding/$ExtraMedia]".($ExtraRemastered ? " &lt;$ExtraRemasterTitle - $ExtraRemasterYear&gt;" : "")."</a> ".($ExtraHasCue == '1' ? " (Cue)" : '').($ExtraHasLog == '1' ? " <a href='torrents.php?action=viewlog&amp;torrentid=$ExtraID&amp;groupid=$ExtraGroupID'>(Log: $ExtraLogScore %)</a>" : "")." (".number_format($ExtraSize/(1024*1024), 2)." MB)";
-			}	
+			}
 ?>
 									<?=($First ? "" : "<br />")?>
 									<?=$ExtraLinkName?>
@@ -462,7 +462,7 @@
 						</tr>
 			<?
 				}
-				
+
 				if($Images) {
 			?>
 						<tr>
@@ -474,12 +474,12 @@
 						$Image = 'http'.($SSL?'s':'').'://'.SITE_URL.'/image.php?c=1&amp;i='.urlencode($Image);
 			?>
 								<img style="max-width: 200px;" onclick="lightbox.init(this,200);" src="<?=$Image?>" alt="Relevant image" />
-			<? 
+			<?
 					}
 			?>
 							</td>
 						</tr>
-			<? 
+			<?
 				}
 			?>
 						<tr>
@@ -487,7 +487,7 @@
 							<td colspan="3"><?=$Text->full_format($UserComment)?></td>
 						</tr>
 						<? // END REPORTED STUFF :|: BEGIN MOD STUFF ?>
-			<?	
+			<?
 				if($Status == "InProgress") {
 			?>
 						<tr>
@@ -497,7 +497,7 @@
 							</td>
 						</tr>
 			<?	}
-				if($Status != "Resolved") { 
+				if($Status != "Resolved") {
 			?>
 						<tr>
 							<td class="label">Report Comment:</td>
@@ -519,7 +519,7 @@
 			$Priorities[$Key] = $Value['priority'];
 		}
 		array_multisort($Priorities, SORT_ASC, $TypeList);
-	
+
 		foreach($TypeList as $Type => $Data) {
 	?>
 							<option value="<?=$Type?>"><?=$Data['title']?></option>
@@ -562,7 +562,7 @@
 									<option value="Uploader">Uploader</option>
 									<option value="Reporter">Reporter</option>
 								</select>:
-							</td> 
+							</td>
 							<td colspan="3">
 								<span title="Uploader: Appended to the regular message unless using &quot;Send Now&quot;. Reporter: Must be used with &quot;Send Now&quot;.">
 									<textarea name="uploader_pm" id="uploader_pm<?=$ReportID?>" cols="50" rows="1"></textarea>
@@ -571,7 +571,7 @@
 							</td>
 						</tr>
 						<tr>
-							<td class="label"><strong>Extra</strong> Log Message:</td> 
+							<td class="label"><strong>Extra</strong> Log Message:</td>
 							<td>
 								<input type="text" name="log_message" id="log_message<?=$ReportID?>" size="40" <? if($ExtraIDs) {
 											$Extras = explode(" ", $ExtraIDs);
@@ -582,7 +582,7 @@
 											echo 'value="'.trim($Value).'"';
 										} ?>/>
 							</td>
-							<td class="label"><strong>Extra</strong> Staff Notes:</td> 
+							<td class="label"><strong>Extra</strong> Staff Notes:</td>
 							<td>
 								<input type="text" name="admin_message" id="admin_message<?=$ReportID?>" size="40" />
 							</td>
@@ -604,25 +604,25 @@
 				} else {
 			?>
 						<tr>
-							<td class="label">Resolver</td> 
+							<td class="label">Resolver</td>
 							<td colspan="3">
 								<a href="user.php?id=<?=$ResolverID?>"><?=$ResolverName?></a>
 							</td>
 						</tr>
 						<tr>
-							<td class="label">Resolve Time</td> 
+							<td class="label">Resolve Time</td>
 							<td colspan="3">
 								<?=time_diff($LastChangeTime)?>
 							</td>
 						</tr>
 						<tr>
-							<td class="label">Report Comments</td> 
+							<td class="label">Report Comments</td>
 							<td colspan="3">
 								<?=$ModComment?>
 							</td>
 						</tr>
 						<tr>
-							<td class="label">Log Message</td> 
+							<td class="label">Log Message</td>
 							<td colspan="3">
 								<?=$LogMessage?>
 							</td>
diff --git a/sections/reportsv2/takereport.php b/sections/reportsv2/takereport.php
index af3dc35c..dc2c7cf3 100644
--- a/sections/reportsv2/takereport.php
+++ b/sections/reportsv2/takereport.php
@@ -2,12 +2,12 @@
 /*
  * This page handles the backend from when a user submits a report.
  * It checks for (in order):
- * 1. The usual POST injections, then checks that things. 
- * 2. Things that are required by the report type are filled 
+ * 1. The usual POST injections, then checks that things.
+ * 2. Things that are required by the report type are filled
  * 	('1' in the report_fields array).
  * 3. Things that are filled are filled with correct things.
  * 4. That the torrent you're reporting still exists.
- * 
+ *
  * Then it just inserts the report to the DB and increments the counter.
  */
 
diff --git a/sections/reportsv2/takeresolve.php b/sections/reportsv2/takeresolve.php
index 4c0eb007..578bfa8b 100644
--- a/sections/reportsv2/takeresolve.php
+++ b/sections/reportsv2/takeresolve.php
@@ -1,6 +1,6 @@
 <?
 /*
- * This is the backend of the AJAXy reports resolve (When you press the shiny submit button). 
+ * This is the backend of the AJAXy reports resolve (When you press the shiny submit button).
  * This page shouldn't output anything except in error, if you do want output, it will be put
  * straight into the table where the report used to be. Currently output is only given when
  * a collision occurs or a POST attack is detected.
@@ -68,7 +68,7 @@
 			 $Comment = "Report was dismissed as invalid";
 		}
 	}
-	
+
 	$DB->query("UPDATE reportsv2 SET
 	Status='Resolved',
 	LastChangeTime='".sqltime()."',
@@ -76,7 +76,7 @@
 	ResolverID='".$LoggedUser['ID']."'
 	WHERE ID='".$ReportID."'
 	AND Status <> 'Resolved'");
-	
+
 	if($DB->affected_rows() > 0) {
 		$Cache->delete_value('num_torrent_reportsv2');
 		$Cache->delete_value('reports_torrent_'.$TorrentID);
@@ -113,7 +113,7 @@
 $DB->query("SELECT ID FROM torrents WHERE ID = ".$TorrentID);
 $TorrentExists = ($DB->record_count() > 0);
 if(!$TorrentExists) {
-	$DB->query("UPDATE reportsv2 
+	$DB->query("UPDATE reportsv2
 		SET Status='Resolved',
 		LastChangeTime='".sqltime()."',
 		ResolverID='".$LoggedUser['ID']."',
@@ -125,7 +125,7 @@
 
 if($Report) {
 	//Resolve with a parallel check
-	$DB->query("UPDATE reportsv2 
+	$DB->query("UPDATE reportsv2
 		SET Status='Resolved',
 			LastChangeTime='".sqltime()."',
 			ResolverID='".$LoggedUser['ID']."'
@@ -138,7 +138,7 @@
 	//We did, lets do all our shit
 	if($Report) { $Cache->decrement('num_torrent_reportsv2'); }
 
-	
+
 	if(isset($Escaped['upload'])) {
 		$Upload = true;
 	} else {
@@ -168,7 +168,7 @@
 		$Cache->delete_value('torrents_details_'.$GroupID);
 		$SendPM = true;
 	}
-	
+
 	//Log and delete
 	if(isset($Escaped['delete']) && check_perms('users_mod')) {
 		$DB->query("SELECT Username FROM users_main WHERE ID = ".$UploaderID);
@@ -181,7 +181,7 @@
 		$DB->query("SELECT GroupID, hex(info_hash) FROM torrents WHERE ID = ".$TorrentID);
 		list($GroupID, $InfoHash) = $DB->next_record();
 		Torrents::delete_torrent($TorrentID, 0, $ResolveType['reason']);
-		
+
 		//$InfoHash = unpack("H*", $InfoHash);
 		$Log .= " (".strtoupper($InfoHash).")";
 		Misc::write_log($Log);
@@ -190,20 +190,20 @@
 	} else {
 		$Log = "No log message (Torrent wasn't deleted)";
 	}
-	
+
 	//Warnings / remove upload
 	if($Upload) {
 		$Cache->begin_transaction('user_info_heavy_'.$UploaderID);
 		$Cache->update_row(false, array('DisableUpload' => '1'));
 		$Cache->commit_transaction(0);
-	
+
 		$DB->query("UPDATE users_info SET
 			DisableUpload='1'
 			WHERE UserID=".$UploaderID);
 	}
-	
+
 	if($Warning > 0) {
-		$WarnLength = $Warning * (7*24*60*60); 
+		$WarnLength = $Warning * (7*24*60*60);
 		$Reason = "Uploader of torrent (".$TorrentID.") ".$RawName." which was resolved with the preset: ".$ResolveType['title'].".";
 		if($Escaped['admin_message']) {
 			$Reason .= " (".$Escaped['admin_message'].").";
@@ -227,13 +227,13 @@
 		}
 		if($AdminComment) {
 			$AdminComment = date("Y-m-d").' - '.$AdminComment."\n\n";
-				
+
 			$DB->query("UPDATE users_info SET
 				AdminComment=CONCAT('".db_string($AdminComment)."',AdminComment)
 				WHERE UserID='".db_string($UploaderID)."'");
 		}
 	}
-	
+
 	//PM
 	if($Escaped['uploader_pm'] || $Warning > 0 || isset($Escaped['delete']) || $SendPM) {
 		if(isset($Escaped['delete'])) {
@@ -241,17 +241,17 @@
 		} else {
 			$PM = "[url=http://".NONSSL_SITE_URL."/torrents.php?torrentid=".$TorrentID."]Your above torrent[/url] was reported but not deleted.\n\n";
 		}
-		
+
 		$Preset = $ResolveType['resolve_options']['pm'];
-		
+
 		if($Preset != "") {
 			 $PM .= "Reason: ".$Preset;
 		}
-		
+
 		if($Warning > 0) {
-			$PM .= "\nThis has resulted in a [url=http://".NONSSL_SITE_URL."/wiki.php?action=article&amp;id=218]".$Warning." week warning.[/url]\n";	
+			$PM .= "\nThis has resulted in a [url=http://".NONSSL_SITE_URL."/wiki.php?action=article&amp;id=218]".$Warning." week warning.[/url]\n";
 		}
-		
+
 		if($Upload) {
 			$PM .= "This has ".($Warning > 0 ? 'also ' : '')."resulted in you losing your upload privileges.";
 		}
@@ -259,20 +259,20 @@
 		if($Log) {
 			$PM = $PM."\nLog Message: ".$Log."\n";
 		}
-		
+
 		if($Escaped['uploader_pm']) {
-			$PM .= "\nMessage from ".$LoggedUser['Username'].": ".$PMMessage;	
+			$PM .= "\nMessage from ".$LoggedUser['Username'].": ".$PMMessage;
 		}
-		
+
 		$PM .= "\n\nReport was handled by [user]".$LoggedUser['Username']."[/user].";
-		
+
 		Misc::send_pm($UploaderID, 0, db_string($Escaped['raw_name']), db_string($PM));
 	}
 
 	$Cache->delete_value('reports_torrent_'.$TorrentID);
-	
+
 	//Now we've done everything, update the DB with values
-	if($Report) { 
+	if($Report) {
 		$DB->query("UPDATE reportsv2 SET
 		Type = '".$Escaped['resolve_type']."',
 		LogMessage='".db_string($Log)."',
diff --git a/sections/reportsv2/views.php b/sections/reportsv2/views.php
index 7027eb71..8b6ff483 100644
--- a/sections/reportsv2/views.php
+++ b/sections/reportsv2/views.php
@@ -172,7 +172,7 @@
 	<td style="vertical-align: top;">
 <?
 	$DB->query("SELECT r.ResolverID,
-						um.Username, 
+						um.Username,
 						COUNT(r.ID) AS Count,
 						COUNT(tasted.Tasted) AS Tasted
 				FROM reportsv2 AS r
@@ -189,8 +189,8 @@
 				<td>Current count</td>
 				<td>Tasted count</td>
 			</tr>
-		
-	<?	
+
+	<?
 		foreach($Staff as $Array) {	?>
 			<tr>
 				<td>
@@ -201,7 +201,7 @@
 					<a href="reportsv2.php?view=tasted&amp;id=<?=$Array['ResolverID']?>"><?=number_format($Array['Tasted'])?></a>
 				</td>
 			</tr>
-	<?	
+	<?
 		}
 	?>
 		</table>
@@ -210,7 +210,7 @@
 <?
 	$DB->query("SELECT 	r.Type,
 						COUNT(r.ID) AS Count
-				FROM reportsv2 AS r 
+				FROM reportsv2 AS r
 				WHERE r.Status='New'
 				GROUP BY r.Type");
 	$Current = $DB->to_array();
diff --git a/sections/requests/functions.php b/sections/requests/functions.php
index f7938be9..4ff4e954 100644
--- a/sections/requests/functions.php
+++ b/sections/requests/functions.php
@@ -7,15 +7,15 @@ function get_request_artists($RequestID) {
 		$Results = $Artists;
 	} else {
 		$Results = array();
-		$DB->query("SELECT ra.ArtistID, 
-						aa.Name, 
-						ra.Importance 
-					FROM requests_artists AS ra 
-						JOIN artists_alias AS aa ON ra.AliasID = aa.AliasID 
+		$DB->query("SELECT ra.ArtistID,
+						aa.Name,
+						ra.Importance
+					FROM requests_artists AS ra
+						JOIN artists_alias AS aa ON ra.AliasID = aa.AliasID
 					WHERE ra.RequestID = ".$RequestID."
 					ORDER BY ra.Importance ASC,
 							aa.Name ASC;");
-		
+
 		$ArtistRaw = $DB->to_array();
 		foreach($ArtistRaw as $ArtistRow) {
 			list($ArtistID, $ArtistName, $ArtistImportance) = $ArtistRow;
@@ -28,10 +28,10 @@ function get_request_artists($RequestID) {
 
 function get_request_tags($RequestID) {
 	global $DB;
-	$DB->query("SELECT rt.TagID, 
-					t.Name 
-				FROM requests_tags AS rt 
-					JOIN tags AS t ON rt.TagID=t.ID 
+	$DB->query("SELECT rt.TagID,
+					t.Name
+				FROM requests_tags AS rt
+					JOIN tags AS t ON rt.TagID=t.ID
 				WHERE rt.RequestID = ".$RequestID."
 				ORDER BY rt.TagID ASC");
 	$Tags = $DB->to_array();
@@ -45,7 +45,7 @@ function get_request_tags($RequestID) {
 
 function get_votes_array($RequestID) {
 	global $Cache, $DB;
-	
+
 	$RequestVotes = $Cache->get_value('request_votes_'.$RequestID);
 	if(!is_array($RequestVotes)) {
 		$DB->query("SELECT rv.UserID,
@@ -59,18 +59,18 @@ function get_votes_array($RequestID) {
 			error(0);
 		} else {
 			$Votes = $DB->to_array();
-			
+
 			$RequestVotes = array();
 			$RequestVotes['TotalBounty'] = array_sum($DB->collect('Bounty'));
-			
+
 			foreach($Votes as $Vote) {
 				list($UserID, $Bounty, $Username) = $Vote;
 				$VoteArray = array();
-				$VotesArray[] = array('UserID' => $UserID, 
+				$VotesArray[] = array('UserID' => $UserID,
 										'Username' => $Username,
 										'Bounty' => $Bounty);
 			}
-	
+
 			$RequestVotes['Voters'] = $VotesArray;
 			$Cache->cache_value('request_votes_'.$RequestID, $RequestVotes);
 		}
diff --git a/sections/requests/index.php b/sections/requests/index.php
index b73f7035..f16b5f92 100644
--- a/sections/requests/index.php
+++ b/sections/requests/index.php
@@ -48,23 +48,23 @@
 			authorize();
 
 			enforce_login();
-			if (!isset($_POST['requestid']) || !is_number($_POST['requestid']) || $_POST['body']==='' || !isset($_POST['body'])) { 
+			if (!isset($_POST['requestid']) || !is_number($_POST['requestid']) || $_POST['body']==='' || !isset($_POST['body'])) {
 				error(0);
 			}
 			if($LoggedUser['DisablePosting']) {
 				error('Your posting rights have been removed.');
 			}
-			
+
 			$RequestID = $_POST['requestid'];
 			if(!$RequestID) { error(404); }
-		
+
 			$DB->query("SELECT CEIL((SELECT COUNT(ID)+1 FROM requests_comments AS rc WHERE rc.RequestID='".$RequestID."')/".TORRENT_COMMENTS_PER_PAGE.") AS Pages");
 			list($Pages) = $DB->next_record();
-		
+
 			$DB->query("INSERT INTO requests_comments (RequestID,AuthorID,AddedTime,Body) VALUES (
 				'".$RequestID."', '".db_string($LoggedUser['ID'])."','".sqltime()."','".db_string($_POST['body'])."')");
 			$PostID=$DB->inserted_id();
-		
+
 			$CatalogueID = floor((TORRENT_COMMENTS_PER_PAGE*$Pages-TORRENT_COMMENTS_PER_PAGE)/THREAD_CATALOGUE);
 			$Cache->begin_transaction('request_comments_'.$RequestID.'_catalogue_'.$CatalogueID);
 			$Post = array(
@@ -79,29 +79,29 @@
 			$Cache->insert('', $Post);
 			$Cache->commit_transaction(0);
 			$Cache->increment('request_comments_'.$RequestID);
-			
+
 			header('Location: requests.php?action=view&id='.$RequestID.'&page='.$Pages);
 		break;
-		
+
 		case 'get_post':
 			enforce_login();
 			if (!$_GET['post'] || !is_number($_GET['post'])) { error(0); }
 			$DB->query("SELECT Body FROM requests_comments WHERE ID='".db_string($_GET['post'])."'");
 			list($Body) = $DB->next_record(MYSQLI_NUM);
-		
+
 			echo trim($Body);
 			break;
-		
+
 		case 'takeedit_comment':
 			enforce_login();
 			authorize();
 
 			include(SERVER_ROOT.'/classes/class_text.php'); // Text formatting class
 			$Text = new TEXT;
-		
+
 			// Quick SQL injection check
 			if(!$_POST['post'] || !is_number($_POST['post'])) { error(0); }
-			
+
 			// Mainly
 			$DB->query("SELECT
 				rc.Body,
@@ -111,24 +111,24 @@
 				FROM requests_comments AS rc
 				WHERE rc.ID='".db_string($_POST['post'])."'");
 			list($OldBody, $AuthorID,$RequestID,$AddedTime)=$DB->next_record();
-			
+
 			$DB->query("SELECT ceil(COUNT(ID) / ".POSTS_PER_PAGE.") AS Page FROM requests_comments WHERE RequestID = $RequestID AND ID <= $_POST[post]");
 			list($Page) = $DB->next_record();
-			
+
 			if ($LoggedUser['ID']!=$AuthorID && !check_perms('site_moderate_forums')) { error(404); }
 			if ($DB->record_count()==0) { error(404); }
-		
+
 			// Perform the update
 			$DB->query("UPDATE requests_comments SET
 				Body = '".db_string($_POST['body'])."',
 				EditedUserID = '".db_string($LoggedUser['ID'])."',
 				EditedTime = '".sqltime()."'
 				WHERE ID='".db_string($_POST['post'])."'");
-		
+
 			// Update the cache
 			$CatalogueID = floor((TORRENT_COMMENTS_PER_PAGE*$Page-TORRENT_COMMENTS_PER_PAGE)/THREAD_CATALOGUE);
 			$Cache->begin_transaction('request_comments_'.$RequestID.'_catalogue_'.$CatalogueID);
-			
+
 			$Cache->update_row($_POST['key'], array(
 				'ID'=>$_POST['post'],
 				'AuthorID'=>$AuthorID,
@@ -139,24 +139,24 @@
 				'Username'=>$LoggedUser['Username']
 			));
 			$Cache->commit_transaction(0);
-			
+
 			$DB->query("INSERT INTO comments_edits (Page, PostID, EditUser, EditTime, Body)
 								VALUES ('requests', ".db_string($_POST['post']).", ".db_string($LoggedUser['ID']).", '".sqltime()."', '".db_string($OldBody)."')");
-			
+
 			// This gets sent to the browser, which echoes it in place of the old body
 			echo $Text->full_format($_POST['body']);
 			break;
-		
+
 		case 'delete_comment':
 			enforce_login();
 			authorize();
-		
+
 			// Quick SQL injection check
 			if (!$_GET['postid'] || !is_number($_GET['postid'])) { error(0); }
-		
+
 			// Make sure they are moderators
 			if (!check_perms('site_moderate_forums')) { error(403); }
-		
+
 			// Get topicid, forumid, number of pages
 			$DB->query("SELECT DISTINCT
 				RequestID,
@@ -165,24 +165,24 @@
 				FROM requests_comments AS rc
 				WHERE rc.RequestID=(SELECT RequestID FROM requests_comments WHERE ID='".db_string($_GET['postid'])."')");
 			list($RequestID,$Pages,$Page)=$DB->next_record();
-		
+
 			// $Pages = number of pages in the thread
 			// $Page = which page the post is on
 			// These are set for cache clearing.
-		
+
 			$DB->query("DELETE FROM requests_comments WHERE ID='".db_string($_GET['postid'])."'");
-		
+
 			//We need to clear all subsequential catalogues as they've all been bumped with the absence of this post
 			$ThisCatalogue = floor((TORRENT_COMMENTS_PER_PAGE*$Page-TORRENT_COMMENTS_PER_PAGE)/THREAD_CATALOGUE);
 			$LastCatalogue = floor((TORRENT_COMMENTS_PER_PAGE*$Pages-TORRENT_COMMENTS_PER_PAGE)/THREAD_CATALOGUE);
 			for($i = $ThisCatalogue; $i <= $LastCatalogue; $i++) {
 				$Cache->delete('request_comments_'.$RequestID.'_catalogue_'.$i);
 			}
-			
+
 			// Delete thread info cache (eg. number of pages)
 			$Cache->delete('request_comments_'.$GroupID);
 		break;
-		
+
 		default:
 			error(0);
 	}
diff --git a/sections/requests/interim.php b/sections/requests/interim.php
index 7f408b1b..35222d40 100644
--- a/sections/requests/interim.php
+++ b/sections/requests/interim.php
@@ -10,12 +10,12 @@
 list($RequestorID, $FillerID) = $DB->next_record();
 
 if($Action == 'unfill') {
-	if($LoggedUser['ID'] != $RequestorID && $LoggedUser['ID'] != $FillerID && !check_perms('site_moderate_requests')) { 
-		error(403); 
+	if($LoggedUser['ID'] != $RequestorID && $LoggedUser['ID'] != $FillerID && !check_perms('site_moderate_requests')) {
+		error(403);
 	}
 } elseif($Action == "delete") {
-	if($LoggedUser['ID'] != $RequestorID && !check_perms('site_moderate_requests')) { 
-		error(403); 
+	if($LoggedUser['ID'] != $RequestorID && !check_perms('site_moderate_requests')) {
+		error(403);
 	}
 }
 
diff --git a/sections/rules/clients.php b/sections/rules/clients.php
index a3215b05..c655dd91 100644
--- a/sections/rules/clients.php
+++ b/sections/rules/clients.php
@@ -38,10 +38,10 @@
 			The modification of clients to bypass our client requirements (spoofing) is explicitly forbidden. People caught doing this will be instantly and permanently banned. This is your only warning.
 		</p>
 		<p>
-			The use of clients or proxies which have been modified to report incorrect stats to the tracker (cheating) is not allowed, and will result in a permanent ban. Additionally, your information will be passed on to representatives of other trackers, where you are liable to be banned as well. 
+			The use of clients or proxies which have been modified to report incorrect stats to the tracker (cheating) is not allowed, and will result in a permanent ban. Additionally, your information will be passed on to representatives of other trackers, where you are liable to be banned as well.
 		</p>
 		<p>
-			The testing of unstable clients by developers is not allowed unless approved by a staff member. 
+			The testing of unstable clients by developers is not allowed unless approved by a staff member.
 		</p>
 	</div>
 	<h3>Further Details</h3>
@@ -50,7 +50,7 @@
 			If someone you invited to the site breaks the above rules you will receive a 2 month warning and lose the right to invite people to this site.
 		</p>
 		<p>
-			If you were invited by someone who broke the above rules, your account will be disabled without warning. 
+			If you were invited by someone who broke the above rules, your account will be disabled without warning.
 		</p>
 	</div>
 <? include('jump.php'); ?>
diff --git a/sections/rules/collages.php b/sections/rules/collages.php
index 486d4b7c..e9fa2a51 100644
--- a/sections/rules/collages.php
+++ b/sections/rules/collages.php
@@ -9,7 +9,7 @@
 	<div class="box pad rule_summary" style="padding:10px 10px 10px 20px;">
 		<ul>
 			<li>Collages in the Discography, Staff Picks, Label, and Charts categories must be based on fact, and not opinion. If something is a published Best Of (for instance, "Pitchfork's Best Albums of the 1990's") then it should go in the Charts category.</li>
-			
+
 			<li>
 			Collages in the Personal, Theme, and Genre Introductions categories may be based on opinion. You must respect others' opinions whilst creating and populating Theme and Genre Introduction collages.
 			</li>
@@ -49,7 +49,7 @@
 			<li>
 			Please attempt to add album art to every torrent in your collage.
 			</li>
-			
+
 		</ul>
 	</div>
 <? include('jump.php'); ?>
diff --git a/sections/rules/jump.php b/sections/rules/jump.php
index 86a8cbc0..25783ce6 100644
--- a/sections/rules/jump.php
+++ b/sections/rules/jump.php
@@ -4,14 +4,14 @@
 	<table width="100%">
 		<tr class="colhead">
 			<td style="width:150px;">Category</td>
-			<td style="width:400px;">Additional Info</td>
+			<td style="width:400px;">Additional information</td>
 		</tr>
 		<tr class="rowb">
 			<td class="nobr">
 				<a href="rules.php">Golden Rules</a>
 			</td>
 			<td class="nobr">
-				These are the most important rules, breaking these will result in the most serious consequences.
+				These are the most important rules. Breaking these rules will result in the most serious consequences.
 			</td>
 		</tr>
 		<tr class="rowa">
@@ -51,7 +51,7 @@
 				<a href="rules.php?p=upload">Upload</a>
 			</td>
 			<td class="nobr">
-				This is the section of the rules regarding any and all content which is allowed on this site.	
+				This is the section of the rules regarding any and all content which is allowed on this site.
 			</td>
 		</tr>
 		<tr class="rowb">
@@ -59,7 +59,7 @@
 				<a href="rules.php?p=chat">Chat</a>
 			</td>
 			<td class="nobr">
-				Read this before posting in our forums or talking on the IRC.
+				Read this before posting in our forums or talking on our IRC network.
 			</td>
 		</tr>
 		<tr class="rowa">
@@ -67,11 +67,11 @@
 				<a href="rules.php?p=tag">Tagging</a>
 			</td>
 			<td class="nobr">
-				These rules govern what tags can and can not be added. 
+				These rules govern what tags can and cannot be added.
 			</td>
 		</tr>
 		<tr class="colhead">
-			<td colspan="2">Other Languages (Please note, these are community maintained and subject to error.)</td>
+			<td colspan="2">Other languages (Please note, these are community-maintained and are subject to error.)</td>
 		</tr>
 		<tr class="rowb">
 			<td class="nobr">
diff --git a/sections/schedule/index.php b/sections/schedule/index.php
index e8d5ec2c..475712fb 100644
--- a/sections/schedule/index.php
+++ b/sections/schedule/index.php
@@ -71,7 +71,7 @@ function next_hour() {
 
 //------------- Freeleech -----------------------------------------------//
 
-//We use this to control 6 hour freeleeches. They're actually 7 hour, but don't tell anyone. 
+//We use this to control 6 hour freeleeches. They're actually 7 hour, but don't tell anyone.
 /*
 $TimeMinus = time_minus(3600*7);
 
@@ -93,8 +93,8 @@ function next_hour() {
 	$Cache->delete_value('users_tokens_'.$UserID[0]);
 }
 
-$DB->query("SELECT uf.UserID, t.info_hash 
-            FROM users_freeleeches AS uf 
+$DB->query("SELECT uf.UserID, t.info_hash
+            FROM users_freeleeches AS uf
             JOIN torrents AS t ON uf.TorrentID = t.ID
 			WHERE uf.Expired = FALSE AND uf.Time < '$sqltime' - INTERVAL 4 DAY");
 while (list($UserID,$InfoHash) = $DB->next_record(MYSQLI_NUM, false)) {
@@ -115,7 +115,7 @@ function next_hour() {
 
 if($Hour != next_hour() || $_GET['runhour'] || isset($argv[2])){
 	echo "Ran hourly functions\n";
-	
+
 	//------------- Front page stats ----------------------------------------//
 
 	//Love or hate, this makes things a hell of a lot faster
@@ -142,23 +142,23 @@ function next_hour() {
 	list($UserStats['Month']) = $DB->next_record();
 
 	$Cache->cache_value('stats_users',$UserStats,0);
-	
+
 	//------------- Record who's seeding how much, used for ratio watch
-	
+
 	$DB->query("TRUNCATE TABLE users_torrent_history_temp");
-	$DB->query("INSERT INTO users_torrent_history_temp 
-		(UserID, NumTorrents) 
-		SELECT uid, 
-		COUNT(DISTINCT fid) 
-		FROM xbt_files_users 
-		WHERE mtime>unix_timestamp(now()-interval 1 hour) 
+	$DB->query("INSERT INTO users_torrent_history_temp
+		(UserID, NumTorrents)
+		SELECT uid,
+		COUNT(DISTINCT fid)
+		FROM xbt_files_users
+		WHERE mtime>unix_timestamp(now()-interval 1 hour)
 		AND Remaining=0
 		GROUP BY uid;");
-	$DB->query("UPDATE users_torrent_history AS h 
-		JOIN users_torrent_history_temp AS t ON t.UserID=h.UserID AND t.NumTorrents=h.NumTorrents 
-		SET h.Finished='0', 
-		h.LastTime=unix_timestamp(now()) 
-		WHERE h.Finished='1' 
+	$DB->query("UPDATE users_torrent_history AS h
+		JOIN users_torrent_history_temp AS t ON t.UserID=h.UserID AND t.NumTorrents=h.NumTorrents
+		SET h.Finished='0',
+		h.LastTime=unix_timestamp(now())
+		WHERE h.Finished='1'
 		AND h.Date=UTC_DATE()+0;");
 	$DB->query("INSERT INTO users_torrent_history
 		(UserID, NumTorrents, Date)
@@ -190,7 +190,7 @@ function next_hour() {
 		if (!empty($L['Extra'])) {
 			$Query .= ' AND '.$L['Extra'];
 		}
-		
+
 		$DB->query($Query);
 
 		$UserIDs = $DB->collect('ID');
@@ -205,12 +205,12 @@ function next_hour() {
 				$Cache->delete_value('user_stats_'.$UserID);
 				$Cache->delete_value('enabled_'.$UserID);
 				$DB->query("UPDATE users_info SET AdminComment = CONCAT('".sqltime()." - Class changed to ".Users::make_class_string($L['To'])." by System\n\n', AdminComment) WHERE UserID = ".$UserID);
-			}		
+			}
 			$DB->query("UPDATE users_main SET PermissionID=".$L['To']." WHERE ID IN(".implode(',',$UserIDs).")");
 		}
 
 		// Demote users with less than the required uploads
-		
+
 		$Query = "SELECT ID FROM users_main JOIN users_info ON users_main.ID = users_info.UserID
 			WHERE PermissionID='$L[To]'
 			AND ( Uploaded<'$L[MinUpload]'
@@ -221,10 +221,10 @@ function next_hour() {
 			$Query .= ")
 			AND Enabled='1'
 			AND ID NOT IN (213461)";
-		
+
 		$DB->query($Query);
 		$UserIDs = $DB->collect('ID');
-		
+
 		if (count($UserIDs) > 0) {
 			foreach($UserIDs as $UserID) {
 				/*$Cache->begin_transaction('user_info_'.$UserID);
@@ -269,7 +269,7 @@ function next_hour() {
 
 	//------------- Remove dead sessions ---------------------------------------//
 	sleep(3);
-	
+
 	$AgoMins = time_minus(60*30);
 	$AgoDays = time_minus(3600*24*30);
 	
@@ -311,14 +311,14 @@ function next_hour() {
         $UserIDs = $DB->collect('ID'  );
     if(count($UserIDs) > 0) {
         $Subject = 'Leeching Disabled';
-        $Message = 'You have downloaded more then 10 GiB while on Ratio Watch. Your leeching privileges have been disabled. Please reread the rules and refer to this guide on how to improve your ratio https://what.cd/wiki.php?action=article&amp;id=110';            
+        $Message = 'You have downloaded more then 10 GiB while on Ratio Watch. Your leeching privileges have been disabled. Please reread the rules and refer to this guide on how to improve your ratio https://what.cd/wiki.php?action=article&amp;id=110';
         foreach($UserIDs as $UserID) {
 			Misc::send_pm($UserID,0,db_string($Subject),db_string($Message));
 			send_irc("PRIVMSG #reports : !leechdisabled Downloaded 10 GB+ on Ratio Watch. https://".NONSSL_SITE_URL."/user.php?id=$UserID");
         }
- 
+
             $DB->query("UPDATE users_info AS i JOIN users_main AS m ON m.ID=i.UserID
-            SET 
+            SET
             m.can_leech='0',
             i.AdminComment=CONCAT('$sqltime - Leech disabled by ratio watch system for downloading more than 10 GBs on ratio watch.  - required ratio: ', m.RequiredRatio,'
 
@@ -339,13 +339,13 @@ function next_hour() {
 	if($Day%2 == 0) { // If we should generate the drive database (at the end)
 		$GenerateDriveDB = true;
 	}
-	
+
 	//------------- Ratio requirements
-	
-	
+
+
 	$DB->query("DELETE FROM users_torrent_history WHERE Date<date('".sqltime()."'-interval 7 day)+0");
 	$DB->query("TRUNCATE TABLE users_torrent_history_temp;");
-	$DB->query("INSERT INTO users_torrent_history_temp 
+	$DB->query("INSERT INTO users_torrent_history_temp
 		(UserID, SumTime)
 		SELECT UserID, SUM(Time) FROM users_torrent_history
 		GROUP BY UserID;");
@@ -356,14 +356,14 @@ function next_hour() {
 		WHERE SumTime<259200;");
 	$DB->query("UPDATE users_torrent_history SET Weight=NumTorrents*Time;");
 	$DB->query("TRUNCATE TABLE users_torrent_history_temp;");
-	$DB->query("INSERT INTO users_torrent_history_temp 
+	$DB->query("INSERT INTO users_torrent_history_temp
 		(UserID, SeedingAvg)
 		SELECT UserID, SUM(Weight)/SUM(Time) FROM users_torrent_history
 		GROUP BY UserID;");
 	$DB->query("DELETE FROM users_torrent_history WHERE NumTorrents='0'");
 	$DB->query("TRUNCATE TABLE users_torrent_history_snatch;");
-	$DB->query("INSERT INTO users_torrent_history_snatch(UserID, NumSnatches) 
-		SELECT 
+	$DB->query("INSERT INTO users_torrent_history_snatch(UserID, NumSnatches)
+		SELECT
 		xs.uid,
 		COUNT(DISTINCT xs.fid)
 		FROM
@@ -375,7 +375,7 @@ function next_hour() {
 		JOIN users_torrent_history_snatch AS s ON s.UserID=um.ID
 		SET um.RequiredRatioWork=(1-(t.SeedingAvg/s.NumSnatches))
 		WHERE s.NumSnatches>0;");
-	
+
 	$RatioRequirements = array(
 		array(80*1024*1024*1024, 0.60, 0.50),
 		array(60*1024*1024*1024, 0.60, 0.40),
@@ -386,35 +386,35 @@ function next_hour() {
 		array(10*1024*1024*1024, 0.20, 0.0),
 		array(5*1024*1024*1024,  0.15, 0.0)
 	);
-	
+
 	$DB->query("UPDATE users_main SET RequiredRatio=0.60 WHERE Downloaded>100*1024*1024*1024");
-	
-	
-	
+
+
+
 	$DownloadBarrier = 100*1024*1024*1024;
 	foreach($RatioRequirements as $Requirement) {
 		list($Download, $Ratio, $MinRatio) = $Requirement;
-		
+
 		$DB->query("UPDATE users_main SET RequiredRatio=RequiredRatioWork*$Ratio WHERE Downloaded >= '$Download' AND Downloaded < '$DownloadBarrier'");
-		
+
 		$DB->query("UPDATE users_main SET RequiredRatio=$MinRatio WHERE Downloaded >= '$Download' AND Downloaded < '$DownloadBarrier' AND RequiredRatio<$MinRatio");
-		
+
 		//$DB->query("UPDATE users_main SET RequiredRatio=$Ratio WHERE Downloaded >= '$Download' AND Downloaded < '$DownloadBarrier' AND can_leech='0' AND Enabled='1'");
-		
+
 		$DownloadBarrier = $Download;
 	}
-	
+
 	$DB->query("UPDATE users_main SET RequiredRatio=0.00 WHERE Downloaded<5*1024*1024*1024");
-	
+
 	// Here is where we manage ratio watch
-	
+
 	$OffRatioWatch = array();
 	$OnRatioWatch = array();
-	
+
 	// Take users off ratio watch and enable leeching
 	$UserQuery = $DB->query("SELECT m.ID, torrent_pass FROM users_info AS i JOIN users_main AS m ON m.ID=i.UserID
 		WHERE m.Uploaded/m.Downloaded >= m.RequiredRatio
-		AND i.RatioWatchEnds!='0000-00-00 00:00:00' 
+		AND i.RatioWatchEnds!='0000-00-00 00:00:00'
 		AND m.can_leech='0'
 		AND m.Enabled='1'");
 	$OffRatioWatch = $DB->collect('ID');
@@ -427,7 +427,7 @@ function next_hour() {
 			ui.AdminComment = CONCAT('".$sqltime." - Leeching re-enabled by adequate ratio.\n\n', ui.AdminComment)
 			WHERE ui.UserID IN(".implode(",", $OffRatioWatch).")");
 	}
-	
+
 	foreach($OffRatioWatch as $UserID) {
 		$Cache->begin_transaction('user_info_heavy_'.$UserID);
 		$Cache->update_row(false, array('RatioWatchEnds'=>'0000-00-00 00:00:00','RatioWatchDownload'=>'0','CanLeech'=>1));
@@ -441,7 +441,7 @@ function next_hour() {
 		Tracker::update_tracker('update_user', array('passkey' => $Passkey, 'can_leech' => '1'));
 	}
 
-        // Take users off ratio watch 
+        // Take users off ratio watch
         $UserQuery = $DB->query("SELECT m.ID, torrent_pass FROM users_info AS i JOIN users_main AS m ON m.ID=i.UserID
                 WHERE m.Uploaded/m.Downloaded >= m.RequiredRatio
                 AND i.RatioWatchEnds!='0000-00-00 00:00:00'
@@ -469,7 +469,7 @@ function next_hour() {
                 Tracker::update_tracker('update_user', array('passkey' => $Passkey, 'can_leech' => '1'));
         }
 
-	
+
 	// Put user on ratio watch if he doesn't meet the standards
 	sleep(10);
 	$DB->query("SELECT m.ID, m.Downloaded FROM users_info AS i JOIN users_main AS m ON m.ID=i.UserID
@@ -478,7 +478,7 @@ function next_hour() {
 		AND m.Enabled='1'
 		AND m.can_leech='1'");
 	$OnRatioWatch = $DB->collect('ID');
-	
+
 	if(count($OnRatioWatch)>0) {
 		$DB->query("UPDATE users_info AS i JOIN users_main AS m ON m.ID=i.UserID
 			SET i.RatioWatchEnds='".time_plus(60*60*24*14)."',
@@ -486,7 +486,7 @@ function next_hour() {
 			i.RatioWatchDownload = m.Downloaded
 			WHERE m.ID IN(".implode(",", $OnRatioWatch).")");
 	}
-	
+
 	foreach($OnRatioWatch as $UserID) {
 		$Cache->begin_transaction('user_info_heavy_'.$UserID);
 		$Cache->update_row(false, array('RatioWatchEnds'=>time_plus(60*60*24*14),'RatioWatchDownload'=>0));
@@ -509,20 +509,20 @@ function next_hour() {
 	}
 
 	sleep(5);
-	
+
 	//------------- Disable downloading ability of users on ratio watch
-	
-	
+
+
 	$UserQuery = $DB->query("SELECT ID, torrent_pass FROM users_info AS i JOIN users_main AS m ON m.ID=i.UserID
 		WHERE i.RatioWatchEnds!='0000-00-00 00:00:00'
 		AND i.RatioWatchEnds<'$sqltime'
 		AND m.Enabled='1'
 		AND m.can_leech!='0'");
-	
+
 	$UserIDs = $DB->collect('ID');
 	if(count($UserIDs) > 0) {
 		$DB->query("UPDATE users_info AS i JOIN users_main AS m ON m.ID=i.UserID
-			SET 
+			SET
 			m.can_leech='0',
 			i.AdminComment=CONCAT('$sqltime - Leeching ability disabled by ratio watch system - required ratio: ', m.RequiredRatio,'
 
@@ -532,7 +532,7 @@ function next_hour() {
 		
 		$DB->query("DELETE FROM users_torrent_history WHERE UserID IN (".implode(',',$UserIDs).")");
 	}
-	
+
 	foreach($UserIDs as $UserID) {
 		$Cache->begin_transaction('user_info_heavy_'.$UserID);
 		$Cache->update_row(false, array('RatioWatchDownload'=>0, 'CanLeech'=>0));
@@ -546,7 +546,7 @@ function next_hour() {
 	foreach($Passkeys as $Passkey) {
 		Tracker::update_tracker('update_user', array('passkey' => $Passkey, 'can_leech' => '0'));
 	}
-	
+
 	//------------- Disable inactive user accounts --------------------------//
 	sleep(5);
 	// Send email
@@ -567,7 +567,7 @@ function next_hour() {
 	$DB->query("SELECT um.ID FROM  users_info AS ui JOIN users_main AS um ON um.ID=ui.UserID
 		LEFT JOIN users_levels AS ul ON ul.UserID = um.ID AND ul.PermissionID = '".CELEB."'
 		WHERE um.PermissionID IN ('".USER."', '".MEMBER	."')
-		AND um.LastAccess<'".time_minus(3600*24*30*4)."' 
+		AND um.LastAccess<'".time_minus(3600*24*30*4)."'
 		AND um.LastAccess!='0000-00-00 00:00:00'
 		AND ui.Donor='0'
 		AND um.Enabled!='2'
@@ -592,15 +592,15 @@ function next_hour() {
 		AND um.Enabled!='2'
 		");
 	$Cache->decrement('stats_user_count',$DB->affected_rows());
-	
+
 	echo "disabled unconfirmed\n";
-	
+
 	//------------- Demote users --------------------------------------------//
 	sleep(10);
 	$DB->query('SELECT um.ID FROM users_main AS um WHERE PermissionID IN('.POWER.', '.ELITE.', '.TORRENT_MASTER.') AND Uploaded/Downloaded < 0.95 OR PermissionID IN('.POWER.', '.ELITE.', '.TORRENT_MASTER.') AND Uploaded < 25*1024*1024*1024');
-	
+
 	echo "demoted 1\n";
-	
+
 	while(list($UserID) = $DB->next_record()) {
 		$Cache->begin_transaction('user_info_'.$UserID);
 		$Cache->update_row(false, array('PermissionID'=>MEMBER));
@@ -608,7 +608,7 @@ function next_hour() {
 	}
 	$DB->query('UPDATE users_main SET PermissionID='.MEMBER.' WHERE PermissionID IN('.POWER.', '.ELITE.', '.TORRENT_MASTER.') AND Uploaded/Downloaded < 0.95 OR PermissionID IN('.POWER.', '.ELITE.', '.TORRENT_MASTER.') AND Uploaded < 25*1024*1024*1024');
 	echo "demoted 2\n";
-	
+
 	$DB->query('SELECT um.ID FROM users_main AS um WHERE PermissionID IN('.MEMBER.', '.POWER.', '.ELITE.', '.TORRENT_MASTER.') AND Uploaded/Downloaded < 0.65');
 	echo "demoted 3\n";
 	while(list($UserID) = $DB->next_record()) {
@@ -628,13 +628,13 @@ function next_hour() {
 				  AND DATEDIFF(CURDATE(),DATE(t.LastPostTime))/7>f.AutoLockWeeks
 				  AND f.AutoLock = '1'");
 	$IDs = $DB->collect('ID');
-	
+
 	if(count($IDs) > 0) {
 		$LockIDs = implode(',', $IDs);
 		$DB->query("UPDATE forums_topics SET IsLocked='1' WHERE ID IN($LockIDs)");
 		sleep(2);
 		$DB->query("DELETE FROM forums_last_read_topics WHERE TopicID IN($LockIDs)");
-	
+
 		foreach($IDs as $ID) {
 			$Cache->begin_transaction('thread_'.$ID.'_info');
 			$Cache->update_row(false, array('IsLocked'=>'1'));
@@ -646,7 +646,7 @@ function next_hour() {
 	echo "Old threads locked\n";
 
 	//------------- Delete dead torrents ------------------------------------//
-	
+
 	sleep(10);
 	//remove dead torrents that were never announced to -- XBTT will not delete those with a pid of 0, only those that belong to them (valid pids)
 	
@@ -676,9 +676,9 @@ function next_hour() {
 		AND t.last_action = 0");
 	$TorrentIDs = $DB->to_array();
 	echo "Found ".count($TorrentIDs)." inactive torrents to be deleted.\n";
-	
+
 	$LogEntries = array();
-	
+
 	// Exceptions for inactivity deletion
 	$InactivityExceptionsMade = array(//UserID => expiry time of exception
 		
@@ -687,7 +687,7 @@ function next_hour() {
 		list($ID, $GroupID, $Name, $ArtistName, $LastAction, $Format, $Encoding, $UserID, $Media, $InfoHash) = $TorrentID;
 		if (array_key_exists($UserID, $InactivityExceptionsMade) && (time() < $InactivityExceptionsMade[$UserID])) {
 			// don't delete the torrent!
-			continue;	
+			continue;
 		}
 		if($ArtistName) {
 			$Name = $ArtistName.' - '.$Name;
@@ -697,26 +697,26 @@ function next_hour() {
 		}
 		Torrents::delete_torrent($ID, $GroupID);
 		$LogEntries[] = "Torrent ".$ID." (".$Name.") (".strtoupper($InfoHash).") was deleted for inactivity (unseeded)";
-		
+
 		if (!array_key_exists($UserID, $DeleteNotes))
 				$DeleteNotes[$UserID] = array('Count' => 0, 'Msg' => '');
-		
+
 		$DeleteNotes[$UserID]['Msg'] .= "\n$Name";
 		$DeleteNotes[$UserID]['Count']++;
-		
+
 		++$i;
 		if ($i % 500 == 0) {
 			echo "$i inactive torrents removed.\n";
 		}
 	}
 	echo "$i torrents deleted for inactivity.\n";
-	
+
 	foreach($DeleteNotes as $UserID => $MessageInfo){
 		$Singular = ($MessageInfo['Count'] == 1) ? true : false;
 		Misc::send_pm($UserID,0,db_string($MessageInfo['Count'].' of your torrents '.($Singular?'has':'have').' been deleted for inactivity'), db_string(($Singular?'One':'Some').' of your uploads '.($Singular?'has':'have').' been deleted for being unseeded.  Since '.($Singular?'it':'they').' didn\'t break any rules (we hope), please feel free to re-upload '.($Singular?'it':'them').".\n\nThe following torrent".($Singular?' was':'s were').' deleted:'.$MessageInfo['Msg']));
-	}	
+	}
 	unset($DeleteNotes);
-	
+
 	if(count($LogEntries) > 0) {
 		$Values = "('".implode("', '".$sqltime."'), ('",$LogEntries)."', '".$sqltime."')";
 		$DB->query('INSERT INTO log (Message, Time) VALUES '.$Values);
@@ -725,13 +725,13 @@ function next_hour() {
 
 	$DB->query("SELECT SimilarID FROM artists_similar_scores WHERE Score<=0");
 	$SimilarIDs = implode(',',$DB->collect('SimilarID'));
-	
-	if($SimilarIDs) {	
+
+	if($SimilarIDs) {
 		$DB->query("DELETE FROM artists_similar WHERE SimilarID IN($SimilarIDs)");
 		$DB->query("DELETE FROM artists_similar_scores WHERE SimilarID IN($SimilarIDs)");
 		$DB->query("DELETE FROM artists_similar_votes WHERE SimilarID IN($SimilarIDs)");
 	}
-	
+
 	
 
 	// Daily top 10 history.
@@ -777,13 +777,13 @@ function next_hour() {
 			$RemasterTitle,$Snatched,$Seeders,$Leechers,$Data) = $Torrent;
 
 		$DisplayName='';
-		
+
 		$Artists = Artists::get_artist($GroupID);
-		
+
 		if(!empty($Artists)) {
 			$DisplayName = Artists::display_artists($Artists, false, true);
 		}
-		
+
 		$DisplayName.= $GroupName;
 
 		if($GroupCategoryID==1 && $GroupYear>0) {
@@ -862,13 +862,13 @@ function next_hour() {
 				$RemasterTitle,$Snatched,$Seeders,$Leechers,$Data) = $Torrent;
 
 			$DisplayName='';
-			
+
 			$Artists = Artists::get_artist($GroupID);
-			
+
 			if(!empty($Artists)) {
 				$DisplayName = Artists::display_artists($Artists, false, true);
 			}
-			
+
 			$DisplayName.= $GroupName;
 
 			if($GroupCategoryID==1 && $GroupYear>0) {
@@ -901,7 +901,7 @@ function next_hour() {
 				(".$HistoryID.", ".$i.", ".$TorrentID.", '".db_string($TitleString)."', '".db_string($TagString)."')");
 			$i++;
 		}
-	
+
 		// Send warnings to uploaders of torrents that will be deleted this week
 		$DB->query("SELECT
 			t.ID,
@@ -922,12 +922,12 @@ function next_hour() {
 		$TorrentAlerts = array();
 		foreach ($TorrentIDs as $TorrentID) {
 			list($ID, $GroupID, $Name, $Format, $Encoding, $UserID) = $TorrentID;
-			
+
 			if (array_key_exists($UserID, $InactivityExceptionsMade) && (time() < $InactivityExceptionsMade[$UserID])) {
 				// don't notify exceptions
-				continue;	
+				continue;
 			}
-			
+
 			if (!array_key_exists($UserID, $TorrentAlerts))
 				$TorrentAlerts[$UserID] = array('Count' => 0, 'Msg' => '');
 			$ArtistName = Artists::display_artists(Artists::get_artist($GroupID), false, false, false);
@@ -944,11 +944,11 @@ function next_hour() {
 			Misc::send_pm($UserID, 0, db_string('Unseeded torrent notification'), db_string($MessageInfo['Count']." of your uploads will be deleted for inactivity soon.  Unseeded torrents are deleted after 4 weeks. If you still have the files, you can seed your uploads by ensuring the torrents are in your client and that they aren't stopped. You can view the time that a torrent has been unseeded by clicking on the torrent description line and looking for the \"Last active\" time. For more information, please go [url=https://what.cd/wiki.php?action=article&amp;id=663]here[/url].\n\nThe following torrent".($MessageInfo['Count']>1?'s':'')." will be removed for inactivity:".$MessageInfo['Msg']."\n\nIf you no longer wish to receive these notifications, please disable them in your profile settings."));
 		}
 	}
-	
-	$DB->query("UPDATE staff_pm_conversations 
+
+	$DB->query("UPDATE staff_pm_conversations
 					SET Status = 'Resolved', ResolverID = '0'
 					WHERE Date < NOW() - INTERVAL 1 MONTH AND Status = 'Open' AND AssignedToUser IS NULL");
-	
+
 }
 /*************************************************************************\
 //--------------Run twice per month -------------------------------------//
@@ -991,11 +991,11 @@ function next_hour() {
 	This cascades, so if you qualify for the last bonus group, you also qualify for the first two and will receive three bonus invites.
 
 	The bonus invites cannot put a user over their cap.
-	
+
 	*/
 
-	$DB->query("SELECT ID 
-				FROM users_main AS um 
+	$DB->query("SELECT ID
+				FROM users_main AS um
 				JOIN users_info AS ui on ui.UserID=um.ID
 				WHERE um.Enabled='1' AND ui.DisableInvites = '0'
 					AND ((um.PermissionID = ".POWER." AND um.Invites < 2) OR (um.PermissionID = ".ELITE." AND um.Invites < 4))");
@@ -1013,22 +1013,22 @@ function next_hour() {
 		array(0.75, 2*1024*1024*1024),
 		array(2.0, 10*1024*1024*1024),
 		array(3.0, 20*1024*1024*1024));
-	
+
 	// Since MySQL doesn't like subselecting from the target table during an update, we must create a temporary table.
 
 	$DB->query("CREATE TEMPORARY TABLE temp_sections_schedule_index
 		SELECT SUM(Uploaded) AS Upload,SUM(Downloaded) AS Download,Inviter
 		FROM users_main AS um JOIN users_info AS ui ON ui.UserID=um.ID
 		GROUP BY Inviter");
-	
+
 	foreach ($BonusReqs as $BonusReq) {
 		list($Ratio, $Upload) = $BonusReq;
 		$DB->query("SELECT ID
-					FROM users_main AS um 
+					FROM users_main AS um
 					JOIN users_info AS ui ON ui.UserID=um.ID
 					JOIN temp_sections_schedule_index AS u ON u.Inviter = um.ID
-					WHERE u.Upload>$Upload AND u.Upload/u.Download>$Ratio 
-						AND um.Enabled = '1' AND ui.DisableInvites = '0' 
+					WHERE u.Upload>$Upload AND u.Upload/u.Download>$Ratio
+						AND um.Enabled = '1' AND ui.DisableInvites = '0'
 						AND ((um.PermissionID = ".POWER." AND um.Invites < 2) OR (um.PermissionID = ".ELITE." AND um.Invites < 4))");
 		$UserIDs = $DB->collect('ID');
 		if (count($UserIDs) > 0) {
@@ -1040,7 +1040,7 @@ function next_hour() {
 			$DB->query("UPDATE users_main SET Invites=Invites+1 WHERE ID IN (".implode(',',$UserIDs).")");
 		}
 	}
-	
+
 	if($BiWeek == 8) {
 		$DB->query("TRUNCATE TABLE top_snatchers;");
 		
@@ -1051,7 +1051,7 @@ function next_hour() {
 
 
 echo "-------------------------\n\n";
-if (check_perms('admin_schedule')) {	
+if (check_perms('admin_schedule')) {
 	echo '<pre>';
 	View::show_footer();
 }
diff --git a/sections/staff/index.php b/sections/staff/index.php
index a312ccf9..f94c2c1d 100644
--- a/sections/staff/index.php
+++ b/sections/staff/index.php
@@ -105,7 +105,7 @@
 			</tr>
 <?
 		} // End new class header
-		
+
 		// Display staff members for this class
 		$Row = ($Row == 'a') ? 'b' : 'a';
 ?>
@@ -122,7 +122,7 @@
 			</tr>
 <?	} ?>
 		</table>
-		
+
 	</div>
 </div>
 <?
diff --git a/sections/staffblog/index.php b/sections/staffblog/index.php
index cd4374e1..fc7dc5a3 100644
--- a/sections/staffblog/index.php
+++ b/sections/staffblog/index.php
@@ -43,7 +43,7 @@
 				}
 				header('Location: staffblog.php');
 				break;
-		
+
 			case 'takenewblog':
 				authorize();
 				if (empty($_POST['title'])) {
@@ -55,9 +55,9 @@
 				$DB->query("INSERT INTO staff_blog (UserID, Title, Body, Time) VALUES ('$LoggedUser[ID]', '".db_string($_POST['title'])."', '".db_string($_POST['body'])."', NOW())");
 				$Cache->delete_value('staff_blog');
 				$Cache->delete_value('staff_blog_latest_time');
-				
+
 				send_irc("PRIVMSG ".ADMIN_CHAN." :!blog " . $_POST['title']);
-		
+
 				header('Location: staffblog.php');
 				break;
 		}
@@ -72,12 +72,12 @@
 				</span>
 			</div>
 			<form class="<?=((empty($_GET['action'])) ? 'create_form' : 'edit_form')?>" name="blog_post" action="staffblog.php" method="post">
-				<div id="postform" class="pad<?=($_REQUEST['action']!='editblog')?' hidden':''?>">	
+				<div id="postform" class="pad<?=($_REQUEST['action']!='editblog')?' hidden':''?>">
 					<input type="hidden" name="action" value="<?=((empty($_GET['action'])) ? 'takenewblog' : 'takeeditblog')?>" />
 					<input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
-	<? if(!empty($_GET['action']) && $_GET['action'] == 'editblog'){?> 
+	<? if(!empty($_GET['action']) && $_GET['action'] == 'editblog'){?>
 					<input type="hidden" name="blogid" value="<?=$BlogID; ?>" />
-	<? }?> 
+	<? }?>
 					<h3>Title</h3>
 					<input type="text" name="title" size="95" <? if(!empty($Title)) { echo 'value="'.display_str($Title).'"'; } ?> /><br />
 					<h3>Body</h3>
@@ -90,7 +90,7 @@
 			</form>
 		</div>
 		<br />
-<? 
+<?
 } else {
 	View::show_header('Staff Blog','bbcode');
 }
@@ -117,7 +117,7 @@
 			<div id="blog<?=$BlogID?>" class="box">
 				<div class="head">
 					<strong><?=$Title?></strong> - posted <?=time_diff($BlogTime);?> by <?=$Author?>
-		<? if(check_perms('admin_manage_blog')) { ?> 
+		<? if(check_perms('admin_manage_blog')) { ?>
 					- <a href="staffblog.php?action=editblog&amp;id=<?=$BlogID?>" class="brackets">Edit</a>
 					<a href="staffblog.php?action=deleteblog&amp;id=<?=$BlogID?>&amp;auth=<?=$LoggedUser['AuthKey']?>" onclick="return confirm('Do you want to delete this?')" class="brackets">Delete</a>
 		 <? } ?>
@@ -127,7 +127,7 @@
 				</div>
 			</div>
 		<br />
-<? 
+<?
 }
 ?>
 </div>
diff --git a/sections/staffpm/ajax_delete_response.php b/sections/staffpm/ajax_delete_response.php
index 30653bd1..f1c1b9e1 100644
--- a/sections/staffpm/ajax_delete_response.php
+++ b/sections/staffpm/ajax_delete_response.php
@@ -19,9 +19,9 @@
 }
 
 if ($ID = (int)$_POST['id']) {
-	$DB->query("DELETE FROM staff_pm_responses WHERE ID=$ID");	
+	$DB->query("DELETE FROM staff_pm_responses WHERE ID=$ID");
 	echo '1';
-		
+
 } else {
 	// No id
 	echo '-1';
diff --git a/sections/staffpm/ajax_edit_response.php b/sections/staffpm/ajax_edit_response.php
index a37add79..7f576813 100644
--- a/sections/staffpm/ajax_edit_response.php
+++ b/sections/staffpm/ajax_edit_response.php
@@ -40,7 +40,7 @@
 		// No id
 		echo '-2';
 	}
-	
+
 } else {
 	// No message/name
 	echo '-1';
diff --git a/sections/staffpm/ajax_get_response.php b/sections/staffpm/ajax_get_response.php
index b1562d7e..3f590bbc 100644
--- a/sections/staffpm/ajax_get_response.php
+++ b/sections/staffpm/ajax_get_response.php
@@ -28,7 +28,7 @@
 		$Text = new TEXT;
 		echo $Text->full_format($Message);
 	}
-	
+
 } else {
 	// No id
 	echo '-1';
diff --git a/sections/staffpm/assign.php b/sections/staffpm/assign.php
index b04d1c29..63a37b38 100644
--- a/sections/staffpm/assign.php
+++ b/sections/staffpm/assign.php
@@ -8,7 +8,7 @@
 	// FLS, check level of conversation
 	$DB->query("SELECT Level FROM staff_pm_conversations WHERE ID=$ConvID");
 	list($Level) = $DB->next_record;
-	
+
 	if ($Level == 0) {
 		// FLS conversation, assign to staff (moderator)
 		if(!empty($_GET['to'])) {
@@ -24,7 +24,7 @@
 					error(404);
 					break;
 			}
-			
+
 			$DB->query("UPDATE staff_pm_conversations SET Status='Unanswered', Level=".$Level." WHERE ID=$ConvID");
 			header('Location: staffpm.php');
 		} else {
@@ -34,16 +34,16 @@
 		// FLS trying to assign non-FLS conversation
 		error(403);
 	}
-	
+
 } elseif ($ConvID = (int)$_POST['convid']) {
 	// Staff (via ajax), get current assign of conversation
 	$DB->query("SELECT Level, AssignedToUser FROM staff_pm_conversations WHERE ID=$ConvID");
 	list($Level, $AssignedToUser) = $DB->next_record;
-	
+
 	if ($LoggedUser['EffectiveClass'] >= $Level || $AssignedToUser == $LoggedUser['ID']) {
 		// Staff member is allowed to assign conversation, assign
 		list($LevelType, $NewLevel) = explode("_", db_string($_POST['assign']));
-		
+
 		if ($LevelType == 'class') {
 			// Assign to class
 			$DB->query("UPDATE staff_pm_conversations SET Status='Unanswered', Level=$NewLevel, AssignedToUser=NULL WHERE ID=$ConvID");
@@ -53,18 +53,18 @@
 			if (!$Level) {
 				error("Assign to user not found.");
 			}
-			
+
 			// Assign to user
 			$DB->query("UPDATE staff_pm_conversations SET Status='Unanswered', AssignedToUser=$NewLevel, Level=$Level WHERE ID=$ConvID");
 			
 		}
 		echo '1';
-		
+
 	} else {
 		// Staff member is not allowed to assign conversation
 		echo '-1';
 	}
-	
+
 } else {
 	// No id
 	header('Location: staffpm.php');
diff --git a/sections/staffpm/common_responses.php b/sections/staffpm/common_responses.php
index 6c7f89fb..b3813fe1 100644
--- a/sections/staffpm/common_responses.php
+++ b/sections/staffpm/common_responses.php
@@ -37,15 +37,15 @@
 		<div id="response_new" class="box">
 			<form class="send_form" name="response" id="response_form_0" action="">
 				<div class="head">
-					<strong>Name:</strong> 
-					<input onfocus="if (this.value == 'New name') this.value='';" 
-						   onblur="if (this.value == '') this.value='New name';" 
-						   type="text" id="response_name_0" size="87" value="New name" 
+					<strong>Name:</strong>
+					<input onfocus="if (this.value == 'New name') this.value='';"
+						   onblur="if (this.value == '') this.value='New name';"
+						   type="text" id="response_name_0" size="87" value="New name"
 					/>
 				</div>
 				<div class="pad">
-					<textarea onfocus="if (this.value == 'New message') this.value='';" 
-							  onblur="if (this.value == '') this.value='New message';" 
+					<textarea onfocus="if (this.value == 'New message') this.value='';"
+							  onblur="if (this.value == '') this.value='New message';"
 							  rows="10" cols="87"
 							  id="response_message_0">New message</textarea>
 					<br />
@@ -63,7 +63,7 @@
 // List common responses
 $DB->query("SELECT ID, Message, Name FROM staff_pm_responses ORDER BY ID DESC");
 while(list($ID, $Message, $Name) = $DB->next_record()) {
-	
+
 ?>
 		<br />
 		<div id="ajax_message_<?=$ID?>" class="hidden center alertbar"></div>
@@ -71,7 +71,7 @@
 		<div id="response_<?=$ID?>" class="box">
 			<form class="send_form" name="response" id="response_form_<?=$ID?>" action="">
 				<div class="head">
-					<strong>Name:</strong> 
+					<strong>Name:</strong>
 					<input type="hidden" name="id" value="<?=$ID?>" />
 					<input type="text" name="name" id="response_name_<?=$ID?>" size="87" value="<?=display_str($Name)?>" />
 				</div>
@@ -88,7 +88,7 @@
 			</form>
 		</div>
 <?
-	
+
 }
 
 ?>
diff --git a/sections/staffpm/get_post.php b/sections/staffpm/get_post.php
index b29b51ca..bfc8172e 100644
--- a/sections/staffpm/get_post.php
+++ b/sections/staffpm/get_post.php
@@ -3,10 +3,10 @@
 /*********************************************************************\
 //--------------Get Post--------------------------------------------//
 
-This gets the raw BBCode of a post. It's used for editing and 
-quoting posts. 
+This gets the raw BBCode of a post. It's used for editing and
+quoting posts.
 
-It gets called if $_GET['action'] == 'get_post'. It requires 
+It gets called if $_GET['action'] == 'get_post'. It requires
 $_GET['post'], which is the ID of the post.
 
 \*********************************************************************/
@@ -21,14 +21,14 @@
 
 // Message is selected providing the user quoting is the guy who opened the PM or has
 // the right level
-$DB->query("SELECT m.Message, c.Level, c.UserID			
+$DB->query("SELECT m.Message, c.Level, c.UserID
 			FROM staff_pm_messages as m
 			JOIN staff_pm_conversations AS c ON m.ConvID=c.ID
 			WHERE m.ID='$PostID'");
 list($Message, $Level, $UserID) = $DB->next_record(MYSQLI_NUM);
 
 if (($LoggedUser['ID'] == $UserID) || ($IsFLS && $LoggedUser['Class'] >= $Level))  {
-	// This gets sent to the browser, which echoes it wherever 
+	// This gets sent to the browser, which echoes it wherever
 	echo trim($Message);
 } else {
 	error(403);
diff --git a/sections/staffpm/index.php b/sections/staffpm/index.php
index 02da29de..92d5ebc5 100644
--- a/sections/staffpm/index.php
+++ b/sections/staffpm/index.php
@@ -21,7 +21,7 @@
 $IsFLS = ($IsStaff || $LoggedUser['ExtraClasses'][41]);
 
 switch($_REQUEST['action']) {
-	case 'viewconv':	
+	case 'viewconv':
 		require('viewconv.php');
 		break;
 	case 'takepost':
diff --git a/sections/staffpm/makedonor.php b/sections/staffpm/makedonor.php
index 6d6cb680..1aca71f8 100644
--- a/sections/staffpm/makedonor.php
+++ b/sections/staffpm/makedonor.php
@@ -2,11 +2,11 @@
 	if (!is_number($_GET['id'])) {
 		error(404);
 	}
-	
+
 	if (!check_perms('users_give_donor')) {
 		error(403);
 	}
-	
+
 	$ConvID = (int)$_GET['id'];
 	$DB->query("SELECT c.Subject, c.UserID, c.Level, c.AssignedToUser, c.Unread, c.Status, u.Donor
 				FROM staff_pm_conversations AS c
@@ -16,14 +16,14 @@
 	if ($DB->record_count() == 0) {
 		error(404);
 	}
-	
+
 	$Message = "Thank for for helping to support the site.  It's users like you who make all of this possible.";
-	
+
 	if ((int)$Donor === 0) {
 		$Msg = db_string(sqltime() . ' - Donated: http://'.NONSSL_SITE_URL."/staffpm.php?action=viewconv&amp;id=$ConvID\n\n");
-		$DB->query("UPDATE users_info 
+		$DB->query("UPDATE users_info
 					SET Donor='1',
-						AdminComment = CONCAT('$Msg',AdminComment) 
+						AdminComment = CONCAT('$Msg',AdminComment)
 					WHERE UserID = $UserID");
 		$DB->query("UPDATE users_main SET Invites=Invites+2 WHERE ID = $UserID");
 
@@ -35,8 +35,8 @@
 	}
 	$DB->query("INSERT INTO staff_pm_messages (UserID, SentDate, Message, ConvID)
 				VALUES (".$LoggedUser['ID'].", '".sqltime()."', '".db_string($Message)."', $ConvID)");
-	$DB->query("UPDATE staff_pm_conversations 
-	               SET Date='".sqltime()."', Unread=true, 
+	$DB->query("UPDATE staff_pm_conversations
+	               SET Date='".sqltime()."', Unread=true,
 				       Status='Resolved', ResolverID=".$LoggedUser['ID']."
 				 WHERE ID=$ConvID");
 	header('Location: staffpm.php');
diff --git a/sections/staffpm/multiresolve.php b/sections/staffpm/multiresolve.php
index 63756dd3..c559158e 100644
--- a/sections/staffpm/multiresolve.php
+++ b/sections/staffpm/multiresolve.php
@@ -3,11 +3,11 @@
 	$Queries = array();
 	foreach ($IDs as &$ID) {
 		$ID = (int)$ID;
-		
+
 		// Check if conversation belongs to user
 		$DB->query("SELECT UserID, AssignedToUser FROM staff_pm_conversations WHERE ID=$ID");
 		list($UserID, $AssignedToUser) = $DB->next_record();
-		
+
 		if ($UserID == $LoggedUser['ID'] || $DisplayStaff == '1' || $UserID == $AssignedToUser) {
 			// Conversation belongs to user or user is staff, queue query
 			$Queries[] = "UPDATE staff_pm_conversations SET Status='Resolved', ResolverID=".$LoggedUser['ID']." WHERE ID=$ID";
@@ -16,7 +16,7 @@
 			error(403);
 		}
 	}
-	
+
 	// Run queries
 	foreach ($Queries as $Query) {
 		$DB->query($Query);
@@ -27,7 +27,7 @@
 
 	// Done! Return to inbox
 	header("Location: staffpm.php");
-	
+
 } else {
 	// No id
 	header("Location: staffpm.php");
diff --git a/sections/staffpm/resolve.php b/sections/staffpm/resolve.php
index 3fe11535..c7eba539 100644
--- a/sections/staffpm/resolve.php
+++ b/sections/staffpm/resolve.php
@@ -3,7 +3,7 @@
 	// Check if conversation belongs to user
 	$DB->query("SELECT UserID, AssignedToUser FROM staff_pm_conversations WHERE ID=$ID");
 	list($UserID, $AssignedToUser) = $DB->next_record();
-	
+
 	if ($UserID == $LoggedUser['ID'] || $IsFLS || $AssignedToUser == $LoggedUser['ID']) {
 		// Conversation belongs to user or user is staff, resolve it
 		$DB->query("UPDATE staff_pm_conversations SET Status='Resolved', ResolverID=".$LoggedUser['ID']." WHERE ID=$ID");
diff --git a/sections/staffpm/takepost.php b/sections/staffpm/takepost.php
index dc8039c4..bb6e3867 100644
--- a/sections/staffpm/takepost.php
+++ b/sections/staffpm/takepost.php
@@ -4,12 +4,12 @@
 		// New staff pm conversation
 		$Level = db_string($_POST['level']);
 		$DB->query("
-			INSERT INTO staff_pm_conversations 
+			INSERT INTO staff_pm_conversations
 				(Subject, Status, Level, UserID, Date)
 			VALUES
 				('$Subject', 'Unanswered', $Level, ".$LoggedUser['ID'].", '".sqltime()."')"
 		);
-		
+
 		// New message
 		$ConvID = $DB->inserted_id();
 		$DB->query("
@@ -18,16 +18,16 @@
 			VALUES
 				(".$LoggedUser['ID'].", '".sqltime()."', '$Message', $ConvID)"
 		);
-		
+
 		header('Location: staffpm.php');
-		
+
 	} elseif ($ConvID = (int)$_POST['convid']) {
 		// Check if conversation belongs to user
 		$DB->query("SELECT UserID, AssignedToUser FROM staff_pm_conversations WHERE ID=$ConvID");
 		list($UserID, $AssignedToUser) = $DB->next_record();
 		
-		
-		
+
+
 		if ($UserID == $LoggedUser['ID'] || $IsFLS || $UserID == $AssignedToUser) {
 			// Response to existing conversation
 			$DB->query("
@@ -36,7 +36,7 @@
 				VALUES
 					(".$LoggedUser['ID'].", '".sqltime()."', '$Message', $ConvID)"
 			);
-			
+
 			// Update conversation
 			if ($IsFLS) {
 				// FLS/Staff
@@ -50,22 +50,22 @@
 			// Clear cache for user
 			$Cache->delete_value('staff_pm_new_'.$UserID);
 			$Cache->delete_value('staff_pm_new_'.$LoggedUser['ID']);
-						
+
 			header("Location: staffpm.php?action=viewconv&id=$ConvID");
 		} else {
 			// User is trying to respond to conversation that does no belong to them
 			error(403);
 		}
-		
+
 	} else {
 		// Message but no subject or conversation id
 		header("Location: staffpm.php?action=viewconv&id=$ConvID");
-		
+
 	}
 } elseif ($ConvID = (int)$_POST['convid']) {
 	// No message, but conversation id
 	header("Location: staffpm.php?action=viewconv&id=$ConvID");
-	
+
 } else {
 	// No message or conversation id
 	header('Location: staffpm.php');
diff --git a/sections/staffpm/unresolve.php b/sections/staffpm/unresolve.php
index d91412a6..bca816be 100644
--- a/sections/staffpm/unresolve.php
+++ b/sections/staffpm/unresolve.php
@@ -3,8 +3,8 @@
 	// Check if conversation belongs to user
 	$DB->query("SELECT UserID, Level, AssignedToUser FROM staff_pm_conversations WHERE ID=$ID");
 	list($UserID, $Level, $AssignedToUser) = $DB->next_record();
-	
-	if ($UserID == $LoggedUser['ID'] || ($IsFLS && $Level == 0) || 
+
+	if ($UserID == $LoggedUser['ID'] || ($IsFLS && $Level == 0) ||
 	    $AssignedToUser == $LoggedUser['ID'] || ($IsStaff && $Level <= $LoggedUser['EffectiveClass'])) {
 		/*if($Level != 0 && $IsStaff == false)  {
 			error(403);
@@ -14,7 +14,7 @@
 		$DB->query("UPDATE staff_pm_conversations SET Status='Unanswered' WHERE ID=$ID");
 		// Clear cache for user
 		$Cache->delete_value('num_staff_pms_'.$LoggedUser['ID']);
-		
+
 		header('Location: staffpm.php');
 	} else {
 		// Conversation does not belong to user
diff --git a/sections/staffpm/user_inbox.php b/sections/staffpm/user_inbox.php
index ce0fd3dc..b1d0562d 100644
--- a/sections/staffpm/user_inbox.php
+++ b/sections/staffpm/user_inbox.php
@@ -7,16 +7,16 @@
 // Get messages
 $StaffPMs = $DB->query("
 	SELECT
-		ID, 
-		Subject, 
-		UserID, 
-		Status, 
-		Level, 
-		AssignedToUser, 
-		Date, 
+		ID,
+		Subject,
+		UserID,
+		Status,
+		Level,
+		AssignedToUser,
+		Date,
 		Unread
-	FROM staff_pm_conversations 
-	WHERE UserID=".$LoggedUser['ID']." 
+	FROM staff_pm_conversations
+	WHERE UserID=".$LoggedUser['ID']."
 	ORDER BY Status, Date DESC"
 );
 
@@ -73,7 +73,7 @@
 			</table>
 			<br />
 			<h3>Resolved messages</h3>
-			<table class="message_table checkboxes">	
+			<table class="message_table checkboxes">
 				<tr class="colhead">
 					<td width="10"><input type="checkbox" onclick="toggleChecks('messageform',this)" /></td>
 					<td width="50%">Subject</td>
@@ -87,7 +87,7 @@
 		$Assigned = ($Level == 0) ? "First Line Support" : $ClassLevels[$Level]['Name'];
 		// No + on Sysops
 		if ($Assigned != 'Sysop') { $Assigned .= "+"; }
-			
+
 		// Table row
 ?>
 				<tr class="<?=$RowClass?>">
diff --git a/sections/staffpm/viewconv.php b/sections/staffpm/viewconv.php
index f1ea5c4e..835ee207 100644
--- a/sections/staffpm/viewconv.php
+++ b/sections/staffpm/viewconv.php
@@ -215,9 +215,9 @@
 					<input type="submit" value="Send message" />
 <?	} else { ?>
 					<input type="button" value="Unresolve" onclick="location.href='staffpm.php?action=unresolve&amp;id=<?=$ConvID?>';" />
-<?	} 
+<?	}
 	if (check_perms('users_give_donor')) { ?>
-					<br />	
+					<br />
 					<input type="button" value="Make Donor" onclick="location.href='staffpm.php?action=make_donor&amp;id=<?=$ConvID?>';" />
 <?	} ?>
 				</form>
diff --git a/sections/stats/users.php b/sections/stats/users.php
index f17386f6..5b28709b 100644
--- a/sections/stats/users.php
+++ b/sections/stats/users.php
@@ -4,13 +4,13 @@
 	$DB->query('SELECT Code, Users FROM users_geodistribution');
 	$Data = $DB->to_array();
 	$Count = $DB->record_count()-1;
-	
+
 	if($Count<30) {
 		$CountryMinThreshold = $Count;
 	} else {
 		$CountryMinThreshold = 30;
 	}
-	
+
 	$CountryMax = ceil(log(Max(1,$Data[0][1]))/log(2))+1;
 	$CountryMin = floor(log(Max(1,$Data[$CountryMinThreshold][1]))/log(2));
 
@@ -29,7 +29,7 @@
 		}
 	}
 	reset($Rank);
-	
+
 	for ($i=$CountryMin;$i<=$CountryMax;$i++) {
 		$LogIncrements[] = Format::human_format(pow(2,$i));
 	}
diff --git a/sections/tools/data/database_specifics.php b/sections/tools/data/database_specifics.php
index b23c9c46..d20de4ab 100644
--- a/sections/tools/data/database_specifics.php
+++ b/sections/tools/data/database_specifics.php
@@ -107,7 +107,7 @@
 foreach ($Tables as $Table) {
 	list($Name,$Engine,,,$Rows,$RowSize,$DataSize,,$IndexSize) = $Table;
 	$Row = ($Row == 'a') ? 'b' : 'a';
-	
+
 	$TotalRows += $Rows;
 	$TotalDataSize += $DataSize;
 	$TotalIndexSize += $IndexSize;
diff --git a/sections/tools/data/donation_log.php b/sections/tools/data/donation_log.php
index 02e3aa05..37bca4ef 100644
--- a/sections/tools/data/donation_log.php
+++ b/sections/tools/data/donation_log.php
@@ -7,13 +7,13 @@
 list($Page,$Limit) = Format::page_limit(DONATIONS_PER_PAGE);
 
 
-$sql = "SELECT 
+$sql = "SELECT
 	SQL_CALC_FOUND_ROWS
-	d.UserID, 
-	d.Amount, 
-	d.Currency, 
-	d.Email, 
-	d.Time 
+	d.UserID,
+	d.Amount,
+	d.Currency,
+	d.Email,
+	d.Time
 	FROM donations AS d ";
 if(!empty($_GET['search'])) {
 	$sql .= "WHERE d.Email LIKE '%".db_string($_GET['search'])."%' ";
@@ -63,7 +63,7 @@
 					<input type="submit" value="Search donation log" />
 				</td>
 			</tr>
-		</table>	
+		</table>
 	</form>
 </div>
 <br />
diff --git a/sections/tools/data/economic_stats.php b/sections/tools/data/economic_stats.php
index 1077ae95..6ac091c3 100644
--- a/sections/tools/data/economic_stats.php
+++ b/sections/tools/data/economic_stats.php
@@ -2,7 +2,7 @@
 /*
 Tools necessary for economic management
 1. Current overall stats (!economy)
-2. Statistical traffic trends in a graph 
+2. Statistical traffic trends in a graph
 	a. All time  / 1 year (whichever is smaller)
 	b. 1 month
 	c. 1 week
diff --git a/sections/tools/data/invite_pool.php b/sections/tools/data/invite_pool.php
index 38c1f06d..b7660d29 100644
--- a/sections/tools/data/invite_pool.php
+++ b/sections/tools/data/invite_pool.php
@@ -16,7 +16,7 @@
 	$Search = "";
 }
 
-$sql = "SELECT 
+$sql = "SELECT
 	SQL_CALC_FOUND_ROWS
 	um.ID,
 	i.InviteKey,
@@ -51,7 +51,7 @@
 						<input type="submit" value="Search log" />
 					</td>
 				</tr>
-			</table>	
+			</table>
 		</form>
 	</div>
 	<div class="linkbox">
diff --git a/sections/tools/data/opcode_stats.php b/sections/tools/data/opcode_stats.php
index 6ceb4a33..605c46aa 100644
--- a/sections/tools/data/opcode_stats.php
+++ b/sections/tools/data/opcode_stats.php
@@ -18,7 +18,7 @@
 	}
 	if (function_exists('eaccelerator_optimizer')) {
 		if($_POST['optimize'] == 1) {
-		
+
 			authorize();
 
 			eaccelerator_optimizer(true);
@@ -26,7 +26,7 @@
 			eaccelerator_optimizer(false);
 		}
 	}
-	
+
 	if (isset($_POST['clear'])) {
 		authorize();
 		eaccelerator_clear();
@@ -85,7 +85,7 @@
 						<input type="submit" name="submit" value="Update" />
 					</td>
 				</tr>
-			</table>	
+			</table>
 		</form>
 	</div>
 	<br /><br />
diff --git a/sections/tools/data/registration_log.php b/sections/tools/data/registration_log.php
index d970e665..b11cd85c 100644
--- a/sections/tools/data/registration_log.php
+++ b/sections/tools/data/registration_log.php
@@ -5,7 +5,7 @@
 list($Page,$Limit) = Format::page_limit(USERS_PER_PAGE);
 
 
-$RS = $DB->query("SELECT 
+$RS = $DB->query("SELECT
 	SQL_CALC_FOUND_ROWS
 	m.ID,
 	m.IP,
@@ -32,12 +32,12 @@
 	ii.Donor,
 	ii.Warned,
 	ii.JoinDate,
-	(SELECT COUNT(h2.UserID) FROM users_history_ips AS h2 WHERE h2.IP=im.IP) AS InviterUses 
-	FROM users_main AS m 
+	(SELECT COUNT(h2.UserID) FROM users_history_ips AS h2 WHERE h2.IP=im.IP) AS InviterUses
+	FROM users_main AS m
 	LEFT JOIN users_info AS i ON i.UserID=m.ID
 	LEFT JOIN users_main AS im ON i.Inviter = im.ID
 	LEFT JOIN users_info AS ii ON i.Inviter = ii.UserID
-	WHERE i.JoinDate > '".time_minus(3600*24*3)."' 
+	WHERE i.JoinDate > '".time_minus(3600*24*3)."'
 	ORDER BY i.Joindate DESC LIMIT $Limit");
 $DB->query("SELECT FOUND_ROWS()");
 list($Results) = $DB->next_record();
diff --git a/sections/tools/data/service_stats.php b/sections/tools/data/service_stats.php
index 1a4545d9..720278ab 100644
--- a/sections/tools/data/service_stats.php
+++ b/sections/tools/data/service_stats.php
@@ -1,8 +1,8 @@
 <?
 if(!check_perms('site_debug')) { error(403); }
-if(isset($_POST['global_flush'])){ 
+if(isset($_POST['global_flush'])){
 	authorize();
-	$Cache->flush(); 
+	$Cache->flush();
 }
 $DB->query('SHOW GLOBAL STATUS');
 $DBStats =$DB->to_array('Variable_name');
diff --git a/sections/tools/data/suggestions.php b/sections/tools/data/suggestions.php
index 01541a4c..411d8e05 100644
--- a/sections/tools/data/suggestions.php
+++ b/sections/tools/data/suggestions.php
@@ -34,9 +34,9 @@
 		<td>Count</td>
 	</tr>
 	<?
-	$DB->query("SELECT 
-				s.UserID, count(s.ThreadID) AS C 
-				FROM marked_suggestions AS s 
+	$DB->query("SELECT
+				s.UserID, count(s.ThreadID) AS C
+				FROM marked_suggestions AS s
 				GROUP BY s.UserID ORDER BY c DESC LIMIT 15");
 	$Row = 'b';
 	while ( list ($UserID, $Count) = $DB->next_record() ) {
@@ -57,9 +57,9 @@
 		<td>Count</td>
 	</tr>
 	<?
-	$DB->query("SELECT 
-				LastPostAuthorID, count(LastPostAuthorID) AS C 
-				FROM forums_topics AS f 
+	$DB->query("SELECT
+				LastPostAuthorID, count(LastPostAuthorID) AS C
+				FROM forums_topics AS f
 				WHERE ForumID = 63 AND f.Title LIKE '[implemented]%'
 				GROUP BY LastPostAuthorID ORDER BY c DESC LIMIT 15");
 	$Row = 'b';
@@ -82,8 +82,8 @@
 	</tr>
 	<?
 	$DB->query("SELECT
-				LastPostAuthorID, count(LastPostAuthorID) AS C 
-				FROM forums_topics AS f 
+				LastPostAuthorID, count(LastPostAuthorID) AS C
+				FROM forums_topics AS f
 				WHERE ForumID = 63 AND f.Title LIKE '[rejected]%'
 				GROUP BY LastPostAuthorID ORDER BY c DESC LIMIT 15");
 	$Row = 'b';
diff --git a/sections/tools/data/torrent_stats.php b/sections/tools/data/torrent_stats.php
index 361e822f..8aa5063c 100644
--- a/sections/tools/data/torrent_stats.php
+++ b/sections/tools/data/torrent_stats.php
@@ -2,7 +2,7 @@
 if(!check_perms('site_view_flow')) { error(403); }
 View::show_header('Torrents');
 
-if (!$TorrentStats = $Cache->get_value('new_torrent_stats')) {	
+if (!$TorrentStats = $Cache->get_value('new_torrent_stats')) {
 	$DB->query("SELECT COUNT(ID), SUM(Size), SUM(FileCount) FROM torrents");
 	list($TorrentCount, $TotalSize, $TotalFiles) = $DB->next_record();
 	$DB->query("SELECT COUNT(ID) FROM users_main WHERE Enabled='1'");
diff --git a/sections/tools/data/upscale_pool.php b/sections/tools/data/upscale_pool.php
index 3e301462..563db3c4 100644
--- a/sections/tools/data/upscale_pool.php
+++ b/sections/tools/data/upscale_pool.php
@@ -4,7 +4,7 @@
 define('USERS_PER_PAGE', 50);
 list($Page,$Limit) = Format::page_limit(USERS_PER_PAGE);
 
-$RS = $DB->query("SELECT 
+$RS = $DB->query("SELECT
 	SQL_CALC_FOUND_ROWS
 	m.ID,
 	m.Username,
@@ -18,7 +18,7 @@
 	i.RatioWatchEnds,
 	i.RatioWatchDownload,
 	m.RequiredRatio
-	FROM users_main AS m 
+	FROM users_main AS m
 	LEFT JOIN users_info AS i ON i.UserID=m.ID
 	WHERE i.RatioWatchEnds != '0000-00-00 00:00:00'
 	AND m.Enabled = '1'
diff --git a/sections/tools/data/user_flow.php b/sections/tools/data/user_flow.php
index 50052f42..57daf3e7 100644
--- a/sections/tools/data/user_flow.php
+++ b/sections/tools/data/user_flow.php
@@ -119,7 +119,7 @@
 			<td>(+) Joined</td>
 			<td>(-) Manual</td>
 			<td>(-) Ratio</td>
-			<td>(-) Inactivity</td>			
+			<td>(-) Inactivity</td>
 			<td>(-) Total</td>
 			<td>Net Growth</td>
 		</tr>
diff --git a/sections/tools/index.php b/sections/tools/index.php
index 9e02b573..0e72ec11 100644
--- a/sections/tools/index.php
+++ b/sections/tools/index.php
@@ -89,7 +89,7 @@
 	case 'recommend_alter':
 		include('managers/recommend_alter.php');
 		break;
-		
+
 	case 'recommend_restore':
 		include('managers/recommend_restore.php');
 		break;
@@ -101,7 +101,7 @@
 	case 'eb_alter':
 		include('managers/eb_alter.php');
 		break;
-	
+
 	case 'eb_search':
 		include('managers/eb_search.php');
 		break;
@@ -150,15 +150,15 @@
 		if(!check_perms('admin_manage_news')){ error(403); }
 
 		$DB->query("INSERT INTO news (UserID, Title, Body, Time) VALUES ('$LoggedUser[ID]', '".db_string($_POST['title'])."', '".db_string($_POST['body'])."', '".sqltime()."')");
+
 		
-		
-		
+
 		$Cache->cache_value('news_latest_id', $DB->inserted_id(), 0);
 		$Cache->delete_value('news');
-		
+
 		header('Location: index.php');
 		break;
-		
+
 	case 'tokens':
 		include('managers/tokens.php');
 		break;
@@ -189,7 +189,7 @@
 					error(403);
 				}
 				$Values = unserialize($Values);
-			}		
+			}
 
 			if (!empty($_POST['submit'])) {
 				$Err = $Val->ValidateForm($_POST);
@@ -365,31 +365,31 @@
 	case 'sandbox2':
 		include('misc/sandbox2.php');
 		break;
-		
+
 	case 'sandbox3':
 		include('misc/sandbox3.php');
 		break;
-		
+
 	case 'sandbox4':
 		include('misc/sandbox4.php');
 		break;
-		
+
 	case 'sandbox5':
 		include('misc/sandbox5.php');
 		break;
-		
+
 	case 'sandbox6':
 		include('misc/sandbox6.php');
 		break;
-		
+
 	case 'sandbox7':
 		include('misc/sandbox7.php');
 		break;
-		
+
 	case 'sandbox8':
 		include('misc/sandbox8.php');
 		break;
-		
+
 	case 'public_sandbox':
 		include('misc/public_sandbox.php');
 		break;
diff --git a/sections/tools/managers/bans.php b/sections/tools/managers/bans.php
index c1fa511d..09254c6f 100644
--- a/sections/tools/managers/bans.php
+++ b/sections/tools/managers/bans.php
@@ -15,7 +15,7 @@
 		$Val->SetFields('notes', '1','string','You must include the reason for the ban.');
 		$Err=$Val->ValidateForm($_POST); // Validate the form
 		if($Err){ error($Err); }
-	
+
 		$Notes = db_string($_POST['notes']);
 		$Start = Tools::ip_to_unsigned($_POST['start']); //Sanitized by Validation regex
 		$End = Tools::ip_to_unsigned($_POST['end']); //See above
@@ -89,7 +89,7 @@
 					<input type="submit" value="Search" />
 				</td>
 			</tr>
-		</table>	
+		</table>
 	</form>
 </div>
 <br />
diff --git a/sections/tools/managers/dnu_alter.php b/sections/tools/managers/dnu_alter.php
index 1c42ca34..eef51699 100644
--- a/sections/tools/managers/dnu_alter.php
+++ b/sections/tools/managers/dnu_alter.php
@@ -24,7 +24,7 @@
 			Time='".sqltime()."'
 			WHERE ID='$P[id]'");
 	} else { //Create
-		$DB->query("INSERT INTO do_not_upload 
+		$DB->query("INSERT INTO do_not_upload
 			(Name, Comment, UserID, Time) VALUES
 			('$P[name]','$P[comment]','$LoggedUser[ID]','".sqltime()."')");
 	}
diff --git a/sections/tools/managers/eb.php b/sections/tools/managers/eb.php
index c4b77fb0..d466f335 100644
--- a/sections/tools/managers/eb.php
+++ b/sections/tools/managers/eb.php
@@ -13,7 +13,7 @@
 	eb.Time,
 	eb.Email,
 	eb.Comment
-	FROM email_blacklist AS eb 
+	FROM email_blacklist AS eb
 	ORDER BY eb.Time DESC LIMIT $Limit");
 $Results = $DB->to_array(false, MYSQLI_ASSOC, false);
 $DB->query("SELECT FOUND_ROWS()");
@@ -49,7 +49,7 @@
 		</form>
 	</tr>
 	<?
-	
+
 	foreach ($Results as $Result) {
 		?>
 	<tr>
diff --git a/sections/tools/managers/eb_alter.php b/sections/tools/managers/eb_alter.php
index 770f3f72..a399b2ed 100644
--- a/sections/tools/managers/eb_alter.php
+++ b/sections/tools/managers/eb_alter.php
@@ -24,7 +24,7 @@
 			Time='".sqltime()."'
 			WHERE ID='$P[id]'");
 	} else { //Create
-		$DB->query("INSERT INTO email_blacklist 
+		$DB->query("INSERT INTO email_blacklist
 			(Email, Comment, UserID, Time) VALUES
 			('$P[email]','$P[comment]','$LoggedUser[ID]','".sqltime()."')");
 	}
diff --git a/sections/tools/managers/eb_search.php b/sections/tools/managers/eb_search.php
index 62ef5217..132776a1 100644
--- a/sections/tools/managers/eb_search.php
+++ b/sections/tools/managers/eb_search.php
@@ -29,7 +29,7 @@
 
 if ($Count > 0) {
 	foreach ($EmailResults as $Email) {
-		$Emails[] = array("id" => (int) $Email['ID'], "email" => $Email['Email'], 
+		$Emails[] = array("id" => (int) $Email['ID'], "email" => $Email['Email'],
 						"comment" => $Email['Comment'], "userid" => (int) $Email['UserID'],
 						"time" => $Email['Time']);
 	}
diff --git a/sections/tools/managers/forum_list.php b/sections/tools/managers/forum_list.php
index 0190abf8..80f8b7d6 100644
--- a/sections/tools/managers/forum_list.php
+++ b/sections/tools/managers/forum_list.php
@@ -4,7 +4,7 @@ function class_list($Selected=0){
 	$Return = '';
 	foreach ($Classes as $ID => $Class) {
 		if ($Class['Secondary']) { continue; }
-		
+
 		$Name = $Class['Name'];
 		$Level = $Class['Level'];
 		$Return.='<option value="'.$Level.'"';
@@ -96,17 +96,17 @@ function class_list($Selected=0){
 			</td>
 			<td>
 				<select name="minclassread">
-					<?=class_list($MinClassRead)?> 
+					<?=class_list($MinClassRead)?>
 				</select>
 			</td>
 			<td>
 				<select name="minclasswrite">
-					<?=class_list($MinClassWrite)?> 
+					<?=class_list($MinClassWrite)?>
 				</select>
 			</td>
 			<td>
 				<select name="minclasscreate">
-					<?=class_list($MinClassCreate)?> 
+					<?=class_list($MinClassCreate)?>
 				</select>
 			</td>
 			<td>
@@ -119,7 +119,7 @@ function class_list($Selected=0){
 				<input type="submit" name="submit" value="Edit" />
 				<input type="submit" name="submit" value="Delete" />
 			</td>
-			
+
 		</form>
 	</tr>
 <?
@@ -151,17 +151,17 @@ function class_list($Selected=0){
 			</td>
 			<td>
 				<select name="minclassread">
-					<?=class_list()?> 
+					<?=class_list()?>
 				</select>
 			</td>
 			<td>
 				<select name="minclasswrite">
-					<?=class_list()?> 
+					<?=class_list()?>
 				</select>
 			</td>
 			<td>
 				<select name="minclasscreate">
-					<?=class_list()?> 
+					<?=class_list()?>
 				</select>
 			</td>
 			<td>
@@ -173,7 +173,7 @@ function class_list($Selected=0){
 			<td>
 				<input type="submit" value="Create" />
 			</td>
-			
+
 		</form>
 	</tr>
 </table>
diff --git a/sections/tools/managers/login_watch.php b/sections/tools/managers/login_watch.php
index 1c9d6c7f..ab6c09fd 100644
--- a/sections/tools/managers/login_watch.php
+++ b/sections/tools/managers/login_watch.php
@@ -8,7 +8,7 @@
 
 View::show_header('Login Watch');
 
-$DB->query('SELECT 
+$DB->query('SELECT
 	l.ID,
 	l.IP,
 	l.UserID,
@@ -50,7 +50,7 @@
 			</td>
 			<td>
 				<?=time_diff($BannedUntil)?>
-			</td>	
+			</td>
 			<td>
 				<form class="manage_form" name="bans" action="" method="post">
 					<input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
diff --git a/sections/tools/managers/news.php b/sections/tools/managers/news.php
index ab4285ae..7e0ffbe0 100644
--- a/sections/tools/managers/news.php
+++ b/sections/tools/managers/news.php
@@ -43,7 +43,7 @@
 			<br />
 			<h3>Body</h3>
 			<textarea name="body" cols="95" rows="15"><? if(!empty($Body)) { echo display_str($Body); } ?></textarea> <br /><br />
-						
+
 
 			<div class="center">
 				<input type="submit" value="<?= ($_GET['action'] == 'news')? 'Create news post' : 'Edit news post';?>" />
diff --git a/sections/tools/managers/ocelot.php b/sections/tools/managers/ocelot.php
index cbf4a75c..79318b39 100644
--- a/sections/tools/managers/ocelot.php
+++ b/sections/tools/managers/ocelot.php
@@ -1,11 +1,11 @@
 <?
 	$Key = $_REQUEST['key'];
 	$Type = $_REQUEST['type'];
-	
+
 	if (($Key != TRACKER_SECRET) || ($_SERVER['REMOTE_ADDR'] != TRACKER_HOST && $_SERVER['REMOTE_HOST'] != TRACKER_HOST)) {
 		error(403);
 	}
-	
+
 	switch ($Type) {
 		case 'expiretoken':
 			if (isset($_GET['tokens'])) {
diff --git a/sections/tools/managers/recommend_add.php b/sections/tools/managers/recommend_add.php
index 3a3ec067..de8f69be 100644
--- a/sections/tools/managers/recommend_add.php
+++ b/sections/tools/managers/recommend_add.php
@@ -27,7 +27,7 @@
 $GroupID=$Matches[1];
 
 if(empty($GroupID) || !is_number($GroupID)) {
-	 error(404); 
+	 error(404);
 }
 
 $DB->query("INSERT INTO torrents_recommended (GroupID, UserID, Time) VALUES ('".db_string($GroupID)."', $LoggedUser[ID], '".sqltime()."')");
diff --git a/sections/tools/managers/recommend_list.php b/sections/tools/managers/recommend_list.php
index 310e234c..d334717b 100644
--- a/sections/tools/managers/recommend_list.php
+++ b/sections/tools/managers/recommend_list.php
@@ -4,7 +4,7 @@
 }
 View::show_header('Recommendations');
 
-$DB->query("SELECT 
+$DB->query("SELECT
 	tr.GroupID,
 	tr.UserID,
 	tg.Name,
@@ -44,13 +44,13 @@
 ?>
 			<li>
 				<strong><?=Users::format_username($UserID, false, false, false)?></strong>
-<?		if($ArtistID){ ?> 
+<?		if($ArtistID){ ?>
 				- <a href="artist.php?id=<?=$ArtistID?>"><?=$ArtistName?></a>
-<?		} ?> 
+<?		} ?>
 				- <a href="torrents.php?id=<?=$GroupID?>"><?=$GroupName?></a>
 <?		if(check_perms('site_manage_recommendations') || $UserID == $LoggedUser['ID']){ ?>
 				<a href="tools.php?action=recommend_alter&amp;groupid=<?=$GroupID?>" class="brackets">Delete</a>
-<?		} ?> 
+<?		} ?>
 			</li>
 <?	} ?>
 		</ul>
diff --git a/sections/tools/managers/tokens.php b/sections/tools/managers/tokens.php
index 1f603307..30e93dd3 100644
--- a/sections/tools/managers/tokens.php
+++ b/sections/tools/managers/tokens.php
@@ -4,7 +4,7 @@
 if (isset($_REQUEST['addtokens'])) {
 	authorize();
 	$Tokens = $_REQUEST['numtokens'];
-	
+
 	if (!is_number($Tokens) || ($Tokens < 0)) {	error("Please enter a valid number of tokens."); }
 	$sql = "UPDATE users_main SET FLTokens = FLTokens + $Tokens WHERE Enabled = '1'";
 	if (!isset($_REQUEST['leechdisabled'])) {
@@ -23,9 +23,9 @@
 } elseif (isset($_REQUEST['cleartokens'])) {
 	authorize();
 	$Tokens = $_REQUEST['numtokens'];
-	
+
 	if (!is_number($Tokens) || ($Tokens < 0)) {	error("Please enter a valid number of tokens."); }
-	
+
 	if (isset($_REQUEST['onlydrop'])) {
 		$Where = "WHERE FLTokens > $Tokens";
 	} elseif (!isset($_REQUEST['leechdisabled'])) {
@@ -36,12 +36,12 @@
 	$DB->query("SELECT ID FROM users_main $Where");
 	$Users = $DB->to_array();
 	$DB->query("UPDATE users_main SET FLTokens = $Tokens $Where");
-	
+
 	foreach ($Users as $UserID) {
 		list($UserID) = $UserID;
 		$Cache->delete_value('user_info_heavy_'.$UserID);
 	}
-	
+
 	$where = "";
 }
 
diff --git a/sections/tools/managers/whitelist_alter.php b/sections/tools/managers/whitelist_alter.php
index b6dbbd3b..57662bcb 100644
--- a/sections/tools/managers/whitelist_alter.php
+++ b/sections/tools/managers/whitelist_alter.php
@@ -9,18 +9,18 @@
 	if(!is_number($_POST['id']) || $_POST['id'] == ''){
 		error("1");
 	}
-	
+
 	$DB->query("SELECT peer_id FROM xbt_client_whitelist WHERE id = ".$_POST['id']);
 	list($PeerID) = $DB->next_record();
 	$DB->query('DELETE FROM xbt_client_whitelist WHERE id='.$_POST['id']);
 	Tracker::update_tracker('remove_whitelist', array('peer_id' => $PeerID));
 } else { //Edit & Create, Shared Validation
-	
+
 	if(empty($_POST['client']) || empty($_POST['peer_id'])) {
 		print_r($_POST);
 		die();
 	}
-	
+
 	$Client = db_string($_POST['client']);
 	$PeerID = db_string($_POST['peer_id']);
 
@@ -38,7 +38,7 @@
 		}
 	} else { //Create
 		$DB->query("INSERT INTO xbt_client_whitelist
-			(vstring, peer_id) 
+			(vstring, peer_id)
 		VALUES
 			('".$Client."','".$PeerID."')");
 		Tracker::update_tracker('add_whitelist', array('peer_id' => $PeerID));
diff --git a/sections/tools/managers/whitelist_list.php b/sections/tools/managers/whitelist_list.php
index 7f0bcb45..cc4684cd 100644
--- a/sections/tools/managers/whitelist_list.php
+++ b/sections/tools/managers/whitelist_list.php
@@ -46,8 +46,8 @@
 		<tr class="colhead">
 			<td colspan="4">Add Client</td>
 		</tr>
-		<tr class="rowa">		
-			
+		<tr class="rowa">
+
 			<td>
 				<input type="text" size="100" name="client" />
 			</td>
diff --git a/sections/tools/misc/create_user.php b/sections/tools/misc/create_user.php
index caf002d8..2fb4fb2b 100644
--- a/sections/tools/misc/create_user.php
+++ b/sections/tools/misc/create_user.php
@@ -13,7 +13,7 @@
 	$Username = $_POST['Username'];
 	$Email = $_POST['Email'];
 	$Password = $_POST['Password'];
-	
+
 	//Make sure all the fields are filled in
 	if (!empty($Username) && !empty($Email) && !empty($Password)) {
 
@@ -23,53 +23,53 @@
 
 		//Create the account
 		$DB->query("INSERT INTO users_main (Username,Email,PassHash,torrent_pass,Enabled,PermissionID, Language) VALUES ('".db_string($Username)."','".db_string($Email)."','".db_string(Users::make_crypt_hash($Password))."','".db_string($torrent_pass)."','1','".USER."', 'en')");
-		
+
 		//Increment site user count
 		$Cache->increment('stats_user_count');
-		
+
 		//Grab the userid
 		$UserID=$DB->inserted_id();
-		
+
 		Tracker::update_tracker('add_user', array('id' => $UserID, 'passkey' => $torrent_pass));
 
 		//Default stylesheet
 		$DB->query("SELECT ID FROM stylesheets");
 		list($StyleID)=$DB->next_record();
-		
+
 		//Auth key
 		$AuthKey = Users::make_secret();
-		
+
 		//Give them a row in users_info
-		$DB->query("INSERT INTO users_info 
-		(UserID,StyleID,AuthKey,JoinDate) VALUES 
+		$DB->query("INSERT INTO users_info
+		(UserID,StyleID,AuthKey,JoinDate) VALUES
 		('".db_string($UserID)."','".db_string($StyleID)."','".db_string($AuthKey)."', '".sqltime()."')");
-		
+
 		//Redirect to users profile
 		header ("Location: user.php?id=".$UserID);
-	
+
 	//What to do if we don't have a username, email, or password
 	} elseif (empty($Username)) {
-	
+
 		//Give the Error -- We do not have a username
 		error("Please supply a username");
-		
+
 	} elseif (empty($Email)) {
-	
+
 		//Give the Error -- We do not have an email address
 		error("Please supply an email address");
-		
+
 	} elseif (empty($Password)) {
-	
+
 		//Give the Error -- We do not have a password
 		error("Please supply a password");
-	
+
 	} else {
-	
+
 		//Uh oh, something went wrong
 		error("Unknown error");
-	
+
 	}
-	
+
 //Form wasn't sent -- Show form
 } else {
 
@@ -77,7 +77,7 @@
 	<div class="header">
 		<h2>Create a User</h2>
 	</div>
-	
+
 	<form class="create_form" name="user" method="post" action="">
 		<input type="hidden" name="action" value="create_user" />
 		<input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
diff --git a/sections/tools/misc/dupe_ip.php b/sections/tools/misc/dupe_ip.php
index ad060752..7a177e80 100644
--- a/sections/tools/misc/dupe_ip.php
+++ b/sections/tools/misc/dupe_ip.php
@@ -6,7 +6,7 @@
 list($Page,$Limit) = Format::page_limit(USERS_PER_PAGE);
 
 
-$RS = $DB->query("SELECT 
+$RS = $DB->query("SELECT
 	SQL_CALC_FOUND_ROWS
 	m.ID,
 	m.IP,
@@ -17,7 +17,7 @@
 	i.Warned,
 	i.JoinDate,
 	(SELECT COUNT(DISTINCT h.UserID) FROM users_history_ips AS h WHERE h.IP=m.IP) AS Uses
-	FROM users_main AS m 
+	FROM users_main AS m
 	LEFT JOIN users_info AS i ON i.UserID=m.ID
 	WHERE (SELECT COUNT(DISTINCT h.UserID) FROM users_history_ips AS h WHERE h.IP=m.IP) >= ".IP_OVERLAPS."
 	AND m.Enabled = '1'
diff --git a/sections/tools/misc/manipulate_tree.php b/sections/tools/misc/manipulate_tree.php
index 92bf36e2..363d929b 100644
--- a/sections/tools/misc/manipulate_tree.php
+++ b/sections/tools/misc/manipulate_tree.php
@@ -1,9 +1,9 @@
 <?
 //Props to Leto of StC.
 if (
-	!check_perms('users_view_invites') && 
-	!check_perms('users_disable_users') && 
-	!check_perms('users_edit_invites') && 
+	!check_perms('users_view_invites') &&
+	!check_perms('users_disable_users') &&
+	!check_perms('users_edit_invites') &&
 	!check_perms('users_disable_any')
 ) { error(404); }
 View::show_header("Manipulate Invite Tree");
@@ -12,16 +12,16 @@
 	authorize();
 
 	if(!is_number($_POST['id'])) { error(403); }
-	if(!$_POST['comment']) { error('Please enter a comment to add to the users affected.'); 
+	if(!$_POST['comment']) { error('Please enter a comment to add to the users affected.');
 	} else { $Comment = db_string($_POST['comment']); }
 	$UserID = $_POST['id'];
-	$DB->query("SELECT 
-		t1.TreePosition, 
-		t1.TreeID, 
-		t1.TreeLevel, 
-		(SELECT 
-			t2.TreePosition FROM invite_tree AS t2 
-			WHERE TreeID=t1.TreeID AND TreeLevel=t1.TreeLevel AND t2.TreePosition>t1.TreePosition 
+	$DB->query("SELECT
+		t1.TreePosition,
+		t1.TreeID,
+		t1.TreeLevel,
+		(SELECT
+			t2.TreePosition FROM invite_tree AS t2
+			WHERE TreeID=t1.TreeID AND TreeLevel=t1.TreeLevel AND t2.TreePosition>t1.TreePosition
 			ORDER BY TreePosition LIMIT 1
 		) AS MaxPosition
 		FROM invite_tree AS t1
@@ -30,14 +30,14 @@
 	if(!$MaxPosition){ $MaxPosition = 1000000; } // $MaxPermission is null if the user is the last one in that tree on that level
 	if(!$TreeID){ return; }
 		$DB->query("
-			SELECT 
+			SELECT
 			UserID
 			FROM invite_tree
 			WHERE TreeID=$TreeID
 			AND TreePosition>$TreePosition
 			AND TreePosition<$MaxPosition
 			AND TreeLevel>$TreeLevel
-			ORDER BY TreePosition");		
+			ORDER BY TreePosition");
 	$BanList = array();
 
 	while(list($Invitee) = $DB->next_record()) {
@@ -73,7 +73,7 @@
 					SET Enabled='2'
 					WHERE ID='".$InviteeID."'");
 			$Msg = "Successfully banned entire invite tree!";
-		} elseif ($_POST['perform']=='inviteprivs') { //DisableInvites =1 
+		} elseif ($_POST['perform']=='inviteprivs') { //DisableInvites =1
 			$DB->query("UPDATE
 					users_info
 					SET DisableInvites='1'
diff --git a/sections/tools/misc/update_geoip.php b/sections/tools/misc/update_geoip.php
index 6f78bab2..d1756d75 100644
--- a/sections/tools/misc/update_geoip.php
+++ b/sections/tools/misc/update_geoip.php
@@ -102,7 +102,7 @@
 
 			$Start = Tools::ip_to_unsigned($Matches[2]);
 			if($Start == 2147483647) { continue; }
-			
+
 			if (!isset($Current)) {
 				$Current = array('StartIP' => $Start, 'EndIP' => $Start + $Matches[3],'Code' => $Matches[1]);
 			} elseif ($Current['Code'] == $Matches[1] && $Current['EndIP'] == $Start) {
diff --git a/sections/tools/tools.php b/sections/tools/tools.php
index 9ae07623..6c1a0f83 100644
--- a/sections/tools/tools.php
+++ b/sections/tools/tools.php
@@ -91,7 +91,7 @@
 			<tr><td><a href="tools.php?action=sandbox8">Sandbox (8)</a></td></tr>
 
 			<tr><td><a href="schedule.php?auth=<?=$LoggedUser['AuthKey']?>">Schedule</a></td></tr>
-<? }?>	
+<? }?>
 			<tr><td><strong><a href="tools.php?action=public_sandbox">Public Sandbox</a></strong></td></tr>
 <? if (check_perms('users_mod')) { ?>
 			<tr><td><strong><a href="tools.php?action=mod_sandbox">Mod level Sandbox</a></strong></td></tr>
diff --git a/sections/torrents/add_alias.php b/sections/torrents/add_alias.php
index 13baaef6..eafc0cc1 100644
--- a/sections/torrents/add_alias.php
+++ b/sections/torrents/add_alias.php
@@ -15,11 +15,11 @@
 for ($i = 0; $i < count($AliasNames); $i++) {
 	$AliasName = Artists::normalise_artist_name($AliasNames[$i]);
 	$Importance = $Importances[$i];
-	
+
 	if ($Importance!='1' && $Importance!='2' && $Importance!='3' && $Importance!='4' && $Importance!='5' && $Importance!='6' && $Importance!='7') {
 		break;
 	}
-	
+
 	if (strlen($AliasName) > 0) {
 		$DB->query("SELECT AliasID, ArtistID, Redirect, Name FROM artists_alias WHERE Name = '".db_string($AliasName)."'");
 		while (list($AliasID, $ArtistID, $Redirect, $FoundAliasName) = $DB->next_record(MYSQLI_NUM, false)) {
@@ -37,29 +37,29 @@
 			$DB->query("INSERT INTO artists_alias (ArtistID, Name) VALUES ('$ArtistID', '$AliasName')");
 			$AliasID = $DB->inserted_id();
 		}
-		
+
 		$DB->query("SELECT Name FROM torrents_group WHERE ID=".$GroupID);
 		list($GroupName) = $DB->next_record(MYSQLI_NUM, false);
 
 		$DB->query("SELECT Name FROM artists_group WHERE ArtistID=".$ArtistID);
 		list($ArtistName) = $DB->next_record(MYSQLI_NUM, false);
-		
-		
-		$DB->query("INSERT IGNORE INTO torrents_artists 
-		(GroupID, ArtistID, AliasID, Importance, UserID) VALUES 
+
+
+		$DB->query("INSERT IGNORE INTO torrents_artists
+		(GroupID, ArtistID, AliasID, Importance, UserID) VALUES
 		('$GroupID', '$ArtistID', '$AliasID', '$Importance', '$UserID')");
-		
+
 		if ($DB->affected_rows()) {
 			$Changed = true;
-			$DB->query("INSERT INTO torrents_group (ID, NumArtists) 
-					SELECT ta.GroupID, COUNT(ta.ArtistID) 
-					FROM torrents_artists AS ta 
-					WHERE ta.GroupID='$GroupID' 
+			$DB->query("INSERT INTO torrents_group (ID, NumArtists)
+					SELECT ta.GroupID, COUNT(ta.ArtistID)
+					FROM torrents_artists AS ta
+					WHERE ta.GroupID='$GroupID'
 					AND ta.Importance='1'
-					GROUP BY ta.GroupID 
-				ON DUPLICATE KEY UPDATE 
+					GROUP BY ta.GroupID
+				ON DUPLICATE KEY UPDATE
 				NumArtists=VALUES(NumArtists);");
-			
+
 			Misc::write_log("Artist ".$ArtistID." (".$ArtistName.") was added to the group ".$GroupID." (".$GroupName.") as ".$ArtistTypes[$Importance]." by user ".$LoggedUser['ID']." (".$LoggedUser['Username'].")");
 			Torrents::write_group_log($GroupID, 0, $LoggedUser['ID'], "added artist ".$ArtistName." as ".$ArtistTypes[$Importance], 0);
 		}
diff --git a/sections/torrents/add_tag.php b/sections/torrents/add_tag.php
index e8332f9d..004ece90 100644
--- a/sections/torrents/add_tag.php
+++ b/sections/torrents/add_tag.php
@@ -20,7 +20,7 @@
 		// Check DB for tag matching name
 		$DB->query("SELECT t.ID FROM tags AS t WHERE t.Name LIKE '".$TagName."'");
 		list($TagID) = $DB->next_record();
-	
+
 		if(!$TagID) { // Tag doesn't exist yet - create tag
 			$DB->query("INSERT INTO tags (Name, UserID) VALUES ('".$TagName."', ".$UserID.")");
 			$TagID = $DB->inserted_id();
@@ -33,14 +33,14 @@
 		}
 
 		
-	
-		$DB->query("INSERT INTO torrents_tags 
-			(TagID, GroupID, PositiveVotes, UserID) VALUES 
-			('$TagID', '$GroupID', '3', '$UserID') 
+
+		$DB->query("INSERT INTO torrents_tags
+			(TagID, GroupID, PositiveVotes, UserID) VALUES
+			('$TagID', '$GroupID', '3', '$UserID')
 			ON DUPLICATE KEY UPDATE PositiveVotes=PositiveVotes+2");
-	
+
 		$DB->query("INSERT INTO torrents_tags_votes (GroupID, TagID, UserID, Way) VALUES ('$GroupID', '$TagID', '$UserID', 'up')");
-		
+
 		$DB->query("INSERT INTO group_log (GroupID, UserID, Time, Info)
 					VALUES ('$GroupID',".$LoggedUser['ID'].",'".sqltime()."','".db_string('Tag "'.$TagName.'" added to group')."')");
 	}
diff --git a/sections/torrents/browse.php b/sections/torrents/browse.php
index 240bd0f4..8d0ea3a9 100644
--- a/sections/torrents/browse.php
+++ b/sections/torrents/browse.php
@@ -2,15 +2,15 @@
 /************************************************************************
 *-------------------- Browse page ---------------------------------------
 * Welcome to one of the most complicated pages in all of gazelle - the
-* browse page. 
-* 
+* browse page.
+*
 * This is the page that is displayed when someone visits torrents.php, if
 * you're not using sphinx.
-* 
+*
 * It also handle snatch lists, and seeding/leeching/uploaded lists.
-* 
+*
 * It offers normal and advanced search, as well as enabled/disabled
-* grouping. 
+* grouping.
 *
 * For the Sphinx version, see sections/torrents/browse2.php
 *
@@ -47,7 +47,7 @@ function build_search($SearchStr,$Field,$Exact=false,$SQLWhere='',$FullText=0,&$
 			if(trim($SearchVal)!='') {
 				$SearchVal=trim($SearchVal);
 				$SearchVal=str_replace("{{SPACE}}"," ",$SearchVal);
-				
+
 				// Choose between fulltext or LIKE based off length of the string
 				if ($FullText && strlen($SearchVal)>2) {
 					if($SQLWhere!='') { $SQLWhere.=" AND "; }
@@ -91,7 +91,7 @@ function header_link($SortKey,$DefaultWay="DESC") {
 		if($OrderWay=="DESC") { $NewWay="ASC"; }
 		else { $NewWay="DESC"; }
 	} else { $NewWay=$DefaultWay; }
-	
+
 	return "torrents.php?order_way=".$NewWay."&amp;order_by=".$SortKey."&amp;".Format::get_url(array('order_way','order_by'));
 }
 
@@ -145,7 +145,7 @@ function header_link($SortKey,$DefaultWay="DESC") {
 // Uploaded, seeding, leeching, snatched lists
 if($_GET['userid'] && is_number($_GET['userid'])) {
 	$UserID=ceil($_GET['userid']);
-	
+
 	$DB->query("SELECT m.Paranoia, p.Level FROM users_main AS m JOIN permissions AS p ON p.ID=m.PermissionID WHERE ID='".$UserID."'");
 	list($Paranoia, $UserClass) = $DB->next_record();
 
@@ -155,28 +155,28 @@ function header_link($SortKey,$DefaultWay="DESC") {
 		if(!check_paranoia('uploads', $Paranoia, $UserClass, $UserID)) { error(403); }
 		$TorrentWhere="WHERE t.UserID='".$UserID."'";
 		$Title="Uploaded Torrents";
-		
+
 	} elseif($_GET['type']=="seeding") {
 		if(!check_paranoia('seeding', $Paranoia, $UserClass, $UserID)) { error(403); }
 		$TorrentJoin="JOIN xbt_files_users AS xfu ON xfu.fid=t.ID AND xfu.uid='$UserID' AND xfu.remaining=0";
 		$Title="Seeding Torrents";
 		$TimeField="xfu.mtime";
 		$TimeLabel="Seeding Time";
-		
+
 	} elseif($_GET['type']=="leeching") {
 		if(!check_paranoia('leeching', $Paranoia, $UserClass, $UserID)) { error(403); }
 		$TorrentJoin="JOIN xbt_files_users AS xfu ON xfu.fid=t.ID AND xfu.uid='$UserID' AND xfu.remaining>0";
 		$Title="Leeching Torrents";
 		$TimeField="xfu.mtime";
 		$TimeLabel="Leeching Time";
-		
+
 	} elseif($_GET['type']=="snatched") {
 		if(!check_paranoia('snatched', $Paranoia, $UserClass, $UserID)) { error(403); }
 		$TorrentJoin="JOIN xbt_snatched AS xs ON xs.fid=t.ID AND xs.uid='$UserID'";
 		$Title="Snatched Torrents";
 		$TimeField="xs.tstamp";
 		$TimeLabel="Snatched Time";
-		
+
 	} else {
 		// Something fishy in $_GET['type']
 		unset($UserID);
@@ -213,11 +213,11 @@ function header_link($SortKey,$DefaultWay="DESC") {
 			}
 		}
 		reset($_GET);
-		
+
 	} else {
 		$TorrentSpecifics=1;
 	}
-	
+
 	// And now we start building the mega SQL query
 	if($_GET['artistname']!='') {
 			$TorrentJoin .= ' LEFT JOIN torrents_artists AS ta ON g.ID = ta.GroupID LEFT JOIN artists AS a ON ta.ArtistID = a.ID';
@@ -259,9 +259,9 @@ function header_link($SortKey,$DefaultWay="DESC") {
 				if($_GET['other_bitrate']!='') {
 					$GroupWhere=build_search(db_string($_GET['other_bitrate']),'EncodingList',false,$GroupWhere);
 					if($TorrentSpecifics>0) {
-						if($TorrentWhere=='') { 
+						if($TorrentWhere=='') {
 							$TorrentWhere="WHERE ";
-						} else { 
+						} else {
 							$TorrentWhere.=" AND ";
 						}
 					}
@@ -270,9 +270,9 @@ function header_link($SortKey,$DefaultWay="DESC") {
 			} else {
 				$GroupWhere=build_search(db_string($_GET['bitrate']),'EncodingList',false,$GroupWhere);
 				if($TorrentSpecifics>0) {
-					if($TorrentWhere=='') { 
+					if($TorrentWhere=='') {
 						$TorrentWhere="WHERE ";
-					} else { 
+					} else {
 						$TorrentWhere.=" AND ";
 					}
 					$TorrentWhere.="t.Encoding LIKE '".db_string($_GET['bitrate'])."'";
@@ -307,7 +307,7 @@ function header_link($SortKey,$DefaultWay="DESC") {
 			$GroupWhere=build_search($_GET['haslog'],'LogScoreList',false,$GroupWhere);
 			$HasLog = 1;
 		}
-		
+
 		$GroupWhere=build_search("%".$HasLog."%",'LogList',true,$GroupWhere);
 		if($TorrentSpecifics>0) {
 			if($_GET['haslog'] == '100' || $_GET['haslog'] == '-100') {
@@ -372,7 +372,7 @@ function header_link($SortKey,$DefaultWay="DESC") {
 // Searching tags is the same for basic and advanced search
 if(isset($_GET['searchtags']) && $_GET['searchtags']!='') {
 	if($DisableGrouping) { $TagField="g.TagList"; } else { $TagField="h.TagList"; }
-	
+
 	$Tags=explode(',',$_GET['searchtags']);
 	foreach($Tags as $Key => $Tag) {
 		if(trim($Tag)!='') {
@@ -511,7 +511,7 @@ function header_link($SortKey,$DefaultWay="DESC") {
 					$TorrentWhere
 					ORDER BY $OrderBy $OrderWay
 					LIMIT $Limit");
-					
+
 		$TorrentList=$DB->to_array();
 		if(EXPLAIN_HACK){
 			$DB->query("EXPLAIN SELECT NULL FROM (SELECT NULL FROM torrent_hash AS h ".$TorrentJoin." ".$GroupWhere.") AS Count");
@@ -533,7 +533,7 @@ function header_link($SortKey,$DefaultWay="DESC") {
 	$TorrentList=$TorrentCache[1];
 	if($UserID) { $TitleUser=$TorrentCache[2]; }
 }
- 
+
  // List of pages
 $Pages=Format::get_pages($Page,$TorrentCount,TORRENTS_PER_PAGE);
 
@@ -600,15 +600,15 @@ function header_link($SortKey,$DefaultWay="DESC") {
 		} else {
 			$OtherBitrate = false;
 		}
-		
+
 foreach($Bitrates as $BitrateName) { ?>
 						<option value="<?=display_str($BitrateName); ?>" <? if($BitrateName==$_GET['bitrate']) { ?>selected="selected"<? } ?>><?=display_str($BitrateName); ?></option>
 <?	} ?>			</select>
-					
+
 					<span id="other_bitrate_span"<? if(!$OtherBitrate){ echo " style='display: none;'"; } ?> >
 						<input type="text" spellcheck="false" name="other_bitrate" size="5" id="other_bitrate"<? if($OtherBitrate){ echo " value='".display_str($_GET['other_bitrate'])."'";} ?> />
 					</span>
-					
+
 					<select name="format" style="width:auto;">
 						<option value="">Format</option>
 <?	foreach($Formats as $FormatName) { ?>
@@ -896,7 +896,7 @@ function header_link($SortKey,$DefaultWay="DESC") {
 			$Row = 'a';
 			foreach($Torrents['id'] as $Key => $Val) {
 				// All of the individual torrents in the group
-				
+
 				// If they're using the advanced search and have chosen enabled grouping, we just skip the torrents that don't check out
 				if(!empty($_GET['bitrate']) && $Torrents['encoding'][$Key]!=$_GET['bitrate']) { continue; }
 				if(!empty($_GET['format']) && $Torrents['format'][$Key]!=$_GET['format']) { continue; }
@@ -909,7 +909,7 @@ function header_link($SortKey,$DefaultWay="DESC") {
 						continue;
 					}
 					if(($_GET['haslog'] == '1' || $_GET['haslog'] == '0') && $Torrents['log'][$Key]!=$_GET['haslog']) {
-						continue; 
+						continue;
 					}
 				}
 				if(!empty($_GET['hascue']) && $Torrents['cue'][$Key]!=$_GET['hascue']) { continue; }
@@ -932,10 +932,10 @@ function header_link($SortKey,$DefaultWay="DESC") {
 						continue;
 					}
 				}
-				
+
 				$ExtraInfo='';
 				$AddExtra='';
-				
+
 				if($Torrents['format'][$Key]) 		{ $ExtraInfo.=$Torrents['format'][$Key]; $AddExtra=" / "; }
 				if($Torrents['encoding'][$Key]) 	{ $ExtraInfo.=$AddExtra.$Torrents['encoding'][$Key]; $AddExtra=" / "; }
 				if($Torrents['log'][$Key]=="1") 	{
@@ -991,7 +991,7 @@ function header_link($SortKey,$DefaultWay="DESC") {
 			if($Torrents['freetorrent'][0]=="1") 	{ $ExtraInfo.=$AddExtra. Format::torrent_label('Freeleech!'); $AddExtra=" / "; }
 			if($ExtraInfo!='') 			{ $ExtraInfo="[".$ExtraInfo."]"; }
 			if($GroupYear>0) 			{ $ExtraInfo.=" [".$GroupYear."]"; }
-			
+
 			if (!isset($TimeField) || $TimeField=="t.Time") { $GroupTime=strtotime($GroupTime); }
 ?>
 	<tr class="torrent">
@@ -1018,12 +1018,12 @@ function header_link($SortKey,$DefaultWay="DESC") {
 ?>
 </table>
 <? } else {
-$DB->query("SELECT 
+$DB->query("SELECT
 	tags.Name,
 	((COUNT(tags.Name)-2)*(SUM(tt.PositiveVotes)-SUM(tt.NegativeVotes)))/(tags.Uses*0.8) AS Score
-	FROM xbt_snatched AS s 
-	INNER JOIN torrents AS t ON t.ID=s.fid 
-	INNER JOIN torrents_group AS g ON t.GroupID=g.ID 
+	FROM xbt_snatched AS s
+	INNER JOIN torrents AS t ON t.ID=s.fid
+	INNER JOIN torrents_group AS g ON t.GroupID=g.ID
 	INNER JOIN torrents_tags AS tt ON tt.GroupID=g.ID
 	INNER JOIN tags ON tags.ID=tt.TagID
 	WHERE s.uid='$LoggedUser[ID]'
diff --git a/sections/torrents/delete.php b/sections/torrents/delete.php
index 774fff26..0bd1cb8f 100644
--- a/sections/torrents/delete.php
+++ b/sections/torrents/delete.php
@@ -106,11 +106,11 @@
 	if($DB->record_count() < 1) {
 		die();
 	}
-	list($GroupName, $GroupID, $ArtistID, $ArtistName, $Year, $CategoryID, $Time, $Remastered, $RemasterTitle, 
+	list($GroupName, $GroupID, $ArtistID, $ArtistName, $Year, $CategoryID, $Time, $Remastered, $RemasterTitle,
 		$RemasterYear, $Media, $Format, $Encoding, $Size, $HasLog, $LogScore, $UploaderID, $UploaderName) = $DB->next_record();
-	
+
 	$Type = 'dupe'; //hardcoded default
-	
+
 	if (array_key_exists($Type, $Types[$CategoryID])) {
 		$ReportType = $Types[$CategoryID][$Type];
 	} else if(array_key_exists($Type,$Types['master'])) {
@@ -132,13 +132,13 @@
 		$RawName = "$ArtistName - $GroupName".($Year ? " ($Year)" : "")." [$Format/$Encoding/$Media]".($Remastered ? " &lt;$RemasterTitle - $RemasterYear&gt;" : "").($HasLog ? " ($LogScore %)" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
 		$LinkName = "<a href='artist.php?id=$ArtistID'>$ArtistName</a> - <a href='torrents.php?id=$GroupID'>$GroupName".($Year ? " ($Year)" : "")."</a> <a href='torrents.php?torrentid=$TorrentID'> [$Format/$Encoding/$Media]".($Remastered ? " &lt;$RemasterTitle - $RemasterYear&gt;" : "")."</a> ".($HasLog ? " <a href='torrents.php?action=viewlog&amp;torrentid=$TorrentID&amp;groupid=$GroupID'>(Log: $LogScore %)</a>" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
 		$BBName = "[url=artist.php?id=$ArtistID]".$ArtistName."[/url] - [url=torrents.php?id=$GroupID]$GroupName".($Year ? " ($Year)" : "")."[/url] [url=torrents.php?torrentid=$TorrentID][$Format/$Encoding/$Media]".($Remastered ? " &lt;$RemasterTitle - $RemasterYear&gt;" : "")."[/url] ".($HasLog ? " [url=torrents.php?action=viewlog&amp;torrentid=$TorrentID&amp;groupid=$GroupID'](Log: $LogScore %)[/url]" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
-	}	
-?>	
+	}
+?>
 	<div id="report<?=$ReportID?>">
 		<form class="create_form" name="report" id="reportform_<?=$ReportID?>" action="reports.php" method="post">
-			<? 
+			<?
 				/*
-				* Some of these are for takeresolve, some for the javascript.			
+				* Some of these are for takeresolve, some for the javascript.
 				*/
 			?>
 			<div>
@@ -166,22 +166,22 @@
 						<a href="torrents.php?action=download&amp;id=<?=$TorrentID?>&amp;authkey=<?=$LoggedUser['AuthKey']?>&amp;torrent_pass=<?=$LoggedUser['torrent_pass']?>" class="brackets" title="Download">DL</a>
 						uploaded by <a href="user.php?id=<?=$UploaderID?>"><?=$UploaderName?></a> <?=time_diff($Time)?>
 						<br />
-	<?		$DB->query("SELECT r.ID 
-						FROM reportsv2 AS r 
-						LEFT JOIN torrents AS t ON t.ID=r.TorrentID 
+	<?		$DB->query("SELECT r.ID
+						FROM reportsv2 AS r
+						LEFT JOIN torrents AS t ON t.ID=r.TorrentID
 						WHERE r.Status != 'Resolved'
 						AND t.GroupID=$GroupID");
 			$GroupOthers = ($DB->record_count());
-			
+
 			if($GroupOthers > 0) { ?>
 						<div style="text-align: right;">
 							<a href="reportsv2.php?view=group&amp;id=<?=$GroupID?>">There <?=(($GroupOthers > 1) ? "are $GroupOthers reports" : "is 1 other report")?> for torrent(s) in this group</a>
 						</div>
 	<? 		}
-	
-			$DB->query("SELECT t.UserID 
-						FROM reportsv2 AS r 
-						JOIN torrents AS t ON t.ID=r.TorrentID 
+
+			$DB->query("SELECT t.UserID
+						FROM reportsv2 AS r
+						JOIN torrents AS t ON t.ID=r.TorrentID
 						WHERE r.Status != 'Resolved'
 						AND t.UserID=$UploaderID");
 			$UploaderOthers = ($DB->record_count());
@@ -191,7 +191,7 @@
 							<a href="reportsv2.php?view=uploader&amp;id=<?=$UploaderID?>">There <?=(($UploaderOthers > 1) ? "are $UploaderOthers reports" : "is 1 other report")?> for torrent(s) uploaded by this user</a>
 						</div>
 	<? 		}
-		
+
 			$DB->query("SELECT DISTINCT req.ID,
 						req.FillerID,
 						um.Username,
@@ -262,11 +262,11 @@
 					</td>
 				</tr>
 				<tr>
-					<td class="label"><strong>Extra</strong> Log Message:</td> 
+					<td class="label"><strong>Extra</strong> Log Message:</td>
 					<td>
 						<input type="text" name="log_message" id="log_message<?=$ReportID?>" size="40" />
 					</td>
-					<td class="label"><strong>Extra</strong> Staff Notes:</td> 
+					<td class="label"><strong>Extra</strong> Staff Notes:</td>
 					<td>
 						<input type="text" name="admin_message" id="admin_message<?=$ReportID?>" size="40" />
 					</td>
diff --git a/sections/torrents/delete_alias.php b/sections/torrents/delete_alias.php
index 29e89fcb..46f479bd 100644
--- a/sections/torrents/delete_alias.php
+++ b/sections/torrents/delete_alias.php
@@ -19,14 +19,14 @@
 
 //Get a count of how many groups or requests use this artist ID
 $DB->query("SELECT ag.ArtistID
-			FROM artists_group as ag 
-				LEFT JOIN requests_artists AS ra ON ag.ArtistID=ra.ArtistID 
+			FROM artists_group as ag
+				LEFT JOIN requests_artists AS ra ON ag.ArtistID=ra.ArtistID
 			WHERE ra.ArtistID IS NOT NULL
 				AND ag.ArtistID = ".$ArtistID);
 $ReqCount = $DB->record_count();
 $DB->query("SELECT ag.ArtistID
-			FROM artists_group as ag 
-				LEFT JOIN torrents_artists AS ta ON ag.ArtistID=ta.ArtistID 
+			FROM artists_group as ag
+				LEFT JOIN torrents_artists AS ta ON ag.ArtistID=ta.ArtistID
 			WHERE ta.ArtistID IS NOT NULL
 				AND ag.ArtistID = ".$ArtistID);
 $GroupCount = $DB->record_count();
@@ -35,13 +35,13 @@
 	Artists::delete_artist($ArtistID);
 }
 
-$DB->query("INSERT INTO torrents_group (ID, NumArtists) 
-		SELECT ta.GroupID, COUNT(ta.ArtistID) 
-		FROM torrents_artists AS ta 
-		WHERE ta.GroupID='$GroupID' 
+$DB->query("INSERT INTO torrents_group (ID, NumArtists)
+		SELECT ta.GroupID, COUNT(ta.ArtistID)
+		FROM torrents_artists AS ta
+		WHERE ta.GroupID='$GroupID'
 		AND ta.Importance='1'
-		GROUP BY ta.GroupID 
-	ON DUPLICATE KEY UPDATE 
+		GROUP BY ta.GroupID
+	ON DUPLICATE KEY UPDATE
 	NumArtists=VALUES(NumArtists);");
 
 $Cache->delete_value('torrents_details_'.$GroupID); // Delete torrent group cache
diff --git a/sections/torrents/delete_tag.php b/sections/torrents/delete_tag.php
index fe12ba4d..b48c71f8 100644
--- a/sections/torrents/delete_tag.php
+++ b/sections/torrents/delete_tag.php
@@ -26,7 +26,7 @@
 if($Count < 1) {
 	$DB->query("SELECT Name FROM tags WHERE ID=".$TagID);
 	list($TagName) = $DB->next_record();
-	
+
 	$DB->query("DELETE FROM tags WHERE ID=".$TagID);
 }
 
diff --git a/sections/torrents/download.php b/sections/torrents/download.php
index 2d5f81e4..26d5f00e 100644
--- a/sections/torrents/download.php
+++ b/sections/torrents/download.php
@@ -90,9 +90,9 @@
 		}
 		$FLTokens = $UInfo['FLTokens'];
 	}
-	
+
 	// First make sure this isn't already FL, and if it is, do nothing
-	
+
 	if (!Torrents::has_token($TorrentID)) {
 		if ($FLTokens <= 0) {
 			error("You do not have any freeleech tokens left. Please use the regular DL link.");
@@ -100,25 +100,25 @@
 		if ($Size >= 1073741824) {
 			error("This torrent is too large. Please use the regular DL link.");
 		}
-		
+
 		// Let the tracker know about this
 		if (!Tracker::update_tracker('add_token', array('info_hash' => rawurlencode($InfoHash), 'userid' => $UserID))) {
 			error("Sorry! An error occurred while trying to register your token. Most often, this is due to the tracker being down or under heavy load. Please try again later.");
 		}
-		
+
 		if (!Torrents::has_token($TorrentID)) {
 			$DB->query("INSERT INTO users_freeleeches (UserID, TorrentID, Time) VALUES ($UserID, $TorrentID, NOW())
 							ON DUPLICATE KEY UPDATE Time=VALUES(Time), Expired=FALSE, Uses=Uses+1");
 			$DB->query("UPDATE users_main SET FLTokens = FLTokens - 1 WHERE ID=$UserID");
-			
+
 			// Fix for downloadthemall messing with the cached token count
 			$UInfo = Users::user_heavy_info($UserID);
 			$FLTokens = $UInfo['FLTokens'];
-			
+
 			$Cache->begin_transaction('user_info_heavy_'.$UserID);
 			$Cache->update_row(false, array('FLTokens'=>($FLTokens - 1)));
 			$Cache->commit_transaction(0);
-			
+
 			$Cache->delete_value('users_tokens_'.$UserID);
 		}
 	}
diff --git a/sections/torrents/downloadlist.php b/sections/torrents/downloadlist.php
index 7c02c396..8db54912 100644
--- a/sections/torrents/downloadlist.php
+++ b/sections/torrents/downloadlist.php
@@ -29,7 +29,7 @@
 	$UserIDs = implode(',',$UserIDs);
 	$DB->query("SELECT uid FROM xbt_snatched WHERE fid='$TorrentID' AND uid IN($UserIDs)");
 	$Snatched = $DB->to_array('uid');
-	
+
 	$DB->query("SELECT uid FROM xbt_files_users WHERE fid='$TorrentID' AND Remaining=0 AND uid IN($UserIDs)");
 	$Seeding = $DB->to_array('uid');
 }
@@ -55,21 +55,21 @@
 
 foreach($Results as $ID=>$Data) {
 	list($SnatcherID, $Timestamp) = array_values($Data);
-	
+
 	$User = Users::format_username($SnatcherID, true, true, true, true);
-	
+
 	if(!array_key_exists($SnatcherID, $Snatched) && $SnatcherID!=$UserID) {
 		$User = '<span style="font-style: italic;">'.$User.'</span>';
 		if(array_key_exists($SnatcherID, $Seeding)) {
 			$User = '<strong>'.$User.'</strong>';
 		}
 	}
-	if($i % 2 == 0 && $i>0){ ?> 
+	if($i % 2 == 0 && $i>0){ ?>
 	</tr>
-	<tr>	
+	<tr>
 <?
 	}
-?> 
+?>
 		<td><?=$User?></td>
 		<td><?=time_diff($Timestamp)?></td>
 <?
diff --git a/sections/torrents/edit.php b/sections/torrents/edit.php
index ec86c88d..82ebc66d 100644
--- a/sections/torrents/edit.php
+++ b/sections/torrents/edit.php
@@ -14,21 +14,21 @@
 
 $TorrentID = $_GET['id'];
 
-$DB->query("SELECT 
-	t.Media, 
-	t.Format, 
-	t.Encoding AS Bitrate, 
-	t.RemasterYear, 
-	t.Remastered, 
-	t.RemasterTitle, 
+$DB->query("SELECT
+	t.Media,
+	t.Format,
+	t.Encoding AS Bitrate,
+	t.RemasterYear,
+	t.Remastered,
+	t.RemasterTitle,
 	t.RemasterCatalogueNumber,
 	t.RemasterRecordLabel,
-	t.Scene, 
-	t.FreeTorrent, 
-	t.FreeLeechType, 
-	t.Dupable, 
-	t.DupeReason, 
-	t.Description AS TorrentDescription, 
+	t.Scene,
+	t.FreeTorrent,
+	t.FreeLeechType,
+	t.Dupable,
+	t.DupeReason,
+	t.Description AS TorrentDescription,
 	tg.CategoryID,
 	tg.Name AS Title,
 	tg.Year,
@@ -46,7 +46,7 @@
 	ca.TorrentID AS CassetteApproved,
 	lma.TorrentID AS LossymasterApproved,
 	lwa.TorrentID AS LossywebApproved
-	FROM torrents AS t 
+	FROM torrents AS t
 	LEFT JOIN torrents_group AS tg ON tg.ID=t.GroupID
 	LEFT JOIN artists_group AS ag ON ag.ArtistID=tg.ArtistID
 	LEFT JOIN torrents_bad_tags AS bt ON bt.TorrentID=t.ID
@@ -72,18 +72,18 @@
 
 if(!($Properties['Remastered'] && !$Properties['RemasterYear']) || check_perms('edit_unknowns')) {
 	$TorrentForm = new TORRENT_FORM($Properties, $Err, false);
-	
+
 	$TorrentForm->head();
 	switch ($UploadForm) {
 		case 'Music':
 			$TorrentForm->music_form('');
 			break;
-			
+
 		case 'Audiobooks':
 		case 'Comedy':
 			$TorrentForm->audiobook_form();
 			break;
-		
+
 		case 'Applications':
 		case 'Comics':
 		case 'E-Books':
diff --git a/sections/torrents/editgroup.php b/sections/torrents/editgroup.php
index bce81a2b..a726bd49 100644
--- a/sections/torrents/editgroup.php
+++ b/sections/torrents/editgroup.php
@@ -2,14 +2,14 @@
 /************************************************************************
 ||------------|| Edit artist wiki page ||------------------------------||
 
-This page is the page that is displayed when someone feels like editing 
+This page is the page that is displayed when someone feels like editing
 an artist's wiki page.
 
-It is called when $_GET['action'] == 'edit'. $_GET['artistid'] is the 
+It is called when $_GET['action'] == 'edit'. $_GET['artistid'] is the
 ID of the artist, and must be set.
 
-The page inserts a new revision into the wiki_artists table, and clears 
-the cache for the artist page. 
+The page inserts a new revision into the wiki_artists table, and clears
+the cache for the artist page.
 
 ************************************************************************/
 
@@ -78,7 +78,7 @@
 	</div>
 <?	$DB->query("SELECT UserID FROM torrents WHERE GroupID = ".$GroupID);
 	//Users can edit the group info if they've uploaded a torrent to the group or have torrents_edit
-	if(in_array($LoggedUser['ID'], $DB->collect('UserID')) || check_perms('torrents_edit')) { ?> 
+	if(in_array($LoggedUser['ID'], $DB->collect('UserID')) || check_perms('torrents_edit')) { ?>
 	<h3>Non-wiki group editing</h3>
 	<div class="box pad">
 		<form class="edit_form" name="torrent_group" action="torrents.php" method="post">
@@ -106,7 +106,7 @@
 					<td>
 						<input type="text" name="catalogue_number" size="40" value="<?=$CatalogueNumber?>" />
 					</td>
-				</tr>								
+				</tr>
 <? if(check_perms('torrents_freeleech')) { ?>
 				<tr>
 					<td class="label">Freeleech <strong>Group</strong></td>
@@ -114,24 +114,24 @@
 						<input type="checkbox" name="unfreeleech" /> Reset
 						<input type="checkbox" name="freeleech" /> Freeleech
 						<input type="checkbox" name="neutralleech" /> Neutral Leech
-						 because 
+						 because
 						<select name="freeleechtype">
 	<?	$FL = array("N/A", "Staff Pick", "Perma-FL", "Vanity House");
-		foreach($FL as $Key => $FLType) { ?>	
+		foreach($FL as $Key => $FLType) { ?>
 							<option value="<?=$Key?>" <?=($Key == $Torrent['FreeLeechType'] ? ' selected="selected"' : '')?>><?=$FLType?></option>
 	<?	} ?>
 						</select>
 					</td>
-				</tr>	
+				</tr>
 <? } ?>
 			</table>
 			<input type="submit" value="Edit" />
 		</form>
 	</div>
-<? 
+<?
 	}
-	if(check_perms('torrents_edit')) { 
-?> 
+	if(check_perms('torrents_edit')) {
+?>
 	<h3>Rename (won't merge)</h3>
 	<div class="box pad">
 		<form class="rename_form" name="torrent_group" action="torrents.php" method="post">
@@ -143,7 +143,7 @@
 				<div style="text-align: center;">
 					<input type="submit" value="Rename" />
 				</div>
-				
+
 			</div>
 		</form>
 	</div>
@@ -159,10 +159,10 @@
 				<div style="text-align: center;">
 					<input type="submit" value="Merge" />
 				</div>
-				
+
 			</div>
 		</form>
 	</div>
-<?	} ?> 
+<?	} ?>
 </div>
 <? View::show_footer(); ?>
diff --git a/sections/torrents/editgroupid.php b/sections/torrents/editgroupid.php
index 475e078d..b7a7c016 100644
--- a/sections/torrents/editgroupid.php
+++ b/sections/torrents/editgroupid.php
@@ -1,8 +1,8 @@
 <?
 /***************************************************************
 * This page handles the backend of the "edit group ID" function
-* (found on edit.php). It simply changes the group ID of a 
-* torrent. 
+* (found on edit.php). It simply changes the group ID of a
+* torrent.
 ****************************************************************/
 
 if(!check_perms('torrents_edit')) { error(403); }
@@ -36,7 +36,7 @@
 	}
 
 	$Artists = Artists::get_artists(array($OldGroupID, $GroupID));
-	
+
 	View::show_header();
 ?>
 	<div class="thin">
@@ -67,7 +67,7 @@
 	$DB->query("UPDATE torrents
 				SET	GroupID='$GroupID'
 				WHERE ID=$TorrentID");
-	
+
 	// Delete old torrent group if it's empty now
 	$DB->query("SELECT COUNT(ID) FROM torrents WHERE GroupID='$OldGroupID'");
 	list($TorrentsInGroup) = $DB->next_record();
@@ -80,14 +80,14 @@
 		Torrents::update_hash($OldGroupID);
 	}
 	Torrents::update_hash($GroupID);
-	
+
 	Misc::write_log("Torrent $TorrentID was edited by " . $LoggedUser['Username']); // TODO: this is probably broken
 	Torrents::write_group_log($GroupID, 0, $LoggedUser['ID'], "merged group ".$OldGroupID, 0);
 	$DB->query("UPDATE group_log SET GroupID = ".$GroupID." WHERE GroupID = ".$OldGroupID);
-	
-	$Cache->delete_value('torrents_details_'.$GroupID);	
+
+	$Cache->delete_value('torrents_details_'.$GroupID);
 	$Cache->delete_value('torrent_download_'.$TorrentID);
-	
+
 	header("Location: torrents.php?id=$GroupID");
 	}
 ?>
\ No newline at end of file
diff --git a/sections/torrents/functions.php b/sections/torrents/functions.php
index ebe1d72e..34a89e4c 100644
--- a/sections/torrents/functions.php
+++ b/sections/torrents/functions.php
@@ -166,7 +166,7 @@ function get_group_requests($GroupID) {
 		return array();
 	}
 	global $DB, $Cache;
-	
+
 	$Requests = $Cache->get_value('requests_group_'.$GroupID);
 	if ($Requests === FALSE) {
 		$DB->query("SELECT ID FROM requests WHERE GroupID = $GroupID AND TimeFilled = '0000-00-00 00:00:00'");
diff --git a/sections/torrents/history.php b/sections/torrents/history.php
index d897b8f3..6a73f6be 100644
--- a/sections/torrents/history.php
+++ b/sections/torrents/history.php
@@ -2,8 +2,8 @@
 /************************************************************************
 ||------------|| Artist wiki history page ||---------------------------||
 
-This page lists previous revisions of the artists page. It gets called 
-if $_GET['action'] == 'history'. 
+This page lists previous revisions of the artists page. It gets called
+if $_GET['action'] == 'history'.
 
 It also requires $_GET['artistid'].
 
diff --git a/sections/torrents/index.php b/sections/torrents/index.php
index 35b18ba7..9edc7d05 100644
--- a/sections/torrents/index.php
+++ b/sections/torrents/index.php
@@ -23,27 +23,27 @@ function js_pages($Action, $TorrentID, $NumResults, $CurrentPage) {
 			enforce_login();
 			include(SERVER_ROOT.'/sections/torrents/edit.php');
 			break;
-		
+
 		case 'editgroup':
 			enforce_login();
 			include(SERVER_ROOT.'/sections/torrents/editgroup.php');
 			break;
-		
+
 		case 'editgroupid':
 			enforce_login();
 			include(SERVER_ROOT.'/sections/torrents/editgroupid.php');
 			break;
-		
+
 		case 'takeedit':
 			enforce_login();
 			include(SERVER_ROOT.'/sections/torrents/takeedit.php');
 			break;
-		
+
 		case 'newgroup':
 			enforce_login();
 			include(SERVER_ROOT.'/sections/torrents/takenewgroup.php');
 			break;
-		
+
 		case 'peerlist':
 			enforce_login();
 			include(SERVER_ROOT.'/sections/torrents/peerlist.php');
@@ -53,97 +53,97 @@ function js_pages($Action, $TorrentID, $NumResults, $CurrentPage) {
 			enforce_login();
 			include(SERVER_ROOT.'/sections/torrents/snatchlist.php');
 			break;
-	
+
 		case 'downloadlist':
 			enforce_login();
 			include(SERVER_ROOT.'/sections/torrents/downloadlist.php');
 			break;
-	
+
 		case 'redownload':
 			enforce_login();
 			include(SERVER_ROOT.'/sections/torrents/redownload.php');
 			break;
-	
+
 		case 'revert':
 		case 'takegroupedit':
 			enforce_login();
 			include(SERVER_ROOT.'/sections/torrents/takegroupedit.php');
 			break;
-		
+
 		case 'nonwikiedit':
 			enforce_login();
 			include(SERVER_ROOT.'/sections/torrents/nonwikiedit.php');
 			break;
-		
+
 		case 'rename':
 			enforce_login();
 			include(SERVER_ROOT.'/sections/torrents/rename.php');
 			break;
-		
+
 		case 'merge':
 			enforce_login();
 			include(SERVER_ROOT.'/sections/torrents/merge.php');
 			break;
-			
+
 		case 'add_alias':
 			enforce_login();
 			include(SERVER_ROOT.'/sections/torrents/add_alias.php');
 			break;
-			
+
 		case 'delete_alias':
 			enforce_login();
 			authorize();
 			include(SERVER_ROOT.'/sections/torrents/delete_alias.php');
 			break;
-			
-			
+
+
 		case 'history':
 			enforce_login();
 			include(SERVER_ROOT.'/sections/torrents/history.php');
 			break;
-		
+
 		case 'delete':
 			enforce_login();
 			include(SERVER_ROOT.'/sections/torrents/delete.php');
 			break;
-		
+
 		case 'takedelete':
 			enforce_login();
 			include(SERVER_ROOT.'/sections/torrents/takedelete.php');
 			break;
-	
+
 		case 'masspm':
 			enforce_login();
 			include(SERVER_ROOT.'/sections/torrents/masspm.php');
 			break;
-	
+
 		case 'reseed':
 			enforce_login();
 			include(SERVER_ROOT.'/sections/torrents/reseed.php');
 			break;
-	
+
 		case 'takemasspm':
 			enforce_login();
 			include(SERVER_ROOT.'/sections/torrents/takemasspm.php');
 			break;
-	 	
+
 		case 'vote_tag':
 			enforce_login();
 			authorize();
 			include(SERVER_ROOT.'/sections/torrents/vote_tag.php');
 			break;
-		
+
 		case 'add_tag':
 			enforce_login();
 			include(SERVER_ROOT.'/sections/torrents/add_tag.php');
 			break;
-		
+
 		case 'delete_tag':
 			enforce_login();
 			authorize();
 			include(SERVER_ROOT.'/sections/torrents/delete_tag.php');
 			break;
-	
+
 		case 'notify':
 			enforce_login();
 			include(SERVER_ROOT.'/sections/torrents/notify.php');
@@ -151,7 +151,7 @@ function js_pages($Action, $TorrentID, $NumResults, $CurrentPage) {
 
 		case 'manage_artists':
 			enforce_login();
-			require(SERVER_ROOT.'/sections/torrents/manage_artists.php');			
+			require(SERVER_ROOT.'/sections/torrents/manage_artists.php');
 			break;
 
 		case 'notify_clear':
@@ -170,28 +170,28 @@ function js_pages($Action, $TorrentID, $NumResults, $CurrentPage) {
 		case 'download':
 			require(SERVER_ROOT.'/sections/torrents/download.php');
 			break;
-			
+
 		case 'reply':
 			enforce_login();
 			authorize();
 
-			if (!isset($_POST['groupid']) || !is_number($_POST['groupid']) || trim($_POST['body'])==='' || !isset($_POST['body'])) { 
+			if (!isset($_POST['groupid']) || !is_number($_POST['groupid']) || trim($_POST['body'])==='' || !isset($_POST['body'])) {
 				error(0);
 			}
 			if($LoggedUser['DisablePosting']) {
 				error('Your posting rights have been removed.');
 			}
-			
+
 			$GroupID = $_POST['groupid'];
 			if(!$GroupID) { error(404); }
-		
+
 			$DB->query("SELECT CEIL((SELECT COUNT(ID)+1 FROM torrents_comments AS tc WHERE tc.GroupID='".db_string($GroupID)."')/".TORRENT_COMMENTS_PER_PAGE.") AS Pages");
 			list($Pages) = $DB->next_record();
-		
+
 			$DB->query("INSERT INTO torrents_comments (GroupID,AuthorID,AddedTime,Body) VALUES (
 				'".db_string($GroupID)."', '".db_string($LoggedUser['ID'])."','".sqltime()."','".db_string($_POST['body'])."')");
 			$PostID=$DB->inserted_id();
-		
+
 			$CatalogueID = floor((TORRENT_COMMENTS_PER_PAGE*$Pages-TORRENT_COMMENTS_PER_PAGE)/THREAD_CATALOGUE);
 			$Cache->begin_transaction('torrent_comments_'.$GroupID.'_catalogue_'.$CatalogueID);
 			$Post = array(
@@ -206,29 +206,29 @@ function js_pages($Action, $TorrentID, $NumResults, $CurrentPage) {
 			$Cache->insert('', $Post);
 			$Cache->commit_transaction(0);
 			$Cache->increment('torrent_comments_'.$GroupID);
-			
+
 			header('Location: torrents.php?id='.$GroupID.'&page='.$Pages);
 			break;
-		
+
 		case 'get_post':
 			enforce_login();
 			if (!$_GET['post'] || !is_number($_GET['post'])) { error(0); }
 			$DB->query("SELECT Body FROM torrents_comments WHERE ID='".db_string($_GET['post'])."'");
 			list($Body) = $DB->next_record(MYSQLI_NUM);
-		
+
 			echo trim($Body);
 			break;
-		
+
 		case 'takeedit_post':
 			enforce_login();
 			authorize();
 
 			include(SERVER_ROOT.'/classes/class_text.php'); // Text formatting class
 			$Text = new TEXT;
-		
+
 			// Quick SQL injection check
 			if(!$_POST['post'] || !is_number($_POST['post'])) { error(0); }
-			
+
 			// Mainly
 			$DB->query("SELECT
 				tc.Body,
@@ -238,24 +238,24 @@ function js_pages($Action, $TorrentID, $NumResults, $CurrentPage) {
 				FROM torrents_comments AS tc
 				WHERE tc.ID='".db_string($_POST['post'])."'");
 			list($OldBody, $AuthorID,$GroupID,$AddedTime)=$DB->next_record();
-			
+
 			$DB->query("SELECT ceil(COUNT(ID) / ".TORRENT_COMMENTS_PER_PAGE.") AS Page FROM torrents_comments WHERE GroupID = $GroupID AND ID <= $_POST[post]");
 			list($Page) = $DB->next_record();
-			
+
 			if ($LoggedUser['ID']!=$AuthorID && !check_perms('site_moderate_forums')) { error(404); }
 			if ($DB->record_count()==0) { error(404); }
-		
+
 			// Perform the update
 			$DB->query("UPDATE torrents_comments SET
 				Body = '".db_string($_POST['body'])."',
 				EditedUserID = '".db_string($LoggedUser['ID'])."',
 				EditedTime = '".sqltime()."'
 				WHERE ID='".db_string($_POST['post'])."'");
-		
+
 			// Update the cache
 			$CatalogueID = floor((TORRENT_COMMENTS_PER_PAGE*$Page-TORRENT_COMMENTS_PER_PAGE)/THREAD_CATALOGUE);
 			$Cache->begin_transaction('torrent_comments_'.$GroupID.'_catalogue_'.$CatalogueID);
-			
+
 			$Cache->update_row($_POST['key'], array(
 				'ID'=>$_POST['post'],
 				'AuthorID'=>$AuthorID,
@@ -266,24 +266,24 @@ function js_pages($Action, $TorrentID, $NumResults, $CurrentPage) {
 				'Username'=>$LoggedUser['Username']
 			));
 			$Cache->commit_transaction(0);
-		
+
 			$DB->query("INSERT INTO comments_edits (Page, PostID, EditUser, EditTime, Body)
 									VALUES ('torrents', ".db_string($_POST['post']).", ".db_string($LoggedUser['ID']).", '".sqltime()."', '".db_string($OldBody)."')");
-			
+
 			// This gets sent to the browser, which echoes it in place of the old body
 			echo $Text->full_format($_POST['body']);
 			break;
-		
+
 		case 'delete_post':
 			enforce_login();
 			authorize();
-		
+
 			// Quick SQL injection check
 			if (!$_GET['postid'] || !is_number($_GET['postid'])) { error(0); }
-		
+
 			// Make sure they are moderators
 			if (!check_perms('site_moderate_forums')) { error(403); }
-		
+
 			// Get topicid, forumid, number of pages
 			$DB->query("SELECT
 				GroupID,
@@ -293,23 +293,23 @@ function js_pages($Action, $TorrentID, $NumResults, $CurrentPage) {
 				WHERE tc.GroupID=(SELECT GroupID FROM torrents_comments WHERE ID=".$_GET['postid'].")
 				GROUP BY tc.GroupID");
 			list($GroupID,$Pages,$Page)=$DB->next_record();
-		
+
 			// $Pages = number of pages in the thread
 			// $Page = which page the post is on
 			// These are set for cache clearing.
-		
+
 			$DB->query("DELETE FROM torrents_comments WHERE ID='".db_string($_GET['postid'])."'");
-		
+
 			//We need to clear all subsequential catalogues as they've all been bumped with the absence of this post
 			$ThisCatalogue = floor((TORRENT_COMMENTS_PER_PAGE*$Page-TORRENT_COMMENTS_PER_PAGE)/THREAD_CATALOGUE);
 			$LastCatalogue = floor((TORRENT_COMMENTS_PER_PAGE*$Pages-TORRENT_COMMENTS_PER_PAGE)/THREAD_CATALOGUE);
 			for($i=$ThisCatalogue;$i<=$LastCatalogue;$i++) {
 				$Cache->delete('torrent_comments_'.$GroupID.'_catalogue_'.$i);
 			}
-			
+
 			// Delete thread info cache (eg. number of pages)
 			$Cache->delete('torrent_comments_'.$GroupID);
-			
+
 			break;
 		case 'regen_filelist' :
 			if(check_perms('users_mod') && !empty($_GET['torrentid']) && is_number($_GET['torrentid'])) {
@@ -345,7 +345,7 @@ function js_pages($Action, $TorrentID, $NumResults, $CurrentPage) {
 			break;
 		default:
 			enforce_login();
-		
+
 			if(!empty($_GET['id'])) {
 				include(SERVER_ROOT.'/sections/torrents/details.php');
 			} elseif(isset($_GET['torrentid']) && is_number($_GET['torrentid'])) {
@@ -385,6 +385,6 @@ function js_pages($Action, $TorrentID, $NumResults, $CurrentPage) {
 	} else {
 		include(SERVER_ROOT.'/sections/torrents/browse2.php');
 	}
-	
+
 }
 ?>
diff --git a/sections/torrents/merge.php b/sections/torrents/merge.php
index 94945198..b84e220b 100644
--- a/sections/torrents/merge.php
+++ b/sections/torrents/merge.php
@@ -25,7 +25,7 @@
 //Everything is legit, let's just confim they're not retarded
 if(empty($_POST['confirm'])) {
 	$Artists = Artists::get_artists(array($GroupID, $NewGroupID));
-	
+
 	View::show_header();
 ?>
 	<div class="center thin">
@@ -51,7 +51,7 @@
 	View::show_footer();
 } else {
 	authorize();
-	
+
 	// Votes ninjutsu. This is so annoyingly complicated.
 	// 1. Get a list of everybody who voted on the old group and clear their cache keys
 	$DB->query("SELECT UserID FROM users_votes WHERE GroupID='$GroupID'");
@@ -67,7 +67,7 @@
 				FROM (SELECT IFNULL(SUM(IF(Type='Up',1,0)),0) As UpVotes,
 							 COUNT(1) AS TotalVotes,
 							 binomial_ci(IFNULL(SUM(IF(Type='Up',1,0)),0), COUNT(1)) AS VoteScore
-						FROM users_votes 
+						FROM users_votes
 						WHERE GroupID = $NewGroupID
 						GROUP BY GroupID) AS a
 				ON DUPLICATE KEY UPDATE
@@ -75,7 +75,7 @@
 				Total = a.TotalVotes,
 				Score = a.VoteScore;");
 	// 3. Clear the votes_pairs keys!
-	$DB->query("SELECT v2.GroupID 
+	$DB->query("SELECT v2.GroupID
 				FROM users_votes AS v1
 				INNER JOIN users_votes AS v2 USING (UserID)
 				WHERE (v1.Type = 'Up' OR v2.Type='Up')
@@ -85,19 +85,19 @@
 		$Cache->delete_value('vote_pairs_'.$CacheGroupID);
 	}
 	// 4. Clear the new groups vote keys
-	
+
 
 	$DB->query("UPDATE torrents SET GroupID='$NewGroupID' WHERE GroupID='$GroupID'");
 	$DB->query("UPDATE wiki_torrents SET PageID='$NewGroupID' WHERE PageID='$GroupID'");
 	$DB->query("UPDATE torrents_comments SET GroupID='$NewGroupID' WHERE GroupID='$GroupID'");
-	
+
 	Torrents::delete_group($GroupID);
 
 	Torrents::write_group_log($NewGroupID, 0, $LoggedUser['ID'], "Merged Group ".$GroupID." (".$Name.") to ".$NewGroupID." (".$NewName.")", 0);
 	$DB->query("UPDATE group_log SET GroupID = ".$NewGroupID." WHERE GroupID = ".$GroupID);
-	
+
 	$GroupID=$NewGroupID;
-	
+
 	//Collages
 	$DB->query("SELECT CollageID FROM collages_torrents WHERE GroupID='$OldGroupID'"); //Select all collages that contain edited group
 	while(list($CollageID) = $DB->next_record()) {
@@ -105,7 +105,7 @@
 		$DB->query("DELETE FROM collages_torrents WHERE GroupID='$OldGroupID' AND CollageID='$CollageID'");
 		$Cache->delete_value('collage_'.$CollageID);
 	}
-	
+
 	//Requests
 	$DB->query("SELECT ID FROM requests WHERE GroupID='$OldGroupID'");
 	$Requests = $DB->collect('ID');
@@ -113,7 +113,7 @@
 	foreach ($Requests as $RequestID) {
 		$Cache->delete_value('request_'.$RequestID);
 	}
-	
+
 	$DB->query("SELECT ID FROM torrents WHERE GroupID='$OldGroupID'");
 	while(list($TorrentID) = $DB->next_record()) {
 		$Cache->delete_value('torrent_download_'.$TorrentID);
@@ -123,7 +123,7 @@
 	$Cache->delete_value('torrent_comments_'.$GroupID);
 	$Cache->delete_value('groups_artists_'.$GroupID);
 	Torrents::update_hash($GroupID);
-	
+
 	header('Location: torrents.php?id='.$GroupID);
 }
 ?>
diff --git a/sections/torrents/nonwikiedit.php b/sections/torrents/nonwikiedit.php
index 1e156ccd..b8704e9f 100644
--- a/sections/torrents/nonwikiedit.php
+++ b/sections/torrents/nonwikiedit.php
@@ -11,7 +11,7 @@
 //Usual perm checks
 if(!check_perms('torrents_edit')) {
 	$DB->query("SELECT UserID FROM torrents WHERE GroupID = ".$GroupID);
-	if(!in_array($LoggedUser['ID'], $DB->collect('UserID'))) { 
+	if(!in_array($LoggedUser['ID'], $DB->collect('UserID'))) {
 		error(403);
 	}
 }
@@ -46,7 +46,7 @@
 
 
 
-$DB->query("UPDATE torrents_group SET 
+$DB->query("UPDATE torrents_group SET
 	Year = '$Year',
 	RecordLabel = '".$RecordLabel."',
 	CatalogueNumber = '".$CatalogueNumber."'
diff --git a/sections/torrents/redownload.php b/sections/torrents/redownload.php
index baabca7a..63261e40 100644
--- a/sections/torrents/redownload.php
+++ b/sections/torrents/redownload.php
@@ -59,7 +59,7 @@
 	tg.Name,
 	t.Size
 	FROM torrents as t
-	JOIN torrents_group AS tg ON t.GroupID=tg.ID 
+	JOIN torrents_group AS tg ON t.GroupID=tg.ID
 	".$SQL."
 	GROUP BY TorrentID");
 
diff --git a/sections/torrents/reseed.php b/sections/torrents/reseed.php
index a1466b05..12137516 100644
--- a/sections/torrents/reseed.php
+++ b/sections/torrents/reseed.php
@@ -25,10 +25,10 @@
 	$Users = $DB->to_array();
 	foreach($Users as $User) {
 		$UserID = $User['uid'];
-		
+
 		$DB->query("SELECT UserID FROM top_snatchers WHERE UserID='$UserID'");
 		if($DB->record_count()>0) { continue; }
-		
+
 		$UserInfo = Users::user_info($UserID);
 		$Username = $UserInfo['Username'];
 		$TimeStamp = $User['tstamp'];
@@ -39,14 +39,14 @@
 The exact process for re-seeding a torrent is slightly different for each client, but the concept is the same. The idea is to download the .torrent file and open it in your client, and point your client to the location where the data files are, then initiate a hash check.
 
 Thanks!";
-		
+
 		Misc::send_pm($UserID, 0, 'Re-seed request for torrent '.db_string($Name), db_string($Request));
 	}
 	$NumUsers = count($Users);
 } else {
 	$UserInfo = Users::user_info($UploaderID);
 	$Username = $UserInfo['Username'];
-	
+
 	$Request = "Hi $Username,
 
 The user [url=http://".SITE_URL."/user.php?id=$LoggedUser[ID]]$LoggedUser[Username][/url] has requested a re-seed for the torrent [url=http://".SITE_URL."/torrents.php?id=$GroupID&torrentid=$TorrentID]".$Name."[/url], which you uploaded on ".date('M d Y', strtotime($UploadedTime)).". The torrent is now un-seeded, and we need your help to resurrect it!
@@ -55,9 +55,9 @@
 
 Thanks!";
 	Misc::send_pm($UploaderID, 0, 'Re-seed request for torrent '.db_string($Name), db_string($Request));
-	
+
 	$NumUsers = 1;
-	
+
 }
 View::show_header();
 ?>
diff --git a/sections/torrents/snatchlist.php b/sections/torrents/snatchlist.php
index ef941446..d38e3331 100644
--- a/sections/torrents/snatchlist.php
+++ b/sections/torrents/snatchlist.php
@@ -33,7 +33,7 @@
 	<tr class="colhead_dark" style="font-weight: bold;">
 		<td>User</td>
 		<td>Time</td>
-		
+
 		<td>User</td>
 		<td>Time</td>
 	</tr>
@@ -43,14 +43,14 @@
 
 foreach($Results as $ID=>$Data) {
 	list($SnatcherID, $Timestamp) = array_values($Data);
-	
+
 	if($i % 2 == 0 && $i>0) {
-?> 
+?>
 	</tr>
-	<tr>	
+	<tr>
 <?
 	}
-?> 
+?>
 		<td><?=Users::format_username($SnatcherID, true, true, true, true)?></td>
 		<td><?=time_diff($Timestamp)?></td>
 <?
diff --git a/sections/torrents/takedelete.php b/sections/torrents/takedelete.php
index 07320ef5..5502dfb7 100644
--- a/sections/torrents/takedelete.php
+++ b/sections/torrents/takedelete.php
@@ -11,8 +11,8 @@
 	t.info_hash,
 	tg.Name,
 	ag.Name,
-	t.Time, 
-	COUNT(x.uid) 
+	t.Time,
+	COUNT(x.uid)
 	FROM torrents AS t
 	LEFT JOIN torrents_group AS tg ON tg.ID=t.GroupID
 	LEFT JOIN artists_group AS ag ON ag.ArtistID=tg.ArtistID
diff --git a/sections/torrents/takegroupedit.php b/sections/torrents/takegroupedit.php
index ca7d7663..c82160b2 100644
--- a/sections/torrents/takegroupedit.php
+++ b/sections/torrents/takegroupedit.php
@@ -84,7 +84,7 @@
 if(empty($RevisionID)) { // edit
 	$DB->query("INSERT INTO wiki_torrents (PageID, Body, Image, UserID, Summary, Time)
 				VALUES ('$GroupID', '".db_string($Body)."', '".db_string($Image)."', '$UserID', '$Summary', '".sqltime()."')");
-	
+
 	$DB->query("UPDATE torrents_group SET ReleaseType='$ReleaseType' WHERE ID='$GroupID'");
 	Torrents::update_hash($GroupID);
 }
@@ -92,9 +92,9 @@
 	$DB->query("SELECT PageID,Body,Image FROM wiki_torrents WHERE RevisionID='$RevisionID'");
 	list($PossibleGroupID, $Body, $Image) = $DB->next_record();
 	if($PossibleGroupID != $GroupID) { error(404); }
-	
-	$DB->query("INSERT INTO wiki_torrents (PageID, Body, Image, UserID, Summary, Time) 
-		SELECT '$GroupID', Body, Image, '$UserID', 'Reverted to revision $RevisionID', '".sqltime()."' 
+
+	$DB->query("INSERT INTO wiki_torrents (PageID, Body, Image, UserID, Summary, Time)
+		SELECT '$GroupID', Body, Image, '$UserID', 'Reverted to revision $RevisionID', '".sqltime()."'
 		FROM wiki_artists WHERE RevisionID='$RevisionID'");
 }
 
@@ -104,7 +104,7 @@
 $Image = db_string($Image);
 
 // Update torrents table (technically, we don't need the RevisionID column, but we can use it for a join which is nice and fast)
-$DB->query("UPDATE torrents_group SET 
+$DB->query("UPDATE torrents_group SET
 	RevisionID='$RevisionID',
 	".((isset($VanityHouse)) ? "VanityHouse='$VanityHouse'," : "")."
 	WikiBody='$Body',
diff --git a/sections/torrents/takemasspm.php b/sections/torrents/takemasspm.php
index f1d5c2b0..603bc151 100644
--- a/sections/torrents/takemasspm.php
+++ b/sections/torrents/takemasspm.php
@@ -46,8 +46,8 @@
 if ($DB->record_count()>0) {
 	// Save this because send_pm uses $DB to run its own query... Oops...
 	$Snatchers = $DB->to_array();
-	foreach ($Snatchers as $UserID) { 
-		Misc::send_pm($UserID[0],0,db_string($Subject),db_string($Message)); 
+	foreach ($Snatchers as $UserID) {
+		Misc::send_pm($UserID[0],0,db_string($Subject),db_string($Message));
 	}
 }
 
diff --git a/sections/torrents/takenewgroup.php b/sections/torrents/takenewgroup.php
index 9de1ddba..d8a8f1e7 100644
--- a/sections/torrents/takenewgroup.php
+++ b/sections/torrents/takenewgroup.php
@@ -1,7 +1,7 @@
 <?
 /***************************************************************
 * This page handles the backend of the "new group" function
-* which splits a torrent off into a new group. 
+* which splits a torrent off into a new group.
 ****************************************************************/
 
 authorize();
@@ -61,13 +61,13 @@
 	}
 
 	$DB->query("INSERT INTO torrents_group
-		(ArtistID, NumArtists, CategoryID, Name, Year, Time, WikiBody, WikiImage, SearchText) 
+		(ArtistID, NumArtists, CategoryID, Name, Year, Time, WikiBody, WikiImage, SearchText)
 		VALUES
 		($ArtistID, '1', '1', '$Title', '$Year', '".sqltime()."', '', '', '$SearchText')");
 	$GroupID = $DB->inserted_id();
 
-	$DB->query("INSERT INTO torrents_artists 
-		(GroupID, ArtistID, AliasID, Importance, UserID) VALUES 
+	$DB->query("INSERT INTO torrents_artists
+		(GroupID, ArtistID, AliasID, Importance, UserID) VALUES
 		('$GroupID', '$ArtistID', '$AliasID', '1', '$LoggedUser[ID]')");
 
 	$DB->query("UPDATE torrents SET
diff --git a/sections/torrents/vote_ranks.php b/sections/torrents/vote_ranks.php
index d7d80ce9..39f2876e 100644
--- a/sections/torrents/vote_ranks.php
+++ b/sections/torrents/vote_ranks.php
@@ -8,7 +8,7 @@
 	$names = array('overall'=>'<a href="top10.php?type=votes">overall</a>',
 				   'decade'=>check_perms('site_advanced_top10') ? 'for the <a href="top10.php?advanced=1&type=votes&year1='.$GroupDecade.'&year2='.($GroupDecade+9).'">'.$GroupDecade.'s</a>' : 'for the '.$GroupDecade.'s',
 				   'year'=>check_perms('site_advanced_top10') ? 'for <a href="top10.php?advanced=1&type=votes&year1='.$GroupYear.'&year2=">'.$GroupYear.'</a>' : "for $GroupYear");
-				   
+
 	foreach ($names as $key => $text) {
 		if ($Rank = $Rankings[$key]) {
 			if ($Rank <= 10) {
@@ -18,11 +18,11 @@
 			} elseif ($Rank <= 50) {
 				$Class = "vr_top_50";
 			}
-			
+
 			$LIs .= '<li id="vote_rank_'.$key.'" class="'.$Class.'">No. '.$Rank.' '.$text.'</li>';
 		}
 	}
-	
+
 	if ($LIs != '') {
 ?>
 		<div class="box" id="votes_ranks">
diff --git a/sections/torrents/voter_picks.php b/sections/torrents/voter_picks.php
index c1c8e086..e52865d5 100644
--- a/sections/torrents/voter_picks.php
+++ b/sections/torrents/voter_picks.php
@@ -1,5 +1,5 @@
 <?
-//global $Cache, $DB; 
+//global $Cache, $DB;
 include(SERVER_ROOT.'/sections/torrents/ranking_funcs.php');
 
 $Top10 = $Cache->get_value('similar_albums_'.$GroupID);
@@ -36,7 +36,7 @@
 			<tr class="colhead">
 				<td><a href="#">&uarr;</a>&nbsp;People who like this album also liked... <a href="#" onclick="$('.votes_rows').toggle(); return false;">(Show)</a></td>
 			</tr>
-<?	
+<?
 	$Top10Groups = array_keys($Top10);
 
 	$Groups = Torrents::get_groups($Top10Groups, true, true, false);
diff --git a/sections/upload/insert_extra_torrents.php b/sections/upload/insert_extra_torrents.php
index efb358a9..c24725ed 100644
--- a/sections/upload/insert_extra_torrents.php
+++ b/sections/upload/insert_extra_torrents.php
@@ -6,10 +6,10 @@
 	// Torrent
 	$DB->query("
 	INSERT INTO torrents
-		(GroupID, UserID, Media, Format, Encoding, 
-		Remastered, RemasterYear, RemasterTitle, RemasterRecordLabel, RemasterCatalogueNumber, 
+		(GroupID, UserID, Media, Format, Encoding,
+		Remastered, RemasterYear, RemasterTitle, RemasterRecordLabel, RemasterCatalogueNumber,
 		HasLog, HasCue, info_hash, FileCount, FileList, FilePath, Size, Time,
-		Description, LogScore, FreeTorrent, FreeLeechType) 
+		Description, LogScore, FreeTorrent, FreeLeechType)
 	VALUES
 		(" . $GroupID . ", " . $LoggedUser['ID'] . ", " . $T['Media'] . ", " . $ExtraTorrent['Format'] . ", " . $ExtraTorrent['Encoding'] . ",
 		" . $T['Remastered'] . ", " . $T['RemasterYear'] . ", " . $T['RemasterTitle'] . ", " . $T['RemasterRecordLabel'] . ", " . $T['RemasterCatalogueNumber'] . ", " . $ExtraHasLog . ", " . $ExtraHasCue . ", '" . db_string($ExtraTorrent['InfoHash']) . "', " . $ExtraTorrent['NumFiles'] . ", '" . $ExtraTorrent['FileString'] . "', '" . $ExtraTorrent['FilePath'] . "', " . $ExtraTorrent['TotalSize'] . ", '" . sqltime() . "',
diff --git a/sections/upload/upload.php b/sections/upload/upload.php
index 576d2c3d..670be556 100644
--- a/sections/upload/upload.php
+++ b/sections/upload/upload.php
@@ -13,7 +13,7 @@
 View::show_header('Upload','upload,jquery,valid_tags,musicbrainz,multiformat_uploader');
 
 if(empty($Properties) && !empty($_GET['groupid']) && is_number($_GET['groupid'])) {
-	$DB->query("SELECT 
+	$DB->query("SELECT
 		tg.ID as GroupID,
 		tg.CategoryID,
 		tg.Name AS Title,
@@ -28,26 +28,26 @@
 		LEFT JOIN torrents AS t ON t.GroupID = tg.ID
 		WHERE tg.ID=".$_GET['groupid']."
 		GROUP BY tg.ID");
-	if ($DB->record_count()) {	
+	if ($DB->record_count()) {
 		list($Properties) = $DB->to_array(false,MYSQLI_BOTH);
 		$UploadForm = $Categories[$Properties['CategoryID']-1];
 		$Properties['CategoryName'] = $Categories[$Properties['CategoryID']-1];
 		$Properties['Artists'] = Artists::get_artist($_GET['groupid']);
-		
-		$DB->query("SELECT 
-			GROUP_CONCAT(tags.Name SEPARATOR ', ') AS TagList 
+
+		$DB->query("SELECT
+			GROUP_CONCAT(tags.Name SEPARATOR ', ') AS TagList
 			FROM torrents_tags AS tt JOIN tags ON tags.ID=tt.TagID
 			WHERE tt.GroupID='$_GET[groupid]'");
-		
+
 		list($Properties['TagList']) = $DB->next_record();
 	} else {
 		unset($_GET['groupid']);
 	}
 	if (!empty($_GET['requestid']) && is_number($_GET['requestid'])) {
 		$Properties['RequestID'] = $_GET['requestid'];
-	}	
+	}
 } elseif (empty($Properties) && !empty($_GET['requestid']) && is_number($_GET['requestid'])) {
-	include(SERVER_ROOT.'/sections/requests/functions.php');	
+	include(SERVER_ROOT.'/sections/requests/functions.php');
 	$DB->query("SELECT
 		r.ID AS RequestID,
 		r.CategoryID,
@@ -59,7 +59,7 @@
 		r.Image
 		FROM requests AS r
 		WHERE r.ID=".$_GET['requestid']);
-	
+
 	list($Properties) = $DB->to_array(false,MYSQLI_BOTH);
 	$UploadForm = $Categories[$Properties['CategoryID']-1];
 	$Properties['CategoryName'] = $Categories[$Properties['CategoryID']-1];
@@ -86,8 +86,8 @@
 	$Cache->cache_value('genre_tags', $GenreTags, 3600*6);
 }
 
-$DB->query("SELECT 
-	d.Name, 
+$DB->query("SELECT
+	d.Name,
 	d.Comment,
 	d.Time
 	FROM do_not_upload as d
@@ -114,14 +114,14 @@
 			<td><strong>Comment</strong></td>
 		</tr>
 <? 	$TimeDiff = strtotime('-1 month', strtotime('now'));
-	foreach($DNU as $BadUpload) { 
+	foreach($DNU as $BadUpload) {
 		list($Name, $Comment, $Updated) = $BadUpload;
-?>		
+?>
 		<tr>
 			<td><?=$Text->full_format($Name)?>
 <?		if($TimeDiff < strtotime($Updated)) { ?>
 				 <strong class="important_text">(New!)</strong>
-		<? } ?>		
+		<? } ?>
 			</td>
 			<td><?=$Text->full_format($Comment)?></td>
 		</tr>
@@ -134,12 +134,12 @@
 	case 'Music':
 		$TorrentForm->music_form($GenreTags);
 		break;
-		
+
 	case 'Audiobooks':
 	case 'Comedy':
 		$TorrentForm->audiobook_form();
 		break;
-	
+
 	case 'Applications':
 	case 'Comics':
 	case 'E-Books':
diff --git a/sections/upload/upload_handle.php b/sections/upload/upload_handle.php
index 3356c4a5..6a035c95 100644
--- a/sections/upload/upload_handle.php
+++ b/sections/upload/upload_handle.php
@@ -226,7 +226,7 @@
 
 		$Validate->SetFields('release_desc',
 			'0','string','The release description has a minimum length of 10 characters.',array('maxlength'=>1000000, 'minlength'=>10));
-		
+
 		$Validate->SetFields('image',
 			'0','link','The image URL you entered was invalid.',array('maxlength'=>255, 'minlength'=>12));
 		break;
@@ -637,13 +637,13 @@
 // Torrent
 $DB->query("
 	INSERT INTO torrents
-		(GroupID, UserID, Media, Format, Encoding, 
-		Remastered, RemasterYear, RemasterTitle, RemasterRecordLabel, RemasterCatalogueNumber, 
-		Scene, HasLog, HasCue, info_hash, FileCount, FileList, FilePath, Size, Time, 
-		Description, LogScore, FreeTorrent, FreeLeechType) 
+		(GroupID, UserID, Media, Format, Encoding,
+		Remastered, RemasterYear, RemasterTitle, RemasterRecordLabel, RemasterCatalogueNumber,
+		Scene, HasLog, HasCue, info_hash, FileCount, FileList, FilePath, Size, Time,
+		Description, LogScore, FreeTorrent, FreeLeechType)
 	VALUES
-		(".$GroupID.", ".$LoggedUser['ID'].", ".$T['Media'].", ".$T['Format'].", ".$T['Encoding'].", 
-		".$T['Remastered'].", ".$T['RemasterYear'].", ".$T['RemasterTitle'].", ".$T['RemasterRecordLabel'].", ".$T['RemasterCatalogueNumber'].", 
+		(".$GroupID.", ".$LoggedUser['ID'].", ".$T['Media'].", ".$T['Format'].", ".$T['Encoding'].",
+		".$T['Remastered'].", ".$T['RemasterYear'].", ".$T['RemasterTitle'].", ".$T['RemasterRecordLabel'].", ".$T['RemasterCatalogueNumber'].",
 		".$T['Scene'].", ".$HasLog.", ".$HasCue.", '".db_string($InfoHash)."', ".$NumFiles.", '".$FileString."', '".$FilePath."', ".$TotalSize.", '".sqltime()."',
 		".$T['TorrentDescription'].", '".(($HasLog == "'1'") ? $LogScoreAverage : 0)."', '".$T['FreeLeech']."', '".$T['FreeLeechType']."')");
 
@@ -676,8 +676,8 @@
 
 if (!empty($LogScores) && $HasLog) {
 	$LogQuery = 'INSERT INTO torrents_logs_new (TorrentID,Log,Details,NotEnglish,Score,Revision,Adjusted,AdjustedBy,AdjustmentReason) VALUES (';
-	foreach ($LogScores as $LogKey => $LogScore) { 
-		$LogScores[$LogKey] = "$TorrentID,$LogScore,1,0,0,NULL"; 
+	foreach ($LogScores as $LogKey => $LogScore) {
+		$LogScores[$LogKey] = "$TorrentID,$LogScore,1,0,0,NULL";
 	}
 	$LogQuery .= implode('),(', $LogScores).')';
 	$DB->query($LogQuery);
@@ -708,7 +708,7 @@
 //******************************************************************************//
 //--------------- Contest ------------------------------------------------------//
 if ($Properties['LibraryImage'] != "") {
-	$DB->query("INSERT INTO reportsv2 (ReporterID, TorrentID, Type, UserComment, Status, ReportedTime, Track, Image, ExtraID, Link) 
+	$DB->query("INSERT INTO reportsv2 (ReporterID, TorrentID, Type, UserComment, Status, ReportedTime, Track, Image, ExtraID, Link)
 			VALUES (0, ".$TorrentID.", 'library', '".db_string(($Properties['MultiDisc'] ? "Multi-disc" : ""))."', 'New', '".sqltime()."', '', '".db_string($Properties['LibraryImage'])."', '', '')");
 }
 
@@ -870,7 +870,7 @@
 	$BitrateReq = "(Encodings LIKE '%|".db_string($UsedFormatBitrate['bitrate'])."|%' OR Encodings = '') ";
 	$SQL .= "AND (NOT($FormatReq AND $BitrateReq)) ";
 }
- 
+
 $SQL .= "))";
 
 
diff --git a/sections/user/advancedsearch.php b/sections/user/advancedsearch.php
index 3ae14603..c25fbd7c 100644
--- a/sections/user/advancedsearch.php
+++ b/sections/user/advancedsearch.php
@@ -19,7 +19,7 @@
 		$_GET['comment'] = $_GET['search'];
 	}
 }
- 
+
 define('USERS_PER_PAGE', 30);
 
 function wrap($String, $ForceMatch = '', $IPSearch = false){
@@ -82,14 +82,14 @@ function date_compare($Field, $Operand, $Date1, $Date2 = ''){
 
 
 function num_compare($Field, $Operand, $Num1, $Num2 = ''){
-	
+
 	if($Num1!=0){
 		$Num1 = db_string($Num1);
 	}
 	if($Num2!=0){
 		$Num2 = db_string($Num2);
 	}
-	
+
 	$Return = array();
 
 	switch($Operand){
@@ -164,7 +164,7 @@ function num_compare($Field, $Operand, $Num1, $Num2 = ''){
 
 	$Val->SetFields('order', '0', 'inarray', 'Invalid ordering', $OrderVals);
 	$Val->SetFields('way', '0', 'inarray', 'Invalid way', $WayVals);
-	
+
 	$Val->SetFields('passkey', '0', 'string', 'Invalid passkey', array('maxlength'=>32));
 	$Val->SetFields('avatar', '0', 'string', 'Avatar URL too long', array('maxlength'=>512));
 	$Val->SetFields('stylesheet', '0', 'inarray', 'Invalid stylesheet', array_unique(array_keys($Stylesheets)));
@@ -235,7 +235,7 @@ function num_compare($Field, $Operand, $Num1, $Num2 = ''){
 		}
 		
 
-		if (!empty($_GET['email_cnt'])) {
+		if (!empty($_GET['email_cnt']) && is_number($_GET['email_cnt'])) {
 			$Query = "SELECT UserID FROM users_history_emails GROUP BY UserID HAVING COUNT(DISTINCT Email) ";
 			if ($_GET['emails_opt'] === 'equal') {
 				$operator = '=';
@@ -269,9 +269,9 @@ function num_compare($Field, $Operand, $Num1, $Num2 = ''){
 
 		if (!empty($_GET['cc'])) {
 			if ($_GET['cc_op'] == "equal") {
-				$Where[]="um1.ipcc = '".$_GET['cc']."'";
+				$Where[]="um1.ipcc = '".db_string($_GET['cc'])."'";
 			} else {
-				$Where[]="um1.ipcc != '".$_GET['cc']."'";
+				$Where[]="um1.ipcc != '".db_string($_GET['cc'])."'";
 			}
 		}
 
@@ -285,13 +285,13 @@ function num_compare($Field, $Operand, $Num1, $Num2 = ''){
 //				$Distinct = 'DISTINCT ';
 //				$Join['xs']=' JOIN xbt_snatched AS xs ON um1.ID=xs.uid ';
 //				$Where[]= ' xs.IP '.$Match.wrap($_GET['ip']);
-//		}	
-		
+//		}
+
 		if(!empty($_GET['comment'])){
 			$Where[]='ui1.AdminComment'.$Match.wrap($_GET['comment']);
 		}
-		
-		
+
+
 		if(strlen($_GET['invites1'])){
 			$Invites1 = round($_GET['invites1']);
 			$Invites2 = round($_GET['invites2']);
@@ -340,13 +340,13 @@ function num_compare($Field, $Operand, $Num1, $Num2 = ''){
 			$Download2 = round($_GET['downloaded2']);
 			$Where[]=implode(' AND ', num_compare('ROUND(Downloaded/1024/1024/1024)', $_GET['downloaded'], $Download1, $Download2));
 		}
-		
+
 		if(strlen($_GET['snatched1'])){
 			$Snatched1 = round($_GET['snatched1']);
 			$Snatched2 = round($_GET['snatched2']);
 			$Having[]=implode(' AND ', num_compare('Snatches', $_GET['snatched'], $Snatched1, $Snatched2));
 		}
-		
+
 		if($_GET['enabled']!=''){
 			$Where[]='um1.Enabled='.wrap($_GET['enabled'], '=');
 		}
@@ -355,7 +355,7 @@ function num_compare($Field, $Operand, $Num1, $Num2 = ''){
 			$Where[]='um1.PermissionID='.wrap($_GET['class'], '=');
 		}
 		
-		
+
 		if($_GET['secclass']!=''){
 			$Join['ul']=' JOIN users_levels AS ul ON um1.ID=ul.UserID ';
 			$Where[]='ul.PermissionID='.wrap($_GET['secclass'], '=');
@@ -385,15 +385,15 @@ function num_compare($Field, $Operand, $Num1, $Num2 = ''){
 				$Join['um2']=' JOIN users_main AS um2 ON um2.IP=um1.IP AND um2.Enabled=\'2\' ';
 			}
 		}
-		
+
 		if(!empty($_GET['passkey'])){
 			$Where[]='um1.torrent_pass'.$Match.wrap($_GET['passkey']);
 		}
-		
+
 		if(!empty($_GET['avatar'])){
 			$Where[]='ui1.Avatar'.$Match.wrap($_GET['avatar']);
 		}
-		
+
 		if($_GET['stylesheet']!=''){
 			$Where[]='ui1.StyleID='.wrap($_GET['stylesheet'], '=');
 		}
@@ -406,16 +406,16 @@ function num_compare($Field, $Operand, $Num1, $Num2 = ''){
 
 		$SQL = 'SELECT '.$Distinct.$SQL;
 		$SQL .= implode(' ', $Join);
-		
+
 		if(count($Where)){
 			$SQL .= ' WHERE '.implode(' AND ', $Where);
 		}
-		
+
 		if(count($Having)){
 			$SQL .= ' HAVING '.implode(' AND ', $Having);
 		}
 		$SQL .= $Order;
-		
+
 		if(count($Where)>0 || count($Join)>0 || count($Having)>0){
 			$RunQuery = true;
 		}
@@ -477,7 +477,7 @@ function num_compare($Field, $Operand, $Num1, $Num2 = ''){
 				<td>
 					<select name="class">
 						<option value="" <? if($_GET['class']==='') {echo ' selected="selected"';}?>>Any</option>
-<?	foreach($ClassLevels as $Class){ 
+<?	foreach($ClassLevels as $Class){
 		if ($Class['Secondary']) { continue; }
 ?>
 					<option value="<?=$Class['ID'] ?>" <? if($_GET['class']===$Class['ID']) {echo ' selected="selected"';}?>><?=Format::cut_string($Class['Name'], 10, 1, 1).' ('.$Class['Level'].')'?></option>
diff --git a/sections/user/connchecker.php b/sections/user/connchecker.php
index d9ff89e6..04b257de 100644
--- a/sections/user/connchecker.php
+++ b/sections/user/connchecker.php
@@ -19,12 +19,12 @@
 	) {
 		die('Invalid IP');
 	}
-	
+
 	if (empty($_GET['port']) || !is_number($_GET['port']) || $_GET['port']<1 || $_GET['port']>65535){
 		die('Invalid Port');
 	}
 
-	//Error suppression, ugh.	
+	//Error suppression, ugh.
 	if(@fsockopen($_GET['ip'], $_GET['port'], $Errno, $Errstr, 20)){
 		die('Port '.$_GET['port'].' on '.$_GET['ip'].' connected successfully.');
 	} else {
diff --git a/sections/user/index.php b/sections/user/index.php
index e28aebe0..5b6d9f0f 100644
--- a/sections/user/index.php
+++ b/sections/user/index.php
@@ -42,7 +42,7 @@
 	case 'edit':
 		include('edit.php');
 		break;
-	
+
 	case 'takeedit':
 		include('takeedit.php');
 		break;
@@ -54,7 +54,7 @@
 		break;
 	case 'takeinvite':
 		include('takeinvite.php');
-		break;		
+		break;
 	case 'deleteinvite':
 		include('deleteinvite.php');
 		break;
@@ -70,7 +70,7 @@
 		break;
 	case 'similar':
 		include('similar.php');
-		break;	
+		break;
 	case 'moderate':
 		include('takemoderate.php');
 		break;
diff --git a/sections/user/invite.php b/sections/user/invite.php
index 75c93c51..a026bad9 100644
--- a/sections/user/invite.php
+++ b/sections/user/invite.php
@@ -1,7 +1,7 @@
 <?
 if(isset($_GET['userid']) && check_perms('users_view_invites')){
 	if(!is_number($_GET['userid'])){ error(403); }
-	
+
 	$UserID=$_GET['userid'];
 	$Sneaky = true;
 } else {
@@ -10,7 +10,7 @@
 		list($UserCount) = $DB->next_record();
 		$Cache->cache_value('stats_user_count', $UserCount, 0);
 	}
-	
+
 	$UserID = $LoggedUser['ID'];
 	$Sneaky = false;
 	
@@ -112,11 +112,11 @@
 $DB->query("SELECT can_leech FROM users_main WHERE ID = ".$UserID);
 list($CanLeech) = $DB->next_record();
 
-if(!$Sneaky 
+if(!$Sneaky
 	&& !$LoggedUser['RatioWatch']
 	&& $CanLeech
 	&& empty($LoggedUser['DisableInvites'])
-	&& ($LoggedUser['Invites']>0 || check_perms('site_send_unlimited_invites')) 
+	&& ($LoggedUser['Invites']>0 || check_perms('site_send_unlimited_invites'))
 	&& ($UserCount <= USER_LIMIT || USER_LIMIT == 0 || check_perms('site_can_invite_always'))
 	){ ?>
 	<div class="box pad">
@@ -174,13 +174,13 @@
 				<td><?=time_diff($Expires)?></td>
 				<td><a href="user.php?action=deleteinvite&amp;invite=<?=$InviteKey?>&amp;auth=<?=$LoggedUser['AuthKey']?>" onclick="return confirm('Are you sure you want to delete this invite?');">Delete invite</a></td>
 			</tr>
-<?	} ?> 
+<?	} ?>
 		</table>
 	</div>
 <?
 }
 
-?> 
+?>
 	<h3>Invitee list</h3>
 	<div class="box pad">
 		<table width="100%">
@@ -198,7 +198,7 @@
 	foreach ($Invited as $User) {
 		list($ID, $Email, $Uploaded, $Downloaded, $JoinDate, $LastAccess) = $User;
 		$Row = ($Row == 'a') ? 'b' : 'a';
-?> 
+?>
 			<tr class="row<?=$Row?>">
 				<td><?=Users::format_username($ID, true, true, true, true)?></td>
 				<td><?=display_str($Email)?></td>
diff --git a/sections/user/invitetree.php b/sections/user/invitetree.php
index 9374f1a9..abedc8f4 100644
--- a/sections/user/invitetree.php
+++ b/sections/user/invitetree.php
@@ -1,7 +1,7 @@
 <?
 if(isset($_GET['userid']) && check_perms('users_view_invites')){
 	if(!is_number($_GET['userid'])){ error(403); }
-	
+
 	$UserID=$_GET['userid'];
 	$Sneaky = true;
 } else {
@@ -10,7 +10,7 @@
 		list($UserCount) = $DB->next_record();
 		$Cache->cache_value('stats_user_count', $UserCount, 0);
 	}
-	
+
 	$UserID = $LoggedUser['ID'];
 	$Sneaky = false;
 }
diff --git a/sections/user/manage_linked.php b/sections/user/manage_linked.php
index 5101980f..35dcfd0b 100644
--- a/sections/user/manage_linked.php
+++ b/sections/user/manage_linked.php
@@ -1,18 +1,18 @@
 <?
 	authorize();
 	include(SERVER_ROOT.'/sections/user/linkedfunctions.php');
-	
+
 	if (!check_perms('users_mod')) {
 		error(403);
 	}
-	
+
 	$UserID = $_REQUEST['userid'];
-	
+
 	switch ($_REQUEST['dupeaction']) {
 		case 'remove':
 			unlink_user($_REQUEST['removeid']);
 			break;
-			
+
 		case 'update':
 			if ($_REQUEST['target']) {
 				$Target = $_REQUEST['target'];
@@ -23,15 +23,15 @@
 					error("User '$Target' not found.");
 				}
 			}
-			
+
 			$DB->query("SELECT GroupID FROM users_dupes WHERE UserID = '$UserID'");
 			list($GroupID) = $DB->next_record();
-			
+
 			if ($_REQUEST['dupecomments'] && $GroupID) {
 				dupe_comments($GroupID, $_REQUEST['dupecomments']);
 			}
 			break;
-			
+
 		default:
 			error(403);
 	}
diff --git a/sections/user/notify_handle.php b/sections/user/notify_handle.php
index 0c68ed40..d36d1d8f 100644
--- a/sections/user/notify_handle.php
+++ b/sections/user/notify_handle.php
@@ -148,7 +148,7 @@
 		ToYear='$ToYear'
 		WHERE ID='".$_POST['id'.$FormID]."' AND UserID='$LoggedUser[ID]'");
 } else {
-	$DB->query("INSERT INTO users_notify_filters 
+	$DB->query("INSERT INTO users_notify_filters
 		(UserID, Label, Artists, ExcludeVA, NewGroupsOnly, Tags, NotTags, ReleaseTypes, Categories, Formats, Encodings, Media, FromYear, ToYear)
 		VALUES
 		('$LoggedUser[ID]','".db_string($_POST['label'.$FormID])."','$ArtistList','$ExcludeVA','$NewGroupsOnly','$TagList', '$NotTagList', '$ReleaseTypeList','$CategoryList','$FormatList','$EncodingList','$MediaList', '$FromYear', '$ToYear')");
diff --git a/sections/user/permissions.php b/sections/user/permissions.php
index 20043d33..2d68cabd 100644
--- a/sections/user/permissions.php
+++ b/sections/user/permissions.php
@@ -7,9 +7,9 @@
 
 list($UserID, $Username, $PermissionID) = array_values(Users::user_info($_REQUEST['userid']));
 
-$DB->query("SELECT 
-		u.CustomPermissions 
-	FROM users_main AS u 
+$DB->query("SELECT
+		u.CustomPermissions
+	FROM users_main AS u
 	WHERE u.ID='$UserID'");
 
 list($Customs)=$DB->next_record(MYSQLI_NUM, false);
@@ -30,7 +30,7 @@
 	}
 	if (!is_number($_POST['maxcollages']) && !empty($_POST['maxcollages'])) { error("Please enter a valid number of extra personal collages"); }
 	$Delta['MaxCollages'] = $_POST['maxcollages'];
-	
+
 	$Cache->begin_transaction('user_info_heavy_'.$UserID);
 	$Cache->update_row(false, array('CustomPermissions' => $Delta));
 	$Cache->commit_transaction(0);
diff --git a/sections/user/search.php b/sections/user/search.php
index 9fd781a5..532c28ed 100644
--- a/sections/user/search.php
+++ b/sections/user/search.php
@@ -7,7 +7,7 @@
 	
 	$_GET['username'] = $_GET['search'];
 }
- 
+
 define('USERS_PER_PAGE', 30);
 
 if (isset($_GET['username'])) {
@@ -16,7 +16,7 @@
 	// form submitted
 	$Val->SetFields('username','1','username','Please enter a username.');
 	$Err = $Val->ValidateForm($_GET);
-	
+
 	if(!$Err){
 		// Passed validation. Let's rock.
 		list($Page,$Limit) = Format::page_limit(USERS_PER_PAGE);
diff --git a/sections/user/subscribe.php b/sections/user/subscribe.php
index 796ae54f..29808904 100644
--- a/sections/user/subscribe.php
+++ b/sections/user/subscribe.php
@@ -4,7 +4,7 @@
 
 $UserID = db_string($_GET['userid']);
 if($_GET['perform'] == 'add') {
-	$DB->query("INSERT IGNORE INTO subscribed_users (UserID, SubscriberID) VALUES ('$UserID', '$LoggedUser[ID]')");	
+	$DB->query("INSERT IGNORE INTO subscribed_users (UserID, SubscriberID) VALUES ('$UserID', '$LoggedUser[ID]')");
 }
 elseif($_GET['perform'] == 'remove') {
 	$DB->query("DELETE FROM subscribed_users WHERE UserID = '$UserID' AND SubscriberID = '$LoggedUser[ID]'");
diff --git a/sections/user/takeedit.php b/sections/user/takeedit.php
index cd7866d7..0bb7fce5 100644
--- a/sections/user/takeedit.php
+++ b/sections/user/takeedit.php
@@ -6,7 +6,7 @@
 	error(404);
 }
 
-//For the entire of this page we should in general be using $UserID not $LoggedUser['ID'] and $U[] not $LoggedUser[]	
+//For the entire of this page we should in general be using $UserID not $LoggedUser['ID'] and $U[] not $LoggedUser[]
 $U = Users::user_info($UserID);
 
 if (!$U) {
@@ -135,22 +135,22 @@
 		}
 	}
 	if(!$Err) {
-		$NewEmail = db_string($_POST['email']);		
+		$NewEmail = db_string($_POST['email']);
+
 
-	
 		//This piece of code will update the time of their last email change to the current time *not* the current change.
 		$ChangerIP = db_string($LoggedUser['IP']);
 		$DB->query("UPDATE users_history_emails SET Time='".sqltime()."' WHERE UserID='$UserID' AND Time='0000-00-00 00:00:00'");
 		$DB->query("INSERT INTO users_history_emails
 				(UserID, Email, Time, IP) VALUES
 				('$UserID', '$NewEmail', '0000-00-00 00:00:00', '".db_string($_SERVER['REMOTE_ADDR'])."')");
-		
+
 	} else {
 		error($Err);
 		header('Location: user.php?action=edit&userid='.$UserID);
 		die();
 	}
-	
+
 	
 }
 //End Email change
@@ -160,10 +160,10 @@
 	list($PassHash,$Secret)=$DB->next_record();
 
 	if (Users::check_password($_POST['cur_pass'], $PassHash, $Secret)) {
-		if ($_POST['new_pass_1'] && $_POST['new_pass_2']) { 
-			$ResetPassword = true; 
+		if ($_POST['new_pass_1'] && $_POST['new_pass_2']) {
+			$ResetPassword = true;
 		}
-	} else { 
+	} else {
 		$Err = "You did not enter the correct password.";
 	}
 }
@@ -297,9 +297,9 @@
 }
 
 if (isset($_POST['resetpasskey'])) {
+
 	
-	
-	
+
 	$UserInfo = Users::user_heavy_info($UserID);
 	$OldPassKey = db_string($UserInfo['torrent_pass']);
 	$NewPassKey = db_string(Users::make_secret());
@@ -312,7 +312,7 @@
 	$Cache->update_row(false, array('torrent_pass'=>$NewPassKey));
 	$Cache->commit_transaction(0);
 	$Cache->delete_value('user_'.$OldPassKey);
-	
+
 	Tracker::update_tracker('change_passkey', array('oldpasskey' => $OldPassKey, 'newpasskey' => $NewPassKey));
 }
 
diff --git a/sections/user/takeinvite.php b/sections/user/takeinvite.php
index 3b759cd3..e2c4f571 100644
--- a/sections/user/takeinvite.php
+++ b/sections/user/takeinvite.php
@@ -19,7 +19,7 @@
 	$LoggedUser['DisableInvites'] == '1'||
 	$LoggedUser['Invites']==0 && !check_perms('site_send_unlimited_invites') ||
 	($UserCount >= USER_LIMIT && USER_LIMIT != 0 && !check_perms('site_can_invite_always'))) {
-		
+
 		error(403);
 }
 
@@ -53,7 +53,7 @@
 		die();
 	}
 	$InviteKey = db_string(Users::make_secret());
-		
+
 $Message = <<<EOT
 The user $Username has invited you to join $SiteName, and has specified this address ($CurEmail) as your email address. If you do not know this person, please ignore this email, and do not reply.
 
@@ -63,12 +63,12 @@
 
 http://$SiteURL/register.php?invite=$InviteKey
 
-After you register, you will be able to use your account. Please take note that if you do not use this invite in the next 3 days, it will expire. We urge you to read the RULES and the wiki immediately after you join. 
+After you register, you will be able to use your account. Please take note that if you do not use this invite in the next 3 days, it will expire. We urge you to read the RULES and the wiki immediately after you join.
 
 Thank you,
 $SiteName Staff
 EOT;
-	
+
 	$DB->query("INSERT INTO invites
 		(InviterID, InviteKey, Email, Expires) VALUES
 		('$LoggedUser[ID]', '$InviteKey', '".db_string($CurEmail)."', '$InviteExpires')");
@@ -79,7 +79,7 @@
 		$Cache->update_row(false, array('Invites'=>'-1'));
 		$Cache->commit_transaction(0);
 	}
-	
+
 	Misc::send_email($CurEmail, 'You have been invited to '.SITE_NAME, $Message,'noreply');
 
 	
diff --git a/sections/user/takemoderate.php b/sections/user/takemoderate.php
index 25334cfe..f96cf2e7 100644
--- a/sections/user/takemoderate.php
+++ b/sections/user/takemoderate.php
@@ -34,7 +34,7 @@
 $SupportFor = db_string($_POST['SupportFor']);
 $Pass = $_POST['ChangePassword'];
 $Warned = (isset($_POST['Warned']))? 1 : 0;
-$Logs095 = (int)$_POST['095logs']; 
+$Logs095 = (int)$_POST['095logs'];
 if(isset($_POST['Uploaded']) && isset($_POST['Downloaded'])) {
 	$Uploaded = ($_POST['Uploaded'] == "" ? 0 : $_POST['Uploaded']);
 	if($Arithmetic = strpbrk($Uploaded, '+-')) {
@@ -160,9 +160,9 @@
 	$DB->query("DELETE FROM users_main WHERE id=".$UserID);
 	$DB->query("DELETE FROM users_info WHERE UserID=".$UserID);
 	$Cache->delete_value('user_info_'.$UserID);
-	
+
 	Tracker::update_tracker('remove_user', array('passkey' => $Cur['torrent_pass']));
-	
+
 	header("Location: log.php?search=User+".$UserID);
 	die();
 }
@@ -212,7 +212,7 @@
 	$Cache->delete_value('user_info_heavy_'.$UserID);
 	$Cache->delete_value('user_stats_'.$UserID);
 	$Cache->delete_value('enabled_'.$UserID);
-	
+
 	if($_POST['LogOut']) {
 		$DB->query("SELECT SessionID FROM users_sessions WHERE UserID='$UserID'");
 		while(list($SessionID) = $DB->next_record()) {
@@ -338,14 +338,14 @@
 	$LightUpdates['Visible']=$Visible;
 }
 
-if ($Uploaded!=$Cur['Uploaded'] && $Uploaded!=$_POST['OldUploaded'] && (check_perms('users_edit_ratio') 
+if ($Uploaded!=$Cur['Uploaded'] && $Uploaded!=$_POST['OldUploaded'] && (check_perms('users_edit_ratio')
  || (check_perms('users_edit_own_ratio') && $UserID == $LoggedUser['ID']))) {
 	$UpdateSet[]="Uploaded='".$Uploaded."'";
 	$EditSummary[]="uploaded changed from ".Format::get_size($Cur['Uploaded'])." to ".Format::get_size($Uploaded);
 	$Cache->delete_value('users_stats_'.$UserID);
 }
 
-if ($Downloaded!=$Cur['Downloaded'] && $Downloaded!=$_POST['OldDownloaded'] && (check_perms('users_edit_ratio') 
+if ($Downloaded!=$Cur['Downloaded'] && $Downloaded!=$_POST['OldDownloaded'] && (check_perms('users_edit_ratio')
  || (check_perms('users_edit_own_ratio') && $UserID == $LoggedUser['ID']))) {
 	$UpdateSet[]="Downloaded='".$Downloaded."'";
 	$EditSummary[]="downloaded changed from ".Format::get_size($Cur['Downloaded'])." to ".Format::get_size($Downloaded);
@@ -378,9 +378,9 @@
 	$LightUpdates['Warned']='0000-00-00 00:00:00';
 
 } elseif ($Warned == 1 && $ExtendWarning!='---' && check_perms('users_warn')) {
-	
+
 	Misc::send_pm($UserID,0,db_string('Your warning has been extended'),db_string("Your warning has been extended by $ExtendWarning week(s) by [user]".$LoggedUser['Username']."[/user]. The reason given was: $WarnReason"));
-	
+
 	$UpdateSet[]="Warned=Warned + INTERVAL $ExtendWarning WEEK";
 	$DB->query("SELECT Warned + INTERVAL $ExtendWarning WEEK FROM users_info WHERE UserID='$UserID'");
 	list($WarnedUntil) = $DB->next_record();
@@ -389,9 +389,9 @@
 	$EditSummary[]= db_string($Msg);
 	$LightUpdates['Warned']=$WarnedUntil;
 } elseif ($Warned == 1 && $ExtendWarning=='---' && $ReduceWarning!='---' && check_perms('users_warn')) {
-	
+
 	Misc::send_pm($UserID,0,db_string('Your warning has been reduced'),db_string("Your warning has been reduced by $ReduceWarning week(s) by [user]".$LoggedUser['Username']."[/user]. The reason given was: $WarnReason"));
-	
+
 	$UpdateSet[]="Warned=Warned - INTERVAL $ReduceWarning WEEK";
 	$DB->query("SELECT Warned - INTERVAL $ReduceWarning WEEK FROM users_info WHERE UserID='$UserID'");
 	list($WarnedUntil) = $DB->next_record();
@@ -448,8 +448,8 @@
 
 if ($DisableInvites!=$Cur['DisableInvites'] && check_perms('users_disable_any')) {
 	$UpdateSet[]="DisableInvites='$DisableInvites'";
-	if ($DisableInvites == 1) { 
-		//$UpdateSet[]="Invites='0'"; 
+	if ($DisableInvites == 1) {
+		//$UpdateSet[]="Invites='0'";
 		if (!empty($UserReason)) {
 			Misc::send_pm($UserID, 0, db_string('Your invite privileges have been disabled'),db_string("Your invite privileges have been disabled. The reason given was: $UserReason. If you would like to discuss this please join ".BOT_DISABLED_CHAN." on our IRC network. Instructions can be found [url=https://".NONSSL_SITE_URL."/wiki.php?action=article&amp;name=IRC+-+How+to+join]here[/url]."));
 		}
@@ -496,13 +496,13 @@
 
 if ($DisableWiki!=$Cur['DisableWiki'] && check_perms('users_disable_any')) {
 	$UpdateSet[]="DisableWiki='$DisableWiki'";
-	$EditSummary[]="wiki status changed";	
+	$EditSummary[]="wiki status changed";
 	$HeavyUpdates['DisableWiki']=$DisableWiki;
 	$HeavyUpdates['site_edit_wiki']=0;
 	if (!empty($UserReason)) {
 		Misc::send_pm($UserID, 0, db_string('Your site editing privileges have been disabled'),db_string("Your site editing privileges have been disabled. The reason given was: $UserReason. If you would like to discuss this please join ".BOT_DISABLED_CHAN." on our IRC network. Instructions can be found [url=https://".NONSSL_SITE_URL."/wiki.php?action=article&amp;name=IRC+-+How+to+join]here[/url]."));
 	}
-	
+
 }
 
 if ($DisablePM!=$Cur['DisablePM'] && check_perms('users_disable_any')) {
@@ -545,7 +545,7 @@
 			$UpdateSet[]="i.RatioWatchEnds='0000-00-00 00:00:00'";
 			$CanLeech = 1;
 			$UpdateSet[]="m.can_leech='1'";
-			$UpdateSet[]="i.RatioWatchDownload='0'";	
+			$UpdateSet[]="i.RatioWatchDownload='0'";
 		} else {
 			$EnableStr .= ' (Ratio: '.Format::get_ratio_html($Cur['Uploaded'], $Cur['Downloaded'], false).', RR: '.number_format($Cur['RequiredRatio'],2).')';
 			if ($Cur['RatioWatchEnds'] != '0000-00-00 00:00:00') {
@@ -661,17 +661,17 @@
 if ($EditSummary) {
 	$Summary = implode(', ', $EditSummary)." by ".$LoggedUser['Username'];
 	$Summary = sqltime().' - '.ucfirst($Summary);
-	
+
 	if ($Reason){
 		$Summary .= "\nReason: ".$Reason;
 	}
+
 	
-	
-	
+
 	$Summary .= "\n\n".$AdminComment;
 } elseif (empty($UpdateSet) && empty($EditSummary) && $Cur['AdminComment']==$_POST['AdminComment']) {
 	$Summary = sqltime().' - '.'Comment added by '.$LoggedUser['Username'].': '.$Reason."\n\n";
-	
+
 	
 }
 
diff --git a/sections/userhistory/email_history.php b/sections/userhistory/email_history.php
index 75d3d409..0291c6a6 100644
--- a/sections/userhistory/email_history.php
+++ b/sections/userhistory/email_history.php
@@ -48,7 +48,7 @@
 							WHERE h.UserID='$UserID' AND h2.UserID>0"/*AND Time<>'0000-00-00 00:00:00'*/."
 				ORDER BY Time DESC");
 } else {
-	$DB->query("SELECT 
+	$DB->query("SELECT
 					u.Email,
 					'".sqltime()."' AS Time,
 					u.IP,
@@ -56,8 +56,8 @@
 				FROM users_main AS u
 				LEFT JOIN geoip_country AS c ON INET_ATON(u.IP) BETWEEN c.StartIP AND c.EndIP
 				WHERE u.ID='$UserID'
-				UNION SELECT 
-					h.Email, 
+				UNION SELECT
+					h.Email,
 					h.Time,
 					h.IP,
 					c.Code
@@ -110,7 +110,7 @@
 			$DB->set_query_id($ueQuery);
 ?>
 		<td><a href="<?=display_str($UserURL)?>"><?=Users::format_username($UserID2, false, false, true)?></a></td>
-	</tr>	
+	</tr>
 <?
 		}
 	}
diff --git a/sections/userhistory/index.php b/sections/userhistory/index.php
index 387cc734..320948ec 100644
--- a/sections/userhistory/index.php
+++ b/sections/userhistory/index.php
@@ -3,10 +3,10 @@
 User history switch center
 
 
-This page acts as a switch that includes the real user history pages (to keep 
+This page acts as a switch that includes the real user history pages (to keep
 the root less cluttered).
 
-enforce_login() is run here - the entire user history pages are off limits for 
+enforce_login() is run here - the entire user history pages are off limits for
 non members.
 *****************************************************************/
 
@@ -81,7 +81,7 @@
 	userid (index)
 	ip (stored using ip2long())
 	timestamp
-	
+
 users_history_passwd:
 	id (auto_increment, index)
 	userid (index)
@@ -105,7 +105,7 @@
 	old_passkey
 	new_passkey
 	timestamp
-	
+
 users_history_stats:
 	id (auto_increment, index)
 	userid (index)
diff --git a/sections/userhistory/ip_history.php b/sections/userhistory/ip_history.php
index 3818f22d..9bf17b2a 100644
--- a/sections/userhistory/ip_history.php
+++ b/sections/userhistory/ip_history.php
@@ -18,7 +18,7 @@
 $DB->query("SELECT um.Username, p.Level AS Class FROM users_main AS um LEFT JOIN permissions AS p ON p.ID=um.PermissionID WHERE um.ID = ".$UserID);
 list($Username, $Class) = $DB->next_record();
 
-if(!check_perms('users_view_ips', $Class)) { 
+if(!check_perms('users_view_ips', $Class)) {
 	error(403);
 }
 
@@ -37,7 +37,7 @@ function ShowIPs(rowname) {
 
 }
 function Ban(ip, id, elemID) {
-	var notes = prompt("Enter notes for this ban"); 
+	var notes = prompt("Enter notes for this ban");
 	if(notes != null && notes.length > 0) {
 		var xmlhttp;
 		if (window.XMLHttpRequest) {
@@ -142,13 +142,13 @@ function UnBan(ip, id, elemID) {
 		<tr class="colhead">
 			<td>IP address search</td>
 		</tr>
-		
+
 		<tr><td>
 			<form class="search_form" name="ip_log" method="post" action="">
 				<input type="text" name="ip" />
 				<input type="submit" value="Search" />
 			</form>
-		</td></tr>	
+		</td></tr>
 	</table>
 
 <table>
@@ -188,7 +188,7 @@ function UnBan(ip, id, elemID) {
 			if(!isset($IPs[$IP])) {
 					$sql = "SELECT ID, FromIP, ToIP FROM ip_bans WHERE '".Tools::ip_to_unsigned($IP)."' BETWEEN FromIP AND ToIP LIMIT 1";
 			$DB->query($sql);
-			
+
 			if($DB->record_count() > 0) {
 							$IPs[$IP] = true;
 			?>
@@ -199,15 +199,15 @@ function UnBan(ip, id, elemID) {
 				<a id="<?=$counter?>" href="#" onclick="Ban('<?=$IP?>', '<?=$ID?>', '<?=$counter?>'); this.onclick=null;return false;" class="brackets">Ban</a>
 <?			}
 			$counter++;
-		} 
-	}	
+		}
+	}
 ?>
 
 
 			<br />
 			<?=Tools::get_host_by_ajax($IP)?>
-			<?=($HasDupe ? 
-			'<a href="#" onclick="ShowIPs('.$Index.'); return false;">('.count($UserIDs).')</a>' 
+			<?=($HasDupe ?
+			'<a href="#" onclick="ShowIPs('.$Index.'); return false;">('.count($UserIDs).')</a>'
 			: '(0)')?></td>
 			<td><?=time_diff($StartTime)?></td>
 			<td><?=time_diff($EndTime)?></td>
@@ -226,7 +226,7 @@ function UnBan(ip, id, elemID) {
 			<td><?//time_diff(strtotime($UserStartTimes[$Key]), strtotime($UserEndTimes[$Key])); ?></td>
 		</tr>
 <?
-			
+
 		}
 	}
 ?>
diff --git a/sections/userhistory/ip_tracker_history.php b/sections/userhistory/ip_tracker_history.php
index 58656ffb..392cc173 100644
--- a/sections/userhistory/ip_tracker_history.php
+++ b/sections/userhistory/ip_tracker_history.php
@@ -20,7 +20,7 @@
 $DB->query("SELECT um.Username, p.Level AS Class FROM users_main AS um LEFT JOIN permissions AS p ON p.ID=um.PermissionID WHERE um.ID = ".$UserID);
 list($Username, $Class) = $DB->next_record();
 
-if(!check_perms('users_view_ips', $Class)) { 
+if(!check_perms('users_view_ips', $Class)) {
 	error(403);
 }
 
diff --git a/sections/userhistory/passkey_history.php b/sections/userhistory/passkey_history.php
index 94aa2474..8300eb62 100644
--- a/sections/userhistory/passkey_history.php
+++ b/sections/userhistory/passkey_history.php
@@ -16,15 +16,15 @@
 $DB->query("SELECT um.Username, p.Level AS Class FROM users_main AS um LEFT JOIN permissions AS p ON p.ID=um.PermissionID WHERE um.ID = ".$UserID);
 list($Username, $Class) = $DB->next_record();
 
-if(!check_perms('users_view_keys', $Class)) { 
+if(!check_perms('users_view_keys', $Class)) {
 	error(403);
 }
 
 View::show_header("PassKey history for $Username");
 
-$DB->query("SELECT 
-	OldPassKey, 
-	NewPassKey, 
+$DB->query("SELECT
+	OldPassKey,
+	NewPassKey,
 	ChangeTime,
 	ChangerIP
 	FROM users_history_passkeys
diff --git a/sections/userhistory/password_history.php b/sections/userhistory/password_history.php
index 5d5d1542..1980cc58 100644
--- a/sections/userhistory/password_history.php
+++ b/sections/userhistory/password_history.php
@@ -2,7 +2,7 @@
 /************************************************************************
 ||------------|| Password reset history page ||------------------------||
 
-This page lists password reset IP and Times a user has made on the site. 
+This page lists password reset IP and Times a user has made on the site.
 It gets called if $_GET['action'] == 'password'.
 
 It also requires $_GET['userid'] in order to get the data for the correct
@@ -16,13 +16,13 @@
 $DB->query("SELECT um.Username, p.Level AS Class FROM users_main AS um LEFT JOIN permissions AS p ON p.ID=um.PermissionID WHERE um.ID = ".$UserID);
 list($Username, $Class) = $DB->next_record();
 
-if(!check_perms('users_view_keys', $Class)) { 
+if(!check_perms('users_view_keys', $Class)) {
 	error(403);
 }
 
 View::show_header("Password reset history for $Username");
 
-$DB->query("SELECT 
+$DB->query("SELECT
 	ChangeTime,
 	ChangerIP
 	FROM users_history_passwords
diff --git a/sections/userhistory/post_history.php b/sections/userhistory/post_history.php
index 2bd8d414..97f12d30 100644
--- a/sections/userhistory/post_history.php
+++ b/sections/userhistory/post_history.php
@@ -37,7 +37,7 @@
 		FROM users_main AS m
 		JOIN users_info AS i ON i.UserID = m.ID
 		WHERE m.ID = $UserID");
-	
+
 	if($DB->record_count() == 0){ // If user doesn't exist
 		error(404);
 	}
@@ -164,22 +164,22 @@
 		$sql.='
 		AND ((t.IsLocked=\'0\' OR t.IsSticky=\'1\') AND (l.PostID<t.LastPostID OR l.PostID IS NULL)) ';
 	}
-	
+
 	$sql .= '
 		ORDER BY p.ID DESC';
-	
+
 	if($ShowGrouped) {
 		$sql.='
 		) AS sub
 		GROUP BY TopicID ORDER BY ID DESC';
 	}
-	
+
 	$sql.=' LIMIT '.$Limit;
 	$Posts = $DB->query($sql);
-	
+
 	$DB->query("SELECT FOUND_ROWS()");
 	list($Results) = $DB->next_record();
-	
+
 	$DB->set_query_id($Posts);
 }
 
@@ -208,7 +208,7 @@
 		$Cache->cache_value('subscriptions_user_'.$LoggedUser['ID'],$UserSubscriptions,0);
 		$DB->set_query_id($Posts);
 	}
-	
+
 	if(!$ShowUnread){ ?>
 		<br /><br />
 		<? if($ShowGrouped) { ?>
@@ -220,7 +220,7 @@
 <?	} else { ?>
 		<br /><br />
 		<a href="userhistory.php?action=posts&amp;userid=<?=$UserID?>&amp;showunread=0&amp;group=0" class="brackets">Show all posts</a>&nbsp;&nbsp;&nbsp;
-<?	
+<?
 		if(!$ShowGrouped) {
 			?><a href="userhistory.php?action=posts&amp;userid=<?=$UserID?>&amp;showunread=1&amp;group=1" class="brackets">Only display posts with unread replies (grouped)</a>&nbsp;&nbsp;&nbsp;<?
 		}
@@ -305,7 +305,7 @@
 ?>
 				<img src="<?=$Avatar?>" width="150" style="max-height:400px;" alt="<?=$Username?>'s avatar" />
 <?
-				} 
+				}
 ?>
 			</td>
 <?
@@ -322,7 +322,7 @@
 <? 				} ?>
 					Last edited by
 					<?=Users::format_username($EditedUserID, false, false, false) ?> <?=time_diff($EditedTime,2,true,true)?>
-<?			} ?>		
+<?			} ?>
 				</div>
 			</td>
 		</tr>
diff --git a/sections/userhistory/subscriptions.php b/sections/userhistory/subscriptions.php
index 1ac10942..1faf4274 100644
--- a/sections/userhistory/subscriptions.php
+++ b/sections/userhistory/subscriptions.php
@@ -31,7 +31,7 @@
 	SQL_CALC_FOUND_ROWS
 	MAX(p.ID) AS ID
 	FROM (SELECT TopicID
-	FROM users_subscriptions 
+	FROM users_subscriptions
 	WHERE UserID = '.$LoggedUser['ID'].') AS s
 	LEFT JOIN forums_last_read_topics AS l ON s.TopicID = l.TopicID AND l.UserID = '.$LoggedUser['ID'].'
 	JOIN forums_topics AS t ON t.ID = s.TopicID
@@ -52,7 +52,7 @@
 
 	$sql .= '
 	AND IF(l.PostID IS NULL OR (t.IsLocked = \'1\' && t.IsSticky = \'0\'), t.LastPostID, l.PostID) < t.LastPostID';
-	$sql .= ' OR (t.AuthorID != '.$LoggedUser['ID'].' AND l.PostID IS NULL)'; 
+	$sql .= ' OR (t.AuthorID != '.$LoggedUser['ID'].' AND l.PostID IS NULL)';
 
 }
 $sql .= '
diff --git a/sections/userhistory/token_history.php b/sections/userhistory/token_history.php
index d79b5440..174d4b48 100644
--- a/sections/userhistory/token_history.php
+++ b/sections/userhistory/token_history.php
@@ -29,7 +29,7 @@
 	if (!check_perms('users_mod')) { error(403); }
 	$UserID = $_GET['userid'];
 	$TorrentID = $_GET['torrentid'];
-	
+
 	if (!is_number($UserID) || !is_number($TorrentID)) { error(403); }
 	$DB->query("SELECT info_hash FROM torrents where ID = $TorrentID");
 	if (list($InfoHash) = $DB->next_record(MYSQLI_NUM, FALSE)) {
@@ -90,7 +90,7 @@
 $i = true;
 foreach ($Tokens as $Token) {
 	$i = !$i;
-	list($TorrentID, $GroupID, $Time, $Expired, $Downloaded, $Uses, $Name, $Format, $Encoding) = $Token; 
+	list($TorrentID, $GroupID, $Time, $Expired, $Downloaded, $Uses, $Name, $Format, $Encoding) = $Token;
 	$Name = "<a href=\"torrents.php?torrentid=$TorrentID\">$Name</a>";
 	$ArtistName = Artists::display_artists($Artists[$GroupID]);
 	if($ArtistName) {
diff --git a/sections/wiki/aliases.php b/sections/wiki/aliases.php
index e9c37e76..bb841bd9 100644
--- a/sections/wiki/aliases.php
+++ b/sections/wiki/aliases.php
@@ -41,7 +41,7 @@
 				<td><?=$Title?></td>
 
 			</tr>
-<? 	
+<?
 $DB->query("SELECT Alias FROM wiki_aliases WHERE ArticleID='$ArticleID'");
 while(list($Revision, $Title, $AuthorID, $AuthorName, $Date) = $DB->next_record()) { ?>
 			<tr>
diff --git a/sections/wiki/compare.php b/sections/wiki/compare.php
index b3ba23ed..d8880da6 100644
--- a/sections/wiki/compare.php
+++ b/sections/wiki/compare.php
@@ -5,7 +5,7 @@ function diff($OldText, $NewText) {
 	$LineArrayNew = explode("\n",$NewText);
 	$LineOffset = 0;
 	$Result = array();
-	
+
 	foreach($LineArrayOld as $OldLine => $OldString) {
 		$Key = $OldLine + $LineOffset;
 		if($Key<0) { $Key = 0; }
@@ -19,28 +19,28 @@ function diff($OldText, $NewText) {
 				break;
 			}
 		}
-		
+
 		if($Found=='-1') { //we never found the old line in the new array
 			$Result[] = '<span class="line_deleted">&larr; '.$OldString.'</span><br />';
 			$LineOffset = $LineOffset - 1;
-		} elseif ($Found ==$OldLine+$LineOffset) { 
+		} elseif ($Found ==$OldLine+$LineOffset) {
 			$Result[] = '<span class="line_unchanged">&#8597; '.$OldString.'</span><br />';
 		} elseif ($Found != $OldLine+$LineOffset) {
 			if ($Found < $OldLine+$LineOffset) {
-				$Result[] = '<span class="line_moved">&#8676; '.$OldString.'</span><br />'; 
-			} else { 
+				$Result[] = '<span class="line_moved">&#8676; '.$OldString.'</span><br />';
+			} else {
 				$Result[] = '<span class="line_moved">&larr; '.$OldString.'</span><br />';
 				$Key = $OldLine + $LineOffset;
 				while ($Key<$Found) {
 					$Result[] = '<span class="line_new">&rarr; '.$LineArrayNew[$Key].'</span><br />';
 					$Key++;
 				}
-				$Result[] = '<span class="line_moved">&rarr; '.$OldString.'</span><br />'; 
+				$Result[] = '<span class="line_moved">&rarr; '.$OldString.'</span><br />';
 			}
-				$LineOffset = $Found-$OldLine; 
+				$LineOffset = $Found-$OldLine;
 		}
 	}
-	if(count($LineArrayNew)>count($LineArrayOld) + $LineOffset) { 
+	if(count($LineArrayNew)>count($LineArrayOld) + $LineOffset) {
 		$Key = count($LineArrayOld) + $LineOffset;
 		while($Key<count($LineArrayNew)) {
 			$Result[] = '<span class="line_new">&rarr; '.$LineArrayNew[$Key].'</span><br />';
@@ -64,12 +64,12 @@ function get_body($ID, $Rev) {
 }
 
 if (
-	!isset($_GET['old']) || 
-	!isset($_GET['new']) || 
-	!isset($_GET['id']) || 
-	!is_number($_GET['old']) || 
-	!is_number($_GET['new']) || 
-	!is_number($_GET['id']) || 
+	!isset($_GET['old']) ||
+	!isset($_GET['new']) ||
+	!isset($_GET['id']) ||
+	!is_number($_GET['old']) ||
+	!is_number($_GET['new']) ||
+	!is_number($_GET['id']) ||
 	$_GET['old'] > $_GET['new']
 ) { error(0); }
 
diff --git a/sections/wiki/edit.php b/sections/wiki/edit.php
index a496742a..bc6808af 100644
--- a/sections/wiki/edit.php
+++ b/sections/wiki/edit.php
@@ -4,7 +4,7 @@
 
 $Article = $Alias->article($ArticleID);
 list($Revision, $Title, $Body, $Read, $Edit, $Date, $Author) = array_shift($Article);
-if($Edit > $LoggedUser['EffectiveClass']){ 
+if($Edit > $LoggedUser['EffectiveClass']){
 	error('You do not have access to edit this article.');
 }
 
diff --git a/sections/wiki/revisions.php b/sections/wiki/revisions.php
index edb44ab7..9448155d 100644
--- a/sections/wiki/revisions.php
+++ b/sections/wiki/revisions.php
@@ -33,10 +33,10 @@
 				<td><input type="radio" name="old" value="<?=$Revision?>" disabled="disabled" /></td>
 				<td><input type="radio" name="new" value="<?=$Revision?>" checked="checked" /></td>
 			</tr>
-<? 	
-$DB->query("SELECT 
-	w.Revision, 
-	w.Title, 
+<?
+$DB->query("SELECT
+	w.Revision,
+	w.Title,
 	w.Author,
 	w.Date
 	FROM wiki_revisions AS w
diff --git a/sections/wiki/search.php b/sections/wiki/search.php
index cab2288f..dce8dc17 100644
--- a/sections/wiki/search.php
+++ b/sections/wiki/search.php
@@ -32,9 +32,9 @@
 $Way = $WayTable[$_GET['way']];
 if(!$Way) { $Way = 'DESC'; }
 
-$SQL = "SELECT SQL_CALC_FOUND_ROWS 
-	w.ID, 
-	w.Title, 
+$SQL = "SELECT SQL_CALC_FOUND_ROWS
+	w.ID,
+	w.Title,
 	w.Date,
 	w.Author
 	FROM wiki_articles AS w
@@ -99,7 +99,7 @@
 						<input type="submit" value="Search" />
 					</td>
 				</tr>
-			</table>	
+			</table>
 		</form>
 	</div>
 	<br />
diff --git a/sections/wiki/takecreate.php b/sections/wiki/takecreate.php
index f94bb8ac..ad692483 100644
--- a/sections/wiki/takecreate.php
+++ b/sections/wiki/takecreate.php
@@ -35,7 +35,7 @@
 	$Edit=100;
 }
 
-$DB->query("INSERT INTO wiki_articles 
+$DB->query("INSERT INTO wiki_articles
 	(Revision, Title, Body, MinClassRead, MinClassEdit, Date, Author) VALUES
 	('1', '$P[title]', '$P[body]', '$Read', '$Edit', '".sqltime()."', '$LoggedUser[ID]')");
 
diff --git a/sections/wiki/wiki_browse.php b/sections/wiki/wiki_browse.php
index b4d23fd7..22171af3 100644
--- a/sections/wiki/wiki_browse.php
+++ b/sections/wiki/wiki_browse.php
@@ -9,9 +9,9 @@
 
 View::show_header($Title);
 
-$sql = "SELECT SQL_CALC_FOUND_ROWS 
-	w.ID, 
-	w.Title, 
+$sql = "SELECT SQL_CALC_FOUND_ROWS
+	w.ID,
+	w.Title,
 	w.Date,
 	w.Author
 	FROM wiki_articles AS w
diff --git a/staffblog.php b/staffblog.php
index 663fc008..50e58b38 100644
--- a/staffblog.php
+++ b/staffblog.php
@@ -1,3 +1,3 @@
-<? 
+<?
 define('ERROR_EXCEPTION', true);
 require('classes/script_start.php');
diff --git a/static/functions/artist_cloud.js b/static/functions/artist_cloud.js
index d414367a..9e5db00b 100644
--- a/static/functions/artist_cloud.js
+++ b/static/functions/artist_cloud.js
@@ -51,10 +51,10 @@ function addArtist(id, name, score) {
 
 function addArtistMain(name) {
         var item = $('<li><a style="color:#007DC6;" data-weight="350">' + name + '</a></li>');
-		
+
 	$("#currentArtist").attr('href', 'artist.php?id=' + artistId);
 	$("#currentArtist").text(artistName);
-	
+
 
 	$(item).click(function(e) {
                 e.preventDefault();
@@ -62,7 +62,7 @@ function addArtistMain(name) {
         });
 
         artistTags.append(item);
-}	
+}
 
 function reinit(id, name) {
 	artistId = id;
@@ -76,7 +76,7 @@ function createCloud() {
 	  if(!$('#similarArtistsCanvas').tagcanvas({
 
 	// textFont: 'Impact,"Arial Black",sans-serif',
-	wheelZoom: false, 
+	wheelZoom: false,
 	freezeActive: true,
 	weightSize:0.15,
 	interval:20,
diff --git a/static/functions/artists.js b/static/functions/artists.js
index e612d24d..2cc20ad7 100644
--- a/static/functions/artists.js
+++ b/static/functions/artists.js
@@ -8,13 +8,13 @@ function editOrdering() {
 	$('.sidebar').hide();
 	$('.main_column > .box').hide(); // Artist info
 	$('.main_column > #requests').hide();
-	
+
 	$('#savelayout').show();
 	$('#emptylinkbox').show();
 	$('#torrents_allopenclose').show();
-	
+
 	dragObjects = new Array();
-	
+
 	var elems = $('#torrents_tables table').objects;
 	for(i in elems) {
 		var elemID = elems[i].id;
@@ -33,14 +33,14 @@ function editOrdering() {
 			}
 		}
 	}
-	
+
 	for(i in dragObjects) { dragObjects[i].StartListening(); }
 }
 
 function saveOrdering() {
 	$('#savelayout').hide();
 	$('#savinglayout').show();
-	
+
 	var elems = $('#torrents_tables table').objects;
 	var releaseTypes = "{";
 	for(i in elems) {
@@ -55,7 +55,7 @@ function saveOrdering() {
 					releaseType = classes[j].split('_')[1];
 				}
 			}
-		}		
+		}
 		if(releaseType != null) { releaseTypes += '"' + releaseType + '":' + ($('#releases_' + releaseType + '_defaultopen').raw().checked ? 1 : 0) + ","; }
 	}
 	releaseTypes = releaseTypes.substring(0, releaseTypes.length-1) + '}';
@@ -72,8 +72,8 @@ function saveOrderingCallback(response) {
 	for(releaseType in releaseTypes) {
 		if(releaseTypes[releaseType] == 1) { setShow(releaseType, true); }
 		else { setShow(releaseType, false); }
-	}	
-	
+	}
+
 	//Ordering in linkbox
 	var prevOrderedLink = null;
 	for(releaseType in releaseTypes) {
@@ -81,11 +81,11 @@ function saveOrderingCallback(response) {
 		if(elem == undefined) { continue; }
 		if(prevOrderedLink == null) { prevOrderedLink = elem; }
 		else {
-			prevOrderedLink.parentNode.insertBefore(elem, prevOrderedLink.nextSibling);	
+			prevOrderedLink.parentNode.insertBefore(elem, prevOrderedLink.nextSibling);
 			prevOrderedLink = elem;
 		}
 	}
-	
+
 	//Now let's return to the non editing layout.
 	var elems = $('#torrents_tables table').objects;
 	for(i in elems) {
@@ -104,15 +104,15 @@ function saveOrderingCallback(response) {
 			}
 			if(empty) { $('#'+elemID).hide(); }
 		}
-	}	
-	
+	}
+
 	for(i in dragObjects) { dragObjects[i].StopListening(); }
 	dragObjects	= null;
-	
+
 	$('#savinglayout').hide();
 	$('#emptylinkbox').hide();
 	$('#torrents_allopenclose').hide();
-	
+
 	$('#editlayout').show();
 	$('#releasetypes').show();
 	$('#linkbox').show();
@@ -148,7 +148,7 @@ function setDefaultShow(id, show) {
 	else {
 		$('#releases_'+id+'_openlink').show();
 		$('#releases_'+id+'_closedlink').hide();
-		$('#releases_'+id+'_defaultopen').raw().checked = '';	
+		$('#releases_'+id+'_defaultopen').raw().checked = '';
 	}
 }
 
@@ -161,7 +161,7 @@ function setShow(id, show) {
 	else {
 		$('#releases_'+id+'_viewlink').show();
 		$('#releases_'+id+'_hidelink').hide();
-		$('.releases_'+id).hide();	
+		$('.releases_'+id).hide();
 	}
 }
 
@@ -174,7 +174,7 @@ function startDrag(element) {
 	element.style.zIndex = '100';
 
 	$('body').objects[0].style.cursor = 'move';
-	
+
 	dragObjectPlaceholder = document.createElement('TABLE');
 	dragObjectPlaceholder.style.backgroundColor = '#DDDDDD';
 	dragObjectPlaceholder.style.height = element.style.height;
@@ -184,16 +184,16 @@ function startDrag(element) {
 
 function moveDrag(element) {
 	if(
-	  (element.offsetTop > (dragObjectPlaceholder.offsetTop + parseInt(dragObjectPlaceholder.style.height))) || 
+	  (element.offsetTop > (dragObjectPlaceholder.offsetTop + parseInt(dragObjectPlaceholder.style.height))) ||
 	  ((element.offsetTop + parseInt(dragObjectPlaceholder.style.height)) < dragObjectPlaceholder.offsetTop)
 	) {
 		var bestItem = 'END';
 		elems = element.parentNode.childNodes;
-		
+
 		for(var i=0; i < elems.length; i++) {
 			elem = elems[i];
 			if(elem == element || elem.nodeName != 'TABLE') { continue; }
-				
+
 			if((element.offsetTop > dragObjectPlaceholder.offsetTop) && (elem.offsetTop - element.offsetTop) > parseInt(element.style.height)) {
 				bestItem = elem;
 				break;
@@ -204,7 +204,7 @@ function moveDrag(element) {
 			}
 		}
 		if(bestItem == dragObjectPlaceholder) { return; }
-	 
+
 		if(bestItem != 'END') { element.parentNode.insertBefore(dragObjectPlaceholder, element.parentNode.childNodes[i]); }
 		else { element.parentNode.appendChild(dragObjectPlaceholder); }
 	}
@@ -245,7 +245,7 @@ function cancelEvent(e) {
 function Position(x, y) {
 	this.X = x;
 	this.Y = y;
-  
+
 	this.Add = function(val) {
 		var newPos = new Position(this.X, this.Y);
 		if(val != null) {
@@ -254,7 +254,7 @@ function Position(x, y) {
 		}
 		return newPos;
 	}
-  
+
 	this.Subtract = function(val) {
 		var newPos = new Position(this.X, this.Y);
 		if(val != null) {
@@ -262,15 +262,15 @@ function Position(x, y) {
 			if(!isNaN(val.Y)) { newPos.Y -= val.Y; }
 		}
 		return newPos;
-	}  
-  
+	}
+
 	this.Check = function() {
 		var newPos = new Position(this.X, this.Y);
 		if(isNaN(newPos.X)) { newPos.X = 0; }
 		if(isNaN(newPos.Y)) { newPos.Y = 0; }
 		return newPos;
 	}
-  
+
 	this.Apply = function(element, horizontal, vertical) {
 		if(!isNaN(this.X) && horizontal) { element.style.left = this.X + 'px'; }
 		if(!isNaN(this.Y) && vertical) { element.style.top = this.Y + 'px'; }
@@ -279,8 +279,8 @@ function Position(x, y) {
 
 function absoluteCursorPostion(eventObj) {
 	eventObj = eventObj ? eventObj : window.event;
-  
-	if(isNaN(window.scrollX)) { 
+
+	if(isNaN(window.scrollX)) {
 		return new Position(eventObj.clientX + document.documentElement.scrollLeft + document.body.scrollLeft, eventObj.clientY + document.documentElement.scrollTop + document.body.scrollTop);
 	}
 	else { return new Position(eventObj.clientX + window.scrollX, eventObj.clientY + window.scrollY); }
@@ -289,16 +289,16 @@ function absoluteCursorPostion(eventObj) {
 function dragObject(element, handlerElement, startCallback, moveCallback, endCallback) {
 	if(typeof(element) == "string") { element = $('#' + element).raw(); }
 	if(element == null) { return; }
-		
+
 	if(typeof(handlerElement) == "string") { handlerElement = $('#' + handlerElement).raw(); }
 	if(handlerElement == null) { handlerElement = element; }
-		
+
 	var cursorStartPos = null;
 	var elementStartPos = null;
 	var dragging = false;
 	var listening = false;
 	var disposed = false;
-	
+
 	function dragStart(eventObj) {
 		if(dragging || !listening || disposed) { return; }
 		dragging = true;
@@ -306,42 +306,42 @@ function dragObject(element, handlerElement, startCallback, moveCallback, endCal
 		cursorStartPos = absoluteCursorPostion(eventObj);
 		elementStartPos = new Position(parseInt(element.offsetLeft), parseInt(element.offsetTop));
 		elementStartPos = elementStartPos.Check();
-		
+
 		if(startCallback != null) { startCallback(element); }
-		
+
 		addEvent(document, "mousemove", dragGo);
 		addEvent(document, "mouseup", dragStopHook);
 
 		return cancelEvent(eventObj);
 	}
-  
+
 	function dragGo(eventObj) {
 		if(!dragging || disposed) { return; }
-   
+
 		var newPos = absoluteCursorPostion(eventObj);
 		newPos = newPos.Add(elementStartPos).Subtract(cursorStartPos);
 		newPos.Apply(element, false, true);
         if(moveCallback != null) { moveCallback(element); }
 
-		return cancelEvent(eventObj); 
+		return cancelEvent(eventObj);
 	}
-  
+
 	function dragStop() {
 		if(!dragging || disposed) { return; }
 		removeEvent(document, "mousemove", dragGo);
 		removeEvent(document, "mouseup", dragStopHook);
 		cursorStartPos = null;
 		elementStartPos = null;
-		
+
         if(endCallback != null) { endCallback(element); }
 		dragging = false;
 	}
-	
+
  	function dragStopHook(eventObj) {
 		dragStop();
 		return cancelEvent(eventObj);
 	}
- 
+
 	this.Dispose = function() {
 		if(disposed) { return; }
 		this.StopListening(true);
@@ -352,18 +352,18 @@ function dragObject(element, handlerElement, startCallback, moveCallback, endCal
 		endCallback = null;
 		disposed = true;
 	}
-  
+
 	this.StartListening = function() {
 		if(listening || disposed) { return; }
 		listening = true;
 		addEvent(handlerElement, "mousedown", dragStart);
 	}
-  
+
 	this.StopListening = function(stopCurrentDragging) {
 		if(!listening || disposed) { return; }
 		removeEvent(handlerElement, "mousedown", dragStart);
 		listening = false;
-    
+
 		if(stopCurrentDragging && dragging) { dragStop(); }
 	}
 }
diff --git a/static/functions/browse.js b/static/functions/browse.js
index 51a16b57..aa8a6c7c 100644
--- a/static/functions/browse.js
+++ b/static/functions/browse.js
@@ -178,7 +178,7 @@ function AddArtistField() {
 	Importance.name = "importance[]";
 	Importance.innerHTML = '<option value="1">Main</option><option value="2">Guest</option><option value="4">Composer</option><option value="5">Conductor</option><option value="6">DJ / Compiler</option><option value="3">Remixer</option><option value="7">Producer</option>';
 	x.appendChild(Importance);
-	ArtistFieldCount++;	
+	ArtistFieldCount++;
 }
 
 function ToggleEditionRows() {
diff --git a/static/functions/class_ajax.js b/static/functions/class_ajax.js
index 2e823187..f283fe38 100644
--- a/static/functions/class_ajax.js
+++ b/static/functions/class_ajax.js
@@ -1,24 +1,24 @@
 /*
 	TODO: Further optimize serialize function
-	
-	UPDATE: We were forced to create an individual XHR for each request 
-	to avoid race conditions on slower browsers where the request would 
-	be overwritten before the callback triggered, and leave it hanging. 
+
+	UPDATE: We were forced to create an individual XHR for each request
+	to avoid race conditions on slower browsers where the request would
+	be overwritten before the callback triggered, and leave it hanging.
 	This only happened in FF3.0 that we tested.
 
 	Example usage 1:
 	ajax.handle = function () {
 		$('#preview' + postid).raw().innerHTML = ajax.response;
-		$('#editbox' + postid).hide();	
+		$('#editbox' + postid).hide();
 	}
 	ajax.post("ajax.php?action=preview","#form-id" + postid);
-	
+
 	Example usage 2:
 	ajax.handle = function() {
 		$('#quickpost').raw().value = "[quote="+username+"]" + ajax.response + "[/quote]";
 	}
 	ajax.get("?action=get_post&post=" + postid);
-	
+
 */
 "use strict";
 var json = {
diff --git a/static/functions/class_cookie.js b/static/functions/class_cookie.js
index 15a33b09..ea802f81 100644
--- a/static/functions/class_cookie.js
+++ b/static/functions/class_cookie.js
@@ -9,11 +9,11 @@ var cookie = {
 	},
 	set: function (cookie_name, value, days) {
 		var date = new Date();
-		
+
 		if (days === undefined) {
 			days = 365;
 		}
-		
+
 		date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
 		document.cookie = cookie_name + "=" + value + "; expires=" + date.toGMTString() + "; path=/";
 	},
diff --git a/static/functions/class_countdown.js b/static/functions/class_countdown.js
index faea4c7d..001bae60 100644
--- a/static/functions/class_countdown.js
+++ b/static/functions/class_countdown.js
@@ -1,4 +1,4 @@
-/* 
+/*
 	TODO: Move to more efficient structure used in class_ajax.
 
 	Example Usage:
@@ -16,14 +16,14 @@
 var count = {
 	update: function (Offset) {
 		if (Offset < 0) {
-			document.getElementById(this.element).innerHTML = this.end; 
+			document.getElementById(this.element).innerHTML = this.end;
 		} else {
-			var Seconds = Offset % 60; 
+			var Seconds = Offset % 60;
 			if (Seconds < 10) {
 				Seconds = '0' + Seconds;
 			}
 			var Remainder = (Offset - Seconds) / 60;
-			var Minutes = Remainder % 60; 
+			var Minutes = Remainder % 60;
 			if (Minutes < 10) {
 				Minutes = '0' + Minutes;
 			}
diff --git a/static/functions/class_storage.js b/static/functions/class_storage.js
index f3efcfef..7648e0f5 100644
--- a/static/functions/class_storage.js
+++ b/static/functions/class_storage.js
@@ -10,11 +10,11 @@ var cookie = {
 	},
 	set: function (key_name, value, days) {
 		var date = new Date();
-		
+
 		if (days === undefined) {
 			days = 365;
 		}
-		
+
 		date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
 		document.cookie = key_name + "=" + value + "; expires=" + date.toGMTString() + "; path=/";
 	},
diff --git a/static/functions/class_textareapreview.js b/static/functions/class_textareapreview.js
index a6c54c79..9f3943a2 100644
--- a/static/functions/class_textareapreview.js
+++ b/static/functions/class_textareapreview.js
@@ -10,7 +10,7 @@ jQuery(document).ready(function ($) {
 			}
 		}
 	};
-	
+
 	TextareaPreview.factory = function (arrays) {
 		var i = 0, j = arrays.length, t;
 		for (i; i < j; i++) {
@@ -30,7 +30,7 @@ jQuery(document).ready(function ($) {
 				.on('dblclick.preview', $.proxy(this.toggle, this))
 				.addClass('text_preview')
 				.attr('title', 'Double click to edit.');
-				
+
 			this.buttons.preview
 				.on('click.preview', $.proxy(this.get, this))
 				.toggleClass('hidden');
diff --git a/static/functions/collage.js b/static/functions/collage.js
index 52374ec5..11eb4867 100644
--- a/static/functions/collage.js
+++ b/static/functions/collage.js
@@ -54,23 +54,23 @@ var collageShow = {
 	page:function(num,el){
 		var ul = $('#collage_page'+num).raw(), s = this.selected(), covers, lists, i;
 		this.pg = num;
-		
+
 		if(!ul){
 			covers = this.pages[num];
 			if(covers){
 				ul = this.createUL(covers);
 			}
 		}
-		
+
 		lists = $('.collage_images').objects;
 		i = lists.length;
 		while(i--){ $(lists[i]).hide(); }
-		
+
 		$(ul).show();
 		if(s){ $(s).remove_class('selected'); }
 		if(el){ $(el.parentNode).add_class('selected'); }
-		
-				
+
+
 		// Toggle the page number links
 		first = Math.max(0, this.pg - 2);
 		if (this.max - this.pg < 2) {
@@ -86,7 +86,7 @@ var collageShow = {
 		for (i = last + 1; i <= this.max; i++) {
 			$('#pagelink' + i).hide();
 		}
-		
+
 		// Toggle the first, prev, next, and last links
 		if (this.pg > 0) {
 			$('#prevpage').remove_class('invisible');
@@ -108,7 +108,7 @@ var collageShow = {
 		} else {
 			$('#lastpage').add_class('invisible');
 		}
-		
+
 		// Toggle the bar
 		if ((last == this.max) && (this.pg != this.max)) {
 			$('#nextbar').show();
diff --git a/static/functions/comments.js b/static/functions/comments.js
index 8c18e900..3d7f09f1 100644
--- a/static/functions/comments.js
+++ b/static/functions/comments.js
@@ -17,7 +17,7 @@ function QuoteJump(event, post) {
 }
 
 function Quote(post, user) {
-	Quote(post, user, false) 
+	Quote(post, user, false)
 }
 
 function Quote(post, user, link) {
@@ -27,7 +27,7 @@ function Quote(post, user, link) {
 		if ($('#quickpost').raw().value !== '') {
 			$('#quickpost').raw().value = $('#quickpost').raw().value + "\n\n";
 		}
-		$('#quickpost').raw().value = $('#quickpost').raw().value + "[quote="+username + (link == true ? "|" + post : "") + "]" + 
+		$('#quickpost').raw().value = $('#quickpost').raw().value + "[quote="+username + (link == true ? "|" + post : "") + "]" +
 			//response.replace(/(img|aud)(\]|=)/ig,'url$2').replace(/\[url\=(https?:\/\/[^\s\[\]<>"\'()]+?)\]\[url\](.+?)\[\/url\]\[\/url\]/gi, "[url]$1[/url]")
 			html_entity_decode(response)
 		+ "[/quote]";
@@ -75,7 +75,7 @@ function Preview_Edit(postid) {
 	$('#bar' + postid).raw().innerHTML = "<input type=\"button\" value=\"Editor\" onclick=\"Cancel_Preview(" + postid + ");\" /><input type=\"button\" value=\"Post\" onclick=\"Save_Edit(" + postid + ")\" /><input type=\"button\" value=\"Cancel\" onclick=\"Cancel_Edit(" + postid + ");\" />";
 	ajax.post("ajax.php?action=preview","form" + postid, function(response){
 		$('#preview' + postid).raw().innerHTML = response;
-		$('#editbox' + postid).hide();	
+		$('#editbox' + postid).hide();
 	});
 }
 
@@ -229,7 +229,7 @@ function AddPollOption(id) {
 			auth.name = "auth";
 			auth.value = authkey;
 			form.appendChild(auth);
-		
+
 			var action = document.createElement("input");
 			action.type = "hidden";
 			action.name = "action";
@@ -247,7 +247,7 @@ function AddPollOption(id) {
 			input.name = "new_option";
 			input.size = "50";
 			form.appendChild(input);
-		
+
 			var submit = document.createElement("input");
 			submit.type = "submit";
 			submit.id = "new_submit";
diff --git a/static/functions/delays.js b/static/functions/delays.js
index 64698dac..b12c7300 100644
--- a/static/functions/delays.js
+++ b/static/functions/delays.js
@@ -16,10 +16,10 @@ function SetDate() {
 			amount *= 1000; //millis
 			break;
 	}
-	
+
 	var d = new Date;
 	d.setTime(d.getTime() + amount + (d.getTimezoneOffset() * 60 * 1000));
-	
+
 	//YYYY-MM-DD HH:MM:SS
 	var out = d.getFullYear() + "-" + (d.getMonth() + 1) + "-" + d.getDate() + " " + d.getHours() + ":" + d.getMinutes() + ":" + d.getSeconds();
 
diff --git a/static/functions/global.js b/static/functions/global.js
index 80dd347b..dae8093f 100644
--- a/static/functions/global.js
+++ b/static/functions/global.js
@@ -9,15 +9,15 @@ function toggleChecks(formElem,masterElem) {
 
 //Lightbox stuff
 
-/* 
+/*
  *  If loading from a thumbnail the lightbox is shown first with a "loading" screen
  *  while the full size image loads, then the html of the lightbox is replaced with the image.
- */ 
+ */
 
 var lightbox = {
 	init: function (image, size) {
 		if(typeof(image)=='string') {
-			$('#lightbox').show().listen('click',lightbox.unbox).raw().innerHTML = 
+			$('#lightbox').show().listen('click',lightbox.unbox).raw().innerHTML =
 				'<p size="7" style="color:gray;font-size:50px">Loading...<p>';
                         $('#curtain').show().listen('click',lightbox.unbox);
                         var src = image;
@@ -35,7 +35,7 @@ var lightbox = {
 			delete tmp;
 		}
 		if (image.naturalWidth > size) {
-			lightbox.box(image);			
+			lightbox.box(image);
 		}
 	},
 	box: function (image) {
diff --git a/static/functions/iphone.js b/static/functions/iphone.js
index 9bad91ee..ba992da4 100644
--- a/static/functions/iphone.js
+++ b/static/functions/iphone.js
@@ -37,7 +37,7 @@ function main () {
 		titles:[$('#first_title'),$('#second_title')],
 		pages:[$('#first_page'),$('#second_page')]
 	};
-	
+
 	// Transform on load
 	elements.pages[1].style.webkitTransform = 'translateX(100%)';
 
@@ -47,7 +47,7 @@ function main () {
 
 	elements.buttons[0].addEventListener(method, go_back, false);
 	elements.buttons[1].addEventListener(method, go_back, false);
-	
+
 	elements.pages[0].addEventListener('webkitTransitionEnd', transition_ended, false);
 	Transitions.DEFAULTS.duration = 0.35;
 
@@ -113,10 +113,10 @@ var transitions_in_progress = false;
 function transition_ended () { transitions_in_progress = false; };
 function transition_to_new_element (data, going_forward) {
 	transitions_in_progress = true;
-	
+
 	var from_index = active_index;
 	var to_index = (active_index == 1) ? 0 : 1;
-	
+
 	//Make other page visible
 	//elements.pages[to_index].style.height = '';
 
@@ -130,7 +130,7 @@ function transition_to_new_element (data, going_forward) {
 		from: [1],
 		to: [0]
 	});
-	
+
 	transitions.add({
 		element : elements.titles[to_index],
 		duration: [0.5],
@@ -138,7 +138,7 @@ function transition_to_new_element (data, going_forward) {
 		from : [0],
 		to : [1]
 	});
-	
+
 	transitions.add({
 		element: elements.buttons[from_index],
 		duration: [0.5],
@@ -146,7 +146,7 @@ function transition_to_new_element (data, going_forward) {
 		from: [1],
 		to: [0]
 	});
-	
+
 	transitions.add({
 		element : elements.buttons[to_index],
 		duration: [0.5],
@@ -163,7 +163,7 @@ function transition_to_new_element (data, going_forward) {
 		from : ['translateX(0%)'],
 		to : ['translateX(' + ((going_forward) ? -150 : 150) + '%)']
 	});
-	
+
 	transitions.add({
 		element : elements.pages[to_index],
 		from : ['translateX(' + ((going_forward) ? 150 : -150) + '%)'],
@@ -174,10 +174,10 @@ function transition_to_new_element (data, going_forward) {
 	elements.pages[to_index].innerHTML = data;
 	elements.titles[to_index].textContent = title;
 	elements.buttons[to_index].textContent = back_name;
-	
+
 	//Hide other page to avoid excess scroll at the bottom
 	//elements.pages[from_index].style.height = '0px';
-	
+
 	active_index = to_index;
 
 	transitions.apply();
diff --git a/static/functions/musicbrainz.js b/static/functions/musicbrainz.js
index c8663166..7c0a7995 100644
--- a/static/functions/musicbrainz.js
+++ b/static/functions/musicbrainz.js
@@ -26,7 +26,7 @@ $(document).ready(function() {
   loadCSS();
   enableMusicBrainzButton();
   controlPopup();
-  
+
   $("#musicbrainz_button").click(function() {
     var $album = $("#title").val();
     var $artist = $("#artist").val();
@@ -61,11 +61,11 @@ $(document).ready(function() {
     url: "https://musicbrainz.org/ws/2/release-group/" + $id + "?inc=artist-credits%2Breleases+tags+media",
     dataType: "xml",
     success: showReleases
- }); 
+ });
 }
 });
    $("#results2").click(function(event) {
-    var $id = event.target.id; 
+    var $id = event.target.id;
     if($id != "mb" && $id != "results2") {
     jQuery('#results2').empty();
     jQuery('#results2').show();
@@ -108,13 +108,13 @@ function showReleaseGroups(xml)
 {
     var $count = $(xml).find("release-group-list").attr("count");
     if($count == 0 ) {
-        alert("Could not find on MusicBrainz");        
+        alert("Could not find on MusicBrainz");
     }
     else {
     	jQuery('#popup_title').text("Choose Release Group");
     	openPopup();
     }
-  
+
   $(xml).find("release-group").each(function()
   {
     var $title = $(this).find("title:first").text();
@@ -136,10 +136,10 @@ function showReleases(xml) {
     $year_original = $date_release_group.substring(0,4);
     $release_type = $(xml).find("release-group").attr("type");
     $release_group_id = $(xml).find("release-group").attr("id");
-    jQuery('#popup_title').html("Choose Release " + "<a href='https://musicbrainz.org/release-group/" 
+    jQuery('#popup_title').html("Choose Release " + "<a href='https://musicbrainz.org/release-group/"
     		+ $release_group_id + "'target=_new>(View on MusicBrainz)</a>");
       jQuery('#popup_back').html("<a href='#null' id='back'>[Go Back]</a>");
-    
+
 	$(xml).find("release").each(function()
 	{
     var $release_id = $(this).attr("id");
@@ -157,10 +157,10 @@ function showReleases(xml) {
 	}); }); });
 	var $result =  $title + " [Year: " + $year + ", Format: " + $format + ", Tracks: " + $tracks + ", Country: " + $country + "]";
 	$("<a href='#null'>" + $result +  "</a>").attr("id", $release_id).appendTo("#results2");
-	
+
 	$("<a href='https://musicbrainz.org/release/" + $release_id +"' target=_new> (View on MB)</a>" + "<p/>").attr("id", "mb").appendTo("#results2");
 	});
-	
+
 	parseTags(xml);
 }
     /**
@@ -171,11 +171,11 @@ function showReleases(xml) {
 	  $tags = "";
 	  $(xml).find("tag").each(function() {
 		$tag =  cleanTag($(this).find("name").text());
-	        if(isValidTag($tag)) {        
+	        if(isValidTag($tag)) {
             		$tags += "," + $tag;
            	}
 	});
-	if($tags.charAt(0) == ',') { 
+	if($tags.charAt(0) == ',') {
                 $tags = $tags.substring(1);
         }
     }
@@ -192,7 +192,7 @@ function showReleases(xml) {
      */
 	function populateForm(xml) {
 		closePopup();
-		
+
 	    var $release_id = $(xml).find("release").attr("id");
 	    var $release_title = $(xml).find("release").find("title:first").text();
 	    var $artist = $(xml).find("artist-credit:first").find("name:first").text();
@@ -203,13 +203,13 @@ function showReleases(xml) {
 	    var $barcode = $(xml).find("barcode").text();
         $catalog_number = $(xml).find("catalog-number").text();
         $record_label = $(xml).find("label").find("sort-name").text();
-        var $track_count = $(xml).find("track-list").attr("count");    
+        var $track_count = $(xml).find("track-list").attr("count");
         var $track_titles = new Array();
         $(xml).find("track-list").find("title").each(function() {
             var $title = $(this).text();
             $track_titles.push($title);
         });
-        
+
             clear();
 	    $("#artist").val($artist);
 	    $("#title").val($release_title);
@@ -230,11 +230,11 @@ function showReleases(xml) {
             if($barcode.length > 0) {
                 $barcode_text =  "Barcode: " + $barcode + "\n";
             }
-	    var $description = $amazon_link + 
-	                       "[url=https://musicbrainz.org/release-group/" + $release_group_id + "]MusicBrainz[/url]" + "\n" + "\n" + 
+	    var $description = $amazon_link +
+	                       "[url=https://musicbrainz.org/release-group/" + $release_group_id + "]MusicBrainz[/url]" + "\n" + "\n" +
 			       $country_text +
 			       $barcode_text +
-	                       "Tracks: " + $track_count + "\n" + "\n" + 
+	                       "Tracks: " + $track_count + "\n" + "\n" +
 	                       "Track List:" + "\n";
 	                       for (var i=0; i < $track_titles.length; i++) {
 						      $description = $description + "[#]" + $track_titles[i] + "\n";
@@ -263,12 +263,12 @@ function showReleases(xml) {
 	 if($("#remaster").attr("checked")) {
                 $('#remaster_true').hide();
         }
-	
+
          $("#remaster").attr("checked", false);
 	 $("#remaster_year").val("");
          $("#remaster_record_label").val("");
          $("#remaster_catalogue_number").val("");
-	
+
 
     }
     /**
@@ -283,25 +283,25 @@ function showReleases(xml) {
                break;
             case "Soundtrack":
                $value = 3;
-               break;   
+               break;
             case "EP":
                $value = 5;
-               break; 
+               break;
             case "Compilation":
                $value = 7;
-               break; 
+               break;
             case "Single":
                $value = 9;
-               break; 
+               break;
             case "Live":
                $value = 11;
-               break;     
+               break;
             case "Remix":
                $value = 13;
-               break;    
+               break;
             case "Interview":
                $value = 15;
-               break;    
+               break;
             default:
                $value = "---";
                break;
@@ -312,13 +312,13 @@ function showReleases(xml) {
 	 * Enables the musicbrainz button only when the "Music" type is selected and a format isn't being uploaded
 	 */
     function enableMusicBrainzButton() {
-     if ($('#categories').is(':disabled') == false) { 
+     if ($('#categories').is(':disabled') == false) {
       $("#categories").click(function() {
         if($("#categories").val() != 0 ) {
              $("#musicbrainz_button").attr("disabled", "disabled");
           }
         else {
-             $("#musicbrainz_button").removeAttr("disabled");      
+             $("#musicbrainz_button").removeAttr("disabled");
         }
         });
      }
@@ -330,7 +330,7 @@ function showReleases(xml) {
 	 *Clears fields in the upload form
 	 */
     function clear() {
-	    closeEditionsForm();	  
+	    closeEditionsForm();
   	    $("#artist").val("");
 	    $("#title").val("");
 	    $("#year").val("");
@@ -343,7 +343,7 @@ function showReleases(xml) {
 	    $("#remaster_record_label").val("");
 	    $("#remaster_catalogue_number").val("");
 }
-    
+
  /**
   * Loads the popup
   * @returns
@@ -419,7 +419,7 @@ function showReleases(xml) {
    $link.rel = 'stylesheet';
    $link.type = 'text/css';
    document.body.appendChild($link);
-   $link = null; 
+   $link = null;
   }
 
 } ) ( jQuery );
diff --git a/static/functions/password_validate.js b/static/functions/password_validate.js
index 2be29ec3..2786200b 100644
--- a/static/functions/password_validate.js
+++ b/static/functions/password_validate.js
@@ -145,7 +145,7 @@ function checkMatching(password1, password2) {
 	else if(getStrong() == true) {
 		 $("#pass_match").text("Passwords do not match").css("color", "red");
 		 disableSubmit();
-	} 
+	}
 	else{
 		 $("#pass_match").text("Password isn't strong").css("color", "red");
                  disableSubmit();
diff --git a/static/functions/release_sort.js b/static/functions/release_sort.js
index ab1664b0..1ee0973e 100644
--- a/static/functions/release_sort.js
+++ b/static/functions/release_sort.js
@@ -8,9 +8,9 @@ jQuery(document).ready(function ($) {
 		});
 		$('#sorthide').val(JSON.stringify(a));
     };
-	
+
 	serialize();
-	
+
 	$('#sortable')
 		.on('click', 'input', function () {
 			// the + converts the boolean to either 1 or 0
@@ -24,14 +24,14 @@ jQuery(document).ready(function ($) {
 			placeholder: 'ui-state-highlight',
 			update: serialize
 		});
-	
+
 	$('#toggle_sortable').click(function (e) {
 		e.preventDefault();
 	    $('#sortable_container').slideToggle(function () {
 			$('#toggle_sortable').text($(this).is(':visible') ? 'Collapse' : 'Expand');
-	    }); 
+	    });
 	});
-	
+
 	$('#reset_sortable').click(function (e) {
 		e.preventDefault();
 	    $('#sortable').html(sortable_list_default); // var sortable_list_default is found on edit.php
diff --git a/static/functions/reportsv2.js b/static/functions/reportsv2.js
index 491abaf7..982d0000 100644
--- a/static/functions/reportsv2.js
+++ b/static/functions/reportsv2.js
@@ -84,7 +84,7 @@ function NewReport(q, view, id) {
 		if(id) {
 			url += "&id=" + id;
 		}
-		
+
 		ajax.get(url, function (response) {
 			if(response) {
 				var div = document.createElement("div");
@@ -119,10 +119,10 @@ function AddMore(view, id) {
 			x = a;
 		}
 	}
-	
+
 	if(document.getElementsByName("reportid").length + x <= 50) {
 		NewReport(x, view, id);
-	} else { 
+	} else {
 		NewReport(50 - document.getElementsByName("reportid").length, view, id);
 	}
 }
diff --git a/static/functions/requests.js b/static/functions/requests.js
index ae6259b9..b51283c7 100644
--- a/static/functions/requests.js
+++ b/static/functions/requests.js
@@ -6,7 +6,7 @@ function Vote(amount, requestid) {
 	if(amount == 0) {
 		 amount = 20 * 1024 * 1024;
 	}
-	
+
 	var index;
 	var votecount;
 	if(!requestid) {
@@ -18,7 +18,7 @@ function Vote(amount, requestid) {
 		bounty = $('#bounty_' + requestid).raw();
 		index = true;
 	}
-	
+
 	if (amount > 20*1024*1024) {
 		upload   = $('#current_uploaded').raw().value;
 		download = $('#current_downloaded').raw().value;
@@ -29,7 +29,7 @@ function Vote(amount, requestid) {
 			}
 		}
 	}
-	
+
 	ajax.get('requests.php?action=takevote&id=' + requestid + '&auth=' + authkey + '&amount=' + amount, function (response) {
 			if(response == 'bankrupt') {
 				error_message("You do not have sufficient upload credit to add " + get_size(amount) + " to this request");
@@ -85,7 +85,7 @@ function AddArtistField() {
 		ArtistField.id = "artist";
 		ArtistField.name = "artists[]";
 		ArtistField.size = 45;
-		
+
 		var ImportanceField = document.createElement("select");
 		ImportanceField.id = "importance";
 		ImportanceField.name = "importance[]";
@@ -96,7 +96,7 @@ function AddArtistField() {
 		ImportanceField.options[4] = new Option("DJ / Compiler", "6");
 		ImportanceField.options[5] = new Option("Remixer", "3");
 		ImportanceField.options[6] = new Option("Producer", "7");
-		
+
 		var x = $('#artistfields').raw();
 		x.appendChild(document.createElement("br"));
 		x.appendChild(ArtistField);
@@ -108,11 +108,11 @@ function RemoveArtistField() {
 		var ArtistCount = document.getElementsByName("artists[]").length;
 		if (ArtistCount == 1) { return; }
 		var x = $('#artistfields').raw();
-		
-		while(x.lastChild.tagName != "INPUT") { 
-			x.removeChild(x.lastChild); 
+
+		while(x.lastChild.tagName != "INPUT") {
+			x.removeChild(x.lastChild);
 		}
-		x.removeChild(x.lastChild); 
+		x.removeChild(x.lastChild);
 		ArtistCount--;
 }
 
@@ -166,7 +166,7 @@ function Toggle(id, disable) {
 			arr[x].disabled = master;
 		}
 	}
-	
+
 	if(id == "formats") {
 		ToggleLogCue();
 	}
@@ -175,11 +175,11 @@ function Toggle(id, disable) {
 function ToggleLogCue() {
 	var formats = document.getElementsByName('formats[]');
 	var flac = false;
-	
+
 	if(formats[1].checked) {
 		flac = true;
 	}
-	
+
 	if(flac) {
 		$('#logcue_tr').show();
 	} else {
diff --git a/static/functions/script_start.js b/static/functions/script_start.js
index 5dcb781a..7cb7bd86 100644
--- a/static/functions/script_start.js
+++ b/static/functions/script_start.js
@@ -1,10 +1,10 @@
 "use strict";
 
 /* Prototypes */
-if(!String.prototype.trim) {  
-  String.prototype.trim = function () {  
-    return this.replace(/^\s+|\s+$/g,'');  
-  };  
+if(!String.prototype.trim) {
+  String.prototype.trim = function () {
+    return this.replace(/^\s+|\s+$/g,'');
+  };
 }
 
 var listener = {
@@ -254,7 +254,7 @@ util.fn = util.prototype = {
 					object.className = class_name;
 				} else {
 					object.className = object.className + ' ' + class_name;
-				}				
+				}
 			}
 		}
 		return this;
@@ -279,7 +279,7 @@ util.fn = util.prototype = {
 	},
 	nextElementSibling: function () {
 		var here = this.objects[0];
-		if (here.nextElementSibling) { 
+		if (here.nextElementSibling) {
 			return $(here.nextElementSibling);
 		}
 		do {
@@ -289,7 +289,7 @@ util.fn = util.prototype = {
 	},
 	previousElementSibling: function () {
 		var here = this.objects[0];
-		if (here.previousElementSibling) { 
+		if (here.previousElementSibling) {
 			return $(here.previousElementSibling);
 		}
 		do {
diff --git a/static/functions/staffpm.js b/static/functions/staffpm.js
index 8cb5b78d..3b95db32 100644
--- a/static/functions/staffpm.js
+++ b/static/functions/staffpm.js
@@ -19,7 +19,7 @@ function UpdateMessage() {
 function SaveMessage(id) {
 	var ajax_message = 'ajax_message_' + id;
 	var ToPost = [];
-	
+
 	ToPost['id'] = id;
 	ToPost['name'] = document.getElementById('response_name_' + id).value;
 	ToPost['message'] = document.getElementById('response_message_' + id).value;
@@ -113,7 +113,7 @@ function Quote(post, user) {
 		if ($('#quickpost').raw().value !== '') {
 			$('#quickpost').raw().value = $('#quickpost').raw().value + "\n\n";
 		}
-		$('#quickpost').raw().value = $('#quickpost').raw().value + "[quote="+username+"]" + 
+		$('#quickpost').raw().value = $('#quickpost').raw().value + "[quote="+username+"]" +
 			//response.replace(/(img|aud)(\]|=)/ig,'url$2').replace(/\[url\=(https?:\/\/[^\s\[\]<>"\'()]+?)\]\[url\](.+?)\[\/url\]\[\/url\]/gi, "[url]$1[/url]")
 			html_entity_decode(response)
 		+ "[/quote]";
diff --git a/static/functions/tagcanvas.js b/static/functions/tagcanvas.js
index 48006aa6..7b107225 100644
--- a/static/functions/tagcanvas.js
+++ b/static/functions/tagcanvas.js
@@ -10,7 +10,7 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
diff --git a/static/functions/torrent.js b/static/functions/torrent.js
index 75bffb23..62f10660 100644
--- a/static/functions/torrent.js
+++ b/static/functions/torrent.js
@@ -215,7 +215,7 @@ function Vote(amount, requestid) {
 	if(amount == 0) {
 		 amount = 20 * 1024 * 1024;
 	}
-	
+
 	var index;
 	var votecount;
 	if(!requestid) {
@@ -227,7 +227,7 @@ function Vote(amount, requestid) {
 		bounty = $('#bounty_' + requestid).raw();
 		index = true;
 	}
-	
+
 	ajax.get('requests.php?action=takevote&id=' + requestid + '&auth=' + authkey + '&amount=' + amount, function (response) {
 			if(response == 'bankrupt') {
 				error_message("You do not have sufficient upload credit to add " + get_size(amount) + " to this request");
@@ -309,7 +309,7 @@ function UnvoteGroup(groupid, authkey) {
 			} else if (response == 'success-up') {
 				$('#totalvotes').raw().innerHTML = (parseInt($('#totalvotes').raw().innerHTML)) - 1;
 				$('#upvotes').raw().innerHTML = (parseInt($('#upvotes').raw().innerHTML)) - 1;
-			} 
+			}
 		}
 	);
 	$('#vote_message').show();
diff --git a/static/functions/transitions.js b/static/functions/transitions.js
index 31f7326d..e07aec23 100644
--- a/static/functions/transitions.js
+++ b/static/functions/transitions.js
@@ -2,11 +2,11 @@
 
 function Transitions () {
   // callback for the first batch of operation, where we set the default properties
-  // for the transition (transition-property and transition-duration) as well as 
+  // for the transition (transition-property and transition-duration) as well as
   // the "from" property value if explicitely passed as a param to .add()
-  this.instantOperations = new Function (); 
+  this.instantOperations = new Function ();
   // callback for the second batch of operation, where we set the "to" property value
-  this.deferredOperations = new Function (); 
+  this.deferredOperations = new Function ();
 };
 
 // Core defaults for the transitions, you can update these members so that all
@@ -19,18 +19,18 @@ Transitions.DEFAULTS = {
 
 /*
  Adds a CSS transition, parameters are :
- 
+
  element:	 target element for transition
  duration:	duration for all transitions in seconds
  properties:  the properties that are transitioned (will be fed to '-webkit-transition-property')
  from:		optional list of initial property values to match properties passed as .properties
  to:		  list of final property values to match properties passed as .properties
- 
+
  The .duration and .properties parameters are optional and can be defined once for
  all upcoming transitions by over-riding the Transition.DEFAULTS properties
 
  Some operations need to be deferred so that the styles are currently set for the from state
- of from / to operations 
+ of from / to operations
 
  */
 
diff --git a/static/functions/upload.js b/static/functions/upload.js
index 062e344a..15cf2d13 100644
--- a/static/functions/upload.js
+++ b/static/functions/upload.js
@@ -12,7 +12,7 @@ function Remaster() {
 	} else {
 		$('#remaster_true').hide();
 	}
-	
+
 }
 
 function Format() {
@@ -32,7 +32,7 @@ function Format() {
  	if($('#format').raw().options[$('#format').raw().selectedIndex].value == 'AAC') {
                 $('#format_warning').raw().innerHTML = 'Lossy AAC torrents may only be uploaded when they represent exclusive content not currently available in any other format. <a href="rules.php?p=upload#r2.1.24">(2.1.24)</a>';
         }
-        else {  
+        else {
                 $('#format_warning').raw().innerHTML = '';
         }
 
@@ -116,15 +116,15 @@ function AddFormat() {
 	if(FormatCount >= 10) { return; }
 	FormatCount++;
 	$('#extras').raw().value = FormatCount;
-	
+
 	var NewRow = document.createElement("tr");
 	NewRow.id = "new_torrent_row"+FormatCount;
 	NewRow.setAttribute("style","border-top-width: 5px; border-left-width: 5px; border-right-width: 5px;");
-	
+
 	var NewCell1 = document.createElement("td");
 	NewCell1.setAttribute("class","label");
 	NewCell1.innerHTML = "Extra Torrent File";
-	
+
 	var NewCell2 = document.createElement("td");
 	var TorrentField = document.createElement("input");
 	TorrentField.type = "file";
@@ -132,9 +132,9 @@ function AddFormat() {
 	TorrentField.name = "extra_torrent_files[]";
 	TorrentField.size = 50;
 	NewCell2.appendChild(TorrentField);
-	
+
 	NewRow.appendChild(NewCell1);
-	NewRow.appendChild(NewCell2);	
+	NewRow.appendChild(NewCell2);
 
 	NewRow = document.createElement("tr");
 	NewRow.id = "new_format_row"+FormatCount;
@@ -142,7 +142,7 @@ function AddFormat() {
 	NewCell1 = document.createElement("td");
 	NewCell1.setAttribute("class","label");
 	NewCell1.innerHTML = "Extra Format / Bitrate";
-	
+
 	NewCell2 = document.createElement("td");
 	tmp = '<select id="releasetype" name="extra_formats[]"><option value="">---</option>';
 	var formats=["Saab","Volvo","BMW"];
@@ -156,41 +156,41 @@ function AddFormat() {
 		tmp += "<option value='"+bitrates[i]+"'>"+bitrates[i]+"</option>\n";
 	}
 	tmp += "</select>";
-	
+
 	NewCell2.innerHTML = tmp;
 	NewRow.appendChild(NewCell1);
-	NewRow.appendChild(NewCell2);	
+	NewRow.appendChild(NewCell2);
+
 
-	
 	NewRow = document.createElement("tr");
 	NewRow.id = "new_description_row"+FormatCount;
 	NewRow.setAttribute("style","border-bottom-width: 5px; border-left-width: 5px; border-right-width: 5px;");
 	NewCell1 = document.createElement("td");
 	NewCell1.setAttribute("class","label");
 	NewCell1.innerHTML = "Extra Release Description";
-	
+
 	NewCell2 = document.createElement("td");
 	NewCell2.innerHTML = '<textarea name="extra_release_desc[]" id="release_desc" cols="60" rows="4"></textarea>';
-	
+
 	NewRow.appendChild(NewCell1);
-	NewRow.appendChild(NewCell2);	
+	NewRow.appendChild(NewCell2);
 }
 
 function RemoveFormat() {
 	if(FormatCount == 0) { return; }
 	$('#extras').raw().value = FormatCount;
-	
+
 	var x = $('#new_torrent_row'+FormatCount).raw();
 	x.parentNode.removeChild(x);
-	
+
 	x = $('#new_format_row'+FormatCount).raw();
 	x.parentNode.removeChild(x);
-	
+
 	x = $('#new_description_row'+FormatCount).raw();
 	x.parentNode.removeChild(x);
-	
+
 	FormatCount--;
-	
+
 }
 
 function Media() {
@@ -211,7 +211,7 @@ function AddArtistField() {
 	ArtistField.id = "artist";
 	ArtistField.name = "artists[]";
 	ArtistField.size = 45;
-	
+
 	var ImportanceField = document.createElement("select");
 	ImportanceField.id = "importance";
 	ImportanceField.name = "importance[]";
@@ -222,7 +222,7 @@ function AddArtistField() {
 	ImportanceField.options[4] = new Option("DJ / Compiler", "6");
 	ImportanceField.options[5] = new Option("Remixer", "3");
 	ImportanceField.options[6] = new Option("Producer", "7");
-	
+
 	var x = $('#artistfields').raw();
 	x.appendChild(document.createElement("br"));
 	x.appendChild(ArtistField);
@@ -272,12 +272,12 @@ function ToggleUnknown() {
 		$('#remaster_title').raw().value = "";
 		$('#remaster_record_label').raw().value = "";
 		$('#remaster_catalogue_number').raw().value = "";
-		
+
 		if($('#groupremasters').raw()) {
 			$('#groupremasters').raw().selectedIndex = 0;
 			$('#groupremasters').raw().disabled = true;
 		}
-		
+
 		$('#remaster_year').raw().disabled = true;
 		$('#remaster_title').raw().disabled = true;
 		$('#remaster_record_label').raw().disabled = true;
@@ -287,7 +287,7 @@ function ToggleUnknown() {
 		$('#remaster_title').raw().disabled = false;
 		$('#remaster_record_label').raw().disabled = false;
 		$('#remaster_catalogue_number').raw().disabled = false;
-		
+
 		if($('#groupremasters').raw()) {
 			$('#groupremasters').raw().disabled = false;
 		}
diff --git a/static/functions/user.js b/static/functions/user.js
index ad93561b..a8e468ca 100644
--- a/static/functions/user.js
+++ b/static/functions/user.js
@@ -60,17 +60,17 @@ function AlterParanoia() {
 	UncheckIfDisabled($('input[name=p_seeding_l]').raw());
 	UncheckIfDisabled($('input[name=p_leeching_l]').raw());
 	UncheckIfDisabled($('input[name=p_snatched_l]').raw());
-	
+
 	// unique groups, "Perfect" FLACs and artists added are deducible from the list of uploads
 	if ($('input[name=p_uploads_l]').raw().checked) {
 		$('input[name=p_uniquegroups_c]').raw().checked = true;
 		$('input[name=p_uniquegroups_l]').raw().checked = true;
 		$('input[name=p_uniquegroups_c]').raw().disabled = true;
-		$('input[name=p_uniquegroups_l]').raw().disabled = true;			
+		$('input[name=p_uniquegroups_l]').raw().disabled = true;
 		$('input[name=p_perfectflacs_c]').raw().checked = true;
 		$('input[name=p_perfectflacs_l]').raw().checked = true;
 		$('input[name=p_perfectflacs_c]').raw().disabled = true;
-		$('input[name=p_perfectflacs_l]').raw().disabled = true;			
+		$('input[name=p_perfectflacs_l]').raw().disabled = true;
 		$('input[type=checkbox][name=p_artistsadded]').raw().checked = true;
 		$('input[type=checkbox][name=p_artistsadded]').raw().disabled = true;
 	} else {
@@ -114,7 +114,7 @@ function ParanoiaReset(checkbox, drops) {
 			} else {
 				checkboxes.raw(i).checked = checkbox;
 			}
-			AlterParanoia();			
+			AlterParanoia();
 		}
 	}
 }
@@ -153,6 +153,6 @@ function ToggleIdenticons() {
                $('#identicons').show();
        }
        else {
-               $('#identicons').hide();                
+               $('#identicons').hide();
        }
 }
\ No newline at end of file
diff --git a/static/functions/valid_tags.js b/static/functions/valid_tags.js
index 73baa9d1..e36a870a 100644
--- a/static/functions/valid_tags.js
+++ b/static/functions/valid_tags.js
@@ -1,5 +1,5 @@
 /**
- * List of tags to compare musicbrainz results with. 
+ * List of tags to compare musicbrainz results with.
  *
  * @author Gwindow
  *
diff --git a/static/functions/validate.js b/static/functions/validate.js
index 9a126fdc..dbfb5148 100644
--- a/static/functions/validate.js
+++ b/static/functions/validate.js
@@ -2,9 +2,9 @@ var elemStyles=Array();
 var errorElems=Array();
 
 function validEmail(str) {
-	if (str.match(/^[_a-z0-9-]+([.+][_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})$/i)) {			  
+	if (str.match(/^[_a-z0-9-]+([.+][_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})$/i)) {
 		return true;
-	} else { 
+	} else {
 		return false;
 	}
 }
diff --git a/static/styles/global.css b/static/styles/global.css
index b65fa9e9..6f70601b 100644
--- a/static/styles/global.css
+++ b/static/styles/global.css
@@ -82,7 +82,7 @@ ul.collage_images img {
 }
 
 .log1 {
-	
+
 }
 
 .log2 {
@@ -335,7 +335,7 @@ tr.torrent .bookmark>a:after {
 	background: #007DC6 /*{bgColorHighlight}*/;
 	opacity : 0.15;
 	width: 50%;
-	
+
 }
 
 .navigation_list, .navigation_list ol {
diff --git a/static/styles/hydro/style.css b/static/styles/hydro/style.css
index 7d835ae1..817e77b2 100644
--- a/static/styles/hydro/style.css
+++ b/static/styles/hydro/style.css
@@ -767,7 +767,7 @@ ul .invitetree {
 	text-align: center;
 }
 
-.spellcheck { 
+.spellcheck {
 	margin: 25px 0;
 	font-size: 1.25em;
 	font-weight: bold;
diff --git a/static/styles/layer_cake/style.css b/static/styles/layer_cake/style.css
index c7986c44..424dcb34 100644
--- a/static/styles/layer_cake/style.css
+++ b/static/styles/layer_cake/style.css
@@ -766,7 +766,7 @@ ul .invitetree {
 	text-align: center;
 }
 
-.spellcheck { 
+.spellcheck {
 	margin: 25px 0;
 	font-size: 1.25em;
 	font-weight: bold;
diff --git a/static/styles/public/style.css b/static/styles/public/style.css
index 1ffd1aec..3c1a9740 100644
--- a/static/styles/public/style.css
+++ b/static/styles/public/style.css
@@ -100,7 +100,7 @@ input[type="text"]:invalid, input[type="password"]:invalid {
 }
 
 .poetry {
-	width: 320px; 
+	width: 320px;
 	text-align: justify;
 }
 
diff --git a/static/styles/shiro/style.css b/static/styles/shiro/style.css
index a941c91d..ef303d9f 100644
--- a/static/styles/shiro/style.css
+++ b/static/styles/shiro/style.css
@@ -847,7 +847,7 @@ form tr {
 	text-align: center;
 }
 
-.spellcheck { 
+.spellcheck {
 	margin: 25px 0;
 	font-size: 1.25em;
 	font-weight: bold;
diff --git a/static/styles/whatlove/style.css b/static/styles/whatlove/style.css
index dc604c08..a4308c41 100644
--- a/static/styles/whatlove/style.css
+++ b/static/styles/whatlove/style.css
@@ -885,7 +885,7 @@ form tr {
 	text-align: center;
 }
 
-.spellcheck { 
+.spellcheck {
 	margin: 25px 0;
 	font-size: 1.25em;
 	font-weight: bold;
diff --git a/torrents.php b/torrents.php
index 663fc008..50e58b38 100644
--- a/torrents.php
+++ b/torrents.php
@@ -1,3 +1,3 @@
-<? 
+<?
 define('ERROR_EXCEPTION', true);
 require('classes/script_start.php');