From cdf0c1a6b749807dd15a1c095f3aa15fc872bdcf Mon Sep 17 00:00:00 2001
From: glix08 <glix08@a8ac35ab-4ca4-ca47-4c2d-a49a94f06293>
Date: Thu, 1 Aug 2013 20:53:10 +0000
Subject: [PATCH] r530
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Фикс именования скачиваемых торрент-файлов с доменом сайта (по аналогии с рутрекером). Обоснованность включения по-умолчанию разработчикам пояснена отдельно. git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@530 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
---
 upload/attach_mod/displaying_torrent.php | 2 +-
 upload/config.php                        | 6 +++---
 upload/includes/functions_torrent.php    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/upload/attach_mod/displaying_torrent.php b/upload/attach_mod/displaying_torrent.php
index c05a83a6f..ac4c8ba67 100644
--- a/upload/attach_mod/displaying_torrent.php
+++ b/upload/attach_mod/displaying_torrent.php
@@ -88,7 +88,7 @@ if ($tor_auth_reg || $tor_auth_del)
 
 if ($bb_cfg['torrent_name_style'])
 {
-	$display_name = '['.$domain_name.'].t' . $bt_topic_id . '.torrent';
+	$display_name = '['.$bb_cfg['server_name'].'].t' . $bt_topic_id . '.torrent';
 }
 
 if (!$tor_reged)
diff --git a/upload/config.php b/upload/config.php
index 1aa28b87c..e1886bfa4 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -56,8 +56,8 @@ $domain_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : $do
 
 // Increase number of revision after update
 $bb_cfg['tp_version'] = '2.5 (unstable)';
-$bb_cfg['tp_release_date'] = '01-08-2013';
-$bb_cfg['tp_release_state'] = 'R529';
+$bb_cfg['tp_release_date'] = '02-08-2013';
+$bb_cfg['tp_release_state'] = 'R530';
 
 // Database
 $charset  = 'utf8';
@@ -178,7 +178,7 @@ $bb_cfg['allow_dl_list_names_mode'] = true;
 
 // Torrents
 $bb_cfg['torrent_sign']   = ''; // e.g. "[yoursite.com]"
-$bb_cfg['torrent_name_style']  = false; // Use torrent name style [yoursite.com].txxx.torrent
+$bb_cfg['torrent_name_style']  = true; // Use torrent name style [yoursite.com].txxx.torrent
 $bb_cfg['tor_help_links'] = '';
 
 // Сколько дней сохранять торрент зарегистрированным / Days to keep torrent registered, if:
diff --git a/upload/includes/functions_torrent.php b/upload/includes/functions_torrent.php
index ef0996795..e3e986e33 100644
--- a/upload/includes/functions_torrent.php
+++ b/upload/includes/functions_torrent.php
@@ -613,7 +613,7 @@ function send_torrent_with_passkey ($filename)
 	header("Content-Type: $mimetype $charset name=\"$filename\"");
 	if ($bb_cfg['torrent_name_style'])
 	{
-		$header_file_name = 'Content-Disposition: attachment; filename="['.$domain_name.'].t' . $topic_id . '.torrent"';
+		$header_file_name = 'Content-Disposition: attachment; filename="['.$bb_cfg['server_name'].'].t' . $topic_id . '.torrent"';
 		header($header_file_name);
 	}
 	else