diff --git a/admin/admin_attach_cp.php b/admin/admin_attach_cp.php index a05774157..eddfad757 100644 --- a/admin/admin_attach_cp.php +++ b/admin/admin_attach_cp.php @@ -452,7 +452,7 @@ if ($view === 'attachments') { 'S_DELETE_BOX' => $delete_box, 'S_HIDDEN' => $hidden_field, - 'U_VIEW_ATTACHMENT' => BB_ROOT . DOWNLOAD_URL . $attachments[$i]['attach_id'], + 'U_VIEW_ATTACHMENT' => BB_ROOT . DL_URL . $attachments[$i]['attach_id'], )); } } diff --git a/callseed.php b/callseed.php index 243ece668..5fdf65f99 100644 --- a/callseed.php +++ b/callseed.php @@ -49,7 +49,7 @@ $user_list = DB()->fetch_rowset(" "); $subject = sprintf($lang['CALLSEED_SUBJECT'], $t_data['topic_title']); -$message = sprintf($lang['CALLSEED_TEXT'], make_url(TOPIC_URL . $topic_id), $t_data['topic_title'], make_url(DOWNLOAD_URL . $t_data['attach_id'])); +$message = sprintf($lang['CALLSEED_TEXT'], make_url(TOPIC_URL . $topic_id), $t_data['topic_title'], make_url(DL_URL . $t_data['attach_id'])); if ($user_list) { foreach ($user_list as $row) { diff --git a/dl.php b/dl.php index d165c6273..06cb97ef4 100644 --- a/dl.php +++ b/dl.php @@ -186,7 +186,7 @@ if (IS_GUEST && !bb_captcha('check')) { global $template; $redirect_url = $_POST['redirect_url'] ?? $_SERVER['HTTP_REFERER'] ?? '/'; - $message = '
'; + $message = ''; $message .= $lang['CAPTCHA'] . ':'; $message .= '
' . bb_captcha('get') . '
'; $message .= ''; diff --git a/library/attach_mod/displaying.php b/library/attach_mod/displaying.php index 85c5789f0..c61b361f7 100644 --- a/library/attach_mod/displaying.php +++ b/library/attach_mod/displaying.php @@ -239,7 +239,7 @@ function display_attachments($post_id) if ($image) { // Images if ($attach_config['upload_dir'][0] == '/' || ($attach_config['upload_dir'][0] != '/' && $attach_config['upload_dir'][1] == ':')) { - $img_source = BB_ROOT . DOWNLOAD_URL . $attachments['_' . $post_id][$i]['attach_id']; + $img_source = BB_ROOT . DL_URL . $attachments['_' . $post_id][$i]['attach_id']; $download_link = true; } else { $img_source = $filename; @@ -269,7 +269,7 @@ function display_attachments($post_id) if ($thumbnail) { // Images, but display Thumbnail if ($attach_config['upload_dir'][0] == '/' || ($attach_config['upload_dir'][0] != '/' && $attach_config['upload_dir'][1] == ':')) { - $thumb_source = BB_ROOT . DOWNLOAD_URL . $attachments['_' . $post_id][$i]['attach_id'] . '&thumb=1'; + $thumb_source = BB_ROOT . DL_URL . $attachments['_' . $post_id][$i]['attach_id'] . '&thumb=1'; } else { $thumb_source = $thumbnail_filename; } @@ -277,7 +277,7 @@ function display_attachments($post_id) $template->assign_block_vars('postrow.attach.cat_thumb_images', array( 'DOWNLOAD_NAME' => $display_name, 'S_UPLOAD_IMAGE' => $upload_image, - 'IMG_SRC' => BB_ROOT . DOWNLOAD_URL . $attachments['_' . $post_id][$i]['attach_id'], + 'IMG_SRC' => BB_ROOT . DL_URL . $attachments['_' . $post_id][$i]['attach_id'], 'IMG_THUMB_SRC' => $thumb_source, 'FILESIZE' => $filesize, 'COMMENT' => $comment, @@ -292,7 +292,7 @@ function display_attachments($post_id) // display attachment $template->assign_block_vars('postrow.attach.attachrow', array( - 'U_DOWNLOAD_LINK' => BB_ROOT . DOWNLOAD_URL . $attachments['_' . $post_id][$i]['attach_id'], + 'U_DOWNLOAD_LINK' => BB_ROOT . DL_URL . $attachments['_' . $post_id][$i]['attach_id'], 'S_UPLOAD_IMAGE' => $upload_image, 'DOWNLOAD_NAME' => $display_name, 'FILESIZE' => $filesize, diff --git a/library/attach_mod/displaying_torrent.php b/library/attach_mod/displaying_torrent.php index 899e99949..7c2c138b7 100644 --- a/library/attach_mod/displaying_torrent.php +++ b/library/attach_mod/displaying_torrent.php @@ -77,7 +77,7 @@ $tor_auth_del = ($tor_auth && $tor_reged); $tracker_link = ($tor_reged) ? $lang['BT_REG_YES'] : $lang['BT_REG_NO']; -$download_link = DOWNLOAD_URL . $attach_id; +$download_link = DL_URL . $attach_id; $description = ($comment) ?: preg_replace("#.torrent$#i", '', $display_name); if ($tor_auth_reg || $tor_auth_del) { diff --git a/library/config.php b/library/config.php index 85e24f3fd..2f80b053f 100644 --- a/library/config.php +++ b/library/config.php @@ -141,6 +141,7 @@ $bb_cfg['torhelp_enabled'] = false; // find dead torrents (without seeder) that // URL's $bb_cfg['ajax_url'] = 'ajax.php'; # "http://{$_SERVER['SERVER_NAME']}/ajax.php" +$bb_cfg['dl_url'] = 'dl.php?id='; # "http://{$domain_name}/dl.php?id=" $bb_cfg['login_url'] = 'login.php'; # "http://{$domain_name}/login.php" $bb_cfg['posting_url'] = 'posting.php'; # "http://{$domain_name}/posting.php" $bb_cfg['pm_url'] = 'privmsg.php'; # "http://{$domain_name}/privmsg.php" diff --git a/library/includes/init_bb.php b/library/includes/init_bb.php index a8919a670..b4dde7af1 100644 --- a/library/includes/init_bb.php +++ b/library/includes/init_bb.php @@ -282,7 +282,7 @@ define('PAGE_HEADER', INC_DIR . '/page_header.php'); define('PAGE_FOOTER', INC_DIR . '/page_footer.php'); define('CAT_URL', 'index.php?c='); -define('DOWNLOAD_URL', 'dl.php?id='); +define('DL_URL', $bb_cfg['dl_url']); define('FORUM_URL', 'viewforum.php?f='); define('GROUP_URL', 'group.php?g='); define('LOGIN_URL', $bb_cfg['login_url']); diff --git a/library/includes/page_header.php b/library/includes/page_header.php index 348ef4f24..1cf3167be 100644 --- a/library/includes/page_header.php +++ b/library/includes/page_header.php @@ -178,7 +178,7 @@ $template->assign_vars(array( // Common urls 'AVATARS_URL' => 'data/avatars', 'CAT_URL' => BB_ROOT . CAT_URL, - 'DOWNLOAD_URL' => BB_ROOT . DOWNLOAD_URL, + 'DOWNLOAD_URL' => BB_ROOT . DL_URL, 'FORUM_URL' => BB_ROOT . FORUM_URL, 'GROUP_URL' => BB_ROOT . GROUP_URL, 'LOGIN_URL' => $bb_cfg['login_url'], diff --git a/src/Legacy/Attach.php b/src/Legacy/Attach.php index 3cb3b2519..56870d36f 100644 --- a/src/Legacy/Attach.php +++ b/src/Legacy/Attach.php @@ -695,7 +695,7 @@ class Attach if (@$this->attachment_id_list[$i] == 0) { $download_link = $upload_dir . '/' . basename($this->attachment_list[$i]); } else { - $download_link = BB_ROOT . DOWNLOAD_URL . $this->attachment_id_list[$i]; + $download_link = BB_ROOT . DL_URL . $this->attachment_id_list[$i]; } $template->assign_block_vars('attach_row', [ diff --git a/src/Legacy/Torrent.php b/src/Legacy/Torrent.php index 755c5c7b7..b357cfc1e 100644 --- a/src/Legacy/Torrent.php +++ b/src/Legacy/Torrent.php @@ -411,7 +411,7 @@ class Torrent if ($reg_mode == 'request' || $reg_mode == 'newtopic') { set_die_append_msg($forum_id, $topic_id); - $mess = sprintf($lang['BT_REGISTERED'], DOWNLOAD_URL . $attach_id); + $mess = sprintf($lang['BT_REGISTERED'], DL_URL . $attach_id); bb_die($mess); }