From 9532c6feaf5fd3bc5e75fd56088b6de6334b34e7 Mon Sep 17 00:00:00 2001 From: nanosimbiot Date: Tue, 10 Apr 2012 01:59:07 +0000 Subject: [PATCH] r394 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit фикс магнет ссылок для гостей git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@394 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293 --- upload/config.php | 2 +- upload/includes/functions.php | 2 +- upload/language/lang_english/lang_admin.php | 4 +++- upload/language/lang_english/lang_main.php | 1 + upload/language/lang_russian/lang_admin.php | 2 ++ upload/language/lang_russian/lang_main.php | 3 ++- upload/templates/admin/admin_board.tpl | 2 +- upload/templates/admin/admin_bt_tracker_cfg.tpl | 2 +- upload/templates/default/tpl_config.php | 2 +- upload/viewforum.php | 6 ++++-- 10 files changed, 17 insertions(+), 9 deletions(-) diff --git a/upload/config.php b/upload/config.php index e76e06845..6809c197a 100644 --- a/upload/config.php +++ b/upload/config.php @@ -52,7 +52,7 @@ $bb_cfg = $tr_cfg = $page_cfg = array(); // Increase number of revision after update $bb_cfg['tp_version'] = '2.4 (RC)'; -$bb_cfg['tp_release_state'] = 'R393'; +$bb_cfg['tp_release_state'] = 'R394'; $bb_cfg['tp_release_date'] = '10-04-2012'; // Database diff --git a/upload/includes/functions.php b/upload/includes/functions.php index 57b84e50f..764b43a62 100644 --- a/upload/includes/functions.php +++ b/upload/includes/functions.php @@ -2723,7 +2723,7 @@ function pad_with_space ($str) function create_magnet($infohash, $auth_key, $logged_in) { global $bb_cfg, $userdata, $_GET; - $passkey_url = (!$logged_in || isset($_GET['no_passkey'])) ? '' : "?{$bb_cfg['passkey_key']}=$auth_key"; + $passkey_url = ((!$logged_in || isset($_GET['no_passkey'])) && $bb_cfg['bt_tor_browse_only_reg']) ? '' : "?{$bb_cfg['passkey_key']}=$auth_key"; return ''; } diff --git a/upload/language/lang_english/lang_admin.php b/upload/language/lang_english/lang_admin.php index 3fb85a02a..3d1ff5998 100644 --- a/upload/language/lang_english/lang_admin.php +++ b/upload/language/lang_english/lang_admin.php @@ -655,7 +655,7 @@ $lang['REPORTS'] = 'Reports'; // // Reports [END] // - + // // Mods // @@ -676,3 +676,5 @@ $lang['SEED_BONUS_RELEASE'] = 'to N-number of releases'; $lang['SEED_BONUS_POINTS'] = 'bonuses in an hour'; $lang['SEED_BONUS_TOR_SIZE'] = '

Minimum distribution for which will be awarded bonuses

If you want to calculate bonuses for all distribution, leave blank.
'; $lang['SEED_BONUS_USER_REGDATA'] = '

Minimum length of user tracker, after which will be awarded bonuses

If you want to accrue bonuses to all users, leave blank.
'; +$lang['SEED_BONUS_WARNING'] = 'ATTENTION! Seed Bonuses should be in ascending order'; + diff --git a/upload/language/lang_english/lang_main.php b/upload/language/lang_english/lang_main.php index 94478e538..de52a30d5 100644 --- a/upload/language/lang_english/lang_main.php +++ b/upload/language/lang_english/lang_main.php @@ -82,6 +82,7 @@ $lang['SKYPE_ERROR'] = 'You entered an invalid login'; $lang['FORUM_INDEX'] = '%s Forum Index'; // eg. sitename Forum Index, %s can be removed if you prefer $lang['POST_NEW_TOPIC'] = 'Post new topic'; +$lang['POST_NEW_RELEASE'] = 'Post new release'; $lang['POST_REGULAR_TOPIC'] = 'Post regular topic'; $lang['REPLY_TO_TOPIC'] = 'Reply to topic'; $lang['REPLY_WITH_QUOTE'] = 'Reply with quote'; diff --git a/upload/language/lang_russian/lang_admin.php b/upload/language/lang_russian/lang_admin.php index d70ca3580..c452e5ca8 100644 --- a/upload/language/lang_russian/lang_admin.php +++ b/upload/language/lang_russian/lang_admin.php @@ -674,3 +674,5 @@ $lang['SEED_BONUS_RELEASE'] = 'до N-числа релизов'; $lang['SEED_BONUS_POINTS'] = 'бонусов в час'; $lang['SEED_BONUS_TOR_SIZE'] = '

Минимальный размер раздачи, за который будут начисляться бонусы

Если хотите начислять бонусы за все раздачи, оставьте поле пустым.
'; $lang['SEED_BONUS_USER_REGDATA'] = '

Минимальный стаж пользователя на трекере, после которого будут начисляться бонусы

