diff --git a/classes/class_cache.php b/classes/class_cache.php index 3334f30d..d77aa1a1 100644 --- a/classes/class_cache.php +++ b/classes/class_cache.php @@ -40,7 +40,7 @@ class CACHE extends Memcache { 'top10tor_*', 'query_lock_*', 'top10votes_*', - 'similar_albums_*', +// 'similar_albums_*', 'users_snatched_*' ); diff --git a/classes/class_torrent_form.php b/classes/class_torrent_form.php index 2e5fbf51..ecf7e1be 100644 --- a/classes/class_torrent_form.php +++ b/classes/class_torrent_form.php @@ -143,7 +143,7 @@ function foot() { ?> -

Be sure that your torrent is approved by the rules. Not doing this will result in a warning or worse.

+

Be sure that your torrent is approved by the rules. Not doing this will result in a warning or worse.

NewTorrent) { ?>

After uploading the torrent, you will have a one hour grace period during which no one other than you can fill requests with this torrent. Make use of this time wisely, and search the requests.

@@ -198,7 +198,7 @@ function music_form($GenreTags) { Artist(s) - + $Artists) { @@ -244,7 +244,7 @@ function music_form($GenreTags) { Album title: Disabled?>/> -

Do not include the words remaster, re-issue, MSFL Gold, limited edition, bonus tracks, bonus disc or country specific information in this field. That belongs in the edition information fields below, see this for further information. Also remember to use the correct capitalization for your upload. See the Capitalization Guidelines for more information. +

Do not include the words remaster, re-issue, MSFL Gold, limited edition, bonus tracks, bonus disc or country specific information in this field. That belongs in the edition information fields below, see this for further information. Also remember to use the correct capitalization for your upload. See the Capitalization Guidelines for more information. @@ -314,7 +314,7 @@ function show() { Catalogue Number (Optional): Disabled?> /> - Please double check the record label and catalogue number when using MusicBrainz. See this guide for more details. + Please double check the record label and catalogue number when using MusicBrainz. See this guide for more details. @@ -335,7 +335,7 @@ function show() { } ?> - Please take the time to fill this out properly (try searching MusicBrainz). + Please take the time to fill this out properly (try searching MusicBrainz). @@ -390,7 +390,7 @@ function show() { Scene /> - Check this only if this is a 'scene release'. If you ripped it yourself, it is not a scene release.
If you are not sure, DO NOT check it; you will be penalized. For information on the scene, visit Wikipedia. + Check this only if this is a 'scene release'. If you ripped it yourself, it is not a scene release.
If you are not sure, DO NOT check it; you will be penalized. For information on the scene, visit Wikipedia. @@ -481,7 +481,7 @@ function show() { Log Files - Check your log files here before uploading: logchecker.php
+ Check your log files here before uploading: logchecker.php
[+] [-] diff --git a/design/privateheader.php b/design/privateheader.php index 30259fb4..c3ac2586 100644 --- a/design/privateheader.php +++ b/design/privateheader.php @@ -406,7 +406,7 @@ if($Show) { ?> -

+
@@ -414,6 +414,13 @@
+ + $Data['FreeTorrent'] == '1', 'isNeutralLeech' => $Data['FreeTorrent'] == '2', 'isPersonalFreeleech' => $Data['PersonalFL'], - 'canUseToken' => ($LoggedUser['FLTokens'] > 0) - && $Data['HasFile'] && ($Data['Size'] < 1073741824) - && !$Data['PersonalFL'] - && empty($Data['FreeTorrent']) && ($LoggedUser['CanLeech'] == '1') + 'canUseToken' => Torrents::can_use_token($Data), + 'hasSnatched' => $Data['IsSnatched'] ); } @@ -582,10 +580,8 @@ function header_link($SortKey,$DefaultWay="desc") { 'isFreeleech' => $Data['FreeTorrent'] == '1', 'isNeutralLeech' => $Data['FreeTorrent'] == '2', 'isPersonalFreeleech' => $Data['PersonalFL'], - 'canUseToken' => ($LoggedUser['FLTokens'] > 0) - && $Data['HasFile'] && ($Data['Size'] < 1073741824) - && !$Data['PersonalFL'] - && empty($Data['FreeTorrent']) && ($LoggedUser['CanLeech'] == '1') + 'canUseToken' => Torrents::can_use_token($Data), + 'hasSnatched' => $Data['IsSnatched'] ); } } diff --git a/sections/torrents/vote.php b/sections/torrents/vote.php index ac1ebf4a..6c85c899 100644 --- a/sections/torrents/vote.php +++ b/sections/torrents/vote.php @@ -27,7 +27,7 @@ This has out of total>, including your upvote>, including your downvote.

- id="vote_message">Upvote - Downvote + id="vote_message">Upvote - Downvote id="unvote_message">Changed your mind?
Clear your vote
diff --git a/sections/torrents/voter_picks.php b/sections/torrents/voter_picks.php index 32ca0261..0a2439ab 100644 --- a/sections/torrents/voter_picks.php +++ b/sections/torrents/voter_picks.php @@ -3,10 +3,10 @@ include(SERVER_ROOT.'/sections/torrents/ranking_funcs.php'); $Top10 = $Cache->get_value('similar_albums_'.$GroupID); -if ($Top10 === False) { +if ($Top10 === False || isset($Top10[$GroupID])) { $VotePairs = $Cache->get_value('vote_pairs_'.$GroupID, true); - if ($VotePairs === False) { + if ($VotePairs === False|| isset($VotePairs[$GroupID])) { $DB->query("SELECT v.GroupID, SUM(IF(v.Type='Up',1,0)) AS Ups, COUNT(1) AS Total FROM (SELECT UserID FROM users_votes WHERE GroupID = $GroupID AND Type='Up') AS a JOIN users_votes AS v USING (UserID) @@ -28,7 +28,7 @@ arsort($GroupScores); $Top10 = array_slice($GroupScores, 0, 10, true); - $Cache->cache_value('similar_albums_'.$GroupID, $Top10, 2*3600); + $Cache->cache_value('similar_albums_'.$GroupID, $Top10, .5*3600); } if (count($Top10) > 0) { ?> diff --git a/sections/user/takeedit.php b/sections/user/takeedit.php index 6758ec8c..664107ef 100644 --- a/sections/user/takeedit.php +++ b/sections/user/takeedit.php @@ -194,6 +194,7 @@ $Options['DisablePMAvatars'] = (!empty($_POST['disablepmavatars']) ? 1 : 0); $Options['NotifyOnQuote'] = (!empty($_POST['notifyquotes']) ? 1 : 0); $Options['ShowSnatched'] = (!empty($_POST['showsnatched']) ? 1 : 0); +$Options['DisableAutoSave'] = (!empty($_POST['disableautosave']) ? 1 : 0); if(isset($LoggedUser['DisableFreeTorrentTop10'])) { diff --git a/static/functions/rippy.js b/static/functions/rippy.js index cb6c90f5..5047806a 100644 --- a/static/functions/rippy.js +++ b/static/functions/rippy.js @@ -13,3 +13,5 @@ function say() { function rippyclick() { $('.rippywrap').remove(); } + + diff --git a/static/styles/global.css b/static/styles/global.css index 07679462..77797418 100644 --- a/static/styles/global.css +++ b/static/styles/global.css @@ -190,7 +190,7 @@ div#AddArtists a { z-index: 25; display: block; position: fixed; - background: transparent url('../rippy/rippy_bday.png') no-repeat bottom + background: transparent no-repeat bottom center; color: black; text-align: center;