34 changes from Wed Aug 10 07:46:49 2011 -0400 to Fri Aug 12 14:53:11 2011 -0500

rules typo featured album text change fixed spacing issue on user edit page remove time limit file name changes don't run blank searches fixing email history ip syntax fix restrict re-scoring to EAC 0.95 logs, extension of previous commit to this file fix per http://what.cd/forums.php?action=viewthread&threadid=137863&postid=3422033#post3422033 extend probable fix for http://what.cd/forums.php?action=viewthread&threadid=115673 probable fix for http://what.cd/forums.php?action=viewthread&threadid=115673 Revert "probable fix for http://what.cd/forums.php?action=viewthread&threadid=115673" implemented suggestion per http://what.cd/forums.php?action=viewthread&threadid=137863 Revert "implemented suggestion per http://what.cd/forums.php?action=viewthread&threadid=137863" fix per http://what.cd/forums.php?action=viewthread&threadid=136996 typo notify of disabling remove snatched I suck at grammar collage rule update
2024-12-13 02:46:30 +00:00 · 2011-08-12 21:42:06 +00:00 · 2011-08-12 21:42:06 +00:00 · 27da8d54c4
commit 27da8d54c4
parent d1d9a95d3b
11 changed files with 49 additions and 38 deletions
--- a/design/privateheader.php
+++ b/design/privateheader.php
@ -122,7 +122,28 @@
 			<li id="stats_required"><a href="rules.php?p=ratio">Required</a>: <span class="stat"><?=number_format($LoggedUser['RequiredRatio'], 2)?></span></li>
 <?	} ?>
 		</ul>
