Empty commit

2025-01-31 02:21:36 +00:00 · 2013-05-15 08:00:54 +00:00 · 2013-05-15 08:00:54 +00:00 · 53a6628206
commit 53a6628206
parent bdb2e4fe12
49 changed files with 786 additions and 615 deletions
--- a/sections/ajax/forum/forum.php
+++ b/sections/ajax/forum/forum.php
@ -37,7 +37,8 @@
 	list($Forum,,,$Stickies) = $Cache->get_value('forums_'.$ForumID);
 }
 if (!isset($Forum) || !is_array($Forum)) {
-	$DB->query("SELECT
+	$DB->query("
+		SELECT
 			t.ID,
 			t.Title,
 			t.AuthorID,
@ -65,11 +66,11 @@
 // Make sure they're allowed to look at the page
 if (!check_perms('site_moderate_forums')) {
 	if (isset($LoggedUser['CustomForums'][$ForumID]) && $LoggedUser['CustomForums'][$ForumID] === 0) {
-		json_die("failure", "unsufficient permissions to view page");
+		json_die("failure", "insufficient permissions to view page");
 	}
 }
 if ($LoggedUser['CustomForums'][$ForumID] != 1 && $Forums[$ForumID]['MinClassRead'] > $LoggedUser['Class']) {
-	json_die("failure", "unsufficient permissions to view page");
+	json_die("failure", "insufficient permissions to view page");
 }

 $ForumName = display_str($Forums[$ForumID]['Name']);
@ -138,7 +139,7 @@
 			'lastAuthorName' => $LastAuthorName == null ? '' : $LastAuthorName,
 			'lastReadPage' => $LastRead[$TopicID]['Page'] == null ? 0 : (int) $LastRead[$TopicID]['Page'],
 			'lastReadPostId' => $LastRead[$TopicID]['PostID'] == null ? 0 : (int) $LastRead[$TopicID]['PostID'],
-			'read' => $Read == "read"
+			'read' => $Read == 'read'
 		);
 	}

--- a/sections/ajax/request.php
+++ b/sections/ajax/request.php
@ -203,6 +203,7 @@
 	'title' => $Title,
 	'year' => (int) $Year,
 	'image' => $Image,
+	'bbDescription' => $Description,
 	'description' => $Text->full_format($Description),
 	'musicInfo' => $JsonMusicInfo,
 	'catalogueNumber' => $CatalogueNumber,
--- a/sections/ajax/userhistory/post_history.php
+++ b/sections/ajax/userhistory/post_history.php
@ -39,6 +39,7 @@ function error_out($reason = '') {
 if ($LoggedUser['CustomForums']) {
 	unset($LoggedUser['CustomForums']['']);
 	$RestrictedForums = implode("','", array_keys($LoggedUser['CustomForums'], 0));
+	$PermittedForums = implode("','", array_keys($LoggedUser['CustomForums'], 1));
 }
 $ViewingOwn = ($UserID == $LoggedUser['ID']);
 $ShowUnread = ($ViewingOwn && (!isset($_GET['showunread']) || !!$_GET['showunread']));
@ -56,7 +57,7 @@ function error_out($reason = '') {
 	$sql .= '
 			LEFT JOIN forums AS f ON f.ID = t.ForumID
 		WHERE p.AuthorID = '.$UserID.'
-			AND ((f.MinClassRead <= '.$LoggedUser['EffectiveClass'];
+			AND ((f.MinClassRead <= '.$LoggedUser['Class'];
 	if (!empty($RestrictedForums)) {
 		$sql.='
 			AND f.ID NOT IN (\''.$RestrictedForums.'\')';
@ -137,12 +138,19 @@ function error_out($reason = '') {
 			JOIN forums AS f ON f.ID = t.ForumID
 			LEFT JOIN forums_last_read_topics AS l ON l.UserID = '.$UserID.' AND l.TopicID = t.ID
 		WHERE p.AuthorID = '.$UserID.'
-			AND f.MinClassRead <= '.$LoggedUser['EffectiveClass'];
+			AND ((f.MinClassRead <= '.$LoggedUser['Class'];

 	if (!empty($RestrictedForums)) {
 		$sql.='
 			AND f.ID NOT IN (\''.$RestrictedForums.'\')';
 	}
+	$sql .= ')';
+
+	if (!empty($PermittedForums)) {
+		$sql.='
+			OR f.ID IN (\''.$PermittedForums.'\')';
+	}
+	$sql .= ')';

 	if ($ShowUnread) {
 		$sql.='
--- a/sections/artist/artist.php
+++ b/sections/artist/artist.php
@ -452,7 +452,7 @@ function compare($X, $Y) {
 		</td>
 		<td class="nobr"><?=Format::get_size($Torrent['Size'])?></td>
 		<td><?=number_format($Torrent['Snatched'])?></td>
-		<td<?=($Torrent['Seeders']==0)?' class="r00"':''?>><?=number_format($Torrent['Seeders'])?></td>
+		<td<?=(($Torrent['Seeders'] == 0) ? ' class="r00"' : '')?>><?=number_format($Torrent['Seeders'])?></td>
 		<td><?=number_format($Torrent['Leechers'])?></td>
 	</tr>
 <?
@ -608,7 +608,7 @@ function compare($X, $Y) {
 						<option value="1"<? if ($ZIPPrefs == 1) { echo ' selected="selected"'; } ?>>Prefer Best Seeded</option>
 						<option value="2"<? if ($ZIPPrefs == 2) { echo ' selected="selected"'; } ?>>Prefer Bonus Tracks</option>
 					</select>
-					<input type="submit" style="width:210px" value="Download" />
+					<input type="submit" style="width: 210px;" value="Download" />
 				</form>
 			</div>
 		</div>
--- a/sections/bookmarks/torrents.php
+++ b/sections/bookmarks/torrents.php
@ -322,11 +322,11 @@ function compare($X, $Y) {
 			<span id="firstpage" class="invisible"><a href="#" class="pageslink" onclick="collageShow.page(0, this); return false;">&lt;&lt; First</a> | </span>
 			<span id="prevpage" class="invisible"><a href="#" id="prevpage"  class="pageslink" onclick="collageShow.prevPage(); return false;">&lt; Prev</a> | </span>
 <?			for ($i = 0; $i < $NumGroups / $CollageCovers; $i++) { ?>
-			<span id="pagelink<?=$i?>" class="<?=(($i>4)?'hidden':'')?><?=(($i==0)?' selected':'')?>"><a href="#" class="pageslink" onclick="collageShow.page(<?=$i?>, this); return false;"><?=$CollageCovers*$i+1?>-<?=min($NumGroups,$CollageCovers*($i+1))?></a><?=($i != ceil($NumGroups/$CollageCovers)-1)?' | ':''?></span>
+			<span id="pagelink<?=$i?>" class="<?=(($i > 4) ? 'hidden' : '')?><?=(($i == 0) ? ' selected' : '')?>"><a href="#" class="pageslink" onclick="collageShow.page(<?=$i?>, this); return false;"><?=($CollageCovers * $i + 1)?>-<?=min($NumGroups, $CollageCovers * ($i + 1))?></a><?=(($i != ceil($NumGroups / $CollageCovers) - 1) ? ' | ' : '')?></span>
 <?			} ?>
-			<span id="nextbar" class="<?=($NumGroups/$CollageCovers > 5)?'hidden':''?>"> | </span>
+			<span id="nextbar" class="<?=(($NumGroups / $CollageCovers > 5) ? 'hidden' : '')?>"> | </span>
 			<span id="nextpage"><a href="#" class="pageslink" onclick="collageShow.nextPage(); return false;">Next &gt;</a></span>
-			<span id="lastpage" class="<?=ceil($NumGroups/$CollageCovers)==2?'invisible':''?>"> | <a href="#" id="lastpage" class="pageslink" onclick="collageShow.page(<?=ceil($NumGroups/$CollageCovers)-1?>, this); return false;">Last &gt;&gt;</a></span>
+			<span id="lastpage" class="<?=(ceil($NumGroups / $CollageCovers) == 2 ? 'invisible' : '')?>"> | <a href="#" id="lastpage" class="pageslink" onclick="collageShow.page(<?=(ceil($NumGroups / $CollageCovers) - 1)?>, this); return false;">Last &gt;&gt;</a></span>
 		</div>
 		<script type="text/javascript">
 			collageShow.init(<?=json_encode($CollagePages)?>);
--- a/sections/collages/browse.php
+++ b/sections/collages/browse.php
@ -70,7 +70,8 @@
 	$BookmarkJoin = '';
 }

-$BaseSQL = $SQL = "SELECT SQL_CALC_FOUND_ROWS
+$BaseSQL = $SQL = "
+	SELECT SQL_CALC_FOUND_ROWS
 		c.ID,
 		c.Name,
 		c.NumTorrents,
--- a/sections/comments/requestcomments.php
+++ b/sections/comments/requestcomments.php
@ -29,7 +29,8 @@
 	$Header = 'Request comments made by ' . ($Self ? 'you' : Users::format_username($UserID, false, false, false));
 }

-$Comments = $DB->query("SELECT
+$Comments = $DB->query("
+	SELECT
 		SQL_CALC_FOUND_ROWS
 		rc.AuthorID,
 		r.ID as RequestID,
--- a/sections/comments/torrentcomments.php
+++ b/sections/comments/torrentcomments.php
@ -30,7 +30,8 @@
 	}
 }

-$Comments = $DB->query("SELECT
+$Comments = $DB->query("
+	SELECT
 		SQL_CALC_FOUND_ROWS
 		tc.AuthorID,
 		t.ID,
--- a/sections/log/index.php
+++ b/sections/log/index.php
@ -17,7 +17,7 @@
 				<tr>
 					<td class="label"><strong>Search for:</strong></td>
 					<td>
-						<input type="text" name="search" size="60"<?=!empty($_GET['search']) ? ' value="'.display_str($_GET['search']).'"' : '' ?> />
+						<input type="text" name="search" size="60"<?=(!empty($_GET['search']) ? ' value="'.display_str($_GET['search']).'"' : '')?> />
 						&nbsp;
 						<input type="submit" value="Search log" />
 					</td>
@ -98,7 +98,7 @@
 				$UserID = 0;
 				$User = '';
 				$URL = '';
-				if ($MessageParts[$i + 1] == "user") {
+				if ($MessageParts[$i + 1] == 'user') {
 					$i++;
 					if (is_numeric($MessageParts[$i + 1])) {
 						$UserID = $MessageParts[++$i];
@ -120,37 +120,37 @@
 					$DB->set_query_id($Log);
 					$URL = $Usernames[$User] ? '<a href="user.php?id='.$UserID.'">'.$User."</a>".($Colon ? ':' : '') : $User;
 				}
-				$Message = $Message." by ".$URL;
+				$Message = "$Message by $URL";
 				break;
 			case "uploaded":
 				if ($Color === false) {
 					$Color = 'green';
 				}
-				$Message = $Message." ".$MessageParts[$i];
+				$Message = $Message.' '.$MessageParts[$i];
 				break;
 			case "deleted":
 				if ($Color === false || $Color === 'green') {
 					$Color = 'red';
 				}
-				$Message = $Message." ".$MessageParts[$i];
+				$Message = $Message.' '.$MessageParts[$i];
 				break;
 			case "edited":
 				if ($Color === false) {
 					$Color = 'blue';
 				}
-				$Message = $Message." ".$MessageParts[$i];
+				$Message = $Message.' '.$MessageParts[$i];
 				break;
 			case "un-filled":
 				if ($Color === false) {
 					$Color = '';
 				}
-				$Message = $Message." ".$MessageParts[$i];
+				$Message = $Message.' '.$MessageParts[$i];
 				break;
 			case "marked":
 				if ($i == 1) {
 					$User = $MessageParts[$i - 1];
 					if (!isset($Usernames[$User])) {
-						$DB->query("SELECT ID FROM users_main WHERE Username = _utf8 '".$User."' COLLATE utf8_bin");
+						$DB->query("SELECT ID FROM users_main WHERE Username = _utf8 '$User' COLLATE utf8_bin");
 						list($UserID) = $DB->next_record();
 						$Usernames[$User] = $UserID ? $UserID : '';
 						$DB->set_query_id($Log);
@ -173,10 +173,10 @@
 				}
 				break;
 			default:
-				$Message = $Message." ".$MessageParts[$i];
+				$Message = $Message.' '.$MessageParts[$i];
 		}
 	}
-	$Row = ($Row == 'a') ? 'b' : 'a';
+	$Row = (($Row == 'a') ? 'b' : 'a');
 ?>
 		<tr class="row<?=$Row?>" id="log_<?=$ID?>">
 			<td class="nobr">
--- a/sections/register/index.php
+++ b/sections/register/index.php
@ -81,12 +81,12 @@
 				$Enabled = '0';
 			}

-			$ipcc = Tools::geoip($_SERVER['REMOTE_ADDR']);
+			$IPcc = Tools::geoip($_SERVER['REMOTE_ADDR']);
 			
 			
 			$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')");
+				('".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();
 			
@ -122,9 +122,10 @@
 			// Manage invite trees, delete invite

 			if ($InviterID !== NULL) {
-				$DB->query("SELECT
-					TreePosition, TreeID, TreeLevel
-					FROM invite_tree WHERE UserID='$InviterID'");
+				$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
@ -133,15 +134,16 @@
 					$DB->query("SELECT MAX(TreeID)+1 FROM invite_tree");
 					list($TreeID) = $DB->next_record();

-					$DB->query("INSERT INTO invite_tree
+					$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
+					$DB->query("
+						SELECT TreePosition
 						FROM invite_tree
 						WHERE TreePosition>'$InviterTreePosition'
 							AND TreeLevel<='$TreeLevel'
@ -151,10 +153,14 @@
 					list($TreePosition) = $DB->next_record();

 					if ($TreePosition) {
-						$DB->query("UPDATE invite_tree SET TreePosition=TreePosition+1 WHERE TreeID='$TreeID' AND TreePosition>='$TreePosition'");
+						$DB->query("
+							UPDATE invite_tree
+							SET TreePosition=TreePosition+1
+							WHERE TreeID='$TreeID'
+								AND TreePosition>='$TreePosition'");
 					} else {
-						$DB->query("SELECT
-							TreePosition+1
+						$DB->query("
+							SELECT TreePosition+1
 							FROM invite_tree
 							WHERE TreeID='$TreeID'
 							ORDER BY TreePosition DESC
@ -164,9 +170,9 @@
 					$TreeLevel++;

 					// Create invite tree record
-					$DB->query("INSERT INTO invite_tree
-						(UserID, InviterID, TreePosition, TreeID, TreeLevel) VALUES
-						('$UserID', '$InviterID', '$TreePosition', '$TreeID', '$TreeLevel')");
+					$DB->query("
+						INSERT INTO invite_tree (UserID, InviterID, TreePosition, TreeID, TreeLevel)
+						VALUES ('$UserID', '$InviterID', '$TreePosition', '$TreeID', '$TreeLevel')");
 				}
 			} else { // No inviter (open registration)
 				$DB->query("SELECT MAX(TreeID) FROM invite_tree");
--- a/sections/reports/ajax_resolve_report.php
+++ b/sections/reports/ajax_resolve_report.php
@ -11,7 +11,7 @@
 list($Type) = $DB->next_record();
 if (!check_perms('admin_reports')) {
 	if (check_perms('site_moderate_forums')) {
-		if (!in_array($Type, array('collages_comment', 'post', 'requests_comment', 'thread', 'torrents_comment'))) {
+		if (!in_array($Type, array('artist_comment', 'collages_comment', 'post', 'requests_comment', 'thread', 'torrents_comment'))) {
 			ajax_error();
 		}
 	} elseif (check_perms('project_team')) {
@ -21,7 +21,8 @@
 	}
 }

-$DB->query("UPDATE reports
+$DB->query("
+	UPDATE reports
 	SET Status='Resolved',
 		ResolvedTime='".sqltime()."',
 		ResolverID='".$LoggedUser['ID']."'
@ -35,7 +36,7 @@
 	$Cache->decrement('num_update_reports');
 }

-if (in_array($Type, array('collages_comment', 'post', 'requests_comment', 'thread', 'torrents_comment'))) {
+if (in_array($Type, array('artist_comment', 'collages_comment', 'post', 'requests_comment', 'thread', 'torrents_comment'))) {
 	$Channels[] = '#forumreports';
 	$Cache->decrement('num_forum_reports');
 }
@ -45,7 +46,7 @@
 list($Remaining) = $DB->next_record();

 foreach ($Channels as $Channel) {
-	send_irc("PRIVMSG $Channel :Report $ReportID resolved by ".preg_replace("/^(.{2})/", "$1·", $LoggedUser['Username'])." on site (".(int)$Remaining." remaining).");
+	send_irc("PRIVMSG $Channel :Report $ReportID resolved by ".preg_replace("/^(.{2})/", "$1·", $LoggedUser['Username']).' on site ('.(int)$Remaining.' remaining).');
 }

 $Cache->delete_value('num_other_reports');
--- a/sections/reports/takereport.php
+++ b/sections/reports/takereport.php
@ -13,85 +13,136 @@
 $Short = $_POST['type'];
 $Type = $Types[$Short];
 $ID = $_POST['id'];
-if ($Short == "request_update") {
+if ($Short == 'request_update') {
 	if (empty($_POST['year']) || !is_number($_POST['year'])) {
 		error('Year must be specified.');
 		header('Location: reports.php?action=report&type=request_update&id='.$ID);
 		die();
 	}
-	$Reason  = "[b]Year[/b]: ".$_POST['year'].".\n\n";
+	$Reason  = '[b]Year[/b]: '.$_POST['year'].".\n\n";
 	// If the release type is somehow invalid, return "Not given"; otherwise, return the release type.
-	$Reason .= "[b]Release Type[/b]: ".((empty($_POST['releasetype']) || !is_number($_POST['releasetype']) || $_POST['releasetype'] == 0) ? 'Not given' : $ReleaseTypes[$_POST['releasetype']]).". \n\n";
-	$Reason .= "[b]Additional Comments[/b]: ".$_POST['comment'];
+	$Reason .= '[b]Release type[/b]: '.((empty($_POST['releasetype']) || !is_number($_POST['releasetype']) || $_POST['releasetype'] == 0) ? 'Not given' : $ReleaseTypes[$_POST['releasetype']]).". \n\n";
+	$Reason .= '[b]Additional comments[/b]: '.$_POST['comment'];
 } else {
 	$Reason = $_POST['reason'];
 }

 switch ($Short) {
-	case "request" :
-	case "request_update" :
+	case 'request' :
+	case 'request_update' :
 		$Link = 'requests.php?action=view&id='.$ID;
 		break;
-	case "user" :
+	case 'user' :
 		$Link = 'user.php?id='.$ID;
 		break;
-	case "collage" :
+	case 'collage' :
 		$Link = 'collages.php?id='.$ID;
 		break;
-	case "thread" :
+	case 'thread' :
 		$Link = 'forums.php?action=viewthread&threadid='.$ID;
 		break;
-	case "post" :
-		$DB->query("SELECT p.ID, p.TopicID, (SELECT COUNT(ID) FROM forums_posts WHERE forums_posts.TopicID = p.TopicID AND forums_posts.ID<=p.ID) AS PostNum FROM forums_posts AS p WHERE ID=".$ID);
+	case 'post' :
+		$DB->query("
+			SELECT
+				p.ID,
+				p.TopicID,
+				(	SELECT COUNT(ID)
+					FROM forums_posts
+					WHERE forums_posts.TopicID = p.TopicID
+						AND forums_posts.ID<=p.ID
+				) AS PostNum
+			FROM forums_posts AS p
+			WHERE ID=".$ID);
 		list($PostID,$TopicID,$PostNum) = $DB->next_record();
-		$Link = "forums.php?action=viewthread&threadid=".$TopicID."&post=".$PostNum."#post".$PostID;
+		$Link = 'forums.php?action=viewthread&threadid='.$TopicID.'&post='.$PostNum.'#post'.$PostID;
 		break;
-	case "requests_comment" :
-		$DB->query("SELECT rc.RequestID, rc.Body, (SELECT COUNT(ID) FROM requests_comments WHERE ID <= ".$ID." AND requests_comments.RequestID = rc.RequestID) AS CommentNum FROM requests_comments AS rc WHERE ID=".$ID);
+	case 'requests_comment' :
+		$DB->query("
+			SELECT
+				rc.RequestID,
+				rc.Body,
+				(	SELECT COUNT(ID)
+					FROM requests_comments
+					WHERE ID <= $ID
+						AND requests_comments.RequestID = rc.RequestID
+				) AS CommentNum
+			FROM requests_comments AS rc
+			WHERE ID=".$ID);
 		list($RequestID, $Body, $PostNum) = $DB->next_record();
 		$PageNum = ceil($PostNum / TORRENT_COMMENTS_PER_PAGE);
-		$Link = "requests.php?action=view&id=".$RequestID."&page=".$PageNum."#post".$ID."";
+		$Link = 'requests.php?action=view&id='.$RequestID.'&page='.$PageNum.'#post'.$ID;
 		break;
-	case "torrents_comment" :
-		$DB->query("SELECT tc.GroupID, tc.Body, (SELECT COUNT(ID) FROM torrents_comments WHERE ID <= ".$ID." AND torrents_comments.GroupID = tc.GroupID) AS CommentNum FROM torrents_comments AS tc WHERE ID=".$ID);
+	case 'torrents_comment' :
+		$DB->query("
+			SELECT
+				tc.GroupID,
+				tc.Body,
+				(	SELECT COUNT(ID)
+					FROM torrents_comments
+					WHERE ID <= $ID
+						AND torrents_comments.GroupID = tc.GroupID
+				) AS CommentNum
+			FROM torrents_comments AS tc
+			WHERE ID=".$ID);
 		list($GroupID, $Body, $PostNum) = $DB->next_record();
 		$PageNum = ceil($PostNum / TORRENT_COMMENTS_PER_PAGE);
-		$Link = "torrents.php?id=".$GroupID."&page=".$PageNum."#post".$ID;
+		$Link = 'torrents.php?id='.$GroupID.'&page='.$PageNum.'#post'.$ID;
 		break;
-	case "artist_comment" :
-		$DB->query("SELECT ac.ArtistID, ac.Body, (SELECT COUNT(ID) FROM artist_comments WHERE ID <= ".$ID." AND artist_comments.ArtistID = ac.ArtistID) AS CommentNum FROM artist_comments AS ac WHERE ID=".$ID);
+	case 'artist_comment' :
+		$DB->query("
+			SELECT
+				ac.ArtistID,
+				ac.Body,
+				(	SELECT COUNT(ID)
+					FROM artist_comments
+					WHERE ID <= $ID
+						AND artist_comments.ArtistID = ac.ArtistID
+				) AS CommentNum
+			FROM artist_comments AS ac
+			WHERE ID=".$ID);
 		list($ArtistID, $Body, $PostNum) = $DB->next_record();
 		$PageNum = ceil($PostNum / TORRENT_COMMENTS_PER_PAGE);
-		$Link = "artist.php?id=".$ArtistID."&page=".$PageNum."#post".$ID;
+		$Link = 'artist.php?id='.$ArtistID.'&page='.$PageNum.'#post'.$ID;
 		break;
-	case "collages_comment" :
-		$DB->query("SELECT cc.CollageID, cc.Body, (SELECT COUNT(ID) FROM collages_comments WHERE ID <= ".$ID." AND collages_comments.CollageID = cc.CollageID) AS CommentNum FROM collages_comments AS cc WHERE ID=".$ID);
+	case 'collages_comment' :
+		$DB->query("
+			SELECT
+				cc.CollageID,
+				cc.Body,
+				(	SELECT COUNT(ID)
+					FROM collages_comments
+					WHERE ID <= $ID
+						AND collages_comments.CollageID = cc.CollageID
+				) AS CommentNum
+			FROM collages_comments AS cc
+			WHERE ID=".$ID);
 		list($CollageID, $Body, $PostNum) = $DB->next_record();
 		$PerPage = POSTS_PER_PAGE;
 		$PageNum = ceil($PostNum / $PerPage);
-		$Link = "collage.php?action=comments&collageid=".$CollageID."&page=".$PageNum."#post".$ID;
+		$Link = 'collage.php?action=comments&collageid='.$CollageID.'&page='.$PageNum.'#post'.$ID;
 		break;
 }

-$DB->query("INSERT INTO reports
+$DB->query('
+	INSERT INTO reports
 		(UserID, ThingID, Type, ReportedTime, Reason)
 	VALUES
-				(".db_string($LoggedUser['ID']).", ".$ID." , '".$Short."', '".sqltime()."', '".db_string($Reason)."')");
+		('.db_string($LoggedUser['ID']).", $ID , '$Short', '".sqltime()."', '".db_string($Reason)."')");
 $ReportID = $DB->inserted_id();

 $Channels = array();

-if ($Short == "request_update") {
-	$Channels[] = "#requestedits";
+if ($Short == 'request_update') {
+	$Channels[] = '#requestedits';
 	$Cache->increment('num_update_reports');
 }
 if (in_array($Short, array('collages_comment', 'post', 'requests_comment', 'thread', 'torrents_comment'))) {
-	$Channels[] = "#forumreports";
+	$Channels[] = '#forumreports';

 }

 foreach ($Channels as $Channel) {
-	send_irc("PRIVMSG ".$Channel." :".$ReportID." - ".$LoggedUser['Username']." just reported a ".$Short.": https://".SSL_SITE_URL."/".$Link." : ".strtr($Reason, "\n", " "));
+	send_irc("PRIVMSG $Channel :$ReportID - ".$LoggedUser['Username']." just reported a $Short: https://".SSL_SITE_URL."/$Link : ".strtr($Reason, "\n", ' '));
 }

 $Cache->delete_value('num_other_reports');
--- a/sections/tools/data/upscale_pool.php
+++ b/sections/tools/data/upscale_pool.php
@ -6,7 +6,8 @@
 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,
@ -24,10 +25,15 @@
 		LEFT JOIN users_info AS i ON i.UserID=m.ID
 	WHERE i.RatioWatchEnds != '0000-00-00 00:00:00'
 		AND m.Enabled = '1'
-	ORDER BY i.RatioWatchEnds ASC LIMIT $Limit");
+	ORDER BY i.RatioWatchEnds ASC
+	LIMIT $Limit");
 $DB->query("SELECT FOUND_ROWS()");
 list($Results) = $DB->next_record();
-$DB->query("SELECT COUNT(UserID) FROM users_info WHERE BanDate != '0000-00-00 00:00:00' AND BanReason = '2'");
+$DB->query("
+	SELECT COUNT(UserID)
+	FROM users_info
+	WHERE BanDate != '0000-00-00 00:00:00'
+		AND BanReason = '2'");
 list($TotalDisabled) = $DB->next_record();
 $DB->set_query_id($RS);

--- a/sections/tools/managers/eb.php
+++ b/sections/tools/managers/eb.php
@ -6,7 +6,8 @@
 list ($Page, $Limit) = Format::page_limit(EMAILS_PER_PAGE);

 View::show_header('Manage email blacklist');
-$DB->query("SELECT
+$DB->query("
+	SELECT
 		SQL_CALC_FOUND_ROWS
 		eb.ID,
 		eb.UserID,
@ -14,7 +15,8 @@
 		eb.Email,
 		eb.Comment
 	FROM email_blacklist AS eb
-	ORDER BY eb.Time DESC LIMIT $Limit");
+	ORDER BY eb.Time DESC
+	LIMIT $Limit");
 $Results = $DB->to_array(false, MYSQLI_ASSOC, false);
 $DB->query("SELECT FOUND_ROWS()");
 list ($NumResults) = $DB->next_record();
--- a/sections/torrents/details.php
+++ b/sections/torrents/details.php
@ -621,17 +621,17 @@ function filelist($Str) {
 <?	foreach ($Requests as $Request) {
 		$RequestVotes = Requests::get_votes_array($Request['ID']);

-		if ($Request['BitrateList'] != "") {
-			$BitrateString = implode(", ", explode("|", $Request['BitrateList']));
-			$FormatString = implode(", ", explode("|", $Request['FormatList']));
-			$MediaString = implode(", ", explode("|", $Request['MediaList']));
+		if ($Request['BitrateList'] != '') {
+			$BitrateString = implode(', ', explode('|', $Request['BitrateList']));
+			$FormatString = implode(', ', explode('|', $Request['FormatList']));
+			$MediaString = implode(', ', explode('|', $Request['MediaList']));
 			if ($Request['LogCue']) {
 				$FormatString .= ' - '.$Request['LogCue'];
 			}
 		} else {
-			$BitrateString = "Unknown";
-			$FormatString = "Unknown";
-			$MediaString = "Unknown";
+			$BitrateString = 'Unknown';
+			$FormatString = 'Unknown';
+			$MediaString = 'Unknown';
 		}
 ?>
 				<tr class="requestrows <?=(++$i % 2 ? 'rowa' : 'rowb')?>">
@ -651,7 +651,13 @@ function filelist($Str) {
 }
 $Collages = $Cache->get_value('torrent_collages_'.$GroupID);
 if (!is_array($Collages)) {
-	$DB->query("SELECT c.Name, c.NumTorrents, c.ID FROM collages AS c JOIN collages_torrents AS ct ON ct.CollageID=c.ID WHERE ct.GroupID='$GroupID' AND Deleted='0' AND CategoryID!='0'");
+	$DB->query("
+		SELECT c.Name, c.NumTorrents, c.ID
+		FROM collages AS c
+			JOIN collages_torrents AS ct ON ct.CollageID=c.ID
+		WHERE ct.GroupID='$GroupID'
+			AND Deleted='0'
+			AND CategoryID!='0'");
 	$Collages = $DB->to_array();
 	$Cache->cache_value('torrent_collages_'.$GroupID, $Collages, 3600 * 6);
 }
@ -695,7 +701,13 @@ function filelist($Str) {

 $PersonalCollages = $Cache->get_value('torrent_collages_personal_'.$GroupID);
 if (!is_array($PersonalCollages)) {
-	$DB->query("SELECT c.Name, c.NumTorrents, c.ID FROM collages AS c JOIN collages_torrents AS ct ON ct.CollageID=c.ID WHERE ct.GroupID='$GroupID' AND Deleted='0' AND CategoryID='0'");
+	$DB->query("
+		SELECT c.Name, c.NumTorrents, c.ID
+		FROM collages AS c
+			JOIN collages_torrents AS ct ON ct.CollageID=c.ID
+		WHERE ct.GroupID='$GroupID'
+			AND Deleted='0'
+			AND CategoryID='0'");
 	$PersonalCollages = $DB->to_array(false, MYSQLI_NUM);
 	$Cache->cache_value('torrent_collages_personal_'.$GroupID, $PersonalCollages, 3600 * 6);
 }
@ -742,7 +754,7 @@ function filelist($Str) {
 ?>
 		<div class="box">
 			<div class="head"><a href="#">&uarr;</a>&nbsp;<strong><?=(!empty($ReleaseType) ? $ReleaseTypes[$ReleaseType].' info' : 'Info' )?></strong></div>
-			<div class="body"><? if ($WikiBody!="") { echo $WikiBody; } else { echo "There is no information on this torrent."; } ?></div>
+			<div class="body"><? if ($WikiBody != '') { echo $WikiBody; } else { echo 'There is no information on this torrent.'; } ?></div>
 		</div>
 <?
 // --- Comments ---
@ -750,8 +762,8 @@ function filelist($Str) {
 // gets the amount of comments for this group
 $Results = $Cache->get_value('torrent_comments_'.$GroupID);
 if ($Results === false) {
-	$DB->query("SELECT
-			COUNT(c.ID)
+	$DB->query("
+		SELECT COUNT(c.ID)
 		FROM torrents_comments as c
 		WHERE c.GroupID = '$GroupID'");
 	list($Results) = $DB->next_record();
@ -759,7 +771,11 @@ function filelist($Str) {
 }

 if (isset($_GET['postid']) && is_number($_GET['postid']) && $Results > TORRENT_COMMENTS_PER_PAGE) {
-	$DB->query("SELECT COUNT(ID) FROM torrents_comments WHERE GroupID = $GroupID AND ID <= $_GET[postid]");
+	$DB->query("
+		SELECT COUNT(ID)
+		FROM torrents_comments
+		WHERE GroupID = $GroupID
+			AND ID <= $_GET[postid]");
 	list($PostNum) = $DB->next_record();
 	list($Page,$Limit) = Format::page_limit(TORRENT_COMMENTS_PER_PAGE,$PostNum);
 } else {
@ -775,7 +791,8 @@ function filelist($Str) {
 // Cache catalogue from which the page is selected, allows block caches and future ability to specify posts per page
 $Catalogue = $Cache->get_value('torrent_comments_'.$GroupID.'_catalogue_'.$CatalogueID);
 if ($Catalogue === false) {
-	$DB->query("SELECT
+	$DB->query("
+		SELECT
 			c.ID,
 			c.AuthorID,
 			c.AddedTime,
--- a/sections/torrents/user.php
+++ b/sections/torrents/user.php
@ -274,7 +274,8 @@ function header_link($SortKey,$DefaultWay="DESC") {
 		$Words = array_unique(explode(' ', db_string($_GET['search'])));
 	}

-	$SQL = "SELECT SQL_CALC_FOUND_ROWS
+	$SQL = "
+		SELECT SQL_CALC_FOUND_ROWS
 			GroupID, TorrentID, Time, CategoryID
 		FROM temp_sections_torrents_user";
 	if (!empty($Words)) {
@ -282,7 +283,8 @@ function header_link($SortKey,$DefaultWay="DESC") {
 		WHERE Name LIKE '%".implode("%' AND Name LIKE '%", $Words)."%'";
 	}
 	$SQL .= "
-		ORDER BY $Order $Way LIMIT $Limit";
+		ORDER BY $Order $Way
+		LIMIT $Limit";
 }

 $DB->query($SQL);
--- a/sections/upload/upload_handle.php
+++ b/sections/upload/upload_handle.php
@ -907,7 +907,6 @@
 } else {
 	$SQL.=" AND (FromYear=0 AND ToYear=0) ";
 }
-
 $SQL.=" AND UserID != '".$LoggedUser['ID']."' ";

 $DB->query($SQL);
--- a/sections/user/linkedfunctions.php
+++ b/sections/user/linkedfunctions.php
@ -143,12 +143,14 @@ function user_dupes_table($UserID) {
 	if (!is_number($UserID)) {
 		error(403);
 	}
-	$DB->query("SELECT d.ID, d.Comments, SHA1(d.Comments) AS CommentHash
+	$DB->query("
+		SELECT d.ID, d.Comments, SHA1(d.Comments) AS CommentHash
 		FROM dupe_groups AS d
 			JOIN users_dupes AS u ON u.GroupID = d.ID
 		WHERE u.UserID = $UserID");
 	if (list($GroupID, $Comments, $CommentHash) = $DB->next_record()) {
-		$DB->query("SELECT m.ID
+		$DB->query("
+			SELECT m.ID
 			FROM users_main AS m
 				JOIN users_dupes AS d ON m.ID = d.UserID
 			WHERE d.GroupID = $GroupID
@ -180,22 +182,23 @@ function user_dupes_table($UserID) {
 		$DupeInfo = Users::user_info($DupeID);
 ?>
 					<td align="left"><?=Users::format_username($DupeID, true, true, true, true)?>
-						<a href="user.php?action=dupes&amp;dupeaction=remove&amp;auth=<?=$LoggedUser['AuthKey']?>&amp;userid=<?=$UserID?>&amp;removeid=<?=$DupeID?>" onclick="return confirm('Are you sure you wish to remove <?=$DupeInfo['Username']?> from this group?');" class="brackets">x</a></td>
+						<a href="user.php?action=dupes&amp;dupeaction=remove&amp;auth=<?=$LoggedUser['AuthKey']?>&amp;userid=<?=$UserID?>&amp;removeid=<?=$DupeID?>" onclick="return confirm('Are you sure you wish to remove <?=$DupeInfo['Username']?> from this group?');" class="brackets">x</a>
+					</td>
 <?
 		if ($i == 5) {
 			$i = 0;
-			echo "</tr><tr>";
+			echo "\t\t\t\t\t</tr>\n\t\t\t\t\t<tr>";
 		}
 	}
 	if ($DupeCount) {
 		for ($j = $i; $j < 5; $j++) {
-			echo '<td>&nbsp;</td>';
+			echo "\t\t\t\t\t\t<td>&nbsp;</td>";
 		}
 ?>
 					</tr>
 <?	}	?>
 					<tr>
-						<td colspan="5" align="left" style="border-top: thin solid"><strong>Comments:</strong></td>
+						<td colspan="5" align="left" style="border-top: thin solid;"><strong>Comments:</strong></td>
 					</tr>
 					<tr>
 						<td colspan="5" align="left">
--- a/sections/user/notify_edit.php
+++ b/sections/user/notify_edit.php
@ -12,7 +12,12 @@
 		</div>
 	</div>
 <?
-$DB->query("SELECT ID, Label, Artists, ExcludeVA, NewGroupsOnly, Tags, NotTags, ReleaseTypes, Categories, Formats, Encodings, Media, FromYear, ToYear FROM users_notify_filters WHERE UserID='$LoggedUser[ID]' UNION ALL SELECT NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL");
+$DB->query("
+	SELECT ID, Label, Artists, ExcludeVA, NewGroupsOnly, Tags, NotTags, ReleaseTypes, Categories, Formats, Encodings, Media, FromYear, ToYear, RecordLabels
+	FROM users_notify_filters
+	WHERE UserID='$LoggedUser[ID]'
+	UNION ALL
+	SELECT NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL");
 $i = 0;
 $NumFilters = $DB->record_count() - 1;

@ -27,10 +32,14 @@
 	$N['Formats'] 		= explode('|', substr($N['Formats'], 1, -1));
 	$N['Encodings'] 	= explode('|', substr($N['Encodings'], 1, -1));
    $N['Media'] 		= explode('|', substr($N['Media'], 1, -1));
-	if ($N['FromYear'] == 0) { $N['FromYear'] = ''; }
-	if ($N['ToYear'] == 0) { $N['ToYear'] = ''; }
+	$N['RecordLabels']		= implode(', ', explode('|', substr($N['RecordLabels'], 1, -1)));
+    if ($N['FromYear'] == 0) {
+		$N['FromYear'] = '';
+	}
+	if ($N['ToYear'] == 0) {
+		$N['ToYear'] = '';
+	}
 	$i++;
-
 	if ($i > $NumFilters && $NumFilters > 0) { ?>
 			<h3>Create a new notification filter</h3>
 <?	} elseif ($NumFilters > 0) { ?>
@ -48,10 +57,10 @@
 		<table <?=($i <= $NumFilters) ? 'id="filter_'.$N['ID'].'" class="layout hidden"' : 'class="layout"'?>>
 <?	if ($i > $NumFilters) { ?>
 			<tr>
-				<td class="label"><strong>Label</strong></td>
+				<td class="label"><strong>Notification filter name</strong></td>
 				<td>
-					<input type="text" name="label<?=$i?>" style="width: 100%" />
-					<p class="min_padding">A label/name for the filter set to tell different filters apart.</p>
+					<input type="text" name="label<?=$i?>" style="width: 100%;" />
+					<p class="min_padding">A name for the notification filter set to tell different filters apart.</p>
 				</td>
 			</tr>
 			<tr>
@ -65,23 +74,22 @@
 			<tr>
 				<td class="label"><strong>One of these artists</strong></td>
 				<td>
-					<textarea name="artists<?=$i?>" style="width:100%" rows="5"><?=display_str($N['Artists'])?></textarea>
+					<textarea name="artists<?=$i?>" style="width: 100%;" rows="5"><?=display_str($N['Artists'])?></textarea>
 					<p class="min_padding">Comma-separated list &mdash; e.g. <em>Pink Floyd, Led Zeppelin, Neil Young</em></p>
 					<input type="checkbox" name="excludeva<?=$i?>" id="excludeva_<?=$N['ID']?>"<? if ($N['ExcludeVA'] == '1') { echo ' checked="checked"';} ?> />
 					<label for="excludeva_<?=$N['ID']?>">Exclude Various Artists releases</label>
 				</td>
-			</tr>
-			<tr>
+			</tr>			<tr>
 				<td class="label"><strong>At least one of these tags</strong></td>
 				<td>
-					<textarea name="tags<?=$i?>" style="width:100%" rows="2"><?=display_str($N['Tags'])?></textarea>
+					<textarea name="tags<?=$i?>" style="width: 100%;" rows="2"><?=display_str($N['Tags'])?></textarea>
 					<p class="min_padding">Comma-separated list &mdash; e.g. <em>rock, jazz, pop</em></p>
 				</td>
 			</tr>
 			<tr>
 				<td class="label"><strong>None of these tags</strong></td>
 				<td>
-					<textarea name="nottags<?=$i?>" style="width:100%" rows="2"><?=display_str($N['NotTags'])?></textarea>
+					<textarea name="nottags<?=$i?>" style="width: 100%;" rows="2"><?=display_str($N['NotTags'])?></textarea>
 					<p class="min_padding">Comma-separated list &mdash; e.g. <em>rock, jazz, pop</em></p>
 				</td>
 			</tr>
--- a/sections/user/notify_handle.php
+++ b/sections/user/notify_handle.php
@ -15,6 +15,7 @@
 $MediaList = '';
 $FromYear = 0;
 $ToYear = 0;
+$RecordLabels = '';
 $HasFilter = false;

 if ($_POST['formid'] && is_number($_POST['formid'])) {
@ -25,12 +26,12 @@
 	$Artists = explode(',', $_POST['artists'.$FormID]);
 	$ParsedArtists = array();
 	foreach ($Artists as $Artist) {
-		if (trim($Artist) != "") {
+		if (trim($Artist) != '') {
 			$ParsedArtists[] = db_string(trim($Artist));
 		}
 	}
 	if (count($ParsedArtists) > 0) {
-		$ArtistList = '|'.implode("|", $ParsedArtists).'|';
+		$ArtistList = '|'.implode('|', $ParsedArtists).'|';
 		$HasFilter = true;
 	}
 }
@ -118,6 +119,20 @@
 	}
 }

+if ($_POST['record_labels'.$FormID]) {
+	$RLs = explode(',', $_POST['record_labels'.$FormID]);
+	$ParsedRLs = array();
+	foreach ($RLs as $RL) {
+		if (trim($RL) != '') {
+			$ParsedRLs[] = db_string(trim($RL));
+		}
+	}
+	if (count($ParsedRLs) > 0) {
+		$RecordLabels = '|'.implode('|', $ParsedRLs).'|';
+		$HasFilter = true;
+	}
+}
+
 if (!$HasFilter) {
 	$Err = 'You must add at least one criterion to filter by';
 } elseif (!$_POST['label'.$FormID] && !$_POST['id'.$FormID]) {
@ -135,7 +150,9 @@
 $NotTagList = str_replace('||','|',$NotTagList);

 if ($_POST['id'.$FormID] && is_number($_POST['id'.$FormID])) {
-	$DB->query("UPDATE users_notify_filters SET
+	$DB->query("
+		UPDATE users_notify_filters
+		SET
 			Artists='$ArtistList',
 			ExcludeVA='$ExcludeVA',
 			NewGroupsOnly='$NewGroupsOnly',
@ -147,13 +164,16 @@
 			Encodings='$EncodingList',
 			Media='$MediaList',
 			FromYear='$FromYear',
-		ToYear='$ToYear'
-		WHERE ID='".$_POST['id'.$FormID]."' AND UserID='$LoggedUser[ID]'");
+			ToYear='$ToYear',
+			RecordLabels='$RecordLabels'
+		WHERE ID='".$_POST['id'.$FormID]."'
+			AND UserID='$LoggedUser[ID]'");
 } else {
-	$DB->query("INSERT INTO users_notify_filters
-		(UserID, Label, Artists, ExcludeVA, NewGroupsOnly, Tags, NotTags, ReleaseTypes, Categories, Formats, Encodings, Media, FromYear, ToYear)
+	$DB->query("
+		INSERT INTO users_notify_filters
+			(UserID, Label, Artists, ExcludeVA, NewGroupsOnly, Tags, NotTags, ReleaseTypes, Categories, Formats, Encodings, Media, FromYear, ToYear, RecordLabels)
 		VALUES
-		('$LoggedUser[ID]','".db_string($_POST['label'.$FormID])."','$ArtistList','$ExcludeVA','$NewGroupsOnly','$TagList', '$NotTagList', '$ReleaseTypeList','$CategoryList','$FormatList','$EncodingList','$MediaList', '$FromYear', '$ToYear')");
+			('$LoggedUser[ID]','".db_string($_POST['label'.$FormID])."','$ArtistList','$ExcludeVA','$NewGroupsOnly','$TagList', '$NotTagList', '$ReleaseTypeList','$CategoryList','$FormatList','$EncodingList','$MediaList', '$FromYear', '$ToYear', '$RecordLabels')");
 }

 $Cache->delete_value('notify_filters_'.$LoggedUser['ID']);
--- a/sections/user/user.php
+++ b/sections/user/user.php
@ -493,7 +493,7 @@ function check_paranoia_here($Setting) {
 			<div class="head">
 				<span style="float: left;">Profile<? if ($CustomTitle) { ?>&nbsp;-&nbsp;</span>
 				<span class="user_title"><? echo html_entity_decode($DisplayCustomTitle); } ?></span>
-				<span style="float: right;"><?=!empty($Badges)?"$Badges&nbsp;&nbsp;":''?><a href="#" onclick="$('#profilediv').toggle(); this.innerHTML=(this.innerHTML=='Hide'?'Show':'Hide'); return false;" class="brackets">Hide</a></span>&nbsp;
+				<span style="float: right;"><?=(!empty($Badges) ? "$Badges&nbsp;&nbsp;" : '')?><a href="#" onclick="$('#profilediv').toggle(); this.innerHTML=(this.innerHTML=='Hide'?'Show':'Hide'); return false;" class="brackets">Hide</a></span>&nbsp;
 			</div>
 			<div class="pad" id="profilediv">
 <?	if (!$Info) { ?>
@ -510,7 +510,8 @@ function check_paranoia_here($Setting) {
 if ($Snatched > 4 && check_paranoia_here('snatched')) {
 	$RecentSnatches = $Cache->get_value('recent_snatches_'.$UserID);
 	if (!is_array($RecentSnatches)) {
-		$DB->query("SELECT
+		$DB->query("
+			SELECT
 				g.ID,
 				g.Name,
 				g.WikiImage
@ -555,7 +556,8 @@ function check_paranoia_here($Setting) {
 if ($Uploads > 4 && check_paranoia_here('uploads')) {
 	$RecentUploads = $Cache->get_value('recent_uploads_'.$UserID);
 	if (!is_array($RecentUploads)) {
-		$DB->query("SELECT
+		$DB->query("
+			SELECT
 				g.ID,
 				g.Name,
 				g.WikiImage
@ -592,18 +594,26 @@ function check_paranoia_here($Setting) {
 <?
 }

-$DB->query("SELECT ID, Name FROM collages WHERE UserID='$UserID' AND CategoryID='0' AND Deleted='0' ORDER BY Featured DESC, Name ASC");
+$DB->query("
+	SELECT ID, Name
+	FROM collages
+	WHERE UserID='$UserID'
+		AND CategoryID='0'
+		AND Deleted='0'
+	ORDER BY Featured DESC, Name ASC");
 $Collages = $DB->to_array();
 $FirstCol = true;
 foreach ($Collages as $CollageInfo) {
 	list($CollageID, $CName) = $CollageInfo;
-	$DB->query("SELECT ct.GroupID,
+	$DB->query("
+		SELECT ct.GroupID,
 			tg.WikiImage,
 			tg.CategoryID
 		FROM collages_torrents AS ct
 			JOIN torrents_group AS tg ON tg.ID=ct.GroupID
 		WHERE ct.CollageID='$CollageID'
-		ORDER BY ct.Sort LIMIT 5");
+		ORDER BY ct.Sort
+		LIMIT 5");
 	$Collage = $DB->to_array();
 ?>
 	<table class="layout recent" id="collage<?=$CollageID?>_box" cellpadding="0" cellspacing="0" border="0">
@ -638,8 +648,6 @@ function check_paranoia_here($Setting) {
 }


-
-
 // Linked accounts
 if (check_perms('users_mod')) {
 	include(SERVER_ROOT.'/sections/user/linkedfunctions.php');
@ -663,7 +671,8 @@ function check_paranoia_here($Setting) {

 // Requests
 if (empty($LoggedUser['DisableRequests']) && check_paranoia_here('requestsvoted_list')) {
-	$DB->query("SELECT
+	$DB->query("
+		SELECT
 			r.ID,
 			r.CategoryID,
 			r.Title,
@ -674,7 +683,7 @@ function check_paranoia_here($Setting) {
 		FROM requests AS r
 			LEFT JOIN users_main AS u ON u.ID=UserID
 			LEFT JOIN requests_votes AS rv ON rv.RequestID=r.ID
-		WHERE r.UserID = ".$UserID."
+		WHERE r.UserID = $UserID
 			AND r.TorrentID = 0
 		GROUP BY r.ID
 		ORDER BY Votes DESC");
@ -768,7 +777,8 @@ function check_paranoia_here($Setting) {
 $IsFLS = $LoggedUser['ExtraClasses'][41];
 if (check_perms('users_mod', $Class) || $IsFLS) {
 	$UserLevel = $LoggedUser['EffectiveClass'];
-	$DB->query("SELECT
+	$DB->query("
+		SELECT
 			SQL_CALC_FOUND_ROWS
 			ID,
 			Subject,
@ -778,7 +788,8 @@ function check_paranoia_here($Setting) {
 			Date,
 			ResolverID
 		FROM staff_pm_conversations
-				WHERE UserID = $UserID AND (Level <= $UserLevel OR AssignedToUser='".$LoggedUser['ID']."')
+		WHERE UserID = $UserID
+			AND (Level <= $UserLevel OR AssignedToUser='".$LoggedUser['ID']."')
 		ORDER BY Date DESC");
 	if ($DB->record_count()) {
 		$StaffPMs = $DB->to_array();
@ -799,10 +810,10 @@ function check_paranoia_here($Setting) {
 			// Get assigned
 			if ($AssignedToUser == '') {
 				// Assigned to class
-				$Assigned = ($Level == 0) ? "First Line Support" : $ClassLevels[$Level]['Name'];
+				$Assigned = ($Level == 0) ? 'First Line Support' : $ClassLevels[$Level]['Name'];
 				// No + on Sysops
 				if ($Assigned != 'Sysop') {
-					$Assigned .= "+";
+					$Assigned .= '+';
 				}

 			} else {
@ -813,7 +824,7 @@ function check_paranoia_here($Setting) {
 			if ($ResolverID) {
 				$Resolver = Users::format_username($ResolverID, true, true, true, true);
 			} else {
-				$Resolver = "(unresolved)";
+				$Resolver = '(unresolved)';
 			}

 			?>
@ -937,7 +948,8 @@ function check_paranoia_here($Setting) {
 			<td class="label">Secondary classes:</td>
 			<td>
 <?
-		$DB->query("SELECT p.ID, p.Name, l.UserID
+		$DB->query("
+			SELECT p.ID, p.Name, l.UserID
 			FROM permissions AS p
 				LEFT JOIN users_levels AS l ON l.PermissionID = p.ID AND l.UserID = '$UserID'
 			WHERE p.Secondary = 1
@ -1122,7 +1134,11 @@ function check_paranoia_here($Setting) {
 				</td>
 			</tr>
 <?	if (check_perms('users_disable_posts') || check_perms('users_disable_any')) {
-		$DB->query("SELECT DISTINCT Email, IP FROM users_history_emails WHERE UserID = ".$UserID." ORDER BY Time ASC");
+		$DB->query("
+			SELECT DISTINCT Email, IP
+			FROM users_history_emails
+			WHERE UserID = $UserID
+			ORDER BY Time ASC");
 		$Emails = $DB->to_array();
 ?>
 			<tr>
--- a/sections/userhistory/ip_tracker_history.php
+++ b/sections/userhistory/ip_tracker_history.php
@ -45,7 +45,13 @@ function ShowIPs(rowname) {
 <?
 list($Page,$Limit) = Format::page_limit(IPS_PER_PAGE);

-$TrackerIps = $DB->query("SELECT IP, fid, tstamp FROM xbt_snatched WHERE uid = ".$UserID." AND IP != '' ORDER BY tstamp DESC LIMIT $Limit");
+$TrackerIps = $DB->query("
+	SELECT IP, fid, tstamp
+	FROM xbt_snatched
+	WHERE uid = $UserID
+		AND IP != ''
+	ORDER BY tstamp DESC
+	LIMIT $Limit");

 $DB->query("SELECT FOUND_ROWS()");
 list($NumResults) = $DB->next_record();
@ -56,7 +62,7 @@ function ShowIPs(rowname) {
 ?>
 <div class="thin">
 	<div class="header">
-		<h2>Tracker IP address history for <a href="/user.php?id=<?=$UserID?>"><?=$Username?></a></h2>
+		<h2>Tracker IP address history for <a href="user.php?id=<?=$UserID?>"><?=$Username?></a></h2>
 	</div>
 	<div class="linkbox"><?=$Pages?></div>
 	<table>
--- a/sections/userhistory/post_history.php
+++ b/sections/userhistory/post_history.php
@ -7,11 +7,9 @@
 	error(403);
 }

-
 include(SERVER_ROOT.'/classes/class_text.php'); // Text formatting class
 $Text = new TEXT;

-
 $UserID = empty($_GET['userid']) ? $LoggedUser['ID'] : $_GET['userid'];
 if (!is_number($UserID)) {
 	error(0);
@ -33,12 +31,14 @@
 if ($LoggedUser['CustomForums']) {
 	unset($LoggedUser['CustomForums']['']);
 	$RestrictedForums = implode("','", array_keys($LoggedUser['CustomForums'], 0));
+	$PermittedForums = implode("','", array_keys($LoggedUser['CustomForums'], 1));
 }
 $ViewingOwn = ($UserID == $LoggedUser['ID']);
 $ShowUnread = ($ViewingOwn && (!isset($_GET['showunread']) || !!$_GET['showunread']));
 $ShowGrouped = ($ViewingOwn && (!isset($_GET['group']) || !!$_GET['group']));
 if ($ShowGrouped) {
-	$sql = 'SELECT
+	$sql = '
+		SELECT
 			SQL_CALC_FOUND_ROWS
 			MAX(p.ID) AS ID
 		FROM forums_posts AS p
@ -50,7 +50,7 @@
 	$sql .= '
 			LEFT JOIN forums AS f ON f.ID = t.ForumID
 		WHERE p.AuthorID = '.$UserID.'
-		AND ((f.MinClassRead <= '.$LoggedUser['EffectiveClass'];
+			AND ((f.MinClassRead <= '.$LoggedUser['Class'];
 	if (!empty($RestrictedForums)) {
 		$sql.='
 			AND f.ID NOT IN (\''.$RestrictedForums.'\')';
@ -68,7 +68,8 @@
 	}
 	$sql .= '
 		GROUP BY t.ID
-		ORDER BY p.ID DESC LIMIT '.$Limit;
+		ORDER BY p.ID DESC
+		LIMIT '.$Limit;
 	$PostIDs = $DB->query($sql);
 	$DB->query("SELECT FOUND_ROWS()");
 	list($Results) = $DB->next_record();
@ -102,8 +103,8 @@
 		$Posts = $DB->query($sql);
 	}
 } else {
-	$sql = 'SELECT
-		SQL_CALC_FOUND_ROWS';
+	$sql = '
+		SELECT SQL_CALC_FOUND_ROWS';
 	if ($ShowGrouped) {
 		$sql.=' * FROM (SELECT';
 	}
@ -132,16 +133,25 @@
 			JOIN forums AS f ON f.ID = t.ForumID
 			LEFT JOIN forums_last_read_topics AS l ON l.UserID = '.$UserID.' AND l.TopicID = t.ID
 		WHERE p.AuthorID = '.$UserID.'
-			AND f.MinClassRead <= '.$LoggedUser['EffectiveClass'];
+			AND ((f.MinClassRead <= '.$LoggedUser['Class'];

 	if (!empty($RestrictedForums)) {
 		$sql.='
 			AND f.ID NOT IN (\''.$RestrictedForums.'\')';
 	}
+	$sql .= ')';
+
+	if (!empty($PermittedForums)) {
+		$sql.='
+			OR f.ID IN (\''.$PermittedForums.'\')';
+	}
+	$sql .= ')';

 	if ($ShowUnread) {
 		$sql.='
-		AND ((t.IsLocked=\'0\' OR t.IsSticky=\'1\') AND (l.PostID<t.LastPostID OR l.PostID IS NULL)) ';
+			AND (	(t.IsLocked=\'0\' OR t.IsSticky=\'1\')
+					AND (l.PostID<t.LastPostID OR l.PostID IS NULL)
+				) ';
 	}

 	$sql .= '
@ -150,7 +160,8 @@
 	if ($ShowGrouped) {
 		$sql.='
 		) AS sub
-		GROUP BY TopicID ORDER BY ID DESC';
+		GROUP BY TopicID
+		ORDER BY ID DESC';
 	}

 	$sql.=' LIMIT '.$Limit;
--- a/sections/userhistory/subscriptions.php
+++ b/sections/userhistory/subscriptions.php
@ -27,12 +27,13 @@

 $ShowUnread = (!isset($_GET['showunread']) && !isset($HeavyInfo['SubscriptionsUnread']) || isset($HeavyInfo['SubscriptionsUnread']) && !!$HeavyInfo['SubscriptionsUnread'] || isset($_GET['showunread']) && !!$_GET['showunread']);
 $ShowCollapsed = (!isset($_GET['collapse']) && !isset($HeavyInfo['SubscriptionsCollapse']) || isset($HeavyInfo['SubscriptionsCollapse']) && !!$HeavyInfo['SubscriptionsCollapse'] || isset($_GET['collapse']) && !!$_GET['collapse']);
-$sql = 'SELECT
-	SQL_CALC_FOUND_ROWS
+$sql = '
+	SELECT SQL_CALC_FOUND_ROWS
 		MAX(p.ID) AS ID
 	FROM (	SELECT TopicID
 			FROM users_subscriptions
-	WHERE UserID = '.$LoggedUser['ID'].') AS s
+			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
 		JOIN forums_posts AS p ON t.ID = p.TopicID
@ -66,7 +67,8 @@
 if ($NumResults > $PerPage * ($Page - 1)) {
 	$DB->set_query_id($PostIDs);
 	$PostIDs = $DB->collect('ID');
-	$sql = 'SELECT
+	$sql = '
+		SELECT
 			f.ID AS ForumID,
 			f.Name AS ForumName,
 			p.TopicID,
@ -190,7 +192,5 @@
 <? } // else -- if (empty($NumResults)) ?>
 </div>
 <?
-
 View::show_footer();
-
 ?>
--- a/static/functions/autocomplete.js
+++ b/static/functions/autocomplete.js
@ -137,8 +137,14 @@ var autocomp = {
 			listener.set(li,'mouseover',function() {
 				autocomp.highlight(this.i);
 			});
-			listener.set(li,'click',function() {
-				window.location = autocomp.id + '.php?id='+this.artistid;
+			listener.set(li,'click',function(e) {
+			    var location = autocomp.id + '.php?id='+this.artistid;
+			    if(e.button == 0) {
+			        window.open(location, '_self');
+			    } else if(e.button == 1) {
+			        var win = window.open(location, '_blank');
+					win.focus();
+			    }
 			});
 			this.list.appendChild(li);
 		}
--- a/static/styles/anorex/style.css
+++ b/static/styles/anorex/style.css
@ -91,8 +91,14 @@ span.size8 { font-size:2.5em; }
 span.size9 { font-size: 2.75em; }
 span.size10 { font-size: 3em; }

-ul.thin { margin:0px 0px 0px 25px; padding:0px; }
-ul.thin li { margin:0px 0px; padding:0px; }
+ul.thin {
+	margin: 0px 0px 0px 25px;
+	padding: 0px;
+}
+ul.thin li {
+	margin: 0px 0px;
+	padding: 0px;
+}

 /* Layout (Every page) */

@ -774,7 +780,7 @@ ul .invitetree {
 	background-color: black;
 	z-index: 1001;
 	-moz-opacity: 0.8;
-	opacity:.80;
+	opacity: 0.80;
 	filter: alpha(opacity=80);
 }

--- a/static/styles/global.css
+++ b/static/styles/global.css
@ -199,8 +199,7 @@ div#AddArtists a {
 	z-index: 25;
 	display: block;
 	position: fixed;
-	background: transparent url('../rippy/rippy.png') no-repeat bottom
-		center;
+	background: transparent url('../rippy/rippy.png') no-repeat bottom center;
 	color: black;
 	text-align: center;
 	width: 190px;
@ -275,23 +274,20 @@ span.secondary_class {
 }

 .headerSort span {
-	background: url("../common/table-order.png") no-repeat scroll right
-		-38px transparent;
+	background: url("../common/table-order.png") no-repeat scroll right -38px transparent;
 	padding: 0px 20px 0 0;
 }

 .headerSortDown span {
-	background: url("../common/table-order.png") no-repeat scroll right 4px
-		transparent;
+	background: url("../common/table-order.png") no-repeat scroll right 4px transparent;
 }

 .headerSortUp span {
-	background: url("../common/table-order.png") no-repeat scroll right
-		-79px transparent;
+	background: url("../common/table-order.png") no-repeat scroll right -79px transparent;
 }

 .album_votes {
-	text-align: center
+	text-align: center;
 }

 .favoritecount {
--- a/static/styles/minimal/style.css
+++ b/static/styles/minimal/style.css
@ -18,8 +18,8 @@ input#file, input[type="file"]{color:#000}
 textarea#quickpost{margin:0; padding:0}

 /* GENERAL */
-.box, #content table tr td{background:#373737; margin-bottom:15px}
-.pad{padding:10px}
+.box, #content table tr td{background: #373737; margin-bottom: 15px;}
+.pad{padding: 10px;}

 .sidebar .box{position:relative}
 .sidebar img{max-width:228px}
@ -32,25 +32,25 @@ textarea#quickpost{margin:0; padding:0}
 .label{width:15%}

 /* wrapper */
-#wrapper{width:980px; margin:0 auto}
+#wrapper{width: 980px; margin: 0 auto;}

 /* header layout */
-#header{position:relative; overflow:visible; height:110px; z-index:4}
-#logo{width:94px; height:74px; position:absolute; top:8px; left:0; background-repeat:no-repeat; background-image:url(images/logo.png)}
-#logo a{width:94px; height:74px; display:block}
+#header{position: relative; overflow: visible; height: 110px; z-index: 4;}
+#logo{width: 94px; height: 74px; position: absolute; top: 8px; left: 0; background-repeat: no-repeat; background-image: url(images/logo.png);}
+#logo a{width: 94px; height: 74px; display: block;}

 /* menu */
-#menu{margin:0 0 0 105px; padding:0 249px 7px 0; border-bottom:1px solid #353535; overflow:hidden}
-#menu *{text-transform:lowercase}
-#menu ul{list-style:none; margin:0; padding:0}
-#menu ul li{float:left; margin:2px 6px 0; text-align:center}
-#menu ul li a{padding:12px 4px 3px; font-weight:bold; display:block; text-decoration:none; color:#FFF}
-#menu ul li:hover{background:#353535}
-#menu ul li:hover a{color:#FFF}
+#menu{margin: 0 0 0 105px; padding: 0 249px 7px 0; border-bottom: 1px solid #353535; overflow: hidden;}
+#menu *{text-transform: lowercase;}
+#menu ul{list-style: none; margin: 0; padding: 0;}
+#menu ul li{float: left; margin: 2px 6px 0; text-align: center;}
+#menu ul li a{padding: 12px 4px 3px; font-weight: bold; display: block; text-decoration: none; color: #FFF;}
+#menu ul li:hover{background: #353535;}
+#menu ul li:hover a{color: #FFF;}

 /* active menu item */
 #index #nav_index a, #torrents #nav_torrents a, #collage #nav_collages a, #requests #nav_requests a, #forums #nav_forums a, #top10 #nav_top10 a, #rules #nav_rules a, #kb #nav_wiki a, #wiki #nav_wiki a, #staff #nav_staff a, #chat #nav_irc a
-{background:#5AF}
+{background: #5AF;}

 /* sprite */
 #userinfo_username li:first-child, #userinfo_major li:first-child, #userinfo_minor li:first-child, #userinfo_username li:first-child:hover, #userinfo_major li:first-child:hover, #userinfo_minor li:first-child:hover,
--- a/static/styles/whatlove/style.css
+++ b/static/styles/whatlove/style.css
@ -879,7 +879,9 @@ form tr {
 	background-color: #D1F0FD;
 }

-#site_debug .hidden { display: none; }
+#site_debug .hidden {
+	display: none;
+}

 .center {
 	text-align: center;