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

Merge branch 'develop' into feature/atom

Browse source
This commit is contained in:
Exile 2014-08-12 22:24:00 +04:00
commit 12db8b3b5f
11 changed files with 42 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -25,14 +25,14 @@ TorrentPier II - движок торрент-трекера, написанны
- atom - atom
- cache - cache
- cache/filecache - cache/filecache
- files
- files/thumbs
- images - images
- images/avatars - images/avatars
- images/captcha - images/captcha
- images/ranks - images/ranks
- images/smiles - images/smiles
- log - log
- old_files
- old_files/thumbs
- sitemap - sitemap
- triggers - triggers

2
install/sql/mysql.sql
View file

@ -114,7 +114,7 @@ CREATE TABLE IF NOT EXISTS `bb_attachments_config` (
-- Дамп данных таблицы `bb_attachments_config` -- Дамп данных таблицы `bb_attachments_config`
-- --
INSERT INTO `bb_attachments_config` VALUES ('upload_dir', 'files'); INSERT INTO `bb_attachments_config` VALUES ('upload_dir', 'old_files');
INSERT INTO `bb_attachments_config` VALUES ('upload_img', 'images/icon_clip.gif'); INSERT INTO `bb_attachments_config` VALUES ('upload_img', 'images/icon_clip.gif');
INSERT INTO `bb_attachments_config` VALUES ('topic_icon', 'images/icon_clip.gif'); INSERT INTO `bb_attachments_config` VALUES ('topic_icon', 'images/icon_clip.gif');
INSERT INTO `bb_attachments_config` VALUES ('display_order', '0'); INSERT INTO `bb_attachments_config` VALUES ('display_order', '0');

10
upload/includes/torrent_show_dl_list.php
View file

@ -90,10 +90,11 @@ if ($show_dl_list)
$dl_cat[$i] = "<span class=$desc>". $dl_cat[$i] .'</span>'; $dl_cat[$i] = "<span class=$desc>". $dl_cat[$i] .'</span>';
$template->assign_block_vars('dl_users.users_row', array( $template->assign_block_vars('dl_users.users_row', array(
'DL_OPTION_NAME' => $lang[strtoupper($desc) .'_2'], 'DL_OPTION_NAME' => $lang[strtoupper($desc)],
'DL_OPTION_USERS' => $dl_cat[$i], 'DL_OPTION_USERS' => $dl_cat[$i],
'DL_COUNT' => $dl_count[$i], 'DL_COUNT' => $dl_count[$i],
'DL_USERS_DIV_STYLE' => $dl_users_div_style)); 'DL_USERS_DIV_STYLE' => $dl_users_div_style,
));
} }
else if ($dl_count[$i] && $count_mode) else if ($dl_count[$i] && $count_mode)
{ {
@ -102,8 +103,9 @@ if ($show_dl_list)
continue; continue;
} }
$template->assign_block_vars('dl_counts.count_row', array( $template->assign_block_vars('dl_counts.count_row', array(
'DL_OPTION_NAME' => $lang[strtoupper($desc) .'_2'], 'DL_OPTION_NAME' => $lang[strtoupper($desc)],
'DL_OPTION_USERS' => $dl_count[$i])); 'DL_OPTION_USERS' => $dl_count[$i],
));
} }
} }
} }

2
upload/index.php
View file

