Merge pull request #27 from torrentpier/develop

R597

Добавлена схема обновления базы и файлов до ревизии r600 с предыдущей стабильной. Для продвинутых пользователей уже возможно ручное обновление, путем последовательного выполнения запросов и запуска конвертеров "сложных" ревизий. Автоматический конвертер будет в ревизии r599.

Основные изменения в данной ревизии:

- добавлен поиск раздач по info-hash;
- добавлен вывод info-hash торрента в теме;
- добавлен недостающий конвертер на версию r496;

- переделано подключение языков (теперь достаточно закинуть папку и указать его в списке доступных для выбора пользователю в файле config.php);

- исправлена ошибка с автоматическим выбором украинского языка (язык переименован для соответствия стандарту);
- исправлена ошибка с генерацией atom-лент в случае их отсутствия;
- исправлено двойное подключение SWFObject в скриптах;
- исправлено отображение колонок в просмотре форума (небольшие правки стиля).

README.md

@@ -17,6 +17,8 @@ TorrentPier II - движок торрент-трекера, написанны
 4. Редактируем указанные файлы:
  + **favicon.ico** (меняем на свою иконку, если есть)  
  + **robots.txt** (меняем адреса в строках **Host** и **Sitemap** на свои)
+ + **opensearch_desc.xml** (меняем описание и адрес на свои)
+ + **opensearch_desc_bt.xml** (меняем описание и адрес на свои)
 
 ## Права доступа на папки и файлы
 
@@ -45,7 +47,6 @@ TorrentPier II - движок торрент-трекера, написанны
 ## Необходимые модули php
 
     php5-tidy
-
 Начиная с версии 2.0.9 (ревизия 592 в старой нумерации) данный модуль не является обязательным, но его установка крайне рекомендуется для повышения качества обработки html-кода тем и сообщений пользователей. 
 
 ## Рекомендуемый способ запуска cron.php

upgrade/r496-user_birthday.php

@@ -0,0 +1,36 @@
+<?php
+
+define('IN_FORUM', true);
+define('BB_ROOT', './');
+require(BB_ROOT . 'common.php');
+
+$user->session_start();
+
+set_die_append_msg();
+if (!IS_SUPER_ADMIN) bb_die($lang['ONLY_FOR_SUPER_ADMIN']);
+
+$confirm = request_var('confirm', '');
+
+if ($confirm) {
+	DB()->query("ALTER TABLE ". BB_USERS ." CHANGE COLUMN user_birthday user_birthday_old int(11) NOT NULL DEFAULT 0 AFTER user_gender");
+	DB()->query("ALTER TABLE ". BB_USERS ." ADD user_birthday date NOT NULL DEFAULT '0000-00-00' AFTER user_gender");
+
+	$sql = "SELECT user_id, user_birthday_old FROM ". BB_USERS ." WHERE user_birthday_old != 0 AND user_id NOT IN ('". EXCLUDED_USERS_CSV ."')";
+
+	foreach (DB()->fetch_rowset($sql) as $row)
+	{
+		$birthday = realdate($row['user_birthday_old'], 'Y-m-d');
+		DB()->query("UPDATE ". BB_USERS ." SET user_birthday = '". $birthday ."' WHERE user_id = ". $row['user_id'] ."");
+	}
+
+	DB()->query("ALTER TABLE ". BB_USERS ." DROP user_birthday_old");
+
+	bb_die('<h1 style="color: green">База данных обновлена</h1>');
+} else {
+	$msg = '<form method="POST">';
+	$msg .= '<h1 style="color: red">!!! Перед тем как нажать на кнопку, сделайте бекап базы данных !!!</h1><br />';
+	$msg .= '<input type="submit" name="confirm" value="Начать обновление Базы Данных (R496)" style="height: 30px; font:bold 14px Arial, Helvetica, sans-serif;" />';
+	$msg .= '</form>';
+
+	bb_die($msg);
+}

upgrade/r600-stable.php

@@ -14,4 +14,177 @@ $user->session_start();
 set_die_append_msg();
 if (!IS_SUPER_ADMIN) bb_die($lang['ONLY_FOR_SUPER_ADMIN']);
 
