diff --git a/app/Torrent.php b/app/Torrent.php index c7cc70847..c142746aa 100644 --- a/app/Torrent.php +++ b/app/Torrent.php @@ -634,7 +634,8 @@ public function peerlistTotal() { public function peerlistPage(int $userId, int $limit, int $offset) { $key = sprintf(self::CACHE_KEY_PEERLIST_PAGE, $this->id, $offset); - if (($list = $this->cache->get_value($key)) === false) { + $list = $this->cache->get_value($key); + if ($list === false) { // force flush the next page of results $this->cache->delete_value(sprintf(self::CACHE_KEY_PEERLIST_PAGE, $this->id, $offset + $limit)); $this->db->prepared_query(" @@ -647,7 +648,9 @@ public function peerlistPage(int $userId, int $limit, int $offset) { xfu.ip AS ipv4addr, xfu.uid AS user_id, t.Size AS size, - sx.name AS seedbox + sx.name AS seedbox, + EXISTS(SELECT 1 FROM users_downloads ud WHERE ud.UserID = xfu.uid AND ud.TorrentID = xfu.fid) AS is_download, + EXISTS(SELECT 1 FROM xbt_snatched xs WHERE xs.uid = xfu.uid AND xs.fid = xfu.fid) AS is_snatched FROM xbt_files_users AS xfu INNER JOIN users_main AS um ON (um.ID = xfu.uid) INNER JOIN torrents AS t ON (t.ID = xfu.fid) @@ -658,9 +661,53 @@ public function peerlistPage(int $userId, int $limit, int $offset) { LIMIT ? OFFSET ? ", $userId, $this->id, $userId, $limit, $offset ); - $list = $this->db->to_array(false, MYSQLI_ASSOC); + $list = $this->db->to_array(false, MYSQLI_ASSOC, false); $this->cache->cache_value($key, $list, 300); } return $list; } + + public function downloadTotal(): int { + return $this->db->scalar(" + SELECT count(*) FROM users_downloads WHERE TorrentID = ? + ", $this->id + ); + } + + public function downloadPage(int $limit, int $offset): array { + $this->db->prepared_query(" + SELECT ud.UserID AS user_id, + ud.Time AS timestamp, + EXISTS(SELECT 1 FROM xbt_snatched xs WHERE xs.uid = ud.UserID AND xs.fid = ud.TorrentID) AS is_snatched, + EXISTS(SELECT 1 FROM xbt_files_users xfu WHERE xfu.uid = ud.UserID AND xfu.fid = ud.TorrentID) AS is_seeding + FROM users_downloads ud + WHERE ud.TorrentID = ? + ORDER BY ud.Time DESC, ud.UserID + LIMIT ? OFFSET ? + ", $this->id, $limit, $offset + ); + return $this->db->to_array(false, MYSQLI_ASSOC, false); + } + + public function snatchTotal(): int { + return $this->db->scalar(" + SELECT count(*) FROM xbt_snatched WHERE fid = ? + ", $this->id + ); + } + + public function snatchPage(int $limit, int $offset): array { + $this->db->prepared_query(" + SELECT xs.uid AS user_id, + from_unixtime(xs.tstamp) AS timestamp, + EXISTS(SELECT 1 FROM users_downloads ud WHERE ud.UserID = xs.uid AND ud.TorrentID = xs.fid) AS is_download, + EXISTS(SELECT 1 FROM xbt_files_users xfu WHERE xfu.uid = xs.uid AND xfu.fid = xs.fid) AS is_seeding + FROM xbt_snatched xs + WHERE xs.fid = ? + ORDER BY xs.tstamp DESC + LIMIT ? OFFSET ? + ", $this->id, $limit, $offset + ); + return $this->db->to_array(false, MYSQLI_ASSOC, false); + } } diff --git a/app/Util/Paginator.php b/app/Util/Paginator.php index 6d0948663..679c4fc17 100644 --- a/app/Util/Paginator.php +++ b/app/Util/Paginator.php @@ -39,6 +39,10 @@ public function total(): int { return $this->total; } + public function pages(): int { + return (int)ceil($this->total / $this->perPage); + } + public function setAnchor(string $anchor) { $this->anchor = '#' . $anchor; return $this; diff --git a/classes/config.template.php b/classes/config.template.php index 35e2ead65..ef1d93f32 100644 --- a/classes/config.template.php +++ b/classes/config.template.php @@ -323,6 +323,7 @@ define('ICON_NONE', "\xf0\x9f\x9a\xab"); define('ICON_TOGGLE', "\xf0\x9f\x94\x81"); define('ICON_PADLOCK', "\xF0\x9F\x94\x92"); +define('ICON_STAR', "\xE2\x98\x85"); define('COLLAGE', [ 0 => 'Personal', diff --git a/sections/reportsv2/report.php b/sections/reportsv2/report.php index f32d6d12c..d3f0bc14b 100644 --- a/sections/reportsv2/report.php +++ b/sections/reportsv2/report.php @@ -161,7 +161,7 @@ "; foreach ($Reports as $Report) { - if (check_perms('admin_reports')) { + if ($Viewer->permitted('admin_reports')) { $ReporterID = $Report['ReporterID']; $ReporterName = $userMan->findById($ReporterID)->username(); $ReportLinks = "$ReporterName reported it"; @@ -187,8 +187,8 @@ $ReportInfo .= "\n\t\t"; } -$CanEdit = (check_perms('torrents_edit') || (($UserID == $Viewer->id() && !$Viewer->disableWiki()) && !($Remastered && !$RemasterYear))); -$RegenLink = check_perms('users_mod') ? ' Regenerate' : ''; +$CanEdit = ($Viewer->permitted('torrents_edit') || (($UserID == $Viewer->id() && !$Viewer->disableWiki()) && !($Remastered && !$RemasterYear))); +$RegenLink = $Viewer->permitted('users_mod') ? ' Regenerate' : ''; $FileTable = ' @@ -296,7 +296,7 @@ 'key' => $Viewer->announceKey(), 't' => $TorrentList, 'edit' => $CanEdit, - 'remove' => check_perms('torrents_delete') || $UserID == $Viewer->id(), + 'remove' => $Viewer->permitted('torrents_delete') || $UserID == $Viewer->id(), 'pl' => true, ]) ?> » @@ -327,18 +327,18 @@ } ?> - +permitted('site_moderate_requests')) { ?>
Mass PM snatchers
- View peer list - - View download list - View snatch list +permitted('site_view_torrent_snatchlist')) { ?> + View downloaders + View snatchers - View file list + View seeders + View contents View report information diff --git a/sections/reportsv2/static.php b/sections/reportsv2/static.php index 58e6a2680..a625e6a43 100644 --- a/sections/reportsv2/static.php +++ b/sections/reportsv2/static.php @@ -146,7 +146,6 @@ tg.CategoryID, t.Time, t.Description, - t.FileList, t.Remastered, t.RemasterTitle, t.RemasterYear, @@ -159,6 +158,8 @@ t.HasLogDB, t.LogScore, t.LogChecksum, + t.FileList, + t.FilePath, tls.last_action, t.UserID AS UploaderID FROM $tables @@ -172,7 +173,7 @@ ); $Reports = $DB->to_array(false, MYSQLI_NUM); -View::show_header('Reports V2', ['js' => 'reportsv2,bbcode,torrent']); +View::show_header('Reports V2', ['js' => 'reportsv2,bbcode,browse,torrent']); ?>

@@ -202,9 +203,9 @@ [$ReportID, $ReporterID, $TorrentID, $Type, $UserComment, $ResolverID, $Status, $ReportedTime, $LastChangeTime, $ModComment, $Tracks, $Images, $ExtraIDs, $Links, $LogMessage, $GroupName, $GroupID, $ArtistID, $ArtistName, $Year, - $CategoryID, $Time, $Description, $FileList, $Remastered, $RemasterTitle, $RemasterYear, + $CategoryID, $Time, $Description, $Remastered, $RemasterTitle, $RemasterYear, $Media, $Format, $Encoding, $Size, $HasLog, $HasCue, $HasLogDB, $LogScore, $LogChecksum, - $LastAction, $UploaderID + $FileList, $FilePath, $LastAction, $UploaderID ] = $Report; $reporterName = (int)$ReporterID ? $userMan->findById((int)$ReporterID)->username() : 'System'; $uploaderName = (int)$UploaderID ? $userMan->findById((int)$UploaderID)->username() : 'System'; @@ -275,7 +276,35 @@ (Deleted) - DL +
DL + Downloaders + Snatchers + Seeders + Contents + + + + +
+ + + + +splitMetaFilename($f); +?> + + +
+
File Names
+
+ 		+ Size +
+
reported by for the reason:
uploaded by on
Last action: @@ -396,6 +425,7 @@ t.Time, t.Description, t.Filelist, + t.FilePath, t.Remastered, t.RemasterTitle, t.RemasterYear, @@ -421,7 +451,7 @@ ); [$ExtraGroupName, $ExtraGroupID, $ExtraArtistID, $ExtraArtistName, - $ExtraYear, $ExtraTime, $ExtraDescription, $ExtraFileList, $ExtraRemastered, + $ExtraYear, $ExtraTime, $ExtraDescription, $ExtraFileList, $ExtraFilePath, $ExtraRemastered, $ExtraRemasterTitle, $ExtraRemasterYear, $ExtraMedia, $ExtraFormat, $ExtraEncoding, $ExtraSize, $ExtraHasCue, $ExtraHasLog, $ExtraLogScore, $ExtraLastAction, $ExtraUploaderID, $ExtraUploaderName] @@ -446,7 +476,35 @@ ?> ')?> - DL +
DL + Downloaders + Snatchers + Seeders + Contents + + + + +
uploaded by on () @@ -658,6 +716,8 @@ ); } elseif (isset($ReportType['extra_log'])) { $Value = $ReportType['extra_log']; + } else { + $Value = ''; } ?> diff --git a/sections/torrents/details.php b/sections/torrents/details.php index ecffac411..8c62321b9 100644 --- a/sections/torrents/details.php +++ b/sections/torrents/details.php @@ -86,11 +86,11 @@

