From aca54267f8da1641edc6321ef2b2d7600eec448d Mon Sep 17 00:00:00 2001
From: Git <git@what.cd>
Date: Fri, 18 Nov 2011 08:00:16 +0000
Subject: [PATCH] Empty commit

---
 gazelle.sql                   |   4 +-
 sections/staffpm/viewconv.php | 213 +++++++++++++++-------------------
 sections/user/user.php        |   2 +-
 3 files changed, 98 insertions(+), 121 deletions(-)

diff --git a/gazelle.sql b/gazelle.sql
index 7a602756..97bfd924 100644
--- a/gazelle.sql
+++ b/gazelle.sql
@@ -525,7 +525,7 @@ CREATE TABLE `requests_artists` (
   `RequestID` int(10) unsigned NOT NULL,
   `ArtistID` int(10) NOT NULL,
   `AliasID` int(10) NOT NULL,
-  `Importance` enum('1','2','3') NOT NULL DEFAULT '1',
+  `Importance` enum('1','2','3','4','5','6') DEFAULT NULL,
   PRIMARY KEY (`RequestID`,`AliasID`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
@@ -841,7 +841,7 @@ CREATE TABLE `torrents_artists` (
   `ArtistID` int(10) NOT NULL,
   `AliasID` int(10) NOT NULL,
   `UserID` int(10) unsigned NOT NULL DEFAULT '0',
-  `Importance` enum('1','2','3') NOT NULL,
+  `Importance` enum('1','2','3','4','5','6') DEFAULT NULL,
   PRIMARY KEY (`GroupID`,`AliasID`),
   KEY `ArtistID` (`ArtistID`),
   KEY `AliasID` (`AliasID`),
diff --git a/sections/staffpm/viewconv.php b/sections/staffpm/viewconv.php
index 291fe0fc..83c6c7a8 100644
--- a/sections/staffpm/viewconv.php
+++ b/sections/staffpm/viewconv.php
@@ -7,46 +7,49 @@
 	$DB->query("SELECT Subject, UserID, Level, AssignedToUser, Unread, Status FROM staff_pm_conversations WHERE ID=$ConvID");
 	list($Subject, $UserID, $Level, $AssignedToUser, $Unread, $Status) = $DB->next_record();
 
-	if ($UserID == $LoggedUser['ID'] || $IsStaff || ($Level == 0 && $IsFLS) || $LoggedUser['ID'] == $AssignedToUser) {
-		// User is trying to view their own unread conversation, set it to read
-		if ($UserID == $LoggedUser['ID'] && $Unread) {
-			$DB->query("UPDATE staff_pm_conversations SET Unread=false WHERE ID=$ConvID");
-			// Clear cache for user
-			$Cache->delete_value('staff_pm_new_'.$LoggedUser['ID']);
-		}
+	if ($UserID != $LoggedUser['ID'] && ($Level > $LoggedUser['Class']) && !($Level == 0 && $IsFLS) && $LoggedUser['ID'] != $AssignedToUser) {
+	// User is trying to view someone else's conversation
+		error(403);
+	}
+	// User is trying to view their own unread conversation, set it to read
+	if ($UserID == $LoggedUser['ID'] && $Unread) {
+		$DB->query("UPDATE staff_pm_conversations SET Unread=false WHERE ID=$ConvID");
+		// Clear cache for user
+		$Cache->delete_value('staff_pm_new_'.$LoggedUser['ID']);
+	}
 
-		show_header('Staff PM', 'staffpm,bbcode');
+	show_header('Staff PM', 'staffpm,bbcode');
 
-		$UserInfo = user_info($UserID);
-		$UserStr = format_username($UserID, $UserInfo['Username'], $UserInfo['Donor'], $UserInfo['Warned'], $UserInfo['Enabled'], $UserInfo['PermissionID']);
+	$UserInfo = user_info($UserID);
+	$UserStr = format_username($UserID, $UserInfo['Username'], $UserInfo['Donor'], $UserInfo['Warned'], $UserInfo['Enabled'], $UserInfo['PermissionID']);
 
-		$OwnerID = $UserID;
+	$OwnerID = $UserID;
 
 ?>
 <div id="thin">
 	<h2>Staff PM - <?=display_str($Subject)?></h2>
 	<div class="linkbox">
 <?
-		// Staff only
-		if ($IsStaff) {
+	// Staff only
+	if ($IsStaff) {
 ?>
-		<a href="staffpm.php">[My unanswered]</a>
+	<a href="staffpm.php">[My unanswered]</a>
 <?
-		}
+	}
 
-		// FLS/Staff
-		if ($IsFLS) {
+	// FLS/Staff
+	if ($IsFLS) {
 ?>
 		<a href="staffpm.php?view=unanswered">[All unanswered]</a>
 		<a href="staffpm.php?view=open">[Open]</a>
 		<a href="staffpm.php?view=resolved">[Resolved]</a>
 <?
 		// User
-		} else {
+	} else {
 ?>
 		<a href="staffpm.php">[Back to inbox]</a>
 <?
-		}
+	}
 
 ?>
 		<br />
@@ -54,20 +57,20 @@
 	</div>
 	<div id="inbox">
 <?
-		// Get messages
-		$StaffPMs = $DB->query("SELECT UserID, SentDate, Message FROM staff_pm_messages WHERE ConvID=$ConvID");
+	// Get messages
+	$StaffPMs = $DB->query("SELECT UserID, SentDate, Message FROM staff_pm_messages WHERE ConvID=$ConvID");
 
-		while(list($UserID, $SentDate, $Message) = $DB->next_record()) {
-			// Set user string
-			if ($UserID == $OwnerID) {
-				// User, use prepared string
-				$UserString = $UserStr;
-			} else {
-				// Staff/FLS
-				$UserInfo = user_info($UserID);
-				$UserString = format_username($UserID, $UserInfo['Username'], $UserInfo['Donor'], $UserInfo['Warned'], $UserInfo['Enabled'], $UserInfo['PermissionID']);
+	while(list($UserID, $SentDate, $Message) = $DB->next_record()) {
+		// Set user string
+		if ($UserID == $OwnerID) {
+			// User, use prepared string
+			$UserString = $UserStr;
+		} else {
+			// Staff/FLS
+			$UserInfo = user_info($UserID);
+			$UserString = format_username($UserID, $UserInfo['Username'], $UserInfo['Donor'], $UserInfo['Warned'], $UserInfo['Enabled'], $UserInfo['PermissionID']);
 
-			}
+		}
 ?>
 		<div class="box vertical_space">
 			<div class="head">
@@ -82,11 +85,11 @@
 		</div>
 		<div align="center" style="display: none"></div>
 <?
-			$DB->set_query_id($StaffPMs);
-		}
+		$DB->set_query_id($StaffPMs);
+	}
 
-		// Common responses
-		if ($IsFLS && $Status != 'Resolved') {
+	// Common responses
+	if ($IsFLS && $Status != 'Resolved') {
 ?>
 		<div id="common_answers" class="hidden">
 			<div class="box vertical_space">
@@ -100,30 +103,25 @@
 				<select id="common_answers_select" onChange="UpdateMessage();">
 					<option id="first_common_response">Select a message</option>
 <?
-			// List common responses
-			$DB->query("SELECT ID, Name FROM staff_pm_responses");
-			while(list($ID, $Name) = $DB->next_record()) {
+		// List common responses
+		$DB->query("SELECT ID, Name FROM staff_pm_responses");
+		while(list($ID, $Name) = $DB->next_record()) {
 ?>
 					<option value="<?=$ID?>"><?=$Name?></option>
-<?
-			}
-?>
+<?		} ?>
 				</select>
 				<input type="button" value="Set message" onClick="SetMessage();" />
 				<input type="button" value="Create new / Edit" onClick="location.href='staffpm.php?action=responses&convid=<?=$ConvID?>'" />
 			</div>
 		</div>
-<?
-		}
+<?	}
 
-		// Ajax assign response div
-		if ($IsStaff) {
-?>
+	// Ajax assign response div
+	if ($IsStaff) { ?>
 		<div id="ajax_message" class="hidden center alertbar"></div>
-<?
-		}
+<?	}
 
-		// Replybox and buttons
+	// Replybox and buttons
 ?>
 		<h3>Reply</h3>
 		<div class="box pad">
@@ -134,99 +132,82 @@
 					<input type="hidden" name="convid" value="<?=$ConvID?>" id="convid" />
 					<textarea id="quickpost" name="message" cols="90" rows="10"></textarea> <br />
 <?
-		// Assign to
-		if ($IsStaff) {
-			// Staff assign dropdown
+	// Assign to
+	if ($IsStaff) {
+		// Staff assign dropdown
 ?>
 					<select id="assign_to" name="assign">
 						<optgroup label="User classes">
-<?
-			// FLS "class"
-			$Selected = (!$AssignedToUser && $Level == 0) ? ' selected="selected"' : '';
+<?		// FLS "class"
+		$Selected = (!$AssignedToUser && $Level == 0) ? ' selected="selected"' : '';
 ?>
 							<option value="class_0"<?=$Selected?>>First Line Support</option>
-<?
-			// Staff classes
-			foreach ($ClassLevels as $Class) {
-				// Create one <option> for each staff user class
-				if ($Class['Level'] >= 650) {
-					$Selected = (!$AssignedToUser && ($Level == $Class['Level'])) ? ' selected="selected"' : '';
+<?		// Staff classes
+		foreach ($ClassLevels as $Class) {
+			// Create one <option> for each staff user class
+			if ($Class['Level'] >= 650) {
+				$Selected = (!$AssignedToUser && ($Level == $Class['Level'])) ? ' selected="selected"' : '';
 ?>
 							<option value="class_<?=$Class['Level']?>"<?=$Selected?>><?=$Class['Name']?></option>
-<?
-				}
-			}
-?>
+<?			}
+		} ?>
 						</optgroup>
 						<optgroup label="Staff">
-<?
-
-			// Staff members
-			$DB->query("
-				SELECT
-					m.ID,
-					m.Username
-				FROM permissions as p
-				JOIN users_main as m ON m.PermissionID=p.ID
-				WHERE p.DisplayStaff='1'
-				ORDER BY p.Level DESC, m.Username ASC"
-			);
-			while(list($ID, $Name) = $DB->next_record()) {
-				// Create one <option> for each staff member
-				$Selected = ($AssignedToUser == $ID) ? ' selected="selected"' : '';
+<?		// Staff members
+		$DB->query("
+			SELECT
+				m.ID,
+				m.Username
+			FROM permissions as p
+			JOIN users_main as m ON m.PermissionID=p.ID
+			WHERE p.DisplayStaff='1'
+			ORDER BY p.Level DESC, m.Username ASC"
+		);
+		while(list($ID, $Name) = $DB->next_record()) {
+			// Create one <option> for each staff member
+			$Selected = ($AssignedToUser == $ID) ? ' selected="selected"' : '';
 ?>
 							<option value="user_<?=$ID?>"<?=$Selected?>><?=$Name?></option>
-<?
-			}
-?>
+<?		} ?>
 						</optgroup>
 						<optgroup label="First Line Support">
 <?
-			// FLS users
-			$DB->query("
-				SELECT
-					m.ID,
-					m.Username
-				FROM users_info as i
-				JOIN users_main as m ON m.ID=i.UserID
-				JOIN permissions as p ON p.ID=m.PermissionID
-				WHERE p.DisplayStaff!='1' AND i.SupportFor!=''
-				ORDER BY m.Username ASC
-			");
-			while(list($ID, $Name) = $DB->next_record()) {
-				// Create one <option> for each FLS user
-				$Selected = ($AssignedToUser == $ID) ? ' selected="selected"' : '';
+		// FLS users
+		$DB->query("
+			SELECT
+				m.ID,
+				m.Username
+			FROM users_info as i
+			JOIN users_main as m ON m.ID=i.UserID
+			JOIN permissions as p ON p.ID=m.PermissionID
+			WHERE p.DisplayStaff!='1' AND i.SupportFor!=''
+			ORDER BY m.Username ASC
+		");
+		while(list($ID, $Name) = $DB->next_record()) {
+			// Create one <option> for each FLS user
+			$Selected = ($AssignedToUser == $ID) ? ' selected="selected"' : '';
 ?>
 							<option value="user_<?=$ID?>"<?=$Selected?>><?=$Name?></option>
-<?
-			}
-?>
+<?		} ?>
 						</optgroup>
 					</select>
 					<input type="button" onClick="Assign();" value="Assign" />
-<?
-		} elseif ($IsFLS) {	// FLS assign button
-?>
+<?	} elseif ($IsFLS) {	// FLS assign button ?>
 					<input type="button" value="Assign to staff" onClick="location.href='staffpm.php?action=assign&to=staff&convid=<?=$ConvID?>';" />
 					<input type="button" value="Assign to forum staff" onClick="location.href='staffpm.php?action=assign&to=forum&convid=<?=$ConvID?>';" />
-<?
-		}
+<?	}
 
-		if ($Status != 'Resolved') {
+	if ($Status != 'Resolved') {
 
-				if ($IsFLS) { ?>
+			if ($IsFLS) { ?>
 					<input type="button" value="Common answers" onClick="$('#common_answers').toggle();" />
 					<input type="button" value="Preview" onclick="PreviewMessage();" />
-<?				} ?>
+<?			} ?>
 					<input type="button" value="Resolve" onClick="location.href='staffpm.php?action=resolve&id=<?=$ConvID?>';" />
 					<input type="submit" value="Send message" />
-<?
-		} else {
-?>
+<?	} else { ?>
 					<input type="button" value="Unresolve" onClick="location.href='staffpm.php?action=unresolve&id=<?=$ConvID?>';" />
-<?
-		}
-?>
+<?	} ?>
 				</form>
 			</div>
 		</div>
@@ -235,10 +216,6 @@
 <?
 
 	show_footer();
-	} else {
-		// User is trying to view someone else's conversation
-		error(403);
-	}
 } else {
 	// No id
 	header('Location: staffpm.php');
diff --git a/sections/user/user.php b/sections/user/user.php
index c6f2a356..42a23589 100644
--- a/sections/user/user.php
+++ b/sections/user/user.php
@@ -519,7 +519,7 @@ function check_paranoia_here($Setting) {
 }
 ?>
 <? if (check_paranoia_here('seeding')) { ?>
-				<li>Seeding: <?=number_format($Seeding)?> <?=($Snatched && ($OwnProfile || check_paranoia_here(false)))?'(' . 100*min(1,round($Seeding/$Snatched,2)).'%) ':''?>[<a href="torrents.php?type=seeding&amp;userid=<?=$UserID?>" title="View">View</a>]<? if (check_perms('zip_downloader')) { ?> [<a href="torrents.php?action=redownload&amp;type=seeding&amp;userid=<?=$UserID?>" onclick="return confirm('If you no longer have the content, your ratio WILL be affected, be sure to check the size of all albums before redownloading.');">Download</a>]<? } ?></li>
+				<li>Seeding: <?=number_format($Seeding)?> <?=($Snatched && ($OwnProfile || check_paranoia_here(false)))?'(' . 100*min(1,round($Seeding/$UniqueSnatched,2)).'%) ':''?>[<a href="torrents.php?type=seeding&amp;userid=<?=$UserID?>" title="View">View</a>]<? if (check_perms('zip_downloader')) { ?> [<a href="torrents.php?action=redownload&amp;type=seeding&amp;userid=<?=$UserID?>" onclick="return confirm('If you no longer have the content, your ratio WILL be affected, be sure to check the size of all albums before redownloading.');">Download</a>]<? } ?></li>
 <? } elseif (check_paranoia_here('seeding+')) { ?>
 				<li>Seeding: <?=number_format($Seeding)?></li>
 <? } ?>