github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-08-21 22:03:49 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

r394

Browse source 
фикс магнет ссылок для гостей git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@394 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
This commit is contained in:
nanosimbiot 2012-04-10 01:59:07 +00:00
commit 9532c6feaf
10 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
upload/config.php
View file

@ -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

2
upload/includes/functions.php
View file

@ -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 '<a href="magnet:?xt=urn:btih:'. bin2hex($infohash) .'&tr='. urlencode($bb_cfg['bt_announce_url'] . $passkey_url) .'"><img src="images/magnet.png" width="12" height="12" border="0" /></a>';
}

2
upload/language/lang_english/lang_admin.php
View file

@ -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'] = '<h4>Minimum distribution for which will be awarded bonuses </h4> <h6> If you want to calculate bonuses for all distribution, leave blank. </h6>';
$lang['SEED_BONUS_USER_REGDATA'] = '<h4>Minimum length of user tracker, after which will be awarded bonuses </h4> <h6> If you want to accrue bonuses to all users, leave blank. </h6>';
$lang['SEED_BONUS_WARNING'] = 'ATTENTION! Seed Bonuses should be in ascending order';

1
upload/language/lang_english/lang_main.php
View file

@ -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';

2
upload/language/lang_russian/lang_admin.php
View file

@ -674,3 +674,5 @@ $lang['SEED_BONUS_RELEASE'] = 'до N-числа релизов';
$lang['SEED_BONUS_POINTS'] = 'бонусов в час';
$lang['SEED_BONUS_TOR_SIZE'] = '<h4>Минимальный размер раздачи, за который будут начисляться бонусы</h4><h6>Если хотите начислять бонусы за все раздачи, оставьте поле пустым.</h6>';
$lang['SEED_BONUS_USER_REGDATA'] = '<h4>Минимальный стаж пользователя на трекере, после которого будут начисляться бонусы</h4><h6>Если хотите начислять бонусы всем пользователям, оставьте поле пустым.</h6>';
$lang['SEED_BONUS_WARNING'] = 'ВНИМАНИЕ! Сид Бонусы должны быть в порядке возрастания';

1
upload/language/lang_russian/lang_main.php
View file

@ -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'] = 'Ответить с цитатой';

2
upload/templates/admin/admin_board.tpl
View file

@ -436,7 +436,7 @@
</td>
</tr>
<tr class="row3 med">
<td class="bold tCenter warnColor1" colspan="2">ВНИМАНИЕ!!! Сид Бонусы должны быть в порядке возрастания</td>
<td class="bold tCenter warnColor1" colspan="2">{L_SEED_BONUS_WARNING}</td>
</tr>
<!-- BEGIN seed_bonus -->
<tr id="seed_bonus_{seed_bonus.RELEASE}">

2
upload/templates/admin/admin_bt_tracker_cfg.tpl
View file

@ -52,7 +52,7 @@
</tr>
<tr>
<td><h4>{L_ALLOW_GUEST_DL}</h4><!-- IF L_ALLOW_GUEST_DL_EXPL --><h6>{L_ALLOW_GUEST_DL_EXPL}</h6><!-- ENDIF --></td>
<td><span class="gen">&nbsp; {L_NO}</td>
<td><span class="gen">&nbsp; <!-- IF $bb_cfg['bt_tor_browse_only_reg'] -->{L_NO}<!-- ELSE -->{L_YES}<!-- ENDIF --></td>
</tr>
<tr>

2
upload/templates/default/tpl_config.php
View file

@ -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';

6
upload/viewforum.php
View file

@ -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&amp;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&amp;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 ."&amp;mark=topics",