Empty commit

This commit is contained in:
Git 2011-12-01 08:00:22 +00:00
parent 42a70cac26
commit 04768d6faa
4 changed files with 24 additions and 13 deletions

View File

@ -268,7 +268,7 @@ function compare($X, $Y){
case 1023: // Remixes, DJ Mixes, and Guest artists need the artist name
case 1024:
case 8:
if (!empty($ExtendedArtists[1]) || !empty($ExtendedArtists[4]) || !empty($ExtendedArtists[5])) {
if (!empty($ExtendedArtists[1]) || !empty($ExtendedArtists[4]) || !empty($ExtendedArtists[5]) || !empty($ExtendedArtists[6])) {
unset($ExtendedArtists[2]);
unset($ExtendedArtists[3]);
$DisplayName = display_artists($ExtendedArtists).$DisplayName;

View File

@ -7,7 +7,7 @@
$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'] && ($Level > $LoggedUser['Class']) && !($Level == 0 && $IsFLS) && $LoggedUser['ID'] != $AssignedToUser) {
if (!(($UserID == $LoggedUser['ID']) || ($AssignedToUser == $LoggedUser['ID']) || (($Level > 0 && $Level < $LoggedUser['Class']) || ($Level == 0 && $IsFLS)))) {
// User is trying to view someone else's conversation
error(403);
}

View File

@ -85,6 +85,7 @@
<tr><td><a href="tools.php?action=sandbox8">Sandbox (8)</a></td></tr>
<tr><td><a href="tools.php?action=nightoath">NightOath's Sandbox</a></td></tr>
<tr><td><a href="schedule.php?auth=<?=$LoggedUser['AuthKey']?>">Schedule</a></td></tr>
<tr><td><a href="tools.php?action=branches">Git branches</a></td></tr>
<? }?>
<tr><td><strong><a href="tools.php?action=public_sandbox">Public Sandbox</a></strong></td></tr>
<? if (check_perms('users_mod')) { ?>

View File

@ -80,34 +80,44 @@
$GenreTags = $DB->collect('Name');
$Cache->cache_value('genre_tags', $GenreTags, 3600*6);
}
$DB->query("SELECT
d.Name,
d.Comment,
d.Time
FROM do_not_upload as d
ORDER BY d.Time");
$DNU = $DB->to_array();
list($Name,$Comment,$Updated) = end($DNU);
reset($DNU);
$DB->query("SELECT IF(MAX(t.Time) < '$Updated' OR MAX(t.Time) IS NULL,1,0) FROM torrents AS t
WHERE UserID = ".$LoggedUser['ID']);
list($NewDNU) = $DB->next_record();
$HideDNU = check_perms('torrents_hide_dnu') && !$NewDNU;
?>
<div class="<?=(check_perms('torrents_hide_dnu')?'box pad':'')?>" style="margin:0px auto;width:700px">
<h3 id="dnu_header">Do not upload</h3>
<p><?=$NewDNU?'<strong class="important_text">':''?>Last Updated: <?=time_diff($Updated)?><?=$NewDNU?'</strong>':''?></p>
<p>The following releases are currently forbidden from being uploaded to the site. Do not upload them unless your torrent meets a condition specified in the comment.
<? if (check_perms('torrents_hide_dnu')) { ?>
<? if ($HideDNU) { ?>
<span id="showdnu"><a href="#" <a href="#" onclick="$('#dnulist').toggle(); this.innerHTML=(this.innerHTML=='(Hide)'?'(Show)':'(Hide)'); return false;">(Show)</a></span>
<? } ?>
</p>
<?
$DB->query("SELECT
d.Name,
d.Comment
FROM do_not_upload as d
ORDER BY d.Time");
?>
<table id="dnulist" class="<?=(check_perms('torrents_hide_dnu')?'hidden':'')?>" style="">
<table id="dnulist" class="<?=($HideDNU?'hidden':'')?>" style="">
<tr class="colhead">
<td width="50%"><strong>Name</strong></td>
<td><strong>Comment</strong></td>
</tr>
<? while(list($Name, $Comment) = $DB->next_record()){ ?>
<? foreach($DNU as $BadUpload) {
list($Name, $Comment, $Updated) = $BadUpload;
?>
<tr>
<td><?=$Text->full_format($Name)?></td>
<td><?=$Text->full_format($Comment)?></td>
</tr>
<? } ?>
</table>
</div><?=(check_perms('torrents_hide_dnu')?'<br />':'')?>
</div><?=($HideDNU?'<br />':'')?>
<?
$TorrentForm->head();
switch ($UploadForm) {