- +permitted('site_edit_wiki')) { ?> Edit description Request an Edit - +permitted('site_edit_wiki')) { ?> Revert to this revision " class="brackets">Add format permitted('site_submit_requests')) { ?> Request format @@ -227,7 +227,7 @@ ?>
Artists - Edit' : ''?> + permitted('torrents_edit') ? 'Edit' : ''?>
    @@ -243,7 +243,7 @@ ?>
  • ‎ - +permitted('torrents_edit')) { ?> (getAlias($Artist['name']) ?>) 
    Add artist+
    @@ -286,7 +286,7 @@
    permitted('site_collages_create')) { ?>
    Add to collage
    @@ -322,7 +322,7 @@ if ($GroupCategoryID === 1) { $decade = $GroupYear - ($GroupYear % 10); $decadeEnd = $decade + 9; - $advanced = check_perms('site_advanced_top10'); + $advanced = $Viewer->permitted('site_advanced_top10'); $rankList = [ 'overall' => [ @@ -525,7 +525,7 @@ function filelist($Str) { "; foreach ($Reports as $Report) { - $ReportLinks = !check_perms('admin_reports') + $ReportLinks = !$Viewer->permitted('admin_reports') ? 'Someone reported it' : sprintf('%s reported it', $Report['ReporterID'], @@ -550,9 +550,9 @@ function filelist($Str) { $ReportInfo .= "\n\t\t"; } - $CanEdit = (check_perms('torrents_edit') || (($UserID == $Viewer->id() && !$LoggedUser['DisableWiki']) && !($Remastered && !$RemasterYear))); + $CanEdit = ($Viewer->permitted('torrents_edit') || (($UserID == $Viewer->id() && !$LoggedUser['DisableWiki']) && !($Remastered && !$RemasterYear))); - $RegenLink = check_perms('users_mod') ? ' Regenerate' : ''; + $RegenLink = $Viewer->permitted('users_mod') ? ' Regenerate' : ''; $FileTable = ' @@ -620,7 +620,7 @@ function filelist($Str) { 'key' => $Viewer->announceKey() , 't' => $Torrent, 'edit' => $CanEdit, - 'remove' => check_perms('torrents_delete') || $UserID == $Viewer->id(), + 'remove' => $Viewer->permitted('torrents_delete') || $UserID == $Viewer->id(), 'pl' => true, 'extra' => [ "JS", @@ -681,7 +681,7 @@ function filelist($Str) { } } - if (($Seeders == 0 && time() - strtotime($LastActive) >= 345678 && time() - strtotime($LastReseedRequest) >= 864000) || check_perms('users_mod')) { ?> + if (($Seeders == 0 && time() - strtotime($LastActive) >= 345678 && time() - strtotime($LastReseedRequest) >= 864000) || $Viewer->permitted('users_mod')) { ?>
    Request re-seed

    If you download this, your ratio will become
    - +permitted('site_moderate_requests')) { ?> Mass PM snatchers - View peer list View log - View download list - View snatch list + if ($Viewer->permitted('site_view_torrent_snatchlist')) { ?> + View downloaders + View snatchers - View file list + View seeders + View contents View report information @@ -762,7 +762,7 @@ function filelist($Str) {
    diff --git a/sections/torrents/downloadlist.php b/sections/torrents/downloadlist.php index d4094a6ec..94fd432e1 100644 --- a/sections/torrents/downloadlist.php +++ b/sections/torrents/downloadlist.php @@ -1,86 +1,19 @@ permitted('site_view_torrent_snatchlist')) { + error(403); } - -$NumResults = $DB->scalar("SELECT count(*) FROM users_downloads WHERE TorrentID = ?", $TorrentID); -$DB->prepared_query(" - SELECT UserID, - Time - FROM users_downloads - WHERE TorrentID = ? - ORDER BY Time DESC - LIMIT $Limit - ", $TorrentID -); -$Results = $DB->to_array('UserID', MYSQLI_ASSOC); -if (empty($Results)) { - $Snatched = []; - $Seeding = []; -} else { - $DB->prepared_query(" - SELECT xs.uid - FROM xbt_snatched xs - INNER JOIN users_downloads ud ON (ud.UserID = xs.uid) - WHERE xs.fid = ? - ", $TorrentID - ); - $Snatched = $DB->to_array('uid'); - $DB->prepared_query(" - SELECT xfu.uid - FROM xbt_files_users xfu - INNER JOIN users_downloads ud ON (ud.UserID = xfu.uid) - WHERE xfu.Remaining = 0 AND xfu.fid = ? - ", $TorrentID - ); - $Seeding = $DB->to_array('uid'); +$torrent = (new Gazelle\Manager\Torrent)->findById((int)$_GET['torrentid']); +if (is_null($torrent)) { + error(404); } -?> -

    List of Downloaders

    - 100) { ?> -
    - -
    / / - +permitted('site_vote')) { ?>    +
    - - - - - - - - $Data) { - [$SnatcherID, $Timestamp] = array_values($Data); +$paginator = new Gazelle\Util\Paginator(PEERS_PER_PAGE, (int)($_GET['page'] ?? 1)); +$paginator->setTotal($torrent->downloadTotal()); - $User = Users::format_username($SnatcherID, true, true, true, true); - if (!array_key_exists($SnatcherID, $Snatched) && $SnatcherID != $UserID) { - $User = '' . $User . ''; - if (array_key_exists($SnatcherID, $Seeding)) { - $User = '' . $User . ''; - } - } - if ($i % 2 == 0 && $i > 0) { ?> - - - - - - - -
    UserTimeUserTime
    - 100) { ?> -
    - +echo $Twig->render('torrent/downloadlist.twig', [ + 'page' => $torrent->downloadPage($paginator->limit(), $paginator->offset()), + 'paginator' => $paginator, + 'torrent_id' => $torrent->id(), + 'url_stem' => STATIC_SERVER . '/styles/' . $Viewer->stylesheetName() . '/images/', + 'viewer_id' => $Viewer->id(), +]); diff --git a/sections/torrents/index.php b/sections/torrents/index.php index 02258e15e..bc798c46e 100644 --- a/sections/torrents/index.php +++ b/sections/torrents/index.php @@ -1,19 +1,5 @@ $i"; - } - } - return implode(' | ', $PageLinks); -} - if (!empty($_REQUEST['action'])) { switch ($_REQUEST['action']) { case 'editlog': diff --git a/sections/torrents/peerlist.php b/sections/torrents/peerlist.php index f4651f8cf..6d7173fb8 100644 --- a/sections/torrents/peerlist.php +++ b/sections/torrents/peerlist.php @@ -9,9 +9,10 @@ $paginator->setTotal($torrent->peerlistTotal()); echo $Twig->render('torrent/peerlist.twig', [ - 'is_admin' => check_perms('users_mod'), - 'linkbox' => $paginator->linkboxJS('show_peers', $torrent->id()), + 'is_admin' => $Viewer->permitted('users_mod'), 'list' => $torrent->peerlistPage($Viewer->id(), $paginator->limit(), $paginator->offset()), + 'paginator' => $paginator, 'torrent_id' => $torrent->id(), + 'url_stem' => STATIC_SERVER . '/styles/' . $Viewer->stylesheetName() . '/images/', 'user_id' => $Viewer->id(), ]); diff --git a/sections/torrents/snatchlist.php b/sections/torrents/snatchlist.php index 9c10f1ff0..f5d1a8d5d 100644 --- a/sections/torrents/snatchlist.php +++ b/sections/torrents/snatchlist.php @@ -1,63 +1,20 @@ permitted('site_view_torrent_snatchlist')) { + error(403); +} +$torrent = (new Gazelle\Manager\Torrent)->findById((int)$_GET['torrentid']); +if (is_null($torrent)) { + error(404); } -$NumResults = $DB->scalar(" - SELECT count(*) FROM xbt_snatched WHERE fid = ? - ", $TorrentID -); -$DB->prepared_query(" - SELECT uid, - tstamp - FROM xbt_snatched - WHERE fid = ? - ORDER BY tstamp DESC - LIMIT $Limit - ", $TorrentID -); -$Results = $DB->to_array('uid', MYSQLI_ASSOC); -?> -

    List of Snatchers

    - - 100) { ?> -
    - +$paginator = new Gazelle\Util\Paginator(PEERS_PER_PAGE, (int)($_GET['page'] ?? 1)); +$paginator->setTotal($torrent->snatchTotal()); - - - - - - - - -$Data) { - [$SnatcherID, $Timestamp] = array_values($Data); - if ($i % 2 == 0 && $i > 0) { -?> - - - - - - - -
    UserTimeUserTime
    - 100) { ?> -
    - +echo $Twig->render('torrent/snatchlist.twig', [ + 'page' => $torrent->snatchPage($paginator->limit(), $paginator->offset()), + 'paginator' => $paginator, + 'torrent_id' => $torrent->id(), + 'url_stem' => STATIC_SERVER . '/styles/' . $Viewer->stylesheetName() . '/images/', + 'viewer_id' => $Viewer->id(), +]); diff --git a/templates/macro/paginator.twig b/templates/macro/paginator.twig new file mode 100644 index 000000000..54e878438 --- /dev/null +++ b/templates/macro/paginator.twig @@ -0,0 +1,12 @@ +{% macro pager(action, torrent_id, page, pages) %} + {% if pages > 1 %} + {% for p in 1 .. pages %} + {% if not loop.first %} | {% endif %} + {% if page == p %} + {{ p }} + {% else %} + {{ p }} + {% endif %} + {% endfor %} + {% endif %} +{% endmacro %} diff --git a/templates/torrent/downloadlist.twig b/templates/torrent/downloadlist.twig new file mode 100644 index 000000000..206bfd4fe --- /dev/null +++ b/templates/torrent/downloadlist.twig @@ -0,0 +1,31 @@ +{% from 'macro/paginator.twig' import pager %} +{% for download in page %} + {% if loop.first %} +

    List of Downloaders

    +
    {{ pager('show_downloads', torrent_id, paginator.page, paginator.pages)|raw }}
    + + + {% for n in range(1, 2) %} + + + + + {% endfor %} + + + {% elseif loop.index0 % 2 == 0 %} + + + {% endif %} + + + + + {% if loop.last %} + +
    UserTimeSnatched?Seeding?
    {{ download.user_id|user_full }}{{ download.timestamp|time_diff }}{% if download.is_snatched %}{{ constant('ICON_STAR') }} {% else %} {% endif %}{% if download.is_seeding %}{{ constant('ICON_STAR') }} {% else %} {% endif %}
    +
    {{ pager('show_downloads', torrent_id, paginator.page, paginator.pages)|raw }}
    + {% endif %} +{% else %} +
    No downloads recorded
    +{% endfor %} diff --git a/templates/torrent/peerlist.twig b/templates/torrent/peerlist.twig index b1bddaa2b..698f63345 100644 --- a/templates/torrent/peerlist.twig +++ b/templates/torrent/peerlist.twig @@ -1,5 +1,8 @@ -

    Peer List

    -{{ linkbox|raw }} +{% from 'macro/paginator.twig' import pager %} +{% for peer in list %} + {% if loop.first %} +

    List of Seeders

    +
    {{ pager('show_peers', torrent_id, paginator.page, paginator.pages)|raw }}
    @@ -9,8 +12,12 @@ + {% if is_admin %} + + + {% endif %} -{% for peer in list %} + {% endif %} {% if is_admin or peer.user_id == user_id %} @@ -35,7 +42,15 @@ {% endif %} + {% if is_admin %} + + + {% endif %} -{% endfor %} + {% if loop.last %}
    UserAvailable % IP Address UseragentDownloaded?Snatched?
    {{ peer.user_id|user_url }}— {{ peer.useragent }}{% if peer.is_download %}{{ constant('ICON_STAR') }} {% else %} {% endif %}{% if peer.is_snatched %}{{ constant('ICON_STAR') }} {% else %} {% endif %}
    -{{ linkbox|raw }} +
    {{ pager('show_peers', torrent_id, paginator.page, paginator.pages)|raw }}
    + {% endif %} +{% else %} +
    No current seeders
    +{% endfor %} diff --git a/templates/torrent/snatchlist.twig b/templates/torrent/snatchlist.twig new file mode 100644 index 000000000..8e89de4cb --- /dev/null +++ b/templates/torrent/snatchlist.twig @@ -0,0 +1,31 @@ +{% from 'macro/paginator.twig' import pager %} +{% for snatch in page %} + {% if loop.first %} +

    List of Snatchers

    +
    {{ pager('show_snatches', torrent_id, paginator.page, paginator.pages)|raw }}
    + + + {% for n in range(1, 2) %} + + + + + {% endfor %} + + + {% elseif loop.index0 % 2 == 0 %} + + + {% endif %} + + + + + {% if loop.last %} + +
    UserTimeDownloaded?Seeding?
    {{ snatch.user_id|user_full }}{{ snatch.timestamp|time_diff }}{% if snatch.is_download %}{{ constant('ICON_STAR') }} {% else %} {% endif %}{% if snatch.is_seeding %}{{ constant('ICON_STAR') }} {% else %} {% endif %}
    +
    {{ pager('show_snatches', torrent_id, paginator.page, paginator.pages)|raw }}
    + {% endif %} +{% else %} +
    No snatches recorded
    +{% endfor %}