Merge branch 'hotfix_tracker_url' into php8

# Conflicts:
#	include/constants.php
This commit is contained in:
xiaomlove
2025-06-29 20:48:23 +07:00
3 changed files with 13 additions and 7 deletions
+1 -1
View File
@@ -140,7 +140,7 @@ if (strlen($CURUSER['passkey']) != 32) {
sql_query("UPDATE users SET passkey=".sqlesc($CURUSER['passkey'])." WHERE id=".sqlesc($CURUSER['id']));
}
$dict = \Rhilip\Bencode\Bencode::load($fn);
$dict['announce'] = \App\Models\TrackerUrl::getById($CURUSER['tracker_url_id']) . "?passkey=" . $CURUSER['passkey'];
$dict['announce'] = get_tracker_schema_and_host($CURUSER['tracker_url_id'], true) . "?passkey=" . $CURUSER['passkey'];
$dict['comment'] = getSchemeAndHttpHost(true) . "/details.php?id=" . $id;
do_log(sprintf("[ANNOUNCE_URL], user: %s, torrent: %s, url: %s", $CURUSER['id'] ?? '', $id, $dict['announce']));
/**
+1 -1
View File
@@ -43,7 +43,7 @@ stdhead($lang_upload['head_upload']);
<table border="1" cellspacing="0" cellpadding="5" width="97%">
<tr>
<td class='colhead' colspan='2' align='center'>
<?php echo $lang_upload['text_tracker_url'] ?>: &nbsp;&nbsp;&nbsp;&nbsp;<b><?php echo get_tracker_schema_and_host(true)?></b>
<?php echo $lang_upload['text_tracker_url'] ?>: &nbsp;&nbsp;&nbsp;&nbsp;<b><?php echo get_tracker_schema_and_host($CURUSER['tracker_url_id'], true)?></b>
<?php
if(!is_writable(getFullDirectory($torrent_dir)))
print("<br /><br /><b>ATTENTION</b>: Torrent directory isn't writable. Please contact the administrator about this problem!");