@ -280,7 +280,7 @@ foreach ($cat_forums as $cid => $c)
$template->assign_vars(array( $template->assign_vars(array(
'SHOW_FORUMS' => $forums_count, 'SHOW_FORUMS' => $forums_count,
'SHOW_MAP' => isset($_GET['map']), 'SHOW_MAP' => (isset($_GET['map']) && !IS_GUEST),
'PAGE_TITLE' => ($viewcat) ? $cat_title_html[$viewcat] : $lang['HOME'], 'PAGE_TITLE' => ($viewcat) ? $cat_title_html[$viewcat] : $lang['HOME'],
'NO_FORUMS_MSG' => ($only_new) ? $lang['NO_NEW_POSTS'] : $lang['NO_FORUMS'], 'NO_FORUMS_MSG' => ($only_new) ? $lang['NO_NEW_POSTS'] : $lang['NO_FORUMS'],

16
upload/language/en/main.php
View file

@ -1257,10 +1257,10 @@ $lang['BT_2_WEEKS'] = '2 weeks';
$lang['BT_1_MONTH'] = 'month'; $lang['BT_1_MONTH'] = 'month';
$lang['DL_LIST_AND_TORRENT_ACTIVITY'] = 'DL-List and Torrent activity'; $lang['DL_LIST_AND_TORRENT_ACTIVITY'] = 'DL-List and Torrent activity';
$lang['DL_WILL'] = 'Will download'; $lang['DLWILL'] = 'Will download';
$lang['DL_DOWN'] = 'Downloading'; $lang['DLDOWN'] = 'Downloading';
$lang['DL_COMPLETE'] = 'Complete'; $lang['DLCOMPLETE'] = 'Complete';
$lang['DL_CANCEL'] = 'Cancel'; $lang['DLCANCEL'] = 'Cancel';
$lang['DL_LIST_DEL'] = 'Clear DL-List'; $lang['DL_LIST_DEL'] = 'Clear DL-List';
$lang['DL_LIST_DEL_CONFIRM'] = 'Delete DL-List for this topic?'; $lang['DL_LIST_DEL_CONFIRM'] = 'Delete DL-List for this topic?';
@ -2601,10 +2601,10 @@ $lang['BT_SHOW_DL_LIST'] = 'Show DL-List in Download topics';
$lang['BT_DL_LIST_ONLY_1ST_PAGE'] = 'Show DL-List only on first page in topics'; $lang['BT_DL_LIST_ONLY_1ST_PAGE'] = 'Show DL-List only on first page in topics';
$lang['BT_DL_LIST_ONLY_COUNT'] = 'Show only number of users'; $lang['BT_DL_LIST_ONLY_COUNT'] = 'Show only number of users';
$lang['BT_SHOW_DL_LIST_BUTTONS'] = 'Show buttons for manually changing DL-status'; $lang['BT_SHOW_DL_LIST_BUTTONS'] = 'Show buttons for manually changing DL-status';
$lang['BT_SHOW_DL_BUT_WILL'] = $lang['DL_WILL']; $lang['BT_SHOW_DL_BUT_WILL'] = $lang['DLWILL'];
$lang['BT_SHOW_DL_BUT_DOWN'] = $lang['DL_DOWN']; $lang['BT_SHOW_DL_BUT_DOWN'] = $lang['DLDOWN'];
$lang['BT_SHOW_DL_BUT_COMPL'] = $lang['DL_COMPLETE']; $lang['BT_SHOW_DL_BUT_COMPL'] = $lang['DLCOMPLETE'];
$lang['BT_SHOW_DL_BUT_CANCEL'] = $lang['DL_CANCEL']; $lang['BT_SHOW_DL_BUT_CANCEL'] = $lang['DLCANCEL'];
$lang['BT_ADD_AUTH_KEY_HEAD'] = 'Passkey'; $lang['BT_ADD_AUTH_KEY_HEAD'] = 'Passkey';
$lang['BT_ADD_AUTH_KEY'] = 'Enable adding passkey to the torrent-files before downloading'; $lang['BT_ADD_AUTH_KEY'] = 'Enable adding passkey to the torrent-files before downloading';

16
upload/language/ru/main.php
View file

@ -1257,10 +1257,10 @@ $lang['BT_2_WEEKS'] = '2 недели';
$lang['BT_1_MONTH'] = 'месяц'; $lang['BT_1_MONTH'] = 'месяц';
$lang['DL_LIST_AND_TORRENT_ACTIVITY'] = 'Статистика раздачи'; $lang['DL_LIST_AND_TORRENT_ACTIVITY'] = 'Статистика раздачи';
$lang['DL_WILL'] = 'Буду качать'; $lang['DLWILL'] = 'Буду качать';
$lang['DL_DOWN'] = 'Качаю'; $lang['DLDOWN'] = 'Качаю';
$lang['DL_COMPLETE'] = 'Скачал'; $lang['DLCOMPLETE'] = 'Скачал';
$lang['DL_CANCEL'] = 'Отмена'; $lang['DLCANCEL'] = 'Отмена';
$lang['DL_LIST_DEL'] = 'Очистить DL-List'; $lang['DL_LIST_DEL'] = 'Очистить DL-List';
$lang['DL_LIST_DEL_CONFIRM'] = 'Вы уверены, что хотите удалить DL-List для этого топика?'; $lang['DL_LIST_DEL_CONFIRM'] = 'Вы уверены, что хотите удалить DL-List для этого топика?';
@ -2601,10 +2601,10 @@ $lang['BT_SHOW_DL_LIST'] = 'Показывать DL-List при просмотр
$lang['BT_DL_LIST_ONLY_1ST_PAGE'] = 'Показывать DL-List только на первой странице топика'; $lang['BT_DL_LIST_ONLY_1ST_PAGE'] = 'Показывать DL-List только на первой странице топика';
$lang['BT_DL_LIST_ONLY_COUNT'] = 'Показывать только количество'; $lang['BT_DL_LIST_ONLY_COUNT'] = 'Показывать только количество';
$lang['BT_SHOW_DL_LIST_BUTTONS'] = 'Показывать кнопки для изменения DL-статуса'; $lang['BT_SHOW_DL_LIST_BUTTONS'] = 'Показывать кнопки для изменения DL-статуса';
$lang['BT_SHOW_DL_BUT_WILL'] = $lang['DL_WILL']; $lang['BT_SHOW_DL_BUT_WILL'] = $lang['DLWILL'];
$lang['BT_SHOW_DL_BUT_DOWN'] = $lang['DL_DOWN']; $lang['BT_SHOW_DL_BUT_DOWN'] = $lang['DLDOWN'];
$lang['BT_SHOW_DL_BUT_COMPL'] = $lang['DL_COMPLETE']; $lang['BT_SHOW_DL_BUT_COMPL'] = $lang['DLCOMPLETE'];
$lang['BT_SHOW_DL_BUT_CANCEL'] = $lang['DL_CANCEL']; $lang['BT_SHOW_DL_BUT_CANCEL'] = $lang['DLCANCEL'];
$lang['BT_ADD_AUTH_KEY_HEAD'] = 'Passkey'; $lang['BT_ADD_AUTH_KEY_HEAD'] = 'Passkey';
$lang['BT_ADD_AUTH_KEY'] = 'Aвтодобавление passkey к торрент-файлам перед их скачиванием'; $lang['BT_ADD_AUTH_KEY'] = 'Aвтодобавление passkey к торрент-файлам перед их скачиванием';

16
upload/language/ua/main.php
View file

@ -1257,10 +1257,10 @@ $lang['BT_2_WEEKS'] = '2 тижні';
$lang['BT_1_MONTH'] = 'місяць'; $lang['BT_1_MONTH'] = 'місяць';
$lang['DL_LIST_AND_TORRENT_ACTIVITY'] = 'Статистика роздачі'; $lang['DL_LIST_AND_TORRENT_ACTIVITY'] = 'Статистика роздачі';
$lang['DL_WILL'] = 'Буду качати'; $lang['DLWILL'] = 'Буду качати';
$lang['DL_DOWN'] = 'Качаю'; $lang['DLDOWN'] = 'Качаю';
$lang['DL_COMPLETE'] = 'Скачав'; $lang['DLCOMPLETE'] = 'Скачав';
$lang['DL_CANCEL'] = 'Відміна'; $lang['DLCANCEL'] = 'Відміна';
$lang['DL_LIST_DEL'] = 'Очистити DL-List'; $lang['DL_LIST_DEL'] = 'Очистити DL-List';
$lang['DL_LIST_DEL_CONFIRM'] = 'Ви впевнені, що хочете видалити DL-List для цього топіка?'; $lang['DL_LIST_DEL_CONFIRM'] = 'Ви впевнені, що хочете видалити DL-List для цього топіка?';
@ -2601,10 +2601,10 @@ $lang['BT_SHOW_DL_LIST'] = 'Показувати DL-List при перегляд
$lang['BT_DL_LIST_ONLY_1ST_PAGE'] = 'Показувати DL-List тільки на першій сторінці топіка'; $lang['BT_DL_LIST_ONLY_1ST_PAGE'] = 'Показувати DL-List тільки на першій сторінці топіка';
$lang['BT_DL_LIST_ONLY_COUNT'] = 'Показувати тільки кількість'; $lang['BT_DL_LIST_ONLY_COUNT'] = 'Показувати тільки кількість';
$lang['BT_SHOW_DL_LIST_BUTTONS'] = 'Показувати кнопки для зміни DL-статусу'; $lang['BT_SHOW_DL_LIST_BUTTONS'] = 'Показувати кнопки для зміни DL-статусу';
$lang['BT_SHOW_DL_BUT_WILL'] = $lang['DL_WILL']; $lang['BT_SHOW_DL_BUT_WILL'] = $lang['DLWILL'];
$lang['BT_SHOW_DL_BUT_DOWN'] = $lang['DL_DOWN']; $lang['BT_SHOW_DL_BUT_DOWN'] = $lang['DLDOWN'];
$lang['BT_SHOW_DL_BUT_COMPL'] = $lang['DL_COMPLETE']; $lang['BT_SHOW_DL_BUT_COMPL'] = $lang['DLCOMPLETE'];
$lang['BT_SHOW_DL_BUT_CANCEL'] = $lang['DL_CANCEL']; $lang['BT_SHOW_DL_BUT_CANCEL'] = $lang['DLCANCEL'];
$lang['BT_ADD_AUTH_KEY_HEAD'] = 'Passkey'; $lang['BT_ADD_AUTH_KEY_HEAD'] = 'Passkey';
$lang['BT_ADD_AUTH_KEY'] = 'Автододавання passkey до торрент-файлів перед їх скачуванням'; $lang['BT_ADD_AUTH_KEY'] = 'Автододавання passkey до торрент-файлів перед їх скачуванням';

0
upload/files/.htaccess → upload/old_files/.htaccess
View file

0
upload/files/thumbs/.htaccess → upload/old_files/thumbs/.htaccess
View file

8
upload/templates/default/search_results.tpl
View file

@ -197,10 +197,10 @@ function show_edit_options ()
<tr> <tr>
<td class="row2" colspan="6"> <td class="row2" colspan="6">
<!-- IF DL_CONTROLS --> <!-- IF DL_CONTROLS -->
<input type="submit" name="dl_set_will" value="{L_DL_WILL}" class="liteoption" /> <input type="submit" name="dl_set_will" value="{L_DLWILL}" class="liteoption" />
<input type="submit" name="dl_set_down" value="{L_DL_DOWN}" class="liteoption" /> <input type="submit" name="dl_set_down" value="{L_DLDOWN}" class="liteoption" />
<input type="submit" name="dl_set_complete" value="{L_DL_COMPLETE}" class="liteoption" /> <input type="submit" name="dl_set_complete" value="{L_DLCOMPLETE}" class="liteoption" />
<input type="submit" name="dl_set_cancel" value="{L_DL_CANCEL}" class="liteoption" /> <input type="submit" name="dl_set_cancel" value="{L_DLCANCEL}" class="liteoption" />
<input type="hidden" name="redirect_type" value="search" /> <input type="hidden" name="redirect_type" value="search" />
<input type="hidden" name="mode" value="set_topics_dl_status" /> <input type="hidden" name="mode" value="set_topics_dl_status" />
<!-- ELSE --> <!-- ELSE -->

8
upload/templates/default/viewtopic_torrent.tpl
View file

@ -232,10 +232,10 @@ $(document).ready(function(){
&nbsp; &nbsp;
<!-- IF DL_BUTTONS --> <!-- IF DL_BUTTONS -->
<form method="POST" action="{S_DL_ACTION}">{DL_HIDDEN_FIELDS} <form method="POST" action="{S_DL_ACTION}">{DL_HIDDEN_FIELDS}
<!-- IF DL_BUT_WILL --><input type="submit" name="dl_set_will" value="{L_DL_WILL}" class="liteoption" />&nbsp;<!-- ENDIF --> <!-- IF DL_BUT_WILL --><input type="submit" name="dl_set_will" value="{L_DLWILL}" class="liteoption" />&nbsp;<!-- ENDIF -->
<!-- IF DL_BUT_DOWN --><input type="submit" name="dl_set_down" value="{L_DL_DOWN}" class="liteoption" />&nbsp;<!-- ENDIF --> <!-- IF DL_BUT_DOWN --><input type="submit" name="dl_set_down" value="{L_DLDOWN}" class="liteoption" />&nbsp;<!-- ENDIF -->
<!-- IF DL_BUT_COMPL --><input type="submit" name="dl_set_complete" value="{L_DL_COMPLETE}" class="liteoption" />&nbsp;<!-- ENDIF --> <!-- IF DL_BUT_COMPL --><input type="submit" name="dl_set_complete" value="{L_DLCOMPLETE}" class="liteoption" />&nbsp;<!-- ENDIF -->
<!-- IF DL_BUT_CANCEL --><input type="submit" name="dl_set_cancel" value="{L_DL_CANCEL}" class="liteoption" /><!-- ENDIF --> <!-- IF DL_BUT_CANCEL --><input type="submit" name="dl_set_cancel" value="{L_DLCANCEL}" class="liteoption" /><!-- ENDIF -->
</form> </form>
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF CALL_SEED --><form action="callseed.php?t={TOPIC_ID}" method="post"><input type="submit" value="{L_CALLSEED}" class="liteoption" />&nbsp;</form><!-- ENDIF --> <!-- IF CALL_SEED --><form action="callseed.php?t={TOPIC_ID}" method="post"><input type="submit" value="{L_CALLSEED}" class="liteoption" />&nbsp;</form><!-- ENDIF -->