Empty commit

This commit is contained in:
Git 2013-08-23 08:00:54 +00:00
parent 21963fb898
commit db7ddd0378
8 changed files with 86 additions and 90 deletions

View File

@ -61,7 +61,7 @@ function compare($X, $Y) {
$CollageSubscriptions = array();
}
if (in_array($CollageID, $CollagepSubscriptions)) {
if (in_array($CollageID, $CollageSubscriptions)) {
$Cache->delete_value('collage_subs_user_new_'.$LoggedUser['ID']);
}
$DB->query("

View File

@ -60,13 +60,13 @@
t.UserID AS UploaderID,
uploader.Username
FROM reportsv2 AS r
LEFT JOIN torrents AS t ON t.ID=r.TorrentID
LEFT JOIN torrents_group AS tg ON tg.ID=t.GroupID
LEFT JOIN torrents_artists AS ta ON ta.GroupID=tg.ID AND ta.Importance='1'
LEFT JOIN artists_alias AS aa ON aa.AliasID=ta.AliasID
LEFT JOIN users_main AS resolver ON resolver.ID=r.ResolverID
LEFT JOIN users_main AS reporter ON reporter.ID=r.ReporterID
LEFT JOIN users_main AS uploader ON uploader.ID=t.UserID
LEFT JOIN torrents AS t ON t.ID = r.TorrentID
LEFT JOIN torrents_group AS tg ON tg.ID = t.GroupID
LEFT JOIN torrents_artists AS ta ON ta.GroupID = tg.ID AND ta.Importance = '1'
LEFT JOIN artists_alias AS aa ON aa.AliasID = ta.AliasID
LEFT JOIN users_main AS resolver ON resolver.ID = r.ResolverID
LEFT JOIN users_main AS reporter ON reporter.ID = r.ReporterID
LEFT JOIN users_main AS uploader ON uploader.ID = t.UserID
WHERE r.Status = 'New'
GROUP BY r.ID
ORDER BY ReportedTime ASC
@ -85,10 +85,10 @@
$DB->query("
UPDATE reportsv2
SET
Status='Resolved',
LastChangeTime='".sqltime()."',
ModComment='Report already dealt with (torrent deleted)'
WHERE ID=".$ReportID);
Status = 'Resolved',
LastChangeTime = '".sqltime()."',
ModComment = 'Report already dealt with (torrent deleted)'
WHERE ID = $ReportID");
?>
<div>
<table class="layout">
@ -104,9 +104,9 @@
}
$DB->query("
UPDATE reportsv2
SET Status='InProgress',
ResolverID=".$LoggedUser['ID']."
WHERE ID=".$ReportID);
SET Status = 'InProgress',
ResolverID = ".$LoggedUser['ID']."
WHERE ID = $ReportID");
if (array_key_exists($Type, $Types[$CategoryID])) {
$ReportType = $Types[$CategoryID][$Type];
@ -167,9 +167,9 @@
<? $DB->query("
SELECT r.ID
FROM reportsv2 AS r
LEFT JOIN torrents AS t ON t.ID=r.TorrentID
LEFT JOIN torrents AS t ON t.ID = r.TorrentID
WHERE r.Status != 'Resolved'
AND t.GroupID=$GroupID");
AND t.GroupID = $GroupID");
$GroupOthers = ($DB->record_count() - 1);
if ($GroupOthers > 0) { ?>
@ -179,9 +179,9 @@
<? $DB->query("
SELECT t.UserID
FROM reportsv2 AS r
JOIN torrents AS t ON t.ID=r.TorrentID
JOIN torrents AS t ON t.ID = r.TorrentID
WHERE r.Status != 'Resolved'
AND t.UserID=$UploaderID");
AND t.UserID = $UploaderID");
$UploaderOthers = ($DB->record_count() - 1);
if ($UploaderOthers > 0) { ?>
@ -196,13 +196,13 @@
um.Username,
req.TimeFilled
FROM requests AS req
LEFT JOIN torrents AS t ON t.ID=req.TorrentID
LEFT JOIN reportsv2 AS rep ON rep.TorrentID=t.ID
JOIN users_main AS um ON um.ID=req.FillerID
LEFT JOIN torrents AS t ON t.ID = req.TorrentID
LEFT JOIN reportsv2 AS rep ON rep.TorrentID = t.ID
JOIN users_main AS um ON um.ID = req.FillerID
WHERE rep.Status != 'Resolved'
AND req.TimeFilled > '2010-03-04 02:31:49'
AND req.TorrentID=$TorrentID");
$Requests = ($DB->has_results());
AND req.TorrentID = $TorrentID");
$Requests = $DB->has_results();
if ($Requests > 0) {
while (list($RequestID, $FillerID, $FillerName, $FilledTime) = $DB->next_record()) {
?>
@ -220,7 +220,7 @@
<tr>
<td class="label">Relevant tracks:</td>
<td colspan="3">
<?=str_replace(" ", ", ", $Tracks)?>
<?=str_replace(' ', ', ', $Tracks)?>
</td>
</tr>
<? }
@ -230,7 +230,7 @@
<td class="label">Relevant links:</td>
<td colspan="3">
<?
$Links = explode(" ", $Links);
$Links = explode(' ', $Links);
foreach ($Links as $Link) {
if ($local_url = $Text->local_url($Link)) {
@ -280,11 +280,11 @@
t.UserID AS UploaderID,
uploader.Username
FROM torrents AS t
LEFT JOIN torrents_group AS tg ON tg.ID=t.GroupID
LEFT JOIN torrents_artists AS ta ON ta.GroupID=tg.ID AND ta.Importance='1'
LEFT JOIN artists_alias AS aa ON aa.AliasID=ta.AliasID
LEFT JOIN users_main AS uploader ON uploader.ID=t.UserID
WHERE t.ID='$ExtraID'
LEFT JOIN torrents_group AS tg ON tg.ID = t.GroupID
LEFT JOIN torrents_artists AS ta ON ta.GroupID = tg.ID AND ta.Importance = '1'
LEFT JOIN artists_alias AS aa ON aa.AliasID = ta.AliasID
LEFT JOIN users_main AS uploader ON uploader.ID = t.UserID
WHERE t.ID = '$ExtraID'
GROUP BY tg.ID");
list($ExtraGroupName, $ExtraGroupID, $ExtraArtistID, $ExtraArtistName, $ExtraYear, $ExtraTime, $ExtraRemastered, $ExtraRemasterTitle,
@ -319,10 +319,10 @@
<td class="label">Relevant images:</td>
<td colspan="3">
<?
$Images = explode(" ", $Images);
$Images = explode(' ', $Images);
foreach ($Images as $Image) {
?>
<img style="max-width: 200px;" onclick="lightbox.init(this,200);" src="<?=ImageTools::process($Image)?>" alt="Relevant image" />
<img style="max-width: 200px;" onclick="lightbox.init(this, 200);" src="<?=ImageTools::process($Image)?>" alt="Relevant image" />
<?
} ?>
</td>
@ -338,15 +338,15 @@
<td class="label">Report comment:</td>
<td colspan="3">
<input type="text" name="comment" id="comment<?=$ReportID?>" size="45" value="<?=$ModComment?>" />
<input type="button" value="Update now" onclick="UpdateComment(<?=$ReportID?>)" />
<input type="button" value="Update now" onclick="UpdateComment(<?=$ReportID?>);" />
</td>
</tr>
<tr>
<td class="label">
<a href="javascript:Load('<?=$ReportID?>')" title="Click here to reset the resolution options to their default values.">Resolve</a>
<a href="javascript:Load('<?=$ReportID?>')" title="Click here to reset the resolution options to their default values.">Resolve:</a>
</td>
<td colspan="3">
<select name="resolve_type" id="resolve_type<?=$ReportID?>" onchange="ChangeResolve(<?=$ReportID?>)">
<select name="resolve_type" id="resolve_type<?=$ReportID?>" onchange="ChangeResolve(<?=$ReportID?>);">
<?
$TypeList = $Types['master'] + $Types[$CategoryID];
$Priorities = array();
@ -370,22 +370,18 @@
<span title="Warning length in weeks">
<strong>Warning</strong>
<select name="warning" id="warning<?=$ReportID?>">
<?
for ($i = 0; $i < 9; $i++) {
?>
<? for ($i = 0; $i < 9; $i++) { ?>
<option value="<?=$i?>"><?=$i?></option>
<?
}
?>
<? } ?>
</select>
</span>
<span title="Remove upload privileges?">
<span>
<label for="upload<?=$ReportID?>"><strong>Remove upload privileges</strong></label>
<input type="checkbox" name="upload" id="upload<?=$ReportID?>" />
</span>
&nbsp;&nbsp;
<span title="Update resolve type">
<input type="button" name="update_resolve" id="update_resolve<?=$ReportID?>" value="Update now" onclick="UpdateResolve(<?=$ReportID?>)" />
<input type="button" name="update_resolve" id="update_resolve<?=$ReportID?>" value="Update now" onclick="UpdateResolve(<?=$ReportID?>);" />
</span>
</span>
</td>
@ -402,7 +398,7 @@
<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?>)" />
<input type="button" value="Send now" onclick="SendPM(<?=$ReportID?>);" />
</td>
</tr>
<tr>

View File

@ -535,7 +535,7 @@
</tr>
<tr>
<td class="label">
<a href="javascript:Load('<?=$ReportID?>')" title="Click here to reset the resolution options to their default values.">Resolve</a>
<a href="javascript:Load('<?=$ReportID?>')" title="Click here to reset the resolution options to their default values.">Resolve:</a>
</td>
<td colspan="3">
<select name="resolve_type" id="resolve_type<?=$ReportID?>" onchange="ChangeResolve(<?=$ReportID?>);">
@ -566,7 +566,7 @@
<? } ?>
</select>
</span>
<span title="Remove upload privileges?">
<span>
<label for="upload<?=$ReportID?>"><strong>Remove upload privileges</strong></label>
<input type="checkbox" name="upload" id="upload<?=$ReportID?>" />
</span>

View File

@ -11,8 +11,8 @@
t.Time,
COUNT(x.uid)
FROM torrents AS t
LEFT JOIN xbt_snatched AS x ON x.fid=t.ID
WHERE t.ID=$TorrentID
LEFT JOIN xbt_snatched AS x ON x.fid = t.ID
WHERE t.ID = $TorrentID
GROUP BY t.UserID");
if (!$DB->has_results()) {
@ -112,11 +112,11 @@
t.UserID AS UploaderID,
uploader.Username
FROM torrents AS t
LEFT JOIN torrents_group AS tg ON tg.ID=t.GroupID
LEFT JOIN torrents_artists AS ta ON ta.GroupID=tg.ID AND ta.Importance='1'
LEFT JOIN artists_alias AS aa ON aa.AliasID=ta.AliasID
LEFT JOIN users_main AS uploader ON uploader.ID=t.UserID
WHERE t.ID=".$TorrentID);
LEFT JOIN torrents_group AS tg ON tg.ID = t.GroupID
LEFT JOIN torrents_artists AS ta ON ta.GroupID = tg.ID AND ta.Importance = '1'
LEFT JOIN artists_alias AS aa ON aa.AliasID = ta.AliasID
LEFT JOIN users_main AS uploader ON uploader.ID = t.UserID
WHERE t.ID = $TorrentID");
if (!$DB->has_results()) {
die();
@ -186,9 +186,9 @@
<? $DB->query("
SELECT r.ID
FROM reportsv2 AS r
LEFT JOIN torrents AS t ON t.ID=r.TorrentID
LEFT JOIN torrents AS t ON t.ID = r.TorrentID
WHERE r.Status != 'Resolved'
AND t.GroupID=$GroupID");
AND t.GroupID = $GroupID");
$GroupOthers = ($DB->has_results());
if ($GroupOthers > 0) { ?>
@ -200,9 +200,9 @@
$DB->query("
SELECT t.UserID
FROM reportsv2 AS r
JOIN torrents AS t ON t.ID=r.TorrentID
JOIN torrents AS t ON t.ID = r.TorrentID
WHERE r.Status != 'Resolved'
AND t.UserID=$UploaderID");
AND t.UserID = $UploaderID");
$UploaderOthers = ($DB->has_results());
if ($UploaderOthers > 0) { ?>
@ -217,14 +217,14 @@
um.Username,
req.TimeFilled
FROM requests AS req
JOIN users_main AS um ON um.ID=req.FillerID
AND req.TorrentID=$TorrentID");
JOIN users_main AS um ON um.ID = req.FillerID
AND req.TorrentID = $TorrentID");
$Requests = ($DB->has_results());
if ($Requests > 0) {
while (list($RequestID, $FillerID, $FillerName, $FilledTime) = $DB->next_record()) {
?>
<div style="text-align: right;">
<a href="user.php?id=<?=$FillerID?>"><?=$FillerName?></a> used this torrent to fill <a href="requests.php?action=viewrequest&amp;id=<?=$RequestID?>">this request</a> <?=time_diff($FilledTime)?>
<strong class="important_text"><a href="user.php?id=<?=$FillerID?>"><?=$FillerName?></a> used this torrent to fill <a href="requests.php?action=viewrequest&amp;id=<?=$RequestID?>">this request</a> <?=time_diff($FilledTime)?></strong>
</div>
<? }
}
@ -235,10 +235,10 @@
<? // END REPORTED STUFF :|: BEGIN MOD STUFF ?>
<tr>
<td class="label">
<a href="javascript:Load('<?=$ReportID?>')">Resolve</a>
<a href="javascript:Load('<?=$ReportID?>')" title="Click here to reset the resolution options to their default values.">Resolve:</a>
</td>
<td colspan="3">
<select name="resolve_type" id="resolve_type<?=$ReportID?>" onchange="ChangeResolve(<?=$ReportID?>)">
<select name="resolve_type" id="resolve_type<?=$ReportID?>" onchange="ChangeResolve(<?=$ReportID?>);">
<?
$TypeList = $Types['master'] + $Types[$CategoryID];
$Priorities = array();
@ -256,8 +256,8 @@
</select>
<span id="options<?=$ReportID?>">
<span title="Delete torrent?">
<strong>Delete</strong>
<input type="checkbox" name="delete" id="delete<?=$ReportID?>"<?=($ReportType['resolve_options']['delete'] ? ' checked="checked"' : '')?> />
<label><strong>Delete</strong>
<input type="checkbox" name="delete" id="delete<?=$ReportID?>"<?=($ReportType['resolve_options']['delete'] ? ' checked="checked"' : '')?> /></label>
</span>
<span title="Warning length in weeks">
<strong>Warning</strong>
@ -267,20 +267,20 @@
<? } ?>
</select>
</span>
<span title="Remove upload privileges?">
<strong>Upload</strong>
<input type="checkbox" name="upload" id="upload<?=$ReportID?>"<?=($ReportType['resolve_options']['upload'] ? ' checked="checked"' : '')?> />
<span>
<label><strong>Remove upload privileges</strong>
<input type="checkbox" name="upload" id="upload<?=$ReportID?>"<?=($ReportType['resolve_options']['upload'] ? ' checked="checked"' : '')?> /></label>
</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 &quot;Send Now&quot;.">
<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?>)" />
<input type="button" value="Send now" onclick="SendPM(<?=$ReportID?>);" />
</td>
</tr>
<tr>

View File

@ -173,7 +173,6 @@ function check_paranoia_here($Setting) {
$Badges .= (($Warned != '0000-00-00 00:00:00') ? '<img src="'.STATIC_SERVER.'common/symbols/warned.png" alt="Warned" />' : '');
$Badges .= (($Enabled == '1' || $Enabled == '0' || !$Enabled) ? '' : '<img src="'.STATIC_SERVER.'common/symbols/disabled.png" alt="Banned" />');
<<<<<<< HEAD
View::show_header($Username, 'user,bbcode,requests,lastfm,info_paster');
@ -1306,13 +1305,13 @@ function check_paranoia_here($Setting) {
<textarea rows="1" cols="50" name="Reason" id="Reason" onkeyup="resize('Reason');"></textarea>
</td>
</tr>
<tr>
<td class="label">Broadcast to #fbi:</td>
<td class="label">Paste user stats:</td>
<td>
<button type="button" id="paster">Paste info</button>
<button type="button" id="paster">Paste</button>
</td>
</tr>
<tr>
<td align="right" colspan="2">
<input type="submit" value="Save changes" />

View File

@ -55,7 +55,7 @@
$SQL .= "%' ";
}
$SQL.= "
$SQL .= "
ORDER BY $Order $Way
LIMIT $Limit ";
$RS = $DB->query($SQL);
@ -81,16 +81,16 @@
</div>
<table cellpadding="6" cellspacing="1" border="0" class="layout border" width="100%">
<tr>
<td class="label"><strong>Search for:</strong></td>
<td class="label"><label for="search"><strong>Search for:</strong></label></td>
<td colspan="3">
<input type="text" name="search" size="70" value="<?=display_str($_GET['search'])?>" />
<input type="text" name="search" id="search" size="70" value="<?=display_str($_GET['search'])?>" />
</td>
</tr>
<tr>
<td class="label"><strong>Search in:</strong></td>
<td>
<input type="radio" name="type" value="Title" <? if ($Type == 'w.Title') { echo 'checked="checked" '; } ?>/> Title
<input type="radio" name="type" value="Body" <? if ($Type == 'w.Body') { echo 'checked="checked" '; } ?>/> Body
<label><input type="radio" name="type" value="Title" <? if ($Type == 'w.Title') { echo 'checked="checked" '; } ?>/> Title</label>
<label><input type="radio" name="type" value="Body" <? if ($Type == 'w.Body') { echo 'checked="checked" '; } ?>/> Body</label>
</td>
<td class="label"><strong>Order by:</strong></td>
<td>
@ -115,7 +115,8 @@
</form>
</div>
<br />
<? $Pages = Format::get_pages($Page, $NumResults, ARTICLES_PER_PAGE);
<?
$Pages = Format::get_pages($Page, $NumResults, ARTICLES_PER_PAGE);
if ($Pages) { ?>
<div class="linkbox pager"><?=($Pages)?></div>
<? } ?>

Binary file not shown.

After

Width:  |  Height:  |  Size: 684 KiB