Empty commit

This commit is contained in:
Git 2011-12-02 08:00:15 +00:00
parent 04768d6faa
commit 01c1412576
9 changed files with 18 additions and 15 deletions

View File

@ -2161,6 +2161,7 @@ function freeleech_torrents($TorrentIDs, $FreeNeutral = 1, $FreeLeechType = 0) {
list($TorrentID, $GroupID, $InfoHash) = $Torrent; list($TorrentID, $GroupID, $InfoHash) = $Torrent;
update_tracker('update_torrent', array('info_hash' => rawurlencode($InfoHash), 'freetorrent' => $FreeNeutral)); update_tracker('update_torrent', array('info_hash' => rawurlencode($InfoHash), 'freetorrent' => $FreeNeutral));
$Cache->delete_value('torrent_download_'.$TorrentID); $Cache->delete_value('torrent_download_'.$TorrentID);
write_log($LoggedUser['Username']." marked torrent ".$TorrentID." freeleech type ".$FreeLeechType."!");
} }
foreach($GroupIDs as $GroupID) { foreach($GroupIDs as $GroupID) {

BIN
ocelot-0.3.1.tar.bz2 Normal file

Binary file not shown.

Binary file not shown.

View File

@ -94,10 +94,11 @@
case '30': $SQL .= "t.Format='FLAC' AND t.Encoding='24bit Lossless' AND t.Media='Vinyl'"; break; case '30': $SQL .= "t.Format='FLAC' AND t.Encoding='24bit Lossless' AND t.Media='Vinyl'"; break;
case '31': $SQL .= "t.Format='FLAC' AND t.Encoding='24bit Lossless' AND t.Media='DVD'"; break; case '31': $SQL .= "t.Format='FLAC' AND t.Encoding='24bit Lossless' AND t.Media='DVD'"; break;
case '32': $SQL .= "t.Format='FLAC' AND t.Encoding='24bit Lossless' AND t.Media='SACD'"; break; case '32': $SQL .= "t.Format='FLAC' AND t.Encoding='24bit Lossless' AND t.Media='SACD'"; break;
case '33': $SQL .= "t.Format='FLAC' AND t.Encoding='Lossless' AND HasLog='1' AND LogScore='100' AND HasCue='1'"; break; case '33': $SQL .= "t.Format='FLAC' AND t.Encoding='24bit Lossless' AND t.Media='WEB'"; break;
case '34': $SQL .= "t.Format='FLAC' AND t.Encoding='Lossless' AND HasLog='1' AND LogScore='100'"; break; case '34': $SQL .= "t.Format='FLAC' AND t.Encoding='Lossless' AND HasLog='1' AND LogScore='100' AND HasCue='1'"; break;
case '35': $SQL .= "t.Format='FLAC' AND t.Encoding='Lossless' AND HasLog='1'"; break; case '35': $SQL .= "t.Format='FLAC' AND t.Encoding='Lossless' AND HasLog='1' AND LogScore='100'"; break;
case '36': $SQL .= "t.Format='FLAC' AND t.Encoding='Lossless'"; break; case '36': $SQL .= "t.Format='FLAC' AND t.Encoding='Lossless' AND HasLog='1'"; break;
case '37': $SQL .= "t.Format='FLAC' AND t.Encoding='Lossless'"; break;
case '40': $SQL .= "t.Format='DTS'"; break; case '40': $SQL .= "t.Format='DTS'"; break;
case '41': $SQL .= "t.Format='Ogg Vorbis'"; break; case '41': $SQL .= "t.Format='Ogg Vorbis'"; break;
case '42': $SQL .= "t.Format='AAC' AND t.Encoding='320'"; break; case '42': $SQL .= "t.Format='AAC' AND t.Encoding='320'"; break;

View File

@ -89,10 +89,11 @@
case '30': $SQL .= "t.Format='FLAC' AND t.Encoding='24bit Lossless' AND t.Media='Vinyl'"; break; case '30': $SQL .= "t.Format='FLAC' AND t.Encoding='24bit Lossless' AND t.Media='Vinyl'"; break;
case '31': $SQL .= "t.Format='FLAC' AND t.Encoding='24bit Lossless' AND t.Media='DVD'"; break; case '31': $SQL .= "t.Format='FLAC' AND t.Encoding='24bit Lossless' AND t.Media='DVD'"; break;
case '32': $SQL .= "t.Format='FLAC' AND t.Encoding='24bit Lossless' AND t.Media='SACD'"; break; case '32': $SQL .= "t.Format='FLAC' AND t.Encoding='24bit Lossless' AND t.Media='SACD'"; break;
case '33': $SQL .= "t.Format='FLAC' AND t.Encoding='Lossless' AND HasLog='1' AND LogScore='100' AND HasCue='1'"; break; case '33': $SQL .= "t.Format='FLAC' AND t.Encoding='24bit Lossless' AND t.Media='WEB'"; break;
case '34': $SQL .= "t.Format='FLAC' AND t.Encoding='Lossless' AND HasLog='1' AND LogScore='100'"; break; case '34': $SQL .= "t.Format='FLAC' AND t.Encoding='Lossless' AND HasLog='1' AND LogScore='100' AND HasCue='1'"; break;
case '35': $SQL .= "t.Format='FLAC' AND t.Encoding='Lossless' AND HasLog='1'"; break; case '35': $SQL .= "t.Format='FLAC' AND t.Encoding='Lossless' AND HasLog='1' AND LogScore='100'"; break;
case '36': $SQL .= "t.Format='FLAC' AND t.Encoding='Lossless'"; break; case '36': $SQL .= "t.Format='FLAC' AND t.Encoding='Lossless' AND HasLog='1'"; break;
case '37': $SQL .= "t.Format='FLAC' AND t.Encoding='Lossless'"; break;
case '40': $SQL .= "t.Format='DTS'"; break; case '40': $SQL .= "t.Format='DTS'"; break;
case '41': $SQL .= "t.Format='Ogg Vorbis'"; break; case '41': $SQL .= "t.Format='Ogg Vorbis'"; break;
case '42': $SQL .= "t.Format='AAC' AND t.Encoding='320'"; break; case '42': $SQL .= "t.Format='AAC' AND t.Encoding='320'"; break;

View File

@ -426,7 +426,7 @@
</li> </li>
<li id="r2.3.7"><a href="#h2.3"><strong>&uarr;_</strong></a> <a href="#r2.3.7">2.3.7.</a> <strong>The year of the original recording should be used for the upload page "Year" box.</strong> Use the recording year for "Year of the original release" (if you can establish it), and use the option to add the release year for the album or edition you are uploading in the <em>Edition information</em> on the uploads page. For example, all editions of <em>The Beatles (White Album)</em> would have 1968 in the main Year box. However, each of the various mono pressings, remasters, re-releases, expanded editions, reconstructions, etc. would have its respective release year in the <em>Edition Information</em> box. <li id="r2.3.7"><a href="#h2.3"><strong>&uarr;_</strong></a> <a href="#r2.3.7">2.3.7.</a> <strong>The year of the original recording should be used for the upload page "Year" box.</strong> Use the recording year for "Year of the original release" (if you can establish it), and use the option to add the release year for the album or edition you are uploading in the <em>Edition information</em> on the uploads page. For example, all editions of <em>The Beatles (White Album)</em> would have 1968 in the main Year box. However, each of the various mono pressings, remasters, re-releases, expanded editions, reconstructions, etc. would have its respective release year in the <em>Edition Information</em> box.
</li> </li>
<li id="r2.3.8"><a href="#h2.3"><strong>&uarr;_</strong></a> <a href="#r2.3.8">2.3.8.</a> <strong>All lossless analog rips should include clear information about source lineage.</strong> All lossless SACD digital layer analog rips and vinyl rips must include clear information about recording equipment used. If you used a USB turntable for vinyl, clearly indicate you have. Also include all intermediate steps up to lossless encoding, such as program used for mastering, sound card used, etc. Lossless analog rips missing rip information can be trumped by better documented lossless analog rips of comparable or better quality. In order to trump a lossless analog rip without a lineage, this lineage must be included as a .txt or .log file within the torrent. <li id="r2.3.8"><a href="#h2.3"><strong>&uarr;_</strong></a> <a href="#r2.3.8">2.3.8.</a> <strong>All lossless analog rips should include clear information about source lineage.</strong> All lossless SACD digital layer analog rips and vinyl rips must include clear information about recording equipment used. If you used a USB turntable for vinyl, clearly indicate that you have. Also include all intermediate steps up to lossless encoding, such as program used for mastering, sound card used, etc. Lossless analog rips missing rip information can be trumped by better documented lossless analog rips of comparable or better quality. In order to trump a lossless analog rip without a lineage, this lineage must be included as a .txt or .log file within the torrent.
</li> </li>
<li id="r2.3.9"><a href="#h2.3"><strong>&uarr;_</strong></a> <a href="#r2.3.9">2.3.9.</a> <strong>All lossless soundboard recordings must include clear information about source lineage.</strong> This information should be displayed in the torrent description. Optionally, the uploader may include the information in a .txt or .log file within the torrent. Lossless soundboard recordings missing lineage information will be deleted if reported. <li id="r2.3.9"><a href="#h2.3"><strong>&uarr;_</strong></a> <a href="#r2.3.9">2.3.9.</a> <strong>All lossless soundboard recordings must include clear information about source lineage.</strong> This information should be displayed in the torrent description. Optionally, the uploader may include the information in a .txt or .log file within the torrent. Lossless soundboard recordings missing lineage information will be deleted if reported.
</li> </li>

View File

@ -17,7 +17,7 @@ function get_fls() {
JOIN users_main AS m ON m.ID=i.UserID JOIN users_main AS m ON m.ID=i.UserID
JOIN permissions AS p ON p.ID=m.PermissionID JOIN permissions AS p ON p.ID=m.PermissionID
WHERE p.DisplayStaff!='1' AND i.SupportFor!=''"); WHERE p.DisplayStaff!='1' AND i.SupportFor!=''");
$FLS = $DB->to_array(false, MYSQLI_BOTH, array(4)); $FLS = $DB->to_array(false, MYSQLI_BOTH, array(3,'Paranoia'));
$Cache->cache_value('fls', $FLS, 180); $Cache->cache_value('fls', $FLS, 180);
} }
return $FLS; return $FLS;
@ -43,7 +43,7 @@ function get_forum_staff() {
WHERE p.DisplayStaff='1' WHERE p.DisplayStaff='1'
AND p.Level < 700 AND p.Level < 700
ORDER BY p.Level, m.LastAccess ASC"); ORDER BY p.Level, m.LastAccess ASC");
$ForumStaff = $DB->to_array(false, MYSQLI_BOTH, array(4)); $ForumStaff = $DB->to_array(false, MYSQLI_BOTH, array(3,'Paranoia'));
$Cache->cache_value('forum_staff', $ForumStaff, 180); $Cache->cache_value('forum_staff', $ForumStaff, 180);
} }
return $ForumStaff; return $ForumStaff;
@ -70,7 +70,7 @@ function get_staff() {
WHERE p.DisplayStaff='1' WHERE p.DisplayStaff='1'
AND p.Level >= 700 AND p.Level >= 700
ORDER BY p.Level, m.LastAccess ASC"); ORDER BY p.Level, m.LastAccess ASC");
$Staff = $DB->to_array(false, MYSQLI_BOTH, array(4)); $Staff = $DB->to_array(false, MYSQLI_BOTH, array(4,'Paranoia'));
$Cache->cache_value('staff', $Staff, 180); $Cache->cache_value('staff', $Staff, 180);
} }
return $Staff; return $Staff;

