diff --git a/classes/class_tracker.php b/classes/class_tracker.php index e27a0347..ef6251fb 100644 --- a/classes/class_tracker.php +++ b/classes/class_tracker.php @@ -64,7 +64,7 @@ function update_tracker($Action, $Updates, $ToIRC = false) { send_irc("PRIVMSG #tracker :{$Attempts} {$Err} {$Get}"); if ($Cache->get_value('ocelot_error_reported') === false) { send_irc("PRIVMSG ".ADMIN_CHAN." :Failed to update ocelot: ".$Err." : ".$Get); - $Cache->cache_value('ocelot_error_reported', true, 900); + $Cache->cache_value('ocelot_error_reported', true, 3600); } } return ($Return == "success"); diff --git a/sections/staffpm/functions.php b/design/views/generic/reply/staffpm.php similarity index 76% rename from sections/staffpm/functions.php rename to design/views/generic/reply/staffpm.php index c6ed80ee..7b8ddceb 100644 --- a/sections/staffpm/functions.php +++ b/design/views/generic/reply/staffpm.php @@ -1,25 +1,25 @@ - -
-
- -

- -
- -

- -
- - Send to: - - - - -
-
- \ No newline at end of file +
+
+ +

+ +
+ +

+ +
+ + Send to: + + + + + +
+
\ No newline at end of file diff --git a/sections/better/single.php b/sections/better/single.php index 59f34f1d..7c5b5fe0 100644 --- a/sections/better/single.php +++ b/sections/better/single.php @@ -38,7 +38,7 @@ $DisplayName.=''.$GroupName.''; if($GroupYear>0) { $DisplayName.=" [".$GroupYear."]"; } if($ReleaseType>0) { $DisplayName.=" [".$ReleaseTypes[$ReleaseType]."]"; } - + $ExtraInfo = Torrents::torrent_info($Torrents[$FlacID]); if($ExtraInfo) { $DisplayName.=' - '.$ExtraInfo; @@ -56,10 +56,10 @@ $TorrentTags='
'.$TagList.'
'; } ?> - "> + - [ DL ] + DL diff --git a/sections/better/snatch.php b/sections/better/snatch.php index 361820be..c640e50b 100644 --- a/sections/better/snatch.php +++ b/sections/better/snatch.php @@ -22,7 +22,7 @@ $DB->query("SELECT t.GroupID, x.fid FROM ".($SeedingOnly ? 'xbt_files_users' : 'xbt_snatched')." AS x JOIN torrents AS t ON t.ID=x.fid - WHERE t.Format='FLAC' + WHERE t.Format='FLAC' AND ((t.LogScore = '100' AND t.Media = 'CD') OR t.Media = 'Vinyl') AND x.uid='$UserID'"); @@ -51,8 +51,8 @@ //$DB->query('SELECT * FROM t'); $DB->query("SELECT GroupID FROM temp_sections_better_snatch - WHERE EncodingList NOT LIKE '%V0 (VBR)%' - OR EncodingList NOT LIKE '%V2 (VBR)%' + WHERE EncodingList NOT LIKE '%V0 (VBR)%' + OR EncodingList NOT LIKE '%V2 (VBR)%' OR EncodingList NOT LIKE '%320%'"); $GroupIDs = array_fill_keys($DB->collect('GroupID'), true); @@ -109,9 +109,9 @@ ?>
- Show all + Show all - Just those currently seeding + Just those currently seeding
@@ -183,7 +183,7 @@ - [ DL ] + DL
diff --git a/sections/better/transcode.php b/sections/better/transcode.php index 88b11398..78086e4f 100644 --- a/sections/better/transcode.php +++ b/sections/better/transcode.php @@ -173,15 +173,15 @@ > - [ DL ] + DL
- YES':'NO'?> - YES':'NO'?> - YES':'NO'?> + YES' : 'NO'?> + YES' : 'NO'?> + YES' : 'NO'?> query("SELECT t.GroupID, t.ID FROM torrents AS t - WHERE - t.Format='FLAC' + WHERE + t.Format='FLAC' AND ((t.LogScore = '100' AND t.Media = 'CD') OR t.Media = 'Vinyl') AND t.UserID='$UserID'"); @@ -35,8 +35,8 @@ //$DB->query('SELECT * FROM t'); $DB->query("SELECT GroupID FROM temp_sections_better_upload - WHERE EncodingList NOT LIKE '%V0 (VBR)%' - OR EncodingList NOT LIKE '%V2 (VBR)%' + WHERE EncodingList NOT LIKE '%V0 (VBR)%' + OR EncodingList NOT LIKE '%V2 (VBR)%' OR EncodingList NOT LIKE '%320%'"); $GroupIDs = $DB->collect('GroupID'); @@ -67,7 +67,7 @@ $DisplayName = ''; } $FlacID = $Uploads[$GroupID]['ID']; - + $DisplayName = ''; if(count($Artists)>0) { $DisplayName = Artists::display_artists(array('1'=>$Artists)); @@ -80,15 +80,15 @@ if($ExtraInfo) { $DisplayName.=' - '.$ExtraInfo; } - + $MissingEncodings = array('V0 (VBR)'=>1, 'V2 (VBR)'=>1, '320'=>1); - + foreach($Torrents as $Torrent) { if(!empty($MissingEncodings[$Torrent['Encoding']])) { $MissingEncodings[$Torrent['Encoding']] = 0; } } - + $TagList=array(); if($TorrentTags!='') { $TorrentTags=explode(' ',$TorrentTags); @@ -104,14 +104,14 @@ > - [ DL ] + DL - + - YES':'NO'?> - YES':'NO'?> - YES':'NO'?> + YES' : 'NO'?> + YES' : 'NO'?> + YES' : 'NO'?> diff --git a/sections/reportsv2/array.php b/sections/reportsv2/array.php index a02f97eb..1587f63c 100644 --- a/sections/reportsv2/array.php +++ b/sections/reportsv2/array.php @@ -108,8 +108,28 @@ 'delete' => '1', 'pm' => '[url=http://'.NONSSL_SITE_URL.'/rules.php?p=upload#h2.2]2.2[/url]. Your torrent was reported because it was trumped by another torrent.' ) + ), + 'private_trump' => array( + 'priority' => 21, + 'reason' => '1', + 'title' => 'Private Flag Trump', + 'report_messages' => array( + 'Please make sure you are reporting the torrent which has been trumped and should be deleted, not the torrent that you think should remain on site.' + ), + + 'report_fields' => array( + 'sitelink' => '1' + ), + + 'resolve_options' => array( + 'upload' => '0', + 'warn' => '0', + 'delete' => '1', + 'pm' => '' + ) ) ), + '1' => array( //Music Resolves 'tag_trump' => array ( 'priority' => '50', diff --git a/sections/staff/index.php b/sections/staff/index.php index 260689a3..a312ccf9 100644 --- a/sections/staff/index.php +++ b/sections/staff/index.php @@ -1,9 +1,9 @@ If you are looking for help with a general question, we appreciate it if you would only message through the staff inbox, where we can all help you.

You can do that by sending a message to the Staff Inbox.

- + true)); ?>

