diff --git a/README.md b/README.md index d4978f077..21682e8bf 100644 --- a/README.md +++ b/README.md @@ -24,14 +24,14 @@ TorrentPier II - движок торрент-трекера, написанны - ajax/html - cache - cache/filecache -- files -- files/thumbs - images - images/avatars - images/captcha - images/ranks - images/smiles - log +- old_files +- old_files/thumbs - sitemap - triggers diff --git a/install/sql/mysql.sql b/install/sql/mysql.sql index 66c0e5ab7..8aed473d3 100644 --- a/install/sql/mysql.sql +++ b/install/sql/mysql.sql @@ -114,7 +114,7 @@ CREATE TABLE IF NOT EXISTS `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 ('topic_icon', 'images/icon_clip.gif'); INSERT INTO `bb_attachments_config` VALUES ('display_order', '0'); diff --git a/upload/includes/torrent_show_dl_list.php b/upload/includes/torrent_show_dl_list.php index a14fb286f..ddc9b8f11 100644 --- a/upload/includes/torrent_show_dl_list.php +++ b/upload/includes/torrent_show_dl_list.php @@ -90,10 +90,11 @@ if ($show_dl_list) $dl_cat[$i] = "". $dl_cat[$i] .''; $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_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) { @@ -102,8 +103,9 @@ if ($show_dl_list) continue; } $template->assign_block_vars('dl_counts.count_row', array( - 'DL_OPTION_NAME' => $lang[strtoupper($desc) .'_2'], - 'DL_OPTION_USERS' => $dl_count[$i])); + 'DL_OPTION_NAME' => $lang[strtoupper($desc)], + 'DL_OPTION_USERS' => $dl_count[$i], + )); } } } diff --git a/upload/language/en/main.php b/upload/language/en/main.php index 463c9f3be..5d1cb75db 100644 --- a/upload/language/en/main.php +++ b/upload/language/en/main.php @@ -1257,10 +1257,10 @@ $lang['BT_2_WEEKS'] = '2 weeks'; $lang['BT_1_MONTH'] = 'month'; $lang['DL_LIST_AND_TORRENT_ACTIVITY'] = 'DL-List and Torrent activity'; -$lang['DL_WILL'] = 'Will download'; -$lang['DL_DOWN'] = 'Downloading'; -$lang['DL_COMPLETE'] = 'Complete'; -$lang['DL_CANCEL'] = 'Cancel'; +$lang['DLWILL'] = 'Will download'; +$lang['DLDOWN'] = 'Downloading'; +$lang['DLCOMPLETE'] = 'Complete'; +$lang['DLCANCEL'] = 'Cancel'; $lang['DL_LIST_DEL'] = 'Clear DL-List'; $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_COUNT'] = 'Show only number of users'; $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_DOWN'] = $lang['DL_DOWN']; -$lang['BT_SHOW_DL_BUT_COMPL'] = $lang['DL_COMPLETE']; -$lang['BT_SHOW_DL_BUT_CANCEL'] = $lang['DL_CANCEL']; +$lang['BT_SHOW_DL_BUT_WILL'] = $lang['DLWILL']; +$lang['BT_SHOW_DL_BUT_DOWN'] = $lang['DLDOWN']; +$lang['BT_SHOW_DL_BUT_COMPL'] = $lang['DLCOMPLETE']; +$lang['BT_SHOW_DL_BUT_CANCEL'] = $lang['DLCANCEL']; $lang['BT_ADD_AUTH_KEY_HEAD'] = 'Passkey'; $lang['BT_ADD_AUTH_KEY'] = 'Enable adding passkey to the torrent-files before downloading'; diff --git a/upload/language/ru/main.php b/upload/language/ru/main.php index 505c9b50b..0a19d4f7f 100644 --- a/upload/language/ru/main.php +++ b/upload/language/ru/main.php @@ -1257,10 +1257,10 @@ $lang['BT_2_WEEKS'] = '2 недели'; $lang['BT_1_MONTH'] = 'месяц'; $lang['DL_LIST_AND_TORRENT_ACTIVITY'] = 'Статистика раздачи'; -$lang['DL_WILL'] = 'Буду качать'; -$lang['DL_DOWN'] = 'Качаю'; -$lang['DL_COMPLETE'] = 'Скачал'; -$lang['DL_CANCEL'] = 'Отмена'; +$lang['DLWILL'] = 'Буду качать'; +$lang['DLDOWN'] = 'Качаю'; +$lang['DLCOMPLETE'] = 'Скачал'; +$lang['DLCANCEL'] = 'Отмена'; $lang['DL_LIST_DEL'] = 'Очистить 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_COUNT'] = 'Показывать только количество'; $lang['BT_SHOW_DL_LIST_BUTTONS'] = 'Показывать кнопки для изменения DL-статуса'; -$lang['BT_SHOW_DL_BUT_WILL'] = $lang['DL_WILL']; -$lang['BT_SHOW_DL_BUT_DOWN'] = $lang['DL_DOWN']; -$lang['BT_SHOW_DL_BUT_COMPL'] = $lang['DL_COMPLETE']; -$lang['BT_SHOW_DL_BUT_CANCEL'] = $lang['DL_CANCEL']; +$lang['BT_SHOW_DL_BUT_WILL'] = $lang['DLWILL']; +$lang['BT_SHOW_DL_BUT_DOWN'] = $lang['DLDOWN']; +$lang['BT_SHOW_DL_BUT_COMPL'] = $lang['DLCOMPLETE']; +$lang['BT_SHOW_DL_BUT_CANCEL'] = $lang['DLCANCEL']; $lang['BT_ADD_AUTH_KEY_HEAD'] = 'Passkey'; $lang['BT_ADD_AUTH_KEY'] = 'Aвтодобавление passkey к торрент-файлам перед их скачиванием'; diff --git a/upload/language/ua/main.php b/upload/language/ua/main.php index d13dc3799..966e2cfcb 100644 --- a/upload/language/ua/main.php +++ b/upload/language/ua/main.php @@ -1257,10 +1257,10 @@ $lang['BT_2_WEEKS'] = '2 тижні'; $lang['BT_1_MONTH'] = 'місяць'; $lang['DL_LIST_AND_TORRENT_ACTIVITY'] = 'Статистика роздачі'; -$lang['DL_WILL'] = 'Буду качати'; -$lang['DL_DOWN'] = 'Качаю'; -$lang['DL_COMPLETE'] = 'Скачав'; -$lang['DL_CANCEL'] = 'Відміна'; +$lang['DLWILL'] = 'Буду качати'; +$lang['DLDOWN'] = 'Качаю'; +$lang['DLCOMPLETE'] = 'Скачав'; +$lang['DLCANCEL'] = 'Відміна'; $lang['DL_LIST_DEL'] = 'Очистити 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_COUNT'] = 'Показувати тільки кількість'; $lang['BT_SHOW_DL_LIST_BUTTONS'] = 'Показувати кнопки для зміни DL-статусу'; -$lang['BT_SHOW_DL_BUT_WILL'] = $lang['DL_WILL']; -$lang['BT_SHOW_DL_BUT_DOWN'] = $lang['DL_DOWN']; -$lang['BT_SHOW_DL_BUT_COMPL'] = $lang['DL_COMPLETE']; -$lang['BT_SHOW_DL_BUT_CANCEL'] = $lang['DL_CANCEL']; +$lang['BT_SHOW_DL_BUT_WILL'] = $lang['DLWILL']; +$lang['BT_SHOW_DL_BUT_DOWN'] = $lang['DLDOWN']; +$lang['BT_SHOW_DL_BUT_COMPL'] = $lang['DLCOMPLETE']; +$lang['BT_SHOW_DL_BUT_CANCEL'] = $lang['DLCANCEL']; $lang['BT_ADD_AUTH_KEY_HEAD'] = 'Passkey'; $lang['BT_ADD_AUTH_KEY'] = 'Автододавання passkey до торрент-файлів перед їх скачуванням'; diff --git a/upload/files/.htaccess b/upload/old_files/.htaccess similarity index 100% rename from upload/files/.htaccess rename to upload/old_files/.htaccess diff --git a/upload/files/thumbs/.htaccess b/upload/old_files/thumbs/.htaccess similarity index 100% rename from upload/files/thumbs/.htaccess rename to upload/old_files/thumbs/.htaccess diff --git a/upload/templates/default/search_results.tpl b/upload/templates/default/search_results.tpl index e42270d97..8280806f8 100644 --- a/upload/templates/default/search_results.tpl +++ b/upload/templates/default/search_results.tpl @@ -197,10 +197,10 @@ function show_edit_options () - - - - + + + + diff --git a/upload/templates/default/viewtopic_torrent.tpl b/upload/templates/default/viewtopic_torrent.tpl index b13db21af..a0723d1a1 100644 --- a/upload/templates/default/viewtopic_torrent.tpl +++ b/upload/templates/default/viewtopic_torrent.tpl @@ -232,10 +232,10 @@ $(document).ready(function(){  
{DL_HIDDEN_FIELDS} -   -   -   - +   +   +   +