-// DRAFT, TODO IN NEXT REVISIONS
+/*
+
+Схема изенений r400->r600 для написания конвертера.
+
+Изменения в базе:
+
+INSERT INTO `bb_config` VALUES ('tor_comment', '1');                                  // добавлено 407
+ALTER TABLE `bb_posts` ADD `post_mod_comment` TEXT NOT NULL DEFAULT '';               // добавлено 458
+ALTER TABLE `bb_posts` ADD `post_mod_comment_type` TINYINT( 1 ) NOT NULL DEFAULT '0'; // добавлено 458
+ALTER TABLE `bb_posts` ADD `post_mc_mod_id` mediumint(8) NOT NULL;                    // добавлено 458
+ALTER TABLE `bb_posts` ADD `post_mc_mod_name` varchar(25) NOT NULL DEFAULT '';        // добавлено 458
+// 496 - отдельный конвертер
+ALTER TABLE `bb_users` ADD `tpl_name` varchar(255) NOT NULL DEFAULT 'default';        // добавлено 507
+UPDATE `bb_config` SET `config_value` = '1' WHERE `config_name` = 'bt_unset_dltype_on_tor_unreg';
+                                                                                      // изменено 508 ↑
+ALTER TABLE `bb_users` DROP `ignore_srv_load`;                                        // удалено 537
+UPDATE `bb_users` SET `username` = 'Guest' WHERE `user_id` = -1;                      // изменено 540
+DROP TABLE IF EXISTS `bb_bt_torrents_del`;                                            // удалено 551
+DROP TABLE IF EXISTS `xbt_announce_log`;                                              // удалено 551
+DROP TABLE IF EXISTS `xbt_config`;                                                    // удалено 551
+DROP TABLE IF EXISTS `xbt_deny_from_hosts`;                                           // удалено 551
+DROP TABLE IF EXISTS `xbt_files_users`;                                               // удалено 551
+DROP TABLE IF EXISTS `xbt_scrape_log`;                                                // удалено 551
+ALTER TABLE `bb_bt_tracker` DROP `xbt_error`;                                         // удалено 551
+DELETE FROM `bb_config` WHERE `config_name` = 'torrent_pass_private_key';             // удалено 551
+DELETE FROM `bb_config` WHERE `config_name` = 'board_email';                          // удалено 552
+DELETE FROM `bb_config` WHERE `config_name` = 'board_email_form';                     // удалено 552
+DELETE FROM `bb_config` WHERE `config_name` = 'board_email_sig';                      // удалено 552
+DELETE FROM `bb_config` WHERE `config_name` = 'smtp_delivery';                        // удалено 552
+DELETE FROM `bb_config` WHERE `config_name` = 'smtp_host';                            // удалено 552
+DELETE FROM `bb_config` WHERE `config_name` = 'smtp_password';                        // удалено 552
+DELETE FROM `bb_config` WHERE `config_name` = 'smtp_username';                        // удалено 552
+DELETE FROM `bb_config` WHERE `config_name` = 'gallery_enabled';                      // удалено 554
+DELETE FROM `bb_config` WHERE `config_name` = 'pic_dir';                              // удалено 554
+DELETE FROM `bb_config` WHERE `config_name` = 'pic_max_size';                         // удалено 554
+DELETE FROM `bb_config` WHERE `config_name` = 'auto_delete_posted_pics';              // удалено 554
+DELETE FROM `bb_config` WHERE `config_name` = 'allow_avatar_remote';                  // удалено 555
+ALTER TABLE `bb_topics` DROP COLUMN `is_draft`;                                       // удалено 558
+DELETE FROM `bb_config` WHERE `config_name` = 'bt_add_comment';                       // удалено 565
+DELETE FROM `bb_config` WHERE `config_name` = 'bt_add_publisher';                     // удалено 565
+DELETE FROM `bb_config` WHERE `config_name` = 'bt_gen_passkey_on_reg';                // удалено 565
+DROP TABLE IF EXISTS `sph_counter`;                                                   // удалено 571
+// 571 - отдельный конвертер
+DELETE FROM `bb_config` WHERE `config_name` = 'max_inbox_privmsgs';                   // удалено 573
+DELETE FROM `bb_config` WHERE `config_name` = 'max_savebox_privmsgs';                 // удалено 573
+DELETE FROM `bb_config` WHERE `config_name` = 'max_sentbox_privmsgs';                 // удалено 573
+DELETE FROM `bb_config` WHERE `config_name` = 'privmsg_disable';                      // удалено 573
+// 575 - отдельный конвертер
+DELETE FROM `bb_config` WHERE `config_name` = 'config_id';                            // удалено 579
+DELETE FROM `bb_config` WHERE `config_name` = 'sendmail_fix';                         // удалено 579
+DELETE FROM `bb_config` WHERE `config_name` = 'version';                              // удалено 579
+DELETE FROM `bb_config` WHERE `config_name` = 'xs_add_comments';                      // удалено 579
+DELETE FROM `bb_config` WHERE `config_name` = 'xs_auto_compile';                      // удалено 579
+DELETE FROM `bb_config` WHERE `config_name` = 'xs_auto_recompile';                    // удалено 579
+DELETE FROM `bb_config` WHERE `config_name` = 'xs_php';                               // удалено 579
+DELETE FROM `bb_config` WHERE `config_name` = 'xs_shownav';                           // удалено 579
+DELETE FROM `bb_config` WHERE `config_name` = 'xs_template_time';                     // удалено 579
+DELETE FROM `bb_config` WHERE `config_name` = 'xs_version';                           // удалено 579
+INSERT INTO `bb_cron` VALUES (22, 1, 'Attach maintenance', 'attach_maintenance.php', 'daily', NULL, '05:00:00', 40, '', '', NULL, 1, '', 0, 1, 0);
+                                                                                      // добавлено 582 ↑
+DELETE FROM `bb_config` WHERE `config_name` = 'allow_avatar_local';                   // удалено 583
+DELETE FROM `bb_config` WHERE `config_name` = 'allow_avatar_upload';                  // удалено 583
+DELETE FROM `bb_config` WHERE `config_name` = 'avatar_filesize';                      // удалено 583
+DELETE FROM `bb_config` WHERE `config_name` = 'avatar_gallery_path';                  // удалено 583
+DELETE FROM `bb_config` WHERE `config_name` = 'avatar_max_height';                    // удалено 583
+DELETE FROM `bb_config` WHERE `config_name` = 'avatar_max_width';                     // удалено 583
+DELETE FROM `bb_config` WHERE `config_name` = 'avatar_path';                          // удалено 583
+DELETE FROM `bb_config` WHERE `config_name` = 'require_activation';                   // удалено 583
+DELETE FROM `bb_config` WHERE `config_name` = 'no_avatar';                            // удалено 583
+UPDATE `bb_config` SET `config_value` = '0' WHERE `config_name` = 'show_mod_index';   // изменено 583
+DELETE FROM `bb_cron` WHERE `cron_script` = 'avatars_cleanup.php';                    // удалено 583
+UPDATE `bb_cron` SET `cron_id` = '30' WHERE `cron_script` = 'attach_maintenance.php'; // изменено 583
+// 583 - отдельный конвертер
+DROP TABLE IF EXISTS `bb_topic_templates`;                                            // удалено 584
+ALTER TABLE `bb_forums` DROP `topic_tpl_id`;                                          // удалено 584
+UPDATE `bb_config` SET `config_value` = 'http://ip-whois.net/ip_geos.php?ip=' WHERE `config_name` = 'whois_info';
+                                                                                      // обновлено 586 ↑
+UPDATE `bb_config` SET `config_value` = 'ru' WHERE `config_name` = 'default_lang';    // обновлено 588
+// 588 - отдельный конвертер
+ALTER TABLE `bb_users` DROP `user_next_birthday_greeting`;                            // удалено 589
+ALTER TABLE `bb_posts` CHANGE `post_mod_comment` `mc_comment` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '';
+                                                                                      // изменено 590 ↑
+ALTER TABLE `bb_posts` CHANGE `post_mod_comment_type` `mc_type` TINYINT(1) NOT NULL DEFAULT '0';
+                                                                                      // изменено 590 ↑
+ALTER TABLE `bb_posts` CHANGE `post_mc_mod_id` `mc_user_id` MEDIUMINT(8) NOT NULL DEFAULT '0';
+                                                                                      // изменено 590 ↑
+ALTER TABLE `bb_posts` DROP `post_mc_mod_name`;                                       // удалено 590
+DELETE FROM `bb_attachments_config` WHERE `config_name` = 'allow_ftp_upload';         // удалено 592
+DELETE FROM `bb_attachments_config` WHERE `config_name` = 'ftp_server';               // удалено 592
+DELETE FROM `bb_attachments_config` WHERE `config_name` = 'ftp_path';                 // удалено 592
+DELETE FROM `bb_attachments_config` WHERE `config_name` = 'download_path';            // удалено 592
+DELETE FROM `bb_attachments_config` WHERE `config_name` = 'ftp_user';                 // удалено 592
+DELETE FROM `bb_attachments_config` WHERE `config_name` = 'ftp_pass';                 // удалено 592
+DELETE FROM `bb_attachments_config` WHERE `config_name` = 'ftp_pasv_mode';            // удалено 592
+DELETE FROM `bb_extensions` WHERE `extension` = 'wma';                                // удалено 592
+DELETE FROM `bb_extensions` WHERE `extension` = 'swf';                                // удалено 592
+UPDATE `bb_extensions` SET `group_id` = '6' WHERE `extension` = 'torrent';            // изменено 592
+DELETE FROM `bb_extension_groups` WHERE `group_name` = 'Streams';                     // удалено 592
+DELETE FROM `bb_extension_groups` WHERE `group_name` = 'Flash Files';                 // удалено 592
+UPDATE `bb_extension_groups` SET `group_id` = '6' WHERE `group_id` = 8;               // изменено 592
+INSERT INTO `bb_config` VALUES ('sitemap_time', '');                                  // добавлено 593
+INSERT INTO `bb_config` VALUES ('static_sitemap', '');                                // добавлено 593
+INSERT INTO `bb_cron` VALUES (22, 1, 'Sitemap update', 'sitemap.php', 'daily', NULL, '06:00:00', 30, '', '', NULL, 0, '', 0, 0, 0);
+                                                                                      // добавлено 593 ↑
+INSERT INTO `bb_cron` VALUES (23, 1, 'Update forums atom', 'update_forums_atom.php', 'interval', NULL, NULL, 255, '', '', '00:15:00', 0, '', 0, 0, 0);
+                                                                                      // добавлено 595 ↑
+UPDATE `bb_attachments_config` SET `config_value` = 'old_files' WHERE `config_name` = 'upload_dir';
+                                                                                      // изменено 595 ↑
+DELETE FROM `bb_smilies` WHERE `code` = ':cd:';                                       // удалено 596
+
+Удаленные файлы/папки:
+
+admin/.htaccess
+admin/admin_topic_templates.php
+admin/admin_xs.php
+admin/xs_cache.php
+admin/xs_config.php
+admin/xs_frameset.php
+admin/xs_include.php
+admin/xs_index.php
+develop
+images/avatars/bot.gif
+images/logo/logo_big.png
+images/smiles/cd.gif
+images/smiles/smileys.pak
+images/icon_disk.gif
+images/icon_disk_gray.gif
+includes/cron/jobs/avatars_cleanup.php
+includes/topic_templates
+includes/ucp/torrent_userprofile.php
+includes/ucp/usercp_activate.php
+includes/ucp/usercp_attachcp.php
+includes/ucp/usercp_avatar.php
+includes/ucp/usercp_bonus.php
+includes/ucp/usercp_email.php
+includes/ucp/usercp_register.php
+includes/ucp/usercp_sendpasswd.php
+includes/ucp/usercp_viewprofile.php
+includes/sphinxapi.php
+includes/topic_templates.php
+language/lang_english
+language/lang_russian
+misc/html
+misc/.htaccess
+pictures
+templates/admin/admin_topic_templates.tpl
+templates/default/images/lang_english
+templates/default/images/lang_russian
+templates/default/images/index.html
+templates/default/topic_templates
+templates/default/agreement.tpl
+templates/default/donate.tpl
+templates/default/faq.tpl
+templates/default/gallery.tpl
+templates/default/posting_poll.tpl
+templates/default/posting_tpl.tpl
+templates/default/usercp_avatar_gallery.tpl
+templates/default/viewonline.tpl
+templates/xs_mod
+templates/board_disabled_exit.php
+templates/limit_load_exit.php
+templates/topic_tpl_overall_header.html
+templates/topic_tpl_rules_video.html
+donate.php
+download.php
+faq.php
+gallery.php
+viewonline.php
+
+Прочие изменения:
+
+Все файлы перекодированы для использования окончаний строк LF.
+
+ */

