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

r245

Browse source 
git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@245 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
This commit is contained in:
pherum83 2011-08-22 15:28:02 +00:00
commit 4a4168ed7e
14 changed files with 31 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
upload/ajax/posts.php
View file

@ -186,7 +186,7 @@ switch($this->request['type'])
<input type="button" value="Img" name="codeImg" title="'.$lang['IMG_TITLE'].'" style="width: 40px;" /> <input type="button" value="Img" name="codeImg" title="'.$lang['IMG_TITLE'].'" style="width: 40px;" />
<input type="button" value="'.$lang['URL'].'" name="codeUrl" title="'.$lang['URL_TITLE'].'" style="width: 63px; text-decoration: underline;" /><input type="hidden" name="codeUrl2" />&nbsp; <input type="button" value="'.$lang['URL'].'" name="codeUrl" title="'.$lang['URL_TITLE'].'" style="width: 63px; text-decoration: underline;" /><input type="hidden" name="codeUrl2" />&nbsp;
<input type="button" value="'.$lang['CODE'].'" name="codeCode" title="'.$lang['CODE_TITLE'].'" style="width: 43px;" /> <input type="button" value="'.$lang['CODE'].'" name="codeCode" title="'.$lang['CODE_TITLE'].'" style="width: 43px;" />
<input type="button" value="'.$lang['LIST'].'" name="codeList" title="'.$lang['LIST_TITLE'].'" style="width: 58px;" /> <input type="button" value="'.$lang['LIST'].'" name="codeList" title="'.$lang['LIST_TITLE'].'" style="width: 60px;" />
<input type="button" value="1." name="codeOpt" title="'.$lang['LIST_ITEM'].'" style="width: 30px;" />&nbsp; <input type="button" value="1." name="codeOpt" title="'.$lang['LIST_ITEM'].'" style="width: 30px;" />&nbsp;
<input type="button" value="'.$lang['QUOTE_SEL'].'" name="quoteselected" title="'.$lang['QUOTE_SELECTED'].'" onmouseout="bbcode.refreshSelection(false);" onmouseover="bbcode.refreshSelection(true);" onclick="bbcode.onclickQuoteSel();" />&nbsp; <input type="button" value="'.$lang['QUOTE_SEL'].'" name="quoteselected" title="'.$lang['QUOTE_SELECTED'].'" onmouseout="bbcode.refreshSelection(false);" onmouseover="bbcode.refreshSelection(true);" onclick="bbcode.onclickQuoteSel();" />&nbsp;

2
upload/config.php
View file

@ -57,7 +57,7 @@ $bb_cfg['css_ver'] = 1;
// Increase number of revision after update // Increase number of revision after update
$bb_cfg['tp_version'] = '2.1 Stable'; $bb_cfg['tp_version'] = '2.1 Stable';
$bb_cfg['tp_release_state'] = 'R244'; $bb_cfg['tp_release_state'] = 'R245';
$bb_cfg['tp_release_date'] = '22-08-2011'; $bb_cfg['tp_release_date'] = '22-08-2011';
$bb_cfg['board_disabled_msg'] = 'форум временно отключен'; // 'forums temporarily disabled'; // show this msg if board has been disabled via ON/OFF trigger $bb_cfg['board_disabled_msg'] = 'форум временно отключен'; // 'forums temporarily disabled'; // show this msg if board has been disabled via ON/OFF trigger

27
upload/includes/functions_torrent.php
View file

