github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-08-22 22:33:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix(peers list): IPv6 showing

Browse source
This commit is contained in:
Roman Kelesidis 2025-05-06 19:33:22 +03:00
commit e708ec2031
3 changed files with 22 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

9
library/attach_mod/displaying_torrent.php
View file

@ -383,7 +383,9 @@ if ($tor_reged && $tor_info) {
// Full details mode // Full details mode
if ($s_mode == 'full') { if ($s_mode == 'full') {
if (!empty($peer['ip']) && !empty($peer['ipv6'])) { if (!empty($peer['ip']) && !empty($peer['ipv6'])) {
$ip = bt_show_ip($peer['ipv6']) . ' (' . bt_show_ip($peer['ip']) . ')'; if ($ip = bt_show_ip($peer['ipv6'])) {
$ip .= ' (' . bt_show_ip($peer['ip']) . ')';
}
} else { } else {
$ip = bt_show_ip(!empty($peer['ipv6']) ? $peer['ipv6'] : $peer['ip']); $ip = bt_show_ip(!empty($peer['ipv6']) ? $peer['ipv6'] : $peer['ip']);
} }
@ -492,7 +494,10 @@ if ($tor_reged && $tor_info) {
]); ]);
if ($ip) { if ($ip) {
$template->assign_block_vars("$x_full.$x_row.ip", ['IP' => $ip]); $template->assign_block_vars("$x_full.$x_row.ip", [
'U_WHOIS_IP' => $bb_cfg['whois_info'] . $ip,
'IP' => $ip
]);
} }
if ($port !== false) { if ($port !== false) {
$template->assign_block_vars("$x_full.$x_row.port", ['PORT' => $port]); $template->assign_block_vars("$x_full.$x_row.port", ['PORT' => $port]);

18
library/includes/functions.php
View file

@ -601,30 +601,30 @@ function bt_show_ip($ip, $port = '')
{ {
global $bb_cfg; global $bb_cfg;
if (IS_AM) {
$ip = \TorrentPier\Helpers\IPHelper::long2ip_extended($ip); $ip = \TorrentPier\Helpers\IPHelper::long2ip_extended($ip);
// Wrap IPv6 address in square brackets // Wrap IPv6 address in square brackets
if ($port && str_contains($ip, ':')) { $port = bt_show_port($port);
$ip = "[$ip]"; if (!empty($port) && str_contains($ip, ':')) {
$ip = "[$ip]:$port";
} }
$ip .= $port ? ":$port" : '';
if (!$bb_cfg['bt_show_ip_only_moder'] || IS_AM) {
return $ip; return $ip;
} else {
return \TorrentPier\Helpers\IPHelper::anonymizeIP($ip);
} }
return $bb_cfg['bt_show_ip_only_moder'] ? false : \TorrentPier\Helpers\IPHelper::anonymizeIP($ip);
} }
function bt_show_port($port) function bt_show_port($port): string
{ {
global $bb_cfg; global $bb_cfg;
if (IS_AM) { if (!$bb_cfg['bt_show_port_only_moder'] || IS_AM) {
return $port; return $port;
} }
return $bb_cfg['bt_show_port_only_moder'] ? false : $port; return '';
} }
function checkbox_get_val(&$key, &$val, $default = 1, $on = 1, $off = 0) function checkbox_get_val(&$key, &$val, $default = 1, $on = 1, $off = 0)

4
styles/templates/default/viewtopic_torrent.tpl
View file

@ -167,7 +167,7 @@ ajax.callback.callseed = function (data) {
<td class="seedmed"><u>{sfull.srow.SPEED_UP_RAW}</u>{sfull.srow.SPEED_UP}</td> <td class="seedmed"><u>{sfull.srow.SPEED_UP_RAW}</u>{sfull.srow.SPEED_UP}</td>
<td class="leechmed"><u>{sfull.srow.SPEED_DOWN_RAW}</u>{sfull.srow.SPEED_DOWN}</td> <td class="leechmed"><u>{sfull.srow.SPEED_DOWN_RAW}</u>{sfull.srow.SPEED_DOWN}</td>
<!-- BEGIN ip --> <!-- BEGIN ip -->
<td>{sfull.srow.ip.IP}</td> <td><a href="{sfull.srow.ip.U_WHOIS_IP}" target="_blank">{sfull.srow.ip.IP}</a></td>
<!-- END ip --> <!-- END ip -->
<!-- BEGIN port --> <!-- BEGIN port -->
<td>{sfull.srow.port.PORT}</td> <td>{sfull.srow.port.PORT}</td>
@ -220,7 +220,7 @@ ajax.callback.callseed = function (data) {
<td class="seedmed"><u>{lfull.lrow.SPEED_UP_RAW}</u>{lfull.lrow.SPEED_UP}</td> <td class="seedmed"><u>{lfull.lrow.SPEED_UP_RAW}</u>{lfull.lrow.SPEED_UP}</td>
<td class="leechmed"><u>{lfull.lrow.SPEED_DOWN_RAW}</u>{lfull.lrow.SPEED_DOWN}</td> <td class="leechmed"><u>{lfull.lrow.SPEED_DOWN_RAW}</u>{lfull.lrow.SPEED_DOWN}</td>
<!-- BEGIN ip --> <!-- BEGIN ip -->
<td>{lfull.lrow.ip.IP}</td> <td><a href="{lfull.lrow.ip.U_WHOIS_IP}" target="_blank">{lfull.lrow.ip.IP}</a></td>
<!-- END ip --> <!-- END ip -->
<!-- BEGIN port --> <!-- BEGIN port -->
<td>{lfull.lrow.port.PORT}</td> <td>{lfull.lrow.port.PORT}</td>