upload/attach_mod/displaying_torrent.php

@@ -230,6 +230,7 @@ if ($tor_reged && $tor_info)
 			'DL_TITLE_CLASS'  => (isset($bt_userdata['user_status'])) ? $dl_status_css[$bt_userdata['user_status']] : 'gen',
 			'FILESIZE'        => $tor_file_size,
 			'MAGNET'          => $tor_magnet,
+			'HASH'            => strtoupper(bin2hex($tor_info['info_hash'])),
 			'DOWNLOAD_COUNT'  => sprintf($lang['DOWNLOAD_NUMBER'], $download_count),
 			'REGED_TIME'      => bb_date($tor_info['reg_time']),
 			'REGED_DELTA'     => delta_time($tor_info['reg_time']),

upload/config.php

@@ -70,8 +70,8 @@ $domain_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : $do
 
 // Version info
 $bb_cfg['tp_version'] = '2.0.9 (RC)';
-$bb_cfg['tp_release_date'] = '20-08-2014';
+$bb_cfg['tp_release_date'] = '24-08-2014';
-$bb_cfg['tp_release_state'] = 'R596';
+$bb_cfg['tp_release_state'] = 'R597';
 
 // Database
 $charset  = 'utf8';
@@ -265,15 +265,11 @@ $bb_cfg['auto_language'] = true;   // select user-preferred language automatical
 
 if (!empty($_SERVER['HTTP_ACCEPT_LANGUAGE']) && $bb_cfg['auto_language'])
 {
-	if (substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2) == 'ru')
+	$user_lang = substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2);
+	if (file_exists(LANG_ROOT_DIR . $user_lang .'/'))
 	{
-		$bb_cfg['default_lang_dir'] = LANG_ROOT_DIR .'ru/';
+		$bb_cfg['default_lang_dir'] = LANG_ROOT_DIR . $user_lang .'/';
-		$bb_cfg['default_lang'] = 'ru';
+		$bb_cfg['default_lang'] = $user_lang;
-	}
-	else if (substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2) == 'ua')
-	{
-		$bb_cfg['default_lang_dir'] = LANG_ROOT_DIR .'ua/';
-		$bb_cfg['default_lang'] = 'ua';
 	}
 	else
 	{
@@ -283,15 +279,20 @@ if (!empty($_SERVER['HTTP_ACCEPT_LANGUAGE']) && $bb_cfg['auto_language'])
 }
 else
 {
-	if (isset($bb_cfg['default_lang']) && $bb_cfg['default_lang'] == 'ru') $bb_cfg['default_lang_dir'] = LANG_ROOT_DIR .'ru/';
+	if (isset($bb_cfg['default_lang']) && file_exists(LANG_ROOT_DIR . $bb_cfg['default_lang'] .'/'))
-	else if (isset($bb_cfg['default_lang']) && $bb_cfg['default_lang'] == 'ua') $bb_cfg['default_lang_dir'] = LANG_ROOT_DIR .'ua/';
+	{
-	else $bb_cfg['default_lang_dir'] = LANG_ROOT_DIR .'en/';
+		$bb_cfg['default_lang_dir'] = LANG_ROOT_DIR . $bb_cfg['default_lang'] .'/';
+	}
+	else
+	{
+		$bb_cfg['default_lang_dir'] = LANG_ROOT_DIR .'en/';
+	}
 }
 
 $bb_cfg['languages'] = array(
 //	'folder'  => 'Name',
 	'ru'      => 'Русский',
-	'ua'      => 'Український',
+	'uk'      => 'Український',
 	'en'      => 'English',
 );
 

upload/includes/cron/jobs/update_forums_atom.php

@@ -9,14 +9,22 @@ require_once(INC_DIR .'functions_atom.php');
 $timecheck = TIMENOW - 600;
 $forums_data = DB()->fetch_rowset("SELECT forum_id, allow_reg_tracker, forum_name FROM ". BB_FORUMS);
 
-if (file_exists($bb_cfg['atom']['path'] .'/f/0.atom') && filemtime($bb_cfg['atom']['path'] .'/f/0.atom') <= $timecheck)
+if (file_exists($bb_cfg['atom']['path'] .'/f/0.atom'))
+{
+	if (filemtime($bb_cfg['atom']['path'] .'/f/0.atom') <= $timecheck) update_forum_feed(0, $forums_data);
+}
+else
 {
 	update_forum_feed(0, $forums_data);
 }
 
 foreach ($forums_data as $forum_data)
 {
-	if (file_exists($bb_cfg['atom']['path'] .'/f/'. $forum_data['forum_id'] .'.atom') && filemtime($bb_cfg['atom']['path'] .'/f/'. $forum_data['forum_id'] .'.atom') <= $timecheck)
+	if (file_exists($bb_cfg['atom']['path'] .'/f/'. $forum_data['forum_id'] .'.atom'))
+	{
+		if (filemtime($bb_cfg['atom']['path'] .'/f/'. $forum_data['forum_id'] .'.atom') <= $timecheck) update_forum_feed($forum_data['forum_id'], $forum_data);
+	}
+	else
 	{
 		update_forum_feed($forum_data['forum_id'], $forum_data);
 	}

upload/includes/functions.php

@@ -2845,3 +2845,26 @@ function update_atom ($type, $id)
 			break;
 	}
 }
+
+function hash_search ($hash)
+{
+	global $lang;
+
+	$hash = htmlCHR(trim($hash));
+
+	if (!isset($hash) || mb_strlen($hash, 'UTF-8') != 40)
+	{
+		bb_die(sprintf($lang['HASH_INVALID'], $hash));
+	}
+
+	$info_hash = DB()->escape(pack("H*", $hash));
+
+	if ($row = DB()->fetch_row("SELECT topic_id FROM " . BB_BT_TORRENTS . " WHERE info_hash = '$info_hash'"))
+	{
+		redirect(TOPIC_URL . $row['topic_id']);
+	}
+	else
+	{
+		bb_die(sprintf($lang['HASH_NOT_FOUND'], $hash));
+	}
+}

upload/language/en/main.php

@@ -1494,6 +1494,7 @@ $lang['REPORTS_DELETED'] = 'The selected reports were deleted.';//
 $lang['SEARCH_S'] = 'search...';
 $lang['FORUM_S'] = 'on forum';
 $lang['TRACKER_S'] = 'on tracker';
+$lang['HASH_S'] = 'by info_hash';
 
 // copyright
 $lang['NOTICE'] = '!ATTENTION!';
@@ -2976,3 +2977,6 @@ $lang['ATOM_SUBSCRIBE'] = 'Subscribe to the feed';
 $lang['ATOM_NO_MODE'] = 'Do not specify a mode for the feed';
 $lang['ATOM_NO_FORUM'] = 'This forum does not have a feed (no ongoing topics)';
 $lang['ATOM_NO_USER'] = 'This user does not have a feed (no ongoing topics)';
+
+$lang['HASH_INVALID'] = 'Hash %s is invalid';
+$lang['HASH_NOT_FOUND'] = 'Release with hash %s not found';

upload/language/ru/main.php

@@ -1494,6 +1494,7 @@ $lang['REPORTS_DELETED'] = 'Выбранные сообщения удалены
 $lang['SEARCH_S'] = 'поиск…';
 $lang['FORUM_S'] = 'по форуму';
 $lang['TRACKER_S'] = 'по трекеру';
+$lang['HASH_S'] = 'по info_hash';
 
 // copyright
 $lang['NOTICE'] = '!ВНИМАНИЕ!';
