diff --git a/classes/class_text.php b/classes/class_text.php index 425eb964..5109389a 100644 --- a/classes/class_text.php +++ b/classes/class_text.php @@ -123,7 +123,9 @@ function local_url($Str) { $URLInfo = parse_url($Str); if(!$URLInfo) { return false; } $Host = $URLInfo['host']; - if($Host == NONSSL_SITE_URL || $Host == SSL_SITE_URL || $Host == 'www.'.NONSSL_SITE_URL) { + // If for some reason your site does not require subdomains or contains a directory in the SITE_URL, revert to the line below. + //if($Host == NONSSL_SITE_URL || $Host == SSL_SITE_URL || $Host == 'www.'.NONSSL_SITE_URL) { + if(preg_match('/(\S+\.)*'.NONSSL_SITE_URL.'/', $Host)) { $URL = $URLInfo['path']; if(!empty($URLInfo['query'])) { $URL.='?'.$URLInfo['query']; diff --git a/classes/class_torrent_form.php b/classes/class_torrent_form.php index 662d3e9a..7c45a461 100644 --- a/classes/class_torrent_form.php +++ b/classes/class_torrent_form.php @@ -117,7 +117,12 @@ function foot() { Freeleech - /> Checking this box will make the torrent freeleech. Don't abuse it. + diff --git a/classes/script_start.php b/classes/script_start.php index c2ca6c69..4d544af4 100644 --- a/classes/script_start.php +++ b/classes/script_start.php @@ -51,6 +51,7 @@ $Debug = new DEBUG; $Debug->handle_errors(); +$Debug->set_flag('Debug constructed'); $DB = new DB_MYSQL; $Cache = new CACHE; @@ -390,9 +391,16 @@ function site_ban_ip($IP) { $IP = ip2unsigned($IP); $IPBans = $Cache->get_value('ip_bans'); if(!is_array($IPBans)) { - $DB->query("SELECT ID, FromIP, ToIP FROM ip_bans"); - $IPBans = $DB->to_array('ID'); - $Cache->cache_value('ip_bans', $IPBans, 0); + //Cache lock! + $Lock = $Cache->get_value('ip_bans_lock'); + if($Lock) { + ?>cache_value('ip_bans_lock', '1', 10); + $DB->query("SELECT ID, FromIP, ToIP FROM ip_bans"); + $IPBans = $DB->to_array('ID'); + $Cache->cache_value('ip_bans', $IPBans, 0); + } } foreach($IPBans as $Index => $IPBan) { list($ID, $FromIP, $ToIP) = $IPBan; @@ -1646,7 +1654,8 @@ function update_sphinx_requests($RequestID) { UNIX_TIMESTAMP(TimeFilled) AS TimeFilled, Visible, COUNT(rv.UserID) AS Votes, SUM(rv.Bounty) >> 10 AS Bounty FROM requests AS r LEFT JOIN requests_votes AS rv ON rv.RequestID=r.ID - WHERE ID = ".$RequestID); + wHERE ID = ".$RequestID." + GROUP BY r.ID"); $DB->query("UPDATE sphinx_requests_delta SET ArtistList = (SELECT @@ -1696,7 +1705,8 @@ function torrent_info($Data) { if(!empty($Data['HasCue'])) { $Info[]='Cue'; } if(!empty($Data['Media'])) { $Info[]=$Data['Media']; } if(!empty($Data['Scene'])) { $Info[]='Scene'; } - if(!empty($Data['FreeTorrent'])) { $Info[]='Freeleech!'; } + if($Data['FreeTorrent'] == '1') { $Info[]='Freeleech!'; } + if($Data['FreeTorrent'] == '2') { $Info[]='Neutral Leech!'; } return implode(' / ', $Info); } @@ -1762,6 +1772,15 @@ function disable_users($UserIDs, $AdminComment, $BanReason = 1) { */ $Cache->delete_value('enabled_'.$UserID); $Cache->delete_value('user_info_'.$UserID); + $Cache->delete_value('user_info_heavy_'.$UserID); + $Cache->delete_value('user_stats_'.$UserID); + + $DB->query("SELECT SessionID FROM users_sessions WHERE UserID='$UserID'"); + while(list($SessionID) = $DB->next_record()) { + $Cache->delete_value('session_'.$UserID.'_'.$SessionID); + } + $Cache->delete_value('users_sessions_'.$UserID); + $DB->query("DELETE FROM users_sessions WHERE UserID='$UserID'"); } $DB->query("SELECT torrent_pass FROM users_main WHERE ID in (".implode(", ",$UserIDs).")"); $PassKeys = $DB->collect('torrent_pass'); diff --git a/defer-bug.php b/defer-bug.php deleted file mode 100644 index 54556110..00000000 --- a/defer-bug.php +++ /dev/null @@ -1,87 +0,0 @@ -", - '€','‚','ƒ','„','…','†','‡','ˆ','‰','Š','‹','Œ','Ž','‘','’','“','”','•','–','—','˜','™','š','›','œ','ž','Ÿ' - ); - - $With=array( - ''','"','<','>', - '€','‚','ƒ','„','…','†','‡','ˆ','‰','Š','‹','Œ','Ž','‘','’','“','”','•','–','—','˜','™','š','›','œ','ž','Ÿ' - ); - - $Str=str_replace($Replace,$With,$Str); - } - return $Str; -} - -require('classes/class_useragent.php'); //Require the useragent class -$UA = new USER_AGENT; -$Browser = $UA->browser($_SERVER['HTTP_USER_AGENT']); -$OperatingSystem = $UA->operating_system($_SERVER['HTTP_USER_AGENT']); -?> - - - - <script> Defer Bug - - - -

Defer bug test (Gecko 1.9.2+)

-

This page showcases issues with browsers and defer loading with the preservation of content order.

-

As one can see in this demo, the implementation of the HTML5 changes to <script defer> (1) has resulted in several small issues, originating from the way this has been used historically. Up until the past year, javascript execution has been painfully slow, to an extent that things like Google Analytics advised the placement of their javascript in file footers (a contradiction to another part of the spec). The defer attribute has been used in such cases to allowe ECMAScript to remain in the correct inclusion location without blocking the download of content or the rendering of the webpage. This lowered the percieved load time, the most important number in web development (notably for encouraging users to return). Because of this change however, not only has this percieved performance gain been sacrificed, but a relatively serious backwords compatibility issue for sites using defer in their natural code execution pattern.

-

Because of this combination of breaking various script loading patterns, a decrease in user percieved performance, the fact that all other browsers thus far have opted out of this adaptation of the spec, and the resulting encouragement this would give web developers to include scripts outside the page header; I am humbly noting that this additional 'clarification' contained in the HTML5 spec is flawed in nature and should be reverted to it's prior method.

- Browser Info - -

To clarify for the confused: if you get the alert, your browser has this bug, if you do not get the alert, your browser is working fine.

- - - diff --git a/gazelle.sql b/gazelle.sql index c4219834..6d0d5c04 100644 --- a/gazelle.sql +++ b/gazelle.sql @@ -759,7 +759,7 @@ CREATE TABLE `torrents` ( `Leechers` int(6) NOT NULL DEFAULT '0', `Seeders` int(6) NOT NULL DEFAULT '0', `last_action` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - `FreeTorrent` enum('0','1') NOT NULL DEFAULT '0', + `FreeTorrent` enum('0','1','2') NOT NULL DEFAULT '0', `FreeLeechType` enum('0','1','2','3') NOT NULL DEFAULT '0', `Dupable` enum('0','1') NOT NULL DEFAULT '0', `DupeReason` varchar(40) DEFAULT NULL, diff --git a/sections/artist/artist.php b/sections/artist/artist.php index 10c55df8..5e9c66ad 100644 --- a/sections/artist/artist.php +++ b/sections/artist/artist.php @@ -580,7 +580,7 @@ function compare($X, $Y){ $TagName) { - $TagList[] = "".display_str($TagName).""; + $TagList[] = "".display_str($TagName).""; } $TagList = implode(', ', $TagList); ?> diff --git a/sections/artist/artist_rearrange.php b/sections/artist/artist_rearrange.php index 93378378..774c3d3f 100644 --- a/sections/artist/artist_rearrange.php +++ b/sections/artist/artist_rearrange.php @@ -456,67 +456,7 @@ function display_name($ReleaseType) { -if(check_perms('zip_downloader')){ - if(isset($LoggedUser['Collector'])) { - list($ZIPList,$ZIPPrefs) = $LoggedUser['Collector']; - $ZIPList = explode(':',$ZIPList); - } else { - $ZIPList = array('00','11'); - $ZIPPrefs = 1; - } -?> -
-
Collector
-
-
- - - -
    - -
  • - - - [X] -
    -
    • - -
- - - - -
-
-
- ?>
Tags
@@ -665,7 +605,7 @@ function display_name($ReleaseType) { $TagName) { - $TagList[] = "".display_str($TagName).""; + $TagList[] = "".display_str($TagName).""; } $TagList = implode(', ', $TagList); ?> diff --git a/sections/artist/download.php b/sections/artist/download.php index 258a6143..3aeeb985 100644 --- a/sections/artist/download.php +++ b/sections/artist/download.php @@ -27,7 +27,7 @@ SQL template: SELECT CASE - WHEN t.Format='Ogg' THEN 0 + WHEN t.Format='Ogg Vorbis' THEN 0 WHEN t.Format='MP3' AND t.Encoding='V0 (VBR)' THEN 1 WHEN t.Format='MP3' AND t.Encoding='V2 (VBR)' THEN 2 ELSE 100 @@ -91,7 +91,7 @@ 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 '40': $SQL .= "t.Format='DTS'"; break; - case '41': $SQL .= "t.Format='Ogg'"; break; + case '41': $SQL .= "t.Format='Ogg Vorbis'"; break; case '42': $SQL .= "t.Format='AAC' AND t.Encoding='320'"; break; case '43': $SQL .= "t.Format='AAC' AND t.Encoding='256'"; break; case '44': $SQL .= "t.Format='AAC' AND t.Encoding='q5.5'"; break; diff --git a/sections/better/better.php b/sections/better/better.php index fd615551..9bc106db 100644 --- a/sections/better/better.php +++ b/sections/better/better.php @@ -86,6 +86,14 @@ Torrents that have been marked as having 'Bad File Names'. + + + Single seeded FLAC torrents + + + FLAC torrents that only have one seeder, show them some love! + +
diff --git a/sections/better/index.php b/sections/better/index.php index 288c14fa..0e021cd0 100644 --- a/sections/better/index.php +++ b/sections/better/index.php @@ -7,6 +7,9 @@ case 'transcode': include(SERVER_ROOT.'/sections/better/transcode.php'); break; + case 'single': + include(SERVER_ROOT.'/sections/better/single.php'); + break; case 'snatch': include(SERVER_ROOT.'/sections/better/snatch.php'); break; diff --git a/sections/better/single.php b/sections/better/single.php new file mode 100644 index 00000000..edcaf359 --- /dev/null +++ b/sections/better/single.php @@ -0,0 +1,50 @@ +get_value('better_single_groupids')) === false) { + $DB->query("SELECT t.ID AS TorrentID, + t.GroupID AS GroupID + FROM xbt_files_users AS x + JOIN torrents AS t ON t.ID=x.fid + WHERE t.Format='FLAC' + GROUP BY x.fid + HAVING COUNT(x.uid) = 1 + ORDER BY t.LogScore DESC, t.Time ASC LIMIT 30"); + + $GroupIDs = $DB->to_array('GroupID'); + $Cache->cache_value('better_single_groupids', $GroupIDs, 30*60); +} + +$Results = get_groups(array_keys($GroupIDs)); + +show_header('Single seeder FLACs'); +?> +
+ + + + +$Group) { + list($GroupID, $GroupName, $GroupYear, $GroupRecordLabel, $GroupCatalogueNumber, $TagList, $ReleaseType, $Torrents, $Artists) = array_values($Group); + $FlacID = $GroupIDs[$GroupID]['TorrentID']; + + $DisplayName = ''; + if(count($Artists)>0) { + $DisplayName = display_artists(array('1'=>$Artists)); + } + $DisplayName.=''.$GroupName.''; + if($GroupYear>0) { $DisplayName.=" [".$GroupYear."]"; } + +?> + + + + +
Torrent
+ + [DL] +
+
+ diff --git a/sections/better/transcode.php b/sections/better/transcode.php index c046f814..856c8d3b 100644 --- a/sections/better/transcode.php +++ b/sections/better/transcode.php @@ -20,7 +20,7 @@ $Query.=' @(groupname,artistname,yearfulltext) '.$SS->EscapeString($_GET['search']); } -$SS->SetFilter('logscore', array(100));// +$SS->SetFilter('logscore', array(100)); $SS->SetSortMode(SPH_SORT_EXTENDED, "@random"); $SS->limit(0, TORRENTS_PER_PAGE); diff --git a/sections/bookmarks/torrents.php b/sections/bookmarks/torrents.php index d28a6531..a7f9386a 100644 --- a/sections/bookmarks/torrents.php +++ b/sections/bookmarks/torrents.php @@ -227,7 +227,7 @@ function compare($X, $Y){ $DisplayName .= $GroupName; if($GroupYear>0) { $DisplayName = $DisplayName. ' ['. $GroupYear .']';} ?> - +
  • <?=$DisplayName?> @@ -235,7 +235,7 @@ function compare($X, $Y){
    - +

    • 's Bookmarks

    - [Remove Snatched] + [Remove Snatched]
    - - - - - - - - - - -
    +
      + + +
    + +
    diff --git a/sections/collages/download.php b/sections/collages/download.php index c4d01cb6..854f8d4a 100644 --- a/sections/collages/download.php +++ b/sections/collages/download.php @@ -26,7 +26,7 @@ SQL template: SELECT CASE - WHEN t.Format='Ogg' THEN 0 + WHEN t.Format='Ogg Vorbis' THEN 0 WHEN t.Format='MP3' AND t.Encoding='V0 (VBR)' THEN 1 WHEN t.Format='MP3' AND t.Encoding='V2 (VBR)' THEN 2 ELSE 100 @@ -91,7 +91,7 @@ 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 '40': $SQL .= "t.Format='DTS'"; break; - case '41': $SQL .= "t.Format='Ogg'"; break; + case '41': $SQL .= "t.Format='Ogg Vorbis'"; break; case '42': $SQL .= "t.Format='AAC' AND t.Encoding='320'"; break; case '43': $SQL .= "t.Format='AAC' AND t.Encoding='256'"; break; case '44': $SQL .= "t.Format='AAC' AND t.Encoding='q5.5'"; break; diff --git a/sections/index/private.php b/sections/index/private.php index f918c307..5cb27560 100644 --- a/sections/index/private.php +++ b/sections/index/private.php @@ -44,8 +44,8 @@
    <?=display_artists($Artists, false, false)?> - <?=$FeaturedAlbum['Name']?>
    Discuss this album here!
    - +
    Latest blog posts
    diff --git a/sections/reportsv2/array.php b/sections/reportsv2/array.php index c6cfb51e..51439b84 100644 --- a/sections/reportsv2/array.php +++ b/sections/reportsv2/array.php @@ -717,7 +717,7 @@ 'upload' => '0', 'warn' => '1', 'delete' => '1', - 'pm' => 'Tutorials on how to use features of applications, musical instruments or computer hardware are the only allowed topics for eLearning Videos.' + 'pm' => 'Tutorials on how to use musical instruments, vocal training, producing music or otherwise learning the theory and practice of music are the only allowed topics.' ) ) ), diff --git a/sections/requests/requests.php b/sections/requests/requests.php index c2f3723e..dc85e0f5 100644 --- a/sections/requests/requests.php +++ b/sections/requests/requests.php @@ -428,7 +428,7 @@
    - + @@ -680,7 +681,7 @@ function header_link($SortKey,$DefaultWay="desc") { } else { $DisplayName=''; } - $DisplayName.=''.$GroupName.'‎'; + $DisplayName.=''.$GroupName.''; if($GroupYear>0) { $DisplayName.=" [".$GroupYear."]"; } ?> @@ -748,7 +749,6 @@ function header_link($SortKey,$DefaultWay="desc") { $Pass = true; } } - if(!empty($_GET['format'])) { $Filter = true; if($Data['Format']==$_GET['format']) { diff --git a/sections/torrents/details.php b/sections/torrents/details.php index 765613a7..967d884c 100644 --- a/sections/torrents/details.php +++ b/sections/torrents/details.php @@ -30,7 +30,7 @@ function compare($X, $Y){ $Artists = get_artist($GroupID); if($Artists) { - $DisplayName = display_artists($Artists, true).$DisplayName.'‎'; + $DisplayName = ''.display_artists($Artists, true).$DisplayName.''; $AltName = display_str(display_artists($Artists, false)).$AltName; $Title = $AltName; } @@ -366,7 +366,8 @@ function filelist($Str) { if(!$ExtraInfo) { $ExtraInfo = $GroupName ; $AddExtra=' / '; } - if($FreeTorrent) { $ExtraInfo.=$AddExtra.'Freeleech!'; $AddExtra=' / '; } + if($FreeTorrent == '1') { $ExtraInfo.=$AddExtra.'Freeleech!'; $AddExtra=' / '; } + if($FreeTorrent == '2') { $ExtraInfo.=$AddExtra.'Neutral Leech!'; $AddExtra=' / '; } if($Reported) { $ExtraInfo.=$AddExtra.'Reported'; $AddExtra=' / '; } if(!empty($BadTags)) { $ExtraInfo.=$AddExtra.'Bad Tags'; $AddExtra=' / '; } if(!empty($BadFolders)) { $ExtraInfo.=$AddExtra.'Bad Folders'; $AddExtra=' / '; } diff --git a/sections/torrents/editgroup.php b/sections/torrents/editgroup.php index bef134a0..9d347701 100644 --- a/sections/torrents/editgroup.php +++ b/sections/torrents/editgroup.php @@ -85,7 +85,7 @@ @@ -105,8 +105,9 @@ diff --git a/sections/torrents/merge.php b/sections/torrents/merge.php index 2837b1fd..532b9e0a 100644 --- a/sections/torrents/merge.php +++ b/sections/torrents/merge.php @@ -76,8 +76,7 @@ $Cache->delete_value('artist_'.$ArtistID); } - $Cache->delete_value('torrentcomments_count_'.$GroupID); - $Cache->delete_value('torrentcomment_'.$GroupID.'_page_1'); + $Cache->delete_value('torrent_comments_'.$GroupID.'_catalogue_0'); $Cache->delete_value('groups_artists_'.$GroupID); update_hash($GroupID); diff --git a/sections/torrents/nonwikiedit.php b/sections/torrents/nonwikiedit.php index 839555fb..3857ba1e 100644 --- a/sections/torrents/nonwikiedit.php +++ b/sections/torrents/nonwikiedit.php @@ -17,8 +17,14 @@ } -if(check_perms('torrents_freeleech') && (isset($_POST['freeleech']) xor isset($_POST['unfreeleech']))) { - $Free = $_POST['freeleech'] ? '1' : '0'; +if(check_perms('torrents_freeleech') && (isset($_POST['freeleech']) xor isset($_POST['neutralleech']) xor isset($_POST['unfreeleech']))) { + if(isset($_POST['freeleech'])) { + $Free = 1; + } elseif(isset($_POST['neutralleech'])) { + $Free = 2; + } else { + $Free = 0; + } $DB->query("SELECT info_hash FROM torrents WHERE GroupID = ".$GroupID); $InfoHashes = $DB->collect('info_hash', false); foreach($InfoHashes as $InfoHash) { diff --git a/sections/torrents/takeedit.php b/sections/torrents/takeedit.php index cfa860b0..79404fc8 100644 --- a/sections/torrents/takeedit.php +++ b/sections/torrents/takeedit.php @@ -55,7 +55,11 @@ $Properties['GroupDescription'] = $_POST['album_desc']; } if(check_perms('torrents_freeleech')) { - $Properties['FreeLeech'] = (isset($_POST['freeleech'])) ? 1 : 0; + $Free = (int)$_POST['freeleech']; + if(!in_array($Free, array(0,1,2))) { + error(404); + } + $Properties['FreeLeech'] = $Free; } $Properties['ExtendedGrace'] = (isset($_POST['extendedgrace']))? 1 : 0; @@ -312,8 +316,9 @@ WHERE ID=$TorrentID "; $DB->query($SQL); + if(check_perms('torrents_freeleech') && $Properties['FreeLeech'] != $CurFreeLeech) { - update_tracker('update_torrent', array('info_hash' => rawurlencode($InfoHash), 'freetorrent' => $Properties['FreeLeech'] ? '1' : '0')); + update_tracker('update_torrent', array('info_hash' => rawurlencode($InfoHash), 'freetorrent' => $Properties['FreeLeech'])); } $DB->query("SELECT GroupID, Time FROM torrents WHERE ID='$TorrentID'"); diff --git a/sections/torrents/user.php b/sections/torrents/user.php index bdeb563d..dd90cf30 100644 --- a/sections/torrents/user.php +++ b/sections/torrents/user.php @@ -156,16 +156,14 @@ function header_link($SortKey,$DefaultWay="DESC") { if(!empty($_GET['filter']) && (($_GET['filter'] == "perfectflac") || ($_GET['filter'] == "uniquegroup"))) { if($_GET['filter'] == "perfectflac") { if (!check_paranoia('perfectflacs', $User['Paranoia'], $UserClass, $UserID)) { error(403); } - $ExtraWhere .= ' AND t.Format = \'FLAC\''; + $ExtraWhere .= " AND t.Format = 'FLAC'"; if(empty($_GET['media'])) { - $ExtraWhere .= ' AND ( + $ExtraWhere .= " AND ( t.LogScore = 100 OR - t.Media = \'Vinyl\' OR - t.Media = \'WEB\' OR - t.Media = \'DVD\' OR - t.Media = \'Soundboard\')'; + t.Media IN ('Vinyl','WEB','DVD','Soundboard','Casette','SACD','Blu-ray','DAT') + )"; } elseif(strtoupper($_GET['media']) == 'CD' && empty($_GET['log'])) { - $ExtraWhere .= ' AND t.LogScore = 100'; + $ExtraWhere .= " AND t.LogScore = 100"; } } elseif($_GET['filter'] == "uniquegroup") { if (!check_paranoia('uniquegroups', $User['Paranoia'], $UserClass, $UserID)) { error(403); } diff --git a/sections/upload/upload_handle.php b/sections/upload/upload_handle.php index 2e4a4a6b..aa7a9075 100644 --- a/sections/upload/upload_handle.php +++ b/sections/upload/upload_handle.php @@ -102,6 +102,10 @@ $Validate->SetFields('album_desc', '1','string','The album description has a minimum length of 10 characters.',array('maxlength'=>1000000, 'minlength'=>10)); + + if ($Properties['Media'] == 'CD' && !$Properties['Remastered']) { + $Validate->SetFields('year', '1', 'number', 'You have selected a year for an album that predates the media you say it was created on.', array('minlength'=>1982)); + } } if($Properties['Remastered'] && !$Properties['UnknownRelease']){ @@ -112,8 +116,8 @@ '0','number','Invalid remaster year.'); } - if ($Properties['Remastered'] && $Properties['RemasterYear'] < 1982 && $Properties['Media'] == 'CD' && !$Properties['UnknownRelease']) { - $Validate->SetFields('remaster_year', '1', 'number', 'You have selected a year for an album that predates the media you say it was created on.'); + if ($Properties['Media'] == 'CD' && $Properties['Remastered']) { + $Validate->SetFields('remaster_year', '1', 'number', 'You have selected a year for an album that predates the media you say it was created on.', array('minlength'=>1982)); } $Validate->SetFields('remaster_title', @@ -620,7 +624,7 @@ $Cache->increment('stats_torrent_count'); $TorrentID = $DB->inserted_id(); -update_tracker('add_torrent', array('id' => $TorrentID, 'info_hash' => rawurlencode($InfoHash), 'freetorrent' => '0')); +update_tracker('add_torrent', array('id' => $TorrentID, 'info_hash' => rawurlencode($InfoHash), 'freetorrent' => (int)$Properties['FreeLeech'])); diff --git a/sections/user/deleteinvite.php b/sections/user/deleteinvite.php index 974a1cf2..3f247d70 100644 --- a/sections/user/deleteinvite.php +++ b/sections/user/deleteinvite.php @@ -9,11 +9,15 @@ $DB->query("DELETE FROM invites WHERE InviteKey='$InviteKey'"); if(!check_perms('site_send_unlimited_invites')){ - $DB->query("UPDATE users_main SET Invites=Invites+1 WHERE ID='$UserID'"); - $Cache->begin_transaction('user_info_heavy_'.$UserID); - $Cache->update_row(false, array('Invites'=>'+1')); - $Cache->commit_transaction(0); + $DB->query("SELECT Invites FROM users_main WHERE ID = ".$UserID." LIMIT 1"); + list($Invites) = $DB->next_record(); + if($Invites < 10) { + $DB->query("UPDATE users_main SET Invites=Invites+1 WHERE ID='$UserID'"); + $Cache->begin_transaction('user_info_heavy_'.$UserID); + $Cache->update_row(false, array('Invites'=>'+1')); + $Cache->commit_transaction(0); + } } header('Location: user.php?action=invite'); -?> \ No newline at end of file +?> diff --git a/sections/user/takemoderate.php b/sections/user/takemoderate.php index b6e8d771..8dd0cc3f 100644 --- a/sections/user/takemoderate.php +++ b/sections/user/takemoderate.php @@ -93,6 +93,7 @@ m.can_leech, m.Visible, i.AdminComment, + m.torrent_pass, i.Donor, i.Artist, i.Warned, @@ -157,6 +158,7 @@ $DB->query("DELETE FROM users_history_ips WHERE UserID='$UserID'"); $DB->query("UPDATE users_main SET IP='127.0.0.1' WHERE ID='$UserID'"); $DB->query("UPDATE xbt_snatched SET IP = '' WHERE uid='$UserID'"); + $DB->query("UPDATE users_history_passwords SET ChangerIP = '' WHERE UserID = ".$UserID); $EditSummary[]='IP history cleared'; } @@ -448,7 +450,7 @@ if ($EnableUser!=$Cur['Enabled'] && check_perms('users_disable_users')) { $EditSummary[]='account '.translateUserStatus($Cur['Enabled']).'->'.translateUserStatus($EnableUser); if($EnableUser == '2') { - disable_users($UserID, '', '1'); + disable_users($UserID, '', 1); } elseif($EnableUser == '1') { $Cache->increment('stats_user_count'); $UpdateSet[]="i.RatioWatchDownload='0'"; diff --git a/sections/user/user.php b/sections/user/user.php index 623fd576..4f9a1b5b 100644 --- a/sections/user/user.php +++ b/sections/user/user.php @@ -751,7 +751,7 @@ function check_paranoia_here($Setting) { $Tags = $Request['Tags']; $TagList = array(); foreach($Tags as $TagID => $TagName) { - $TagList[] = "".display_str($TagName).""; + $TagList[] = "".display_str($TagName).""; } $TagList = implode(', ', $TagList); ?> @@ -1047,9 +1047,9 @@ function check_paranoia_here($Setting) {
    - Request Name + Request Name / Year Votes diff --git a/sections/requests/takeunfill.php b/sections/requests/takeunfill.php index 379af3a8..359fea96 100644 --- a/sections/requests/takeunfill.php +++ b/sections/requests/takeunfill.php @@ -78,7 +78,6 @@ $Cache->delete_value('request_'.$RequestID); -$SS->UpdateAttributes('requests', array('torrentid','fillerid'), array($RequestID => array(0,0))); update_sphinx_requests($RequestID); diff --git a/sections/rules/upload.php b/sections/rules/upload.php index eaca4652..528e3aed 100644 --- a/sections/rules/upload.php +++ b/sections/rules/upload.php @@ -238,7 +238,7 @@
  • ↑_ 2.1.20. Sound sample packs must be uploaded to the Applications category. These releases are allowed only under the apps category; they are forbidden in music and other categories. Sound sample packs may use formats other than those allowed for music, and must be official collections. See 3.1.8. for more information.
    • -
  • ↑_ 2.1.21. All music torrents must represent a complete album (a complete collection release). Albums must not be missing tracks, or discs in the case of a multi-disc release. All music torrents must be one release. If an album is released as a multiple set of CDs, then it must be uploaded as a single torrent. Uploading each disc separately is not allowed. Digital downloads of albums must consist of entire albums. If tracks are available separately, but not released as singles, you may not upload them individually. Exceptions: Bonus discs may be uploaded separately in accordance with this rule. Please note that individual bonus tracks are not allowed to be uploaded without the rest of the album. Bonus tracks are not bonus discs. Enhanced audio CDs with data or video tracks must be uploaded without the non-audio tracks. If you want to share the videos or data, you may host the files off-site with a file sharing service and include the link in your torrent description. +
  • ↑_ 2.1.21. All music torrents must represent a complete album (a complete collection release). Albums must not be missing tracks, or discs in the case of a multi-disc release. All music torrents must be one release. If an album is released as a multiple set of CDs, then it must be uploaded as a single torrent. Uploading each disc separately is not allowed. Digital downloads of albums must consist of entire albums. If tracks are available separately, but not released as singles, you may not upload them individually. Exceptions: Bonus discs may be uploaded separately in accordance with this rule. Please note that individual bonus tracks are not allowed to be uploaded without the rest of the album. Bonus tracks are not bonus discs. Enhanced audio CDs with data or video tracks must be uploaded without the non-audio tracks. If you want to share the videos or data, you may host the files off-site with a file sharing service and include the link in your torrent description.
  • ↑_ 2.1.22. Multi-album torrents are not allowed on the site under any circumstances. That means no discographies, Pitchfork compilations, etc. Discographies make it a hassle for users to download individual albums. They result in a lot of duplicate albums being uploaded and are generally very poor quality. If releases (e.g. CD singles) were never released bundled together, do not upload them together. Live SBD material should be one torrent per night, per show, or per venue. Including more than one show in a torrent results in a multi-album torrent. Exceptions: Only official boxsets and official compilation collections can contain multiple albums.
    • @@ -246,7 +246,7 @@
  • ↑_ 2.1.24. Downsampling of analog rips is allowed. Analog rips that have been downsampled may be uploaded (e.g. a 24/96 vinyl rip downsampled to 16/44). Any downsampled torrents must include the specific programs and methods used to downsample in addition to the lineage for the original rip or it will be deleted. NOTE: downsampling of CDs is expressly forbidden.
    • -
  • ↑_ 2.1.25. Pre-emphasis is allowed in lossless torrents only. Lossless FLAC torrents with pre-emphasis are allowed on the site. They are allowed to co-exist with lossless de-emphasised torrents. On the other hand, lossy formats may not have pre-emphasis and will be deleted if uploaded. +
  • ↑_ 2.1.25. Pre-emphasis is allowed in lossless torrents only. Lossless FLAC torrents with pre-emphasis are allowed on the site. They are allowed to co-exist with lossless de-emphasised torrents. On the other hand, lossy formats may not have pre-emphasis and will be deleted if uploaded.
    • @@ -278,7 +278,7 @@
  • ↑_ 2.2.7. Complete or untouched releases replace incomplete or watermarked versions. Watermarked promos containing voice-overs and similar can be trumped by a non-watermarked release. Releases missing hidden or pre-gap tracks can be replaced by proper rips that include the range. These hidden or pre-gap tracks should be in their own file, not appended to the beginning of track one, and releases where the hidden track or pre-gap is appended can be trumped by one where the track is a separate file.
    • -
  • ↑_ 2.2.8. Bonus disc-only uploads can co-exist with the complete set in accordance with the trumping rules. A bonus disc-only release can be trumped by an upload containing the "full" original album + bonus discs, in the same format, in accordance with the usual trump rules. +
  • ↑_ 2.2.8. Bonus disc-only uploads can co-exist with the complete set in accordance with the trumping rules. A bonus disc-only release can be trumped by an upload containing the "full" original album + bonus discs, in the same format, in accordance with the usual trump rules.
  • ↑_ 2.2.9. Higher bitrate CBR (Constant Bitrate) and ABR (Average Bitrate) torrents replace lower ones. Once a CBR (Constant Bitrate) rip has been uploaded, no CBR rips of that bitrate or lower can be uploaded. In the same manner, once an ABR (Average Bitrate) rip has been uploaded, no ABR rips of that bitrate or lower can be uploaded. For example, if a 320kbps CBR rip is already on the site, you are not allowed to upload a 256kbps CBR. ABR and CBR may be interchangeably trumped. A CBR can trump a lower bitrate ABR and an ABR may trump a lower bitrate CBR. You may not upload a 192kbps CBR if a 256kbps ABR of the same release is already up. @@ -290,9 +290,9 @@
    • ↑_ 2.2.11.1. Only one lossy vinyl rip in a specific bitrate is allowed per release. Once someone has uploaded a lossy-format vinyl rip (in MP3, Ogg Vorbis or AAC), you may not upload another copy in the same bitrate. It does not matter whether if the lossy files are of a different sample rate found on the site. For example, if a 48 kHz -V2 (VBR) copy is already up, you may not upload the same album in -V2 (VBR) at 44.1 kHz.
      • -
    • ↑_ 2.2.11.3. Only one lossless and one 24bit lossless vinyl rip is allowed per edition. A poor sounding lossless rip may be trumped by a better sounding lossless rip, regardless of lineage information. The same quality trump can occur for 24bit lossless rips. To trump a rip for a better sounding version, you need to report it with clear informations about how your rip sounds better than the other one. Rips of extremely poor quality may be deleted outright if reported. All quality trumps/deletions of this nature are at the discretion of the moderator involved. +
    • ↑_ 2.2.11.2. Only one lossless and one 24bit lossless vinyl rip is allowed per edition. A poor sounding lossless rip may be trumped by a better sounding lossless rip, regardless of lineage information. The same quality trump can occur for 24bit lossless rips. To trump a rip for a better sounding version, you need to report it with clear informations about how your rip sounds better than the other one. Rips of extremely poor quality may be deleted outright if reported. All quality trumps/deletions of this nature are at the discretion of the moderator involved.
      • -
    • ↑_ 2.2.11.4. All vinyl torrents must be ripped at the correct speed. You must rip all vinyl at the speed they were intended to be played at. For example, you may not rip a 45rpm vinyl at 33rpm and upload it to the site. +
    • ↑_ 2.2.11.3. All vinyl torrents must be ripped at the correct speed. You must rip all vinyl at the speed they were intended to be played at. For example, you may not rip a 45rpm vinyl at 33rpm and upload it to the site.
  • ↑_ 2.2.12. MP3 Specific Dupe Rules @@ -326,7 +326,7 @@
  • ↑_ 2.2.14.2. Encoding profiles/object types at the same bitrate are not unique uploads. A 256 (VBR) in LC profile is a dupe if an 256 (VBR) HE object type encode already exists on the site. Similarly, different extensions (.m4a and .mp4) count as dupes if available in the same bitrate.
    • -
  • ↑_ 2.2.14.3. VBR AAC encodes can be trumped by 320 CBR encodes. Any (VBR) encode regardless of encoder used may be deleted in favor of 320 CBR encodes. This includes 320 (VBR) encodes or encodes made with Nero preset of approximately -q0.80. +
  • ↑_ 2.2.14.3. VBR AAC encodes can be trumped by 320 CBR encodes. Any (VBR) encode regardless of encoder used may be deleted in favor of 320 CBR encodes. This includes 320 (VBR) encodes or encodes made with Nero preset of approximately -q0.80.
    • @@ -444,7 +444,7 @@
  • ↑_ 3.1.9. Application components such as plug-ins, add-ons, expansions, filters, and so forth may be uploaded in a collection if they correspond to a particular application. You may upload plug-ins, expansions, add-ons, filters, and other application components as collections provided they are compatible to a particular application and version. For example, you may not upload a megapack of all filters for Adobe Photoshop CS2, CS3, and CS4. But you may upload a pack of Adobe Photoshop CS4 filters.
    • -
  • ↑_ 3.1.10. Collections of cracks, keygens or serials are not allowed. The crack, keygen or serial for an application must be in a torrent with its corresponding application. It cannot be uploaded separately from the application. +
  • ↑_ 3.1.10. Collections of cracks, keygens or serials are not allowed. The crack, keygen or serial for an application must be in a torrent with its corresponding application. It cannot be uploaded separately from the application.
  • ↑_ 3.1.11. Torrents containing hacking or cracking tools are not allowed.
    • @@ -630,10 +630,10 @@
  • ↑_ 7.2. No freely available eLearning videos You may not upload videos hosted officially from university sites, the author's site, the Internet Archive or publisher's site. You may upload videos from other torrent sites provided they conform to the rules in this section.
    • -
  • ↑_ 7.3. Tutorials on how to use features of applications, musical instruments or computer hardware are the only allowed topics. No material outside of these 3 topics are allowed. For example, instruction videos about Kung Fu training, dance lessons, or beer brewing are not permitted here. +
  • ↑_ 7.3. Tutorials on how to use musical instruments, vocal training, producing music or otherwise learning the theory and practice of music are the only allowed topics. No material outside of these topics is allowed. For example, instruction videos about Kung Fu training, dance lessons, beer brewing or photography are not permitted here. What is considered allowed under these topics is ultimately under staff discretion.
    • -
  • ↑_ 7.4. eLearning Videos must be either in a video file format (.avi, .mov, etc.) or a disk image (.iso, .bin/.cue, etc.). Exceptions: Only scene uploads may be archived into compressed archives (zip, rar, etc.). +
  • ↑_ 7.4. eLearning Videos must be either in a video file format (.mkv, .avi, .mov, .mp4 etc.) or a disk image (.iso, .bin/.cue, etc.). Only one video file format and one disk image format are allowed per video, anything else is a dupe. Torrents should not be uploaded in compressed archives.
  • ↑_ 7.5. eLearning video uploads must contain an informative description and use proper Gazelle tags. Uploads should include a proper description and/or a link to further information. It is strongly encouraged they at least have the elearning.videos Gazelle tag as well.
    • diff --git a/sections/torrents/browse2.php b/sections/torrents/browse2.php index d113ee56..3b478d95 100644 --- a/sections/torrents/browse2.php +++ b/sections/torrents/browse2.php @@ -509,6 +509,7 @@ function header_link($SortKey,$DefaultWay="desc") {
    NameName / Year Files Time Size
    Year - +
    Freeleech Group + Reset Freeleech - Un-Freeleech + Neutralleech
    Account: