From 1ffbe7f52cc5da1d57d37c34cab05d09994a51e3 Mon Sep 17 00:00:00 2001 From: Exile Date: Thu, 21 Aug 2014 21:14:50 +0400 Subject: [PATCH 1/9] Potential bug in posting.php MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Возможный баг при постинге из-за некорректного наименования переменной. Излишнее дублирование переменной все в том же постинге. Исправление дублирования параметра в CSS. Добавление пары строчек к описанию файлов, которые необходимо править после установки. --- README.md | 5 +++-- upload/config.php | 4 ++-- upload/posting.php | 7 +++---- upload/templates/default/css/main.css | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 3600f2890..fe6f10d6e 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,8 @@ TorrentPier II - движок торрент-трекера, написанны 4. Редактируем указанные файлы: + **favicon.ico** (меняем на свою иконку, если есть) + **robots.txt** (меняем адреса в строках **Host** и **Sitemap** на свои) + + **opensearch_desc.xml** (меняем описание и адрес на свои) + + **opensearch_desc_bt.xml** (меняем описание и адрес на свои) ## Права доступа на папки и файлы @@ -45,7 +47,6 @@ TorrentPier II - движок торрент-трекера, написанны ## Необходимые модули php php5-tidy - Начиная с версии 2.0.9 (ревизия 592 в старой нумерации) данный модуль не является обязательным, но его установка крайне рекомендуется для повышения качества обработки html-кода тем и сообщений пользователей. ## Рекомендуемый способ запуска cron.php @@ -57,4 +58,4 @@ TorrentPier II - движок торрент-трекера, написанны + Наш форум http://torrentpier.me/ + Центр загрузки http://get.torrentpier.me/ + Часто задаваемые вопросы http://faq.torrentpier.me/ -+ Где задать вопрос http://torrentpier.me/forums/10/ ++ Где задать вопрос http://torrentpier.me/forums/10/ \ No newline at end of file diff --git a/upload/config.php b/upload/config.php index 056bebe97..da5bf1184 100644 --- a/upload/config.php +++ b/upload/config.php @@ -70,8 +70,8 @@ $domain_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : $do // Version info $bb_cfg['tp_version'] = '2.0.9 (RC)'; -$bb_cfg['tp_release_date'] = '20-08-2014'; -$bb_cfg['tp_release_state'] = 'R596'; +$bb_cfg['tp_release_date'] = '23-08-2014'; +$bb_cfg['tp_release_state'] = 'R597'; // Database $charset = 'utf8'; diff --git a/upload/posting.php b/upload/posting.php index 62956849f..99fd70d8b 100644 --- a/upload/posting.php +++ b/upload/posting.php @@ -181,15 +181,14 @@ if ($post_info = DB()->fetch_row($sql)) // Can this user edit/delete the post? if ($post_info['poster_id'] != $userdata['user_id'] && !$is_auth['auth_mod']) { - $message = ($delete || $mode == 'delete') ? $lang['DELETE_OWN_POSTS'] : $lang['EDIT_OWN_POSTS']; + $auth_err = ($delete || $mode == 'delete') ? $lang['DELETE_OWN_POSTS'] : $lang['EDIT_OWN_POSTS']; } elseif (!$post_data['last_post'] && !$is_auth['auth_mod'] && ($mode == 'delete' || $delete)) { - $message = $lang['CANNOT_DELETE_REPLIED']; + $auth_err = $lang['CANNOT_DELETE_REPLIED']; } - set_die_append_msg($forum_id, $topic_id); - if(isset($message)) bb_die($message); + if (isset($auth_err)) bb_die($auth_err); } else { diff --git a/upload/templates/default/css/main.css b/upload/templates/default/css/main.css index f09322839..b8d1bec7d 100644 --- a/upload/templates/default/css/main.css +++ b/upload/templates/default/css/main.css @@ -407,7 +407,7 @@ table.forumline { font-size: 9px !important; text-transform: uppercase; } .forumline td { - border: 1px solid #B7C0C5; border-width: 0 1px 1px; + border: solid #B7C0C5; border-width: 0 1px 1px; } .forumline th, .thHead { padding: 6px 8px 7px; text-align: center; From 0eab8c3198cc59ec319e8b65b969d76cc7aec084 Mon Sep 17 00:00:00 2001 From: Exile Date: Sat, 23 Aug 2014 12:13:32 +0400 Subject: [PATCH 2/9] =?UTF-8?q?=C2=AF\=5F(=E3=83=84)=5F/=C2=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Очередной косяк с атом-лентами. Лента не создавалась первично. --- upload/includes/cron/jobs/update_forums_atom.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/upload/includes/cron/jobs/update_forums_atom.php b/upload/includes/cron/jobs/update_forums_atom.php index 7a517feba..a37875b90 100644 --- a/upload/includes/cron/jobs/update_forums_atom.php +++ b/upload/includes/cron/jobs/update_forums_atom.php @@ -9,14 +9,22 @@ require_once(INC_DIR .'functions_atom.php'); $timecheck = TIMENOW - 600; $forums_data = DB()->fetch_rowset("SELECT forum_id, allow_reg_tracker, forum_name FROM ". BB_FORUMS); -if (file_exists($bb_cfg['atom']['path'] .'/f/0.atom') && filemtime($bb_cfg['atom']['path'] .'/f/0.atom') <= $timecheck) +if (file_exists($bb_cfg['atom']['path'] .'/f/0.atom')) +{ + if (filemtime($bb_cfg['atom']['path'] .'/f/0.atom') <= $timecheck) update_forum_feed(0, $forums_data); +} +else { update_forum_feed(0, $forums_data); } foreach ($forums_data as $forum_data) { - if (file_exists($bb_cfg['atom']['path'] .'/f/'. $forum_data['forum_id'] .'.atom') && filemtime($bb_cfg['atom']['path'] .'/f/'. $forum_data['forum_id'] .'.atom') <= $timecheck) + if (file_exists($bb_cfg['atom']['path'] .'/f/'. $forum_data['forum_id'] .'.atom')) + { + if (filemtime($bb_cfg['atom']['path'] .'/f/'. $forum_data['forum_id'] .'.atom') <= $timecheck) update_forum_feed($forum_data['forum_id'], $forum_data); + } + else { update_forum_feed($forum_data['forum_id'], $forum_data); } From 83836e856fc18b00daa97e9300b18687d56f0a57 Mon Sep 17 00:00:00 2001 From: Exile Date: Sat, 23 Aug 2014 18:47:35 +0400 Subject: [PATCH 3/9] Ukrainian language fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Неправильное название языка (локали). Приводим к стандарту. Файлы языковых не правились, кроме локали в main.php --- upload/config.php | 10 +++++----- upload/language/{ua => uk}/.htaccess | 0 upload/language/{ua => uk}/email/.htaccess | 0 upload/language/{ua => uk}/email/admin_send_email.tpl | 0 upload/language/{ua => uk}/email/blank.tpl | 0 upload/language/{ua => uk}/email/group_added.tpl | 0 upload/language/{ua => uk}/email/group_approved.tpl | 0 upload/language/{ua => uk}/email/group_request.tpl | 0 upload/language/{ua => uk}/email/privmsg_notify.tpl | 0 .../language/{ua => uk}/email/profile_send_email.tpl | 0 upload/language/{ua => uk}/email/topic_notify.tpl | 0 upload/language/{ua => uk}/email/user_activate.tpl | 0 .../language/{ua => uk}/email/user_activate_passwd.tpl | 0 upload/language/{ua => uk}/email/user_welcome.tpl | 0 .../{ua => uk}/email/user_welcome_inactive.tpl | 0 upload/language/{ua => uk}/html/.htaccess | 0 upload/language/{ua => uk}/html/advert.html | 0 upload/language/{ua => uk}/html/copyright_holders.html | 0 upload/language/{ua => uk}/html/not_found.html | 0 upload/language/{ua => uk}/html/sidebar1.html | 0 upload/language/{ua => uk}/html/sidebar2.html | 0 upload/language/{ua => uk}/html/user_agreement.html | 0 upload/language/{ua => uk}/main.php | 2 +- upload/language/{ua => uk}/report_hack/.htaccess | 0 .../language/{ua => uk}/report_hack/report_general.php | 0 upload/language/{ua => uk}/report_hack/report_post.php | 0 .../language/{ua => uk}/report_hack/report_privmsg.php | 0 .../language/{ua => uk}/report_hack/report_topic.php | 0 upload/language/{ua => uk}/report_hack/report_user.php | 0 upload/language/{ua => uk}/search_stopwords.txt | 0 upload/language/{ua => uk}/search_synonyms.txt | 0 upload/language/{ua => uk}/translit_table.php | 0 32 files changed, 6 insertions(+), 6 deletions(-) rename upload/language/{ua => uk}/.htaccess (100%) rename upload/language/{ua => uk}/email/.htaccess (100%) rename upload/language/{ua => uk}/email/admin_send_email.tpl (100%) rename upload/language/{ua => uk}/email/blank.tpl (100%) rename upload/language/{ua => uk}/email/group_added.tpl (100%) rename upload/language/{ua => uk}/email/group_approved.tpl (100%) rename upload/language/{ua => uk}/email/group_request.tpl (100%) rename upload/language/{ua => uk}/email/privmsg_notify.tpl (100%) rename upload/language/{ua => uk}/email/profile_send_email.tpl (100%) rename upload/language/{ua => uk}/email/topic_notify.tpl (100%) rename upload/language/{ua => uk}/email/user_activate.tpl (100%) rename upload/language/{ua => uk}/email/user_activate_passwd.tpl (100%) rename upload/language/{ua => uk}/email/user_welcome.tpl (100%) rename upload/language/{ua => uk}/email/user_welcome_inactive.tpl (100%) rename upload/language/{ua => uk}/html/.htaccess (100%) rename upload/language/{ua => uk}/html/advert.html (100%) rename upload/language/{ua => uk}/html/copyright_holders.html (100%) rename upload/language/{ua => uk}/html/not_found.html (100%) rename upload/language/{ua => uk}/html/sidebar1.html (100%) rename upload/language/{ua => uk}/html/sidebar2.html (100%) rename upload/language/{ua => uk}/html/user_agreement.html (100%) rename upload/language/{ua => uk}/main.php (99%) rename upload/language/{ua => uk}/report_hack/.htaccess (100%) rename upload/language/{ua => uk}/report_hack/report_general.php (100%) rename upload/language/{ua => uk}/report_hack/report_post.php (100%) rename upload/language/{ua => uk}/report_hack/report_privmsg.php (100%) rename upload/language/{ua => uk}/report_hack/report_topic.php (100%) rename upload/language/{ua => uk}/report_hack/report_user.php (100%) rename upload/language/{ua => uk}/search_stopwords.txt (100%) rename upload/language/{ua => uk}/search_synonyms.txt (100%) rename upload/language/{ua => uk}/translit_table.php (100%) diff --git a/upload/config.php b/upload/config.php index da5bf1184..900ff3de6 100644 --- a/upload/config.php +++ b/upload/config.php @@ -270,10 +270,10 @@ if (!empty($_SERVER['HTTP_ACCEPT_LANGUAGE']) && $bb_cfg['auto_language']) $bb_cfg['default_lang_dir'] = LANG_ROOT_DIR .'ru/'; $bb_cfg['default_lang'] = 'ru'; } - else if (substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2) == 'ua') + else if (substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2) == 'uk') { - $bb_cfg['default_lang_dir'] = LANG_ROOT_DIR .'ua/'; - $bb_cfg['default_lang'] = 'ua'; + $bb_cfg['default_lang_dir'] = LANG_ROOT_DIR .'uk/'; + $bb_cfg['default_lang'] = 'uk'; } else { @@ -284,14 +284,14 @@ if (!empty($_SERVER['HTTP_ACCEPT_LANGUAGE']) && $bb_cfg['auto_language']) else { if (isset($bb_cfg['default_lang']) && $bb_cfg['default_lang'] == 'ru') $bb_cfg['default_lang_dir'] = LANG_ROOT_DIR .'ru/'; - else if (isset($bb_cfg['default_lang']) && $bb_cfg['default_lang'] == 'ua') $bb_cfg['default_lang_dir'] = LANG_ROOT_DIR .'ua/'; + else if (isset($bb_cfg['default_lang']) && $bb_cfg['default_lang'] == 'uk') $bb_cfg['default_lang_dir'] = LANG_ROOT_DIR .'uk/'; else $bb_cfg['default_lang_dir'] = LANG_ROOT_DIR .'en/'; } $bb_cfg['languages'] = array( // 'folder' => 'Name', 'ru' => 'Русский', - 'ua' => 'Український', + 'uk' => 'Український', 'en' => 'English', ); diff --git a/upload/language/ua/.htaccess b/upload/language/uk/.htaccess similarity index 100% rename from upload/language/ua/.htaccess rename to upload/language/uk/.htaccess diff --git a/upload/language/ua/email/.htaccess b/upload/language/uk/email/.htaccess similarity index 100% rename from upload/language/ua/email/.htaccess rename to upload/language/uk/email/.htaccess diff --git a/upload/language/ua/email/admin_send_email.tpl b/upload/language/uk/email/admin_send_email.tpl similarity index 100% rename from upload/language/ua/email/admin_send_email.tpl rename to upload/language/uk/email/admin_send_email.tpl diff --git a/upload/language/ua/email/blank.tpl b/upload/language/uk/email/blank.tpl similarity index 100% rename from upload/language/ua/email/blank.tpl rename to upload/language/uk/email/blank.tpl diff --git a/upload/language/ua/email/group_added.tpl b/upload/language/uk/email/group_added.tpl similarity index 100% rename from upload/language/ua/email/group_added.tpl rename to upload/language/uk/email/group_added.tpl diff --git a/upload/language/ua/email/group_approved.tpl b/upload/language/uk/email/group_approved.tpl similarity index 100% rename from upload/language/ua/email/group_approved.tpl rename to upload/language/uk/email/group_approved.tpl diff --git a/upload/language/ua/email/group_request.tpl b/upload/language/uk/email/group_request.tpl similarity index 100% rename from upload/language/ua/email/group_request.tpl rename to upload/language/uk/email/group_request.tpl diff --git a/upload/language/ua/email/privmsg_notify.tpl b/upload/language/uk/email/privmsg_notify.tpl similarity index 100% rename from upload/language/ua/email/privmsg_notify.tpl rename to upload/language/uk/email/privmsg_notify.tpl diff --git a/upload/language/ua/email/profile_send_email.tpl b/upload/language/uk/email/profile_send_email.tpl similarity index 100% rename from upload/language/ua/email/profile_send_email.tpl rename to upload/language/uk/email/profile_send_email.tpl diff --git a/upload/language/ua/email/topic_notify.tpl b/upload/language/uk/email/topic_notify.tpl similarity index 100% rename from upload/language/ua/email/topic_notify.tpl rename to upload/language/uk/email/topic_notify.tpl diff --git a/upload/language/ua/email/user_activate.tpl b/upload/language/uk/email/user_activate.tpl similarity index 100% rename from upload/language/ua/email/user_activate.tpl rename to upload/language/uk/email/user_activate.tpl diff --git a/upload/language/ua/email/user_activate_passwd.tpl b/upload/language/uk/email/user_activate_passwd.tpl similarity index 100% rename from upload/language/ua/email/user_activate_passwd.tpl rename to upload/language/uk/email/user_activate_passwd.tpl diff --git a/upload/language/ua/email/user_welcome.tpl b/upload/language/uk/email/user_welcome.tpl similarity index 100% rename from upload/language/ua/email/user_welcome.tpl rename to upload/language/uk/email/user_welcome.tpl diff --git a/upload/language/ua/email/user_welcome_inactive.tpl b/upload/language/uk/email/user_welcome_inactive.tpl similarity index 100% rename from upload/language/ua/email/user_welcome_inactive.tpl rename to upload/language/uk/email/user_welcome_inactive.tpl diff --git a/upload/language/ua/html/.htaccess b/upload/language/uk/html/.htaccess similarity index 100% rename from upload/language/ua/html/.htaccess rename to upload/language/uk/html/.htaccess diff --git a/upload/language/ua/html/advert.html b/upload/language/uk/html/advert.html similarity index 100% rename from upload/language/ua/html/advert.html rename to upload/language/uk/html/advert.html diff --git a/upload/language/ua/html/copyright_holders.html b/upload/language/uk/html/copyright_holders.html similarity index 100% rename from upload/language/ua/html/copyright_holders.html rename to upload/language/uk/html/copyright_holders.html diff --git a/upload/language/ua/html/not_found.html b/upload/language/uk/html/not_found.html similarity index 100% rename from upload/language/ua/html/not_found.html rename to upload/language/uk/html/not_found.html diff --git a/upload/language/ua/html/sidebar1.html b/upload/language/uk/html/sidebar1.html similarity index 100% rename from upload/language/ua/html/sidebar1.html rename to upload/language/uk/html/sidebar1.html diff --git a/upload/language/ua/html/sidebar2.html b/upload/language/uk/html/sidebar2.html similarity index 100% rename from upload/language/ua/html/sidebar2.html rename to upload/language/uk/html/sidebar2.html diff --git a/upload/language/ua/html/user_agreement.html b/upload/language/uk/html/user_agreement.html similarity index 100% rename from upload/language/ua/html/user_agreement.html rename to upload/language/uk/html/user_agreement.html diff --git a/upload/language/ua/main.php b/upload/language/uk/main.php similarity index 99% rename from upload/language/ua/main.php rename to upload/language/uk/main.php index c458fd454..5445b2726 100644 --- a/upload/language/ua/main.php +++ b/upload/language/uk/main.php @@ -1,6 +1,6 @@ Date: Sat, 23 Aug 2014 19:24:18 +0400 Subject: [PATCH 4/9] New lang include MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Новая система подключения языков - автоматическая, теперь не надо дописывать новые языки в условие, достаточно забросить папку с ним и указать в массиве доступных языков к выбору пользователя. --- upload/config.php | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/upload/config.php b/upload/config.php index 900ff3de6..1a6a068ed 100644 --- a/upload/config.php +++ b/upload/config.php @@ -265,15 +265,11 @@ $bb_cfg['auto_language'] = true; // select user-preferred language automatical if (!empty($_SERVER['HTTP_ACCEPT_LANGUAGE']) && $bb_cfg['auto_language']) { - if (substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2) == 'ru') + $user_lang = substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2); + if (file_exists(LANG_ROOT_DIR . $user_lang .'/')) { - $bb_cfg['default_lang_dir'] = LANG_ROOT_DIR .'ru/'; - $bb_cfg['default_lang'] = 'ru'; - } - else if (substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2) == 'uk') - { - $bb_cfg['default_lang_dir'] = LANG_ROOT_DIR .'uk/'; - $bb_cfg['default_lang'] = 'uk'; + $bb_cfg['default_lang_dir'] = LANG_ROOT_DIR . $user_lang .'/'; + $bb_cfg['default_lang'] = $user_lang; } else { @@ -283,9 +279,14 @@ if (!empty($_SERVER['HTTP_ACCEPT_LANGUAGE']) && $bb_cfg['auto_language']) } else { - if (isset($bb_cfg['default_lang']) && $bb_cfg['default_lang'] == 'ru') $bb_cfg['default_lang_dir'] = LANG_ROOT_DIR .'ru/'; - else if (isset($bb_cfg['default_lang']) && $bb_cfg['default_lang'] == 'uk') $bb_cfg['default_lang_dir'] = LANG_ROOT_DIR .'uk/'; - else $bb_cfg['default_lang_dir'] = LANG_ROOT_DIR .'en/'; + if (isset($bb_cfg['default_lang']) && file_exists(LANG_ROOT_DIR . $bb_cfg['default_lang'] .'/')) + { + $bb_cfg['default_lang_dir'] = LANG_ROOT_DIR . $bb_cfg['default_lang'] .'/'; + } + else + { + $bb_cfg['default_lang_dir'] = LANG_ROOT_DIR .'en/'; + } } $bb_cfg['languages'] = array( From 22cfeb1b83218d85e5807b264095c872dc369c55 Mon Sep 17 00:00:00 2001 From: Exile Date: Sun, 24 Aug 2014 01:22:23 +0400 Subject: [PATCH 5/9] Converter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Добавляем недостающий конвертер. Начинаем работу над основным - составляем полный список изменений в схеме базы данных. --- upgrade/r496-user_birthday.php | 36 ++++++++++ upgrade/r600-stable.php | 125 ++++++++++++++++++++++++++++++++- 2 files changed, 160 insertions(+), 1 deletion(-) create mode 100644 upgrade/r496-user_birthday.php diff --git a/upgrade/r496-user_birthday.php b/upgrade/r496-user_birthday.php new file mode 100644 index 000000000..3d70e4340 --- /dev/null +++ b/upgrade/r496-user_birthday.php @@ -0,0 +1,36 @@ +session_start(); + +set_die_append_msg(); +if (!IS_SUPER_ADMIN) bb_die($lang['ONLY_FOR_SUPER_ADMIN']); + +$confirm = request_var('confirm', ''); + +if ($confirm) { + DB()->query("ALTER TABLE ". BB_USERS ." CHANGE COLUMN user_birthday user_birthday_old int(11) NOT NULL DEFAULT 0 AFTER user_gender"); + DB()->query("ALTER TABLE ". BB_USERS ." ADD user_birthday date NOT NULL DEFAULT '0000-00-00' AFTER user_gender"); + + $sql = "SELECT user_id, user_birthday_old FROM ". BB_USERS ." WHERE user_birthday_old != 0 AND user_id NOT IN ('". EXCLUDED_USERS_CSV ."')"; + + foreach (DB()->fetch_rowset($sql) as $row) + { + $birthday = realdate($row['user_birthday_old'], 'Y-m-d'); + DB()->query("UPDATE ". BB_USERS ." SET user_birthday = '". $birthday ."' WHERE user_id = ". $row['user_id'] .""); + } + + DB()->query("ALTER TABLE ". BB_USERS ." DROP user_birthday_old"); + + bb_die('

