Empty commit

This commit is contained in:
Git 2013-01-24 08:00:24 +00:00
parent 54f79441ac
commit 885ef63219
48 changed files with 334 additions and 158 deletions

View File

@ -270,7 +270,7 @@ public function where_match($Expr, $Field = '*', $Escape = true) {
* @param string $Mode sort method to apply to the selected attribute * @param string $Mode sort method to apply to the selected attribute
* @return current SphinxQL query object * @return current SphinxQL query object
*/ */
public function order_by($Attribute = false, $Mode) { public function order_by($Attribute = false, $Mode = false) {
if (empty($Attribute)) { if (empty($Attribute)) {
$this->SortBy = array(); $this->SortBy = array();
} else { } else {
@ -303,7 +303,7 @@ public function group_by($Attribute = false) {
* @param string $Mode sort method to apply to the selected attribute * @param string $Mode sort method to apply to the selected attribute
* @return current SphinxQL query object * @return current SphinxQL query object
*/ */
public function order_group_by($Attribute = false, $Mode) { public function order_group_by($Attribute = false, $Mode = false) {
if (empty($Attribute)) { if (empty($Attribute)) {
$this->SortGroupBy = ''; $this->SortGroupBy = '';
} else { } else {

View File

@ -202,6 +202,9 @@ public static function user_heavy_info($UserID) {
} else { } else {
$HeavyInfo['CustomForums'] = null; $HeavyInfo['CustomForums'] = null;
} }
if (isset($HeavyInfo['CustomForums'][''])) {
unset($HeavyInfo['CustomForums']['']);
}
$HeavyInfo['SiteOptions'] = unserialize($HeavyInfo['SiteOptions']); $HeavyInfo['SiteOptions'] = unserialize($HeavyInfo['SiteOptions']);
if (!empty($HeavyInfo['SiteOptions'])) { if (!empty($HeavyInfo['SiteOptions'])) {

View File

@ -9,14 +9,13 @@ class Votes {
public static function vote_link($GroupID, $Vote = '') { public static function vote_link($GroupID, $Vote = '') {
global $LoggedUser; global $LoggedUser;
if (!$LoggedUser['NoVoteLinks'] && check_perms('site_album_votes')) { ?> if (!$LoggedUser['NoVoteLinks'] && check_perms('site_album_votes')) { ?>
<span class="votespan" style="white-space: nowrap"> <span class="votespan brackets" style="white-space: nowrap">
( Vote: Vote:
<a href="#" onclick="UpVoteGroup(<?=$GroupID?>, '<?=$LoggedUser['AuthKey']?>'); return false;" class="small_upvote vote_link_<?=$GroupID?><?=(!empty($Vote)?' hidden':'')?>"></a> <a href="#" onclick="UpVoteGroup(<?=$GroupID?>, '<?=$LoggedUser['AuthKey']?>'); return false;" class="small_upvote vote_link_<?=$GroupID?><?=(!empty($Vote)?' hidden':'')?>"></a>
<span class="voted_type small_upvoted voted_up_<?=$GroupID?><?=(($Vote == 'Down' || empty($Vote))?' hidden':'')?>"></span> <span class="voted_type small_upvoted voted_up_<?=$GroupID?><?=(($Vote == 'Down' || empty($Vote))?' hidden':'')?>"></span>
<a href="#" onclick="DownVoteGroup(<?=$GroupID?>, '<?=$LoggedUser['AuthKey']?>'); return false;" class="small_downvote vote_link_<?=$GroupID?><?=(!empty($Vote)?' hidden':'')?>"></a> <a href="#" onclick="DownVoteGroup(<?=$GroupID?>, '<?=$LoggedUser['AuthKey']?>'); return false;" class="small_downvote vote_link_<?=$GroupID?><?=(!empty($Vote)?' hidden':'')?>"></a>
<span class="voted_type small_downvoted voted_down_<?=$GroupID?><?=(($Vote == 'Up'|| empty($Vote))?' hidden':'')?>"></span> <span class="voted_type small_downvoted voted_down_<?=$GroupID?><?=(($Vote == 'Up'|| empty($Vote))?' hidden':'')?>"></span>
<a href="#" onclick="UnvoteGroup(<?=$GroupID?>, '<?=$LoggedUser['AuthKey']?>'); return false;" class="small_clearvote vote_clear_<?=$GroupID?><?=(empty($Vote)?' hidden':'')?>">x</a> <a href="#" onclick="UnvoteGroup(<?=$GroupID?>, '<?=$LoggedUser['AuthKey']?>'); return false;" class="small_clearvote vote_clear_<?=$GroupID?><?=(empty($Vote)?' hidden':'')?>">x</a>
)
</span> </span>
<? } <? }
} }

View File

@ -496,7 +496,7 @@ function compare($X, $Y){
<h2><?=display_str($Name)?><? if ($RevisionID) { ?> (Revision #<?=$RevisionID?>)<? } if ($VanityHouseArtist) { ?> [Vanity House] <? } ?></h2> <h2><?=display_str($Name)?><? if ($RevisionID) { ?> (Revision #<?=$RevisionID?>)<? } if ($VanityHouseArtist) { ?> [Vanity House] <? } ?></h2>
<div class="linkbox"> <div class="linkbox">
<? if (check_perms('site_submit_requests')) { ?> <? if (check_perms('site_submit_requests')) { ?>
[<a href="requests.php?action=new&amp;artistid=<?=$ArtistID?>">Add request</a>] <a href="requests.php?action=new&amp;artistid=<?=$ArtistID?>" class="brackets">Add request</a>
<? } <? }
if (check_perms('site_torrents_notify')) { if (check_perms('site_torrents_notify')) {
@ -507,38 +507,38 @@ function compare($X, $Y){
} }
if (stripos($Notify['Artists'], '|'.$Name.'|') === false) { if (stripos($Notify['Artists'], '|'.$Name.'|') === false) {
?> ?>
[<a href="artist.php?action=notify&amp;artistid=<?=$ArtistID?>&amp;auth=<?=$LoggedUser['AuthKey']?>">Notify of new uploads</a>] <a href="artist.php?action=notify&amp;artistid=<?=$ArtistID?>&amp;auth=<?=$LoggedUser['AuthKey']?>" class="brackets">Notify of new uploads</a>
<? <?
} else { } else {
?> ?>
[<a href="artist.php?action=notifyremove&amp;artistid=<?=$ArtistID?>&amp;auth=<?=$LoggedUser['AuthKey']?>">Do not notify of new uploads</a>] <a href="artist.php?action=notifyremove&amp;artistid=<?=$ArtistID?>&amp;auth=<?=$LoggedUser['AuthKey']?>" class="brackets">Do not notify of new uploads</a>
<? <?
} }
} }
if (has_bookmarked('artist', $ArtistID)) { if (has_bookmarked('artist', $ArtistID)) {
?> ?>
[<a href="#" id="bookmarklink_artist_<?=$ArtistID?>" onclick="Unbookmark('artist', <?=$ArtistID?>,'[Bookmark]');return false;">Remove bookmark</a>] <a href="#" id="bookmarklink_artist_<?=$ArtistID?>" onclick="Unbookmark('artist', <?=$ArtistID?>,'Bookmark');return false;" class="brackets">Remove bookmark</a>
<? <?
} else { } else {
?> ?>
[<a href="#" id="bookmarklink_artist_<?=$ArtistID?>" onclick="Bookmark('artist', <?=$ArtistID?>,'[Remove bookmark]');return false;">Bookmark</a>] <a href="#" id="bookmarklink_artist_<?=$ArtistID?>" onclick="Bookmark('artist', <?=$ArtistID?>,'Remove bookmark');return false;" class="brackets">Bookmark</a>
<? <?
} }
if (check_perms('site_edit_wiki')) { if (check_perms('site_edit_wiki')) {
?> ?>
[<a href="artist.php?action=edit&amp;artistid=<?=$ArtistID?>">Edit</a>] <a href="artist.php?action=edit&amp;artistid=<?=$ArtistID?>" class="brackets">Edit</a>
<? } ?> <? } ?>
[<a href="artist.php?action=history&amp;artistid=<?=$ArtistID?>">View history</a>] <a href="artist.php?action=history&amp;artistid=<?=$ArtistID?>" class="brackets">View history</a>
[<a href="artist.php?id=<?=$ArtistID?>#info">Info</a>] <a href="artist.php?id=<?=$ArtistID?>#info" class="brackets">Info</a>
<!-- <strip>--> <!-- <strip>-->
[<a href="artist.php?id=<?=$ArtistID?>#concerts">Concerts</a>] <a href="artist.php?id=<?=$ArtistID?>#concerts" class="brackets">Concerts</a>
<!-- </strip>--> <!-- </strip>-->
[<a href="artist.php?id=<?=$ArtistID?>#artistcomments">Comments</a>] <a href="artist.php?id=<?=$ArtistID?>#artistcomments" class="brackets">Comments</a>
<? if (check_perms('site_delete_artist') && check_perms('torrents_delete')) { ?> <? if (check_perms('site_delete_artist') && check_perms('torrents_delete')) { ?>
[<a href="artist.php?action=delete&amp;artistid=<?=$ArtistID?>&amp;auth=<?=$LoggedUser['AuthKey']?>">Delete</a>] <a href="artist.php?action=delete&amp;artistid=<?=$ArtistID?>&amp;auth=<?=$LoggedUser['AuthKey']?>" class="brackets">Delete</a>
<? } <? }
if ($RevisionID && check_perms('site_edit_wiki')) { if ($RevisionID && check_perms('site_edit_wiki')) {

View File

@ -422,12 +422,12 @@ function display_name($ReleaseType) {
if (has_bookmarked('artist', $ArtistID)) { if (has_bookmarked('artist', $ArtistID)) {
?> ?>
[<a href="#" id="bookmarklink_artist_<?=$ArtistID?>" onclick="Unbookmark('artist', <?=$ArtistID?>,'[Bookmark]');return false;">Remove bookmark</a>] [<a href="#" id="bookmarklink_artist_<?=$ArtistID?>" class="brackets" onclick="Unbookmark('artist', <?=$ArtistID?>,'Bookmark');return false;">Remove bookmark</a>]
<? <?
} else { } else {
?> ?>
[<a href="#" id="bookmarklink_artist_<?=$ArtistID?>" onclick="Bookmark('artist', <?=$ArtistID?>,'[Remove bookmark]');return false;">Bookmark</a>] [<a href="#" id="bookmarklink_artist_<?=$ArtistID?>" class="brackets" onclick="Bookmark('artist', <?=$ArtistID?>,'Remove bookmark');return false;">Bookmark</a>]
<? <?
} }

View File

@ -284,14 +284,14 @@ function compare($X, $Y){
<div class="header"> <div class="header">
<h2><? if (!$Sneaky) { ?><a href="feeds.php?feed=torrents_bookmarks_t_<?=$LoggedUser['torrent_pass']?>&amp;user=<?=$LoggedUser['ID']?>&amp;auth=<?=$LoggedUser['RSS_Auth']?>&amp;passkey=<?=$LoggedUser['torrent_pass']?>&amp;authkey=<?=$LoggedUser['AuthKey']?>&amp;name=<?=urlencode(SITE_NAME.': Bookmarked Torrents')?>"><img src="<?=STATIC_SERVER?>/common/symbols/rss.png" alt="RSS feed" /></a>&nbsp;<? } ?><?=$Title?></h2> <h2><? if (!$Sneaky) { ?><a href="feeds.php?feed=torrents_bookmarks_t_<?=$LoggedUser['torrent_pass']?>&amp;user=<?=$LoggedUser['ID']?>&amp;auth=<?=$LoggedUser['RSS_Auth']?>&amp;passkey=<?=$LoggedUser['torrent_pass']?>&amp;authkey=<?=$LoggedUser['AuthKey']?>&amp;name=<?=urlencode(SITE_NAME.': Bookmarked Torrents')?>"><img src="<?=STATIC_SERVER?>/common/symbols/rss.png" alt="RSS feed" /></a>&nbsp;<? } ?><?=$Title?></h2>
<div class="linkbox"> <div class="linkbox">
<a href="bookmarks.php?type=torrents">[Torrents]</a> <a href="bookmarks.php?type=torrents" class="brackets">Torrents</a>
<a href="bookmarks.php?type=artists">[Artists]</a> <a href="bookmarks.php?type=artists" class="brackets">Artists</a>
<a href="bookmarks.php?type=collages">[Collages]</a> <a href="bookmarks.php?type=collages" class="brackets">Collages</a>
<a href="bookmarks.php?type=requests">[Requests]</a> <a href="bookmarks.php?type=requests" class="brackets">Requests</a>
<? if (count($TorrentList) > 0) { ?> <? if (count($TorrentList) > 0) { ?>
<br /><br /> <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']?>" class="brackets" 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=edit&amp;type=torrents">[Manage Torrents]</a> <a href="bookmarks.php?action=edit&amp;type=torrents" class="brackets">Manage Torrents</a>
<? } ?> <? } ?>
</div> </div>
</div> </div>

View File

@ -221,7 +221,7 @@
<div class="linkbox"> <div class="linkbox">
<? if (!$BookmarkView) { <? if (!$BookmarkView) {
if (check_perms('site_collages_create')) { ?> if (check_perms('site_collages_create')) { ?>
[<a href="collages.php?action=new">New collage</a>] <a href="collages.php?action=new" class="brackets">New collage</a>
<? } <? }
if (check_perms('site_collages_personal')) { if (check_perms('site_collages_personal')) {
@ -231,18 +231,18 @@
if ($CollageCount == 1) { if ($CollageCount == 1) {
list($CollageID) = $DB->next_record(); list($CollageID) = $DB->next_record();
?> ?>
[<a href="collages.php?id=<?=$CollageID?>">Personal collage</a>] <a href="collages.php?id=<?=$CollageID?>" class="brackets">Personal collage</a>
<? } elseif ($CollageCount > 1) { ?> <? } elseif ($CollageCount > 1) { ?>
[<a href="collages.php?action=mine">Personal collages</a>] <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">Subscribed collages</a>] <a href="userhistory.php?action=subscribed_collages" class="brackets">Subscribed collages</a>
<? } ?> <? } ?>
[<a href="bookmarks.php?type=collages">Bookmarked 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">Recover collage</a>] <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')) { if (check_perms('site_collages_create') || check_perms('site_collages_personal') || check_perms('site_collages_recover')) {
@ -251,13 +251,13 @@
<? <?
} }
?> ?>
[<a href="collages.php?userid=<?=$LoggedUser['ID']?>">Collages you started</a>] <a href="collages.php?userid=<?=$LoggedUser['ID']?>" class="brackets">Collages you started</a>
[<a href="collages.php?userid=<?=$LoggedUser['ID']?>&amp;contrib=1">Collages you contributed to</a>] <a href="collages.php?userid=<?=$LoggedUser['ID']?>&amp;contrib=1" class="brackets">Collages you contributed to</a>
<? } else { ?> <? } else { ?>
[<a href="bookmarks.php?type=torrents">Torrents</a>] <a href="bookmarks.php?type=torrents" class="brackets">Torrents</a>
[<a href="bookmarks.php?type=artists">Artists</a>] <a href="bookmarks.php?type=artists" class="brackets">Artists</a>
[<a href="bookmarks.php?type=collages">Collages</a>] <a href="bookmarks.php?type=collages" class="brackets">Collages</a>
[<a href="bookmarks.php?type=requests">Requests</a>] <a href="bookmarks.php?type=requests" class="brackets">Requests</a>
<? } ?> <? } ?>
<br /><br /> <br /><br />
<? <?

View File

@ -367,32 +367,32 @@ function compare($X, $Y){
<div class="header"> <div class="header">
<h2><?=$Name?></h2> <h2><?=$Name?></h2>
<div class="linkbox"> <div class="linkbox">
[<a href="collages.php">List of collages</a>] <a href="collages.php" class="brackets">List of collages</a>
<? if (check_perms('site_collages_create')) { ?> <? if (check_perms('site_collages_create')) { ?>
[<a href="collages.php?action=new">New collage</a>] <a href="collages.php?action=new" class="brackets">New collage</a>
<? } ?> <? } ?>
<br /><br /> <br /><br />
<? if(check_perms('site_collages_subscribe')) { ?> <? if(check_perms('site_collages_subscribe')) { ?>
[<a href="#" onclick="CollageSubscribe(<?=$CollageID?>);return false;" id="subscribelink<?=$CollageID?>"><?=(in_array($CollageID, $CollageSubscriptions) ? 'Unsubscribe' : 'Subscribe')?></a>] <a href="#" id="subscribelink<?=$CollageID?>" class="brackets" onclick="CollageSubscribe(<?=$CollageID?>);return false;"><?=(in_array($CollageID, $CollageSubscriptions) ? 'Unsubscribe' : 'Subscribe')?></a>
<? } <? }
if (check_perms('site_collages_delete') || (check_perms('site_edit_wiki') && !$Locked)) { ?> if (check_perms('site_collages_delete') || (check_perms('site_edit_wiki') && !$Locked)) { ?>
[<a href="collages.php?action=edit&amp;collageid=<?=$CollageID?>">Edit description</a>] <a href="collages.php?action=edit&amp;collageid=<?=$CollageID?>" class="brackets">Edit description</a>
<? } else { ?> <? } else { ?>
[Locked] <span class="brackets">Locked</span>
<? } <? }
if(has_bookmarked('collage', $CollageID)) { if(has_bookmarked('collage', $CollageID)) {
?> ?>
[<a href="#" id="bookmarklink_collage_<?=$CollageID?>" onclick="Unbookmark('collage', <?=$CollageID?>,'[Bookmark]');return false;">Remove bookmark</a>] <a href="#" id="bookmarklink_collage_<?=$CollageID?>" class="brackets" onclick="Unbookmark('collage', <?=$CollageID?>,'Bookmark');return false;">Remove bookmark</a>
<? } else { ?> <? } else { ?>
[<a href="#" id="bookmarklink_collage_<?=$CollageID?>" onclick="Bookmark('collage', <?=$CollageID?>,'[Remove bookmark]');return false;">Bookmark</a>] <a href="#" id="bookmarklink_collage_<?=$CollageID?>" class="brackets" onclick="Bookmark('collage', <?=$CollageID?>,'Remove bookmark');return false;">Bookmark</a>
<? } <? }
if (check_perms('site_collages_manage') && !$Locked) { ?> if (check_perms('site_collages_manage') && !$Locked) { ?>
[<a href="collages.php?action=manage&amp;collageid=<?=$CollageID?>">Manage torrents</a>] <a href="collages.php?action=manage&amp;collageid=<?=$CollageID?>" class="brackets">Manage torrents</a>
<? } ?> <? } ?>
[<a href="reports.php?action=report&amp;type=collage&amp;id=<?=$CollageID?>">Report collage</a>] <a href="reports.php?action=report&amp;type=collage&amp;id=<?=$CollageID?>" class="brackets">Report collage</a>
<? if (check_perms('site_collages_delete') || $CreatorID == $LoggedUser['ID']) { ?> <? if (check_perms('site_collages_delete') || $CreatorID == $LoggedUser['ID']) { ?>
[<a href="collages.php?action=delete&amp;collageid=<?=$CollageID?>&amp;auth=<?=$LoggedUser['AuthKey']?>" onclick="return confirm('Are you sure you want to delete this collage?');">Delete</a>] <a href="collages.php?action=delete&amp;collageid=<?=$CollageID?>&amp;auth=<?=$LoggedUser['AuthKey']?>" class="brackets" onclick="return confirm('Are you sure you want to delete this collage?');">Delete</a>
<? } ?> <? } ?>
</div> </div>
</div> </div>

View File

@ -24,7 +24,7 @@
$Conditions = "WHERE tc.AuthorID = $UserID"; $Conditions = "WHERE tc.AuthorID = $UserID";
$Title = 'Comments made by '.($Self?'you':$Username); $Title = 'Comments made by '.($Self?'you':$Username);
$Header = 'Torrent comments left by '.($Self?'you':Users::format_username($UserID, false, false, false)).''; $Header = 'Torrent comments left by '.($Self?'you':Users::format_username($UserID, false, false, false)).'';
if($Self) $OtherLink = '<a href="comments.php?action=my_torrents">Display comments left on your uploads</a>'; if($Self) $OtherLink = '<a href="comments.php?action=my_torrents" class="brackets">Display comments left on your uploads</a>';
} }
$Comments = $DB->query("SELECT $Comments = $DB->query("SELECT

View File

@ -70,9 +70,9 @@
<h2><a href="forums.php">Forums</a> &gt; <?=$ForumName?></h2> <h2><a href="forums.php">Forums</a> &gt; <?=$ForumName?></h2>
<div class="linkbox"> <div class="linkbox">
<? if(check_forumperm($ForumID, 'Write') && check_forumperm($ForumID, 'Create')){ ?> <? if(check_forumperm($ForumID, 'Write') && check_forumperm($ForumID, 'Create')){ ?>
[<a href="forums.php?action=new&amp;forumid=<?=$ForumID?>">New Thread</a>] <a href="forums.php?action=new&amp;forumid=<?=$ForumID?>" class="brackets">New thread</a>
<? } ?> <? } ?>
[<a href="#" onclick="$('#searchforum').toggle(); this.innerHTML = (this.innerHTML == 'Search this Forum'?'Hide Search':'Search this Forum'); return false;">Search this Forum</a>] <a href="#" onclick="$('#searchforum').toggle(); this.innerHTML = (this.innerHTML == 'Search this Forum'?'Hide Search':'Search this Forum'); return false;" class="brackets">Search this forum</a>
<div id="searchforum" class="hidden center"> <div id="searchforum" class="hidden center">
<div style="display: inline-block;"> <div style="display: inline-block;">
<h3>Search this forum:</h3> <h3>Search this forum:</h3>
@ -125,7 +125,7 @@
</div> </div>
<? if(check_perms('site_moderate_forums')) { ?> <? if(check_perms('site_moderate_forums')) { ?>
<div class="linkbox"> <div class="linkbox">
[<a href="forums.php?action=edit_rules&amp;forumid=<?=$ForumID?>">Change specific rules</a>] <a href="forums.php?action=edit_rules&amp;forumid=<?=$ForumID?>" class="brackets">Change specific rules</a>
</div> </div>
<? } ?> <? } ?>
<? if(!empty($Forums[$ForumID]['SpecificRules'])) { ?> <? if(!empty($Forums[$ForumID]['SpecificRules'])) { ?>
@ -135,7 +135,7 @@
$Thread = get_thread_info($ThreadIDs); $Thread = get_thread_info($ThreadIDs);
?> ?>
<br /> <br />
[<a href="forums.php?action=viewthread&amp;threadid=<?=$ThreadIDs?>"><?=display_str($Thread['Title'])?></a>] <a href="forums.php?action=viewthread&amp;threadid=<?=$ThreadIDs?>" class="brackets"><?=display_str($Thread['Title'])?></a>
<? } ?> <? } ?>
</div> </div>
<? } ?> <? } ?>
@ -251,6 +251,6 @@
<div class="linkbox pager"> <div class="linkbox pager">
<?=$Pages?> <?=$Pages?>
</div> </div>
<div class="linkbox">[<a href="forums.php?action=catchup&amp;forumid=<?=$ForumID?>&amp;auth=<?=$LoggedUser['AuthKey']?>">Catch up</a>]</div> <div class="linkbox"><a href="forums.php?action=catchup&amp;forumid=<?=$ForumID?>&amp;auth=<?=$LoggedUser['AuthKey']?>" class="brackets">Catch up</a></div>
</div> </div>
<? View::show_footer(); ?> <? View::show_footer(); ?>

View File

@ -164,9 +164,9 @@
</h2> </h2>
<div class="linkbox"> <div class="linkbox">
<div class="center"> <div class="center">
[<a href="reports.php?action=report&amp;type=thread&amp;id=<?=$ThreadID?>">Report Thread</a>] <a href="reports.php?action=report&amp;type=thread&amp;id=<?=$ThreadID?>" class="brackets">Report Thread</a>
[<a href="#" onclick="Subscribe(<?=$ThreadID?>);return false;" id="subscribelink<?=$ThreadID?>"><?=(in_array($ThreadID, $UserSubscriptions) ? 'Unsubscribe' : 'Subscribe')?></a>] <a href="#" onclick="Subscribe(<?=$ThreadID?>);return false;" id="subscribelink<?=$ThreadID?>" class="brackets"><?=(in_array($ThreadID, $UserSubscriptions) ? 'Unsubscribe' : 'Subscribe')?></a>
[<a href="#" onclick="$('#searchthread').toggle(); this.innerHTML = (this.innerHTML == 'Search this Thread'?'Hide Search':'Search this Thread'); return false;">Search this Thread</a>] <a href="#" class="brackets" onclick="$('#searchthread').toggle(); this.innerHTML = (this.innerHTML == 'Search this Thread'?'Hide Search':'Search this Thread'); return false;">Search this Thread</a>
</div> </div>
<div id="searchthread" class="hidden center"> <div id="searchthread" class="hidden center">
<div style="display: inline-block;"> <div style="display: inline-block;">

View File

@ -20,9 +20,9 @@
<? <?
if($Section == 'inbox') { ?> if($Section == 'inbox') { ?>
[<a href="inbox.php?action=sentbox">Sentbox</a>] <a href="inbox.php?action=sentbox" class="brackets">Sentbox</a>
<? } elseif($Section == 'sentbox') { ?> <? } elseif($Section == 'sentbox') { ?>
[<a href="inbox.php">Inbox</a>] <a href="inbox.php" class="brackets">Inbox</a>
<? } <? }
?> ?>

View File

@ -333,18 +333,18 @@
<div class="linkbox"> <div class="linkbox">
<? if (!$BookmarkView) { ?> <? if (!$BookmarkView) { ?>
<? if(check_perms('site_submit_requests')){ ?> <? if(check_perms('site_submit_requests')){ ?>
<a href="requests.php?action=new">[New request]</a> <a href="requests.php?action=new" class="brackets">New request</a>
<a href="requests.php?type=created">[My requests]</a> <a href="requests.php?type=created" class="brackets">My requests</a>
<? } <? }
if(check_perms('site_vote')){?> if(check_perms('site_vote')){?>
<a href="requests.php?type=voted">[Requests I've voted on]</a> <a href="requests.php?type=voted" class="brackets">Requests I've voted on</a>
<? } ?> <? } ?>
<a href="bookmarks.php?type=requests">[Bookmarked requests]</a> <a href="bookmarks.php?type=requests" class="brackets">Bookmarked requests</a>
<? } else { ?> <? } else { ?>
<a href="bookmarks.php?type=torrents">[Torrents]</a> <a href="bookmarks.php?type=torrents" class="brackets">Torrents</a>
<a href="bookmarks.php?type=artists">[Artists]</a> <a href="bookmarks.php?type=artists" class="brackets">Artists</a>
<a href="bookmarks.php?type=collages">[Collages]</a> <a href="bookmarks.php?type=collages" class="brackets">Collages</a>
<a href="bookmarks.php?type=requests">[Requests]</a> <a href="bookmarks.php?type=requests" class="brackets">Requests</a>
<? } ?> <? } ?>
</div> </div>
</div> </div>

View File

@ -659,7 +659,7 @@ function next_hour() {
t.Encoding, t.Encoding,
t.UserID, t.UserID,
t.Media, t.Media,
t.info_hash HEX(t.info_hash) AS InfoHash
FROM torrents AS t FROM torrents AS t
JOIN torrents_group AS tg ON tg.ID = t.GroupID JOIN torrents_group AS tg ON tg.ID = t.GroupID
LEFT JOIN artists_group AS ag ON ag.ArtistID = tg.ArtistID LEFT JOIN artists_group AS ag ON ag.ArtistID = tg.ArtistID
@ -689,8 +689,7 @@ function next_hour() {
$Name.=' ['.(empty($Media)?'':"$Media / ").$Format.' / '.$Encoding.']'; $Name.=' ['.(empty($Media)?'':"$Media / ").$Format.' / '.$Encoding.']';
} }
Torrents::delete_torrent($ID, $GroupID); Torrents::delete_torrent($ID, $GroupID);
$InfoHash = unpack("H*", $InfoHash); $LogEntries[] = "Torrent ".$ID." (".$Name.") (".strtoupper($InfoHash).") was deleted for inactivity (unseeded)";
$LogEntries[] = "Torrent ".$ID." (".$Name.") (".strtoupper($InfoHash[1]).") was deleted for inactivity (unseeded)";
if (!array_key_exists($UserID, $DeleteNotes)) if (!array_key_exists($UserID, $DeleteNotes))
$DeleteNotes[$UserID] = array('Count' => 0, 'Msg' => ''); $DeleteNotes[$UserID] = array('Count' => 0, 'Msg' => '');

View File

@ -27,6 +27,7 @@
list($UserID, $AssignedToUser) = $DB->next_record(); list($UserID, $AssignedToUser) = $DB->next_record();
if ($UserID == $LoggedUser['ID'] || $IsFLS || $UserID == $AssignedToUser) { if ($UserID == $LoggedUser['ID'] || $IsFLS || $UserID == $AssignedToUser) {
// Response to existing conversation // Response to existing conversation
$DB->query(" $DB->query("

View File

@ -26,7 +26,7 @@
<div class="header"> <div class="header">
<h2>Staff PMs</h2> <h2>Staff PMs</h2>
<div class="linkbox"> <div class="linkbox">
<a href="#" onclick="$('#compose').toggle();">[Compose New]</a> <a href="#" onclick="$('#compose').toggle();" class="brackets">Compose New</a>
</div> </div>
</div> </div>
<br /> <br />

View File

@ -7,11 +7,11 @@
<div class="header"> <div class="header">
<h2>Top 10 Torrents</h2> <h2>Top 10 Torrents</h2>
<div class="linkbox"> <div class="linkbox">
<a href="top10.php?type=torrents"><strong>[Torrents]</strong></a> <a href="top10.php?type=torrents" class="brackets"><strong>Torrents</strong></a>
<a href="top10.php?type=users">[Users]</a> <a href="top10.php?type=users" class="brackets">Users</a>
<a href="top10.php?type=tags">[Tags]</a> <a href="top10.php?type=tags" class="brackets">Tags</a>
<a href="top10.php?type=history">[History]</a> <a href="top10.php?type=history" class="brackets">History</a>
<a href="top10.php?type=votes">[Favorites]</a> <a href="top10.php?type=votes" class="brackets">Favorites</a>
</div> </div>
</div> </div>
<div class="pad box"> <div class="pad box">

View File

@ -54,10 +54,10 @@
<div class="header"> <div class="header">
<h2>Top <?=$Limit?> Torrents</h2> <h2>Top <?=$Limit?> Torrents</h2>
<div class="linkbox"> <div class="linkbox">
[<a href="top10.php?type=torrents"><strong>Torrents</strong></a>] <a href="top10.php?type=torrents" class="brackets"><strong>Torrents</strong></a>
[<a href="top10.php?type=users">Users</a>] <a href="top10.php?type=users" class="brackets">Users</a>
[<a href="top10.php?type=tags">Tags</a>] <a href="top10.php?type=tags" class="brackets">Tags</a>
[<a href="top10.php?type=votes">Favorites</a>] <a href="top10.php?type=votes" class="brackets">Favorites</a>
</div> </div>
</div> </div>
<? <?
@ -125,7 +125,7 @@
?> ?>
<div style="text-align: right;" class="linkbox"> <div style="text-align: right;" class="linkbox">
[<a href="top10.php?<?=$FreeleechToggleQuery?>"><?=ucfirst($FreeleechToggleName)?> Freeleech in Top 10</a>] <a href="top10.php?<?=$FreeleechToggleQuery?>" class="brackets"><?=ucfirst($FreeleechToggleName)?> Freeleech in Top 10</a>
</div> </div>
<? <?

View File

@ -883,7 +883,7 @@ function header_link($SortKey,$DefaultWay="DESC") {
<td class="center cats_col"><div title="<?=ucfirst(str_replace('_',' ',$PrimaryTag))?>" class="cats_<?=strtolower(str_replace(array('-',' '),array('',''),$Categories[$GroupCategoryID-1]))?> tags_<?=str_replace('.','_',$PrimaryTag)?>"></div></td> <td class="center cats_col"><div title="<?=ucfirst(str_replace('_',' ',$PrimaryTag))?>" class="cats_<?=strtolower(str_replace(array('-',' '),array('',''),$Categories[$GroupCategoryID-1]))?> tags_<?=str_replace('.','_',$PrimaryTag)?>"></div></td>
<td colspan="2"> <td colspan="2">
<?=$DisplayName?> <?=$DisplayName?>
<span style="float:right;"><a href="#showimg_<?=$GroupID?>" onclick="Bookmark(<?=$GroupID?>);this.innerHTML='Bookmarked';return false;">Bookmark</a></span> <span style="float:right;"><a href="#showimg_<?=$GroupID?>" onclick="Bookmark(<?=$GroupID?>);this.innerHTML='Bookmarked';return false;">[Bookmark]</a></span>
<?=$TorrentTags?> <?=$TorrentTags?>
</td> </td>
<td class="nobr"><?=time_diff($GroupTime,1)?></td> <td class="nobr"><?=time_diff($GroupTime,1)?></td>

View File

@ -962,9 +962,9 @@ function header_link($SortKey,$DefaultWay="desc") {
<td colspan="2"> <td colspan="2">
<?=$DisplayName?> <?=$DisplayName?>
<? if (in_array($GroupID, $Bookmarks)) { ?> <? if (in_array($GroupID, $Bookmarks)) { ?>
<span class="remove_bookmark" style="float:right;"><a href="#" id="bookmarklink_torrent_<?=$GroupID?>" title="Remove bookmark" onclick="Unbookmark('torrent',<?=$GroupID?>,'Bookmark');return false;">Unbookmark</a></span> <span class="remove_bookmark" style="float:right;"><a href="#" id="bookmarklink_torrent_<?=$GroupID?>" title="Remove bookmark" onclick="Unbookmark('torrent',<?=$GroupID?>,'Bookmark');return false;">[Unbookmark]</a></span>
<? } else { ?> <? } else { ?>
<span class="add_bookmark" style="float:right;"><a href="#" id="bookmarklink_torrent_<?=$GroupID?>" title="Add bookmark" onclick="Bookmark('torrent',<?=$GroupID?>,'Unbookmark');return false;">Bookmark</a></span> <span class="add_bookmark" style="float:right;"><a href="#" id="bookmarklink_torrent_<?=$GroupID?>" title="Add bookmark" onclick="Bookmark('torrent',<?=$GroupID?>,'Unbookmark');return false;">[Bookmark]</a></span>
<? } ?> <? } ?>
<br /> <br />
<div class="tags"> <div class="tags">

View File

@ -88,25 +88,25 @@ function compare($X, $Y){
<h2><?=$DisplayName?></h2> <h2><?=$DisplayName?></h2>
<div class="linkbox"> <div class="linkbox">
<? if(check_perms('site_edit_wiki')) { ?> <? if(check_perms('site_edit_wiki')) { ?>
<a href="torrents.php?action=editgroup&amp;groupid=<?=$GroupID?>">[Edit description]</a> <a href="torrents.php?action=editgroup&amp;groupid=<?=$GroupID?>" class="brackets">Edit description</a>
<? } ?> <? } ?>
<a href="torrents.php?action=history&amp;groupid=<?=$GroupID?>">[View history]</a> <a href="torrents.php?action=history&amp;groupid=<?=$GroupID?>" class="brackets">View history</a>
<? if($RevisionID && check_perms('site_edit_wiki')) { ?> <? if($RevisionID && check_perms('site_edit_wiki')) { ?>
<a href="/torrents.php?action=revert&amp;groupid=<?=$GroupID ?>&amp;revisionid=<?=$RevisionID ?>&amp;auth=<?=$LoggedUser['AuthKey']?>">[Revert to this revision]</a> <a href="/torrents.php?action=revert&amp;groupid=<?=$GroupID ?>&amp;revisionid=<?=$RevisionID ?>&amp;auth=<?=$LoggedUser['AuthKey']?>" class="brackets">Revert to this revision</a>
<? } <? }
if(has_bookmarked('torrent', $GroupID)) { if(has_bookmarked('torrent', $GroupID)) {
?> ?>
<a href="#" id="bookmarklink_torrent_<?=$GroupID?>" class="remove_bookmark" title="Remove bookmark" onclick="Unbookmark('torrent',<?=$GroupID?>,'Bookmark');return false;">Unbookmark</a> <a href="#" id="bookmarklink_torrent_<?=$GroupID?>" class="remove_bookmark brackets" title="Remove bookmark" onclick="Unbookmark('torrent',<?=$GroupID?>,'Bookmark');return false;">Unbookmark</a>
<? } else { ?> <? } else { ?>
<a href="#" id="bookmarklink_torrent_<?=$GroupID?>" class="add_bookmark" title="Add bookmark" onclick="Bookmark('torrent',<?=$GroupID?>,'Unbookmark');return false;">Bookmark</a> <a href="#" id="bookmarklink_torrent_<?=$GroupID?>" class="add_bookmark brackets" title="Add bookmark" onclick="Bookmark('torrent',<?=$GroupID?>,'Unbookmark');return false;">Bookmark</a>
<? } <? }
if($Categories[$GroupCategoryID-1] == 'Music') { ?> if($Categories[$GroupCategoryID-1] == 'Music') { ?>
<a href="upload.php?groupid=<?=$GroupID?>">[Add format]</a> <a href="upload.php?groupid=<?=$GroupID?>" class="brackets">Add format</a>
<? } <? }
if(check_perms('site_submit_requests')) { ?> if(check_perms('site_submit_requests')) { ?>
<a href="requests.php?action=new&amp;groupid=<?=$GroupID?>">[Request format]</a> <a href="requests.php?action=new&amp;groupid=<?=$GroupID?>" class="brackets">Request format</a>
<? }?> <? }?>
<a href="torrents.php?action=grouplog&amp;groupid=<?=$GroupID?>">[View log]</a> <a href="torrents.php?action=grouplog&amp;groupid=<?=$GroupID?>" class="brackets">View log</a>
</div> </div>
</div> </div>
<div class="sidebar"> <div class="sidebar">
@ -575,26 +575,26 @@ function filelist($Str) {
</blockquote> </blockquote>
<? if(check_perms('site_moderate_requests')) { ?> <? if(check_perms('site_moderate_requests')) { ?>
<div class="linkbox"> <div class="linkbox">
<a href="torrents.php?action=masspm&amp;id=<?=$GroupID?>&amp;torrentid=<?=$TorrentID?>">[Mass PM snatchers]</a> <a href="torrents.php?action=masspm&amp;id=<?=$GroupID?>&amp;torrentid=<?=$TorrentID?>" class="brackets">Mass PM snatchers</a>
</div> </div>
<? } ?> <? } ?>
<div class="linkbox"> <div class="linkbox">
<a href="#" onclick="show_peers('<?=$TorrentID?>', 0);return false;">(View peer list)</a> <a href="#" class="brackets" onclick="show_peers('<?=$TorrentID?>', 0);return false;">View peer list</a>
<? if(check_perms('site_view_torrent_snatchlist')) { ?> <? if(check_perms('site_view_torrent_snatchlist')) { ?>
<a href="#" onclick="show_downloads('<?=$TorrentID?>', 0);return false;" title="View the list of users that have clicked the &quot;DL&quot; button.">(View download list)</a> <a href="#" class="brackets" onclick="show_downloads('<?=$TorrentID?>', 0);return false;" title="View the list of users that have clicked the &quot;DL&quot; button.">View download list</a>
<a href="#" onclick="show_snatches('<?=$TorrentID?>', 0);return false;" title="View the list of users that have reported a snatch to the tracker.">(View snatch list)</a> <a href="#" class="brackets" onclick="show_snatches('<?=$TorrentID?>', 0);return false;" title="View the list of users that have reported a snatch to the tracker.">View snatch list</a>
<? } ?> <? } ?>
<a href="#" onclick="show_files('<?=$TorrentID?>');return false;">(View file list)</a> <a href="#" class="brackets" onclick="show_files('<?=$TorrentID?>');return false;">View file list</a>
<? if($Reported) { ?> <? if($Reported) { ?>
<a href="#" onclick="show_reported('<?=$TorrentID?>');return false;">(View report information)</a> <a href="#" class="brackets" onclick="show_reported('<?=$TorrentID?>');return false;">View report information</a>
<? } ?> <? } ?>
</div> </div>
<div id="peers_<?=$TorrentID?>" class="hidden"></div> <div id="peers_<?=$TorrentID?>" class="hidden brackets"></div>
<div id="downloads_<?=$TorrentID?>" class="hidden"></div> <div id="downloads_<?=$TorrentID?>" class="hidden brackets"></div>
<div id="snatches_<?=$TorrentID?>" class="hidden"></div> <div id="snatches_<?=$TorrentID?>" class="hidden brackets"></div>
<div id="files_<?=$TorrentID?>" class="hidden"><?=$FileList?></div> <div id="files_<?=$TorrentID?>" class="hidden brackets"><?=$FileList?></div>
<? if($Reported) { ?> <? if($Reported) { ?>
<div id="reported_<?=$TorrentID?>" class="hidden"><?=$ReportInfo?></div> <div id="reported_<?=$TorrentID?>" class="hidden brackets"><?=$ReportInfo?></div>
<? } ?> <? } ?>
<? if(!empty($Description)) { <? if(!empty($Description)) {
echo '<blockquote>'.$Text->full_format($Description).'</blockquote>';} echo '<blockquote>'.$Text->full_format($Description).'</blockquote>';}

View File

@ -140,13 +140,14 @@ function header_link($SortKey, $DefaultWay = "desc") {
</div> </div>
<div class="linkbox"> <div class="linkbox">
<? if($FilterID) { ?> <? if($FilterID) { ?>
<a href="torrents.php?action=notify">View all</a>&nbsp;&nbsp;&nbsp; <a href="torrents.php?action=notify" class="brackets">View all</a>&nbsp;&nbsp;&nbsp;
<? } else { ?> <? } else { ?>
<a href="torrents.php?action=notify_clear&amp;auth=<?=$LoggedUser['AuthKey']?>">Clear all</a>&nbsp;&nbsp;&nbsp; <a href="torrents.php?action=notify_clear&amp;auth=<?=$LoggedUser['AuthKey']?>" class="brackets">Clear all</a>&nbsp;&nbsp;&nbsp;
<a href="javascript:SuperGroupClear()">Clear selected</a>&nbsp;&nbsp;&nbsp; <a href="javascript:SuperGroupClear()">Clear selected</a>&nbsp;&nbsp;&nbsp;
<a href="torrents.php?action=notify_catchup&amp;auth=<?=$LoggedUser['AuthKey']?>">Catch up</a>&nbsp;&nbsp;&nbsp; <a href="torrents.php?action=notify_catchup&amp;auth=<?=$LoggedUser['AuthKey']?>" class="brackets">Catch up</a>&nbsp;&nbsp;&nbsp;
<? } ?> <? } ?>
<a href="user.php?action=notify">Edit filters</a>&nbsp;&nbsp;&nbsp; <a href="user.php?action=notify">Edit filters</a>&nbsp;&nbsp;&nbsp;
<a href="user.php?action=notify" class="brackets">Edit filters</a>&nbsp;&nbsp;&nbsp;
</div> </div>
<? if ($TorrentCount > NOTIFICATIONS_PER_PAGE) { ?> <? if ($TorrentCount > NOTIFICATIONS_PER_PAGE) { ?>
<div class="linkbox"> <div class="linkbox">
@ -159,7 +160,7 @@ function header_link($SortKey, $DefaultWay = "desc") {
<table class="layout border"> <table class="layout border">
<tr class="rowb"> <tr class="rowb">
<td colspan="8" class="center"> <td colspan="8" class="center">
No new notifications found! <a href="user.php?action=notify">Edit notification filters</a> No new notifications found! <a href="user.php?action=notify" class="brackets">Edit notification filters</a>
</td> </td>
</tr> </tr>
</table> </table>
@ -186,9 +187,9 @@ function header_link($SortKey, $DefaultWay = "desc") {
</h3> </h3>
</div> </div>
<div class="notify_filter_links"> <div class="notify_filter_links">
<a href="javascript:GroupClear($('#notificationform_<?=$FilterID?>').raw())">Clear selected in filter</a>&nbsp;&nbsp;&nbsp; <a href="javascript:GroupClear($('#notificationform_<?=$FilterID?>').raw())" class="brackets">Clear selected in filter</a>&nbsp;&nbsp;&nbsp;
<a href="torrents.php?action=notify_clear_filter&amp;filterid=<?=$FilterID?>&amp;auth=<?=$LoggedUser['AuthKey']?>">Clear all in filter</a>&nbsp;&nbsp;&nbsp; <a href="torrents.php?action=notify_clear_filter&amp;filterid=<?=$FilterID?>&amp;auth=<?=$LoggedUser['AuthKey']?>" class="brackets">Clear all in filter</a>&nbsp;&nbsp;&nbsp;
<a href="torrents.php?action=notify_catchup_filter&amp;filterid=<?=$FilterID?>&amp;auth=<?=$LoggedUser['AuthKey']?>">Mark all in filter as read</a> <a href="torrents.php?action=notify_catchup_filter&amp;filterid=<?=$FilterID?>&amp;auth=<?=$LoggedUser['AuthKey']?>" class="brackets">Mark all in filter as read</a>
</div> </div>
<form class="manage_form" name="torrents" id="notificationform_<?=$FilterID?>" action=""> <form class="manage_form" name="torrents" id="notificationform_<?=$FilterID?>" action="">
<table class="torrent_table cats checkboxes border"> <table class="torrent_table cats checkboxes border">

View File

@ -91,7 +91,7 @@
<div class="header"> <div class="header">
<h2><?=Users::format_username($UserID, false, false, false)?> &gt; Invites</h2> <h2><?=Users::format_username($UserID, false, false, false)?> &gt; Invites</h2>
<div class="linkbox"> <div class="linkbox">
[<a href="user.php?action=invitetree<? if($Sneaky){ echo '&amp;userid='.$UserID; }?>">Invite tree</a>] <a href="user.php?action=invitetree<? if($Sneaky){ echo '&amp;userid='.$UserID; }?>" class="brackets">Invite tree</a>
</div> </div>
</div> </div>
<? if ($UserCount >= USER_LIMIT && !check_perms('site_can_invite_always')) { ?> <? if ($UserCount >= USER_LIMIT && !check_perms('site_can_invite_always')) { ?>

View File

@ -409,6 +409,7 @@
if ($RestrictedForums != db_string($Cur['RestrictedForums']) && check_perms('users_mod')) { if ($RestrictedForums != db_string($Cur['RestrictedForums']) && check_perms('users_mod')) {
$UpdateSet[]="RestrictedForums='$RestrictedForums'"; $UpdateSet[]="RestrictedForums='$RestrictedForums'";
$EditSummary[]="restricted forum(s): $RestrictedForums"; $EditSummary[]="restricted forum(s): $RestrictedForums";
$DeleteKeys = true;
} }
if ($PermittedForums != db_string($Cur['PermittedForums']) && check_perms('users_mod')) { if ($PermittedForums != db_string($Cur['PermittedForums']) && check_perms('users_mod')) {
@ -422,23 +423,9 @@
$PermittedForums = implode(',',$ForumSet); $PermittedForums = implode(',',$ForumSet);
$UpdateSet[]="PermittedForums='$PermittedForums'"; $UpdateSet[]="PermittedForums='$PermittedForums'";
$EditSummary[]="permitted forum(s): $PermittedForums"; $EditSummary[]="permitted forum(s): $PermittedForums";
$DeleteKeys = true;
} }
if(empty($RestrictedForums) && empty($PermittedForums)) {
$HeavyUpdates['CustomForums'] = null;
} else {
$HeavyUpdates['CustomForums'] = array();
$Forums = explode(',',$RestrictedForums);
foreach ($Forums as $Forum) {
$HeavyUpdates['CustomForums'][$Forum] = 0;
}
$Forums = explode(',',$PermittedForums);
foreach ($Forums as $Forum) {
$HeavyUpdates['CustomForums'][$Forum] = 1;
}
}
if ($DisableAvatar!=$Cur['DisableAvatar'] && check_perms('users_disable_any')) { if ($DisableAvatar!=$Cur['DisableAvatar'] && check_perms('users_disable_any')) {
$UpdateSet[]="DisableAvatar='$DisableAvatar'"; $UpdateSet[]="DisableAvatar='$DisableAvatar'";
$EditSummary[]="avatar status changed"; $EditSummary[]="avatar status changed";
@ -641,7 +628,6 @@
$DB->query("DELETE FROM users_sessions WHERE UserID='$UserID'"); $DB->query("DELETE FROM users_sessions WHERE UserID='$UserID'");
} }
if (empty($UpdateSet) && empty($EditSummary)) { if (empty($UpdateSet) && empty($EditSummary)) {

View File

@ -102,23 +102,23 @@
if(!$ShowUnread) { if(!$ShowUnread) {
?> ?>
<br /><br /> <br /><br />
[<a href="userhistory.php?action=subscriptions&amp;showunread=1">Only display topics with unread replies</a>]&nbsp;&nbsp;&nbsp; <a href="userhistory.php?action=subscriptions&amp;showunread=1" class="brackets">Only display topics with unread replies</a>&nbsp;&nbsp;&nbsp;
<? <?
} else { } else {
?> ?>
<br /><br /> <br /><br />
[<a href="userhistory.php?action=subscriptions&amp;showunread=0">Show all subscribed topics</a>]&nbsp;&nbsp;&nbsp; <a href="userhistory.php?action=subscriptions&amp;showunread=0" class="brackets">Show all subscribed topics</a>&nbsp;&nbsp;&nbsp;
<? <?
} }
if($NumResults) { if($NumResults) {
?> ?>
[<a href="#" onclick="Collapse();return false;" id="collapselink"><?=$ShowCollapsed?'Show':'Hide'?> post bodies</a>]&nbsp;&nbsp;&nbsp; <a href="#" onclick="Collapse();return false;" id="collapselink" class="brackets"><?=$ShowCollapsed?'Show':'Hide'?> post bodies</a>&nbsp;&nbsp;&nbsp;
<? <?
} }
?> ?>
[<a href="userhistory.php?action=catchup&amp;auth=<?=$LoggedUser['AuthKey']?>">Catch up</a>]&nbsp;&nbsp;&nbsp; <a href="userhistory.php?action=catchup&amp;auth=<?=$LoggedUser['AuthKey']?>" class="brackets">Catch up</a>&nbsp;&nbsp;&nbsp;
[<a href="userhistory.php?action=posts&amp;userid=<?=$LoggedUser['ID']?>">Go to post history</a>]&nbsp;&nbsp;&nbsp; <a href="userhistory.php?action=posts&amp;userid=<?=$LoggedUser['ID']?>" class="brackets">Go to post history</a>&nbsp;&nbsp;&nbsp;
[<a href="userhistory.php?action=quote_notifications">Quote notifications</a>]&nbsp;&nbsp;&nbsp; <a href="userhistory.php?action=quote_notifications" class="brackets">Quote notifications</a>&nbsp;&nbsp;&nbsp;
</div> </div>
</div> </div>
<? <?

View File

@ -44,13 +44,13 @@
<div class="header"> <div class="header">
<h2><?=$Title?></h2> <h2><?=$Title?></h2>
<div class="linkbox box"> <div class="linkbox box">
<a href="wiki.php?action=create">[Create]</a> <a href="wiki.php?action=create" class="brackets">Create</a>
<a href="wiki.php?action=edit&amp;id=<?=$ArticleID?>">[Contribute]</a> <a href="wiki.php?action=edit&amp;id=<?=$ArticleID?>" class="brackets">Contribute</a>
<a href="wiki.php?action=revisions&amp;id=<?=$ArticleID?>">[History]</a> <a href="wiki.php?action=revisions&amp;id=<?=$ArticleID?>" class="brackets">History</a>
<? if(check_perms('admin_manage_wiki') && $_GET['id'] != '136'){ ?> <? if(check_perms('admin_manage_wiki') && $_GET['id'] != '136'){ ?>
<a href="wiki.php?action=delete&amp;id=<?=$ArticleID?>&amp;authkey=<?=$LoggedUser['AuthKey']?>" onclick="return confirm('Are you sure you want to delete?\nYes, DELETE, not as in \'Oh hey, if this is wrong we can get someone to magically undelete it for us later\' it will be GONE.\nGiven this new information, do you still want to DELETE this article and all its revisions and all its alias\' and act like it never existed?')">[Delete]</a> <a href="wiki.php?action=delete&amp;id=<?=$ArticleID?>&amp;authkey=<?=$LoggedUser['AuthKey']?>" class="brackets" onclick="return confirm('Are you sure you want to delete?\nYes, DELETE, not as in \'Oh hey, if this is wrong we can get someone to magically undelete it for us later\' it will be GONE.\nGiven this new information, do you still want to DELETE this article and all its revisions and all its alias\' and act like it never existed?')">Delete</a>
<? } ?> <? } ?>
<!--<a href="reports.php?action=submit&amp;type=wiki&amp;article=<?=$ArticleID ?>">[Report]</a>--> <!--<a href="reports.php?action=submit&amp;type=wiki&amp;article=<?=$ArticleID ?>" class="brackets">Report</a>-->
</div> </div>
</div> </div>
<div class="sidebar"> <div class="sidebar">

View File

@ -3,9 +3,9 @@ function Subscribe(topicid) {
var subscribeLink = $("#subscribelink" + topicid).raw(); var subscribeLink = $("#subscribelink" + topicid).raw();
if(subscribeLink) { if(subscribeLink) {
if(subscribeLink.firstChild.nodeValue.substr(1,1) == 'U') { if(subscribeLink.firstChild.nodeValue.substr(1,1) == 'U') {
subscribeLink.firstChild.nodeValue = "[Subscribe]"; subscribeLink.firstChild.nodeValue = "Subscribe";
} else { } else {
subscribeLink.firstChild.nodeValue = "[Unsubscribe]"; subscribeLink.firstChild.nodeValue = "Unsubscribe";
} }
} }
}); });

View File

@ -802,3 +802,13 @@ ul .invitetree {
font-size: 1.25em; font-size: 1.25em;
font-weight: bold; font-weight: bold;
} }
.linkbox .brackets:before {
content: "[";
color: #492802;
}
.linkbox .brackets:after {
content: "]";
color: #492802;
}

View File

@ -1038,3 +1038,11 @@ select:hover, option:hover {
width: 180px; width: 180px;
} }
.rippy #bubble { display: none !important; } .rippy #bubble { display: none !important; }
.linkbox .brackets:before {
content: "[";
}
.linkbox .brackets:after {
content: "]";
}

View File

@ -2004,3 +2004,13 @@ ul#userinfo_random li a:hover {
tr.torrent .bookmark > a:before { content:""; } tr.torrent .bookmark > a:before { content:""; }
tr.torrent .bookmark > a:after { content:""; } tr.torrent .bookmark > a:after { content:""; }
.linkbox .brackets:before {
content: "[";
color: #878787;
}
.linkbox .brackets:after {
content: "]";
color: #878787;
}

View File

@ -372,3 +372,11 @@ tr.torrent .bookmark>a:after {
#lastfm_compatibilitybar { #lastfm_compatibilitybar {
height: 100%; height: 100%;
} }
.votespan.brackets:before {
content: "( ";
}
.votespan.brackets:after {
content: " )";
}

View File

@ -1413,3 +1413,11 @@ body#forums .poll li.graph {
.navigation_list li { .navigation_list li {
margin-left: 20px; margin-left: 20px;
} }
.linkbox .brackets:before {
content: "[";
}
.linkbox .brackets:after {
content: "]";
}

View File

@ -772,3 +772,11 @@ ul .invitetree {
font-size: 1.25em; font-size: 1.25em;
font-weight: bold; font-weight: bold;
} }
.linkbox .brackets:before {
content: "[";
}
.linkbox .brackets:after {
content: "]";
}

View File

@ -896,3 +896,13 @@ form tr {
tr.torrent .bookmark > a:before { color:#999; } tr.torrent .bookmark > a:before { color:#999; }
tr.torrent .bookmark > a:after { color:#999; } tr.torrent .bookmark > a:after { color:#999; }
.linkbox .brackets:before {
content: "[";
color: #999;
}
.linkbox .brackets:after {
content: "]";
color: #999;
}

View File

@ -788,3 +788,15 @@ tr.torrent .bookmark > a:before {
tr.torrent .bookmark > a:after { tr.torrent .bookmark > a:after {
color: black; color: black;
} }
.linkbox .brackets:before {
content: "[";
}
.linkbox .brackets:after {
content: "]";
}
#userinfo_major .brackets {
display: none;
}

View File

@ -746,3 +746,15 @@ ul .invitetree {
z-index:1002; z-index:1002;
overflow: auto; overflow: auto;
} }
.linkbox .brackets:before {
content: "[";
}
.linkbox .brackets:after {
content: "]";
}
#userinfo_major .brackets {
display: none;
}

View File

@ -546,3 +546,13 @@ tr.torrent .bookmark > a:after { content:""; }
margin-left: 20px; margin-left: 20px;
} }
.linkbox .brackets:before {
content: "[ ";
color: #F1F1F1;
}
.linkbox .brackets:after {
content: " ]";
color: #F1F1F1;
}

View File

@ -465,3 +465,13 @@ h3{margin:10px 0}
.cats_elearningvideos{width:30px; height:30px; background:url(https://what.cd/static/styles/minimal/images/icons/elearning.png) top left no-repeat} .cats_elearningvideos{width:30px; height:30px; background:url(https://what.cd/static/styles/minimal/images/icons/elearning.png) top left no-repeat}
.cats_comedy{width:30px; height:30px; background:url(https://what.cd/static/styles/minimal/images/icons/comedy.png) top left no-repeat} .cats_comedy{width:30px; height:30px; background:url(https://what.cd/static/styles/minimal/images/icons/comedy.png) top left no-repeat}
.cats_comics{width:30px; height:30px; background:url(https://what.cd/static/styles/minimal/images/icons/comics.png) top left no-repeat} .cats_comics{width:30px; height:30px; background:url(https://what.cd/static/styles/minimal/images/icons/comics.png) top left no-repeat}
.linkbox .brackets:before {
content: "[ ";
color: #F1F1F1;
}
.linkbox .brackets:after {
content: " ]";
color: #F1F1F1;
}

View File

@ -1489,3 +1489,13 @@ ul.collage_images li a:hover img {
ul.collage_images { ul.collage_images {
width: 695px !important; width: 695px !important;
} }
.linkbox .brackets:before {
content: "[ ";
color: #F1F1F1;
}
.linkbox .brackets:after {
content: " ]";
color: #F1F1F1;
}

View File

@ -1231,7 +1231,6 @@ tr.torrent .bookmark > a:after { content:""; }
background: #fff; background: #fff;
} }
/* Fixes for friends.php */ /* Fixes for friends.php */
form.manage_form[name=friends] table tr { form.manage_form[name=friends] table tr {
/* Previously unfinished */ /* Previously unfinished */
@ -1247,7 +1246,6 @@ form.manage_form[name=friends] .left input[type=submit] {
margin-bottom: 10px; margin-bottom: 10px;
} }
/* Fixes for staffpm.php, wiki.php, user.php?action=edit and inbox.php, when composing new message/wiki, and some other stuff */ /* Fixes for staffpm.php, wiki.php, user.php?action=edit and inbox.php, when composing new message/wiki, and some other stuff */
#compose h3, #compose h3,
[class="create_form"][name=wiki_article] h3, [class="create_form"][name=wiki_article] h3,
@ -1263,13 +1261,11 @@ form.manage_form[name=friends] .left input[type=submit] {
margin-top: 10px; margin-top: 10px;
} }
/* Fix for artist.php sidebar layout */ /* Fix for artist.php sidebar layout */
[class="box box_search"] #filelist, [class="box box_addartists box_addartists_similar"] #artistsimilar { [class="box box_search"] #filelist, [class="box box_addartists box_addartists_similar"] #artistsimilar {
width: 150px; width: 150px;
} }
/* Fix for artist.php artist map margin */ /* Fix for artist.php artist map margin */
#similar_artist_map { #similar_artist_map {
margin-top: 20px; margin-top: 20px;
@ -1281,13 +1277,11 @@ form.manage_form[name=friends] .left input[type=submit] {
margin-top: 10px; margin-top: 10px;
} }
/* Fix for forums.php?action=search, search section */ /* Fix for forums.php?action=search, search section */
[class="search_form"] table tr > td > strong { [class="search_form"] table tr > td > strong {
padding-left: 10px; padding-left: 10px;
} }
/* Fix for wiki.php, sidebar details section */ /* Fix for wiki.php, sidebar details section */
.sidebar [class="box box_info pad"] > ul { .sidebar [class="box box_info pad"] > ul {
/* Previously unstyled */ /* Previously unstyled */
@ -1300,14 +1294,22 @@ form.manage_form[name=friends] .left input[type=submit] {
color: #565656; color: #565656;
} }
/* Fix for index.php, more news section at the very bottom of the page */ /* Fix for index.php, more news section at the very bottom of the page */
#more_news.box { #more_news.box {
height: 0; height: 0;
} }
/* Fix for forums.php, search specific forum */ /* Fix for forums.php, search specific forum */
.search_form[action="forums.php"] td > strong { .search_form[action="forums.php"] td > strong {
margin-right: 10px; margin-right: 10px;
} }
.linkbox .brackets:before {
content: "[";
color: #444;
}
.linkbox .brackets:after {
content: "]";
color: #444;
}

View File

@ -47,3 +47,10 @@
display: block; display: block;
} }
.linkbox .brackets:before {
content: "[";
}
.linkbox .brackets:after {
content: "]";
}

View File

@ -1057,3 +1057,13 @@ tr.torrent .bookmark > a:after {
#requests .forum_post textarea { /* overriding the inline 80-character monospace */ #requests .forum_post textarea { /* overriding the inline 80-character monospace */
max-width: 409px; max-width: 409px;
} }
.linkbox .brackets:before {
content: "[";
color: #FCFCFC;
}
.linkbox .brackets:after {
content: "]";
color: #FCFCFC;
}

View File

@ -1758,3 +1758,13 @@ table.noavatar, table.noavatar tr, table.noavatar td.body, table.noavatar td.bod
tr.torrent .bookmark > a:before { content:""; } tr.torrent .bookmark > a:before { content:""; }
tr.torrent .bookmark > a:after { content:""; } tr.torrent .bookmark > a:after { content:""; }
.linkbox .brackets:before {
content: "[";
color: #575757;
}
.linkbox .brackets:after {
content: "]";
color: #575757;
}

View File

@ -117,3 +117,11 @@ input[type="text"]:invalid, input[type="password"]:invalid {
color: red; color: red;
font-weight: bold; font-weight: bold;
} }
.linkbox .brackets:before {
content: "[";
}
.linkbox .brackets:after {
content: "]";
}

View File

@ -862,3 +862,11 @@ form tr {
font-size: 1.25em; font-size: 1.25em;
font-weight: bold; font-weight: bold;
} }
.linkbox .brackets:before {
content: "[";
}
.linkbox .brackets:after {
content: "]";
}

View File

@ -894,3 +894,11 @@ form tr {
font-size: 1.25em; font-size: 1.25em;
font-weight: bold; font-weight: bold;
} }
.linkbox .brackets:before {
content: "[";
}
.linkbox .brackets:after {
content: "]";
}

View File

@ -34,3 +34,12 @@ tr.torrent .bookmark > a:after { content:""; }
margin-left: 20px; margin-left: 20px;
} }
.linkbox .brackets:before {
content: "[";
color: #666;
}
.linkbox .brackets:after {
content: "]";
color: #666;
}

View File

@ -757,3 +757,12 @@ tr.torrent .bookmark > a:after { content:""; }
margin-left: 20px; margin-left: 20px;
} }
.linkbox .brackets:before {
content: "[";
color: #666;
}
.linkbox .brackets:after {
content: "]";
color: #666;
}