Empty commit

classes/tags.class.php

@@ -81,7 +81,7 @@ public function get_primary() {
 	 * @param string $Primary
 	 */
 	public function set_primary($Primary) {
-		$this->Primary = (string) $Primary;
+		$this->Primary = (string)$Primary;
 	}
 
 	/**

classes/top10view.class.php

@@ -36,7 +36,7 @@ public static function render_artist_controls($Selected, $View) {
 
 	private static function get_selected_link($String, $Selected) {
 		if ($Selected) {
-			return "<strong>" . $String . "</strong>";
+			return "<strong>$String</strong>";
 		} else {
 			return $String;
 		}
@@ -87,11 +87,11 @@ private static function render_list($Url, $Name, $Image) {
 		if (!empty($Image)) {
 			$UseTooltipster = !isset(G::$LoggedUser['Tooltipster']) || G::$LoggedUser['Tooltipster'];
 			$Image = ImageTools::process($Image);
-			$Title = "title=\"&lt;img class=&quot;large_tile&quot; src=&quot;$Image&quot; alt=&quot;&quot; />\"";
+			$Title = "title=\"&lt;img class=&quot;large_tile&quot; src=&quot;$Image&quot; alt=&quot;&quot; /&gt;\"";
 			$Name = display_str($Name);
 ?>
 			<li>
-				<a class="tooltip_image" <?=$Title?> href="<?=$Url?><?=$Name?>"><?=$Name?></a>
+				<a class="tooltip_image" data-title-plain="<?=$Name?>" <?=$Title?> href="<?=$Url?><?=$Name?>"><?=$Name?></a>
 			</li>
 <?
 		}

design/privatefooter.php

@@ -4,7 +4,7 @@
 <? 	if (!empty($Options['disclaimer'])) { ?>
 	<br /><br />
 	<div id="disclaimer_container" class="thin" style="text-align: center; margin-bottom: 20px;">
-		None of the files shown here are actually hosted on this server. The links are provided solely by this site's users. These BitTorrent files are meant for the distribution of backup files. By downloading the BitTorrent file, you are claiming that you own the original file. The administrator of this site (https://<?=SSL_SITE_URL?>) holds NO RESPONSIBILITY if these files are misused in any way and cannot be held responsible for what its users post, or any other actions of it.
+		None of the files shown here are actually hosted on this server. The links are provided solely by this site's users. These BitTorrent files are meant for the distribution of backup files. By downloading the BitTorrent file, you are claiming that you own the original file. The administrator of this site (<?=site_url()?>) holds NO RESPONSIBILITY if these files are misused in any way and cannot be held responsible for what its users post, or any other actions of it.
 	</div>
 <?
 	}

design/privateheader.php

@@ -230,11 +230,11 @@
 				<ul id="userinfo_stats">
 					<li id="stats_seeding">
 						<a href="torrents.php?type=seeding&amp;userid=<?=G::$LoggedUser['ID']?>">Up</a>:
-						<span class="stat" title="<?=Format::get_size(G::$LoggedUser['BytesUploaded'], 5)?>"><?=Format::get_size(G::$LoggedUser['BytesUploaded'])?></span>
+						<span class="stat tooltip" title="<?=Format::get_size(G::$LoggedUser['BytesUploaded'], 5)?>"><?=Format::get_size(G::$LoggedUser['BytesUploaded'])?></span>
 					</li>
 					<li id="stats_leeching">
 						<a href="torrents.php?type=leeching&amp;userid=<?=G::$LoggedUser['ID']?>">Down</a>:
-						<span class="stat" title="<?=Format::get_size(G::$LoggedUser['BytesDownloaded'], 5)?>"><?=Format::get_size(G::$LoggedUser['BytesDownloaded'])?></span>
+						<span class="stat tooltip" title="<?=Format::get_size(G::$LoggedUser['BytesDownloaded'], 5)?>"><?=Format::get_size(G::$LoggedUser['BytesDownloaded'])?></span>
 					</li>
 					<li id="stats_ratio">
 						Ratio: <span class="stat"><?=Format::get_ratio_html(G::$LoggedUser['BytesUploaded'], G::$LoggedUser['BytesDownloaded'])?></span>
@@ -242,7 +242,7 @@
 <?	if (!empty(G::$LoggedUser['RequiredRatio'])) { ?>
 					<li id="stats_required">
 						<a href="rules.php?p=ratio">Required</a>:
-						<span class="stat" title="<?=number_format(G::$LoggedUser['RequiredRatio'], 5)?>"><?=number_format(G::$LoggedUser['RequiredRatio'], 2)?></span>
+						<span class="stat tooltip" title="<?=number_format(G::$LoggedUser['RequiredRatio'], 5)?>"><?=number_format(G::$LoggedUser['RequiredRatio'], 2)?></span>
 					</li>
 <?	}
 	if (G::$LoggedUser['FLTokens'] > 0) { ?>

docs/CHANGES.txt

@@ -1,5 +1,20 @@
 CHANGE LOG
 
+2013-10-24 by alderaan
+Layer Cake CSS now has a wider table of torrents on torrents.php
+
+2013-10-23 by alderaan
+Use less granular times and prevent word wrapping of datetimes in requests list
+
+2013-10-23 by alderaan
+When viewing the bookmarked requests page, don't show the requests search box if you have 0 bookmarked requests.
+
+2013-10-23 by alderaan
+On the bookmarked torrents page, if you have no bookmarked torrents with artists, display a message in "Top Artists" and always show "Artists: 0"
+
+2013-10-23 by alderaan
+Fix several bugs with unstyled tooltips (mostly caused by missing data-title-plain attributes)
+
 2013-10-22 by alderaan
 Second avatars and donor icons will now be automatically reset by the image proxy if they are too large
 

sections/blog/index.php

@@ -109,29 +109,29 @@
 	?>
 		<div class="box thin">
 			<div class="head">
-				<?=(empty($_GET['action']) ? 'Create a blog post' : 'Edit blog post')?>
+				<?=empty($_GET['action']) ? 'Create a blog post' : 'Edit blog post'?>
 			</div>
 			<form class="<?=empty($_GET['action']) ? 'create_form' : 'edit_form'?>" name="blog_post" action="blog.php" method="post">
 				<div class="pad">
-					<input type="hidden" name="action" value="<?=(empty($_GET['action']) ? 'takenewblog' : 'takeeditblog')?>" />
+					<input type="hidden" name="action" value="<?=empty($_GET['action']) ? 'takenewblog' : 'takeeditblog'?>" />
 					<input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
 <?	if (!empty($_GET['action']) && $_GET['action'] == 'editblog') { ?>
 					<input type="hidden" name="blogid" value="<?=$BlogID; ?>" />
 <?	} ?>
 					<h3>Title</h3>
-					<input type="text" name="title" size="95"<? if (!empty($Title)) { echo ' value="'.display_str($Title).'"'; } ?> /><br />
+					<input type="text" name="title" size="95"<?=!empty($Title) ? ' value="'.display_str($Title).'"' : '';?> /><br />
 					<h3>Body</h3>
-					<textarea name="body" cols="95" rows="15"><? if (!empty($Body)) { echo display_str($Body); } ?></textarea> <br />
+					<textarea name="body" cols="95" rows="15"><?=!empty($Body) ? display_str($Body) : '';?></textarea> <br />
 					<input type="checkbox" value="1" name="important" id="important" checked="checked" /><label for="important">Important</label><br />
 					<h3>Thread ID</h3>
-					<input type="text" name="thread" size="8"<? if (!empty($ThreadID)) { echo ' value="'.display_str($ThreadID).'"'; } ?> />
+					<input type="text" name="thread" size="8"<?=!empty($ThreadID) ? ' value="'.display_str($ThreadID).'"' : '';?> />
 					(Leave blank to create thread automatically)
 					<br /><br />
-					<input id="subscribebox" type="checkbox" name="subscribe"<?=!empty($HeavyInfo['AutoSubscribe']) ? ' checked="checked"' : '' ?> tabindex="2" />
+					<input id="subscribebox" type="checkbox" name="subscribe"<?=!empty($HeavyInfo['AutoSubscribe']) ? ' checked="checked"' : '';?> tabindex="2" />
 					<label for="subscribebox">Subscribe</label>
 
 					<div class="center">
-						<input type="submit" value="<?=(!isset($_GET['action']) ? 'Create blog post' : 'Edit blog post') ?>" />
+						<input type="submit" value="<?=!isset($_GET['action']) ? 'Create blog post' : 'Edit blog post';?>" />
 					</div>
 				</div>
 			</form>
@@ -190,7 +190,8 @@
 			<a href="blog.php?action=deadthread&amp;id=<?=$BlogID?>&amp;auth=<?=$LoggedUser['AuthKey']?>" class="brackets">Remove link</a>
 <?
 		}
-			} ?>
+	}
+?>
 		</div>
 	</div>
 	<br />

sections/bookmarks/artists.php

@@ -5,7 +5,7 @@
 		error(403);
 	}
 	$UserID = $_GET['userid'];
-	$Sneaky = ($UserID !== $LoggedUser['ID']);
+	$Sneaky = $UserID !== $LoggedUser['ID'];
 	if (!is_number($UserID)) {
 		error(404);
 	}
@@ -18,7 +18,7 @@
 	$UserID = $LoggedUser['ID'];
 }
 
-$Sneaky = ($UserID !== $LoggedUser['ID']);
+$Sneaky = $UserID !== $LoggedUser['ID'];
 
 //$ArtistList = Bookmarks::all_bookmarks('artist', $UserID);
 
@@ -31,7 +31,7 @@
 
 $ArtistList = $DB->to_array();
 
-$Title = ($Sneaky) ? "$Username's bookmarked artists" : 'Your bookmarked artists';
+$Title = $Sneaky ? "$Username's bookmarked artists" : 'Your bookmarked artists';
 
 View::show_header($Title, 'browse');
 
@@ -48,7 +48,7 @@
 	</div>
 	<div class="box pad" align="center">
 <? if (count($ArtistList) === 0) { ?>
-		<br /><h2>You have not bookmarked any artists.</h2>
+		<h2>You have not bookmarked any artists.</h2>
 	</div>
 </div><!--content-->
 <?

sections/bookmarks/torrents.php

@@ -139,7 +139,7 @@ function compare($X, $Y) {
 			$LastRemasterCatalogueNumber = $Torrent['RemasterCatalogueNumber'];
 			$LastMedia = $Torrent['Media'];
 ?>
-<tr class="group_torrent torrent_row groupid_<?=$GroupID?> edition_<?=$EditionID?><?=$SnatchedTorrentClass . $SnatchedGroupClass . (!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGrouping'] === 1 ? ' hidden' : '')?>">
+	<tr class="group_torrent torrent_row groupid_<?=$GroupID?> edition_<?=$EditionID?><?=$SnatchedTorrentClass . $SnatchedGroupClass . (!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGrouping'] === 1 ? ' hidden' : '')?>">
 		<td colspan="3">
 			<span>[ <a href="torrents.php?action=download&amp;id=<?=$TorrentID?>&amp;authkey=<?=$LoggedUser['AuthKey']?>&amp;torrent_pass=<?=$LoggedUser['torrent_pass']?>" title="Download">DL</a>
 <?			if (Torrents::can_use_token($Torrent)) { ?>
@@ -223,11 +223,12 @@ function compare($X, $Y) {
 		$DisplayName = "$DisplayName [$GroupYear]";
 	}
 	$Tags = display_str($TorrentTags->format());
+	$PlainTags = implode(', ', $TorrentTags->get_tags());
 ?>
 		<li class="image_group_<?=$GroupID?>">
 			<a href="torrents.php?id=<?=$GroupID?>" class="bookmark_<?=$GroupID?>">
 <?	if ($WikiImage) { ?>
-				<img class="tooltip_interactive" src="<?=ImageTools::process($WikiImage, true)?>" alt="<?=$DisplayName?>" title="<?=$DisplayName?> <br /> <?=$Tags?>" width="117" />
+				<img class="tooltip_interactive" src="<?=ImageTools::process($WikiImage, true)?>" alt="<?=$DisplayName?>" title="<?=$DisplayName?> <br /> <?=$Tags?>" data-title-plain="<?="$DisplayName ($PlainTags)"?>" width="118" />
 <?	} else { ?>
 				<div style="width: 107px; padding: 5px;"><?=$DisplayName?></div>
 <?	} ?>
@@ -280,13 +281,11 @@ function compare($X, $Y) {
 			<div class="head"><strong>Stats</strong></div>
 			<ul class="stats nobullet">
 				<li>Torrents: <?=$NumGroups?></li>
-<? if (count($ArtistCount) > 0) { ?>
 				<li>Artists: <?=count($ArtistCount)?></li>
-<? } ?>
 			</ul>
 		</div>
 		<div class="box box_tags">
-			<div class="head"><strong>Top tags</strong></div>
+			<div class="head"><strong>Top Tags</strong></div>
 			<div class="pad">
 				<ol style="padding-left: 5px;">
 <? Tags::format_top(5) ?>
@@ -294,13 +293,15 @@ function compare($X, $Y) {
 			</div>
 		</div>
 		<div class="box box_artists">
-			<div class="head"><strong>Top artists</strong></div>
+			<div class="head"><strong>Top Artists</strong></div>
 			<div class="pad">
-				<ol style="padding-left: 5px;">
 <?
-uasort($ArtistCount, 'compare');
+	$Indent = "\t\t\t\t";
-$i = 0;
+	if (count($ArtistCount) > 0) {
-foreach ($ArtistCount as $ID => $Artist) {
+		echo "$Indent<ol style=\"padding-left: 5px;\">\n";
+		uasort($ArtistCount, 'compare');
+		$i = 0;
+		foreach ($ArtistCount as $ID => $Artist) {
 			$i++;
 			if ($i > 10) {
 				break;
@@ -308,9 +309,14 @@ function compare($X, $Y) {
 ?>
 					<li><a href="artist.php?id=<?=$ID?>"><?=display_str($Artist['name'])?></a> (<?=$Artist['count']?>)</li>
 <?
-}
+		}
+		echo "$Indent</ol>\n";
+	} else {
+		echo "$Indent<ul class=\"nobullet\" style=\"padding-left: 5px;\">\n";
+		echo "$Indent\t<li>There are no artists to display.</li>\n";
+		echo "$Indent</ul>\n";
+	}
 ?>
-				</ol>
 			</div>
 		</div>
 	</div>
@@ -324,7 +330,8 @@ function compare($X, $Y) {
 	$Page1 = array_slice($Collage, 0, $CollageCovers);
 	foreach ($Page1 as $Group) {
 		echo $Group;
-} ?>
+	}
+?>
 			</ul>
 		</div>
 <?	if ($NumGroups > $CollageCovers) { ?>
@@ -341,8 +348,10 @@ function compare($X, $Y) {
 		<script type="text/javascript">
 			collageShow.init(<?=json_encode($CollagePages)?>);
 		</script>
-<?		}
+<?
-} ?>
+	}
+}
+?>
 		<table class="torrent_table grouping cats" id="torrent_table">
 			<tr class="colhead_dark">
 				<td><!-- expand/collapse --></td>

sections/collages/browse.php

@@ -96,9 +96,9 @@
 }
 
 if (isset($_GET['tags_type']) && $_GET['tags_type'] === '0') { // Any
-	$_GET['tags_type'] = 0;
+	$_GET['tags_type'] = '0';
 } else { // All
-	$_GET['tags_type'] = 1;
+	$_GET['tags_type'] = '1';
 }
 
 if (!empty($Tags)) {
@@ -233,10 +233,13 @@
 	</div>
 <?	} // if (!$BookmarkView) ?>
 	<div class="linkbox">
-<?	if (!$BookmarkView) {
+<?
-		if (check_perms('site_collages_create')) { ?>
+	if (!$BookmarkView) {
+		if (check_perms('site_collages_create')) {
+?>
 		<a href="collages.php?action=new" class="brackets">New collage</a>
-<?		}
+<?
+		}
 		if (check_perms('site_collages_personal')) {
 
 			$DB->query("
@@ -253,16 +256,18 @@
 		<a href="collages.php?id=<?=$CollageID?>" class="brackets">Personal collage</a>
 <?			} elseif ($CollageCount > 1) { ?>
 		<a href="collages.php?action=mine" class="brackets">Personal collages</a>
-<?			}
+<?
 			}
-		if (check_perms('site_collages_subscribe')) { ?>
+		}
+		if (check_perms('site_collages_subscribe')) {
+?>
 		<a href="userhistory.php?action=subscribed_collages" class="brackets">Subscribed collages</a>
 <?		} ?>
 		<a href="bookmarks.php?type=collages" class="brackets">Bookmarked collages</a>
-<?
+<?		if (check_perms('site_collages_recover')) { ?>
-		if (check_perms('site_collages_recover')) { ?>
 		<a href="collages.php?action=recover" class="brackets">Recover collage</a>
-<?		}
+<?
+		}
 		if (check_perms('site_collages_create') || check_perms('site_collages_personal') || check_perms('site_collages_recover')) {
 ?>
 		<br />
@@ -274,11 +279,10 @@
 		<a href="bookmarks.php?type=artists" class="brackets">Artists</a>
 		<a href="bookmarks.php?type=collages" class="brackets">Collages</a>
 		<a href="bookmarks.php?type=requests" class="brackets">Requests</a>
-<?	} ?>
-<br /><br />
 <?
-$Pages = Format::get_pages($Page, $NumResults, COLLAGES_PER_PAGE, 9);
+	}
-echo $Pages;
+	$Pages = Format::get_pages($Page, $NumResults, COLLAGES_PER_PAGE, 9);
+	echo $Pages;
 ?>
 	</div>
 <?	if (count($Collages) === 0) { ?>
@@ -293,7 +297,8 @@
 </div><!--content-->
 <?		View::show_footer();
 		die();
-	} ?>
+	}
+?>
 <table width="100%" class="collage_table">
 	<tr class="colhead">
 		<td>Category</td>
@@ -331,7 +336,8 @@
 		<td><?=Users::format_username($UserID, false, false, false)?></td>
 	</tr>
 <?
-} ?>
+}
+?>
 </table>
 	<div class="linkbox"><?=$Pages?></div>
 </div>

sections/collages/torrent_collage.php

@@ -235,11 +235,12 @@
 		$DisplayName = "$DisplayName [$GroupYear]";
 	}
 	$Tags = display_str($TorrentTags->format());
+	$PlainTags = implode(', ', $TorrentTags->get_tags());
 ?>
 				<li class="image_group_<?=$GroupID?>">
 					<a href="torrents.php?id=<?=$GroupID?>">
 <?	if ($WikiImage) { ?>
-						<img class="tooltip_interactive" src="<?=ImageTools::process($WikiImage, true)?>" alt="<?=$DisplayName?>" title="<?=$DisplayName?> <br /> <?=$Tags?>" width="118" />
+						<img class="tooltip_interactive" src="<?=ImageTools::process($WikiImage, true)?>" alt="<?=$DisplayName?>" title="<?=$DisplayName?> <br /> <?=$Tags?>" data-title-plain="<?="$DisplayName ($PlainTags)"?>" width="118" />
 <?	} else { ?>
 						<span style="width: 107px; padding: 5px;"><?=$DisplayName?></span>
 <?	} ?>
@@ -254,7 +255,7 @@
 }
 
 // Silly hack for people who are on the old setting
-$CollageCovers = (isset($LoggedUser['CollageCovers']) ? $LoggedUser['CollageCovers'] : 25 * (abs($LoggedUser['HideCollage'] - 1)));
+$CollageCovers = isset($LoggedUser['CollageCovers']) ? $LoggedUser['CollageCovers'] : 25 * (abs($LoggedUser['HideCollage'] - 1));
 $CollagePages = array();
 
 // Pad it out
@@ -264,7 +265,6 @@
 	}
 }
 
-
 for ($i = 0; $i < $NumGroups / $CollageCovers; $i++) {
 	$Groups = array_slice($Collage, $i * $CollageCovers, $CollageCovers);
 	$CollagePage = '';
@@ -324,7 +324,7 @@
 <?
 if (check_perms('zip_downloader')) {
 	if (isset($LoggedUser['Collector'])) {
-		list($ZIPList,$ZIPPrefs) = $LoggedUser['Collector'];
+		list($ZIPList, $ZIPPrefs) = $LoggedUser['Collector'];
 		$ZIPList = explode(':', $ZIPList);
 	} else {
 		$ZIPList = array('00', '11');
@@ -354,7 +354,7 @@
 $LastGroupID = -1;
 
 foreach ($ZIPOptions as $Option) {
-	list($GroupID,$OptionID,$OptName) = $Option;
+	list($GroupID, $OptionID, $OptName) = $Option;
 
 	if ($GroupID != $LastGroupID) {
 		$LastGroupID = $GroupID;

sections/requests/request.php

@@ -222,7 +222,7 @@
 		</div>
 		<div class="box box_votes">
 			<div class="head"><strong>Top Contributors</strong></div>
-			<table class="layout">
+			<table class="layout" id="request_top_contrib">
 <?
 	$VoteMax = ($VoteCount < 5 ? $VoteCount : 5);
 	$ViewerVote = false;
@@ -431,21 +431,18 @@
 				</td>
 			</tr>
 <?	} ?>
-			<tr>
-				<td colspan="2" class="center"><strong>Description</strong></td>
-			</tr>
-			<tr>
-				<td colspan="2">
-<?=					$Text->full_format($Request['Description']);?>
-				</td>
-			</tr>
 		</table>
+		<div class="box2 box_request_desc">
+			<div class="head"><strong>Description</strong></div>
+			<div class="pad">
+<?=				$Text->full_format($Request['Description']);?>
+			</div>
+		</div>
 <?
-
 list($NumComments, $Page, $Thread, $LastRead) = Comments::load('requests', $RequestID);
-
 ?>
-	<div class="linkbox"><a name="comments"></a>
+		<div class="linkbox">
+			<a name="comments"></a>
 <?
 $Pages = Format::get_pages($Page, $NumComments, TORRENT_COMMENTS_PER_PAGE, 9, '#comments');
 echo $Pages;

sections/requests/requests.php

@@ -316,7 +316,7 @@
 }
 
 $SphQLResult = $SphQL->query();
-$NumResults = $SphQLResult->get_meta('total_found');
+$NumResults = (int)$SphQLResult->get_meta('total_found');
 if ($NumResults > 0) {
 	$SphRequests = $SphQLResult->to_array('id');
 	if ($OrderBy === 'random') {
@@ -355,6 +355,11 @@
 		<a href="bookmarks.php?type=requests" class="brackets">Requests</a>
 <?	} ?>
 	</div>
+<?	if ($BookmarkView && $NumResults === 0) { ?>
+	<div class="box pad" align="center">
+		<h2>You have not bookmarked any requests.</h2>
+	</div>
+<?	} else { ?>
 	<form class="search_form" name="requests" action="" method="get">
 <?		if ($BookmarkView) { ?>
 		<input type="hidden" name="action" value="view" />
@@ -405,9 +410,9 @@
 		</table>
 		<table class="layout cat_list">
 <?
-$x = 1;
+		$x = 1;
-reset($Categories);
+		reset($Categories);
-foreach ($Categories as $CatKey => $CatName) {
+		foreach ($Categories as $CatKey => $CatName) {
 			if ($x % 8 === 0 || $x === 1) {
 ?>
 				<tr>
@@ -416,14 +421,12 @@
 						<input type="checkbox" name="filter_cat[<?=($CatKey + 1) ?>]" id="cat_<?=($CatKey + 1) ?>" value="1"<? if (isset($_GET['filter_cat'][$CatKey + 1])) { ?> checked="checked"<? } ?> />
 						<label for="cat_<?=($CatKey + 1) ?>"><?=$CatName?></label>
 					</td>
-<?
+<?			if ($x % 7 === 0) { ?>
-	if ($x % 7 === 0) {
-?>
 				</tr>
 <?
 			}
 			$x++;
-}
+		}
 ?>
 		</table>
 		<table class="layout">
@@ -432,8 +435,8 @@
 				<td>
 					<input type="checkbox" id="toggle_releases" onchange="Toggle('releases', 0);"<?=(!$Submitted || !empty($ReleaseArray) && count($ReleaseArray) === count($ReleaseTypes) ? ' checked="checked"' : '') ?> /> <label for="toggle_releases">All</label>
 <?
-$i = 0;
+		$i = 0;
-foreach ($ReleaseTypes as $Key => $Val) {
+		foreach ($ReleaseTypes as $Key => $Val) {
 			if ($i % 8 === 0) {
 				echo '<br />';
 			}
@@ -443,7 +446,7 @@
 					/> <label for="release_<?=$Key?>"><?=$Val?></label>
 <?
 			$i++;
-}
+		}
 ?>
 				</td>
 			</tr>
@@ -455,7 +458,7 @@
 					<input type="checkbox" id="formats_strict" name="formats_strict"<?=(!empty($_GET['formats_strict']) ? ' checked="checked"' : '')?> />
 					<label for="formats_strict">Only specified</label>
 <?
-foreach ($Formats as $Key => $Val) {
+		foreach ($Formats as $Key => $Val) {
 			if ($Key % 8 === 0) {
 				echo '<br />';
 			}
@@ -463,9 +466,7 @@
 					<input type="checkbox" name="formats[]" value="<?=$Key?>" id="format_<?=$Key?>"
 						<?=(!$Submitted || (!empty($FormatArray) && in_array($Key, $FormatArray)) ? ' checked="checked" ' : '')?>
 					/> <label for="format_<?=$Key?>"><?=$Val?></label>
-<?
+<?		} ?>
-}
-?>
 				</td>
 			</tr>
 			<tr id="bitrate_list">
@@ -476,7 +477,7 @@
 					<input type="checkbox" id="bitrate_strict" name="bitrate_strict"<?=(!empty($_GET['bitrate_strict']) ? ' checked="checked"' : '') ?> />
 					<label for="bitrate_strict">Only specified</label>
 <?
-foreach ($Bitrates as $Key => $Val) {
+		foreach ($Bitrates as $Key => $Val) {
 			if ($Key % 8 === 0) {
 				echo '<br />';
 			}
@@ -485,7 +486,7 @@
 						<?=(!$Submitted || (!empty($BitrateArray) && in_array($Key, $BitrateArray)) ? ' checked="checked" ' : '')?>
 					/> <label for="bitrate_<?=$Key?>"><?=$Val?></label>
 <?
-}
+		}
 ?>
 				</td>
 			</tr>
@@ -497,7 +498,7 @@
 					<input type="checkbox" id="media_strict" name="media_strict"<?=(!empty($_GET['media_strict']) ? ' checked="checked"' : '')?> />
 					<label for="media_strict">Only specified</label>
 <?
-foreach ($Media as $Key => $Val) {
+		foreach ($Media as $Key => $Val) {
 			if ($Key % 8 === 0) {
 				echo '<br />';
 			}
@@ -505,9 +506,7 @@
 					<input type="checkbox" name="media[]" value="<?=$Key?>" id="media_<?=$Key?>"
 						<?=(!$Submitted || (!empty($MediaArray) && in_array($Key, $MediaArray)) ? ' checked="checked" ' : '')?>
 					/> <label for="media_<?=$Key?>"><?=$Val?></label>
-<?
+<?		} ?>
-}
-?>
 				</td>
 			</tr>
 			<tr>
@@ -517,10 +516,9 @@
 			</tr>
 		</table>
 	</form>
-
 <?		if (isset($PageLinks)) { ?>
 	<div class="linkbox">
-		<?=$PageLinks?>
+		<?=	$PageLinks?>
 	</div>
 <?		} ?>
 	<table id="request_table" class="request_table border" cellpadding="6" cellspacing="1" border="0" width="100%">
@@ -550,7 +548,10 @@
 				<a href="?order=lastvote&amp;sort=<?=($OrderBy === 'lastvote' ? $NewSort : 'desc')?>&amp;<?=$CurrentURL?>"><strong>Last vote</strong></a>
 			</td>
 		</tr>
-<? if ($NumResults === 0) { ?>
+<?
+		if ($NumResults === 0) {
+			// not viewing bookmarks but no requests found
+?>
 		<tr class="rowb">
 			<td colspan="8">
 				Nothing found!
@@ -562,7 +563,9 @@
 				The requested page contains no matches!
 			</td>
 		</tr>
-<? } else {
+<?
+		} else {
+
 	$TimeCompare = 1267643718; // Requests v2 was implemented 2010-03-03 20:15:18
 	$Requests = Requests::get_requests(array_keys($SphRequests));
 	foreach ($SphRequests as $RequestID => $SphRequest) {
@@ -590,7 +593,7 @@
 		} elseif ($CategoryName === 'Audiobooks' || $CategoryName === 'Comedy') {
 			$FullName = "<a href=\"requests.php?action=view&amp;id=$RequestID\">$Request[Title] [$Request[Year]]</a>";
 		} else {
-			$FullName ="<a href=\"requests.php?action=view&amp;id=$RequestID\">$Request[Title]</a>";
+			$FullName = "<a href=\"requests.php?action=view&amp;id=$RequestID\">$Request[Title]</a>";
 		}
 		$Tags = $Request['Tags'];
 ?>
@@ -617,9 +620,9 @@
 			<td class="number_column nobr">
 				<?=Format::get_size($Bounty)?>
 			</td>
-			<td>
+			<td class="nobr">
 <?		if ($IsFilled) { ?>
-				<a href="torrents.php?<?=(strtotime($Request['TimeFilled']) < $TimeCompare ? 'id=' : 'torrentid=') . $Request['TorrentID']?>"><strong><?=time_diff($Request['TimeFilled'])?></strong></a>
+				<a href="torrents.php?<?=(strtotime($Request['TimeFilled']) < $TimeCompare ? 'id=' : 'torrentid=') . $Request['TorrentID']?>"><strong><?=time_diff($Request['TimeFilled'], 1)?></strong></a>
 <?		} else { ?>
 				<strong>No</strong>
 <?		} ?>
@@ -634,16 +637,17 @@
 			<td>
 				<a href="user.php?id=<?=$Request['UserID']?>"><?=Users::format_username($Request['UserID'], false, false, false)?></a>
 			</td>
-			<td>
+			<td class="nobr">
-				<?=time_diff($Request['TimeAdded'])?>
+				<?=time_diff($Request['TimeAdded'], 1)?>
 			</td>
-			<td>
+			<td class="nobr">
-				<?=time_diff($Request['LastVote'])?>
+				<?=time_diff($Request['LastVote'], 1)?>
 			</td>
 		</tr>
 <?
 	} // foreach
-} // else
+		} // else
+	} // if ($BookmarkView && $NumResults < 1)
 ?>
 	</table>
 <? if (isset($PageLinks)) { ?>

sections/top10/lastfm.php

@@ -5,10 +5,10 @@
 //$Limit = in_array($Limit, array(100, 250, 500)) ? $Limit : 100;
 
 
-$Category = isset($_GET['category']) ? ($_GET['category']) : 'weekly';
+$Category = isset($_GET['category']) ? $_GET['category'] : 'weekly';
 $Category = in_array($Category, array('all_time', 'weekly', 'hyped')) ? $Category : 'weekly';
 
-$View = isset($_GET['view']) ? ($_GET['view']) : 'tiles';
+$View = isset($_GET['view']) ? $_GET['view'] : 'tiles';
 $View = in_array($View, array('tiles', 'list')) ? $View : 'tiles';
 
 switch ($Category) {
@@ -37,7 +37,8 @@
 <?
 		foreach ($Artists as $Artist) {
 				Top10View::render_artist_tile($Artist, $Category);
-				} ?>
+		}
+?>
 			</ul>
 		</div>
 <?	} else { ?>
@@ -46,7 +47,8 @@
 <?
 		foreach ($Artists as $Artist) {
 				Top10View::render_artist_list($Artist, $Category);
-				} ?>
+		}
+?>
 			</ul>
 		</div>
 <?	} ?>

sections/user/user.php

@@ -937,7 +937,7 @@ function check_paranoia_here($Setting) {
 <div class="box">
 	<div class="head">Forum warnings</div>
 	<div class="pad">
-		<div id="forumwarningslinks" class="AdminComment box" style="width: 98%;"><?=$Text->full_format($ForumWarnings)?></div>
+		<div id="forumwarningslinks" class="AdminComment" style="width: 98%;"><?=$Text->full_format($ForumWarnings)?></div>
 	</div>
 </div>
 <?
@@ -957,7 +957,7 @@ function check_paranoia_here($Setting) {
 			</div>
 			<div id="staffnotes" class="pad">
 				<input type="hidden" name="comment_hash" value="<?=$CommentHash?>" />
-				<div id="admincommentlinks" class="AdminComment box" style="width: 98%;"><?=$Text->full_format($AdminComment)?></div>
+				<div id="admincommentlinks" class="AdminComment" style="width: 98%;"><?=$Text->full_format($AdminComment)?></div>
 				<textarea id="admincomment" onkeyup="resize('admincomment');" class="AdminComment hidden" name="AdminComment" cols="65" rows="26" style="width: 98%;"><?=display_str($AdminComment)?></textarea>
 				<a href="#" name="admincommentbutton" onclick="ChangeTo('text'); return false;" class="brackets">Toggle edit</a>
 				<script type="text/javascript">

static/functions/collage.js

@@ -14,7 +14,7 @@ function Cancel() {
 	var e=document.getElementsByTagName("input");
 	for (i = 0; i < e.length; i++) {
 		if (e[i].type == "checkbox") {
-			e[i].checked=false;
+			e[i].checked = false;
 		}
 	}
 	document.getElementById("choices").raw().value = "";
@@ -46,13 +46,13 @@ var collageShow = {
 	createUL:function(data) {
 		var ul = document.createElement('ul');
 		$(ul).add_class('collage_images');
-		ul.id = 'collage_page'+this.pg;
+		ul.id = 'collage_page' + this.pg;
 		$(ul).html(data);
 		this.wrap.appendChild(ul);
 		return ul;
 	},
-	page:function(num,el) {
+	page:function(num, el) {
-		var ul = $('#collage_page'+num).raw(), s = this.selected(), covers, lists, i;
+		var ul = $('#collage_page' + num).raw(), s = this.selected(), covers, lists, i;
 		this.pg = num;
 
 		if (!ul) {
@@ -127,6 +127,6 @@ var collageShow = {
 		this.pager();
 	},
 	pager:function() {
-		this.page(this.pg,$('#pagelink'+this.pg).raw().firstChild);
+		this.page(this.pg, $('#pagelink' + this.pg).raw().firstChild);
 	}
 };

static/functions/tooltipster_settings.js

@@ -1,7 +1,7 @@
 var tooltip_delay = 500;
 $(document).ready(function() {
 	if (!$.fn.tooltipster) {
-		$('.tooltip_interactive, .tooltip, .tooltip_gold').each(function() {
+		$('.tooltip_interactive, .tooltip_image, .tooltip, .tooltip_gold').each(function() {
 			if ($(this).data('title-plain')) {
 				$(this).attr('title', $(this).data('title-plain'));
 			}

static/styles/anorex/style.css

@@ -394,7 +394,7 @@ p.min_padding {
 	padding: 4px;
 	background: #b78234 url(images/woodnavcenter.png) repeat-x;
 	border-bottom: 1px solid #65430F;
-	font-weight:bold;
+	font-weight: bold;
 }
 
 .body {
@@ -858,6 +858,24 @@ div[class~=tooltipster-content] > a {
 	font-weight: normal;
 }
 
-.reportsv2_views_table {
+/* get rid of extraneous padding in the Top Contributors box */
-	width: 100%;
+#request_top_contrib {
+	border: none;
+}
+#request_top_contrib tr:first-child th {
+	border-top: 0;
+}
+#request_top_contrib tr:last-child td {
+	border-bottom: 0;
+}
+#request_top_contrib tr td:first-child,
+#request_top_contrib tr th:first-child,
+#request_top_contrib tr td:nth-child(2),
+#request_top_contrib tr th:nth-child(2) {
+	border-left: 0;
+	border-top: 0;
+}
+#request_top_contrib tr td:last-child,
+#request_top_contrib tr th:last-child {
+	border-right: 0;
 }