База данных обновлена

'); +} else { + $msg = '
'; + $msg .= '

!!! Перед тем как нажать на кнопку, сделайте бекап базы данных !!!


'; + $msg .= ''; + $msg .= '
'; + + bb_die($msg); +} \ No newline at end of file diff --git a/upgrade/r600-stable.php b/upgrade/r600-stable.php index c707e8bbe..fb7ff2498 100644 --- a/upgrade/r600-stable.php +++ b/upgrade/r600-stable.php @@ -14,4 +14,127 @@ $user->session_start(); set_die_append_msg(); if (!IS_SUPER_ADMIN) bb_die($lang['ONLY_FOR_SUPER_ADMIN']); -// DRAFT, TODO IN NEXT REVISIONS \ No newline at end of file +// DRAFT, TODO IN NEXT REVISIONS + +/* + +INSERT INTO `bb_config` VALUES ('tor_comment', '1'); // добавлено 407 +ALTER TABLE `bb_posts` ADD `post_mod_comment` TEXT NOT NULL DEFAULT ''; // добавлено 458 +ALTER TABLE `bb_posts` ADD `post_mod_comment_type` TINYINT( 1 ) NOT NULL DEFAULT '0'; // добавлено 458 +ALTER TABLE `bb_posts` ADD `post_mc_mod_id` mediumint(8) NOT NULL; // добавлено 458 +ALTER TABLE `bb_posts` ADD `post_mc_mod_name` varchar(25) NOT NULL DEFAULT ''; // добавлено 458 +ALTER TABLE `bb_topics` ADD COLUMN `is_draft` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0' AFTER `topic_show_first_post`; // удалено 486 +ALTER TABLE `bb_users` CHANGE `user_birthday` `user_birthday` date NOT NULL DEFAULT '0000-00-00'; // изменено 496 +// 496 - отдельный конвертер +ALTER TABLE `bb_users` ADD `tpl_name` varchar(255) NOT NULL DEFAULT 'default'; // добавлено 507 +INSERT INTO `bb_config` VALUES ('bt_unset_dltype_on_tor_unreg', '1'); // изменено значение 508 +ALTER TABLE `bb_users` DROP `ignore_srv_load`; // удалено 537 +INSERT INTO `bb_users` VALUES (-1, 0, 'Guest', // переименовали гостя 540 +DROP TABLE IF EXISTS `bb_bt_torrents_del`; // удалено 551 +DROP TABLE IF EXISTS `xbt_announce_log`; // удалено 551 +DROP TABLE IF EXISTS `xbt_config`; // удалено 551 +DROP TABLE IF EXISTS `xbt_deny_from_hosts`; // удалено 551 +DROP TABLE IF EXISTS `xbt_files_users`; // удалено 551 +DROP TABLE IF EXISTS `xbt_scrape_log`; // удалено 551 +ALTER TABLE `bb_bt_tracker` DROP `xbt_error`; // удалено 551 +INSERT INTO `bb_config` VALUES ('torrent_pass_private_key', 'вставить_из_конфига_XBTT'); // удалено 551 +INSERT INTO `bb_config` VALUES ('board_email', 'board_email@yourdomain.com'); // удалено 552 +INSERT INTO `bb_config` VALUES ('board_email_form', '0'); // удалено 552 +INSERT INTO `bb_config` VALUES ('board_email_sig', 'Thanks, The Management'); // удалено 552 +INSERT INTO `bb_config` VALUES ('smtp_delivery', '0'); // удалено 552 +INSERT INTO `bb_config` VALUES ('smtp_host', ''); // удалено 552 +INSERT INTO `bb_config` VALUES ('smtp_password', ''); // удалено 552 +INSERT INTO `bb_config` VALUES ('smtp_username', ''); // удалено 552 +INSERT INTO `bb_config` VALUES ('gallery_enabled', '1'); // удалено 554 +INSERT INTO `bb_config` VALUES ('pic_dir', 'pictures/'); // удалено 554 +INSERT INTO `bb_config` VALUES ('pic_max_size', '3'); // удалено 554 +INSERT INTO `bb_config` VALUES ('auto_delete_posted_pics', '1'); // удалено 554 +INSERT INTO `bb_config` VALUES ('allow_avatar_remote', '0'); // удалено 555 +ALTER TABLE `bb_topics` DROP COLUMN `is_draft`; +INSERT INTO `bb_users` VALUES (-1, 0, 'Guest', 'd41d8cd98f00b204e9800998ecf8427e', 0, 0, '0', // обновили число сообщенией гостю 561 +INSERT INTO `bb_config` VALUES ('bt_add_comment', ''); // удалено 565 +INSERT INTO `bb_config` VALUES ('bt_add_publisher', 'YourSiteName'); // удалено 565 +INSERT INTO `bb_config` VALUES ('bt_gen_passkey_on_reg', '1'); // удалено 565 +INSERT INTO `bb_config` VALUES ('bt_announce_url', 'http://demo.torrentpier.me/bt/announce.php'); // обновлено 565 +INSERT INTO `bb_config` VALUES ('site_desc', 'A little text to describe your forum'); // обновлено 565 +INSERT INTO `bb_posts` VALUES (1, 1, 1, 2, UNIX_TIMESTAMP(), '', '', 0, 0, 0, 0, 1, '', 0, 0, ''); // обновлено 570 +INSERT INTO `bb_topics` VALUES (1, 1, 'Добро пожаловать в TorrentPier II', 2, UNIX_TIMESTAMP(), // обновлено 570 +DROP TABLE IF EXISTS `bb_bt_dlstatus_main`; // переименовано 571 +DROP TABLE IF EXISTS `bb_bt_dlstatus_mrg`; // удалено 571 +DROP TABLE IF EXISTS `bb_bt_dlstatus_new`; // удалено 571 +DROP TABLE IF EXISTS `sph_counter`; // удалено 571 +// 571 - отдельный конвертер +INSERT INTO `bb_config` VALUES ('max_inbox_privmsgs', '200'); // удалено 573 +INSERT INTO `bb_config` VALUES ('max_savebox_privmsgs', '50'); // удалено 573 +INSERT INTO `bb_config` VALUES ('max_sentbox_privmsgs', '25'); // удалено 573 +INSERT INTO `bb_config` VALUES ('privmsg_disable', '0'); // удалено 573 +// добавлено 575 +CREATE TABLE IF NOT EXISTS `bb_poll_users` ( + `topic_id` int(10) unsigned NOT NULL, + `user_id` int(11) NOT NULL, + `vote_ip` varchar(32) NOT NULL, + `vote_dt` int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (`topic_id`,`user_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +// добавлено 575 +CREATE TABLE IF NOT EXISTS `bb_poll_votes` ( + `topic_id` int(10) unsigned NOT NULL, + `vote_id` tinyint(4) unsigned NOT NULL, + `vote_text` varchar(255) NOT NULL, + `vote_result` mediumint(8) unsigned NOT NULL, + PRIMARY KEY (`topic_id`,`vote_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +INSERT INTO `bb_config` VALUES ('config_id', '1'); // удалено 579 +INSERT INTO `bb_config` VALUES ('sendmail_fix', '0'); // удалено 579 +INSERT INTO `bb_config` VALUES ('version', '.0.22'); // удалено 579 +INSERT INTO `bb_config` VALUES ('xs_add_comments', '0'); // удалено 579 +INSERT INTO `bb_config` VALUES ('xs_auto_compile', '1'); // удалено 579 +INSERT INTO `bb_config` VALUES ('xs_auto_recompile', '1'); // удалено 579 +INSERT INTO `bb_config` VALUES ('xs_php', 'php'); // удалено 579 +INSERT INTO `bb_config` VALUES ('xs_shownav', '17'); // удалено 579 +INSERT INTO `bb_config` VALUES ('xs_template_time', '0'); // удалено 579 +INSERT INTO `bb_config` VALUES ('xs_version', '8'); // удалено 579 +INSERT INTO `bb_cron` VALUES (22, 1, 'Attach maintenance', 'attach_maintenance.php', 'daily', NULL, '05:00:00', 40, '', '', NULL, 1, '', 0, 1, 0); // добавлено 582 +INSERT INTO `bb_config` VALUES ('allow_avatar_local', '1'); // удалено 583 +INSERT INTO `bb_config` VALUES ('allow_avatar_upload', '1'); // удалено 583 +INSERT INTO `bb_config` VALUES ('avatar_filesize', '100000'); // удалено 583 +INSERT INTO `bb_config` VALUES ('avatar_gallery_path', 'images/avatars/gallery'); // удалено 583 +INSERT INTO `bb_config` VALUES ('avatar_max_height', '100'); // удалено 583 +INSERT INTO `bb_config` VALUES ('avatar_max_width', '100'); // удалено 583 +INSERT INTO `bb_config` VALUES ('avatar_path', 'images/avatars'); // удалено 583 +INSERT INTO `bb_config` VALUES ('require_activation', '0'); // удалено 583 +INSERT INTO `bb_config` VALUES ('no_avatar', 'images/avatars/gallery/noavatar.png'); // удалено 583 +INSERT INTO `bb_config` VALUES ('show_mod_index', '0'); // изменено 583 +INSERT INTO `bb_cron` VALUES (3, 1, 'Avatars cleanup', 'avatars_cleanup.php', // удалено заменено на аттачи 583 +// 583 - отдельный конвертер +DROP TABLE IF EXISTS `bb_topic_templates`; // удалено 584 +ALTER TABLE `bb_forums` DROP `topic_tpl_id`; // удалено 584 +INSERT INTO `bb_config` VALUES ('whois_info', 'http://ip-whois.net/ip_geos.php?ip='); // обновлено 586 +INSERT INTO `bb_config` VALUES ('default_lang', 'ru'); // обновлено 588 +// 588 - отдельный конвертер +ALTER TABLE `bb_users` DROP `user_next_birthday_greeting`; // удалено 589 +ALTER TABLE `bb_posts` CHANGE `post_mod_comment` `mc_comment` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT ''; // изменено 590 +ALTER TABLE `bb_posts` CHANGE `post_mod_comment_type` `mc_type` TINYINT(1) NOT NULL DEFAULT '0'; // изменено 590 +ALTER TABLE `bb_posts` CHANGE `post_mc_mod_id` `mc_user_id` MEDIUMINT(8) NOT NULL DEFAULT '0'; // изменено 590 +ALTER TABLE `bb_posts` DROP `post_mc_mod_name`; // изменено 590 +INSERT INTO `bb_attachments_config` VALUES ('allow_ftp_upload', '0'); // удалено 592 +INSERT INTO `bb_attachments_config` VALUES ('ftp_server', ''); // удалено 592 +INSERT INTO `bb_attachments_config` VALUES ('ftp_path', ''); // удалено 592 +INSERT INTO `bb_attachments_config` VALUES ('download_path', ''); // удалено 592 +INSERT INTO `bb_attachments_config` VALUES ('ftp_user', ''); // удалено 592 +INSERT INTO `bb_attachments_config` VALUES ('ftp_pass', ''); // удалено 592 +INSERT INTO `bb_attachments_config` VALUES ('ftp_pasv_mode', '1'); // удалено 592 +INSERT INTO `bb_extensions` VALUES (27, 6, 'wma', ''); // удалено 592 +INSERT INTO `bb_extensions` VALUES (28, 7, 'swf', ''); // удалено 592 +INSERT INTO `bb_extensions` VALUES (29, 6, 'torrent', ''); // изменено 592 +INSERT INTO `bb_extension_groups` VALUES (6, 'Streams', 2, 0, 1, '', 262144, ''); // удалено 592 +INSERT INTO `bb_extension_groups` VALUES (7, 'Flash Files', 3, 0, 1, '', 262144, ''); // удалено 592 +INSERT INTO `bb_extension_groups` VALUES (6, 'Torrent', 0, 1, 1, '', 122880, ''); // изменено 592 +INSERT INTO `bb_config` VALUES ('sitemap_time', ''); // добавлено 593 +INSERT INTO `bb_config` VALUES ('static_sitemap', ''); // добавлено 593 +INSERT INTO `bb_cron` VALUES (22, 1, 'Sitemap update', 'sitemap.php', 'daily', NULL, '06:00:00', 30, '', '', NULL, 0, '', 0, 0, 0); // добавлено 593 +INSERT INTO `bb_cron` VALUES (23, 1, 'Update forums atom', 'update_forums_atom.php', 'interval', NULL, NULL, 255, '', '', '00:15:00', 0, '', 0, 0, 0); // добавлено 595 +INSERT INTO `bb_attachments_config` VALUES ('upload_dir', 'old_files'); // изменено 595 +INSERT INTO `bb_smilies` VALUES (56, ':cd:', 'cd.gif', 'cd'); // удалено 596 + + */ \ No newline at end of file From 9eaa8c4c2eb2c8fc9ea9a88ead0fd838971a5fae Mon Sep 17 00:00:00 2001 From: Exile Date: Sun, 24 Aug 2014 02:49:49 +0400 Subject: [PATCH 6/9] Css MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Пара фиксов. --- upload/templates/default/css/main.css | 2 +- upload/templates/default/page_header.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/upload/templates/default/css/main.css b/upload/templates/default/css/main.css index b8d1bec7d..f09322839 100644 --- a/upload/templates/default/css/main.css +++ b/upload/templates/default/css/main.css @@ -407,7 +407,7 @@ table.forumline { font-size: 9px !important; text-transform: uppercase; } .forumline td { - border: solid #B7C0C5; border-width: 0 1px 1px; + border: 1px solid #B7C0C5; border-width: 0 1px 1px; } .forumline th, .thHead { padding: 6px 8px 7px; text-align: center; diff --git a/upload/templates/default/page_header.tpl b/upload/templates/default/page_header.tpl index d0c7b1a35..fc2263f0b 100644 --- a/upload/templates/default/page_header.tpl +++ b/upload/templates/default/page_header.tpl @@ -309,7 +309,7 @@ $(document).ready(function() { {L_USER_WELCOME} {THIS_USER} [ {L_LOGOUT} ] - +