From 513f945c6e85db34a1395e72c9998c45d38c3f6d Mon Sep 17 00:00:00 2001 From: Git Date: Sat, 26 Oct 2013 08:00:58 +0000 Subject: [PATCH] Empty commit --- classes/format.class.php | 4 +- .../mass_user_torrents_table_view.class.php | 10 ++-- classes/tools.class.php | 2 +- docs/CHANGES.txt | 6 +++ sections/artist/artist.php | 26 +++++----- sections/artist/delete.php | 8 ++-- sections/better/files.php | 4 +- sections/better/folders.php | 4 +- sections/better/single.php | 4 +- sections/better/snatch.php | 4 +- sections/better/tags.php | 4 +- sections/better/transcode.php | 4 +- sections/better/transcode_beta.php | 4 +- sections/better/upload.php | 6 +-- sections/bookmarks/torrents.php | 28 +++++------ sections/collages/manage.php | 4 +- sections/collages/torrent_collage.php | 30 ++++++------ sections/forums/take_new_thread.php | 47 ++++++++++--------- sections/index/private.php | 12 ++--- sections/questions/take_ask_question.php | 6 +++ sections/reports/reports.php | 4 +- sections/reportsv2/ajax_new_report.php | 4 +- sections/reportsv2/report.php | 8 ++-- sections/reportsv2/static.php | 4 +- sections/requests/request.php | 2 +- sections/tools/managers/change_log.php | 2 +- sections/top10/history.php | 8 ++-- sections/top10/torrents.php | 8 ++-- sections/top10/votes.php | 24 +++++----- sections/torrents/browse.php | 40 +++++++++++----- sections/torrents/browse2.php | 40 ++++++++++------ sections/torrents/delete.php | 2 +- sections/torrents/details.php | 25 +++++----- sections/torrents/functions.php | 16 +++---- sections/torrents/notify.php | 30 +++++++----- sections/torrents/user.php | 22 +++++---- sections/user/community_stats.php | 40 ++++++++-------- sections/user/user.php | 28 +++++------ sections/userhistory/subscribed_collages.php | 20 ++++---- static/functions/browse.js | 12 ++++- static/styles/anorex/style.css | 6 +-- static/styles/gtfo_spaceship/style.css | 3 +- 42 files changed, 313 insertions(+), 252 deletions(-) diff --git a/classes/format.class.php b/classes/format.class.php index c4b5c113..32587082 100644 --- a/classes/format.class.php +++ b/classes/format.class.php @@ -107,10 +107,10 @@ public static function get_ratio_html($Dividend, $Divisor, $Color = true) { return '--'; } if ($Ratio === '∞') { - return '∞'; + return '∞'; } if ($Color) { - $Ratio = sprintf('%s', + $Ratio = sprintf('%s', self::get_ratio_color($Ratio), self::get_ratio($Dividend, $Divisor, 5), $Ratio diff --git a/classes/mass_user_torrents_table_view.class.php b/classes/mass_user_torrents_table_view.class.php index 9c8c7531..83a02c72 100644 --- a/classes/mass_user_torrents_table_view.class.php +++ b/classes/mass_user_torrents_table_view.class.php @@ -127,7 +127,7 @@ public function header () { Order - # + # Year Artist Torrent @@ -179,7 +179,7 @@ public function body () { $this->NumGroups++; $DisplayName = self::display_name($ExtendedArtists, $Artists, $VanityHouse); - $TorrentLink = ''.$Name.''; + $TorrentLink = ''.$Name.''; $Year = $Year > 0 ? $Year : ''; $DateAdded = date($Time); @@ -232,7 +232,7 @@ public static function display_name (array &$ExtendedArtists, array &$Artists, $ $DisplayName = Artists::display_artists(array('1'=>$Artists), true, false); } if ($VanityHouse) { - $DisplayName .= ' [VH]'; + $DisplayName .= ' [VH]'; } return $DisplayName; } @@ -243,8 +243,8 @@ public static function display_name (array &$ExtendedArtists, array &$Artists, $ public function buttons () { ?>
- - + +
S'; + $Line .= 'S'; return $Line; } diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt index 64f0c6e6..54952c66 100644 --- a/docs/CHANGES.txt +++ b/docs/CHANGES.txt @@ -1,5 +1,11 @@ CHANGE LOG +2013-10-26 by alderaan +Added tooltip class to many HTML elements that were missing it + +2013-10-25 by alderaan +Fix many display bugs in the unsupported/unofficial Eye Candy CSS. + 2013-10-24 by alderaan Layer Cake CSS now has a wider table of torrents on torrents.php diff --git a/sections/artist/artist.php b/sections/artist/artist.php index 888b3a40..d450488d 100644 --- a/sections/artist/artist.php +++ b/sections/artist/artist.php @@ -333,16 +333,16 @@ function compare($X, $Y) { ↑  (View) Size - Snatches - Seeders - Leechers + Snatches + Seeders + Leechers $GroupName"; + $DisplayName = "$GroupName"; if (check_perms('users_mod') || check_perms('torrents_fix_ghosts')) { $DisplayName .= ' Fix'; } @@ -382,7 +382,7 @@ function compare($X, $Y) { } if ($GroupVanityHouse) { - $DisplayName .= ' [VH]'; + $DisplayName .= ' [VH]'; } $SnatchedGroupClass = ($GroupFlags['IsSnatched'] ? ' snatched_group' : ''); @@ -454,9 +454,9 @@ function compare($X, $Y) { - [ + [ - | FL + | FL ]   »  @@ -516,7 +516,7 @@ function compare($X, $Y) { Bookmark - + "> - X + X
@@ -779,10 +779,10 @@ function compare($X, $Y) { ↑  Request Name - + Vote - + Bounty @@ -820,14 +820,14 @@ function compare($X, $Y) {
- +    + - + diff --git a/sections/artist/delete.php b/sections/artist/delete.php index d2a10a12..1fd72076 100644 --- a/sections/artist/delete.php +++ b/sections/artist/delete.php @@ -35,7 +35,7 @@ if ($DB->has_results()) { ?>
- There are still torrents that have as an artist.
+ There are still torrents that have as an artist.
Please remove the artist from these torrents manually before attempting to delete.
    @@ -43,7 +43,7 @@ while (list($GroupName, $GroupID) = $DB->next_record(MYSQLI_NUM, true)) { ?>
  • - +
    • has_results()) { ?>
    - There are still requests that have as an artist.
    + There are still requests that have as an artist.
    Please remove the artist from these requests manually before attempting to delete.
      @@ -71,7 +71,7 @@ while (list($RequestName, $RequestID) = $DB->next_record(MYSQLI_NUM, true)) { ?>
    • - +
      • $GroupName"; + $DisplayName .= "$GroupName"; if ($GroupYear > 0) { $DisplayName .= " [$GroupYear]"; } @@ -81,7 +81,7 @@ "> - DL + DL diff --git a/sections/better/folders.php b/sections/better/folders.php index bd82c668..0f50fa70 100644 --- a/sections/better/folders.php +++ b/sections/better/folders.php @@ -65,7 +65,7 @@ } else { $DisplayName = ''; } - $DisplayName .= "$GroupName"; + $DisplayName .= "$GroupName"; if ($GroupYear > 0) { $DisplayName .= " [$GroupYear]"; } @@ -81,7 +81,7 @@ - DL + DL diff --git a/sections/better/single.php b/sections/better/single.php index 22fd0e89..f59c60ca 100644 --- a/sections/better/single.php +++ b/sections/better/single.php @@ -42,7 +42,7 @@ } $FlacID = $GroupIDs[$GroupID]['TorrentID']; - $DisplayName .= "$GroupName"; + $DisplayName .= "$GroupName"; if ($GroupYear > 0) { $DisplayName .= " [$GroupYear]"; } @@ -58,7 +58,7 @@ - DL + DL
      format()?>
      diff --git a/sections/better/snatch.php b/sections/better/snatch.php index 178c5cab..d8b96bde 100644 --- a/sections/better/snatch.php +++ b/sections/better/snatch.php @@ -185,7 +185,7 @@ if (!$Edition['FlacID'] || count($Edition['Formats']) === 3) { continue; } - $DisplayName = $ArtistNames . ''.$GroupName.''; + $DisplayName = $ArtistNames . ''.$GroupName.''; if ($GroupYear > 0) { $DisplayName .= " [$GroupYear]"; } @@ -217,7 +217,7 @@ - DL + DL
      diff --git a/sections/better/tags.php b/sections/better/tags.php index 49c43a21..6de556de 100644 --- a/sections/better/tags.php +++ b/sections/better/tags.php @@ -66,7 +66,7 @@ } else { $DisplayName = ''; } - $DisplayName .= "$GroupName"; + $DisplayName .= "$GroupName"; if ($GroupYear > 0) { $DisplayName .= " [$GroupYear]"; } @@ -82,7 +82,7 @@ - DL + DL diff --git a/sections/better/transcode.php b/sections/better/transcode.php index e42e5413..664f6eb1 100644 --- a/sections/better/transcode.php +++ b/sections/better/transcode.php @@ -131,7 +131,7 @@ { continue; } - $DisplayName = $ArtistNames . ''.$GroupName.''; + $DisplayName = $ArtistNames . ''.$GroupName.''; if ($GroupYear > 0) { $DisplayName .= " [$GroupYear]"; } @@ -165,7 +165,7 @@ > - DL + DL
      diff --git a/sections/better/transcode_beta.php b/sections/better/transcode_beta.php index c9516393..b6842f7a 100644 --- a/sections/better/transcode_beta.php +++ b/sections/better/transcode_beta.php @@ -304,7 +304,7 @@ function transcode_parse_groups($Groups) { foreach ($Group['Editions'] as $RemIdent => $Edition) { // TODO: point to the correct FLAC (?) $FlacID = array_search(true, $Edition['FlacIDs']); - $DisplayName = $ArtistNames . "$GroupName"; + $DisplayName = $ArtistNames . "$GroupName"; if ($GroupYear > 0) { $DisplayName .= " [$GroupYear]"; } @@ -318,7 +318,7 @@ function transcode_parse_groups($Groups) { > - DL + DL
      diff --git a/sections/better/upload.php b/sections/better/upload.php index 2b24523a..b6be6d48 100644 --- a/sections/better/upload.php +++ b/sections/better/upload.php @@ -116,7 +116,7 @@ foreach ($Encodings as $Encoding) { if (!isset($Edition['Formats'][$Encoding])) { ++$edition_miss; - ++$Counter['miss_'.$Encoding]; + ++$Counter["miss_$Encoding"]; } } $Counter['miss_total'] += $edition_miss; @@ -164,7 +164,7 @@ if (!$Edition['FlacID'] || count($Edition['Formats']) === 3) { continue; } - $DisplayName = $ArtistNames . ''.$GroupName.''; + $DisplayName = $ArtistNames . ''.$GroupName.''; if ($GroupYear > 0) { $DisplayName .= " [$GroupYear]"; } @@ -196,7 +196,7 @@ - DL + DL
      diff --git a/sections/bookmarks/torrents.php b/sections/bookmarks/torrents.php index 2f7f6032..24de3093 100644 --- a/sections/bookmarks/torrents.php +++ b/sections/bookmarks/torrents.php @@ -65,12 +65,12 @@ function compare($X, $Y) { } else { $DisplayName = ''; } - $DisplayName .= ''.$GroupName.''; + $DisplayName .= ''.$GroupName.''; if ($GroupYear > 0) { $DisplayName = "$DisplayName [$GroupYear]"; } if ($GroupVanityHouse) { - $DisplayName .= ' [VH]'; + $DisplayName .= ' [VH]'; } $SnatchedGroupClass = $GroupFlags['IsSnatched'] ? ' snatched_group' : ''; @@ -87,7 +87,7 @@ function compare($X, $Y) {
    -
    +
    @@ -141,11 +141,11 @@ function compare($X, $Y) { ?> - [ DL + [ DL - | FL + | FL - | RP ] + | RP ]   »  @@ -161,7 +161,7 @@ function compare($X, $Y) { list($TorrentID, $Torrent) = each($Torrents); - $DisplayName = ''.$GroupName.''; + $DisplayName = ''.$GroupName.''; if ($Torrent['IsSnatched']) { $DisplayName .= ' ' . Format::torrent_label('Snatched!'); @@ -178,16 +178,16 @@ function compare($X, $Y) { -
    +
    - [ DL + [ DL - | FL + | FL - | RP ] + | RP ]
    format()?>
    @@ -358,9 +358,9 @@ function compare($X, $Y) { Torrents Size - Snatches - Seeders - Leechers + Snatches + Seeders + Leechers diff --git a/sections/collages/manage.php b/sections/collages/manage.php index dd29a009..91918856 100644 --- a/sections/collages/manage.php +++ b/sections/collages/manage.php @@ -94,10 +94,10 @@ } elseif (count($Artists) > 0) { $DisplayName .= Artists::display_artists(array('1' => $Artists), true, false); } - $TorrentLink = "$GroupName"; + $TorrentLink = "$GroupName"; $GroupYear = $GroupYear > 0 ? $GroupYear : ''; if ($GroupVanityHouse) { - $DisplayName .= ' [VH]'; + $DisplayName .= ' [VH]'; } $AltCSS = ($Number % 2 === 0) ? 'rowa' : 'rowb'; diff --git a/sections/collages/torrent_collage.php b/sections/collages/torrent_collage.php index 5c728606..7b7762f4 100644 --- a/sections/collages/torrent_collage.php +++ b/sections/collages/torrent_collage.php @@ -80,12 +80,12 @@ $DisplayName .= Artists::display_artists(array('1' => $GroupArtists)); } - $DisplayName .= "$GroupName"; + $DisplayName .= "$GroupName"; if ($GroupYear > 0) { $DisplayName = "$DisplayName [$GroupYear]"; } if ($GroupVanityHouse) { - $DisplayName .= ' [VH]'; + $DisplayName .= ' [VH]'; } $SnatchedGroupClass = ($GroupFlags['IsSnatched'] ? ' snatched_group' : ''); // Start an output buffer, so we can store this output in $TorrentTable @@ -98,11 +98,11 @@
    - +
    -
    +
    @@ -157,11 +157,11 @@ - DL + DL - | FL + | FL - | RP + | RP   »  @@ -177,7 +177,7 @@ list($TorrentID, $Torrent) = each($Torrents); - $DisplayName = "$GroupName"; + $DisplayName = "$GroupName"; if ($Torrent['IsSnatched']) { $DisplayName .= ' ' . Format::torrent_label('Snatched!'); @@ -194,16 +194,16 @@ -
    +
    - DL + DL - | FL + | FL - | RP + | RP @@ -576,9 +576,9 @@ Torrents Size - Snatches - Seeders - Leechers + Snatches + Seeders + Leechers diff --git a/sections/forums/take_new_thread.php b/sections/forums/take_new_thread.php index ed4906d1..0f448b3c 100644 --- a/sections/forums/take_new_thread.php +++ b/sections/forums/take_new_thread.php @@ -54,6 +54,29 @@ error(403); } +if (empty($_POST['question']) || empty($_POST['answers']) || !check_perms('forums_polls_create')) { + $NoPoll = 1; +} else { + $NoPoll = 0; + $Question = trim($_POST['question']); + $Answers = array(); + $Votes = array(); + + //This can cause polls to have answer IDs of 1 3 4 if the second box is empty + foreach ($_POST['answers'] as $i => $Answer) { + if ($Answer == '') { + continue; + } + $Answers[$i + 1] = $Answer; + $Votes[$i + 1] = 0; + } + + if (count($Answers) < 2) { + error('You cannot create a poll with only one answer.'); + } elseif (count($Answers) > 25) { + error('You cannot create a poll with greater than 25 answers.'); + } +} $DB->query(" INSERT INTO forums_topics @@ -94,29 +117,7 @@ Subscriptions::subscribe($TopicID); } -if (empty($_POST['question']) || empty($_POST['answers']) || !check_perms('forums_polls_create')) { - $NoPoll = 1; -} else { - $NoPoll = 0; - $Question = trim($_POST['question']); - $Answers = array(); - $Votes = array(); - - //This can cause polls to have answer IDs of 1 3 4 if the second box is empty - foreach ($_POST['answers'] as $i => $Answer) { - if ($Answer == '') { - continue; - } - $Answers[$i + 1] = $Answer; - $Votes[$i + 1] = 0; - } - - if (count($Answers) < 2) { - error('You cannot create a poll with only one answer.'); - } elseif (count($Answers) > 25) { - error('You cannot create a poll with greater than 25 answers.'); - } - +if (!$NoPoll) { // god, I hate double negatives... $DB->query(" INSERT INTO forums_polls (TopicID, Question, Answers) diff --git a/sections/index/private.php b/sections/index/private.php index 36cbe2ca..102c9cca 100644 --- a/sections/index/private.php +++ b/sections/index/private.php @@ -186,7 +186,7 @@ SELECT COUNT(ID) FROM torrents"); list($TorrentCount) = $DB->next_record(); - $Cache->cache_value('stats_torrent_count', $TorrentCount, 0); //inf cache + $Cache->cache_value('stats_torrent_count', $TorrentCount, 604800); // staggered 1 week cache } if (($AlbumCount = $Cache->get_value('stats_album_count')) === false) { @@ -195,7 +195,7 @@ FROM torrents_group WHERE CategoryID = '1'"); list($AlbumCount) = $DB->next_record(); - $Cache->cache_value('stats_album_count', $AlbumCount, 0); //inf cache + $Cache->cache_value('stats_album_count', $AlbumCount, 604830); // staggered 1 week cache } if (($ArtistCount = $Cache->get_value('stats_artist_count')) === false) { @@ -203,7 +203,7 @@ SELECT COUNT(ArtistID) FROM artists_group"); list($ArtistCount) = $DB->next_record(); - $Cache->cache_value('stats_artist_count', $ArtistCount, 0); //inf cache + $Cache->cache_value('stats_artist_count', $ArtistCount, 604860); // staggered 1 week cache } if (($PerfectCount = $Cache->get_value('stats_perfect_count')) === false) { @@ -217,7 +217,7 @@ OR (Media = 'Soundboard' AND Format = 'FLAC') )"); list($PerfectCount) = $DB->next_record(); - $Cache->cache_value('stats_perfect_count', $PerfectCount, 0); //inf cache + $Cache->cache_value('stats_perfect_count', $PerfectCount, 604890); // staggered 1 week cache } ?>
  • Torrents:
    • @@ -265,7 +265,7 @@ $PeerCount = $DB->to_array(0, MYSQLI_NUM, false); $SeederCount = $PeerCount['Seeding'][1] ?: 0; $LeecherCount = $PeerCount['Leeching'][1] ?: 0; - $Cache->cache_value('stats_peers', array($LeecherCount, $SeederCount), 0); + $Cache->cache_value('stats_peers', array($LeecherCount, $SeederCount), 1209600); // 2 week cache $Cache->delete_value('stats_peers_lock'); } } else { @@ -299,7 +299,7 @@ $Cache->cache_value('polls_featured', $TopicID, 0); } if ($TopicID) { - if (($Poll = $Cache->get_value('polls_'.$TopicID)) === false) { + if (($Poll = $Cache->get_value("polls_$TopicID")) === false) { $DB->query(" SELECT Question, Answers, Featured, Closed FROM forums_polls diff --git a/sections/questions/take_ask_question.php b/sections/questions/take_ask_question.php index 9b90bba3..0426c94a 100644 --- a/sections/questions/take_ask_question.php +++ b/sections/questions/take_ask_question.php @@ -1,7 +1,13 @@ query("SELECT COUNT(1) FROM user_questions WHERE UserID = '$LoggedUser[ID]'"); +if ($DB->record_count() >= MAX_QUESTIONS) { + error("You have asked too many questions for the time being."); +} + $Question = db_string($_POST['question']); if (empty($Question)) { diff --git a/sections/reports/reports.php b/sections/reports/reports.php index 58335ea8..232f7d5b 100644 --- a/sections/reports/reports.php +++ b/sections/reports/reports.php @@ -94,8 +94,8 @@ while (list($ReportID, $SnitchID, $SnitchName, $ThingID, $Short, $ReportedTime, $Reason, $Status, $ClaimerID, $Notes, $ResolverID) = $DB->next_record()) { $Type = $Types[$Short]; $Reference = "reports.php?id=$ReportID#report$ReportID"; - ?> -
    +?> +
    diff --git a/sections/reportsv2/ajax_new_report.php b/sections/reportsv2/ajax_new_report.php index 787bf0ff..70543792 100644 --- a/sections/reportsv2/ajax_new_report.php +++ b/sections/reportsv2/ajax_new_report.php @@ -154,7 +154,7 @@ (Deleted) - DL + DL uploaded by
    was reported by for the reason:
    @@ -298,7 +298,7 @@ ?> ')?> - DL + DL uploaded by Switch - - - + + +
    Report # Reported torrent SizeSnatchesSeedersLeechersSnatchesSeedersLeechers
    Reason: - "> (Deleted) - DL + DL uploaded by
    ')?> - DL + DL uploaded by Switch
    -
    +
    Description
    full_format($Request['Description']);?> diff --git a/sections/tools/managers/change_log.php b/sections/tools/managers/change_log.php index 51e3238d..9359a18c 100644 --- a/sections/tools/managers/change_log.php +++ b/sections/tools/managers/change_log.php @@ -78,7 +78,7 @@ foreach ($ChangeLog as $Change) { ?> -
    +
    by diff --git a/sections/top10/history.php b/sections/top10/history.php index 1fcd79ad..2dc5bfcc 100644 --- a/sections/top10/history.php +++ b/sections/top10/history.php @@ -19,7 +19,7 @@ - + @@ -119,7 +119,7 @@ $DisplayName = Artists::display_artists($Artists, true, true); } - $DisplayName .= "$GroupName"; + $DisplayName .= "$GroupName"; if ($GroupCategoryID == 1 && $GroupYear > 0) { $DisplayName .= " [$GroupYear]"; @@ -174,9 +174,9 @@ ?> - + diff --git a/sections/top10/torrents.php b/sections/top10/torrents.php index 7d62f1d6..2ac628c2 100644 --- a/sections/top10/torrents.php +++ b/sections/top10/torrents.php @@ -7,7 +7,7 @@ if ($_GET['tags']) { $TagWhere = array(); - $Tags = explode(',', str_replace(".","_",trim($_GET['tags']))); + $Tags = explode(',', str_replace('.', '_', trim($_GET['tags']))); foreach ($Tags as $Tag) { $Tag = preg_replace('/[^a-z0-9_]/', '', $Tag); if ($Tag != '') { @@ -473,7 +473,7 @@ function generate_torrent_table($Caption, $Tag, $Details, $Limit) { $DisplayName = Artists::display_artists($Artists[$GroupID], true, true); } - $DisplayName .= "$GroupName"; + $DisplayName .= "$GroupName"; if ($GroupCategoryID == 1 && $GroupYear > 0) { $DisplayName .= " [$GroupYear]"; @@ -542,7 +542,7 @@ function generate_torrent_table($Caption, $Tag, $Details, $Limit) { ?> - + @@ -313,7 +313,7 @@ list($TorrentID, $Torrent) = each($Torrents); $Torrent['IsSnatched'] = Torrents::has_snatched($TorrentID); - $DisplayName = $Number .' - '.$GroupName.''; + $DisplayName = $Number .' - '.$GroupName.''; if ($Torrent['IsSnatched']) { $DisplayName .= ' ' . Format::torrent_label('Snatched!'); } @@ -329,7 +329,7 @@ diff --git a/sections/torrents/browse.php b/sections/torrents/browse.php index 99078ccb..946077ec 100644 --- a/sections/torrents/browse.php +++ b/sections/torrents/browse.php @@ -925,7 +925,7 @@ function header_link($SortKey, $DefaultWay = 'DESC') {
    Results - +    @@ -952,9 +952,21 @@ function header_link($SortKey, $DefaultWay = 'DESC') {
    - - - + + + 1 || $GroupCategoryID == 1) && !$DisableGrouping) { // These torrents are in a group - $DisplayName .= "$GroupName"; + $DisplayName .= "$GroupName"; if ($GroupYear > 0) { $DisplayName .= " [$GroupYear]"; } ?> - - + + @@ -1185,9 +1197,9 @@ function header_link($SortKey, $DefaultWay = 'DESC') { } else { // Either grouping is disabled, or we're viewing a type that does not require grouping if ($GroupCategoryID == 1) { - $DisplayName .= ''.$GroupName.''; + $DisplayName .= ''.$GroupName.''; } else { - $DisplayName .= ''.$GroupName.''; + $DisplayName .= ''.$GroupName.''; } $ExtraInfo = ''; @@ -1250,7 +1262,9 @@ function header_link($SortKey, $DefaultWay = 'DESC') { - + - - - + + + 1 || isset($GroupedCategories[$CategoryID - 1]))) { // These torrents are in a group - $DisplayName .= "$GroupName"; + $DisplayName .= "$GroupName"; if ($GroupYear > 0) { $DisplayName .= " [$GroupYear]"; } if ($GroupInfo['VanityHouse']) { - $DisplayName .= ' [VH]'; + $DisplayName .= ' [VH]'; } $DisplayName .= ' ['.$ReleaseTypes[$ReleaseType].']'; ?> @@ -1034,7 +1046,7 @@ function header_link($SortKey, $DefaultWay = 'desc') { @@ -1135,7 +1147,7 @@ function header_link($SortKey, $DefaultWay = 'desc') { // Viewing a type that does not require grouping list($TorrentID, $Data) = each($Torrents); - $DisplayName .= "$GroupName"; + $DisplayName .= "$GroupName"; if (isset($GroupedCategories[$CategoryID - 1])) { if ($GroupYear) { $DisplayName .= " [$GroupYear]"; @@ -1156,7 +1168,7 @@ function header_link($SortKey, $DefaultWay = 'desc') { - - - + + + - + groupid_ edition_ group_torrent" style="font-weight: normal;" id="torrent"> @@ -785,7 +785,10 @@ function filelist($Str) { $i = 0; ?>
    -
    Requests () Show
    +
    + Requests () + Show +
    Date:
    Type:
    		 - DL' : '(Deleted)')?> + DL' : '(Deleted)')?>
    format()?>
    @@ -551,7 +551,7 @@ function generate_torrent_table($Caption, $Tag, $Details, $Limit) {
    - DL + DL - Reported diff --git a/sections/top10/votes.php b/sections/top10/votes.php index 8f6afb16..2674fb37 100644 --- a/sections/top10/votes.php +++ b/sections/top10/votes.php @@ -183,12 +183,12 @@ $DisplayName .= Artists::display_artists(array('1'=>$GroupArtists)); } - $DisplayName .= ''.$GroupName.''; + $DisplayName .= ''.$GroupName.''; if ($GroupYear > 0) { $DisplayName = $DisplayName. " [$GroupYear]"; } if ($GroupVanityHouse) { - $DisplayName .= ' [VH]'; + $DisplayName .= ' [VH]'; } // Start an output buffer, so we can store this output in $TorrentTable ob_start(); @@ -211,7 +211,7 @@
    		-
    +
    		@@ -292,11 +292,11 @@
    -
    +
    		@@ -340,11 +340,11 @@
    - [ DL + [ DL - | FL + | FL - | RP + | RP | Remove bookmark @@ -352,7 +352,7 @@ ] - +
    format()?>
    		Files SizeSnatchesSeedersLeechers + + Snatches + + + + Seeders + + + + Leechers + +
    		"> - [ DL - | RP ] + [ DL + | RP ] »
    		+
    +
    @@ -1258,7 +1272,7 @@ function header_link($SortKey, $DefaultWay = 'DESC') {
    - [ DL | RP ] + [ DL | RP ]
    format()?>
    diff --git a/sections/torrents/browse2.php b/sections/torrents/browse2.php index 543ef4f0..3293bba9 100644 --- a/sections/torrents/browse2.php +++ b/sections/torrents/browse2.php @@ -966,9 +966,21 @@ function header_link($SortKey, $DefaultWay = 'desc') {
    		Files Time SizeSnatchesSeedersLeechers + + Snatches + + + + Seeders + + + + Leechers + +
    -
    +
    		@@ -1114,11 +1126,11 @@ function header_link($SortKey, $DefaultWay = 'desc') {
    - [ + [ - | FL + | FL - | RP ] + | RP ] » / Reported -
    +
    		@@ -1166,11 +1178,11 @@ function header_link($SortKey, $DefaultWay = 'desc') {
    - [ DL + [ DL - | FL + | FL - | RP ] + | RP ]
    diff --git a/sections/torrents/delete.php b/sections/torrents/delete.php index bc455c54..52892135 100644 --- a/sections/torrents/delete.php +++ b/sections/torrents/delete.php @@ -182,7 +182,7 @@ (Deleted) - DL + DL uploaded by
    query(" diff --git a/sections/torrents/details.php b/sections/torrents/details.php index 1ff660da..e2d4304e 100644 --- a/sections/torrents/details.php +++ b/sections/torrents/details.php @@ -517,9 +517,9 @@ function compare($X, $Y) {
    Torrents SizeSnatchesSeedersLeechersSnatchesSeedersLeechers
    − −
    - [ + [ - | FL + | FL - | RP + | RP - | ED + | ED - | RM + | RM - | PL + | PL ] »
    diff --git a/sections/torrents/functions.php b/sections/torrents/functions.php index fa4ff165..51be46a7 100644 --- a/sections/torrents/functions.php +++ b/sections/torrents/functions.php @@ -459,18 +459,18 @@ function filelist($Str) { ?> @@ -502,8 +502,8 @@ function filelist($Str) {
    View peer list - View download list - View snatch list + View download list + View snatch list View file list diff --git a/sections/torrents/notify.php b/sections/torrents/notify.php index 38b2ea22..be85215b 100644 --- a/sections/torrents/notify.php +++ b/sections/torrents/notify.php @@ -233,9 +233,9 @@ function header_link($SortKey, $DefaultWay = 'desc') {
    - - - + + + " . $GroupInfo['Name'] . ''; + $DisplayName .= "" . $GroupInfo['Name'] . ''; $GroupCategoryID = $GroupInfo['CategoryID']; if ($GroupCategoryID == 1) { @@ -285,8 +285,12 @@ function header_link($SortKey, $DefaultWay = 'desc') { // print row ?> > - - + + - - - - - + + + + + Time'.$GroupName.''; + $DisplayName .= ''.$GroupName.''; if ($GroupYear > 0) { $DisplayName .= " [$GroupYear]"; } if ($GroupVanityHouse) { - $DisplayName .= ' [VH]'; + $DisplayName .= ' [VH]'; } $ExtraInfo = Torrents::torrent_info($Torrent); @@ -517,7 +523,7 @@ function header_link($SortKey, $DefaultWay = 'DESC') { ?> @@ -730,8 +730,8 @@ function check_paranoia_here($Setting) { $Name .= $GroupName; ?> diff --git a/sections/userhistory/subscribed_collages.php b/sections/userhistory/subscribed_collages.php index 10047577..88d62562 100644 --- a/sections/userhistory/subscribed_collages.php +++ b/sections/userhistory/subscribed_collages.php @@ -114,12 +114,12 @@ } elseif (count($Artists) > 0) { $DisplayName .= Artists::display_artists(array('1' => $Artists)); } - $DisplayName .= "$GroupName"; + $DisplayName .= "$GroupName"; if ($GroupYear > 0) { $DisplayName = "$DisplayName [$GroupYear]"; } if ($GroupVanityHouse) { - $DisplayName .= ' [VH]'; + $DisplayName .= ' [VH]'; } $SnatchedGroupClass = $GroupFlags['IsSnatched'] ? ' snatched_group' : ''; @@ -186,7 +186,7 @@ @@ -202,7 +202,7 @@ list($TorrentID, $Torrent) = each($Torrents); - $DisplayName = "$GroupName"; + $DisplayName = "$GroupName"; if ($Torrent['IsSnatched']) { $DisplayName .= ' ' . Format::torrent_label('Snatched!'); @@ -215,7 +215,7 @@ - - - + + + diff --git a/static/functions/browse.js b/static/functions/browse.js index e94e6435..46ceb9e9 100644 --- a/static/functions/browse.js +++ b/static/functions/browse.js @@ -93,6 +93,16 @@ function toggle_group(groupid, link, event) { var group_rows = clickedRow.parentNode.children; var showing = $(clickedRow).nextElementSibling().has_class('hidden'); var allGroups = event.ctrlKey; + + // for dealing with Mac OS X + // http://stackoverflow.com/a/3922353 + var allGroupsMac = ( + event.keyCode == 91 // WebKit (left apple) + || event.keyCode == 93 // WebKit (right apple) + || event.keyCode == 224 // Firefox + || event.keyCode == 17 // Opera + ) ? 91 : null; + for (var i = 0; i < group_rows.length; i++) { var row = $(group_rows[i]); if (row.has_class('colhead_dark')) { @@ -102,7 +112,7 @@ function toggle_group(groupid, link, event) { continue; } var relevantRow = row.has_class('group') ? $(group_rows[i + 1]) : row; - if (allGroups || relevantRow.has_class('groupid_' + groupid)) { + if (allGroups || allGroupsMac || relevantRow.has_class('groupid_' + groupid)) { row = $(group_rows[i]); // idk why we need this :S if (row.has_class('group')) { var section; diff --git a/static/styles/anorex/style.css b/static/styles/anorex/style.css index dfe28a36..b27e0eb6 100644 --- a/static/styles/anorex/style.css +++ b/static/styles/anorex/style.css @@ -833,15 +833,13 @@ ul .invitetree { background: #F1E6CC; } -div[class~=tooltipster-base] { +div[class~=tooltipster-base], +div[class~=tooltipster-content] > a { background-color: #DCB881; border-color: #65430F; color: #492802; } -div[class~=tooltipster-content] > a { -} - .post_id { font-weight: normal; } diff --git a/static/styles/gtfo_spaceship/style.css b/static/styles/gtfo_spaceship/style.css index 2cf21151..5444e1ef 100644 --- a/static/styles/gtfo_spaceship/style.css +++ b/static/styles/gtfo_spaceship/style.css @@ -708,7 +708,8 @@ body#torrents { padding: 5px 2px; border-top: 1px solid #5F7187; } -#torrent_table tr.group a[href ^="artist.php"], #torrent_table tr.group a[title ^="View Torrent"] { +#torrent_table tr.group a[href ^="artist.php"], #torrent_table tr.group a[title ^="View torrent"], +#torrent_table tr.group a[href ^="artist.php"], #torrent_table tr.group a[title ^="View torrent group"] { font-size: 12pt; font-weight: bold; }