This commit is contained in:
Roman Kelesidis 2023-11-19 23:05:00 +07:00
parent 7efa9c02c8
commit f5f3733894

View File

@ -487,11 +487,23 @@ function send_torrent_with_passkey ($filename)
$announce = $bb_cfg['ocelot']['enabled'] ? strval($bb_cfg['ocelot']['url'] . $passkey_val . "/announce") : strval($ann_url . "?$passkey_key=$passkey_val"); $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']) if ($bb_cfg['bt_replace_ann_url'] || !isset($tor['announce']))
{ {
$tor['announce'] = $announce; $tor['announce'] = $announce;
} }
// 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'] = array();
}
// Get additional announce urls // Get additional announce urls
$additional_announce_urls = array(); $additional_announce_urls = array();
include(INC_DIR .'torrent_announce_urls.php'); include(INC_DIR .'torrent_announce_urls.php');
@ -503,36 +515,22 @@ function send_torrent_with_passkey ($filename)
} }
unset($additional_announce_urls); unset($additional_announce_urls);
// Delete all additional urls // Adding tracker announcer to announce-list
if ($bb_cfg['bt_del_addit_ann_urls'] || $bb_cfg['bt_disable_dht']) if ($bb_cfg['bt_replace_ann_url'])
{ {
unset($tor['announce-list']); // Adding tracker announcer as main announcer (At start)
array_unshift($tor['announce-list'], array($announce));
} }
else else
{ {
// Creating announce-list if not exist // Adding tracker announcer (At end)
if (!isset($tor['announce-list']) || !is_array($tor['announce-list'])) $tor['announce-list'] = array_merge($tor['announce-list'], array(array($announce)));
{ }
$tor['announce-list'] = array();
}
// Adding tracker announcer to announce-list // Adding additional announce urls (If present)
if ($bb_cfg['bt_replace_ann_url']) if (!empty($announce_urls_add))
{ {
// Adding tracker announcer as main announcer (At start) $tor['announce-list'] = array_merge($tor['announce-list'], $announce_urls_add);
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