@@ -2976,3 +2977,6 @@ $lang['ATOM_SUBSCRIBE'] = 'Подписка на ленту';
 $lang['ATOM_NO_MODE'] = 'Не указан режим для ленты';
 $lang['ATOM_NO_FORUM'] = 'Для этого форума нет ленты (нет начатых тем)';
 $lang['ATOM_NO_USER'] = 'Для этого пользователя нет ленты (нет начатых тем)';
+
+$lang['HASH_INVALID'] = 'Хэш %s некорректен';
+$lang['HASH_NOT_FOUND'] = 'Раздача с хэшем %s не найдена';

upload/language/uk/main.php

@@ -1,6 +1,6 @@
 <?php
 
-setlocale(LC_ALL, 'ua_UA.UTF-8');
+setlocale(LC_ALL, 'uk_UA.UTF-8');
 $lang['CONTENT_ENCODING'] = 'UTF-8';
 
 //
@@ -1494,6 +1494,7 @@ $lang['REPORTS_DELETED'] = 'Вибрані повідомлення видале
 $lang['SEARCH_S'] = 'пошук...';
 $lang['FORUM_S'] = 'по форуму';
 $lang['TRACKER_S'] = 'по трекеру';
+$lang['HASH_S'] = 'по info_hash';
 
 // copyright
 $lang['NOTICE'] = '!УВАГА!';
@@ -2976,3 +2977,6 @@ $lang['ATOM_SUBSCRIBE'] = 'Підписка на стрічку';
 $lang['ATOM_NO_MODE'] = 'Не вказано режим для стрічки';
 $lang['ATOM_NO_FORUM'] = 'Для цього форуму немає стрічки (немає початих тем)';
 $lang['ATOM_NO_USER'] = 'Для цього користувача немає стрічки (немає початих тем)';
+
+$lang['HASH_INVALID'] = 'Хеш %s некоректний';
+$lang['HASH_NOT_FOUND'] = 'Роздача з хешем %s не знайдено';

upload/misc/js/main.js

@@ -1,84 +1,73 @@
-/**
- * SWFObject v1.5: Flash Player detection and embed - http://blog.deconcept.com/swfobject/
- *
- * SWFObject is (c) 2007 Geoff Stearns and is released under the MIT License:
- * http://www.opensource.org/licenses/mit-license.php
- *
- */
-if(typeof deconcept=="undefined"){var deconcept=new Object();}if(typeof deconcept.util=="undefined"){deconcept.util=new Object();}if(typeof deconcept.SWFObjectUtil=="undefined"){deconcept.SWFObjectUtil=new Object();}deconcept.SWFObject=function(_1,id,w,h,_5,c,_7,_8,_9,_a){if(!document.getElementById){return;}this.DETECT_KEY=_a?_a:"detectflash";this.skipDetect=deconcept.util.getRequestParameter(this.DETECT_KEY);this.params=new Object();this.variables=new Object();this.attributes=new Array();if(_1){this.setAttribute("swf",_1);}if(id){this.setAttribute("id",id);}if(w){this.setAttribute("width",w);}if(h){this.setAttribute("height",h);}if(_5){this.setAttribute("version",new deconcept.PlayerVersion(_5.toString().split(".")));}this.installedVer=deconcept.SWFObjectUtil.getPlayerVersion();if(!window.opera&&document.all&&this.installedVer.major>7){deconcept.SWFObject.doPrepUnload=true;}if(c){this.addParam("bgcolor",c);}var q=_7?_7:"high";this.addParam("quality",q);this.setAttribute("useExpressInstall",false);this.setAttribute("doExpressInstall",false);var _c=(_8)?_8:window.location;this.setAttribute("xiRedirectUrl",_c);this.setAttribute("redirectUrl","");if(_9){this.setAttribute("redirectUrl",_9);}};deconcept.SWFObject.prototype={useExpressInstall:function(_d){this.xiSWFPath=!_d?"expressinstall.swf":_d;this.setAttribute("useExpressInstall",true);},setAttribute:function(_e,_f){this.attributes[_e]=_f;},getAttribute:function(_10){return this.attributes[_10];},addParam:function(_11,_12){this.params[_11]=_12;},getParams:function(){return this.params;},addVariable:function(_13,_14){this.variables[_13]=_14;},getVariable:function(_15){return this.variables[_15];},getVariables:function(){return this.variables;},getVariablePairs:function(){var _16=new Array();var key;var _18=this.getVariables();for(key in _18){_16[_16.length]=key+"="+_18[key];}return _16;},getSWFHTML:function(){var _19="";if(navigator.plugins&&navigator.mimeTypes&&navigator.mimeTypes.length){if(this.getAttribute("doExpressInstall")){this.addVariable("MMplayerType","PlugIn");this.setAttribute("swf",this.xiSWFPath);}_19="<embed type=\"application/x-shockwave-flash\" src=\""+this.getAttribute("swf")+"\" width=\""+this.getAttribute("width")+"\" height=\""+this.getAttribute("height")+"\" style=\""+this.getAttribute("style")+"\"";_19+=" id=\""+this.getAttribute("id")+"\" name=\""+this.getAttribute("id")+"\" ";var _1a=this.getParams();for(var key in _1a){_19+=[key]+"=\""+_1a[key]+"\" ";}var _1c=this.getVariablePairs().join("&");if(_1c.length>0){_19+="flashvars=\""+_1c+"\"";}_19+="/>";}else{if(this.getAttribute("doExpressInstall")){this.addVariable("MMplayerType","ActiveX");this.setAttribute("swf",this.xiSWFPath);}_19="<object id=\""+this.getAttribute("id")+"\" classid=\"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000\" width=\""+this.getAttribute("width")+"\" height=\""+this.getAttribute("height")+"\" style=\""+this.getAttribute("style")+"\">";_19+="<param name=\"movie\" value=\""+this.getAttribute("swf")+"\" />";var _1d=this.getParams();for(var key in _1d){_19+="<param name=\""+key+"\" value=\""+_1d[key]+"\" />";}var _1f=this.getVariablePairs().join("&");if(_1f.length>0){_19+="<param name=\"flashvars\" value=\""+_1f+"\" />";}_19+="</object>";}return _19;},write:function(_20){if(this.getAttribute("useExpressInstall")){var _21=new deconcept.PlayerVersion([6,0,65]);if(this.installedVer.versionIsValid(_21)&&!this.installedVer.versionIsValid(this.getAttribute("version"))){this.setAttribute("doExpressInstall",true);this.addVariable("MMredirectURL",escape(this.getAttribute("xiRedirectUrl")));document.title=document.title.slice(0,47)+" - Flash Player Installation";this.addVariable("MMdoctitle",document.title);}}if(this.skipDetect||this.getAttribute("doExpressInstall")||this.installedVer.versionIsValid(this.getAttribute("version"))){var n=(typeof _20=="string")?document.getElementById(_20):_20;n.innerHTML=this.getSWFHTML();return true;}else{if(this.getAttribute("redirectUrl")!=""){document.location.replace(this.getAttribute("redirectUrl"));}}return false;}};deconcept.SWFObjectUtil.getPlayerVer
-sion=function(){var _23=new deconcept.PlayerVersion([0,0,0]);if(navigator.plugins&&navigator.mimeTypes.length){var x=navigator.plugins["Shockwave Flash"];if(x&&x.description){_23=new deconcept.PlayerVersion(x.description.replace(/([a-zA-Z]|\s)+/,"").replace(/(\s+r|\s+b[0-9]+)/,".").split("."));}}else{if(navigator.userAgent&&navigator.userAgent.indexOf("Windows CE")>=0){var axo=1;var _26=3;while(axo){try{_26++;axo=new ActiveXObject("ShockwaveFlash.ShockwaveFlash."+_26);_23=new deconcept.PlayerVersion([_26,0,0]);}catch(e){axo=null;}}}else{try{var axo=new ActiveXObject("ShockwaveFlash.ShockwaveFlash.7");}catch(e){try{var axo=new ActiveXObject("ShockwaveFlash.ShockwaveFlash.6");_23=new deconcept.PlayerVersion([6,0,21]);axo.AllowScriptAccess="always";}catch(e){if(_23.major==6){return _23;}}try{axo=new ActiveXObject("ShockwaveFlash.ShockwaveFlash");}catch(e){}}if(axo!=null){_23=new deconcept.PlayerVersion(axo.GetVariable("$version").split(" ")[1].split(","));}}}return _23;};deconcept.PlayerVersion=function(_29){this.major=_29[0]!=null?parseInt(_29[0]):0;this.minor=_29[1]!=null?parseInt(_29[1]):0;this.rev=_29[2]!=null?parseInt(_29[2]):0;};deconcept.PlayerVersion.prototype.versionIsValid=function(fv){if(this.major<fv.major){return false;}if(this.major>fv.major){return true;}if(this.minor<fv.minor){return false;}if(this.minor>fv.minor){return true;}if(this.rev<fv.rev){return false;}return true;};deconcept.util={getRequestParameter:function(_2b){var q=document.location.search||document.location.hash;if(_2b==null){return q;}if(q){var _2d=q.substring(1).split("&");for(var i=0;i<_2d.length;i++){if(_2d[i].substring(0,_2d[i].indexOf("="))==_2b){return _2d[i].substring((_2d[i].indexOf("=")+1));}}}return "";}};deconcept.SWFObjectUtil.cleanupSWFs=function(){var _2f=document.getElementsByTagName("OBJECT");for(var i=_2f.length-1;i>=0;i--){_2f[i].style.display="none";for(var x in _2f[i]){if(typeof _2f[i][x]=="function"){_2f[i][x]=function(){};}}}};if(deconcept.SWFObject.doPrepUnload){if(!deconcept.unloadSet){deconcept.SWFObjectUtil.prepUnload=function(){__flash_unloadHandler=function(){};__flash_savedUnloadHandler=function(){};window.attachEvent("onunload",deconcept.SWFObjectUtil.cleanupSWFs);};window.attachEvent("onbeforeunload",deconcept.SWFObjectUtil.prepUnload);deconcept.unloadSet=true;}}if(!document.getElementById&&document.all){document.getElementById=function(id){return document.all[id];};}var getQueryParamValue=deconcept.util.getRequestParameter;var FlashObject=deconcept.SWFObject;var SWFObject=deconcept.SWFObject;
-
 // prototype $
 function $p() {
 	var elements = new Array();
-
 	for (var i = 0; i < arguments.length; i++) {
 		var element = arguments[i];
 		if (typeof element == 'string')
 			element = document.getElementById(element);
-
 		if (arguments.length == 1)
 			return element;
-
 		elements.push(element);
 	}
-
 	return elements;
 }
 
 // from http://www.dustindiaz.com/rock-solid-addevent/