static/styles/global.css

@@ -620,16 +620,6 @@ tr.torrent .bookmark>a:after {
 	font-weight: bolder;
 }
 
-.reportsv2_views_table {
-	width: 70%;
-}
-
-.reportsv2_views_container {
-	margin-left: auto;
-	margin-right: auto;
-	padding: 10px 20px 20px 20px;
-}
-
 .noborder {
 	border: none;
 }

static/styles/kuro/style.css

@@ -929,7 +929,3 @@ tr.torrent .bookmark > a:after { color:#999; }
 .vote_tag_down, .vote_artist_down, .vote_album_down, .small_downvote, .small_downvoted {
 	color: red;
 }
-
-.reportsv2_views_table {
-	width: 100%;
-}

static/styles/layer_cake/style.css

@@ -332,6 +332,11 @@ input.hidden {
 	margin: 0px auto;
 }
 
+.widethin { /* overriding the thin class on torrents.php */
+	width: 95% !important;
+	margin: 0px auto;
+}
+
 #userinfo_major .brackets:before {
 	font-weight: bold;
 }
@@ -442,7 +447,6 @@ table {
 }
 
 tr {
-	border: 1px solid #666666;
 	background-color: #EEE;
 }
 
@@ -795,6 +799,10 @@ tr.torrent .bookmark > a:after {
 	width: 600px;
 }
 