Если хотите начислять бонусы всем пользователям, оставьте поле пустым.
'; +$lang['SEED_BONUS_WARNING'] = 'ВНИМАНИЕ! Сид Бонусы должны быть в порядке возрастания'; + diff --git a/upload/language/lang_russian/lang_main.php b/upload/language/lang_russian/lang_main.php index 20d1244c6..c2f782979 100644 --- a/upload/language/lang_russian/lang_main.php +++ b/upload/language/lang_russian/lang_main.php @@ -85,6 +85,7 @@ $lang['SKYPE_ERROR'] = 'Вы ввели некорректный логин'; $lang['FORUM_INDEX'] = 'Список форумов %s'; $lang['POST_NEW_TOPIC'] = 'Начать новую тему'; +$lang['POST_NEW_RELEASE'] = 'Создать раздачу'; $lang['POST_REGULAR_TOPIC'] = 'Создать обычную тему'; $lang['REPLY_TO_TOPIC'] = 'Ответить на тему'; $lang['REPLY_WITH_QUOTE'] = 'Ответить с цитатой'; @@ -1614,7 +1615,7 @@ $lang['DELETE_USER_POSTS_ME'] = 'Вы действительно хотите у $lang['DELETE_USER_POSTS_CONFIRM'] = 'Вы действительно хотите удалить все сообщения пользователя, кроме заглавных?'; $lang['USER_DELETED_POSTS'] = 'Сообщения успешно удалены'; -$lang['USER'] = 'Пользователь'; +$lang['USER'] = 'Пользователь'; $lang['ROLE'] = 'Роль:'; $lang['MEMBERSHIP_IN'] = 'Членство в группах'; $lang['PARTY'] = 'Участник:'; diff --git a/upload/templates/admin/admin_board.tpl b/upload/templates/admin/admin_board.tpl index b3c00fd41..00c561bad 100644 --- a/upload/templates/admin/admin_board.tpl +++ b/upload/templates/admin/admin_board.tpl @@ -436,7 +436,7 @@ - ВНИМАНИЕ!!! Сид Бонусы должны быть в порядке возрастания + {L_SEED_BONUS_WARNING} diff --git a/upload/templates/admin/admin_bt_tracker_cfg.tpl b/upload/templates/admin/admin_bt_tracker_cfg.tpl index db84fb5b1..d28358279 100644 --- a/upload/templates/admin/admin_bt_tracker_cfg.tpl +++ b/upload/templates/admin/admin_bt_tracker_cfg.tpl @@ -52,7 +52,7 @@

{L_ALLOW_GUEST_DL}

{L_ALLOW_GUEST_DL_EXPL}
-   {L_NO} +   {L_NO}{L_YES} diff --git a/upload/templates/default/tpl_config.php b/upload/templates/default/tpl_config.php index 696b39ff0..251cdb77d 100644 --- a/upload/templates/default/tpl_config.php +++ b/upload/templates/default/tpl_config.php @@ -59,7 +59,7 @@ $images['post_new'] = $_lang .'post.gif'; $images['post_locked'] = $_lang .'reply-locked.gif'; $images['reply_new'] = $_lang .'reply.gif'; $images['reply_locked'] = $_lang .'reply-locked.gif'; -$images['relese_new'] = $_lang .'relese.gif'; +$images['release_new'] = $_lang .'release.gif'; // pm_icons $images['pm_inbox'] = $_main .'msg_inbox.gif'; diff --git a/upload/viewforum.php b/upload/viewforum.php index 941240699..8d41fc0fc 100644 --- a/upload/viewforum.php +++ b/upload/viewforum.php @@ -402,12 +402,14 @@ obtain_word_list($orig_word, $replacement_word); if($forum_data['allow_reg_tracker']) { $post_new_topic_url = "posting.php?mode=new_rel&f=$forum_id"; - $post_img = $images['relese_new']; + $post_img = $images['release_new']; + $post_new_topic = $lang['POST_NEW_RELEASE']; } else { $post_new_topic_url = "posting.php?mode=newtopic&f=$forum_id"; $post_img = $images['post_new']; + $post_new_topic = $lang['POST_NEW_TOPIC']; } // Post URL generation for templating vars @@ -451,7 +453,7 @@ $template->assign_vars(array( 'TITLE_MATCH' => htmlCHR($title_match), 'SELECT_TPP' => ($select_tpp) ? build_select('tpp', $select_tpp, $topics_per_page, null, null, 'onchange="$(\'#tpp\').submit();"') : '', - 'T_POST_NEW_TOPIC' => ($forum_data['forum_status'] == FORUM_LOCKED) ? $lang['FORUM_LOCKED'] : $lang['POST_NEW_TOPIC'], + 'T_POST_NEW_TOPIC' => ($forum_data['forum_status'] == FORUM_LOCKED) ? $lang['FORUM_LOCKED'] : $post_new_topic, 'S_AUTH_LIST' => $u_auth, 'U_VIEW_FORUM' => FORUM_URL . $forum_id, 'U_MARK_READ' => FORUM_URL . $forum_id ."&mark=topics",