First-line Support

These users are not official staff members - they're users who have volunteered their time to help people in need. Please treat them with respect and read this before contacting them.

diff --git a/sections/staffpm/user_inbox.php b/sections/staffpm/user_inbox.php index 117714e0..ce0fd3dc 100644 --- a/sections/staffpm/user_inbox.php +++ b/sections/staffpm/user_inbox.php @@ -2,7 +2,7 @@ include(SERVER_ROOT.'/sections/staffpm/functions.php'); -View::show_header('Staff PMs', 'staffpm'); +View::show_header('Staff PMs', 'staffpm,jquery'); // Get messages $StaffPMs = $DB->query(" @@ -31,7 +31,7 @@

- + true)); ?>
delete_value('staff_pm_new_'.$LoggedUser['ID']); } - View::show_header('Staff PM', 'staffpm,bbcode'); + View::show_header('Staff PM', 'staffpm,bbcode,jquery'); $UserInfo = Users::user_info($UserID); $UserStr = Users::format_username($UserID, true, true, true, true); @@ -132,12 +132,14 @@ ?>

Reply

-
-
+ +
';" /> - + diff --git a/static/functions/lastfm.js b/static/functions/lastfm.js index eba18b33..3a4f24b6 100644 --- a/static/functions/lastfm.js +++ b/static/functions/lastfm.js @@ -85,7 +85,7 @@ getTopTracks(div); }); }); - + // Allow updating the sidebar element contents as get requests are completed. function updateDivContents(div) { var html = ""; @@ -110,18 +110,18 @@ $('#lastfm_loading').remove(); } } - + // Escape ampersands with url code to avoid breaking the search links function escapeAmpUrl(input){ return input.replace(/&/g,"%26"); } - + // Escape ampersands with html code to avoid breaking the search links function escapeHtml(input){ return input.replace(/&/g,"&").replace(/' + escapeHtml(j[i]['artist']['name']) + ' - ' + escapeHtml(j[i]['name']) + '' } - html+= '
  • [Expand]
    • ' + html+= '
  • Expand
    • ' } html += ''; html += ""; @@ -311,7 +311,7 @@ updateDivContents(div); }); } - + function getTopTracks(div) { $.get('user.php?action=lastfm_top_tracks&username=' + username, function (response) { var html; @@ -342,7 +342,7 @@ for (i = 3; i < j.length; i++) { html += '' } - html+= '
  • [Expand]
    • ' + html+= '
  • Expand
    • ' } html += ''; html += ""; diff --git a/static/styles/global.css b/static/styles/global.css index 45bf2c93..b65fa9e9 100644 --- a/static/styles/global.css +++ b/static/styles/global.css @@ -368,6 +368,10 @@ tr.torrent .bookmark>a:after { font-size: inherit; } +.preview_wrap { + text-align: left; +} + .text_preview { min-height: 100px }