diff --git a/ReadMe.txt b/ReadMe.txt index 60315cd3d..f95001a09 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -37,6 +37,7 @@ ** Необходимые значения в php.ini ** ************************************ +mbstring.internal_encoding = UTF-8 magic_quotes_gpc = Off extension=php_mbstring.dll extension=php_pdo.dll diff --git a/install/sql/mysql.sql b/install/sql/mysql.sql index 0a70e6cb5..b58dbc5b0 100644 --- a/install/sql/mysql.sql +++ b/install/sql/mysql.sql @@ -525,7 +525,7 @@ CREATE TABLE `bb_categories` ( -- Дамп данных таблицы `bb_categories` -- -INSERT INTO `bb_categories` VALUES (1, 'Test category 1', 10); +INSERT INTO `bb_categories` VALUES (1, 'Ваша первая категория', 10); -- -------------------------------------------------------- @@ -551,7 +551,7 @@ INSERT INTO `bb_config` VALUES ('allow_bbcode', '1'); INSERT INTO `bb_config` VALUES ('allow_namechange', '0'); INSERT INTO `bb_config` VALUES ('allow_sig', '1'); INSERT INTO `bb_config` VALUES ('allow_smilies', '1'); -INSERT INTO `bb_config` VALUES ('avatar_filesize', '10000'); +INSERT INTO `bb_config` VALUES ('avatar_filesize', '100000'); INSERT INTO `bb_config` VALUES ('avatar_gallery_path', 'images/avatars/gallery'); INSERT INTO `bb_config` VALUES ('avatar_max_height', '100'); INSERT INTO `bb_config` VALUES ('avatar_max_width', '100'); @@ -709,10 +709,10 @@ CREATE TABLE `bb_datastore` ( -- Дамп данных таблицы `bb_datastore` -- -INSERT INTO `bb_datastore` VALUES ('cat_forums', 'a:6:{s:15:"not_auth_forums";a:4:{s:10:"guest_view";s:0:"";s:10:"guest_read";s:0:"";s:9:"user_view";s:0:"";s:9:"user_read";s:0:"";}s:14:"tracker_forums";s:0:"";s:14:"cat_title_html";a:1:{i:1;s:15:"Test category 1";}s:15:"forum_name_html";a:1:{i:1;s:12:"Test Forum 1";}s:1:"c";a:1:{i:1;a:4:{s:6:"cat_id";s:1:"1";s:9:"cat_title";s:15:"Test category 1";s:9:"cat_order";s:2:"10";s:6:"forums";a:1:{i:0;s:1:"1";}}}s:1:"f";a:1:{i:1;a:20:{s:8:"forum_id";s:1:"1";s:6:"cat_id";s:1:"1";s:10:"forum_name";s:12:"Test Forum 1";s:10:"forum_desc";s:26:"This is just a test forum.";s:12:"forum_status";s:1:"0";s:11:"forum_posts";s:1:"1";s:12:"forum_topics";s:1:"1";s:9:"auth_view";s:1:"0";s:9:"auth_read";s:1:"0";s:9:"auth_post";s:1:"1";s:10:"auth_reply";s:1:"1";s:9:"auth_edit";s:1:"1";s:11:"auth_delete";s:1:"1";s:11:"auth_sticky";s:1:"3";s:13:"auth_announce";s:1:"3";s:9:"auth_vote";s:1:"1";s:15:"auth_pollcreate";s:1:"1";s:16:"auth_attachments";s:1:"1";s:13:"auth_download";s:1:"1";s:12:"forum_parent";s:1:"0";}}}'); -INSERT INTO `bb_datastore` VALUES ('jumpbox', 'a:2:{s:5:"guest";s:241:"\n\n";s:4:"user";s:241:"\n\n";}'); -INSERT INTO `bb_datastore` VALUES ('viewtopic_forum_select', 'a:1:{s:22:"viewtopic_forum_select";s:187:"\n\n";}'); -INSERT INTO `bb_datastore` VALUES ('latest_news', 'a:1:{i:0;a:3:{s:8:"topic_id";s:1:"1";s:10:"topic_time";s:9:"972086460";s:11:"topic_title";s:18:"Welcome to TorrentPier";}}'); +INSERT INTO `bb_datastore` VALUES ('cat_forums', 'a:6:{s:15:"not_auth_forums";a:4:{s:10:"guest_view";s:0:"";s:10:"guest_read";s:0:"";s:9:"user_view";s:0:"";s:9:"user_read";s:0:"";}s:14:"tracker_forums";s:0:"";s:14:"cat_title_html";a:1:{i:1;s:15:"Ваша первая категория";}s:15:"forum_name_html";a:1:{i:1;s:12:"Ваш первый форум 1";}s:1:"c";a:1:{i:1;a:4:{s:6:"cat_id";s:1:"1";s:9:"cat_title";s:15:"Ваша первая категория 1";s:9:"cat_order";s:2:"10";s:6:"forums";a:1:{i:0;s:1:"1";}}}s:1:"f";a:1:{i:1;a:20:{s:8:"forum_id";s:1:"1";s:6:"cat_id";s:1:"1";s:10:"forum_name";s:12:"Ваш первый форум";s:10:"forum_desc";s:26:"Ваш первый форум";s:12:"forum_status";s:1:"0";s:11:"forum_posts";s:1:"1";s:12:"forum_topics";s:1:"1";s:9:"auth_view";s:1:"0";s:9:"auth_read";s:1:"0";s:9:"auth_post";s:1:"1";s:10:"auth_reply";s:1:"1";s:9:"auth_edit";s:1:"1";s:11:"auth_delete";s:1:"1";s:11:"auth_sticky";s:1:"3";s:13:"auth_announce";s:1:"3";s:9:"auth_vote";s:1:"1";s:15:"auth_pollcreate";s:1:"1";s:16:"auth_attachments";s:1:"1";s:13:"auth_download";s:1:"1";s:12:"forum_parent";s:1:"0";}}}'); +INSERT INTO `bb_datastore` VALUES ('jumpbox', 'a:2:{s:5:"guest";s:241:"\n\n";s:4:"user";s:241:"\n\n";}'); +INSERT INTO `bb_datastore` VALUES ('viewtopic_forum_select', 'a:1:{s:22:"viewtopic_forum_select";s:187:"\n\n";}'); +INSERT INTO `bb_datastore` VALUES ('latest_news', 'a:1:{i:0;a:3:{s:8:"topic_id";s:1:"1";s:10:"topic_time";s:9:"972086460";s:11:"topic_title";s:18:"Добро пожаловать в TorrentPier II";}}'); INSERT INTO `bb_datastore` VALUES ('ads', 'a:0:{}'); INSERT INTO `bb_datastore` VALUES ('stats', 'a:4:{s:9:"usercount";s:1:"3";s:10:"newestuser";a:2:{s:7:"user_id";s:1:"2";s:8:"username";s:5:"admin";}s:9:"postcount";s:1:"1";s:10:"topiccount";s:1:"1";}'); INSERT INTO `bb_datastore` VALUES ('moderators', 'a:6:{s:10:"name_users";a:0:{}s:11:"name_groups";a:0:{}s:9:"mod_users";a:0:{}s:10:"mod_groups";a:0:{}s:10:"moderators";a:0:{}s:6:"admins";a:1:{i:2;s:5:"admin";}}'); @@ -856,7 +856,7 @@ CREATE TABLE `bb_forums` ( -- Дамп данных таблицы `bb_forums` -- -INSERT INTO `bb_forums` VALUES (1, 1, 'Test Forum 1', 'This is just a test forum.', 0, 10, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0); +INSERT INTO `bb_forums` VALUES (1, 1, 'Ваш первый форум', 'Описание вашего первого форума.', 0, 10, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0); -- -------------------------------------------------------- @@ -1045,7 +1045,7 @@ CREATE TABLE `bb_ranks` ( -- Дамп данных таблицы `bb_ranks` -- -INSERT INTO `bb_ranks` VALUES (1, 'Site Admin', -1, 1, ''); +INSERT INTO `bb_ranks` VALUES (1, 'Администратор', -1, 1, 'images/ranks/admin.png'); -- -------------------------------------------------------- -- @@ -1297,7 +1297,7 @@ CREATE TABLE `bb_topics` ( -- Дамп данных таблицы `bb_topics` -- -INSERT INTO `bb_topics` VALUES (1, 1, 'Добро пожаловать в TorrentPier II!', 2, 1309421220, 2, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 972086460); +INSERT INTO `bb_topics` VALUES (1, 1, 'Добро пожаловать в TorrentPier II', 2, 1309421220, 2, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 972086460); -- -------------------------------------------------------- @@ -1402,9 +1402,9 @@ CREATE TABLE IF NOT EXISTS `bb_users` ( -- Дамп данных таблицы `bb_users` -- -INSERT INTO `bb_users` VALUES (-1, 0, 'Anonymous', 'd41d8cd98f00b204e9800998ecf8427e', 0, 0, '0', 1309421220, '0', 0, 5, '0.00', '', 0, 0, 0, 220, 0, '', 0, 0, 1, 1, '', '', '', '', '', '', '', '', '', '', 0, '', 0); -INSERT INTO `bb_users` VALUES (2, 1, 'admin', 'c3284d0f94606de1fd2af172aba15bf3', 0, 0, '0', 1309421220, '0', 1, 1, '+4.00', '', 0, 0, 0, 304, 1, '', 1, 1, 1, 1, 'admin@admin.com', '', '', '', '', '', '', '', '', '', 0, '', 0); -INSERT INTO `bb_users` VALUES (-746, 0, 'bot', 'd41d8cd98f00b204e9800998ecf8427e', 0, 0, '0', 1309421220, '0', 0, 0, '0.00', '', 0, 0, 0, 148, 0, 'bot.gif', 1, 0, 1, 1, 'bot@bot.bot', '', '', '', '', '', '', '', '', '', 0, '', 0); +INSERT INTO `bb_users` VALUES (-1, 0, 'Anonymous', 'd41d8cd98f00b204e9800998ecf8427e', 0, 0, '0', 1309421220, '0', 0, 5, '0.00', '', 0, 0, 0, 220, 0, '', 0, 0, 0, 0, '', '', '', '', '', '', '', '', '', '', 0, '', 0); +INSERT INTO `bb_users` VALUES (2, 1, 'admin', 'c3284d0f94606de1fd2af172aba15bf3', 0, 0, '0', 1309421220, '0', 1, 1, '+4.00', '', 0, 0, 0, 304, 1, '', 1, 0, 0, 0, 'admin@admin.com', '', '', '', '', '', '', '', '', '', 0, '', 0); +INSERT INTO `bb_users` VALUES (-746, 0, 'bot', 'd41d8cd98f00b204e9800998ecf8427e', 0, 0, '0', 1309421220, '0', 0, 0, '0.00', '', 0, 0, 0, 148, 0, 'bot.gif', 1, 0, 0, 0, 'bot@bot.bot', '', '', '', '', '', '', '', '', '', 0, '', 0); -- -------------------------------------------------------- diff --git a/upload/ajax/posts.php b/upload/ajax/posts.php index 17065a1b3..d25e18d3c 100644 --- a/upload/ajax/posts.php +++ b/upload/ajax/posts.php @@ -178,18 +178,19 @@ switch($this->request['type'])
'. $hidden_form .'
- - - -    - - -   - - -   -   - + + + +    + + +   + + +   +   + +
diff --git a/upload/attach_mod/displaying_torrent.php b/upload/attach_mod/displaying_torrent.php index 3e175eea9..8ba878828 100644 --- a/upload/attach_mod/displaying_torrent.php +++ b/upload/attach_mod/displaying_torrent.php @@ -187,7 +187,7 @@ if ($tor_reged && $tor_info) $dl_allowed = ($user_ratio > $min_ratio_dl); } - if (isset($user_ratio) && isset($min_ratio_warn) && $user_ratio < $min_ratio_warn && TR_RATING_LIMITS) + if ((isset($user_ratio) && isset($min_ratio_warn) && $user_ratio < $min_ratio_warn && TR_RATING_LIMITS) || ($bt_userdata['u_down_total'] < MIN_DL_FOR_RATIO)) { $template->assign_vars(array( 'SHOW_RATIO_WARN' => true, diff --git a/upload/config.php b/upload/config.php index 3caeaa918..b85995ddd 100644 --- a/upload/config.php +++ b/upload/config.php @@ -57,8 +57,8 @@ $bb_cfg['css_ver'] = 1; // Increase number of revision after update $bb_cfg['tp_version'] = '2.0'; -$bb_cfg['tp_release_state'] = 'R192'; -$bb_cfg['tp_release_date'] = '4-08-2011'; +$bb_cfg['tp_release_state'] = 'R194'; +$bb_cfg['tp_release_date'] = '5-08-2011'; $bb_cfg['board_disabled_msg'] = 'форум временно отключен'; // 'forums temporarily disabled'; // show this msg if board has been disabled via ON/OFF trigger $bb_cfg['srv_overloaded_msg'] = "Извините, в данный момент сервер перегружен\nПопробуйте повторить запрос через несколько минут"; @@ -136,8 +136,6 @@ $bb_cfg['how_to_download_url_help'] = 'viewtopic.php?t=1'; // URL help link for $bb_cfg['what_is_torrent_url_help'] = 'viewtopic.php?t=2'; // URL help link for "What is Bittorrent?" $bb_cfg['ratio_url_help'] = 'viewtopic.php?t=3'; // URL help link for Ratio. -//$bb_cfg['bt_ratio_warning_msg'] = '$bb_cfg[\'bt_ratio_warning_msg\']'; /* Перемещено в "attach_mod\displaying_torrent.php" */ - $bb_cfg['bt_min_ratio_allow_dl_tor'] = 0; // 0 - disable $bb_cfg['bt_min_ratio_warning'] = 0; // 0 - disable $bb_cfg['bt_ratio_warning_url_help'] = $bb_cfg['ratio_url_help']; // URL help link, for limit end. diff --git a/upload/language/lang_english/lang_main.php b/upload/language/lang_english/lang_main.php index 6cb98a6db..ed5e6b78e 100644 --- a/upload/language/lang_english/lang_main.php +++ b/upload/language/lang_english/lang_main.php @@ -50,6 +50,7 @@ $lang['DO_SUBMIT'] = 'Submit'; $lang['RESET'] = 'Reset'; $lang['CANCEL'] = 'Cancel'; $lang['PREVIEW'] = 'Preview'; +$lang['AJAX_PREVIEW'] = 'Quick View'; $lang['CONFIRM'] = 'Confirm'; $lang['YES'] = 'Yes'; $lang['NO'] = 'No'; @@ -1607,7 +1608,31 @@ $lang['WHAT_IS_A_TORRENT'] = 'What is a torrent?'; $lang['RATINGS_AND_LIMITATIONS'] = 'Ratings and Limitations'; $lang['SCREENSHOTS_RULES'] = 'Read the rules laid out screenshots!'; +$lang['SCREENSHOTS_RULES_TOPIC'] = 'Read the rules laid out the screenshots in this section!'; +$lang['AJAX_EDIT_OPEN'] = 'Have you already opened one quick editing!'; $lang['GO_TO_PAGE'] = 'Go to page ...'; $lang['EDIT'] = 'Edit'; $lang['SAVE'] = 'Save'; -$lang['NEW_WINDOW'] = 'in a new window'; \ No newline at end of file +$lang['NEW_WINDOW'] = 'in a new window'; + +// BB Code +$lang['ALIGN'] = ':'; +$lang['LEFT'] = ''; +$lang['RIGHT'] = ''; +$lang['CENTER'] = ' '; +$lang['JUSTIFY'] = ' '; +$lang['HOR_LINE'] = 'Horizontal line (Ctrl+8)'; +$lang['NEW_LINE'] = 'New line'; +$lang['BOLD'] = 'Bold (Ctrl+B)'; +$lang['ITALIC'] = 'Italic (Ctrl+I)'; +$lang['UNDERLINE'] = 'Underline (Ctrl+U)'; +$lang['STRIKEOUT'] = 'Strikeout (Ctrl+S)'; +$lang['QUOTE_TITLE'] = 'Quote (Ctrl+Q)'; +$lang['IMG_TITLE'] = 'Image (Ctrl+R)'; +$lang['URL'] = 'Url'; +$lang['URL_TITLE'] = 'URL (Ctrl+W)'; +$lang['CODE_TITLE'] = 'Code (Ctrl+K)'; +$lang['LIST'] = 'List'; +$lang['LIST_TITLE'] = 'List (Ctrl+L)'; +$lang['LIST_ITEM'] = 'List item (Ctrl+0)'; +$lang['QUOTE_SEL'] = 'Quote selected'; diff --git a/upload/language/lang_russian/lang_main.php b/upload/language/lang_russian/lang_main.php index 397ced247..eb238dcd9 100644 --- a/upload/language/lang_russian/lang_main.php +++ b/upload/language/lang_russian/lang_main.php @@ -54,6 +54,7 @@ $lang['DO_SUBMIT'] = 'Отправить'; $lang['RESET'] = 'Вернуть'; $lang['CANCEL'] = 'Отмена'; $lang['PREVIEW'] = 'Предв. просмотр'; +$lang['AJAX_PREVIEW'] = 'Быстрый просмотр'; $lang['CONFIRM'] = 'Подтвердите'; $lang['YES'] = 'Да'; $lang['NO'] = 'Нет'; @@ -319,10 +320,10 @@ $lang['EDIT_POST_AJAX'] = 'редактировать сообщение со с $lang['AFTER_THE_LAPSE'] = 'по прошествии '; $lang['DONT_MESSAGE_TITLE'] = 'Вы не указали заголовок сообщения'; -$lang['INVALID_TOPIC_ID'] = 'Топик отсутсвует!'; -$lang['INVALID_TOPIC_ID_DB'] = 'Топик отсутсвует в базе данных!'; +$lang['INVALID_TOPIC_ID'] = 'Топик отсутствует!'; +$lang['INVALID_TOPIC_ID_DB'] = 'Топик отсутствует в базе данных!'; -$lang['NOT_POST'] = 'Сообщение отсутсвует'; +$lang['NOT_POST'] = 'Сообщение отсутствует'; $lang['NOT_EDIT_TOR_STATUS'] = 'Вы не можете редактировать раздачу со статусом'; $lang['TOR_STATUS_DAYS'] = 'дней'; @@ -1621,7 +1622,33 @@ $lang['WHAT_IS_A_TORRENT'] = 'Что такое торрент?'; $lang['RATINGS_AND_LIMITATIONS'] = 'Рейтинг и ограничения'; $lang['SCREENSHOTS_RULES'] = 'Прочтите правила выкладывания скриншотов!'; +$lang['SCREENSHOTS_RULES_TOPIC'] = 'Прочтите правила выкладывания скриншотов в этом разделе!'; +$lang['AJAX_EDIT_OPEN'] = 'У вас уже открыто одно быстрое редактирование!'; $lang['GO_TO_PAGE'] = 'К странице...'; $lang['EDIT'] = 'Изменить'; $lang['SAVE'] = 'Сохранить'; -$lang['NEW_WINDOW'] = 'в новом окне'; \ No newline at end of file +$lang['NEW_WINDOW'] = 'в новом окне'; + +// BB Code +$lang['ALIGN'] = 'Выровнять:'; +$lang['LEFT'] = 'Влево'; +$lang['RIGHT'] = 'Вправо'; +$lang['CENTER'] = 'По центру'; +$lang['JUSTIFY'] = 'По ширине'; +$lang['HOR_LINE'] = 'Горизонтальная линия (Ctrl+8)'; +$lang['NEW_LINE'] = 'Перенос на новую строку'; +$lang['BOLD'] = 'Жирный (Ctrl+B)'; +$lang['ITALIC'] = 'Наклонный (Ctrl+I)'; +$lang['UNDERLINE'] = 'Подчеркнутый (Ctrl+U)'; +$lang['STRIKEOUT'] = 'Зачеркнутый (Ctrl+S)'; +$lang['QUOTE_TITLE'] = 'Цитата (Ctrl+Q)'; +$lang['IMG_TITLE'] = 'Изображение (Ctrl+R)'; +$lang['URL'] = 'Ссылка'; +$lang['URL_TITLE'] = 'Ссылка (Ctrl+W)'; +$lang['CODE_TITLE'] = 'Код (Ctrl+K)'; +$lang['LIST'] = 'Список'; +$lang['LIST_TITLE'] = 'Список (Ctrl+L)'; +$lang['LIST_ITEM'] = 'Элемент списка (Ctrl+0)'; +$lang['QUOTE_SEL'] = 'Цит.выдел'; +$lang['TRANSLIT'] = 'Транслит'; +$lang['TRANSLIT_TITLE'] = 'Перевести выделение из транслита на русский'; diff --git a/upload/misc/js/bbcode.js b/upload/misc/js/bbcode.js index 02b62438f..4dd8df9a6 100644 --- a/upload/misc/js/bbcode.js +++ b/upload/misc/js/bbcode.js @@ -56,7 +56,7 @@ BBCode.prototype = { this.insertAtCursor('[quote]' + sel + '[/quote]\n'); } else { - alert('Please select text.'); + alert('Вы не выбрали текст'); } return false; }, diff --git a/upload/templates/default/posting_editor.tpl b/upload/templates/default/posting_editor.tpl index 05544597c..e4d32d456 100644 --- a/upload/templates/default/posting_editor.tpl +++ b/upload/templates/default/posting_editor.tpl @@ -59,35 +59,36 @@ ajax.callback.posts = function(data){     - -   - + +   +  
- - - -    - - -   - - -   -   - ? + + + +    + + +   + + +   +   + + ?