diff --git a/classes/script_start.php b/classes/script_start.php
index 3d821503..a3c0d67c 100644
--- a/classes/script_start.php
+++ b/classes/script_start.php
@@ -2161,6 +2161,7 @@ function freeleech_torrents($TorrentIDs, $FreeNeutral = 1, $FreeLeechType = 0) {
list($TorrentID, $GroupID, $InfoHash) = $Torrent;
update_tracker('update_torrent', array('info_hash' => rawurlencode($InfoHash), 'freetorrent' => $FreeNeutral));
$Cache->delete_value('torrent_download_'.$TorrentID);
+ write_log($LoggedUser['Username']." marked torrent ".$TorrentID." freeleech type ".$FreeLeechType."!");
}
foreach($GroupIDs as $GroupID) {
diff --git a/ocelot-0.3.1.tar.bz2 b/ocelot-0.3.1.tar.bz2
new file mode 100644
index 00000000..2c3df812
Binary files /dev/null and b/ocelot-0.3.1.tar.bz2 differ
diff --git a/ocelot-0.3.tar.bz2 b/ocelot-0.3.tar.bz2
deleted file mode 100644
index 81024272..00000000
Binary files a/ocelot-0.3.tar.bz2 and /dev/null differ
diff --git a/sections/artist/download.php b/sections/artist/download.php
index 2afabb3e..3e97cccb 100644
--- a/sections/artist/download.php
+++ b/sections/artist/download.php
@@ -94,10 +94,11 @@
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 '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 '34': $SQL .= "t.Format='FLAC' AND t.Encoding='Lossless' AND HasLog='1' AND LogScore='100'"; break;
- case '35': $SQL .= "t.Format='FLAC' AND t.Encoding='Lossless' AND HasLog='1'"; break;
- case '36': $SQL .= "t.Format='FLAC' AND t.Encoding='Lossless'"; 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' AND HasCue='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' AND HasLog='1'"; break;
+ case '37': $SQL .= "t.Format='FLAC' AND t.Encoding='Lossless'"; break;
case '40': $SQL .= "t.Format='DTS'"; break;
case '41': $SQL .= "t.Format='Ogg Vorbis'"; break;
case '42': $SQL .= "t.Format='AAC' AND t.Encoding='320'"; break;
diff --git a/sections/collages/download.php b/sections/collages/download.php
index b4b03a4e..4a46b6a2 100644
--- a/sections/collages/download.php
+++ b/sections/collages/download.php
@@ -89,10 +89,11 @@
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 '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 '34': $SQL .= "t.Format='FLAC' AND t.Encoding='Lossless' AND HasLog='1' AND LogScore='100'"; break;
- case '35': $SQL .= "t.Format='FLAC' AND t.Encoding='Lossless' AND HasLog='1'"; break;
- case '36': $SQL .= "t.Format='FLAC' AND t.Encoding='Lossless'"; 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' AND HasCue='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' AND HasLog='1'"; break;
+ case '37': $SQL .= "t.Format='FLAC' AND t.Encoding='Lossless'"; break;
case '40': $SQL .= "t.Format='DTS'"; break;
case '41': $SQL .= "t.Format='Ogg Vorbis'"; break;
case '42': $SQL .= "t.Format='AAC' AND t.Encoding='320'"; break;
diff --git a/sections/rules/upload.php b/sections/rules/upload.php
index d900413a..749f9360 100644
--- a/sections/rules/upload.php
+++ b/sections/rules/upload.php
@@ -426,7 +426,7 @@
↑_2.3.7.The year of the original recording should be used for the upload page "Year" box. 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 Edition information on the uploads page. For example, all editions of The Beatles (White Album) 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 Edition Information box.
-
↑_2.3.8.All lossless analog rips should include clear information about source lineage. 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.
+
↑_2.3.8.All lossless analog rips should include clear information about source lineage. 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.
↑_2.3.9.All lossless soundboard recordings must include clear information about source lineage. 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.
diff --git a/sections/staff/functions.php b/sections/staff/functions.php
index 203da8f4..24040e76 100644
--- a/sections/staff/functions.php
+++ b/sections/staff/functions.php
@@ -17,7 +17,7 @@ function get_fls() {
JOIN users_main AS m ON m.ID=i.UserID
JOIN permissions AS p ON p.ID=m.PermissionID
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);
}
return $FLS;
@@ -43,7 +43,7 @@ function get_forum_staff() {
WHERE p.DisplayStaff='1'
AND p.Level < 700
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);
}
return $ForumStaff;
@@ -70,7 +70,7 @@ function get_staff() {
WHERE p.DisplayStaff='1'
AND p.Level >= 700
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);
}
return $Staff;
diff --git a/sections/staffpm/viewconv.php b/sections/staffpm/viewconv.php
index fc2fcab8..2c1d5029 100644
--- a/sections/staffpm/viewconv.php
+++ b/sections/staffpm/viewconv.php
@@ -7,7 +7,7 @@
$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();
- 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
error(403);
}
diff --git a/static/functions/inbox.js b/static/functions/inbox.js
index 602b0369..4fda69ab 100644
--- a/static/functions/inbox.js
+++ b/static/functions/inbox.js
@@ -1,7 +1,7 @@
//Using this instead of comments as comments has pertty damn strict requirements on the variable names required
function Quick_Preview() {
- $('#buttons').raw().innerHTML = "";
+ $('#buttons').raw().innerHTML = "";
ajax.post("ajax.php?action=preview","messageform", function(response){
$('#quickpost').hide();
$('#preview').raw().innerHTML = response;
@@ -10,7 +10,7 @@ function Quick_Preview() {
}
function Quick_Edit() {
- $('#buttons').raw().innerHTML = "";
+ $('#buttons').raw().innerHTML = "";
$('#preview').hide();
$('#quickpost').show();
}