torrentpier/torrentpier-lts
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier-lts.git synced 2025-02-28 15:10:54 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed announcer-list issue (#335)

Browse Source 
* Fixed announcer-list issue

* Update CHANGELOG.md
This commit is contained in:
Roman Kelesidis 2023-11-19 22:11:05 +07:00 committed by GitHub
parent 1e88962be5
commit 19011ff8dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -6,6 +6,7 @@
**Merged pull requests:** **Merged pull requests:**
- Release v2.1.5-2024.05-beta1 🎉 - Release v2.1.5-2024.05-beta1 🎉
- Fixed announcer-list issue [\#335](https://github.com/torrentpier/torrentpier-lts/pull/335) ([belomaxorka](https://github.com/belomaxorka))
- Some other changes / improvements - Some other changes / improvements
## [v2.1.5-2024.05-alpha5 [Final v2]](https://github.com/torrentpier/torrentpier-lts/tree/v2.1.5-2024.05-alpha5) (2024-06-04) ## [v2.1.5-2024.05-alpha5 [Final v2]](https://github.com/torrentpier/torrentpier-lts/tree/v2.1.5-2024.05-alpha5) (2024-06-04)

34
library/includes/functions_torrent.php
View File

@ -477,15 +477,17 @@ function send_torrent_with_passkey ($filename)
// Announce URL // Announce URL
$ann_url = $bb_cfg['bt_announce_url']; $ann_url = $bb_cfg['bt_announce_url'];
// Torrent decoding
if (!$tor = bdecode_file($filename)) if (!$tor = bdecode_file($filename))
{ {
bb_die($lang['TORFILE_INVALID']); bb_die($lang['TORFILE_INVALID']);
} }
$announce = $bb_cfg['ocelot']['enabled'] ? strval($bb_cfg['ocelot']['url'] .$passkey_val. "/announce") : strval($ann_url . "?$passkey_key=$passkey_val"); // Get tracker announcer
$announce = $bb_cfg['ocelot']['enabled'] ? strval($bb_cfg['ocelot']['url'] . $passkey_val . "/announce") : strval($ann_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'] || !isset($tor['announce'])) if ($bb_cfg['bt_replace_ann_url'])
{ {
$tor['announce'] = $announce; $tor['announce'] = $announce;
} }
@ -506,9 +508,31 @@ function send_torrent_with_passkey ($filename)
{ {
unset($tor['announce-list']); unset($tor['announce-list']);
} }
elseif (!empty($announce_urls_add)) else
{ {
$tor['announce-list'] = array_merge((isset($tor['announce-list']) ? $tor['announce-list'] : array()), $announce_urls_add); // Creating announce-list if not exist
if (!isset($tor['announce-list']) || !is_array($tor['announce-list']))
{
$tor['announce-list'] = array();
}
// Adding tracker announcer to announce-list
if ($bb_cfg['bt_replace_ann_url'])
{
// Adding tracker announcer as main announcer (At start)
array_unshift($tor['announce-list'], array($announce));
}
else
{
// Adding tracker announcer (At end)
$tor['announce-list'] = array_merge($tor['announce-list'], array(array($announce)));
}
// Adding additional announce urls (If present)
if (!empty($announce_urls_add))
{
$tor['announce-list'] = array_merge($tor['announce-list'], $announce_urls_add);
}
} }
// Add retracker // Add retracker
@ -516,7 +540,7 @@ function send_torrent_with_passkey ($filename)
{ {
if (bf($userdata['user_opt'], 'user_opt', 'user_retracker') || IS_GUEST) if (bf($userdata['user_opt'], 'user_opt', 'user_retracker') || IS_GUEST)
{ {
$tor['announce-list'] = array_merge((isset($tor['announce-list']) ? $tor['announce-list'] : array()), array(array($tr_cfg['retracker_host']))); $tor['announce-list'] = array_merge($tor['announce-list'], array(array($tr_cfg['retracker_host'])));
} }
} }