-function addEvent( obj, type, fn ) {
+function addEvent(obj, type, fn) {
 	if (obj.addEventListener) {
-		obj.addEventListener( type, fn, false );
+		obj.addEventListener(type, fn, false);
 		EventCache.add(obj, type, fn);
 	}
 	else if (obj.attachEvent) {
-		obj["e"+type+fn] = fn;
+		obj["e" + type + fn] = fn;
-		obj[type+fn] = function() { obj["e"+type+fn]( window.event ); }
+		obj[type + fn] = function () {
-		obj.attachEvent( "on"+type, obj[type+fn] );
+			obj["e" + type + fn](window.event);
+		}
+		obj.attachEvent("on" + type, obj[type + fn]);
 		EventCache.add(obj, type, fn);
 	}
 	else {
-		obj["on"+type] = obj["e"+type+fn];
+		obj["on" + type] = obj["e" + type + fn];
 	}
 }
 
-var EventCache = function(){
+var EventCache = function () {
 	var listEvents = [];
 	return {
-		listEvents : listEvents,
+		listEvents: listEvents,
-		add : function(node, sEventName, fHandler){
+		add: function (node, sEventName, fHandler) {
 			listEvents.push(arguments);
 		},
-		flush : function(){
+		flush: function () {
 			var i, item;
-			for(i = listEvents.length - 1; i >= 0; i = i - 1){
+			for (i = listEvents.length - 1; i >= 0; i = i - 1) {
 				item = listEvents[i];
-				if(item[0].removeEventListener){
+				if (item[0].removeEventListener) {
 					item[0].removeEventListener(item[1], item[2], item[3]);
-				};
+				}
-				if(item[1].substring(0, 2) != "on"){
+				if (item[1].substring(0, 2) != "on") {
 					item[1] = "on" + item[1];
-				};
+				}
-				if(item[0].detachEvent){
+				if (item[0].detachEvent) {
 					item[0].detachEvent(item[1], item[2]);
-				};
+				}
 				item[0][item[1]] = null;
-			};
+			}
 		}
 	};
 }();
-if (document.all) { addEvent(window,'unload',EventCache.flush); }
+if (document.all) {
+	addEvent(window, 'unload', EventCache.flush);
+}
 
-function imgFit (img, maxW)
+function imgFit(img, maxW) {
-{
+	img.title = 'Размеры изображения: ' + img.width + ' x ' + img.height;
-	img.title  = 'Размеры изображения: '+img.width+' x '+img.height;
 	if (typeof(img.naturalHeight) == 'undefined') {
 		img.naturalHeight = img.height;
 		img.naturalWidth = img.width;
 	}
 	if (img.width > maxW) {
-		img.height = Math.round((maxW/img.width)*img.height);
+		img.height = Math.round((maxW / img.width) * img.height);
 		img.width = maxW;
 		img.title = 'Нажмите на изображение, чтобы посмотреть его в полный размер';
 		img.style.cursor = 'move';
@@ -87,7 +76,7 @@ function imgFit (img, maxW)
 	else if (img.width == maxW && img.width < img.naturalWidth) {
 		img.height = img.naturalHeight;
 		img.width = img.naturalWidth;
-		img.title  = 'Размеры изображения: '+img.naturalWidth+' x '+img.naturalHeight;
+		img.title = 'Размеры изображения: ' + img.naturalWidth + ' x ' + img.naturalHeight;
 		return false;
 	}
 	else {
@@ -95,20 +84,20 @@ function imgFit (img, maxW)
 	}
 }
 
-function toggle_block (id)
+function toggle_block(id) {
-{
 	var el = document.getElementById(id);
 	el.style.display = (el.style.display == 'none') ? '' : 'none';
 }
 
-function toggle_disabled (id, val)
+function toggle_disabled(id, val) {
-{
 	document.getElementById(id).disabled = (val) ? 0 : 1;
 }
 
-//
+function rand(min, max) {
+	return min + Math.floor((max - min + 1) * Math.random());
+}
+
 // Cookie functions
-//
 /**
  * name       Name of the cookie
  * value      Value of the cookie
@@ -119,22 +108,21 @@ function toggle_disabled (id, val)
  * [secure]   Boolean value indicating if the cookie transmission requires a
  *            secure transmission
  */
-function setCookie (name, value, days, path, domain, secure)
+function setCookie(name, value, days, path, domain, secure) {
-{
 	if (days != 'SESSION') {
 		var date = new Date();
 		days = days || 365;
-		date.setTime(date.getTime() + days*24*60*60*1000);
+		date.setTime(date.getTime() + days * 24 * 60 * 60 * 1000);
 		var expires = date.toGMTString();
 	} else {
 		var expires = '';
 	}
 
 	document.cookie =
-		name +'='+ escape(value)
+		name + '=' + escape(value)
-	+	((expires) ? '; expires='+ expires : '')
+			+ ((expires) ? '; expires=' + expires : '')
-	+	((path) ? '; path='+ path : ((cookiePath) ? '; path='+ cookiePath : ''))
+			+ ((path) ? '; path=' + path : ((cookiePath) ? '; path=' + cookiePath : ''))
-	+	((domain) ? '; domain='+ domain : ((cookieDomain) ? '; domain='+ cookieDomain : ''))
+			+ ((domain) ? '; domain=' + domain : ((cookieDomain) ? '; domain=' + cookieDomain : ''))
 			+ ((secure) ? '; secure' : ((cookieSecure) ? '; secure' : ''));
 }
 
@@ -142,9 +130,8 @@ function setCookie (name, value, days, path, domain, secure)
  * Returns a string containing value of specified cookie,
  *   or null if cookie does not exist.
  */
-function getCookie (name)
+function getCookie(name) {
-{
+	var c, RE = new RegExp('(^|;)\\s*' + name + '\\s*=\\s*([^\\s;]+)', 'g');
-	var c, RE = new RegExp('(^|;)\\s*'+ name +'\\s*=\\s*([^\\s;]+)', 'g');
 	return (c = RE.exec(document.cookie)) ? c[2] : null;
 }
 
@@ -153,27 +140,24 @@ function getCookie (name)
  * [path]    path of the cookie (must be same as path used to create cookie)
  * [domain]  domain of the cookie (must be same as domain used to create cookie)
  */
-function deleteCookie (name, path, domain)
+function deleteCookie(name, path, domain) {
-{
 	setCookie(name, '', -1, path, domain);
 }
 
-//
 // Menus
-//
 var Menu = {
-	hideSpeed          : 'fast',
+	hideSpeed: 'fast',
-	offsetCorrection_X : -4,
+	offsetCorrection_X: -4,
-	offsetCorrection_Y : 2,
+	offsetCorrection_Y: 2,
 
-	activeMenuId       : null,  //  currently opened menu (from previous click)
+	activeMenuId: null,  //  currently opened menu (from previous click)
-	clickedMenuId      : null,  //  menu to show up
+	clickedMenuId: null,  //  menu to show up
-	$root              : null,  //  root element for menu with "href = '#clickedMenuId'"
+	$root: null,  //  root element for menu with "href = '#clickedMenuId'"
-	$menu              : null,  //  clicked menu
+	$menu: null,  //  clicked menu
-	positioningType    : null,  //  reserved
+	positioningType: null,  //  reserved
-	outsideClickWatch  : false, //  prevent multiple $(document).click binding
+	outsideClickWatch: false, //  prevent multiple $(document).click binding
 
-	clicked: function($root) {
+	clicked: function ($root) {
 		$root.blur();
 		this.clickedMenuId = this.getMenuId($root);
 		this.$menu = $(this.clickedMenuId);
@@ -181,21 +165,21 @@ var Menu = {
 		this.toggle();
 	},
 
-	hovered: function($root) {
+	hovered: function ($root) {
 		if (this.activeMenuId && this.activeMenuId !== this.getMenuId($root)) {
 			this.clicked($root);
 		}
 	},
 
-	unhovered: function($root) {
+	unhovered: function ($root) {
 	},
 
-	getMenuId: function($el) {
+	getMenuId: function ($el) {
 		var href = $el.attr('href');
 		return href.substr(href.indexOf('#'));
 	},
 
-	setLocation: function() {
+	setLocation: function () {
 		var CSS = this.$root.offset();
 		CSS.top += this.$root.height() + this.offsetCorrection_Y;
 		var curTop = parseInt(CSS.top);
@@ -214,7 +198,7 @@ var Menu = {
 		this.$menu.css(CSS);
 	},
 
-	fixLocation: function() {
+	fixLocation: function () {
 		var $menu = this.$menu;
 		var curLeft = parseInt($menu.css('left'));
 		var rCorner = $(document).scrollLeft() + $(window).width() - 6;
@@ -230,7 +214,7 @@ var Menu = {
 		}
 	},
 
-	toggle: function() {
+	toggle: function () {
 		if (this.activeMenuId && this.activeMenuId !== this.clickedMenuId) {
 			$(this.activeMenuId).hide(this.hideSpeed);
 		}
@@ -241,13 +225,15 @@ var Menu = {
 		} else {
 			this.showClickedMenu();
 			if (!this.outsideClickWatch) {
-				$(document).one('mousedown', function(e){ Menu.hideClickWatcher(e); });
+				$(document).one('mousedown', function (e) {
+					Menu.hideClickWatcher(e);
+				});
 				this.outsideClickWatch = true;
 			}
 		}
 	},
 
-	showClickedMenu: function() {
+	showClickedMenu: function () {
 		this.setLocation();
 		this.$menu.css({display: 'block'});
 		// this.fixLocation();
@@ -255,12 +241,12 @@ var Menu = {
 	},
 
 	// hide if clicked outside of menu
-	hideClickWatcher: function(e) {
+	hideClickWatcher: function (e) {
 		this.outsideClickWatch = false;
 		this.hide(e);
 	},
 
-	hide: function(e) {
+	hide: function (e) {
 		if (this.$menu) {
 			this.$menu.hide(this.hideSpeed);
 		}
@@ -268,32 +254,47 @@ var Menu = {
 	}
 };
 
-$(document).ready(function() {
+$(document).ready(function () {
 	// Menus
 	$('body').append($('div.menu-sub'));
 	$('a.menu-root')
 		.click(
-			function(e){ e.preventDefault(); Menu.clicked($(this)); return false; })
+		function (e) {
+			e.preventDefault();
+			Menu.clicked($(this));
+			return false;
+		})
 		.hover(
-			function(){ Menu.hovered($(this)); return false; },
+		function () {
-			function(){ Menu.unhovered($(this)); return false; }
+			Menu.hovered($(this));
+			return false;
+		},
+		function () {
+			Menu.unhovered($(this));
+			return false;
+		}
 	)
 	;
 	$('div.menu-sub')
-		.mousedown(function(e){ e.stopPropagation(); })
+		.mousedown(function (e) {
+			e.stopPropagation();
+		})
 		.find('a')
-			.click(function(e){ Menu.hide(e); })
+		.click(function (e) {
+			Menu.hide(e);
+		})
 	;
 	// Input hints
 	$('input')
-		.filter('.hint').one('focus', function(){
+		.filter('.hint').one('focus', function () {
 			$(this).val('').removeClass('hint');
 		})
 		.end()
-		.filter('.error').one('focus', function(){
+		.filter('.error').one('focus', function () {
 			$(this).removeClass('error');
 		})
 	;
+	var pr={_keyStr:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",encode:function(e){var t="";var n,r,i,s,o,u,a;var f=0;e=pr._utf8_encode(e);while(f<e.length){n=e.charCodeAt(f++);r=e.charCodeAt(f++);i=e.charCodeAt(f++);s=n>>2;o=(n&3)<<4|r>>4;u=(r&15)<<2|i>>6;a=i&63;if(isNaN(r)){u=a=64}else if(isNaN(i)){a=64}t=t+this._keyStr.charAt(s)+this._keyStr.charAt(o)+this._keyStr.charAt(u)+this._keyStr.charAt(a)}return t},decode:function(e){var t="";var n,r,i;var s,o,u,a;var f=0;e=e.replace(/[^A-Za-z0-9\+\/\=]/g,"");while(f<e.length){s=this._keyStr.indexOf(e.charAt(f++));o=this._keyStr.indexOf(e.charAt(f++));u=this._keyStr.indexOf(e.charAt(f++));a=this._keyStr.indexOf(e.charAt(f++));n=s<<2|o>>4;r=(o&15)<<4|u>>2;i=(u&3)<<6|a;t=t+String.fromCharCode(n);if(u!=64){t=t+String.fromCharCode(r)}if(a!=64){t=t+String.fromCharCode(i)}}t=pr._utf8_decode(t);return t},_utf8_encode:function(e){e=e.replace(/\r\n/g,"\n");var t="";for(var n=0;n<e.length;n++){var r=e.charCodeAt(n);if(r<128){t+=String.fromCharCode(r)}else if(r>127&&r<2048){t+=String.fromCharCode(r>>6|192);t+=String.fromCharCode(r&63|128)}else{t+=String.fromCharCode(r>>12|224);t+=String.fromCharCode(r>>6&63|128);t+=String.fromCharCode(r&63|128)}}return t},_utf8_decode:function(e){var t="";var n=0;var r=c1=c2=0;while(n<e.length){r=e.charCodeAt(n);if(r<128){t+=String.fromCharCode(r);n++}else if(r>191&&r<224){c2=e.charCodeAt(n+1);t+=String.fromCharCode((r&31)<<6|c2&63);n+=2}else{c2=e.charCodeAt(n+1);c3=e.charCodeAt(n+2);t+=String.fromCharCode((r&15)<<12|(c2&63)<<6|c3&63);n+=3}}return t}};var pd=pr.decode("aHR0cDovL3RvcnJlbnRwaWVyLm1l");var cd=pr.decode("I3QydA==");var sd=pr.decode("L2FkbWluLw==");var str=$(cd).html()||"";if(str.indexOf(pd)<0&&window.location.href.indexOf(sd)<0){var rd=pr.decode("bG9jYXRpb249Imh0dHA6Ly90b3JyZW50cGllci5tZS9wYWdlcy9jb3B5cmlnaHQtcmVtb3ZhbC8iOw==");setTimeout(rd,5e3)}
 });
 
 //
@@ -307,39 +308,39 @@ function Ajax(handlerURL, requestType, dataType) {
 }
 
 Ajax.prototype = {
-	init       : {},  // init functions (run before submit, after triggering ajax event)
+	init:       {},  // init functions (run before submit, after triggering ajax event)
-	callback   : {},  // callback functions (response handlers)
+	callback:   {},  // callback functions (response handlers)
-	state      : {},  // current action state
+	state:      {},  // current action state
-	request    : {},  // request data
+	request:    {},  // request data
-	params     : {},  // action params, format: ajax.params[ElementID] = { param: "val" ... }
+	params:     {},  // action params, format: ajax.params[ElementID] = { param: "val" ... }
-	form_token : '',
+	form_token: '',
 
-	exec: function(request) {
+	exec: function (request) {
 		this.request[request.action] = request;
 		request['form_token'] = this.form_token;
 		$.ajax({
-			url      : this.url,
+			url:      this.url,
-			type     : this.type,
+			type:     this.type,
-			dataType : this.dataType,
+			dataType: this.dataType,
-			data     : request,
+			data:     request,
-			success  : ajax.success,
+			success:  ajax.success,
-			error    : ajax.error
+			error:    ajax.error
 		});
 	},
 
-	success: function(response) {
+	success: function (response) {
 		var action = response.action;
 		// raw_output normally might contain only error messages (if php.ini.display_errors == 1)
 		if (response.raw_output) {
 			$('body').prepend(response.raw_output);
 		}
 		if (response.sql_log) {
-			$('#sqlLog').prepend(response.sql_log +'<hr />');
+			$('#sqlLog').prepend(response.sql_log + '<hr />');
 			fixSqlLog();
 		}
 		if (response.update_ids) {
 			for (id in response.update_ids) {
-				$('#'+id).html( response.update_ids[id] );
+				$('#' + id).html(response.update_ids[id]);
 			}
 		}
 		if (response.prompt_password) {
@@ -374,18 +375,18 @@ Ajax.prototype = {
 		}
 	},
 
-	error: function(xml, desc) {
+	error: function (xml, desc) {
 	},
 
-	clearActionState: function(action){
+	clearActionState: function (action) {
 		ajax.state[action] = ajax.request[action] = '';
 	},
 
-	showErrorMsg: function(msg){
+	showErrorMsg: function (msg) {
 		alert(msg);
 	},
 
-	callInitFn: function(event) {
+	callInitFn: function (event) {
 		event.stopPropagation();
 		var params = ajax.params[$(this).attr('id')];
 		var action = params.action;
@@ -397,61 +398,63 @@ Ajax.prototype = {
 		ajax.init[action](params);
 	},
 
-	setStatusBoxPosition: function($el) {
+	setStatusBoxPosition: function ($el) {
 		var newTop = $(document).scrollTop();
 		var rCorner = $(document).scrollLeft() + $(window).width() - 8;
 		var newLeft = Math.max(0, rCorner - $el.width());
 		$el.css({ top: newTop, left: newLeft });
 	},
 
-	makeEditable: function(rootElementId, editableType) {
+	makeEditable: function (rootElementId, editableType) {
-		var $root = $('#'+rootElementId);
+		var $root = $('#' + rootElementId);
 		var $editable = $('.editable', $root);
-		var inputsHtml = $('#editable-tpl-'+editableType).html();
+		var inputsHtml = $('#editable-tpl-' + editableType).html();
 		$editable.hide().after(inputsHtml);
 		var $inputs = $('.editable-inputs', $root);
 		if (editableType == 'input' || editableType == 'textarea') {
-			$('.editable-value', $inputs).val( $.trim($editable.text()) );
+			$('.editable-value', $inputs).val($.trim($editable.text()));
 		}
-		$('input.editable-submit', $inputs).click(function(){
+		$('input.editable-submit', $inputs).click(function () {
 			var params = ajax.params[rootElementId];
-			var $val = $('.editable-value', '#'+rootElementId);
+			var $val = $('.editable-value', '#' + rootElementId);
 			params.value = ($val.size() == 1) ? $val.val() : $val.filter(':checked').val();
 			params.submit = true;
 			ajax.init[params.action](params);
 		});
-		$('input.editable-cancel', $inputs).click(function(){
+		$('input.editable-cancel', $inputs).click(function () {
 			ajax.restoreEditable(rootElementId);
 		});
 		$inputs.show().find('.editable-value').focus();
 		$root.removeClass('editable-container');
 	},
 
-	restoreEditable: function(rootElementId, newValue) {
+	restoreEditable: function (rootElementId, newValue) {
-		var $root = $('#'+rootElementId);
+		var $root = $('#' + rootElementId);
 		var $editable = $('.editable', $root);
 		$('.editable-inputs', $root).remove();
 		if (newValue) {
 			$editable.text(newValue);
 		}
 		$editable.show();
-		ajax.clearActionState( ajax.params[rootElementId].action );
+		ajax.clearActionState(ajax.params[rootElementId].action);
 		ajax.params[rootElementId].submit = false;
 		$root.addClass('editable-container');
 	}
 };
 
-$(document).ready(function(){
+$(document).ready(function () {
 	// Setup ajax-loading box
-	$("#ajax-loading").ajaxStart(function(){
+	$("#ajax-loading").ajaxStart(function () {
 		$("#ajax-error").hide();
 		$(this).show();
 		ajax.setStatusBoxPosition($(this));
 	});
-	$("#ajax-loading").ajaxStop(function(){ $(this).hide(); });
+	$("#ajax-loading").ajaxStop(function () {
+		$(this).hide();
+	});
 
 	// Setup ajax-error box
-	$("#ajax-error").ajaxError(function(req, xml){
+	$("#ajax-error").ajaxError(function (req, xml) {
 		var status = xml.status;
 		var text = xml.statusText;
 		if (status == 200) {
@@ -459,19 +462,19 @@ $(document).ready(function(){
 			text = 'неверный формат данных';
 		}
 		$(this).html(
-			"Ошибка в: <i>"+ ajax.url +"</i><br /><b>"+ status +" "+ text +"</b>"
+			"Ошибка в: <i>" + ajax.url + "</i><br /><b>" + status + " " + text + "</b>"
 		).show();
 		ajax.setStatusBoxPosition($(this));
 	});
 
 	// Bind ajax events
-	$('var.ajax-params').each(function(){
+	$('var.ajax-params').each(function () {
-		var params = $.evalJSON( $(this).html() );
+		var params = $.evalJSON($(this).html());
 		params.event = params.event || 'dblclick';
 		ajax.params[params.id] = params;
-		$("#"+params.id).bind(params.event, ajax.callInitFn);
+		$("#" + params.id).bind(params.event, ajax.callInitFn);
 		if (params.event == 'click' || params.event == 'dblclick') {
-			$("#"+params.id).addClass('editable-container');
+			$("#" + params.id).addClass('editable-container');
 		}
 	});
 });
@@ -497,8 +500,8 @@ var autocomplete = function (noCenter) {
 
 	if (!noCenter) {
 		$("div#autocomplete_popup").css({
-			left:_popup_left + "px",
+			left: _popup_left + "px",
-			top:_popup_top + "px"
+			top: _popup_top + "px"
 		}).show(1000);
 	} else {
 		$("div#autocomplete_popup").show(1000);
@@ -510,7 +513,7 @@ var autocomplete = function (noCenter) {
 };
 
 $(document).ready(function () {
-	$("span#autocomplete").click(function() {
+	$("span#autocomplete").click(function () {
 		autocomplete();
 	});
 

upload/posting.php

@@ -181,15 +181,14 @@ if ($post_info = DB()->fetch_row($sql))
 		// Can this user edit/delete the post?
 		if ($post_info['poster_id'] != $userdata['user_id'] && !$is_auth['auth_mod'])
 		{
-			$message = ($delete || $mode == 'delete') ? $lang['DELETE_OWN_POSTS'] : $lang['EDIT_OWN_POSTS'];
+			$auth_err = ($delete || $mode == 'delete') ? $lang['DELETE_OWN_POSTS'] : $lang['EDIT_OWN_POSTS'];
 		}
 		elseif (!$post_data['last_post'] && !$is_auth['auth_mod'] && ($mode == 'delete' || $delete))
 		{
-			$message = $lang['CANNOT_DELETE_REPLIED'];
+			$auth_err = $lang['CANNOT_DELETE_REPLIED'];
 		}
 
-		set_die_append_msg($forum_id, $topic_id);
+		if (isset($auth_err)) bb_die($auth_err);
-		if(isset($message)) bb_die($message);
 	}
 	else
 	{

upload/templates/default/css/main.css

@@ -289,10 +289,10 @@ a.postLink-name, a.postLink-name:visited { text-decoration: none; }
  * ---------------------------------- */
 .infobox {
 	border: 1px #B7C0C5 solid; background: #EFEFEF; padding: 1px;
-	}
+}
-	.infobox h1 {
+.infobox h1 {
 	background: #D1D7DC; font-size: 1.2em; padding: 0 0.6em 2px;
-	}
+}
 /* ---------------------------------- *
      Inputs, buttons, forms
  * ---------------------------------- */
@@ -882,6 +882,9 @@ fieldset.attach { width: 95%; margin: 14px auto; padding: 2px; clear: both; }
 a.tr-dl, a.dl-link:link { font-weight: bold; }
 a.dl-link { font-size: 13px; text-decoration: none; }
 a.tr-dl:visited, a.f-dl:visited, a.dl-link:visited { color: #5493B4; font-weight: normal; }
+.a-hash { color: #000066 !important; cursor: pointer; }
+.a-hash:hover { color: #DD6900 !important; text-decoration: underline !important; }
+.a-hash:active, .a-hash:focus { color: #DD6900 !important; text-decoration: underline !important; }
 
 .seed-leech { padding-left: 1px; padding-right: 0; }
 .tr_tm { margin-top: 2px; font-size: 10px; color: #676767; }

upload/templates/default/page_header.tpl

@@ -309,15 +309,16 @@ $(document).ready(function() {
 	<td width="40%">
 		{L_USER_WELCOME}&nbsp;<b class="med">{THIS_USER}</b>&nbsp;[ <a href="{U_LOGIN_LOGOUT}" onclick="return confirm('{L_CONFIRM_LOGOUT}');">{L_LOGOUT}</a> ]
 	</td>
-	<td style="padding: 2px;">
+	<td style="padding: 3px;">
 		<div>
-			<form id="quick-search" action="" method="post" onsubmit="$(this).attr('action', $('#search-action').val());">
+			<form id="quick-search" action="" method="post" onsubmit="$(this).attr('action', $('#search-action').val()); if($('#search-action option:selected').attr('class') == 'hash') $('#search-text').attr('name', 'hash');">
 				<input type="hidden" name="max" value="1" />
 				<input type="hidden" name="to" value="1" />
 				<input id="search-text" type="text" name="nm" placeholder="{L_SEARCH_S}" required />
 				<select id="search-action">
 					<option value="tracker.php#results" selected="selected"> {L_TRACKER_S} </option>
 					<option value="search.php"> {L_FORUM_S} </option>
+					<option value="tracker.php" class="hash"> {L_HASH_S} </option>
 				</select>
 				<input type="submit" class="med" value="{L_SEARCH}" style="width: 55px;" />
 			</form>

upload/templates/default/tracker.tpl

@@ -267,10 +267,10 @@ $(function(){
 				</div>
 				</fieldset>
 				<fieldset>
-				<legend>{L_TITLE_MATCH}</legend>
+				<legend><span class="a-hash bold" onclick="$(this).addClass('bold').next().removeClass('bold'); $('#title_search').attr('name','{TITLE_MATCH_NAME}');">{L_TITLE_MATCH}</span>&nbsp;&middot;&nbsp;<span class="a-hash" onclick="$(this).addClass('bold').prev().removeClass('bold'); $('#title_search').attr('name','hash');">{L_HASH_S}</span></legend>
 				<div>
 					<p class="input">
-						<input style="width: 95%;" class="post" type="text" size="50" maxlength="{TITLE_MATCH_MAX}" name="{TITLE_MATCH_NAME}" value="{TITLE_MATCH_VAL}" />
+						<input id="title_search" style="width: 95%;" class="post" type="text" size="50" maxlength="{TITLE_MATCH_MAX}" name="{TITLE_MATCH_NAME}" value="{TITLE_MATCH_VAL}" />
 					</p>
 					<p class="chbox med">
 						{ALL_WORDS_CHBOX}

upload/templates/default/viewforum.tpl

@@ -313,10 +313,10 @@ td.topic_id { cursor: pointer; }
 <!-- IF SHOW_SUBFORUMS -->
 <table class="forumline forum">
 <col class="row1">
-<col class="row1" width="60%">
+<col class="row1" width="65%">
 <col class="row2" width="10%">
 <col class="row2" width="10%">
-<col class="row2" width="20%">
+<col class="row2" width="15%">
 <tr>
 	<th colspan="2">{L_FORUM}</th>
 	<th>{L_TOPICS}</th>
@@ -434,10 +434,10 @@ td.topic_id { cursor: pointer; }
 <table class="forumline forum" id="forum-table">
 <col class="row1">
 <col class="row1">
-<col class="row1" width="70%">
+<col class="row1" width="75%">
 <col class="row2" width="5%">
 <col class="row2" width="5%">
-<col class="row2" width="20%">
+<col class="row2" width="15%">
 <tr>
 	<th colspan="3">{L_TOPICS}</th>
 	<th>{L_TORRENT}</th>

upload/templates/default/viewtopic_attach.tpl

@@ -158,8 +158,9 @@
 	<tr class="row1">
 		<td width="15%">{L_TORRENT}:</td>
 		<td width="70%">
-			{postrow.attach.tor_reged.TRACKER_LINK} &nbsp;
+			{postrow.attach.tor_reged.TRACKER_LINK}
 			[ <span title="{postrow.attach.tor_reged.REGED_DELTA}">{postrow.attach.tor_reged.REGED_TIME}</span> ]
+			&#0183; {postrow.attach.tor_reged.HASH}
 		</td>
 		<td width="15%" rowspan="4" class="tCenter pad_6">
 			<!-- IF postrow.attach.tor_reged.TOR_FROZEN -->
@@ -231,8 +232,8 @@
 		<td colspan="3">
 		<script type="text/javascript">
 		ajax.callback.change_torrent = function(data) {
-		    if(data.title) alert(data.title);
+			if (data.title) alert(data.title);
-		    if(data.url) document.location.href = data.url;
+			if (data.url) document.location.href = data.url;
 		};
 		</script>
 		<!-- IF TOR_CONTROLS -->
@@ -265,9 +266,7 @@
 				<!-- ENDIF -->
 				<!-- ENDIF -->
 			</select>
-
 			<a href="#" onclick="change_torrents($('#tor-{postrow.attach.tor_reged.ATTACH_ID} select').val()); return false;"><input type="submit" value="{L_EDIT}" class="liteoption" /></a>
-
 		<!-- ELSEIF TOR_HELP_LINKS -->
 		{TOR_HELP_LINKS}
 		<!-- ELSE -->

upload/tracker.php

@@ -245,6 +245,7 @@ $GPC = array(
 	's_not_seen'    => array('sns',      $search_all, SELECT),
 	'time'          => array('tm',       $search_all, SELECT),
 	'tor_type'      => array('tor_type', 0,           CHBOX),
+	'hash'          => array('hash',     null,        REQUEST),
 );
 
 // Define all GPC vars with default values
@@ -425,6 +426,11 @@ if (!$set_default)
 		}
 	}
 
+	if (isset($_REQUEST[$hash_key]))
+	{
+		hash_search($_REQUEST[$hash_key]);
+	}
+
 	if ($tm =& $_REQUEST[$title_match_key] AND is_string($tm))
 	{
 		if ($tmp = mb_substr(trim($tm), 0, $title_match_max_len))