-		<ul id="userinfo_minor">
+<?
+$NewSubscriptions = $Cache->get_value('subscriptions_user_new_'.$LoggedUser['ID']);
+if($NewSubscriptions === FALSE) {
+        if($LoggedUser['CustomForums']) {
+                unset($LoggedUser['CustomForums']['']);
+                $RestrictedForums = implode("','", array_keys($LoggedUser['CustomForums'], 0));
+        }
+        $DB->query("SELECT COUNT(s.TopicID)
+                FROM users_subscriptions AS s
+                        JOIN forums_last_read_topics AS l ON s.UserID = l.UserID AND s.TopicID = l.TopicID
+                        JOIN forums_topics AS t ON l.TopicID = t.ID
+                        JOIN forums AS f ON t.ForumID = f.ID
+                WHERE f.MinClassRead <= ".$LoggedUser['Class']."
+                        AND l.PostID < t.LastPostID
+                        AND s.UserID = ".$LoggedUser['ID'].
+                (!empty($RestrictedForums) ? "
+                        AND f.ID NOT IN ('".$RestrictedForums."')" : ""));
+        list($NewSubscriptions) = $DB->next_record();
+        $Cache->cache_value('subscriptions_user_new_'.$LoggedUser['ID'], $NewSubscriptions, 0);
+} ?>
+
+		<ul id="userinfo_minor"<?=$NewSubscriptions ? ' class="highlite"' : ''?>>
 			<li id="nav_inbox"><a onmousedown="Stats('inbox');" href="inbox.php">Inbox</a></li>
 			<li id="nav_staffinbox"><a onmousedown="Stats('staffpm');" href="staffpm.php">Staff Inbox</a></li>
 			<li id="nav_uploaded"><a onmousedown="Stats('uploads');" href="torrents.php?type=uploaded&amp;userid=<?=$LoggedUser['ID']?>">Uploads</a></li>
@ -130,26 +151,6 @@
 <? if (check_perms('site_torrents_notify')) { ?>
 			<li id="nav_notifications"><a onmousedown="Stats('notifications');" href="user.php?action=notify">Notifications</a></li>
 <? }
-//Subscriptions
-$NewSubscriptions = $Cache->get_value('subscriptions_user_new_'.$LoggedUser['ID']);
-if($NewSubscriptions === FALSE) {
-	if($LoggedUser['CustomForums']) {
-		unset($LoggedUser['CustomForums']['']);
-		$RestrictedForums = implode("','", array_keys($LoggedUser['CustomForums'], 0));
-	}
-	$DB->query("SELECT COUNT(s.TopicID)
-		FROM users_subscriptions AS s
-			JOIN forums_last_read_topics AS l ON s.UserID = l.UserID AND s.TopicID = l.TopicID
-			JOIN forums_topics AS t ON l.TopicID = t.ID
-			JOIN forums AS f ON t.ForumID = f.ID
-		WHERE f.MinClassRead <= ".$LoggedUser['Class']."
-			AND l.PostID < t.LastPostID
-			AND s.UserID = ".$LoggedUser['ID'].
-		(!empty($RestrictedForums) ? "
-			AND f.ID NOT IN ('".$RestrictedForums."')" : ""));
-	list($NewSubscriptions) = $DB->next_record();
-	$Cache->cache_value('subscriptions_user_new_'.$LoggedUser['ID'], $NewSubscriptions, 0);
-}
 ?>
 			<li id="nav_subscriptions"><a onmousedown="Stats('subscriptions');" href="userhistory.php?action=subscriptions"<?=($NewSubscriptions ? ' class="new-subscriptions"' : '')?>>Subscriptions</a></li>
 			<li id="nav_comments"><a onmousedown="Stats('comments');" href="comments.php">Comments</a></li>
--- a/sections/bookmarks/index.php
+++ b/sections/bookmarks/index.php
@ -17,6 +17,8 @@
 		break;
 		
 	case 'remove_snatched':
+		header('Location: bookmarks.php');
+		die();
 		error(0); // disable this for now as it's the heaviest part of the entire site
 		authorize();
 		$DB->query("DELETE b FROM bookmarks_torrents AS b WHERE b.UserID='".$LoggedUser['ID']."' AND b.GroupID IN(SELECT DISTINCT t.GroupID FROM torrents AS t INNER JOIN xbt_snatched AS s ON s.fid=t.ID AND s.uid='".$LoggedUser['ID']."')");
--- a/sections/bookmarks/torrents.php
+++ b/sections/bookmarks/torrents.php
@ -255,7 +255,8 @@ function compare($X, $Y){
 		<a href="bookmarks.php?type=requests">[Requests]</a>
 <? if (count($TorrentList) > 0) { ?>
 		<br /><br />
-		<a href="bookmarks.php?action=remove_snatched&amp;auth=<?=$LoggedUser['AuthKey']?>" onclick="return confirm('Are you sure you want to remove the bookmarks for all items you\'ve snatched?');">[Remove Snatched]</a>
+		<a href="bookmarks.php?action=remove_snatched&amp;auth=<?=$LoggedUser['AuthKey']?>" onclick="alert('This feature is temporarily disabled');">[Remove Snatched]</a>
+		<?//onclick="return confirm('Are you sure you want to remove the bookmarks for all items you\'ve snatched?');">[Remove Snatched]</a>?>
 <? } ?>
 	</div>
 <? if (count($TorrentList) == 0) { ?>
--- a/sections/donate/config.php
+++ b/sections/donate/config.php
@ -22,6 +22,7 @@ function btc_address($UserID, $GenAddress = false) {
 	if (!empty($Addr)) { return $Addr; }
 	elseif ($GenAddress) {
 		
+		if (empty($NewAddr)) { error(0); }
 		$DB->query("UPDATE users_info SET BitcoinAddress = '".db_string($NewAddr)."' WHERE UserID = '".$UserID."' AND BitcoinAddress IS NULL");
 		return $NewAddr;
 	} else {
--- a/sections/index/private.php
+++ b/sections/index/private.php
@ -43,7 +43,7 @@
 			<div class="head colhead_dark"><strong><?=$FeaturedAlbum['Title']?></strong></div>
 			<div class="center pad"><?=display_artists($Artists, true, true)?><a href="torrents.php?id=<?=$FeaturedAlbum['GroupID']?>"><?=$FeaturedAlbum['Name']?></a></div>
 			<div class="center"><a href="torrents.php?id=<?=$FeaturedAlbum['GroupID']?>" title="<?=display_artists($Artists, false, false)?> - <?=$FeaturedAlbum['Name']?>"><img src="<?=$FeaturedAlbum['WikiImage']?>" alt="<?=display_artists($Artists, false, false)?> - <?=$FeaturedAlbum['Name']?>" width="100%" /></a></div>
-			<div class="center pad"><a href="forums.php?action=viewthread&amp;threadid=<?=$FeaturedAlbum['ThreadID']?>"><em>Discuss this album here!</em></a></div>
+			<div class="center pad"><a href="forums.php?action=viewthread&amp;threadid=<?=$FeaturedAlbum['ThreadID']?>"><em>Read the interview with the band, discuss here</em></a></div>
 		</div>
 <?
 	}
--- a/sections/rules/collages.php
+++ b/sections/rules/collages.php
@ -15,7 +15,7 @@
 			Vandalizing of collages will be taken very seriously, resulting in collage editing privileges being removed (at a minimum).
 			</li>
 			<li>
-			Personal Best Of collages are only allowed in the new Personal Collages category. You must be an Elite+ or Donor to create one.
+			Personal Best Of collages are only allowed in the new Personal Collages category. You must be a Power User+ or Donor to create one.
 			</li>
 			<li>
 			A well-defined group of people, for instance Torrent Masters, or Interviewers, may create a Group Picks Theme collage with one pick per person, after having gained permission for the collage from Staff.
--- a/sections/rules/upload.php
+++ b/sections/rules/upload.php
@ -634,8 +634,7 @@
 					<ul>
 						<li>MP3, FLAC, Ogg Vorbis, AAC, AC3, DTS</li>
 					</ul>
-
-					<p><em>Monkey's Audio (APE), Apple Lossless (ALAC/.M4A lossless), and Wavpack (WV) are depreciated. No more new uploads in either of these 3 formats are allowed after April 20, 2009. Only unique releases with no alternative upload in FLAC are permitted to remain on the site. However, you are encouraged to convert them to FLAC. See <a href="#r2.2.15.10">2.2.15.10.</a></em>
+					<p><em>Monkey's Audio (APE), Apple Lossless (ALAC/.M4A lossless), and Wavpack (WV) are deprecated. No more new uploads in either of these 3 formats are allowed after April 20, 2009. Only unique releases with no alternative upload in FLAC are permitted to remain on the site. However, you are encouraged to convert them to FLAC. </em>
 					</p>
 				</li>
 				<li id="r6.2"><a href="#h6"><strong>&uarr;_</strong></a> <a href="#r6.2">6.2.</a> <strong>No music is permitted in these two categories.</strong> They are for spoken word only.
--- a/sections/tools/misc/update_geoip.php
+++ b/sections/tools/misc/update_geoip.php
@ -1,16 +1,17 @@
 <?
 ini_set('memory_limit', -1);
+set_time_limit(0);

 if (!check_perms('site_debug')) { error(403); }

 show_header();

 //requires wget, unzip commands to be installed
-shell_exec('wget http://geolite.maxmind.com/download/geoip/database/GeoLiteCity_CSV/GeoLiteCity_'.date('Ym').'01.zip');
-shell_exec('unzip GeoLiteCity_'.date('Ym').'01.zip');
-shell_exec('rm GeoLiteCity_'.date('Ym').'01.zip');
+shell_exec('wget http://geolite.maxmind.com/download/geoip/database/GeoLiteCity_CSV/GeoLiteCity_'.date('Ym').'02.zip');
+shell_exec('unzip GeoLiteCity_'.date('Ym').'02.zip');
+shell_exec('rm GeoLiteCity_'.date('Ym').'02.zip');

-if(($Locations = file("GeoLiteCity_".date('Ym')."01/GeoLiteCity-Location.csv", FILE_IGNORE_NEW_LINES)) === false) {
+if(($Locations = file("GeoLiteCity_".date('Ym')."02/GeoLiteCity-Location.csv", FILE_IGNORE_NEW_LINES)) === false) {
 	error("Download or extraction of maxmind database failed");
 }
 array_shift($Locations);
@ -29,7 +30,7 @@
 echo "There are ".count($CountryIDs)." CountryIDs";
 echo "<br />";

-if(($Blocks = file("GeoLiteCity_".date('Ym')."01/GeoLiteCity-Blocks.csv", FILE_IGNORE_NEW_LINES)) === false) {
+if(($Blocks = file("GeoLiteCity_".date('Ym')."02/GeoLiteCity-Blocks.csv", FILE_IGNORE_NEW_LINES)) === false) {
 	echo "Error";
 }
 array_shift($Blocks);
--- a/sections/torrents/takeedit.php
+++ b/sections/torrents/takeedit.php
@ -373,9 +373,15 @@
 	$DB->query("UPDATE torrents_logs_new SET Score = 99, Details = '".$Details."' WHERE TorrentID = ".$TorrentID);
 }

-if ($Properties['Trumpable'] == 0 && $LogScore == 99) {
-	$DB->query("UPDATE torrents SET LogScore = 100 WHERE ID = ".$TorrentID);
-	$DB->query("UPDATE torrents_logs_new SET Score = 100, Details = '' WHERE TorrentID = ".$TorrentID);
+$DB->query("SELECT Enabled FROM users_main WHERE ID =".$UserID);
+list($Enabled) = $DB->next_record();
+if ($Properties['Trumpable'] == 0 && $LogScore == 99 && $Enabled == 1 && strtotime($Time) < 1284422400) {
+	$DB->query("SELECT Log FROM torrents_logs_new WHERE TorrentID = ".$TorrentID);
+	list($Log) = $DB->next_record();
+	if (strpos($Log, "EAC extraction") === 0) {
+		$DB->query("UPDATE torrents SET LogScore = 100 WHERE ID = ".$TorrentID);
+		$DB->query("UPDATE torrents_logs_new SET Score = 100, Details = '' WHERE TorrentID = ".$TorrentID);
+	}
 }

 $DB->query("SELECT Name FROM torrents_group WHERE ID=$GroupID");
--- a/sections/user/user.php
+++ b/sections/user/user.php
@ -1018,9 +1018,9 @@ function check_paranoia_here($Setting) {
 					<br />
 					 <input type="checkbox" name="DisableUpload" id="DisableUpload"<? if ($DisableUpload==1) { ?>checked="checked"<? } ?> /> <label for="DisableUpload">Upload</label> |
 					<input type="checkbox" name="DisableWiki" id="DisableWiki"<? if ($DisableWiki==1) { ?>checked="checked"<? } ?> /> <label for="DisableWiki">Wiki</label> |
-					<input type="checkbox" name="DisableLeech" id="DisableLeech"<? if ($DisableLeech==0) { ?>checked="checked"<? } ?> /><label for="DisableLeech">Leech</label> |
-					<input type="checkbox" name="DisablePM" id="DisablePM"<? if ($DisablePM==1) { ?>checked="checked"<? } ?> /><label for="DisablePM">PM</label> |
-					<input type="checkbox" name="DisableIRC" id="DisableIRC"<? if ($DisableIRC==1) { ?>checked="checked"<? } ?> /><label for="DisableIRC">IRC</label>
+					<input type="checkbox" name="DisableLeech" id="DisableLeech"<? if ($DisableLeech==0) { ?>checked="checked"<? } ?> /> <label for="DisableLeech">Leech</label> |
+					<input type="checkbox" name="DisablePM" id="DisablePM"<? if ($DisablePM==1) { ?>checked="checked"<? } ?> /> <label for="DisablePM">PM</label> |
+					<input type="checkbox" name="DisableIRC" id="DisableIRC"<? if ($DisableIRC==1) { ?>checked="checked"<? } ?> /> <label for="DisableIRC">IRC</label>
 				</td>
 			</tr>
 			<tr>
--- a/sections/userhistory/email_history2.php
+++ b/sections/userhistory/email_history2.php
@ -71,7 +71,7 @@
 $Current['Email'] = $CurrentEmail['Email'];
 $Current['StartTime'] = $History[0]['Time'];
 $Current['CurrentIP'] = $CurrentEmail['IP'];
-$Current['IP'] = $History[0]['IP'];
+$Current['IP'] = $History[(count($History) - 1)]['IP'];

 // Matches for current email
 if ($CurrentEmail['Usernames'] != '') {