diff --git a/sections/collages/collage.php b/sections/collages/collage.php index 53dc195b..13e72217 100644 --- a/sections/collages/collage.php +++ b/sections/collages/collage.php @@ -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(" diff --git a/sections/reportsv2/ajax_new_report.php b/sections/reportsv2/ajax_new_report.php index e5af0bf8..f9605e22 100644 --- a/sections/reportsv2/ajax_new_report.php +++ b/sections/reportsv2/ajax_new_report.php @@ -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"); ?>
@@ -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 @@ 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 @@ 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 @@ Relevant links: @@ -338,15 +338,15 @@ @@ -402,7 +398,7 @@ - + @@ -437,6 +433,6 @@
diff --git a/sections/reportsv2/static.php b/sections/reportsv2/static.php index 411b316f..70722f0b 100644 --- a/sections/reportsv2/static.php +++ b/sections/reportsv2/static.php @@ -535,7 +535,7 @@ - + diff --git a/sections/upload/upload_handle.php b/sections/upload/upload_handle.php index 26a3c6dc..4e107a4b 100644 --- a/sections/upload/upload_handle.php +++ b/sections/upload/upload_handle.php @@ -284,12 +284,12 @@ $MainArtistCount = 0; $ArtistNames = array(); $ArtistForm = array( - 1 => array(), - 2 => array(), - 3 => array(), - 4 => array(), - 5 => array(), - 6 => array() + 1 => array(), + 2 => array(), + 3 => array(), + 4 => array(), + 5 => array(), + 6 => array() ); for ($i = 0, $il = count($Artists); $i < $il; $i++) { if (trim($Artists[$i]) != '') { diff --git a/sections/user/user.php b/sections/user/user.php index d1481f77..5ddd60e2 100644 --- a/sections/user/user.php +++ b/sections/user/user.php @@ -173,7 +173,6 @@ function check_paranoia_here($Setting) { $Badges .= (($Warned != '0000-00-00 00:00:00') ? 'Warned' : ''); $Badges .= (($Enabled == '1' || $Enabled == '0' || !$Enabled) ? '' : 'Banned'); -<<<<<<< HEAD View::show_header($Username, 'user,bbcode,requests,lastfm,info_paster'); @@ -1306,13 +1305,13 @@ function check_paranoia_here($Setting) { - - + +
Relevant tracks: - +
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 @@ Relevant images: - Relevant image + Relevant image Report comment: - +
- Resolve + Resolve: - Warning - +    - +
- Resolve + Resolve: - + diff --git a/sections/torrents/delete.php b/sections/torrents/delete.php index 886b111a..3c6e4336 100644 --- a/sections/torrents/delete.php +++ b/sections/torrents/delete.php @@ -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 @@ 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()) { ?>
- used this torrent to fill this request + used this torrent to fill this request
- Resolve + Resolve: - - Delete - /> + Warning @@ -267,20 +267,20 @@ - - Upload - /> + +
PM uploaderPM uploader: - + - +
Broadcast to #fbi:Paste user stats: - +
diff --git a/sections/wiki/search.php b/sections/wiki/search.php index 82bd50c5..3a5644b3 100644 --- a/sections/wiki/search.php +++ b/sections/wiki/search.php @@ -55,7 +55,7 @@ $SQL .= "%' "; } -$SQL.= " +$SQL .= " ORDER BY $Order $Way LIMIT $Limit "; $RS = $DB->query($SQL); @@ -81,16 +81,16 @@ - + -next_record()) { ?> +next_record()) { ?> - +
Search for: - +
Search in: - /> Title - /> Body + + Order by: @@ -115,7 +115,8 @@
-
@@ -125,13 +126,13 @@ 		Last updated on Last edited by
diff --git a/static/common/banners/donorinfographic.jpg b/static/common/banners/donorinfographic.jpg new file mode 100644 index 00000000..83cf1b14 Binary files /dev/null and b/static/common/banners/donorinfographic.jpg differ