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

Fixed announcer-list issue (#1130)

Browse source
This commit is contained in:
Roman Kelesidis 2023-11-19 23:13:33 +07:00 • committed by GitHub
commit 407c887239
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/Legacy/Torrent.php
View file

@ -551,10 +551,20 @@ class Torrent
$announce_url = $bb_cfg['ocelot']['enabled'] ? $bb_cfg['ocelot']['url'] . "$passkey_val/announce" : $bb_cfg['bt_announce_url'] . "?$passkey_key=$passkey_val"; $announce_url = $bb_cfg['ocelot']['enabled'] ? $bb_cfg['ocelot']['url'] . "$passkey_val/announce" : $bb_cfg['bt_announce_url'] . "?$passkey_key=$passkey_val";
// Replace original announce url with tracker default // Replace original announce url with tracker default
if ($bb_cfg['bt_replace_ann_url']) { if ($bb_cfg['bt_replace_ann_url'] || !isset($tor['announce'])) {
$tor['announce'] = $announce_url; $tor['announce'] = $announce_url;
} }
// Delete all additional urls
if ($bb_cfg['bt_del_addit_ann_urls'] || $bb_cfg['bt_disable_dht']) {
unset($tor['announce-list']);
}
// Creating announce-list if not exist
if (!isset($tor['announce-list']) || !is_array($tor['announce-list'])) {
$tor['announce-list'] = [];
}
// Get additional announce urls // Get additional announce urls
$additional_announce_urls = $announce_urls_add = []; $additional_announce_urls = $announce_urls_add = [];
include INC_DIR . '/torrent_announce_urls.php'; include INC_DIR . '/torrent_announce_urls.php';
@ -564,15 +574,6 @@ class Torrent
} }
unset($additional_announce_urls); unset($additional_announce_urls);
// Delete all additional urls
if ($bb_cfg['bt_del_addit_ann_urls'] || $bb_cfg['bt_disable_dht']) {
unset($tor['announce-list']);
} else {
// Creating announce-list if not exist
if (!isset($tor['announce-list']) || !is_array($tor['announce-list'])) {
$tor['announce-list'] = [];
}
// Adding tracker announcer to announce-list // Adding tracker announcer to announce-list
if ($bb_cfg['bt_replace_ann_url']) { if ($bb_cfg['bt_replace_ann_url']) {
// Adding tracker announcer as main announcer (At start) // Adding tracker announcer as main announcer (At start)
@ -586,7 +587,6 @@ class Torrent
if (!empty($announce_urls_add)) { if (!empty($announce_urls_add)) {
$tor['announce-list'] = array_merge($tor['announce-list'], $announce_urls_add); $tor['announce-list'] = array_merge($tor['announce-list'], $announce_urls_add);
} }
}
// Add retracker // Add retracker
if (!empty($bb_cfg['tracker']['retracker_host']) && $bb_cfg['tracker']['retracker']) { if (!empty($bb_cfg['tracker']['retracker_host']) && $bb_cfg['tracker']['retracker']) {