@ -29,7 +29,7 @@ function get_torrent_info ($attach_id)
if (!$torrent = DB()->fetch_row($sql)) if (!$torrent = DB()->fetch_row($sql))
{ {
message_die(GENERAL_ERROR, 'Invalid attach_id'); message_die(GENERAL_ERROR, $lang['INVALID_ATTACH_ID']);
} }
return $torrent; return $torrent;
@ -74,7 +74,7 @@ function tracker_unregister ($attach_id, $mode = '')
{ {
if (!$torrent) if (!$torrent)
{ {
message_die(GENERAL_ERROR, 'Torrent not found'); message_die(GENERAL_ERROR, $lang['TOR_NOT_FOUND']);
} }
if (!$torrent['tracker_status']) if (!$torrent['tracker_status'])
{ {
@ -165,15 +165,14 @@ function tracker_unregister ($attach_id, $mode = '')
function delete_torrent ($attach_id, $mode = '') function delete_torrent ($attach_id, $mode = '')
{ {
global $lang, $userdata; global $lang, $userdata, $reg_mode, $topic_id;
global $reg_mode, $topic_id;
$attach_id = intval($attach_id); $attach_id = intval($attach_id);
$reg_mode = $mode; $reg_mode = $mode;
if (!$torrent = get_torrent_info($attach_id)) if (!$torrent = get_torrent_info($attach_id))
{ {
message_die(GENERAL_ERROR, 'Torrent not found'); message_die(GENERAL_ERROR, $lang['TOR_NOT_FOUND']);
} }
$post_id = $torrent['post_id']; $post_id = $torrent['post_id'];
@ -202,7 +201,7 @@ function change_tor_status ($attach_id, $new_tor_status)
if (!$torrent = get_torrent_info($attach_id)) if (!$torrent = get_torrent_info($attach_id))
{ {
bb_die('Torrent not found'); bb_die($lang['TOR_NOT_FOUND']);
} }
$topic_id = $torrent['topic_id']; $topic_id = $torrent['topic_id'];
@ -226,13 +225,10 @@ function change_tor_type ($attach_id, $tor_status_gold)
if (!$torrent = get_torrent_info($attach_id)) if (!$torrent = get_torrent_info($attach_id))
{ {
bb_die('Torrent not found'); bb_die($lang['TOR_NOT_FOUND']);
} }
if (!(IS_MOD || IS_ADMIN)) if (!IS_AM) bb_die($lang['ONLY_FOR_MOD']);
{
bb_die($lang['ONLY_FOR_MOD']);
}
$topic_id = $torrent['topic_id']; $topic_id = $torrent['topic_id'];
$tor_status_gold = intval($tor_status_gold); $tor_status_gold = intval($tor_status_gold);
@ -255,15 +251,14 @@ function change_tor_type ($attach_id, $tor_status_gold)
function tracker_register ($attach_id, $mode = '') function tracker_register ($attach_id, $mode = '')
{ {
global $template, $attach_config, $bb_cfg, $lang, $return_message; global $template, $attach_config, $bb_cfg, $lang, $return_message, $reg_mode, $tr_cfg;
global $reg_mode, $tr_cfg;
$attach_id = intval($attach_id); $attach_id = intval($attach_id);
$reg_mode = $mode; $reg_mode = $mode;
if (!$torrent = get_torrent_info($attach_id)) if (!$torrent = get_torrent_info($attach_id))
{ {
bb_die('Torrent not found'); bb_die($lang['TOR_NOT_FOUND']);
} }
$post_id = $torrent['post_id']; $post_id = $torrent['post_id'];
@ -343,7 +338,7 @@ function tracker_register ($attach_id, $mode = '')
if (!@$info['name'] || !@$info['piece length'] || !@$info['pieces'] || strlen($info['pieces']) % 20 != 0) if (!@$info['name'] || !@$info['piece length'] || !@$info['pieces'] || strlen($info['pieces']) % 20 != 0)
{ {
torrent_error_exit('Invalid torrent file'); torrent_error_exit($lang['TORFILE_INVALID']);
} }
$info_hash = pack('H*', sha1(bencode($info))); $info_hash = pack('H*', sha1(bencode($info)));
@ -380,7 +375,7 @@ function tracker_register ($attach_id, $mode = '')
} }
else else
{ {
torrent_error_exit('Invalid torrent file'); torrent_error_exit($lang['TORFILE_INVALID']);
} }
$reg_time = TIMENOW; $reg_time = TIMENOW;

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

@ -478,8 +478,9 @@ $lang['RANKS_TITLE'] = 'Rank Administration';
$lang['RANKS_EXPLAIN'] = 'Using this form you can add, edit, view and delete ranks. You can also create custom ranks which can be applied to a user via the user management facility'; $lang['RANKS_EXPLAIN'] = 'Using this form you can add, edit, view and delete ranks. You can also create custom ranks which can be applied to a user via the user management facility';
$lang['ADD_NEW_RANK'] = 'Add new rank'; $lang['ADD_NEW_RANK'] = 'Add new rank';
$lang['RANK_TITLE'] = 'Rank Title'; $lang['RANK_TITLE'] = 'Rank Title';
$lang['STYLE_COLOR'] = 'Style rank';
$lang['STYLE_COLOR_FAQ'] = 'Specify class for painting at the title of the desired color. For example <i class="bold">colorAdmin<i>';
$lang['RANK_SPECIAL'] = 'Set as Special Rank'; $lang['RANK_SPECIAL'] = 'Set as Special Rank';
$lang['RANK_MINIMUM'] = 'Minimum Posts'; $lang['RANK_MINIMUM'] = 'Minimum Posts';
$lang['RANK_MAXIMUM'] = 'Maximum Posts'; $lang['RANK_MAXIMUM'] = 'Maximum Posts';

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

@ -12,6 +12,8 @@ $lang['TRANSLATION_INFO'] = '';
// //
$lang['FORUM'] = 'Forum'; $lang['FORUM'] = 'Forum';
$lang['CATEGORY'] = 'Category'; $lang['CATEGORY'] = 'Category';
$lang['HIDE_CAT'] = 'Hide categories';
$lang['HIDE_CAT_MESS'] = 'Part categories hidden <a class="menu-root" href="#only-new-options">options Show</a> <span class="small"> &middot; <a class="small" href="index.php?sh=1">Show All</a>';
$lang['TOPIC'] = 'Topic'; $lang['TOPIC'] = 'Topic';
$lang['TOPICS'] = 'Topics'; $lang['TOPICS'] = 'Topics';
$lang['TOPICS_SHORT'] = 'Topics'; $lang['TOPICS_SHORT'] = 'Topics';

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

@ -478,8 +478,9 @@ $lang['RANKS_TITLE'] = 'Управление званиями';
$lang['RANKS_EXPLAIN'] = 'Здесь вы можете добавлять, редактировать, просматривать и удалять звания. Вы также можете создавать специальные звания, которые могут затем быть присвоены пользователям на странице управления пользователями.'; $lang['RANKS_EXPLAIN'] = 'Здесь вы можете добавлять, редактировать, просматривать и удалять звания. Вы также можете создавать специальные звания, которые могут затем быть присвоены пользователям на странице управления пользователями.';
$lang['ADD_NEW_RANK'] = 'Новое звание'; $lang['ADD_NEW_RANK'] = 'Новое звание';
$lang['RANK_TITLE'] = 'Звание'; $lang['RANK_TITLE'] = 'Звание';
$lang['STYLE_COLOR'] = 'Стиль звания';
$lang['STYLE_COLOR_FAQ'] = 'Укажите class для окраски звания в нужный цвет. Например <i class="bold">colorAdmin<i>';
$lang['RANK_SPECIAL'] = 'Специальное звание'; $lang['RANK_SPECIAL'] = 'Специальное звание';
$lang['RANK_MINIMUM'] = 'Минимум сообщений'; $lang['RANK_MINIMUM'] = 'Минимум сообщений';
$lang['RANK_MAXIMUM'] = 'Максимум сообщений'; $lang['RANK_MAXIMUM'] = 'Максимум сообщений';

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

@ -17,6 +17,8 @@ $lang['TRANSLATION_INFO'] = '';
// //
$lang['FORUM'] = 'Форум'; $lang['FORUM'] = 'Форум';
$lang['CATEGORY'] = 'Категория'; $lang['CATEGORY'] = 'Категория';
$lang['HIDE_CAT'] = 'Скрыть категории';
$lang['HIDE_CAT_MESS'] = 'Часть категорий скрыта <a class="menu-root" href="#only-new-options">Опциями показа</a> <span class="small"> &middot; <a class="small" href="index.php?sh=1">Показать все</a>';
$lang['TOPIC'] = 'Тема'; $lang['TOPIC'] = 'Тема';
$lang['TOPICS'] = 'Темы'; $lang['TOPICS'] = 'Темы';
$lang['TOPICS_SHORT'] = 'Тем'; $lang['TOPICS_SHORT'] = 'Тем';

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

@ -48,7 +48,7 @@ function toggle_cat_list (val)
</tr> </tr>
<tr id="show_on_index" class="{SHOW_ON_INDEX_CLASS}"> <tr id="show_on_index" class="{SHOW_ON_INDEX_CLASS}">
<td class="row1">{L_SF_SHOW_ON_INDEX}</td> <td class="row1">{L_SF_SHOW_ON_INDEX}</td>
<td class="row2"><label for="show_on_index1"><input type="radio" name="show_on_index" id="show_on_index1" value="1" <!-- IF SHOW_ON_INDEX == 1 -->checked="checked"<!-- ENDIF --> /> Yes&nbsp;</label><label for="show_on_index2">&nbsp;<input type="radio" name="show_on_index" id="show_on_index2" value="0" <!-- IF SHOW_ON_INDEX == 0 -->checked="checked"<!-- ENDIF --> /> No &nbsp;</label></td> <td class="row2"><label for="show_on_index1"><input type="radio" name="show_on_index" id="show_on_index1" value="1" <!-- IF SHOW_ON_INDEX == 1 -->checked="checked"<!-- ENDIF --> /> {L_YES}&nbsp;</label><label for="show_on_index2">&nbsp;<input type="radio" name="show_on_index" id="show_on_index2" value="0" <!-- IF SHOW_ON_INDEX == 0 -->checked="checked"<!-- ENDIF --> /> {L_NO} &nbsp;</label></td>
</tr> </tr>
<tr> <tr>
<td class="row1">{L_FORUM_STATUS}</td> <td class="row1">{L_FORUM_STATUS}</td>

8
upload/templates/admin/admin_ranks.tpl
View file

@ -23,19 +23,19 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td width="40%"><h4>Style</h4></td> <td width="40%"><h4>{L_STYLE_COLOR}</h4><br />
<h6>{L_STYLE_COLOR_FAQ}</h6>
<td> <td>
<input class="post" type="text" name="style" size="60" maxlength="40" value="{STYLE}" /> <input class="post" type="text" name="style" size="60" maxlength="40" value="{STYLE}" />
</td> </td>
</tr> </tr>
<tr> <tr>
<td valign="top"><h4>{L_RANK_IMAGE}:</h4></td> <td valign="top"><h4>{L_RANK_IMAGE}:</h4><br />
<h6>{L_RANK_IMAGE_EXPLAIN}</h6></td>
<td> <td>
<input class="post" type="text" name="rank_image" size="60" maxlength="255" value="{IMAGE}" /> <input class="post" type="text" name="rank_image" size="60" maxlength="255" value="{IMAGE}" />
<br /><br /> <br /><br />
{IMAGE_DISPLAY} {IMAGE_DISPLAY}
<br /><br />
<h6>{L_RANK_IMAGE_EXPLAIN}</h6>
</td> </td>
</tr> </tr>
<tr> <tr>

2
upload/templates/default/index.tpl
View file

@ -49,7 +49,7 @@
<!-- IF SHOW_FORUMS --> <!-- IF SHOW_FORUMS -->
<!-- IF H_C_AL_MESS --> <!-- IF H_C_AL_MESS -->
<div class="row1 med tCenter pad_4 border bw_TRBL">Часть категорий скрыта "опциями показа" <span class="small">(<a class="small" href="index.php?sh=1">Показать все</a>)</span></div> <div class="row1 med tCenter pad_4 border bw_TRBL">{L_HIDE_CAT_MESS}</span></div>
<div class="cat_separator"></div> <div class="cat_separator"></div>
<!-- ENDIF --> <!-- ENDIF -->

2
upload/templates/default/page_header.tpl
View file

@ -475,7 +475,7 @@ function go_to_page ()
</fieldset> </fieldset>
<!-- IF USER_HIDE_CAT --> <!-- IF USER_HIDE_CAT -->
<fieldset id="user_hide_cat"> <fieldset id="user_hide_cat">
<legend>Скрыть категории</legend> <legend>{L_HIDE_CAT}</legend>
<div id="h-cat-ctl" class="pad_4 nowrap"> <div id="h-cat-ctl" class="pad_4 nowrap">
<form autocomplete="off"> <form autocomplete="off">
<!-- BEGIN h_c --> <!-- BEGIN h_c -->

2
upload/templates/default/posting_editor.tpl
View file

@ -88,7 +88,7 @@ ajax.callback.posts = function(data){
<input type="button" value="Img" name="codeImg" title="{L_IMG_TITLE}" style="width: 40px;" /> <input type="button" value="Img" name="codeImg" title="{L_IMG_TITLE}" style="width: 40px;" />
<input type="button" value="{L_URL}" name="codeUrl" title="{L_URL_TITLE}" text-decoration: underline;" style="width: 63px;"/><input type="hidden" name="codeUrl2" />&nbsp; <input type="button" value="{L_URL}" name="codeUrl" title="{L_URL_TITLE}" text-decoration: underline;" style="width: 63px;"/><input type="hidden" name="codeUrl2" />&nbsp;
<input type="button" value="{L_CODE}" name="codeCode" title="{L_CODE_TITLE}" style="width: 43px;" /> <input type="button" value="{L_CODE}" name="codeCode" title="{L_CODE_TITLE}" style="width: 43px;" />
<input type="button" value="{L_LIST}" name="codeList" title="{L_LIST_TITLE}" style="width: 58px;"/> <input type="button" value="{L_LIST}" name="codeList" title="{L_LIST_TITLE}" style="width: 60px;"/>
<input type="button" value="1." name="codeOpt" title="{L_LIST_ITEM}" style="width: 30px;" />&nbsp; <input type="button" value="1." name="codeOpt" title="{L_LIST_ITEM}" style="width: 30px;" />&nbsp;
<input type="button" value="{L_QUOTE_SEL}" name="quoteselected" title="{L_QUOTE_SELECTED}" onmouseout="bbcode.refreshSelection(false);" onmouseover="bbcode.refreshSelection(true);" onclick="bbcode.onclickQuoteSel();" />&nbsp; <input type="button" value="{L_QUOTE_SEL}" name="quoteselected" title="{L_QUOTE_SELECTED}" onmouseout="bbcode.refreshSelection(false);" onmouseover="bbcode.refreshSelection(true);" onclick="bbcode.onclickQuoteSel();" />&nbsp;

2
upload/templates/default/viewforum.tpl
View file

@ -434,7 +434,7 @@ td.topic_id { cursor: pointer; }
<td style="padding: 2px 5px 3px 3px;" class="tt"> <td style="padding: 2px 5px 3px 3px;" class="tt">
<div class="torTopic"> <div class="torTopic">
<!-- IF t.TOR_STATUS_ICON --><span id="status-{t.TOPIC_ID}">{t.TOR_STATUS_ICON}</span>&#0183;<!-- ENDIF --> <!-- IF t.TOR_STATUS_ICON --><span id="status-{t.TOPIC_ID}" title="{t.TOR_STATUS_TEXT}">{t.TOR_STATUS_ICON}</span>&#0183;<!-- ENDIF -->
<!-- IF t.IS_UNREAD --><a href="{TOPIC_URL}{t.HREF_TOPIC_ID}{NEWEST_URL}">{ICON_NEWEST_REPLY}</a><!-- ENDIF --> <!-- IF t.IS_UNREAD --><a href="{TOPIC_URL}{t.HREF_TOPIC_ID}{NEWEST_URL}">{ICON_NEWEST_REPLY}</a><!-- ENDIF -->
<!-- IF t.STATUS == MOVED --><span class="topicMoved">{L_TOPIC_MOVED}</span> <!-- IF t.STATUS == MOVED --><span class="topicMoved">{L_TOPIC_MOVED}</span>
<!-- ELSEIF t.DL_CLASS --><span class="{t.DL_CLASS} iconDL"><b>{L_TOPIC_DL}</b></span> <!-- ELSEIF t.DL_CLASS --><span class="{t.DL_CLASS} iconDL"><b>{L_TOPIC_DL}</b></span>

1
upload/viewforum.php
View file

@ -544,6 +544,7 @@ foreach ($topic_rowset as $topic)
'TOR_TYPE' => $is_gold, 'TOR_TYPE' => $is_gold,
'TOR_STATUS_ICON' => isset($topic['tor_status']) ? $bb_cfg['tor_icons'][$topic['tor_status']] : '', 'TOR_STATUS_ICON' => isset($topic['tor_status']) ? $bb_cfg['tor_icons'][$topic['tor_status']] : '',
'TOR_STATUS_TEXT' => isset($topic['tor_status']) ? $lang['TOR_STATUS_NAME'][$topic['tor_status']] : '',
'ATTACH' => $topic['topic_attachment'], 'ATTACH' => $topic['topic_attachment'],
'STATUS' => $topic['topic_status'], 'STATUS' => $topic['topic_status'],