From 5c7a82260d88fc0111bf57110b7c0304f186ab87 Mon Sep 17 00:00:00 2001 From: Git Date: Mon, 27 Feb 2012 08:00:22 +0000 Subject: [PATCH] Empty commit --- classes/script_start.php | 4 +- sections/artist/artist.php | 79 ++++++++++++++++++++-------------- sections/staffpm/unresolve.php | 53 ++++++++++++----------- sections/torrents/delete.php | 5 +-- sections/torrents/details.php | 4 +- sections/torrents/grouplog.php | 10 ++++- sections/user/invite.php | 10 +++++ 7 files changed, 98 insertions(+), 67 deletions(-) diff --git a/classes/script_start.php b/classes/script_start.php index 763d5c0e..977528cc 100644 --- a/classes/script_start.php +++ b/classes/script_start.php @@ -1693,7 +1693,7 @@ function display_artists($Artists, $MakeLink = true, $IncludeHyphen = true, $Esc $link .= 'Various Artists'; } - if(!empty($Guests) && (count($MainArtists) + count($Composers) > 0) && (count($MainArtists) + count($Composers) + count($Conductors) < 3)) { + /*if(!empty($Guests) && (count($MainArtists) + count($Composers) > 0) && (count($MainArtists) + count($Composers) + count($Conductors) < 3)) { switch(count($Guests)) { case 1: $link .= ' with '.display_artist($Guests[0], $MakeLink, $Escape); @@ -1702,7 +1702,7 @@ function display_artists($Artists, $MakeLink = true, $IncludeHyphen = true, $Esc $link .= ' with '.display_artist($Guests[0], $MakeLink, $Escape).$ampersand.display_artist($Guests[1], $MakeLink, $Escape); break; } - } + }*/ if ((count($Conductors) > 0) && (count($MainArtists) + count($Composers) > 0) && (count($Composers) < 3 || count($MainArtists) > 0)) { $link .= ' under '; diff --git a/sections/artist/artist.php b/sections/artist/artist.php index fea53b3b..e9a23eca 100644 --- a/sections/artist/artist.php +++ b/sections/artist/artist.php @@ -219,6 +219,39 @@ function compare($X, $Y){ $NumLeechers = 0; $NumSnatches = 0; +foreach ($TorrentList as $GroupID => $Group) { + $TagList = explode(' ',str_replace('_','.',$Group['TagList'])); + + $TorrentTags = array(); + + // $Tags array is for the sidebar on the right. Skip compilations and soundtracks. + if (!in_array($ReleaseType, array(7, 3))) { + foreach($TagList as $Tag) { + if(!isset($Tags[$Tag])) { + $Tags[$Tag] = array('name'=>$Tag, 'count'=>1); + } else { + $Tags[$Tag]['count']++; + } + } + } + $TorrentTags = implode(', ', $TorrentTags); + $TorrentTags = '
'.$TorrentTags.'
'; + + foreach ($Group['Torrents'] as $TorrentID => $Torrent) { + $NumTorrents++; + + $Torrent['Seeders'] = (int)$Torrent['Seeders']; + $Torrent['Leechers'] = (int)$Torrent['Leechers']; + $Torrent['Snatched'] = (int)$Torrent['Snatched']; + + $NumSeeders+=$Torrent['Seeders']; + $NumLeechers+=$Torrent['Leechers']; + $NumSnatches+=$Torrent['Snatched']; + } +} + + + $OpenTable = false; $ShowGroups = !isset($LoggedUser['TorrentGrouping']) || $LoggedUser['TorrentGrouping'] == 0; $HideTorrents = ($ShowGroups ? '' : ' hidden'); @@ -236,24 +269,6 @@ function compare($X, $Y){ $OldGroupID = $GroupID; $OldReleaseType = $ReleaseType; } - - $TagList = explode(' ',str_replace('_','.',$TagList)); - - $TorrentTags = array(); - - // $Tags array is for the sidebar on the right. Skip compilations and soundtracks. - if (!in_array($ReleaseType, array(7, 3))) { - foreach($TagList as $Tag) { - if(!isset($Tags[$Tag])) { - $Tags[$Tag] = array('name'=>$Tag, 'count'=>1); - } else { - $Tags[$Tag]['count']++; - } - $TorrentTags[] = ''.$Tag.''; - } - } - $TorrentTags = implode(', ', $TorrentTags); - $TorrentTags = '
'.$TorrentTags.'
'; if (!empty($LoggedUser['DiscogView']) || (isset($LoggedUser['HideTypes']) && in_array($ReleaseType, $LoggedUser['HideTypes']))) { $HideDiscog = ' hidden'; @@ -261,6 +276,16 @@ function compare($X, $Y){ $HideDiscog = ''; } + $TagList = explode(' ',str_replace('_','.',$TagList)); + + $TorrentTags = array(); + + // $Tags array is for the sidebar on the right. Skip compilations and soundtracks. + foreach($TagList as $Tag) { + $TorrentTags[] = ''.$Tag.''; + } + $TorrentTags = implode(', ', $TorrentTags); + $TorrentTags = '
'.$TorrentTags.'
'; if($ReleaseType!=$LastReleaseType) { switch($ReleaseTypes[$ReleaseType]) { @@ -358,32 +383,20 @@ function compare($X, $Y){ unset($FirstUnknown); foreach ($Torrents as $TorrentID => $Torrent) { - $NumTorrents++; - if ($Torrent['Remastered'] && !$Torrent['RemasterYear']) { $FirstUnknown = !isset($FirstUnknown); } - - + if (in_array($TorrentID, $TokenTorrents) && empty($Torrent['FreeTorrent'])) { $Torrent['PersonalFL'] = 1; } - - $Torrent['Seeders'] = (int)$Torrent['Seeders']; - $Torrent['Leechers'] = (int)$Torrent['Leechers']; - $Torrent['Snatched'] = (int)$Torrent['Snatched']; - - $NumSeeders+=$Torrent['Seeders']; - $NumLeechers+=$Torrent['Leechers']; - $NumSnatches+=$Torrent['Snatched']; - + if($Torrent['RemasterTitle'] != $LastRemasterTitle || $Torrent['RemasterYear'] != $LastRemasterYear || - $Torrent['RemasterRecordLabel'] != $LastRemasterRecordLabel || $Torrent['RemasterCatalogueNumber'] != $LastRemasterCatalogueNumber || $FirstUnknown || $Torrent['Media'] != $LastMedia) { + $Torrent['RemasterRecordLabel'] != $LastRemasterRecordLabel || $Torrent['RemasterCatalogueNumber'] != $LastRemasterCatalogueNumber || $FirstUnknown || $Torrent['Media'] != $LastMedia) { $EditionID++; if($Torrent['Remastered'] && $Torrent['RemasterYear'] != 0) { - $RemasterName = $Torrent['RemasterYear']; $AddExtra = " - "; if($Torrent['RemasterRecordLabel']) { $RemasterName .= $AddExtra.display_str($Torrent['RemasterRecordLabel']); $AddExtra=' / '; } diff --git a/sections/staffpm/unresolve.php b/sections/staffpm/unresolve.php index 350a2a70..040e6e6b 100644 --- a/sections/staffpm/unresolve.php +++ b/sections/staffpm/unresolve.php @@ -1,26 +1,27 @@ -query("SELECT UserID, Level, AssignedToUser FROM staff_pm_conversations WHERE ID=$ID"); - list($UserID, $Level, $AssignedToUser) = $DB->next_record(); - - if ($UserID == $LoggedUser['ID'] || $IsFLS || $AssignedToUser == $LoggedUser['ID']) { - if($Level != 0 && $IsStaff == false) { - error(403); - } - - // Conversation belongs to user or user is staff, unresolve it - $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 - error(403); - } -} else { - // No id - header('Location: staffpm.php'); -} -?> +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) || + $AssignedToUser == $LoggedUser['ID'] || ($IsStaff && $Level <= $LoggedUser['Class'])) { + /*if($Level != 0 && $IsStaff == false) { + error(403); + }*/ + + // Conversation belongs to user or user is staff, unresolve it + $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 + error(403); + } +} else { + // No id + header('Location: staffpm.php'); +} +?> diff --git a/sections/torrents/delete.php b/sections/torrents/delete.php index 4d789783..e6c521a8 100644 --- a/sections/torrents/delete.php +++ b/sections/torrents/delete.php @@ -188,8 +188,7 @@ req.FillerID, um.Username, req.TimeFilled - FROM requests AS req - LEFT JOIN torrents AS t ON t.GroupID=req.TorrentID + FROM requests AS req JOIN users_main AS um ON um.ID=req.FillerID AND req.TorrentID=$TorrentID"); $Requests = ($DB->record_count()); @@ -197,7 +196,7 @@ while(list($RequestID, $FillerID, $FillerName, $FilledTime) = $DB->next_record()) { ?>
- used a torrent from this group to fill this request + used this torrent to fill this request
0) { - print '
  • Produced By:
    • '; + print '
  • Produced By:
    • '; foreach($Artists[7] as $Artist) { ?>
  • @@ -467,7 +467,7 @@ function filelist($Str) { if(!empty($BadTags)) { $ExtraInfo.=$AddExtra.'Bad Tags'; $AddExtra=' / '; } if(!empty($BadFolders)) { $ExtraInfo.=$AddExtra.'Bad Folders'; $AddExtra=' / '; } if(!empty($CassetteApproved)) { $ExtraInfo.=$AddExtra.'Cassette Approved'; $AddExtra=' / '; } - if(!empty($LossymasterApproved)) { $ExtraInfo.=$AddExtra.'Lossy master Approved'; $AddExtra=' / '; } + if(!empty($LossymasterApproved)) { $ExtraInfo.=$AddExtra.'Lossy Master Approved'; $AddExtra=' / '; } if(!empty($BadFiles)) { $ExtraInfo.=$AddExtra.'Bad File Names'; $AddExtra=' / '; } if($GroupCategoryID == 1 diff --git a/sections/torrents/grouplog.php b/sections/torrents/grouplog.php index 011f5d1a..bb0721dc 100644 --- a/sections/torrents/grouplog.php +++ b/sections/torrents/grouplog.php @@ -3,10 +3,18 @@ if (!is_number($GroupID)) { error(404); } show_header("History for Group $GroupID"); + +$Groups = get_groups(array($GroupID), true, true, false); +if (!empty($Groups['matches'][$GroupID])) { + $Group = $Groups['matches'][$GroupID]; + $Title = display_artists($Group['ExtendedArtists']).''.$Group['Name'].''; +} else { + $Title = "Group $GroupID"; +} ?>
    -

    History for Group

    +

    History for

    diff --git a/sections/user/invite.php b/sections/user/invite.php index 4965e8ba..7eed09d0 100644 --- a/sections/user/invite.php +++ b/sections/user/invite.php @@ -143,6 +143,16 @@ +
    + Your invites have been disabled. Please read this article for more information. +
    + +
    + You may not send invites while on Ratio Watch or while your leeching privileges are disabled. Please read this article for more information. +
    +