+.brackets {
+	font-weight: normal;
+}
+
 div[class~=tooltipster-content] > a {
 	color: #AAAAAA;
 }
@@ -811,6 +819,24 @@ div[class~=tooltipster-content] > a {
 	color: red;
 }
 
-.reportsv2_views_table {
+/* get rid of extraneous padding in the Top Contributors box */
-	width: 100%;
+#request_top_contrib {
+	border: none;
+}
+#request_top_contrib tr:first-child th {
+	border-top: 0;
+}
+#request_top_contrib tr:last-child td {
+	border-bottom: 0;
+}
+#request_top_contrib tr td:first-child,
+#request_top_contrib tr th:first-child,
+#request_top_contrib tr td:nth-child(2),
+#request_top_contrib tr th:nth-child(2) {
+	border-left: 0;
+	border-top: 0;
+}
+#request_top_contrib tr td:last-child,
+#request_top_contrib tr th:last-child {
+	border-right: 0;
 }

static/styles/minimal/style.css

@@ -580,7 +580,3 @@ tr.torrent .bookmark > a:after { content: ""; }
 .permission_container:first-child {
 	margin-left: 0;
 }
-
-.reportsv2_views_container {
-	width: 100%;
-}

static/styles/minimal_mod_alt.css

@@ -1504,7 +1504,3 @@ ul.collage_images {
 .top10_quantity_links .brackets:after {
 	color: #F1F1F1;
 }
-
-.reportsv2_views_container {
-	width: 100%;
-}

static/styles/postmod/style.css

@@ -1107,11 +1107,3 @@ div[class~=tooltipster-content] > a {
 .vote_tag_down, .vote_artist_down, .vote_album_down, .small_downvote, .small_downvoted {
 	color: red;
 }
-
-.reportsv2_views_table {
-	width: 100%;
-}
-
-.reportsv2_views_container {
-	width: 100%;
-}

static/styles/proton/style.css

@@ -2066,10 +2066,6 @@ div[class~=tooltipster-base] {
 	color: #575757;
 }
 
-.reportsv2_views_table {
-	width: 90%;
-}
-
 /*
 Consistent .box and .pad
 TODO: Make these rules apply globally and add exceptions where needed