Empty commit

This commit is contained in:
Git 2012-12-21 08:00:21 +00:00
parent d7667b814a
commit 39c441b64f
8 changed files with 108 additions and 106 deletions

View File

@ -237,24 +237,25 @@ function music_form($GenreTags) {
<tr id="title_tr">
<td class="label">Album title:</td>
<td>
<input type="text" id="title" name="title" size="60" value="<?=display_str($Torrent['Title']) ?>"<?=$this->Disabled?>/>
<p class="min_padding">Do not include the words remaster, re-issue, MSFL Gold, limited edition, bonus tracks, bonus disc or country specific information in this field. That belongs in the edition information fields below, see <a href="wiki.php?action=article&amp;id=159" target="_blank">this</a> for further information. Also remember to use the correct capitalization for your upload. See the <a href="wiki.php?action=article&amp;id=317" target="_blank">Capitalization Guidelines</a> for more information.
<input type="text" id="title" name="title" size="60" value="<?=display_str($Torrent['Title']) ?>"<?=$this->Disabled?> />
<p class="min_padding">Do not include the words remaster, re-issue, MSFL Gold, limited edition, bonus tracks, bonus disc or country-specific information in this field. That belongs in the edition information fields below; see <a href="wiki.php?action=article&amp;id=159" target="_blank">this</a> for further information. Also remember to use the correct capitalization for your upload. See the <a href="wiki.php?action=article&amp;id=317" target="_blank">Capitalization Guidelines</a> for more information.
</td>
</tr>
<tr id="musicbrainz_tr">
<td class="label">MusicBrainz:</td>
<td class="label" title="Click the &quot;Find Info&quot; button to automatically fill out parts of the upload form by selecting an entry in MusicBrainz">MusicBrainz:</td>
<td><input type="button" value="Find Info" id="musicbrainz_button" /></td>
</tr>
<div id="musicbrainz_popup">
<a href="#null" id="popup_close">x</a>
<h1 id="popup_title"></h1>
<h2 id="popup_back"></h2>
<div id="results1"></div>
<div id="results2"></div>
<a href="#null" id="popup_close">x</a>
<h1 id="popup_title"></h1>
<h2 id="popup_back"></h2>
<div id="results1"></div>
<div id="results2"></div>
</div>
<div id="popup_background"></div>
<script>
<script type="text/javascript">
//<![CDATA[
hide();
if(document.getElementById("categories").disabled == false){
if(navigator.appName == 'Opera') {
@ -262,32 +263,29 @@ function music_form($GenreTags) {
var match = useragent.split('Version/');
var version = parseFloat(match[1]);
if(version >= 12.00) {
show();
show();
}
}
}
else if (navigator.appName != 'Microsoft Internet Explorer') {
show();
show();
}
}
function hide() {
document.getElementById("musicbrainz_tr").style.display="none";
document.getElementById("musicbrainz_popup").style.display="none";
document.getElementById("popup_background").style.display="none";
}
function show() {
document.getElementById("musicbrainz_tr").style.display="";
document.getElementById("musicbrainz_popup").style.display="";
document.getElementById("popup_background").style.display="";
}
document.getElementById("musicbrainz_tr").style.display="none";
document.getElementById("musicbrainz_popup").style.display="none";
document.getElementById("popup_background").style.display="none";
}
function show() {
document.getElementById("musicbrainz_tr").style.display="";
document.getElementById("musicbrainz_popup").style.display="";
document.getElementById("popup_background").style.display="";
}
//]]>
</script>
<tr id="year_tr">
<td class="label">
<span id="year_label_not_remaster"<? if($IsRemaster) { echo ' class="hidden"';}?>>Year</span>
@ -465,7 +463,7 @@ function show() {
</td>
<td id="logfields">
Check your log files here before uploading: <a href="logchecker.php" target="_blank">logchecker.php</a><br />
<input id="file" type="file" name="logfiles[]" size="50" /> [<a href="javascript:;" onclick="AddLogField();">+</a>] [<a href="javascript:;" onclick="RemoveLogField();">-</a>]
<input id="file" type="file" multiple="multiple" name="logfiles[]" size="50" /> [<a href="javascript:;" onclick="AddLogField();">+</a>] [<a href="javascript:;" onclick="RemoveLogField();">-</a>]
</td>
</tr>
<?
@ -481,8 +479,9 @@ function show() {
<tr>
<td class="label">Vanity House:</td>
<td>
<label><input type="checkbox" id="vanity_house" name="vanity_house" <? if(!$Torrent['GroupID']) { echo 'disabled '; }?><? if($Torrent['VanityHouse']){ echo "checked='checked' ";}?>/>
Check this only if you are submitting your own work or submitting on behalf of the artist, and this is intended to be a Vanity House release. Checking this will also automatically add the group as a recommendation.</label>
<label><input type="checkbox" id="vanity_house" name="vanity_house"<? if(!$Torrent['GroupID']) { echo ' disabled="disabled"'; }?><? if($Torrent['VanityHouse']){ echo ' checked="checked"';} ?> />
Check this only if you are submitting your own work or submitting on behalf of the artist, and this is intended to be a Vanity House release. Checking this will also automatically add the group as a recommendation.
</label>
</td>
</tr>
<? } ?>

View File

@ -31,18 +31,17 @@
"request" => array(
"title" => "Request",
"guidelines" => array(
"The report request option is for reporting a request which breaks any of the rules found <a href=\"rules.php?p=requests\">here</a>.",
"The report request option is for reporting a request which breaks any of the rules found <a href=\"rules.php?p=requests\">here</a> and for making minor, generally cosmetic, changes to a request (e.g. adding album art, revising a to-be-announced release title, etc.).",
"We encourage all users to use this feature whenever possible. This will get quicker action than PMing a staff member will.",
"In your report description below, please be specific and include as much information as possible that will help our staff resolve the issue. Links to reliable, external sources of information are extremely useful when resolving reports. Examples of such sources include the artist's official web site, <a href=\"http://www.discogs.com\">Discogs</a>, and <a href=\"http://musicbrainz.org\">MusicBrainz</a>.",
"<strong>Do not report requests simply because they are unfillable.</strong> Requests for currently unfillable releases are allowed because the request may become fillable in the future. An example of such a scenario would be an iTunes-only release of a given album &quot;X&quot; that could have a physical CD, vinyl, etc. release at some future date. The probability of such a physical release is not relevant.",
"<strong>If you are reporting this request to get it updated to the new requests system, please go back and click '[Request Update]'</strong>."
"<strong>Do not report requests simply because they are unfillable.</strong> Requests for currently unfillable releases are allowed because the request may become fillable in the future. An example of such a scenario would be a request for a physical media rip of a currently iTunes-only release because a physical media release could occur at some future date. The probability of such a physical release is not relevant.",
"<strong>If you are reporting this request to get it updated to the new requests system, please go back and click '[Request update]'</strong>."
)
),
"requests_comment" => array(
"title" => "Request Comment",
"guidelines" => array(
"The report comment option is specifically for reporting when the <a href=\"rules.php?p=chat\">chat rules</a> have been broken.",
"Such as posts containing racism, offensive language, flaming, pornography, and other rules violations.",
"The report comment option is specifically for reporting when the <a href=\"rules.php?p=chat\">chat rules</a> have been broken, such as posts containing racism, offensive language, flaming, pornography, and other rules violations.",
"We encourage all users to use this feature when they see a rules violation of any form.",
"This will get quicker action than PMing a staff member will.",
"Please restrict the use of this feature to reporting rules violations, and remember, this is for reporting comments, not replying to them."
@ -51,7 +50,7 @@
"thread" => array(
"title" => "Forum Thread",
"guidelines" => array(
"Please use the &quot;Report Thread&quot; option in the following situations:
"Please use the &quot;Report thread&quot; option in the following situations:
<ul>
<li>Reporting when <a href=\"rules.php?p=chat\">chat rules</a> have been broken, such as posts containing racism, offensive language, flaming, pornography, and other rules violations. We encourage all users to use this feature when they see a rules violation of any form.</li>
<li>Requesting that a thread be unlocked.</li>
@ -65,8 +64,7 @@
"post" => array(
"title" => "Forum Post",
"guidelines" => array(
"The report comment option is specifically for reporting when the <a href=\"rules.php?p=chat\">chat rules</a> have been broken.",
"Such as posts containing racism, offensive language, flaming, pornography, and other rules violations.",
"The report comment option is specifically for reporting when the <a href=\"rules.php?p=chat\">chat rules</a> have been broken, such as posts containing racism, offensive language, flaming, pornography, and other rules violations.",
"We encourage all users to use this feature when they see a rules violation of any form.",
"This will get quicker action than PMing a staff member will.",
"Please restrict the use of this feature to reporting rules violations, and remember, this is for reporting comments, not replying to them."
@ -84,8 +82,7 @@
"collages_comment" => array(
"title" => "Collage Comment",
"guidelines" => array(
"The report comment option is specifically for reporting when the <a href=\"rules.php?p=chat\">chat rules</a> have been broken.",
"Such as posts containing racism, offensive language, flaming, pornography, and other rules violations.",
"The report comment option is specifically for reporting when the <a href=\"rules.php?p=chat\">chat rules</a> have been broken, such as posts containing racism, offensive language, flaming, pornography, and other rules violations.",
"We encourage all users to use this feature when they see a rules violation of any form.",
"This will get quicker action than PMing a staff member will.",
"Please restrict the use of this feature to reporting rules violations, and remember, this is for reporting comments, not replying to them."
@ -94,21 +91,19 @@
"torrents_comment" => array(
"title" => "Torrent Comment",
"guidelines" => array(
"The report comment option is specifically for reporting when the <a href=\"rules.php?p=chat\">chat rules</a> have been broken.",
"Such as posts containing racism, offensive language, flaming, pornography, and other rules violations.",
"The report comment option is specifically for reporting when the <a href=\"rules.php?p=chat\">chat rules</a> have been broken, such as posts containing racism, offensive language, flaming, pornography, and other rules violations.",
"We encourage all users to use this feature when they see a rules violation of any form.",
"This will get quicker action than PMing a staff member will.",
"Please restrict the use of this feature to reporting Rules violations, and remember, this is for reporting comments, not replying to them."
"Please restrict the use of this feature to reporting rules violations, and remember, this is for reporting comments, not replying to them."
)
),
"artist_comment" => array(
"title" => "Artist Comment",
"guidelines" => array(
"The Report comment option is specifically for reporting when the Chat Rules have been broken.",
"Such as posts containing racism, offensive language, flaming, pornography, and other rules violations.",
"The report comment option is specifically for reporting when the <a href=\"rules.php?p=chat\">chat rules</a> have been broken, such as posts containing racism, offensive language, flaming, pornography, and other rules violations.",
"We encourage all users to use this feature when they see a rules violation of any form.",
"This will get quicker action than PMing a staff member will.",
"Please restrict the use of this feature to reporting Rules violations, and remember, this is for reporting comments, not replying to them."
"Please restrict the use of this feature to reporting rules violations, and remember, this is for reporting comments, not replying to them."
)
)
);

View File

@ -88,7 +88,7 @@
$DB->query("UPDATE reportsv2 SET
Status='Resolved',
LastChangeTime='".sqltime()."',
ModComment='Report already dealt with (Torrent deleted)'
ModComment='Report already dealt with (torrent deleted)'
WHERE ID=".$ReportID);
?>
<div>
@ -118,24 +118,24 @@
$ReportType = $Types['master']['other'];
}
if ($ArtistID == 0 && empty($ArtistName)) {
$RawName = $GroupName.($Year ? " ($Year)" : "").($Format || $Encoding || $Media ? " [$Format/$Encoding/$Media]" : "").($Remastered ? " <$RemasterTitle - $RemasterYear>" : "").($HasCue ? " (Cue)" : '').($HasLog ? " (Log: $LogScore %)" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
$RawName = $GroupName.($Year ? " ($Year)" : "").($Format || $Encoding || $Media ? " [$Format/$Encoding/$Media]" : "").($Remastered ? " &lt;$RemasterTitle - $RemasterYear&gt;" : "").($HasCue ? " (Cue)" : '').($HasLog ? " (Log: $LogScore %)" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
$LinkName = "<a href='torrents.php?id=$GroupID'>$GroupName".($Year ? " ($Year)" : "")."</a> <a href='torrents.php?torrentid=$TorrentID'>".($Format || $Encoding || $Media ? " [$Format/$Encoding/$Media]" : "").($Remastered ? " &lt;$RemasterTitle - $RemasterYear&gt;" : "")."</a> ".($HasCue ? " (Cue)" : '').($HasLog ? " <a href='torrents.php?action=viewlog&amp;torrentid=$TorrentID&amp;groupid=$GroupID'>(Log: $LogScore %)</a>" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
$BBName = "[url=torrents.php?id=$GroupID]$GroupName".($Year ? " ($Year)" : "")."[/url] [url=torrents.php?torrentid=$TorrentID][$Format/$Encoding/$Media]".($Remastered ? " <$RemasterTitle - $RemasterYear>" : "")."[/url] ".($HasCue ? " (Cue)" : '').($HasLog ? " [url=torrents.php?action=viewlog&amp;torrentid=$TorrentID&amp;groupid=$GroupID'](Log: $LogScore %)[/url]" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
$BBName = "[url=torrents.php?id=$GroupID]$GroupName".($Year ? " ($Year)" : "")."[/url] [url=torrents.php?torrentid=$TorrentID][$Format/$Encoding/$Media]".($Remastered ? " &lt;$RemasterTitle - $RemasterYear&gt;" : "")."[/url] ".($HasCue ? " (Cue)" : '').($HasLog ? " [url=torrents.php?action=viewlog&amp;torrentid=$TorrentID&amp;groupid=$GroupID'](Log: $LogScore %)[/url]" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
} elseif ($ArtistID == 0 && $ArtistName == 'Various Artists') {
$RawName = "Various Artists - $GroupName".($Year ? " ($Year)" : "")." [$Format/$Encoding/$Media]".($Remastered ? " <$RemasterTitle - $RemasterYear>" : "").($HasCue ? " (Cue)" : '').($HasLog ? " (Log: $LogScore %)" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
$RawName = "Various Artists - $GroupName".($Year ? " ($Year)" : "")." [$Format/$Encoding/$Media]".($Remastered ? " &lt;$RemasterTitle - $RemasterYear&gt;" : "").($HasCue ? " (Cue)" : '').($HasLog ? " (Log: $LogScore %)" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
$LinkName = "Various Artists - <a href='torrents.php?id=$GroupID'>$GroupName".($Year ? " ($Year)" : "")."</a> <a href='torrents.php?torrentid=$TorrentID'> [$Format/$Encoding/$Media]".($Remastered ? " &lt;$RemasterTitle - $RemasterYear&gt;" : "")."</a> ".($HasCue ? " (Cue)" : '').($HasLog ? " <a href='torrents.php?action=viewlog&amp;torrentid=$TorrentID&amp;groupid=$GroupID'>(Log: $LogScore %)</a>" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
$BBName = "Various Artists - [url=torrents.php?id=$GroupID]$GroupName".($Year ? " ($Year)" : "")."[/url] [url=torrents.php?torrentid=$TorrentID][$Format/$Encoding/$Media]".($Remastered ? " <$RemasterTitle - $RemasterYear>" : "")."[/url] ".($HasCue ? " (Cue)" : '').($HasLog ? " [url=torrents.php?action=viewlog&amp;torrentid=$TorrentID&amp;groupid=$GroupID'](Log: $LogScore %)[/url]" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
$BBName = "Various Artists - [url=torrents.php?id=$GroupID]$GroupName".($Year ? " ($Year)" : "")."[/url] [url=torrents.php?torrentid=$TorrentID][$Format/$Encoding/$Media]".($Remastered ? " &lt;$RemasterTitle - $RemasterYear&gt;" : "")."[/url] ".($HasCue ? " (Cue)" : '').($HasLog ? " [url=torrents.php?action=viewlog&amp;torrentid=$TorrentID&amp;groupid=$GroupID'](Log: $LogScore %)[/url]" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
} else {
$RawName = "$ArtistName - $GroupName".($Year ? " ($Year)" : "")." [$Format/$Encoding/$Media]".($Remastered ? " <$RemasterTitle - $RemasterYear>" : "").($HasCue ? " (Cue)" : '').($HasLog ? " (Log: $LogScore %)" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
$RawName = "$ArtistName - $GroupName".($Year ? " ($Year)" : "")." [$Format/$Encoding/$Media]".($Remastered ? " &lt;$RemasterTitle - $RemasterYear&gt;" : "").($HasCue ? " (Cue)" : '').($HasLog ? " (Log: $LogScore %)" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
$LinkName = "<a href='artist.php?id=$ArtistID'>$ArtistName</a> - <a href='torrents.php?id=$GroupID'>$GroupName".($Year ? " ($Year)" : "")."</a> <a href='torrents.php?torrentid=$TorrentID'> [$Format/$Encoding/$Media]".($Remastered ? " &lt;$RemasterTitle - $RemasterYear&gt;" : "")."</a> ".($HasCue ? " (Cue)" : '').($HasLog ? " <a href='torrents.php?action=viewlog&amp;torrentid=$TorrentID&amp;groupid=$GroupID'>(Log: $LogScore %)</a>" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
$BBName = "[url=artist.php?id=$ArtistID]".$ArtistName."[/url] - [url=torrents.php?id=$GroupID]$GroupName".($Year ? " ($Year)" : "")."[/url] [url=torrents.php?torrentid=$TorrentID][$Format/$Encoding/$Media]".($Remastered ? " <$RemasterTitle - $RemasterYear>" : "")."[/url] ".($HasCue ? " (Cue)" : '').($HasLog ? " [url=torrents.php?action=viewlog&amp;torrentid=$TorrentID&amp;groupid=$GroupID'](Log: $LogScore %)[/url]" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
$BBName = "[url=artist.php?id=$ArtistID]".$ArtistName."[/url] - [url=torrents.php?id=$GroupID]$GroupName".($Year ? " ($Year)" : "")."[/url] [url=torrents.php?torrentid=$TorrentID][$Format/$Encoding/$Media]".($Remastered ? " &lt;$RemasterTitle - $RemasterYear&gt;" : "")."[/url] ".($HasCue ? " (Cue)" : '').($HasLog ? " [url=torrents.php?action=viewlog&amp;torrentid=$TorrentID&amp;groupid=$GroupID'](Log: $LogScore %)[/url]" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
}
?>
<div id="report<?=$ReportID?>">
<form class="edit_form" name="report" id="reportform_<?=$ReportID?>" action="reports.php" method="post">
<?
/*
* Some of these are for takeresolve, some for the javascript.
* Some of these are for takeresolve, some for the JavaScript.
*/
?>
<div>
@ -171,7 +171,7 @@
if($GroupOthers > 0) { ?>
<div style="text-align: right;">
<a href="reportsv2.php?view=group&amp;id=<?=$GroupID?>">There <?=(($GroupOthers > 1) ? "are $GroupOthers other reports" : "is 1 other report")?> for torrent(s) in this group</a>
<a href="reportsv2.php?view=group&amp;id=<?=$GroupID?>">There <?=(($GroupOthers > 1) ? "are $GroupOthers other reports" : "is 1 other report")?> for torrents in this group</a>
</div>
<? $DB->query("SELECT t.UserID
FROM reportsv2 AS r
@ -182,7 +182,7 @@
if($UploaderOthers > 0) { ?>
<div style="text-align: right;">
<a href="reportsv2.php?view=uploader&amp;id=<?=$UploaderID?>">There <?=(($UploaderOthers > 1) ? "are $UploaderOthers other reports" : "is 1 other report")?> for torrent(s) uploaded by this user</a>
<a href="reportsv2.php?view=uploader&amp;id=<?=$UploaderID?>">There <?=(($UploaderOthers > 1) ? "are $UploaderOthers other reports" : "is 1 other report")?> for torrents uploaded by this user</a>
</div>
<? }
@ -367,9 +367,9 @@
</select>
<span id="options<?=$ReportID?>">
<? if(check_perms('users_mod')) { ?>
<span title="Delete Torrent?">
<span title="Delete torrent?">
<strong>Delete</strong>
<input type="checkbox" name="delete" id="delete<?=$ReportID?>">
<input type="checkbox" name="delete" id="delete<?=$ReportID?>" />
</span>
<? } ?>
<span title="Warning length in weeks">
@ -386,7 +386,7 @@
</span>
<span title="Remove upload privileges?">
<strong>Upload</strong>
<input type="checkbox" name="upload" id="upload<?=$ReportID?>">
<input type="checkbox" name="upload" id="upload<?=$ReportID?>" />
</span>
&nbsp;&nbsp;
<span title="Update resolve type">
@ -402,9 +402,9 @@
<option value="Uploader">Uploader</option>
<option value="Reporter">Reporter</option>
</select>:
</td>
</td>
<td colspan="3">
<span title="Uploader: Appended to the regular message unless using send now. Reporter: Must be used with send now">
<span title="Uploader: Appended to the regular message unless using &quot;Send Now&quot;. Reporter: Must be used with &quot;Send Now&quot;.">
<textarea name="uploader_pm" id="uploader_pm<?=$ReportID?>" cols="50" rows="1"></textarea>
</span>
<input type="button" value="Send Now" onclick="SendPM(<?=$ReportID?>)" />
@ -433,7 +433,7 @@
<input type="button" value="Report resolved manually" onclick="ManualResolve(<?=$ReportID?>);" />
| <input type="button" value="Give back" onclick="GiveBack(<?=$ReportID?>);" />
| <input id="grab<?=$ReportID?>" type="button" value="Grab!" onclick="Grab(<?=$ReportID?>);" />
| Multi-Resolve <input type="checkbox" name="multi" id="multi<?=$ReportID?>" checked="checked">
| Multi-Resolve <input type="checkbox" name="multi" id="multi<?=$ReportID?>" checked="checked" />
| <input type="button" value="Submit" onclick="TakeResolve(<?=$ReportID?>);" />
</td>
</tr>
@ -441,4 +441,8 @@
</form>
<br />
</div>
<script type="text/javascript">Load('<?=$ReportID?>');</script>
<script type="text/javascript">
//<![CDATA[
Load('<?=$ReportID?>');
//]]>
</script>

View File

@ -232,7 +232,7 @@
$DB->query("UPDATE reportsv2 SET
Status='Resolved',
LastChangeTime='".sqltime()."',
ModComment='Report already dealt with (Torrent deleted)'
ModComment='Report already dealt with (torrent deleted)'
WHERE ID=".$ReportID);
$Cache->decrement('num_torrent_reportsv2');
?>
@ -261,24 +261,24 @@
}
}
if ($ArtistID == 0 && empty($ArtistName)) {
$RawName = $GroupName.($Year ? " ($Year)" : "").($Format || $Encoding || $Media ? " [$Format/$Encoding/$Media]" : "").($Remastered ? " <$RemasterTitle - $RemasterYear>" : "").($HasCue ? " (Cue)" : '').($HasLog ? " (Log: $LogScore %)" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
$RawName = $GroupName.($Year ? " ($Year)" : "").($Format || $Encoding || $Media ? " [$Format/$Encoding/$Media]" : "").($Remastered ? " &lt;$RemasterTitle - $RemasterYear&gt;" : "").($HasCue ? " (Cue)" : '').($HasLog ? " (Log: $LogScore %)" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
$LinkName = "<a href='torrents.php?id=$GroupID'>$GroupName".($Year ? " ($Year)" : "")."</a> <a href='torrents.php?torrentid=$TorrentID'>".($Format || $Encoding || $Media ? " [$Format/$Encoding/$Media]" : "").($Remastered ? " &lt;$RemasterTitle - $RemasterYear&gt;" : "")."</a> ".($HasCue ? " (Cue)" : '').($HasLog ? " <a href='torrents.php?action=viewlog&amp;torrentid=$TorrentID&amp;groupid=$GroupID'>(Log: $LogScore %)</a>" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
$BBName = "[url=torrents.php?id=$GroupID]$GroupName".($Year ? " ($Year)" : "")."[/url] [url=torrents.php?torrentid=$TorrentID][$Format/$Encoding/$Media]".($Remastered ? " <$RemasterTitle - $RemasterYear>" : "")."[/url] ".($HasCue ? " (Cue)" : '').($HasLog ? " [url=torrents.php?action=viewlog&amp;torrentid=$TorrentID&amp;groupid=$GroupID'](Log: $LogScore %)[/url]" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
$BBName = "[url=torrents.php?id=$GroupID]$GroupName".($Year ? " ($Year)" : "")."[/url] [url=torrents.php?torrentid=$TorrentID][$Format/$Encoding/$Media]".($Remastered ? " &lt;$RemasterTitle - $RemasterYear&gt;" : "")."[/url] ".($HasCue ? " (Cue)" : '').($HasLog ? " [url=torrents.php?action=viewlog&amp;torrentid=$TorrentID&amp;groupid=$GroupID'](Log: $LogScore %)[/url]" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
} elseif ($ArtistID == 0 && $ArtistName == 'Various Artists') {
$RawName = "Various Artists - $GroupName".($Year ? " ($Year)" : "")." [$Format/$Encoding/$Media]".($Remastered ? " <$RemasterTitle - $RemasterYear>" : "").($HasCue ? " (Cue)" : '').($HasLog ? " (Log: $LogScore %)" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
$RawName = "Various Artists - $GroupName".($Year ? " ($Year)" : "")." [$Format/$Encoding/$Media]".($Remastered ? " &lt;$RemasterTitle - $RemasterYear&gt;" : "").($HasCue ? " (Cue)" : '').($HasLog ? " (Log: $LogScore %)" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
$LinkName = "Various Artists - <a href='torrents.php?id=$GroupID'>$GroupName".($Year ? " ($Year)" : "")."</a> <a href='torrents.php?torrentid=$TorrentID'> [$Format/$Encoding/$Media]".($Remastered ? " &lt;$RemasterTitle - $RemasterYear&gt;" : "")."</a> ".($HasCue ? " (Cue)" : '').($HasLog ? " <a href='torrents.php?action=viewlog&amp;torrentid=$TorrentID&amp;groupid=$GroupID'>(Log: $LogScore %)</a>" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
$BBName = "Various Artists - [url=torrents.php?id=$GroupID]$GroupName".($Year ? " ($Year)" : "")."[/url] [url=torrents.php?torrentid=$TorrentID][$Format/$Encoding/$Media]".($Remastered ? " <$RemasterTitle - $RemasterYear>" : "")."[/url] ".($HasCue ? " (Cue)" : '').($HasLog ? " [url=torrents.php?action=viewlog&amp;torrentid=$TorrentID&amp;groupid=$GroupID'](Log: $LogScore %)[/url]" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
$BBName = "Various Artists - [url=torrents.php?id=$GroupID]$GroupName".($Year ? " ($Year)" : "")."[/url] [url=torrents.php?torrentid=$TorrentID][$Format/$Encoding/$Media]".($Remastered ? " &lt;$RemasterTitle - $RemasterYear&gt;" : "")."[/url] ".($HasCue ? " (Cue)" : '').($HasLog ? " [url=torrents.php?action=viewlog&amp;torrentid=$TorrentID&amp;groupid=$GroupID'](Log: $LogScore %)[/url]" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
} else {
$RawName = "$ArtistName - $GroupName".($Year ? " ($Year)" : "")." [$Format/$Encoding/$Media]".($Remastered ? " <$RemasterTitle - $RemasterYear>" : "").($HasCue ? " (Cue)" : '').($HasLog ? " (Log: $LogScore %)" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
$RawName = "$ArtistName - $GroupName".($Year ? " ($Year)" : "")." [$Format/$Encoding/$Media]".($Remastered ? " &lt;$RemasterTitle - $RemasterYear&gt;" : "").($HasCue ? " (Cue)" : '').($HasLog ? " (Log: $LogScore %)" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
$LinkName = "<a href='artist.php?id=$ArtistID'>$ArtistName</a> - <a href='torrents.php?id=$GroupID'>$GroupName".($Year ? " ($Year)" : "")."</a> <a href='torrents.php?torrentid=$TorrentID'> [$Format/$Encoding/$Media]".($Remastered ? " &lt;$RemasterTitle - $RemasterYear&gt;" : "")."</a> ".($HasCue ? " (Cue)" : '').($HasLog ? " <a href='torrents.php?action=viewlog&amp;torrentid=$TorrentID&amp;groupid=$GroupID'>(Log: $LogScore %)</a>" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
$BBName = "[url=artist.php?id=$ArtistID]".$ArtistName."[/url] - [url=torrents.php?id=$GroupID]$GroupName".($Year ? " ($Year)" : "")."[/url] [url=torrents.php?torrentid=$TorrentID][$Format/$Encoding/$Media]".($Remastered ? " <$RemasterTitle - $RemasterYear>" : "")."[/url] ".($HasCue ? " (Cue)" : '').($HasLog ? " [url=torrents.php?action=viewlog&amp;torrentid=$TorrentID&amp;groupid=$GroupID'](Log: $LogScore %)[/url]" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
$BBName = "[url=artist.php?id=$ArtistID]".$ArtistName."[/url] - [url=torrents.php?id=$GroupID]$GroupName".($Year ? " ($Year)" : "")."[/url] [url=torrents.php?torrentid=$TorrentID][$Format/$Encoding/$Media]".($Remastered ? " &lt;$RemasterTitle - $RemasterYear&gt;" : "")."[/url] ".($HasCue ? " (Cue)" : '').($HasLog ? " [url=torrents.php?action=viewlog&amp;torrentid=$TorrentID&amp;groupid=$GroupID'](Log: $LogScore %)[/url]" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
}
?>
<div id="report<?=$ReportID?>">
<form class="manage_form" name="report" id="reportform_<?=$ReportID?>" action="reports.php" method="post">
<?
/*
* Some of these are for takeresolve, namely the ones that aren't inputs, some for the javascript.
* Some of these are for takeresolve, namely the ones that aren't inputs, some for the JavaScript.
*/
?>
<div>
@ -526,9 +526,9 @@
</select>
<span id="options<?=$ReportID?>">
<? if(check_perms('users_mod')) { ?>
<span title="Delete Torrent?">
<span title="Delete torrent?">
<strong>Delete</strong>
<input type="checkbox" name="delete" id="delete<?=$ReportID?>">
<input type="checkbox" name="delete" id="delete<?=$ReportID?>" />
</span>
<? } ?>
<span title="Warning length in weeks">
@ -545,7 +545,7 @@
</span>
<span title="Remove upload privileges?">
<strong>Upload</strong>
<input type="checkbox" name="upload" id="upload<?=$ReportID?>">
<input type="checkbox" name="upload" id="upload<?=$ReportID?>" />
</span>
&nbsp;&nbsp;
<span title="Update resolve type">
@ -563,7 +563,7 @@
</select>:
</td>
<td colspan="3">
<span title="Uploader: Appended to the regular message unless using send now. Reporter: Must be used with send now">
<span title="Uploader: Appended to the regular message unless using &quot;Send Now&quot;. Reporter: Must be used with &quot;Send Now&quot;.">
<textarea name="uploader_pm" id="uploader_pm<?=$ReportID?>" cols="50" rows="1"></textarea>
</span>
<input type="button" value="Send Now" onclick="SendPM(<?=$ReportID?>)" />
@ -595,7 +595,7 @@
<? } else { ?>
| <input id="grab<?=$ReportID?>" type="button" value="Grab!" onclick="Grab(<?=$ReportID?>);" />
<? } ?>
| Multi-Resolve <input type="checkbox" name="multi" id="multi<?=$ReportID?>" checked="checked">
| Multi-Resolve <input type="checkbox" name="multi" id="multi<?=$ReportID?>" checked="checked" />
| <input type="button" id="submit_<?=$ReportID?>" value="Submit" onclick="TakeResolve(<?=$ReportID?>);" />
</td>
</tr>
@ -639,7 +639,11 @@
</form>
<br />
</div>
<script type="text/javascript">Load('<?=$ReportID?>');</script>
<script type="text/javascript">
//<![CDATA[
Load('<?=$ReportID?>');
//]]>
</script>
<?
}
}

View File

@ -1,8 +1,8 @@
<?
/*
* This page is to outline all the sexy views build into reports v2.
* This page is to outline all of the views built into reports v2.
* It's used as the main page as it also lists the current reports by type
* and also current in progress reports by staff member.
* and the current in-progress reports by staff member.
* All the different views are self explanatory by their names.
*/
if(!check_perms('admin_reports')){
@ -40,7 +40,7 @@
?>
<tr>
<td><a href="reportsv2.php?view=resolver&amp;id=<?=$UserID?>"><?=$Username?></a></td>
<td><?=$Reports?></td>
<td><?=number_format($Reports)?></td>
</tr>
<? } ?>
</table>
@ -60,7 +60,7 @@
?>
<tr>
<td><?=$Username?></td>
<td><?=$Reports?></td>
<td><?=number_format($Reports)?></td>
</tr>
<? } ?>
</table>
@ -80,7 +80,7 @@
?>
<tr>
<td><?=$Username?></td>
<td><?=$Reports?></td>
<td><?=number_format($Reports)?></td>
</tr>
<? } ?>
</table>
@ -89,7 +89,7 @@
$DB->query("SELECT um.Username, COUNT(r.ID) AS Reports FROM reportsv2 AS r JOIN users_main AS um ON um.ID=r.ResolverID GROUP BY r.ResolverID ORDER BY Reports DESC");
$Results = $DB->to_array();
?>
<strong>Reports resolved since reportsv2 (2009-07-27)</strong>
<strong>Reports resolved since Reports v2 (2009-07-27)</strong>
<table class="border">
<tr>
<td class="head colhead_dark">Username</td>
@ -100,14 +100,14 @@
?>
<tr>
<td><?=$Username?></td>
<td><?=$Reports?></td>
<td><?=number_format($Reports)?></td>
</tr>
<? } ?>
</table>
<br />
<h3>Different view modes by person</h3>
<br />
<strong>By ID of torrent reported.</strong>
<strong>By ID of torrent reported:</strong>
<ul>
<li>
Reports of torrents with ID = 1
@ -117,7 +117,7 @@
</li>
</ul>
<br />
<strong>By GroupID of torrent reported.</strong>
<strong>By group ID of torrent reported:</strong>
<ul>
<li>
Reports of torrents within the group with ID = 1
@ -127,7 +127,7 @@
</li>
</ul>
<br />
<strong>By Report ID.</strong>
<strong>By report ID:</strong>
<ul>
<li>
The report with ID = 1
@ -137,7 +137,7 @@
</li>
</ul>
<br />
<strong>By Reporter ID.</strong>
<strong>By reporter ID:</strong>
<ul>
<li>
Reports created by <?=$Owner?>
@ -147,7 +147,7 @@
</li>
</ul>
<br />
<strong>By uploader ID.</strong>
<strong>By uploader ID:</strong>
<ul>
<li>
Reports for torrents uploaded by <?=$Owner?>
@ -157,7 +157,7 @@
</li>
</ul>
<br />
<strong>By resolver ID.</strong>
<strong>By resolver ID:</strong>
<ul>
<li>
Reports for torrents resolved by <?=$Owner?>
@ -186,7 +186,7 @@
<table>
<tr class="colhead">
<td>Staff member</td>
<td>Current Count</td>
<td>Current count</td>
<td>Tasted</td>
</tr>
@ -219,7 +219,7 @@
<table>
<tr class="colhead">
<td>Type</td>
<td>Current Count</td>
<td>Current count</td>
</tr>
<?
foreach($Current as $Array) {
@ -236,7 +236,7 @@
<a href="reportsv2.php?view=type&amp;id=<?=display_str($Array['Type'])?>"><?=display_str($Title)?></a>
</td>
<td>
<?=$Array['Count']?>
<?=number_format($Array['Count'])?>
</td>
</tr>
<?

View File

@ -307,7 +307,7 @@ function next_hour() {
$Message = 'You have downloaded more then 10 GiB while on Ratio Watch. Your leeching privileges have been disabled. Please reread the rules and refer to this guide on how to improve your ratio https://what.cd/wiki.php?action=article&amp;id=110';
foreach($UserIDs as $UserID) {
Misc::send_pm($UserID,0,db_string($Subject),db_string($Message));
send_irc("PRIVMSG #reports : !leechdisabled Downloaded 10 GB+ on Ratio Watch. https://what.cd/user.php?id=$UserID");
send_irc("PRIVMSG #reports : !leechdisabled Downloaded 10 GB+ on Ratio Watch. https://".SSL_SITE_URL."/user.php?id=$UserID");
}
$DB->query("UPDATE users_info AS i JOIN users_main AS m ON m.ID=i.UserID

View File

@ -121,17 +121,17 @@
$ReportType = $Types['master']['other'];
}
if ($ArtistID == 0 && empty($ArtistName)) {
$RawName = $GroupName.($Year ? " ($Year)" : "").($Format || $Encoding || $Media ? " [$Format/$Encoding/$Media]" : "").($Remastered ? " <$RemasterTitle - $RemasterYear>" : "").($HasLog ? " ($LogScore %)" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
$RawName = $GroupName.($Year ? " ($Year)" : "").($Format || $Encoding || $Media ? " [$Format/$Encoding/$Media]" : "").($Remastered ? " &lt;$RemasterTitle - $RemasterYear&gt;" : "").($HasLog ? " ($LogScore %)" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
$LinkName = "<a href='torrents.php?id=$GroupID'>$GroupName".($Year ? " ($Year)" : "")."</a> <a href='torrents.php?torrentid=$TorrentID'>".($Format || $Encoding || $Media ? " [$Format/$Encoding/$Media]" : "").($Remastered ? " &lt;$RemasterTitle - $RemasterYear&gt;" : "")."</a>".($HasLog ? " <a href='torrents.php?action=viewlog&amp;torrentid=$TorrentID&amp;groupid=$GroupID'>(Log: $LogScore %)</a>" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
$BBName = "[url=torrents.php?id=$GroupID]$GroupName".($Year ? " ($Year)" : "")."[/url] [url=torrents.php?torrentid=$TorrentID][$Format/$Encoding/$Media]".($Remastered ? " <$RemasterTitle - $RemasterYear>" : "")."[/url] ".($HasLog ? " [url=torrents.php?action=viewlog&amp;torrentid=$TorrentID&amp;groupid=$GroupID'](Log: $LogScore %)[/url]" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
$BBName = "[url=torrents.php?id=$GroupID]$GroupName".($Year ? " ($Year)" : "")."[/url] [url=torrents.php?torrentid=$TorrentID][$Format/$Encoding/$Media]".($Remastered ? " &lt;$RemasterTitle - $RemasterYear&gt;" : "")."[/url] ".($HasLog ? " [url=torrents.php?action=viewlog&amp;torrentid=$TorrentID&amp;groupid=$GroupID'](Log: $LogScore %)[/url]" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
} elseif ($ArtistID == 0 && $ArtistName == 'Various Artists') {
$RawName = "Various Artists - $GroupName".($Year ? " ($Year)" : "")." [$Format/$Encoding/$Media]".($Remastered ? " <$RemasterTitle - $RemasterYear>" : "").($HasLog ? " ($LogScore %)" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
$RawName = "Various Artists - $GroupName".($Year ? " ($Year)" : "")." [$Format/$Encoding/$Media]".($Remastered ? " &lt;$RemasterTitle - $RemasterYear&gt;" : "").($HasLog ? " ($LogScore %)" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
$LinkName = "Various Artists - <a href='torrents.php?id=$GroupID'>$GroupName".($Year ? " ($Year)" : "")."</a> <a href='torrents.php?torrentid=$TorrentID'> [$Format/$Encoding/$Media]".($Remastered ? " &lt;$RemasterTitle - $RemasterYear&gt;" : "")."</a> ".($HasLog ? " <a href='torrents.php?action=viewlog&amp;torrentid=$TorrentID&amp;groupid=$GroupID'>(Log: $LogScore %)</a>" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
$BBName = "Various Artists - [url=torrents.php?id=$GroupID]$GroupName".($Year ? " ($Year)" : "")."[/url] [url=torrents.php?torrentid=$TorrentID][$Format/$Encoding/$Media]".($Remastered ? " <$RemasterTitle - $RemasterYear>" : "")."[/url] ".($HasLog ? " [url=torrents.php?action=viewlog&amp;torrentid=$TorrentID&amp;groupid=$GroupID'](Log: $LogScore %)[/url]" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
$BBName = "Various Artists - [url=torrents.php?id=$GroupID]$GroupName".($Year ? " ($Year)" : "")."[/url] [url=torrents.php?torrentid=$TorrentID][$Format/$Encoding/$Media]".($Remastered ? " &lt;$RemasterTitle - $RemasterYear&gt;" : "")."[/url] ".($HasLog ? " [url=torrents.php?action=viewlog&amp;torrentid=$TorrentID&amp;groupid=$GroupID'](Log: $LogScore %)[/url]" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
} else {
$RawName = "$ArtistName - $GroupName".($Year ? " ($Year)" : "")." [$Format/$Encoding/$Media]".($Remastered ? " <$RemasterTitle - $RemasterYear>" : "").($HasLog ? " ($LogScore %)" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
$RawName = "$ArtistName - $GroupName".($Year ? " ($Year)" : "")." [$Format/$Encoding/$Media]".($Remastered ? " &lt;$RemasterTitle - $RemasterYear&gt;" : "").($HasLog ? " ($LogScore %)" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
$LinkName = "<a href='artist.php?id=$ArtistID'>$ArtistName</a> - <a href='torrents.php?id=$GroupID'>$GroupName".($Year ? " ($Year)" : "")."</a> <a href='torrents.php?torrentid=$TorrentID'> [$Format/$Encoding/$Media]".($Remastered ? " &lt;$RemasterTitle - $RemasterYear&gt;" : "")."</a> ".($HasLog ? " <a href='torrents.php?action=viewlog&amp;torrentid=$TorrentID&amp;groupid=$GroupID'>(Log: $LogScore %)</a>" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
$BBName = "[url=artist.php?id=$ArtistID]".$ArtistName."[/url] - [url=torrents.php?id=$GroupID]$GroupName".($Year ? " ($Year)" : "")."[/url] [url=torrents.php?torrentid=$TorrentID][$Format/$Encoding/$Media]".($Remastered ? " <$RemasterTitle - $RemasterYear>" : "")."[/url] ".($HasLog ? " [url=torrents.php?action=viewlog&amp;torrentid=$TorrentID&amp;groupid=$GroupID'](Log: $LogScore %)[/url]" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
$BBName = "[url=artist.php?id=$ArtistID]".$ArtistName."[/url] - [url=torrents.php?id=$GroupID]$GroupName".($Year ? " ($Year)" : "")."[/url] [url=torrents.php?torrentid=$TorrentID][$Format/$Encoding/$Media]".($Remastered ? " &lt;$RemasterTitle - $RemasterYear&gt;" : "")."[/url] ".($HasLog ? " [url=torrents.php?action=viewlog&amp;torrentid=$TorrentID&amp;groupid=$GroupID'](Log: $LogScore %)[/url]" : "")." (".number_format($Size/(1024*1024), 2)." MB)";
}
?>
<div id="report<?=$ReportID?>">
@ -233,9 +233,9 @@
<? } ?>
</select>
<span id="options<?=$ReportID?>">
<span title="Delete Torrent?">
<span title="Delete torrent?">
<strong>Delete</strong>
<input type="checkbox" name="delete" id="delete<?=$ReportID?>"<?=($ReportType['resolve_options']['delete']?' checked="checked"':'')?>>
<input type="checkbox" name="delete" id="delete<?=$ReportID?>"<?=($ReportType['resolve_options']['delete']?' checked="checked"':'')?> />
</span>
<span title="Warning length in weeks">
<strong>Warning</strong>
@ -247,15 +247,15 @@
</span>
<span title="Remove upload privileges?">
<strong>Upload</strong>
<input type="checkbox" name="upload" id="upload<?=$ReportID?>"<?=($ReportType['resolve_options']['upload']?' checked="checked"':'')?>>
<input type="checkbox" name="upload" id="upload<?=$ReportID?>"<?=($ReportType['resolve_options']['upload']?' checked="checked"':'')?> />
</span>
</span>
</td>
</tr>
<tr>
<td class="label">PM Uploader</td>
<td class="label">PM Uploader</td>
<td colspan="3">
<span title="Appended to the regular message unless using send now.">
<span title="Appended to the regular message unless using &quot;Send Now&quot;.">
<textarea name="uploader_pm" id="uploader_pm<?=$ReportID?>" cols="50" rows="1"></textarea>
</span>
<input type="button" value="Send Now" onclick="SendPM(<?=$ReportID?>)" />
@ -283,4 +283,4 @@
</div>
<?
}
View::show_footer(); ?>
View::show_footer(); ?>

View File

@ -217,11 +217,11 @@
if($LoggedUser['ID'] == $UserID || check_perms('edit_unknowns')) {
//Fine!
} else {
$Err = "You may not edit somebody elses upload to unknown";
$Err = "You may not edit somebody else's upload to unknown release.";
}
}
// Strip out amazon's padding
// Strip out Amazon's padding
$AmazonReg = '/(http:\/\/ecx.images-amazon.com\/images\/.+)(\._.*_\.jpg)/i';
$Matches = array();
if (preg_match($RegX, $Properties['Image'], $Matches)) {