View File

@ -7,7 +7,7 @@
$DB->query("SELECT Subject, UserID, Level, AssignedToUser, Unread, Status FROM staff_pm_conversations WHERE ID=$ConvID"); $DB->query("SELECT Subject, UserID, Level, AssignedToUser, Unread, Status FROM staff_pm_conversations WHERE ID=$ConvID");
list($Subject, $UserID, $Level, $AssignedToUser, $Unread, $Status) = $DB->next_record(); list($Subject, $UserID, $Level, $AssignedToUser, $Unread, $Status) = $DB->next_record();
if (!(($UserID == $LoggedUser['ID']) || ($AssignedToUser == $LoggedUser['ID']) || (($Level > 0 && $Level < $LoggedUser['Class']) || ($Level == 0 && $IsFLS)))) { if (!(($UserID == $LoggedUser['ID']) || ($AssignedToUser == $LoggedUser['ID']) || (($Level > 0 && $Level <= $LoggedUser['Class']) || ($Level == 0 && $IsFLS)))) {
// User is trying to view someone else's conversation // User is trying to view someone else's conversation
error(403); error(403);
} }

View File

@ -1,7 +1,7 @@
//Using this instead of comments as comments has pertty damn strict requirements on the variable names required //Using this instead of comments as comments has pertty damn strict requirements on the variable names required
function Quick_Preview() { function Quick_Preview() {
$('#buttons').raw().innerHTML = "<input type='button' value='Editor' onclick='Quick_Edit();' /><input type='submit' value='Send Message!' />"; $('#buttons').raw().innerHTML = "<input type='button' value='Editor' onclick='Quick_Edit();' /><input type='submit' value='Send Message' />";
ajax.post("ajax.php?action=preview","messageform", function(response){ ajax.post("ajax.php?action=preview","messageform", function(response){
$('#quickpost').hide(); $('#quickpost').hide();
$('#preview').raw().innerHTML = response; $('#preview').raw().innerHTML = response;
@ -10,7 +10,7 @@ function Quick_Preview() {
} }
function Quick_Edit() { function Quick_Edit() {
$('#buttons').raw().innerHTML = "<input type='button' value='Preview' onclick='Quick_Preview();' /><input type='submit' value='Send Message!' />"; $('#buttons').raw().innerHTML = "<input type='button' value='Preview' onclick='Quick_Preview();' /><input type='submit' value='Send Message' />";
$('#preview').hide(); $('#preview').hide();
$('#quickpost').show(); $('#quickpost').show();
} }