From 242ff4fc4b95524492ca6db8aaaaa623da152f10 Mon Sep 17 00:00:00 2001
From: Exile <iglix@me.com>
Date: Tue, 16 Feb 2016 05:53:37 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C=D1=88?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D1=82=D1=80=D0=B5=D0=BA=D0=B5=D1=80=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                           | 22 +++++++++-------------
 README.md                            |  1 -
 data/old_files/.htaccess             |  3 ---
 library/includes/init_bb.php         |  2 +-
 styles/templates/default/tracker.tpl |  2 +-
 tracker.php                          |  1 -
 6 files changed, 11 insertions(+), 20 deletions(-)
 delete mode 100644 data/old_files/.htaccess

diff --git a/.gitignore b/.gitignore
index 288abd217..451adc104 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,14 +2,14 @@
 .idea/
 composer.phar
 composer.lock
-data/avatars/
-data/files/
-internal_data/ajax_html/
-internal_data/atom/
-internal_data/cache/
-internal_data/log/
-internal_data/sitemap/
-internal_data/triggers/
+data/avatars
+data/torrent_files
+internal_data/ajax_html
+internal_data/atom
+internal_data/cache
+internal_data/log
+internal_data/sitemap
+internal_data/triggers
 library/config.local.php
 vendor
 
@@ -35,8 +35,4 @@ $RECYCLE.BIN/
 .Spotlight-V100
 .Trashes
 *.orig
-*.rej
-
-### TEMP ###
-data/old_files/
-data/torrent_files/
\ No newline at end of file
+*.rej
\ No newline at end of file
diff --git a/README.md b/README.md
index 811cdb8e5..241c91bc1 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,6 @@ TorrentPier - движок торрент-трекера, написанный 
 
 Исходя из настроек вашего сервера, устанавливаем рекомендуемые права доступа (chmod) на указанные папки **777**, а на файлы внутри этих папок (кроме файлов **.htaccess** и **.keep**) **666**:
 - data/avatars
-- data/old_files
 - data/torrent_files
 - internal_data/ajax_html
 - internal_data/atom
diff --git a/data/old_files/.htaccess b/data/old_files/.htaccess
deleted file mode 100644
index 6c4686a91..000000000
--- a/data/old_files/.htaccess
+++ /dev/null
@@ -1,3 +0,0 @@
-php_flag engine off
-RemoveHandler .php .php5 .php4 .php3 .phtml .pl .asp
-AddType text/plain .php .php .htm .html .phtml .pl .asp
\ No newline at end of file
diff --git a/library/includes/init_bb.php b/library/includes/init_bb.php
index cef3350b6..b7ed6dc8f 100644
--- a/library/includes/init_bb.php
+++ b/library/includes/init_bb.php
@@ -285,7 +285,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('DOWNLOAD_URL', 'dl.php?t=');
 define('FORUM_URL',    'viewforum.php?f=');
 define('GROUP_URL',    'group.php?g=');
 define('LOGIN_URL',    $bb_cfg['login_url']);
diff --git a/styles/templates/default/tracker.tpl b/styles/templates/default/tracker.tpl
index 175c3e1be..0df02b071 100644
--- a/styles/templates/default/tracker.tpl
+++ b/styles/templates/default/tracker.tpl
@@ -411,7 +411,7 @@ $(function(){
 	<!-- ENDIF -->
 	<td class="row4 small nowrap">
 		<u>{tor.TOR_SIZE_RAW}</u>
-		<!-- IF not tor.TOR_FROZEN --><a class="small tr-dl" title="{L_DOWNLOAD}" href="{DOWNLOAD_URL}{tor.ATTACH_ID}">{tor.TOR_SIZE}</a> <!-- IF MAGNET_LINKS --><span title="{L_MAGNET}">{tor.MAGNET}</span><!-- ENDIF --><!-- ELSE -->
+		<!-- IF not tor.TOR_FROZEN --><a class="small tr-dl" title="{L_DOWNLOAD}" href="{DOWNLOAD_URL}{tor.TOPIC_ID}">{tor.TOR_SIZE}</a> <!-- IF MAGNET_LINKS --><span title="{L_MAGNET}">{tor.MAGNET}</span><!-- ENDIF --><!-- ELSE -->
 		{tor.TOR_SIZE}<!-- ENDIF -->
 	</td>
 	<td class="row4 seedmed" title="{tor.SEEDS_TITLE}"><b>{tor.SEEDS}</b></td>
diff --git a/tracker.php b/tracker.php
index 577b91c44..e0b8a1833 100644
--- a/tracker.php
+++ b/tracker.php
@@ -801,7 +801,6 @@ if ($allowed_forums)
 				'TOPIC_ID'     => $tor['topic_id'],
 				'TOPIC_TITLE'  => wbr($tor['topic_title']),
 				'TOPIC_TIME'   => bb_date($tor['topic_time'], 'd-M-y') .' <b>&middot;</b> '. delta_time($tor['topic_time']),
-				'POST_ID'      => $tor['post_id'],
 				'POSTER_ID'    => $poster_id,
 				'USERNAME'     => ($hide_author) ? '' : profile_url(array('username' => $tor['username'], 'user_rank' => $tor['user_rank'])),