Empty commit

This commit is contained in:
Git 2011-11-18 08:00:16 +00:00
parent 53cf5fdd55
commit aca54267f8
3 changed files with 98 additions and 121 deletions

View File

@ -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`),

View File

@ -7,7 +7,10 @@
$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) {
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");
@ -105,23 +108,18 @@
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) {
?>
if ($IsStaff) { ?>
<div id="ajax_message" class="hidden center alertbar"></div>
<?
}
<? }
// Replybox and buttons
?>
@ -140,28 +138,22 @@
?>
<select id="assign_to" name="assign">
<optgroup label="User classes">
<?
// FLS "class"
<? // FLS "class"
$Selected = (!$AssignedToUser && $Level == 0) ? ' selected="selected"' : '';
?>
<option value="class_0"<?=$Selected?>>First Line Support</option>
<?
// Staff classes
<? // 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
<? // Staff members
$DB->query("
SELECT
m.ID,
@ -176,9 +168,7 @@
$Selected = ($AssignedToUser == $ID) ? ' selected="selected"' : '';
?>
<option value="user_<?=$ID?>"<?=$Selected?>><?=$Name?></option>
<?
}
?>
<? } ?>
</optgroup>
<optgroup label="First Line Support">
<?
@ -198,19 +188,14 @@
$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') {
@ -220,13 +205,9 @@
<? } ?>
<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');

View File

@ -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>
<? } ?>