From 9a2981953d90aba156c7a4e93769beec4fcbe940 Mon Sep 17 00:00:00 2001 From: Yuriy Pikhtarev Date: Sun, 25 Jun 2017 00:01:22 +0300 Subject: [PATCH 01/14] New project domain name. --- CODE_OF_CONDUCT.md | 2 +- CONTRIBUTING.md | 2 +- README.md | 10 +++++----- admin/admin_bt_forum_cfg.php | 2 +- admin/admin_bt_tracker_cfg.php | 2 +- composer.json | 17 +++++++++-------- install/sql/mysql.sql | 8 ++++---- library/config.php | 2 +- library/includes/page_footer.php | 2 +- library/includes/torrent_announce_urls.php | 6 +++--- library/language/source/html/sidebar1.html | 4 ++-- library/language/source/main.php | 2 +- opensearch_desc.xml | 4 ++-- opensearch_desc_bt.xml | 4 ++-- package.json | 2 +- robots.txt | 4 ++-- src/Legacy/Common/User.php | 2 +- styles/templates/posting_tpl.tpl | 2 +- 18 files changed, 39 insertions(+), 38 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 344912b6b..522445d96 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe ## Enforcement -Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at admin@torrentpier.me. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at admin@torrentpier.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 179dd4f62..e06246e9b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -73,7 +73,7 @@ further defined and clarified by project maintainers. ### Enforcement Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported by contacting the project team at admin@torrentpier.me. All +reported by contacting the project team at admin@torrentpier.com. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. diff --git a/README.md b/README.md index 39cedfc02..ac3657f1e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -

+

Slack Crowdin @@ -15,7 +15,7 @@ TorrentPier — bull-powered BitTorrent tracker engine, written in php. High speed, simple modification, high load architecture, built-in support for alternative compiled announcers (Ocelot, XBT). In addition we have very helpful -[official support forum](https://torrentpier.me/forum), where among other things it is possible to test the live +[official support forum](https://torrentpier.com/forum), where among other things it is possible to test the live demo, get any support and download modifications for engine. ## Current status @@ -65,7 +65,7 @@ and chmod 0644 for files in them. If you are not sure, leave it as is. ## The recommended way to run cron.php For significant tracker speed increase may be required to replace built-in cron.php by operating system daemon. For more -information about that you can read [this thread](https://torrentpier.me/forum/threads/52/) on our support forum. +information about that you can read [this thread](https://torrentpier.com/forum/threads/52/) on our support forum. ## Local configuration copy @@ -77,11 +77,11 @@ should not be available for reading to anyone by setting up access rights for yo We have built-in support for alternate compiled announcer — Ocelot. The configuration is in the file **library/config.php**, the announcer is in the repository [torrentpier/ocelot](https://github.com/torrentpier/ocelot). You can read assembly instructions -on his repository or in [this thread](https://torrentpier.me/forum/threads/26078/) on our support forum. +on his repository or in [this thread](https://torrentpier.com/forum/threads/26078/) on our support forum. ## Official documentation -Documentation for TorrentPier can be found on the [TorrentPier docs website](https://docs.torrentpier.me). +Documentation for TorrentPier can be found on the [TorrentPier docs website](https://docs.torrentpier.com). ## Contributing diff --git a/admin/admin_bt_forum_cfg.php b/admin/admin_bt_forum_cfg.php index 152d0ad16..5f73ff3e7 100644 --- a/admin/admin_bt_forum_cfg.php +++ b/admin/admin_bt_forum_cfg.php @@ -43,7 +43,7 @@ $cfg = []; * All config names with default values */ $default_cfg_str = array( - 'bt_announce_url' => 'http://demo.torrentpier.me/bt/', + 'bt_announce_url' => 'http://demo.torrentpier.com/bt/', ); $default_cfg_bool = array( diff --git a/admin/admin_bt_tracker_cfg.php b/admin/admin_bt_tracker_cfg.php index 506151371..a43f5e888 100644 --- a/admin/admin_bt_tracker_cfg.php +++ b/admin/admin_bt_tracker_cfg.php @@ -45,7 +45,7 @@ $confirmed = isset($_POST['confirm']); */ $default_cfg_str = array( 'off_reason' => 'Tracker is disabled', - 'browser_redirect_url' => 'http://demo.torrentpier.me/', + 'browser_redirect_url' => 'http://demo.torrentpier.com/', ); $default_cfg_bool = array( diff --git a/composer.json b/composer.json index 59dfa135b..5b43556d8 100644 --- a/composer.json +++ b/composer.json @@ -8,31 +8,32 @@ "torrent", "tracker" ], - "homepage": "https://torrentpier.me/", + "homepage": "https://torrentpier.com/", "license": "MIT", "authors": [ { "name": "Exile", - "email": "admin@torrentpier.me", - "homepage": "https://torrentpier.me/forum/members/exile.1/", + "email": "admin@torrentpier.com", + "homepage": "https://torrentpier.com/forum/members/exile.1/", "role": "Developer" }, { "name": "Diolektor", - "homepage": "https://torrentpier.me/forum/members/diolektor.5765/", + "homepage": "https://torrentpier.com/forum/members/diolektor.5765/", "role": "Developer" }, { "name": "PheRum", - "homepage": "https://torrentpier.me/forum/members/pherum.23/", + "homepage": "https://torrentpier.com/forum/members/pherum.23/", "role": "Developer" } ], "support": { - "email": "support@torrentpier.me", + "email": "support@torrentpier.com", "issues": "https://github.com/torrentpier/torrentpier/issues", - "forum": "https://torrentpier.me/forum/", - "docs": "https://docs.torrentpier.me/" + "forum": "https://torrentpier.com/forum/", + "irc": "http://torrentpier.herokuapp.com/", + "docs": "https://docs.torrentpier.com/" }, "require": { "php": "^5.6 || ^7.0", diff --git a/install/sql/mysql.sql b/install/sql/mysql.sql index 834ba4e66..ff5b7cf00 100644 --- a/install/sql/mysql.sql +++ b/install/sql/mysql.sql @@ -487,7 +487,7 @@ INSERT INTO `bb_config` VALUES ('birthday_min_age', '10'); INSERT INTO `bb_config` VALUES ('birthday_check_day', '7'); INSERT INTO `bb_config` VALUES ('bt_add_auth_key', '1'); INSERT INTO `bb_config` VALUES ('bt_allow_spmode_change', '1'); -INSERT INTO `bb_config` VALUES ('bt_announce_url', 'https://demo.torrentpier.me/bt/announce.php'); +INSERT INTO `bb_config` VALUES ('bt_announce_url', 'https://demo.torrentpier.com/bt/announce.php'); INSERT INTO `bb_config` VALUES ('bt_disable_dht', '0'); INSERT INTO `bb_config` VALUES ('bt_check_announce_url', '0'); INSERT INTO `bb_config` VALUES ('bt_del_addit_ann_urls', '1'); @@ -964,7 +964,7 @@ CREATE TABLE IF NOT EXISTS `bb_posts_text` ( -- Records of bb_posts_text -- ---------------------------- INSERT INTO `bb_posts_text` VALUES ('1', - 'Благодарим вас за установку новой версии TorrentPier Aurochs!\n\nЧто делать дальше? Сперва настройте ваш сайт в администраторском разделе. Измените базовые опции: заголовок сайта, число сообщений на страницу, часовой пояс, язык по-умолчанию, настройки сидбонусов, дней рождения и т.д. Создайте несколько форумов, а также не забудьте переименовать или удалить этот. Обязательно настройте возможность создания релизов в созданных вами разделах и добавьте [url=https://torrentpier.me/threads/25867/]шаблоны оформления раздач[/url] для них. Если у вас возникнут вопросы или потребность в дополнительных модификациях, [url=https://torrentpier.me/forum/]посетите наш форум[/url].\n\nТакже напоминаем, что у проекта TorrentPier есть несколько сайтов, которые могут оказаться полезны для вас:\n[list]\n[*]Форум: https://torrentpier.me/forum/\n[*]Демо-версия: https://demo.torrentpier.me/\n[*]Инструкция: https://docs.torrentpier.me/\n[*]Центр загрузки: https://get.torrentpier.me/\n[*]Перевод на другие языки: https://crowdin.com/project/torrentpier\n[/list]\nНе забудьте добавить их себе в закладки и регулярно проверять наличие новых версий движка на нашем форуме, для своевременного обновления.\n\nНе сомневаемся, вам под силу создать самый лучший трекер. Удачи!'); + 'Благодарим вас за установку новой версии TorrentPier Aurochs!\n\nЧто делать дальше? Сперва настройте ваш сайт в администраторском разделе. Измените базовые опции: заголовок сайта, число сообщений на страницу, часовой пояс, язык по-умолчанию, настройки сидбонусов, дней рождения и т.д. Создайте несколько форумов, а также не забудьте переименовать или удалить этот. Обязательно настройте возможность создания релизов в созданных вами разделах и добавьте [url=https://torrentpier.com/threads/25867/]шаблоны оформления раздач[/url] для них. Если у вас возникнут вопросы или потребность в дополнительных модификациях, [url=https://torrentpier.com/forum/]посетите наш форум[/url].\n\nТакже напоминаем, что у проекта TorrentPier есть несколько сайтов, которые могут оказаться полезны для вас:\n[list]\n[*]Форум: https://torrentpier.com/forum/\n[*]Демо-версия: https://demo.torrentpier.com/\n[*]Инструкция: https://docs.torrentpier.com/\n[*]Центр загрузки: https://get.torrentpier.com/\n[*]Перевод на другие языки: https://crowdin.com/project/torrentpier\n[/list]\nНе забудьте добавить их себе в закладки и регулярно проверять наличие новых версий движка на нашем форуме, для своевременного обновления.\n\nНе сомневаемся, вам под силу создать самый лучший трекер. Удачи!'); -- ---------------------------- -- Table structure for `bb_privmsgs` @@ -1339,14 +1339,14 @@ INSERT INTO `bb_users` VALUES '144', '0', '0', '0', '0000-00-00', - 'bot@torrentpier.me', '', '', '', '', '', '', '', '', '', '', '', '0', '0.00', 'default'); + 'bot@torrentpier.com', '', '', '', '', '', '', '', '', '', '', '', '0', '0.00', 'default'); INSERT INTO `bb_users` VALUES ('2', '1', 'admin', 'c3284d0f94606de1fd2af172aba15bf3', '0', '0', '0', UNIX_TIMESTAMP(), '0', '1', '1', '', 'ru', '0', '0', '0', '304', '1', '0', '0', '0000-00-00', - 'admin@torrentpier.me', '', '', '', '', '', '', '', '', '', '', '', '0', '0.00', 'default'); + 'admin@torrentpier.com', '', '', '', '', '', '', '', '', '', '', '', '0', '0.00', 'default'); -- ---------------------------- -- Table structure for `bb_user_group` diff --git a/library/config.php b/library/config.php index 1067b7269..f984a5905 100644 --- a/library/config.php +++ b/library/config.php @@ -27,7 +27,7 @@ if (!defined('BB_ROOT')) { die(basename(__FILE__)); } -$domain_name = 'torrentpier.me'; // enter here your primary domain name of your site +$domain_name = 'torrentpier.com'; // enter here your primary domain name of your site $domain_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : $domain_name; $bb_cfg = []; diff --git a/library/includes/page_footer.php b/library/includes/page_footer.php index 0e30beff8..25c8d0879 100644 --- a/library/includes/page_footer.php +++ b/library/includes/page_footer.php @@ -32,7 +32,7 @@ global $bb_cfg, $userdata, $template, $DBS, $lang; if (!empty($template)) { $template->assign_vars(array( 'SIMPLE_FOOTER' => !empty($gen_simple_header), - 'POWERED' => 'Tracker software by TorrentPier © 2005-' . date('Y'), + 'POWERED' => 'Tracker software by TorrentPier © 2005-' . date('Y'), 'SHOW_ADMIN_LINK' => (IS_ADMIN && !defined('IN_ADMIN')), 'ADMIN_LINK_HREF' => "admin/index.php", )); diff --git a/library/includes/torrent_announce_urls.php b/library/includes/torrent_announce_urls.php index 3d3954515..3a55a66d0 100644 --- a/library/includes/torrent_announce_urls.php +++ b/library/includes/torrent_announce_urls.php @@ -30,7 +30,7 @@ if (!defined('BB_ROOT')) { $announce_urls = array(); // Here you can define additional allowed announce urls -// For example, if you want to add http://demo.torrentpier.me -// add this line: $announce_urls[] = 'http://demo.torrentpier.me/bt/announce.php'; +// For example, if you want to add http://demo.torrentpier.com +// add this line: $announce_urls[] = 'http://demo.torrentpier.com/bt/announce.php'; -// $announce_urls[] = 'http://demo.torrentpier.me/bt/announce.php'; +// $announce_urls[] = 'http://demo.torrentpier.com/bt/announce.php'; diff --git a/library/language/source/html/sidebar1.html b/library/language/source/html/sidebar1.html index e33754d0e..43553651b 100644 --- a/library/language/source/html/sidebar1.html +++ b/library/language/source/html/sidebar1.html @@ -13,8 +13,8 @@

FAQ

diff --git a/library/language/source/main.php b/library/language/source/main.php index ca46472aa..8e8ccf5a1 100644 --- a/library/language/source/main.php +++ b/library/language/source/main.php @@ -2747,7 +2747,7 @@ $lang['SITEMAP_BING_1'] = 'Register your site at http://torrentpier.me/favicon.png - + http://torrentpier.com/favicon.png + diff --git a/opensearch_desc_bt.xml b/opensearch_desc_bt.xml index 3551e6192..b70ac4eef 100644 --- a/opensearch_desc_bt.xml +++ b/opensearch_desc_bt.xml @@ -3,6 +3,6 @@ TorrentPier (Tracker) TorrentPier (Tracker) UTF-8 - http://torrentpier.me/favicon.png - + http://torrentpier.com/favicon.png + diff --git a/package.json b/package.json index 3c643d0c9..1a8da2dc9 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "description": "Bull-powered BitTorrent tracker engine", "main": "index.js", "repository": "git@github.com:torrentpier/torrentpier.git", - "author": "Exile ", + "author": "Exile ", "license": "MIT", "dependencies": { "jquery": "^3.2.1" diff --git a/robots.txt b/robots.txt index 9944263bb..d72f95ae7 100644 --- a/robots.txt +++ b/robots.txt @@ -9,5 +9,5 @@ Disallow: /posting.php Disallow: /privmsg.php Disallow: /profile.php -Host: torrentpier.me -Sitemap: http://torrentpier.me/sitemap.xml +Host: torrentpier.com +Sitemap: http://torrentpier.com/sitemap.xml diff --git a/src/Legacy/Common/User.php b/src/Legacy/Common/User.php index cd42e7942..992f364e7 100644 --- a/src/Legacy/Common/User.php +++ b/src/Legacy/Common/User.php @@ -257,7 +257,7 @@ class User $sql = "SELECT ban_id FROM " . BB_BANLIST . " WHERE $where_sql LIMIT 1"; if (DB()->fetch_row($sql)) { - header('Location: https://torrentpier.me/banned/'); + header('Location: https://torrentpier.com/banned/'); } } diff --git a/styles/templates/posting_tpl.tpl b/styles/templates/posting_tpl.tpl index 67eeb9e2e..7e199d733 100644 --- a/styles/templates/posting_tpl.tpl +++ b/styles/templates/posting_tpl.tpl @@ -119,7 +119,7 @@ var TPL = { // значения для автозаполнителя формы. если не определено, то заполняется названием year : 2011, - poster : 'https://demo.torrentpier.me/styles/images/logo/logo.pngs', + poster : 'https://demo.torrentpier.com/styles/images/logo/logo.png', screenshots : 'http://img462.imageshack.us/img462/8360/snapshot20070911141251ee8.png\n[img]http://img513.imageshack.us/img513/7226/snapshot20070911141324ey9.png[/img]\nhttp://img513.imageshack.us/img513/2809/snapshot20070911141335tt2.png\n[img]http://img211.imageshack.us/img211/2936/snapshot20070911141603ew2.png[/img]', // dummy From 3aa757cdeae5a2b9da2cc1ea071c75afffde2e75 Mon Sep 17 00:00:00 2001 From: Yuriy Pikhtarev Date: Sun, 25 Jun 2017 00:05:44 +0300 Subject: [PATCH 02/14] Composer support section error. --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index 5b43556d8..9ab4061c5 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,6 @@ "email": "support@torrentpier.com", "issues": "https://github.com/torrentpier/torrentpier/issues", "forum": "https://torrentpier.com/forum/", - "irc": "http://torrentpier.herokuapp.com/", "docs": "https://docs.torrentpier.com/" }, "require": { From 9843d2d6427b0f69e62f59d7a17805762bcb46f1 Mon Sep 17 00:00:00 2001 From: Yuriy Pikhtarev Date: Sun, 25 Jun 2017 00:12:27 +0300 Subject: [PATCH 03/14] Crowdin language pack update for new project domain name. --- library/language/af/html/sidebar1.html | 4 ++-- library/language/af/main.php | 2 +- library/language/ar/html/sidebar1.html | 4 ++-- library/language/ar/main.php | 2 +- library/language/az/html/sidebar1.html | 4 ++-- library/language/az/main.php | 2 +- library/language/be/html/sidebar1.html | 4 ++-- library/language/be/main.php | 2 +- library/language/bg/html/sidebar1.html | 4 ++-- library/language/bg/main.php | 2 +- library/language/bs/html/sidebar1.html | 4 ++-- library/language/bs/main.php | 2 +- library/language/ca/html/sidebar1.html | 4 ++-- library/language/ca/main.php | 2 +- library/language/cs/html/sidebar1.html | 4 ++-- library/language/cs/main.php | 2 +- library/language/da/html/sidebar1.html | 4 ++-- library/language/da/main.php | 2 +- library/language/de/html/sidebar1.html | 4 ++-- library/language/de/main.php | 2 +- library/language/el/html/sidebar1.html | 4 ++-- library/language/el/main.php | 2 +- library/language/en/html/sidebar1.html | 4 ++-- library/language/en/main.php | 2 +- library/language/es/html/sidebar1.html | 4 ++-- library/language/es/main.php | 2 +- library/language/et/html/sidebar1.html | 4 ++-- library/language/et/main.php | 2 +- library/language/fi/html/sidebar1.html | 4 ++-- library/language/fi/main.php | 2 +- library/language/fr/html/sidebar1.html | 4 ++-- library/language/fr/main.php | 2 +- library/language/he/html/sidebar1.html | 4 ++-- library/language/he/main.php | 2 +- library/language/hi/html/sidebar1.html | 4 ++-- library/language/hi/main.php | 2 +- library/language/hr/html/sidebar1.html | 4 ++-- library/language/hr/main.php | 2 +- library/language/hu/html/sidebar1.html | 4 ++-- library/language/hu/main.php | 2 +- library/language/hy/html/sidebar1.html | 4 ++-- library/language/hy/main.php | 2 +- library/language/id/html/sidebar1.html | 4 ++-- library/language/id/main.php | 2 +- library/language/it/html/sidebar1.html | 4 ++-- library/language/it/main.php | 2 +- library/language/ja/html/sidebar1.html | 4 ++-- library/language/ja/main.php | 2 +- library/language/ka/html/sidebar1.html | 4 ++-- library/language/ka/main.php | 2 +- library/language/kk/html/sidebar1.html | 4 ++-- library/language/kk/main.php | 2 +- library/language/ko/html/sidebar1.html | 4 ++-- library/language/ko/main.php | 2 +- library/language/lt/html/sidebar1.html | 4 ++-- library/language/lt/main.php | 2 +- library/language/lv/html/sidebar1.html | 4 ++-- library/language/lv/main.php | 2 +- library/language/nl/html/sidebar1.html | 4 ++-- library/language/nl/main.php | 2 +- library/language/no/html/sidebar1.html | 4 ++-- library/language/no/main.php | 2 +- library/language/pl/html/sidebar1.html | 4 ++-- library/language/pl/main.php | 2 +- library/language/pt/html/sidebar1.html | 4 ++-- library/language/pt/main.php | 2 +- library/language/ro/html/sidebar1.html | 4 ++-- library/language/ro/main.php | 2 +- library/language/ru/html/sidebar1.html | 4 ++-- library/language/ru/main.php | 2 +- library/language/sk/html/sidebar1.html | 4 ++-- library/language/sk/main.php | 2 +- library/language/sl/html/sidebar1.html | 4 ++-- library/language/sl/main.php | 2 +- library/language/sq/html/sidebar1.html | 4 ++-- library/language/sq/main.php | 2 +- library/language/sr/html/sidebar1.html | 4 ++-- library/language/sr/main.php | 2 +- library/language/sv/html/sidebar1.html | 4 ++-- library/language/sv/main.php | 2 +- library/language/tg/html/sidebar1.html | 4 ++-- library/language/tg/main.php | 2 +- library/language/th/html/sidebar1.html | 4 ++-- library/language/th/main.php | 2 +- library/language/tr/html/sidebar1.html | 4 ++-- library/language/tr/main.php | 2 +- library/language/uk/html/sidebar1.html | 6 +++--- library/language/uk/main.php | 26 +++++++++++++------------- library/language/uz/html/sidebar1.html | 4 ++-- library/language/uz/main.php | 2 +- library/language/vi/html/sidebar1.html | 4 ++-- library/language/vi/main.php | 2 +- library/language/zh/html/sidebar1.html | 4 ++-- library/language/zh/main.php | 2 +- 94 files changed, 154 insertions(+), 154 deletions(-) diff --git a/library/language/af/html/sidebar1.html b/library/language/af/html/sidebar1.html index e11b33a6b..a804e785d 100644 --- a/library/language/af/html/sidebar1.html +++ b/library/language/af/html/sidebar1.html @@ -13,8 +13,8 @@

Vrae

 diff --git a/library/language/af/main.php b/library/language/af/main.php index a9ac2bcf6..6f86b4044 100644 --- a/library/language/af/main.php +++ b/library/language/af/main.php @@ -2747,7 +2747,7 @@ $lang['SITEMAP_BING_1'] = 'Registreer jou webwerf by
  • شروط الاستخدام
    • -
  • الأسئلة الشائعة للمبتدئين
    • -
  • أين هو السؤال ؟
    • +
  • الأسئلة الشائعة للمبتدئين
    • +
  • أين هو السؤال ؟
    • diff --git a/library/language/ar/main.php b/library/language/ar/main.php index d69355ca3..27b95fda3 100644 --- a/library/language/ar/main.php +++ b/library/language/ar/main.php @@ -2747,7 +2747,7 @@ $lang['SITEMAP_BING_1'] = 'تسجيل موقعك في
  • İstifadə şərtləri
    • -
  • FAQ başlayanlar üçün
    • -
  • Burada bir sual verim?
    • +
  • FAQ başlayanlar üçün
    • +
  • Burada bir sual verim?
    • diff --git a/library/language/az/main.php b/library/language/az/main.php index c7c4847aa..4ed68b267 100644 --- a/library/language/az/main.php +++ b/library/language/az/main.php @@ -2747,7 +2747,7 @@ $lang['SITEMAP_BING_1'] = 'Qeydiyyatdan sizin sayta
  • Умовы выкарыстання
    • -
  • FAQ для пачаткоўцаў
    • -
  • Дзе задаць пытанне?
    • +
  • FAQ для пачаткоўцаў
    • +
  • Дзе задаць пытанне?
    • diff --git a/library/language/be/main.php b/library/language/be/main.php index 30fbafef5..53edca97b 100644 --- a/library/language/be/main.php +++ b/library/language/be/main.php @@ -2747,7 +2747,7 @@ $lang['SITEMAP_BING_1'] = 'Зарэгістраваць свой сайт у Често задавани въпроси diff --git a/library/language/bg/main.php b/library/language/bg/main.php index 11134aaca..e6b6015e7 100644 --- a/library/language/bg/main.php +++ b/library/language/bg/main.php @@ -2747,7 +2747,7 @@ $lang['SITEMAP_BING_1'] = 'Регистрация на уеб сайт в Pitanja i odgovori o projektu diff --git a/library/language/bs/main.php b/library/language/bs/main.php index ea435d3f5..fc3d129ed 100644 --- a/library/language/bs/main.php +++ b/library/language/bs/main.php @@ -2747,7 +2747,7 @@ $lang['SITEMAP_BING_1'] = 'Registra tvog sajta na
  • Condicions d'ús
    • -
  • FAQ per a principiants
    • -
  • On és la pregunta?
    • +
  • FAQ per a principiants
    • +
  • On és la pregunta?
    • diff --git a/library/language/ca/main.php b/library/language/ca/main.php index 49bd27bb7..7297548d2 100644 --- a/library/language/ca/main.php +++ b/library/language/ca/main.php @@ -2747,7 +2747,7 @@ $lang['SITEMAP_BING_1'] = 'Registrar el seu lloc a
  • Podmínkami užívání
    • -
  • FAQ pro začátečníky
    • -
  • Kde se zeptat?
    • +
  • FAQ pro začátečníky
    • +
  • Kde se zeptat?
    • diff --git a/library/language/cs/main.php b/library/language/cs/main.php index 77f518251..e1a10d8b9 100644 --- a/library/language/cs/main.php +++ b/library/language/cs/main.php @@ -2747,7 +2747,7 @@ $lang['SITEMAP_BING_1'] = 'Zaregistrujte svůj web na
  • Betingelser for brug
    • -
  • FAQ for begyndere
    • -
  • Hvor er stille et spørgsmål?
    • +
  • FAQ for begyndere
    • +
  • Hvor er stille et spørgsmål?
    • diff --git a/library/language/da/main.php b/library/language/da/main.php index 491c14e5b..0f68a2468 100644 --- a/library/language/da/main.php +++ b/library/language/da/main.php @@ -2747,7 +2747,7 @@ $lang['SITEMAP_BING_1'] = 'Registrer dit websted på
  • Nutzungsbedingungen
    • -
  • FAQ für Anfänger
    • -
  • Wo ist eine Frage?
    • +
  • FAQ für Anfänger
    • +
  • Wo ist eine Frage?
    • diff --git a/library/language/de/main.php b/library/language/de/main.php index ea5793e2c..f13a89198 100644 --- a/library/language/de/main.php +++ b/library/language/de/main.php @@ -2747,7 +2747,7 @@ $lang['SITEMAP_BING_1'] = 'Registrieren Sie Ihre Website bei FAQ diff --git a/library/language/el/main.php b/library/language/el/main.php index bf99b4e76..3e215d0bd 100644 --- a/library/language/el/main.php +++ b/library/language/el/main.php @@ -2747,7 +2747,7 @@ $lang['SITEMAP_BING_1'] = 'Καταχωρήστε το site σας σε FAQ diff --git a/library/language/en/main.php b/library/language/en/main.php index 817071830..bf33a9a7c 100644 --- a/library/language/en/main.php +++ b/library/language/en/main.php @@ -2747,7 +2747,7 @@ $lang['SITEMAP_BING_1'] = 'Register your site at
  • Términos de uso
    • -
  • Preguntas más frecuentes para los principiantes
    • -
  • Donde es una pregunta?
    • +
  • Preguntas más frecuentes para los principiantes
    • +
  • Donde es una pregunta?
    • diff --git a/library/language/es/main.php b/library/language/es/main.php index 38b6b9911..f52156547 100644 --- a/library/language/es/main.php +++ b/library/language/es/main.php @@ -2747,7 +2747,7 @@ $lang['SITEMAP_BING_1'] = 'Registrar su sitio en
  • Kasutustingimused
    • -
  • KKK algajatele
    • -
  • Kui on küsimusi?
    • +
  • KKK algajatele
    • +
  • Kui on küsimusi?
    • diff --git a/library/language/et/main.php b/library/language/et/main.php index 7997ad8f8..298f761c2 100644 --- a/library/language/et/main.php +++ b/library/language/et/main.php @@ -2747,7 +2747,7 @@ $lang['SITEMAP_BING_1'] = 'Registreeri oma sait kell
  • Käyttöehdot
    • -
  • FAQ aloittelijoille
    • -
  • Missä on kysyä kysymyksen?
    • +
  • FAQ aloittelijoille
    • +
  • Missä on kysyä kysymyksen?
    • diff --git a/library/language/fi/main.php b/library/language/fi/main.php index b9d816b9a..e4649cafb 100644 --- a/library/language/fi/main.php +++ b/library/language/fi/main.php @@ -2747,7 +2747,7 @@ $lang['SITEMAP_BING_1'] = 'Rekisteröidy sivuston milloin
  • Conditions d’utilisation
    • -
  • FAQ pour les débutants
    • -
  • Où est la question?
    • +
  • FAQ pour les débutants
    • +
  • Où est la question?
    • diff --git a/library/language/fr/main.php b/library/language/fr/main.php index eb2894642..eade9212a 100644 --- a/library/language/fr/main.php +++ b/library/language/fr/main.php @@ -2747,7 +2747,7 @@ $lang['SITEMAP_BING_1'] = 'L\'inscription de votre site à
  • תנאי שימוש
    • -
  • שאלות ותשובות למתחילים
    • -
  • איפה לשאול שאלה?
    • +
  • שאלות ותשובות למתחילים
    • +
  • איפה לשאול שאלה?
    • diff --git a/library/language/he/main.php b/library/language/he/main.php index a1a8fcaf5..66631ba5b 100644 --- a/library/language/he/main.php +++ b/library/language/he/main.php @@ -2747,7 +2747,7 @@ $lang['SITEMAP_BING_1'] = 'לרשום את האתר שלך ב
  • उपयोग की शर्तें
    • -
  • शुरुआती के लिए अकसर किये गए सवाल
    • -
  • प्रश्न पूछना कहाँ है?
    • +
  • शुरुआती के लिए अकसर किये गए सवाल
    • +
  • प्रश्न पूछना कहाँ है?
    • diff --git a/library/language/hi/main.php b/library/language/hi/main.php index a25cc5c8f..7dba32d76 100644 --- a/library/language/hi/main.php +++ b/library/language/hi/main.php @@ -2747,7 +2747,7 @@ $lang['SITEMAP_BING_1'] = 'अपने माइक्रोसॉफ्ट ख $lang['SITEMAP_BING_2'] = 'साइट के साइटमैप को अपनी सेटिंग्स में पंजीकृत करें'; $lang['SITEMAP_ADD_TITLE'] = 'साइटमैप के लिए अतिरिक्त पृष्ठ'; $lang['SITEMAP_ADD_PAGE'] = 'अतिरिक्त पृष्ठ'; -$lang['SITEMAP_ADD_EXP_1'] = 'आप अपनी साइट पर अतिरिक्त पृष्ठ निर्दिष्ट कर सकते हैं (उदाहरण के लिए, http: //torrentpier.me/memberlist.php) जो कि आपके साइटमैप फ़ाइल में शामिल किए जाने चाहिए।'; +$lang['SITEMAP_ADD_EXP_1'] = 'आप अपनी साइट पर अतिरिक्त पृष्ठ निर्दिष्ट कर सकते हैं, जिसे आपके साइटमैप फ़ाइल में शामिल किया जाना चाहिए।'; $lang['SITEMAP_ADD_EXP_2'] = 'प्रत्येक संदर्भ HTTP (एस) से शुरू होना चाहिए: // और एक नई पंक्ति!'; $lang['FORUM_MAP'] = 'फ़ोरम का नक्शा'; diff --git a/library/language/hr/html/sidebar1.html b/library/language/hr/html/sidebar1.html index 6a2cee29e..bacac8a36 100644 --- a/library/language/hr/html/sidebar1.html +++ b/library/language/hr/html/sidebar1.html @@ -13,8 +13,8 @@

    Pitanja i odgovori

    diff --git a/library/language/hr/main.php b/library/language/hr/main.php index 466fd2a5b..781454390 100644 --- a/library/language/hr/main.php +++ b/library/language/hr/main.php @@ -2747,7 +2747,7 @@ $lang['SITEMAP_BING_1'] = 'Registrirati svoje web stranice u
  • Felhasználási feltételek
    • -
  • GYIK-kezdőknek
    • -
  • Hol kérdezhetek?
    • +
  • GYIK-kezdőknek
    • +
  • Hol kérdezhetek?
    • diff --git a/library/language/hu/main.php b/library/language/hu/main.php index 90f063376..5be7e589c 100644 --- a/library/language/hu/main.php +++ b/library/language/hu/main.php @@ -2747,7 +2747,7 @@ $lang['SITEMAP_BING_1'] = 'Regisztrálni a helyszínen
  • Պայմաններ եւ օգտագործման
    • -
  • FAQ սկսնակների համար
    • -
  • Որտեղ հարց տալ?
    • +
  • FAQ սկսնակների համար
    • +
  • Որտեղ հարց տալ?
    • diff --git a/library/language/hy/main.php b/library/language/hy/main.php index cb6b86764..f1890d1e7 100644 --- a/library/language/hy/main.php +++ b/library/language/hy/main.php @@ -2747,7 +2747,7 @@ $lang['SITEMAP_BING_1'] = 'Գրանցել ձեր կայքը
  • Aturan penggunaan
    • -
  • FAQ untuk pemula
    • -
  • Di mana adalah mengajukan pertanyaan?
    • +
  • FAQ untuk pemula
    • +
  • Di mana adalah mengajukan pertanyaan?
    • diff --git a/library/language/id/main.php b/library/language/id/main.php index 2cfe8700c..45e8814b3 100644 --- a/library/language/id/main.php +++ b/library/language/id/main.php @@ -2747,7 +2747,7 @@ $lang['SITEMAP_BING_1'] = 'Daftarkan situs anda di
  • Termini di utilizzo
    • -
  • FAQ per i principianti
    • -
  • Dove è una domanda?
    • +
  • FAQ per i principianti
    • +
  • Dove è una domanda?
    • diff --git a/library/language/it/main.php b/library/language/it/main.php index d68334216..6b4f31064 100644 --- a/library/language/it/main.php +++ b/library/language/it/main.php @@ -2747,7 +2747,7 @@ $lang['SITEMAP_BING_1'] = 'Registra il tuo sito in FAQ diff --git a/library/language/ja/main.php b/library/language/ja/main.php index d7ddd6b41..f4e5ed762 100644 --- a/library/language/ja/main.php +++ b/library/language/ja/main.php @@ -2747,7 +2747,7 @@ $lang['SITEMAP_BING_1'] = '登録サイトでხშირად დასმული კითხვები diff --git a/library/language/ka/main.php b/library/language/ka/main.php index 298266867..4c99dc8d8 100644 --- a/library/language/ka/main.php +++ b/library/language/ka/main.php @@ -2747,7 +2747,7 @@ $lang['SITEMAP_BING_1'] = 'დაარეგისტრირეთ თქვ $lang['SITEMAP_BING_2'] = 'რჩეულებში საიტის რუკა საიტის თქვენ დარეგისტრირებული, მისი პარამეტრები.'; $lang['SITEMAP_ADD_TITLE'] = 'დამატებითი გვერდები საიტის რუკა'; $lang['SITEMAP_ADD_PAGE'] = 'დამატებითი გვერდები'; -$lang['SITEMAP_ADD_EXP_1'] = 'თქვენ შეგიძლიათ მიუთითოთ დამატებითი გვერდები თქვენს საიტზე (მაგალითად, http://torrentpier.me/memberlist.php), რომელიც უნდა იყოს ჩართული, თქვენი საიტის რუკა ფაილი, რომ თქვენ შექმნა.'; +$lang['SITEMAP_ADD_EXP_1'] = 'თქვენ შეგიძლიათ მიუთითოთ დამატებითი გვერდები თქვენს საიტზე რომელიც უნდა იყოს ჩართული, თქვენი საიტის რუკა ფაილი, რომ თქვენ შექმნა.'; $lang['SITEMAP_ADD_EXP_2'] = 'თითოეული მინიშნება უნდა დაიწყოს http(s):// და ახალი ხაზის!'; $lang['FORUM_MAP'] = 'ფორუმები\' რუკაზე'; diff --git a/library/language/kk/html/sidebar1.html b/library/language/kk/html/sidebar1.html index adae0a9d7..c0c834818 100644 --- a/library/language/kk/html/sidebar1.html +++ b/library/language/kk/html/sidebar1.html @@ -13,8 +13,8 @@

    Жиі қойылатын сұрақтар

    diff --git a/library/language/kk/main.php b/library/language/kk/main.php index 4563e7c3c..5ac50c036 100644 --- a/library/language/kk/main.php +++ b/library/language/kk/main.php @@ -2747,7 +2747,7 @@ $lang['SITEMAP_BING_1'] = 'Егер Microsoft тіркелгісін пайда $lang['SITEMAP_BING_2'] = 'Сіз оның параметрлері тіркелген сайттың Сайт картасы қосыңыз.'; $lang['SITEMAP_ADD_TITLE'] = 'Сайт картасы Қосымша беттер'; $lang['SITEMAP_ADD_PAGE'] = 'Қосымша беттер'; -$lang['SITEMAP_ADD_EXP_1'] = 'Сіз жасау сіздің Сайт картасы файлына енгізілуі тиіс: Егер сіз сайттың (//torrentpier.me/memberlist.php мысалы, http) қосымша беттерді көрсетуге болады.'; +$lang['SITEMAP_ADD_EXP_1'] = 'Сіз жасау сіздің Сайт картасы файлына енгізілуі тиіс сіздің сайтында қосымша беттерді көрсетуге болады.'; $lang['SITEMAP_ADD_EXP_2'] = '// және жаңа жолға: Әрбір анықтама HTTP (S) басталуы тиіс!'; $lang['FORUM_MAP'] = 'Форумға картасы'; diff --git a/library/language/ko/html/sidebar1.html b/library/language/ko/html/sidebar1.html index 13917f148..c718da118 100644 --- a/library/language/ko/html/sidebar1.html +++ b/library/language/ko/html/sidebar1.html @@ -13,8 +13,8 @@

    FAQ

    diff --git a/library/language/ko/main.php b/library/language/ko/main.php index 4a5a33ab5..6637f9856 100644 --- a/library/language/ko/main.php +++ b/library/language/ko/main.php @@ -2747,7 +2747,7 @@ $lang['SITEMAP_BING_1'] = '귀하의 사이트에 등록에서
  • Naudojimosi sąlygos
    • -
  • DUK pradedantiesiems
    • -
  • Kur yra užduoti klausimą?
    • +
  • DUK pradedantiesiems
    • +
  • Kur yra užduoti klausimą?
    • diff --git a/library/language/lt/main.php b/library/language/lt/main.php index b66dc8ffb..c01afb388 100644 --- a/library/language/lt/main.php +++ b/library/language/lt/main.php @@ -2747,7 +2747,7 @@ $lang['SITEMAP_BING_1'] = 'Užregistruokite savo svetainę Biežāk UZDOTIE jautājumi diff --git a/library/language/lv/main.php b/library/language/lv/main.php index b49860877..59888e8e0 100644 --- a/library/language/lv/main.php +++ b/library/language/lv/main.php @@ -2747,7 +2747,7 @@ $lang['SITEMAP_BING_1'] = 'Reģistrējiet savu vietnē VEELGESTELDE vragen diff --git a/library/language/nl/main.php b/library/language/nl/main.php index d7e17c5d9..24589c32d 100644 --- a/library/language/nl/main.php +++ b/library/language/nl/main.php @@ -2747,7 +2747,7 @@ $lang['SITEMAP_BING_1'] = 'Het registreren van uw site bij
  • Bruksvilkår
    • -
  • FAQ for nybegynnere
    • -
  • Der er stille et spørsmål?
    • +
  • FAQ for nybegynnere
    • +
  • Der er stille et spørsmål?
    • diff --git a/library/language/no/main.php b/library/language/no/main.php index 032aaaa5a..9816286e0 100644 --- a/library/language/no/main.php +++ b/library/language/no/main.php @@ -2747,7 +2747,7 @@ $lang['SITEMAP_BING_1'] = 'Registrer nettstedet ditt på
  • Warunki użytkowania
    • -
  • FAQ dla początkujących
    • -
  • Gdzie zadać pytanie?
    • +
  • FAQ dla początkujących
    • +
  • Gdzie zadać pytanie?
    • diff --git a/library/language/pl/main.php b/library/language/pl/main.php index 1dcade54c..c8d059a7a 100644 --- a/library/language/pl/main.php +++ b/library/language/pl/main.php @@ -2747,7 +2747,7 @@ $lang['SITEMAP_BING_1'] = 'Zarejestrować swoją stronę w
  • Termos de uso
    • -
  • FAQ para iniciantes
    • -
  • Onde é fazer uma pergunta?
    • +
  • FAQ para iniciantes
    • +
  • Onde é fazer uma pergunta?
    • diff --git a/library/language/pt/main.php b/library/language/pt/main.php index 9a0a87d48..a11cd4e30 100644 --- a/library/language/pt/main.php +++ b/library/language/pt/main.php @@ -2747,7 +2747,7 @@ $lang['SITEMAP_BING_1'] = 'Registe o seu site em FAQ diff --git a/library/language/ro/main.php b/library/language/ro/main.php index 5011bacdc..175831bbe 100644 --- a/library/language/ro/main.php +++ b/library/language/ro/main.php @@ -2747,7 +2747,7 @@ $lang['SITEMAP_BING_1'] = 'Iti inscrii site-ul la
  • Условия использования
    • -
  • FAQ для новичков
    • -
  • Где задать вопрос?
    • +
  • FAQ для новичков
    • +
  • Где задать вопрос?
    • diff --git a/library/language/ru/main.php b/library/language/ru/main.php index 522e3ec75..63974c902 100644 --- a/library/language/ru/main.php +++ b/library/language/ru/main.php @@ -2747,7 +2747,7 @@ $lang['SITEMAP_BING_1'] = 'Зарегистрируйте ваш сайт в FAQ diff --git a/library/language/sk/main.php b/library/language/sk/main.php index 05b0923f6..8f84ffcdc 100644 --- a/library/language/sk/main.php +++ b/library/language/sk/main.php @@ -2747,7 +2747,7 @@ $lang['SITEMAP_BING_1'] = 'Zaregistrujte svoje stránky na
  • Pogoji uporabe
    • -
  • FAQ za začetnike
    • -
  • Kje je postaviti vprašanje?
    • +
  • FAQ za začetnike
    • +
  • Kje je postaviti vprašanje?
    • diff --git a/library/language/sl/main.php b/library/language/sl/main.php index 9631747d7..e19417fc5 100644 --- a/library/language/sl/main.php +++ b/library/language/sl/main.php @@ -2747,7 +2747,7 @@ $lang['SITEMAP_BING_1'] = 'Registrirajte svoje mesto na
  • Kushtet e përdorimit
    • -
  • FAQ për fillestar
    • -
  • Ku është bëj një pyetje?
    • +
  • FAQ për fillestar
    • +
  • Ku është bëj një pyetje?
    • diff --git a/library/language/sq/main.php b/library/language/sq/main.php index 4dda76852..d41bf4e10 100644 --- a/library/language/sq/main.php +++ b/library/language/sq/main.php @@ -2747,7 +2747,7 @@ $lang['SITEMAP_BING_1'] = 'Regjistrohuni në faqen tuaj në
  • Услови коришћења
    • -
  • ПИТАЊА за почетнике
    • -
  • Где да поставим питање?
    • +
  • ПИТАЊА за почетнике
    • +
  • Где да поставим питање?
    • diff --git a/library/language/sr/main.php b/library/language/sr/main.php index e95496e03..02d2461e7 100644 --- a/library/language/sr/main.php +++ b/library/language/sr/main.php @@ -2747,7 +2747,7 @@ $lang['SITEMAP_BING_1'] = 'Региструјте свој сајт у
  • Användarvillkoren
    • -
  • FAQ för nybörjare
    • -
  • Där är en fråga?
    • +
  • FAQ för nybörjare
    • +
  • Där är en fråga?
    • diff --git a/library/language/sv/main.php b/library/language/sv/main.php index 91ce2d913..54fca04e8 100644 --- a/library/language/sv/main.php +++ b/library/language/sv/main.php @@ -2747,7 +2747,7 @@ $lang['SITEMAP_BING_1'] = 'Registrera din webbplats på
  • Шартҳои истифодаи
    • -
  • FAQ барои шурӯъкунандагон
    • -
  • Дар куҷо аст, як савол?
    • +
  • FAQ барои шурӯъкунандагон
    • +
  • Дар куҷо аст, як савол?
    • diff --git a/library/language/tg/main.php b/library/language/tg/main.php index 1f91ce98c..16bcd3fa9 100644 --- a/library/language/tg/main.php +++ b/library/language/tg/main.php @@ -2747,7 +2747,7 @@ $lang['SITEMAP_BING_1'] = 'Ба Реестри сомонаи Шумо дар FAQ diff --git a/library/language/th/main.php b/library/language/th/main.php index 5283378b0..bd033795c 100644 --- a/library/language/th/main.php +++ b/library/language/th/main.php @@ -2747,7 +2747,7 @@ $lang['SITEMAP_BING_1'] = 'ลงทะเบียนของคุณเว $lang['SITEMAP_BING_2'] = 'เพิ่ม sitemap ของเว็บไซต์คุณจดทะเบียนในของมันตั้งค่าย'; $lang['SITEMAP_ADD_TITLE'] = 'เพิ่มเติมหน้าสำหรับ sitemap'; $lang['SITEMAP_ADD_PAGE'] = 'เพิ่มเติมหน้า'; -$lang['SITEMAP_ADD_EXP_1'] = 'คุณสามารถกำหนดเพิ่มเติมหน้าของคุณเว็บไซต์(เช่น http://torrentpier นฉัน/memberlist นphp)ซึ่งควรจะรวมอยู่ของคุณ sitemap แฟ้มที่คุณกำลังสร้าง'; +$lang['SITEMAP_ADD_EXP_1'] = 'คุณสามารถกำหนดเพิ่มเติมหน้าของคุณเว็บไซต์ซึ่งจะถูกรวมอยู่ของคุณ sitemap แฟ้มที่คุณกำลังสร้าง'; $lang['SITEMAP_ADD_EXP_2'] = 'แต่ละการอ้างอิงต้องเริ่มต้นกับ http(s)://และคนใหม่แถว!'; $lang['FORUM_MAP'] = 'Forums\'แผนที่'; diff --git a/library/language/tr/html/sidebar1.html b/library/language/tr/html/sidebar1.html index f3834e2f2..4a44ee430 100644 --- a/library/language/tr/html/sidebar1.html +++ b/library/language/tr/html/sidebar1.html @@ -13,8 +13,8 @@

    SSS

    diff --git a/library/language/tr/main.php b/library/language/tr/main.php index 013825caa..b39e379e6 100644 --- a/library/language/tr/main.php +++ b/library/language/tr/main.php @@ -2747,7 +2747,7 @@ $lang['SITEMAP_BING_1'] = 'μTorrent +
  • µTorrent
  • BitTorrent
  • Transmission
    • @@ -13,8 +13,8 @@

    ЧаПи

    diff --git a/library/language/uk/main.php b/library/language/uk/main.php index 4e8c63fcf..bbd69de66 100644 --- a/library/language/uk/main.php +++ b/library/language/uk/main.php @@ -70,7 +70,7 @@ $lang['AJAX_PREVIEW'] = 'Швидкий перегляд'; $lang['CONFIRM'] = 'Підтвердити'; $lang['YES'] = 'Так'; $lang['NO'] = 'Ні'; -$lang['ENABLED'] = 'Ввімкнено'; +$lang['ENABLED'] = 'Увімкнено'; $lang['DISABLED'] = 'Вимкнено'; $lang['ERROR'] = 'Помилка'; $lang['SELECT_ACTION'] = 'Виберіть дію'; @@ -92,10 +92,10 @@ $lang['PAGE_OF'] = 'Сторінка %d з %s'; $lang['ICQ'] = 'ICQ'; $lang['SKYPE'] = 'Skype'; -$lang['SKYPE_ERROR'] = 'Ви ввели невірний логін Skype'; +$lang['SKYPE_ERROR'] = 'Ви ввели неправильний логін Skype'; $lang['TWITTER'] = 'Твіттер'; -$lang['TWITTER_ERROR'] = 'Ви ввели некоректний логін Твіттер'; +$lang['TWITTER_ERROR'] = 'Ви ввели неправильний логін Твіттер'; $lang['FORUM_INDEX'] = 'Список форумів %s'; // eg. sitename Forum Index, %s can be removed if you prefer @@ -207,7 +207,7 @@ $lang['NO_FORUMS'] = 'Ця дошка немає форумів'; $lang['PRIVATE_MESSAGE'] = 'Приватне повідомлення'; $lang['PRIVATE_MESSAGES'] = 'Приватні повідомлення'; -$lang['WHOSONLINE'] = 'Хто в онлайні'; +$lang['WHOSONLINE'] = 'Зараз на форумі'; $lang['MARK_ALL_FORUMS_READ'] = 'Позначити всі форуми як прочитані'; $lang['FORUMS_MARKED_READ'] = 'Всі форуми позначено як переглянуті'; @@ -242,13 +242,13 @@ $lang['RULES_REPLY_CAN'] = 'Ви можете відповідати в $lang['RULES_REPLY_CANNOT'] = 'Ви не можете відповідати в темах на форумі'; $lang['RULES_EDIT_CAN'] = 'Ви можете редагувати свої повідомлення на форумі'; $lang['RULES_EDIT_CANNOT'] = 'Ви не можете редагувати свої повідомлення на форумі'; -$lang['RULES_DELETE_CAN'] = 'Ви можете видаляти повідомлення на форумі'; -$lang['RULES_DELETE_CANNOT'] = 'Ви не можете видаляти повідомлення на форумі'; +$lang['RULES_DELETE_CAN'] = 'Ви можете видаляти свої повідомлення на форумі'; +$lang['RULES_DELETE_CANNOT'] = 'Ви не можете видаляти свої повідомлення на форумі'; $lang['RULES_VOTE_CAN'] = 'Ви можете голосувати в опитуваннях на форумі'; $lang['RULES_VOTE_CANNOT'] = 'Ви не можете голосувати в опитуваннях на форумі'; $lang['RULES_MODERATE'] = 'Ви можете модерувати цей форум'; -$lang['NO_TOPICS_POST_ONE'] = 'На форумі поки немає повідомлень.
    Натисніть наСтворити нову тему, і Ваше повідомлення буде першим.'; +$lang['NO_TOPICS_POST_ONE'] = 'На форумі поки немає повідомлень.
    Натисніть на Створити нову тему, і Ваше повідомлення буде першим.'; // Viewtopic $lang['VIEW_TOPIC'] = 'Перегляд теми'; @@ -264,7 +264,7 @@ $lang['TOPIC_POST_NOT_EXIST'] = 'Теми або повідомлення, що $lang['NO_POSTS_TOPIC'] = 'В цій темі немає повідомлень'; $lang['DISPLAY_POSTS'] = 'Показати повідомлення'; -$lang['ALL_POSTS'] = 'всі повідомлення'; +$lang['ALL_POSTS'] = 'Всі повідомлення'; $lang['NEWEST_FIRST'] = 'Спочатку нові'; $lang['OLDEST_FIRST'] = 'Спочатку старі'; @@ -283,10 +283,10 @@ $lang['SPOILER_HEAD'] = 'прихований текст'; $lang['SPOILER_CLOSE'] = 'згорнути'; $lang['PLAY_ON_CURPAGE'] = 'Почати відтворення на цій сторінці'; -$lang['EDITED_TIME_TOTAL'] = 'Востаннє редаговано %s (%s); всього редаговано %d раз'; // Last edited by me on 12 Oct 2001; edited 1 time in total +$lang['EDITED_TIME_TOTAL'] = 'Востаннє редаговано %s (%s); всього редагувань: %d'; // Last edited by me on 12 Oct 2001; edited 1 time in total $lang['EDITED_TIMES_TOTAL'] = 'Востаннє редаговано %s (%s); всього редаговано %d разів'; // Last edited by me on 12 Oct 2001; edited 2 times in total -$lang['LOCK_TOPIC'] = 'Блокувати тему'; +$lang['LOCK_TOPIC'] = 'Закрити тему'; $lang['UNLOCK_TOPIC'] = 'Розблокувати тему'; $lang['MOVE_TOPIC'] = 'Перенести тему'; $lang['DELETE_TOPIC'] = 'Видалити тему'; @@ -298,7 +298,7 @@ $lang['NO_LONGER_WATCHING'] = 'Ви більше не стежите за ціє $lang['YOU_ARE_WATCHING'] = 'Тепер Ви стежите за цією темою'; $lang['TOTAL_VOTES'] = 'Всього голосів'; -$lang['SEARCH_IN_TOPIC'] = 'пошук в темі...'; +$lang['SEARCH_IN_TOPIC'] = 'пошук у темі...'; $lang['HIDE_IN_TOPIC'] = 'Приховати'; $lang['SHOW'] = 'Показати'; @@ -321,7 +321,7 @@ $lang['NO_POST_MODE'] = 'Не вказано режим публікації'; / $lang['POST_A_NEW_TOPIC'] = 'Створити нову тему'; $lang['POST_A_REPLY'] = 'Відповісти'; $lang['POST_TOPIC_AS'] = 'Створити тему як'; -$lang['EDIT_POST'] = 'Редагувати повідомлення'; +$lang['EDIT_POST'] = 'Змінити допис'; $lang['EDIT_TOPIC_TITLE'] = 'Змінити назву теми'; $lang['EDIT_POST_NOT_1'] = 'Вам не дозволено'; $lang['EDIT_POST_NOT_2'] = 'Ви не можете '; @@ -2749,7 +2749,7 @@ $lang['SITEMAP_BING_1'] = 'Зареєструйте Ваш сайт на TSS diff --git a/library/language/uz/main.php b/library/language/uz/main.php index ec7ea860d..fb7927c95 100644 --- a/library/language/uz/main.php +++ b/library/language/uz/main.php @@ -2747,7 +2747,7 @@ $lang['SITEMAP_BING_1'] = 'Microsoft hisob qaydnomasidan foydalanib
  • Điều khoản sử dụng
    • -
  • Hỏi ĐÁP cho người mới bắt đầu
    • -
  • Mà là một câu hỏi?
    • +
  • Hỏi ĐÁP cho người mới bắt đầu
    • +
  • Mà là một câu hỏi?
    • diff --git a/library/language/vi/main.php b/library/language/vi/main.php index 7650ff78a..9996d679f 100644 --- a/library/language/vi/main.php +++ b/library/language/vi/main.php @@ -2747,7 +2747,7 @@ $lang['SITEMAP_BING_1'] = 'Đăng ký trang web của bạn ở
  • 使用条款
    • -
  • 常见问题，对于初学者
    • -
  • 哪里是问个问题吗?
    • +
  • 常见问题，对于初学者
    • +
  • 哪里是问个问题吗?
    • diff --git a/library/language/zh/main.php b/library/language/zh/main.php index d8d1b34a8..3682f6618 100644 --- a/library/language/zh/main.php +++ b/library/language/zh/main.php @@ -2747,7 +2747,7 @@ $lang['SITEMAP_BING_1'] = '注册网站在', $code); $code = preg_replace('#\{(\#([a-z_][a-z0-9_]*?))\}#i', '', $code); $code = preg_replace('#\{([a-z0-9\-_]+?)\}#i', '', $code); From b54c9d0c2eedba13aee51837ccaf03be3a1e8820 Mon Sep 17 00:00:00 2001 From: Yuriy Pikhtarev Date: Sat, 29 Jul 2017 09:05:12 +0300 Subject: [PATCH 06/14] Various bug fixes described on the forum. --- README.md | 1 + admin/admin_disallow.php | 2 +- composer.json | 7 +++---- library/config.php | 3 ++- library/includes/functions.php | 2 +- library/includes/functions_atom.php | 22 ++++++++++---------- library/includes/functions_selects.php | 2 +- library/language/source/main.php | 2 ++ src/Helpers/CronHelper.php | 2 +- styles/templates/default/page_header.tpl | 2 +- styles/templates/default/usercp_register.tpl | 2 +- 11 files changed, 25 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index ac3657f1e..2b78813c2 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,7 @@ For installation you need to follow a few simple steps: 1. Create database and import dump located at **install/sql/mysql.sql** 1. Edit database configuration settings in the configuration file or a local copy (see below) 1. Edit domain name in the configuration file or a local copy (see below) +1. Edit domain ssl setting in the configuration file or a local copy (see below) 1. Edit this files: 1. **favicon.png** (change on your own) 1. **robots.txt** (change the addresses in lines **Host** and **Sitemap** on your own) diff --git a/admin/admin_disallow.php b/admin/admin_disallow.php index f7743a564..7f6275c1d 100644 --- a/admin/admin_disallow.php +++ b/admin/admin_disallow.php @@ -39,7 +39,7 @@ if (isset($_POST['add_name'])) { if ($disallowed_user == '') { bb_die($lang['FIELDS_EMPTY']); } - if (!validate_username($disallowed_user)) { + if (validate_username($disallowed_user)) { $message = $lang['DISALLOWED_ALREADY']; } else { $sql = 'INSERT INTO ' . BB_DISALLOW . " (disallow_username) VALUES('" . DB()->escape($disallowed_user) . "')"; diff --git a/composer.json b/composer.json index 9ab4061c5..a03a45ed1 100644 --- a/composer.json +++ b/composer.json @@ -14,17 +14,17 @@ { "name": "Exile", "email": "admin@torrentpier.com", - "homepage": "https://torrentpier.com/forum/members/exile.1/", + "homepage": "https://github.com/Exile37", "role": "Developer" }, { "name": "Diolektor", - "homepage": "https://torrentpier.com/forum/members/diolektor.5765/", + "homepage": "https://github.com/VasyOk", "role": "Developer" }, { "name": "PheRum", - "homepage": "https://torrentpier.com/forum/members/pherum.23/", + "homepage": "https://github.com/PheRum", "role": "Developer" } ], @@ -41,7 +41,6 @@ "gigablah/sphinxphp": "^2.0", "google/recaptcha": "^1.1", "longman/ip-tools": "^1.2", - "roave/security-advisories": "dev-master", "rych/bencode": "^1.0", "samdark/sitemap": "^2.0", "swiftmailer/swiftmailer": "^5.4", diff --git a/library/config.php b/library/config.php index 2eab9723e..508f4d1c5 100644 --- a/library/config.php +++ b/library/config.php @@ -29,6 +29,7 @@ if (!defined('BB_ROOT')) { $domain_name = 'torrentpier.com'; // enter here your primary domain name of your site $domain_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : $domain_name; +$domain_ssl = true; $bb_cfg = []; @@ -366,7 +367,7 @@ $bb_cfg['show_sidebar2_on_every_page'] = false; // Cookie $bb_cfg['cookie_domain'] = in_array($domain_name, [getenv('SERVER_ADDR'), 'localhost'], true) ? '' : ".$domain_name"; -$bb_cfg['cookie_secure'] = !empty($_SERVER['HTTPS']) ? 1 : 0; +$bb_cfg['cookie_secure'] = $domain_ssl ? true : (!empty($_SERVER['HTTPS']) ? true : false); $bb_cfg['cookie_prefix'] = 'bb_'; // 'bb_' // Sessions diff --git a/library/includes/functions.php b/library/includes/functions.php index bb4a708e7..896a9a316 100644 --- a/library/includes/functions.php +++ b/library/includes/functions.php @@ -1851,7 +1851,7 @@ function log_sphinx_error($err_type, $err_msg, $query = '') } } -function get_title_match_topics($title_match_sql, array $forum_ids = array()) +function get_title_match_topics($title_match_sql, $forum_ids = []) { global $bb_cfg, $sphinx, $userdata, $title_match, $lang; diff --git a/library/includes/functions_atom.php b/library/includes/functions_atom.php index a0ecf1e46..bce0fd06f 100644 --- a/library/includes/functions_atom.php +++ b/library/includes/functions_atom.php @@ -32,11 +32,11 @@ if (!defined('BB_ROOT')) { function update_forum_feed($forum_id, $forum_data) { - global $bb_cfg; + global $bb_cfg, $lang; $file_path = $bb_cfg['atom']['path'] . '/f/' . $forum_id . '.atom'; $select_tor_sql = $join_tor_sql = ''; if ($forum_id == 0) { - $forum_data['forum_name'] = 'Общая по всем разделам'; + $forum_data['forum_name'] = $lang['ATOM_GLOBAL_FEED']; } if ($forum_id > 0 && $forum_data['allow_reg_tracker']) { $select_tor_sql = ', tor.size AS tor_size, tor.tor_status'; @@ -97,9 +97,9 @@ function update_forum_feed($forum_id, $forum_data) } if (create_atom($file_path, 'f', $forum_id, htmlCHR($forum_data['forum_name']), $topics)) { return true; - } else { - return false; } + + return false; } function update_user_feed($user_id, $username) @@ -143,14 +143,14 @@ function update_user_feed($user_id, $username) } if (create_atom($file_path, 'u', $user_id, wbr($username), $topics)) { return true; - } else { - return false; } + + return false; } function create_atom($file_path, $mode, $id, $title, $topics) { - global $bb_cfg; + global $lang; $dir = dirname($file_path); if (!file_exists($dir)) { if (!bb_mkdir($dir)) { @@ -168,11 +168,11 @@ function create_atom($file_path, $mode, $id, $title, $topics) } $atom = ""; $atom .= "\n"; - $atom .= "\n"; + $atom .= "\n"; $atom .= "$title\n"; $atom .= "" . $date . "T$time+00:00\n"; $atom .= "tag:rto.feed,2000:/$mode/$id\n"; - $atom .= "\n"; + $atom .= "\n"; foreach ($topics as $topic) { $topic_id = $topic['topic_id']; $tor_size = ''; @@ -187,7 +187,7 @@ function create_atom($file_path, $mode, $id, $title, $topics) $topic_title = preg_replace($orig_word, $replacement_word, $topic_title); } $topic_title = wbr($topic_title); - $author_name = ($topic['first_username']) ? wbr($topic['first_username']) : 'Гость'; + $author_name = $topic['first_username'] ? wbr($topic['first_username']) : $lang['GUEST']; $last_time = $topic['topic_last_post_time']; if ($topic['topic_last_post_edit_time']) { $last_time = $topic['topic_last_post_edit_time']; @@ -197,7 +197,7 @@ function create_atom($file_path, $mode, $id, $title, $topics) $updated = ''; $checktime = TIMENOW - 604800; // неделя (week) if ($topic['topic_first_post_edit_time'] && $topic['topic_first_post_edit_time'] > $checktime) { - $updated = '[Обновлено] '; + $updated = '[' . $lang['ATOM_UPDATED'] . '] '; } $atom .= "\n"; $atom .= " <![CDATA[$updated$topic_title$tor_size]]>\n"; diff --git a/library/includes/functions_selects.php b/library/includes/functions_selects.php index 51be4af06..9edd4a424 100644 --- a/library/includes/functions_selects.php +++ b/library/includes/functions_selects.php @@ -57,7 +57,7 @@ function tz_select($default, $select_name = 'timezone') global $sys_timezone, $lang; if (!isset($default)) { - $default == $sys_timezone; + $default = $sys_timezone; } $tz_select = ''); {L_EMAIL}: *
    {L_EMAIL_EXPLAIN}
    - readonly="readonly" style="color: gray;" /> + readonly="readonly" style="color: gray;" /> From daeeb031e4b77b065480105512d0cac1f4429cb0 Mon Sep 17 00:00:00 2001 From: Yuriy Pikhtarev Date: Sat, 29 Jul 2017 09:14:08 +0300 Subject: [PATCH 07/14] Incorrect logfile rotation regex. --- common.php | 2 +- library/config.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common.php b/common.php index 526a6e1e6..ed951adc8 100644 --- a/common.php +++ b/common.php @@ -263,7 +263,7 @@ function file_write($str, $file, $max_size = LOG_MAX_SIZE, $lock = true, $replac if ($max_size && file_exists($file) && filesize($file) >= $max_size) { $old_name = $file; $ext = ''; - if (preg_match('#^(.+)(\.[^\\/]+)$#', $file, $matches)) { + if (preg_match('#^(.+)(\.[^\\\/]+)$#', $file, $matches)) { $old_name = $matches[1]; $ext = $matches[2]; } diff --git a/library/config.php b/library/config.php index 508f4d1c5..f57618fc5 100644 --- a/library/config.php +++ b/library/config.php @@ -29,7 +29,7 @@ if (!defined('BB_ROOT')) { $domain_name = 'torrentpier.com'; // enter here your primary domain name of your site $domain_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : $domain_name; -$domain_ssl = true; +$domain_ssl = false; $bb_cfg = []; From 0eb7faeed7381b0bced0867d7fc54182bab8428f Mon Sep 17 00:00:00 2001 From: Yuriy Pikhtarev Date: Sun, 30 Jul 2017 11:25:57 +0300 Subject: [PATCH 08/14] Some deprecations, normalize.css, torrent file content sort fix. --- common.php | 3 +- library/ajax/sitemap.php | 6 - library/includes/cron/jobs/sitemap.php | 1 - library/language/source/main.php | 2 +- src/Legacy/Common/User.php | 8 +- src/Legacy/TorrentFileList.php | 2 +- styles/templates/default/css/main.css | 3 +- styles/templates/default/css/normalize.css | 447 +++++++++++++++++++++ 8 files changed, 455 insertions(+), 17 deletions(-) create mode 100644 styles/templates/default/css/normalize.css diff --git a/common.php b/common.php index ed951adc8..c2e5c4d9e 100644 --- a/common.php +++ b/common.php @@ -264,8 +264,7 @@ function file_write($str, $file, $max_size = LOG_MAX_SIZE, $lock = true, $replac $old_name = $file; $ext = ''; if (preg_match('#^(.+)(\.[^\\\/]+)$#', $file, $matches)) { - $old_name = $matches[1]; - $ext = $matches[2]; + list($old_name, $ext) = $matches; } $new_name = $old_name . '_[old]_' . date('Y-m-d_H-i-s_') . getmypid() . $ext; clearstatcache(); diff --git a/library/ajax/sitemap.php b/library/ajax/sitemap.php index 838fe48f0..538b361d5 100644 --- a/library/ajax/sitemap.php +++ b/library/ajax/sitemap.php @@ -56,12 +56,6 @@ switch ($mode) { $html .= '
    ' . $lang['SITEMAP_NOTIFY_SEARCH'] . ' Google: ' . $lang['SITEMAP_ERROR'] . ' URL:     http://google.com/webmasters/sitemaps/ping?sitemap=' . $map_link . ''; } - if ($map->sendSitemap('http://ping.blogs.yandex.ru/ping?sitemap=', $map_link)) { - $html .= '
    ' . $lang['SITEMAP_NOTIFY_SEARCH'] . ' Yandex: ' . $lang['SITEMAP_SENT'] . ''; - } else { - $html .= '
    ' . $lang['SITEMAP_NOTIFY_SEARCH'] . ' Yandex: ' . $lang['SITEMAP_ERROR'] . ' URL: http://ping.blogs.yandex.ru/ping?sitemap=' . $map_link . ''; - } - if ($map->sendSitemap('http://www.bing.com/ping?sitemap=', $map_link)) { $html .= '
    ' . $lang['SITEMAP_NOTIFY_SEARCH'] . ' Bing: ' . $lang['SITEMAP_SENT'] . ''; } else { diff --git a/library/includes/cron/jobs/sitemap.php b/library/includes/cron/jobs/sitemap.php index e8c442bfa..27b3ea1d8 100644 --- a/library/includes/cron/jobs/sitemap.php +++ b/library/includes/cron/jobs/sitemap.php @@ -34,6 +34,5 @@ if (file_exists(SITEMAP_DIR . '/sitemap.xml')) { $map_link = make_url('sitemap/sitemap.xml'); $map->sendSitemap('http://google.com/webmasters/sitemaps/ping?sitemap=', $map_link); - $map->sendSitemap('http://ping.blogs.yandex.ru/ping?sitemap=', $map_link); $map->sendSitemap('http://www.bing.com/ping?sitemap=', $map_link); } diff --git a/library/language/source/main.php b/library/language/source/main.php index 3d6fbc9d3..0a6a9e27f 100644 --- a/library/language/source/main.php +++ b/library/language/source/main.php @@ -846,7 +846,7 @@ $lang['AUTH_ADMINISTRATORS'] = 'administrators'; $lang['NOT_MODERATOR'] = 'You are not a moderator of this forum.'; $lang['NOT_AUTHORISED'] = 'Not Authorised'; -$lang['YOU_BEEN_BANNED'] = 'You have been banned from this forum.
    Please contact the webmaster or board administrator for more information.'; +$lang['YOU_BEEN_BANNED'] = 'You have been banned from this forum. Please contact the board administrator for more information.'; // Viewonline $lang['ONLINE_EXPLAIN'] = 'users active over the past five minutes'; diff --git a/src/Legacy/Common/User.php b/src/Legacy/Common/User.php index 992f364e7..5fbcdcc02 100644 --- a/src/Legacy/Common/User.php +++ b/src/Legacy/Common/User.php @@ -239,7 +239,7 @@ class User */ public function session_create($userdata, $auto_created = false) { - global $bb_cfg; + global $bb_cfg, $lang; $this->data = $userdata; $session_id = $this->sessiondata['sid']; @@ -254,10 +254,8 @@ class User $where_sql = 'ban_ip = ' . USER_IP; $where_sql .= $login ? " OR ban_userid = $user_id" : ''; - $sql = "SELECT ban_id FROM " . BB_BANLIST . " WHERE $where_sql LIMIT 1"; - - if (DB()->fetch_row($sql)) { - header('Location: https://torrentpier.com/banned/'); + if (DB()->fetch_row("SELECT ban_id FROM " . BB_BANLIST . " WHERE $where_sql LIMIT 1")) { + bb_simple_die($lang['YOU_BEEN_BANNED']); } } diff --git a/src/Legacy/TorrentFileList.php b/src/Legacy/TorrentFileList.php index 5ebf7cb27..724d93e31 100644 --- a/src/Legacy/TorrentFileList.php +++ b/src/Legacy/TorrentFileList.php @@ -114,7 +114,7 @@ class TorrentFileList $cur_files_ary[] = $this->build_file_item($name, $length); } } - natsort($cur_files_ary); + asort($cur_files_ary); } else { $name = $f['path'][0]; $this->files_ary['/'][] = $this->build_file_item($name, $length); diff --git a/styles/templates/default/css/main.css b/styles/templates/default/css/main.css index 0e70008a4..31393d1fa 100644 --- a/styles/templates/default/css/main.css +++ b/styles/templates/default/css/main.css @@ -22,11 +22,12 @@ * SOFTWARE. */ +@import "normalize.css"; +@import "initial.css"; @import "ajax.css"; @import "alert.css"; @import "globals.css"; @import "images.css"; -@import "initial.css"; @import "main_content.css"; @import "menus.css"; @import "misc.css"; diff --git a/styles/templates/default/css/normalize.css b/styles/templates/default/css/normalize.css new file mode 100644 index 000000000..fa4e73dd4 --- /dev/null +++ b/styles/templates/default/css/normalize.css @@ -0,0 +1,447 @@ +/*! normalize.css v7.0.0 | MIT License | github.com/necolas/normalize.css */ + +/* Document + ========================================================================== */ + +/** + * 1. Correct the line height in all browsers. + * 2. Prevent adjustments of font size after orientation changes in + * IE on Windows Phone and in iOS. + */ + +html { + line-height: 1.15; /* 1 */ + -ms-text-size-adjust: 100%; /* 2 */ + -webkit-text-size-adjust: 100%; /* 2 */ +} + +/* Sections + ========================================================================== */ + +/** + * Remove the margin in all browsers (opinionated). + */ + +body { + margin: 0; +} + +/** + * Add the correct display in IE 9-. + */ + +article, +aside, +footer, +header, +nav, +section { + display: block; +} + +/** + * Correct the font size and margin on `h1` elements within `section` and + * `article` contexts in Chrome, Firefox, and Safari. + */ + +h1 { + font-size: 2em; + margin: 0.67em 0; +} + +/* Grouping content + ========================================================================== */ + +/** + * Add the correct display in IE 9-. + * 1. Add the correct display in IE. + */ + +figcaption, +figure, +main { /* 1 */ + display: block; +} + +/** + * Add the correct margin in IE 8. + */ + +figure { + margin: 1em 40px; +} + +/** + * 1. Add the correct box sizing in Firefox. + * 2. Show the overflow in Edge and IE. + */ + +hr { + box-sizing: content-box; /* 1 */ + height: 0; /* 1 */ + overflow: visible; /* 2 */ +} + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ + +pre { + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ +} + +/* Text-level semantics + ========================================================================== */ + +/** + * 1. Remove the gray background on active links in IE 10. + * 2. Remove gaps in links underline in iOS 8+ and Safari 8+. + */ + +a { + background-color: transparent; /* 1 */ + -webkit-text-decoration-skip: objects; /* 2 */ +} + +/** + * 1. Remove the bottom border in Chrome 57- and Firefox 39-. + * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. + */ + +abbr[title] { + border-bottom: none; /* 1 */ + text-decoration: underline; /* 2 */ + text-decoration: underline dotted; /* 2 */ +} + +/** + * Prevent the duplicate application of `bolder` by the next rule in Safari 6. + */ + +b, +strong { + font-weight: inherit; +} + +/** + * Add the correct font weight in Chrome, Edge, and Safari. + */ + +b, +strong { + font-weight: bolder; +} + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ + +code, +kbd, +samp { + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ +} + +/** + * Add the correct font style in Android 4.3-. + */ + +dfn { + font-style: italic; +} + +/** + * Add the correct background and color in IE 9-. + */ + +mark { + background-color: #ff0; + color: #000; +} + +/** + * Add the correct font size in all browsers. + */ + +small { + font-size: 80%; +} + +/** + * Prevent `sub` and `sup` elements from affecting the line height in + * all browsers. + */ + +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sub { + bottom: -0.25em; +} + +sup { + top: -0.5em; +} + +/* Embedded content + ========================================================================== */ + +/** + * Add the correct display in IE 9-. + */ + +audio, +video { + display: inline-block; +} + +/** + * Add the correct display in iOS 4-7. + */ + +audio:not([controls]) { + display: none; + height: 0; +} + +/** + * Remove the border on images inside links in IE 10-. + */ + +img { + border-style: none; +} + +/** + * Hide the overflow in IE. + */ + +svg:not(:root) { + overflow: hidden; +} + +/* Forms + ========================================================================== */ + +/** + * 1. Change the font styles in all browsers (opinionated). + * 2. Remove the margin in Firefox and Safari. + */ + +button, +input, +optgroup, +select, +textarea { + font-family: sans-serif; /* 1 */ + font-size: 100%; /* 1 */ + line-height: 1.15; /* 1 */ + margin: 0; /* 2 */ +} + +/** + * Show the overflow in IE. + * 1. Show the overflow in Edge. + */ + +button, +input { /* 1 */ + overflow: visible; +} + +/** + * Remove the inheritance of text transform in Edge, Firefox, and IE. + * 1. Remove the inheritance of text transform in Firefox. + */ + +button, +select { /* 1 */ + text-transform: none; +} + +/** + * 1. Prevent a WebKit bug where (2) destroys native `audio` and `video` + * controls in Android 4. + * 2. Correct the inability to style clickable types in iOS and Safari. + */ + +button, +html [type="button"], /* 1 */ +[type="reset"], +[type="submit"] { + -webkit-appearance: button; /* 2 */ +} + +/** + * Remove the inner border and padding in Firefox. + */ + +button::-moz-focus-inner, +[type="button"]::-moz-focus-inner, +[type="reset"]::-moz-focus-inner, +[type="submit"]::-moz-focus-inner { + border-style: none; + padding: 0; +} + +/** + * Restore the focus styles unset by the previous rule. + */ + +button:-moz-focusring, +[type="button"]:-moz-focusring, +[type="reset"]:-moz-focusring, +[type="submit"]:-moz-focusring { + outline: 1px dotted ButtonText; +} + +/** + * Correct the padding in Firefox. + */ + +fieldset { + padding: 0.35em 0.75em 0.625em; +} + +/** + * 1. Correct the text wrapping in Edge and IE. + * 2. Correct the color inheritance from `fieldset` elements in IE. + * 3. Remove the padding so developers are not caught out when they zero out + * `fieldset` elements in all browsers. + */ + +legend { + box-sizing: border-box; /* 1 */ + color: inherit; /* 2 */ + display: table; /* 1 */ + max-width: 100%; /* 1 */ + padding: 0; /* 3 */ + white-space: normal; /* 1 */ +} + +/** + * 1. Add the correct display in IE 9-. + * 2. Add the correct vertical alignment in Chrome, Firefox, and Opera. + */ + +progress { + display: inline-block; /* 1 */ + vertical-align: baseline; /* 2 */ +} + +/** + * Remove the default vertical scrollbar in IE. + */ + +textarea { + overflow: auto; +} + +/** + * 1. Add the correct box sizing in IE 10-. + * 2. Remove the padding in IE 10-. + */ + +[type="checkbox"], +[type="radio"] { + box-sizing: border-box; /* 1 */ + padding: 0; /* 2 */ +} + +/** + * Correct the cursor style of increment and decrement buttons in Chrome. + */ + +[type="number"]::-webkit-inner-spin-button, +[type="number"]::-webkit-outer-spin-button { + height: auto; +} + +/** + * 1. Correct the odd appearance in Chrome and Safari. + * 2. Correct the outline style in Safari. + */ + +[type="search"] { + -webkit-appearance: textfield; /* 1 */ + outline-offset: -2px; /* 2 */ +} + +/** + * Remove the inner padding and cancel buttons in Chrome and Safari on macOS. + */ + +[type="search"]::-webkit-search-cancel-button, +[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} + +/** + * 1. Correct the inability to style clickable types in iOS and Safari. + * 2. Change font properties to `inherit` in Safari. + */ + +::-webkit-file-upload-button { + -webkit-appearance: button; /* 1 */ + font: inherit; /* 2 */ +} + +/* Interactive + ========================================================================== */ + +/* + * Add the correct display in IE 9-. + * 1. Add the correct display in Edge, IE, and Firefox. + */ + +details, /* 1 */ +menu { + display: block; +} + +/* + * Add the correct display in all browsers. + */ + +summary { + display: list-item; +} + +/* Scripting + ========================================================================== */ + +/** + * Add the correct display in IE 9-. + */ + +canvas { + display: inline-block; +} + +/** + * Add the correct display in IE. + */ + +template { + display: none; +} + +/* Hidden + ========================================================================== */ + +/** + * Add the correct display in IE 10-. + */ + +[hidden] { + display: none; +} From 3f6207363000ded72149f4fd6bd90bf9fad0fe75 Mon Sep 17 00:00:00 2001 From: Yuriy Pikhtarev Date: Wed, 2 Aug 2017 23:42:15 +0300 Subject: [PATCH 09/14] Fix broken ajax. --- styles/templates/default/page_header.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/styles/templates/default/page_header.tpl b/styles/templates/default/page_header.tpl index dafcd9825..9664ad314 100644 --- a/styles/templates/default/page_header.tpl +++ b/styles/templates/default/page_header.tpl @@ -37,7 +37,7 @@ var BB_ROOT = "{#BB_ROOT}"; var cookieDomain = "{$bb_cfg['cookie_domain']}"; var cookiePath = "{$bb_cfg['script_path']}"; var cookiePrefix = "{$bb_cfg['cookie_prefix']}"; -var cookieSecure = {$bb_cfg['cookie_secure']}; +var cookieSecure = "{$bb_cfg['cookie_secure']}"; var LOGGED_IN = {LOGGED_IN}; var IWP = 'HEIGHT=510,WIDTH=780,resizable=yes'; var IWP_US = 'HEIGHT=250,WIDTH=400,resizable=yes'; From 9aba4d0d59da3321d4bec2bdc7bca9a1785baf8d Mon Sep 17 00:00:00 2001 From: Yuriy Pikhtarev Date: Mon, 7 Aug 2017 00:30:28 +0300 Subject: [PATCH 10/14] Broken announcer fix, announcer debug removed. --- bt/announce.php | 45 ++----------------- bt/includes/init_tr.php | 31 +------------ bt/scrape.php | 5 --- library/defines.php | 2 - .../cron/jobs/tr_cleanup_and_dlstat.php | 2 +- src/Legacy/Cache/Memcache.php | 4 -- src/Legacy/Cache/SqliteCommon.php | 4 -- src/Legacy/Datastore/Memcache.php | 4 -- src/Legacy/Datastore/SqliteCommon.php | 4 -- src/Legacy/SqlDb.php | 12 ++--- styles/templates/default/viewtopic_attach.tpl | 5 --- 11 files changed, 9 insertions(+), 109 deletions(-) diff --git a/bt/announce.php b/bt/announce.php index 668306319..e21101e18 100644 --- a/bt/announce.php +++ b/bt/announce.php @@ -36,9 +36,6 @@ if (empty($_SERVER['HTTP_USER_AGENT'])) { // Ignore 'completed' event if (isset($_GET['event']) && $_GET['event'] === 'completed') { - if (DBG_LOG) { - dbg_log(' ', '!die-event-completed'); - } dummy_exit(mt_rand(600, 1200)); } @@ -149,10 +146,6 @@ $peer_hash = md5( // Get cached peer info from previous announce (last peer info) $lp_info = CACHE('tr_cache')->get(PEER_HASH_PREFIX . $peer_hash); -if (DBG_LOG) { - dbg_log(' ', '$lp_info-get_from-CACHE-' . ($lp_info ? 'hit' : 'miss')); -} - // Drop fast announce if ($lp_info && (!isset($event) || $event !== 'stopped')) { drop_fast_announce($lp_info); @@ -174,10 +167,6 @@ function drop_fast_announce($lp_info) function msg_die($msg) { - if (DBG_LOG) { - dbg_log(' ', '!die-' . clean_filename($msg)); - } - $output = \Rych\Bencode\Bencode::encode([ 'min interval' => (int)1800, 'failure reason' => (string)$msg, @@ -196,9 +185,6 @@ $stopped = ($event === 'stopped'); // Stopped event if ($stopped) { CACHE('tr_cache')->rm(PEER_HASH_PREFIX . $peer_hash); - if (DBG_LOG) { - dbg_log(' ', 'stopped'); - } } // Get last peer info from DB @@ -206,10 +192,6 @@ if (!CACHE('tr_cache')->used && !$lp_info) { $lp_info = DB()->fetch_row(" SELECT * FROM " . BB_BT_TRACKER . " WHERE peer_hash = '$peer_hash' LIMIT 1 "); - - if (DBG_LOG) { - dbg_log(' ', '$lp_info-get_from-DB-' . ($lp_info ? 'hit' : 'miss')); - } } if ($lp_info) { @@ -312,7 +294,7 @@ if ($lp_info) { } // Up/Down speed -$speed_up = $speed_down = $uploaded = $downloaded = 0; +$speed_up = $speed_down = 0; if ($lp_info && $lp_info['update_time'] < TIMENOW) { if ($uploaded > $lp_info['uploaded']) { @@ -358,8 +340,8 @@ if ($lp_info) { $sql .= ($downloaded != $lp_info['downloaded']) ? ", downloaded = $downloaded" : ''; $sql .= ", remain = $left"; - $sql .= ($up_add) ? ", up_add = up_add + $up_add" : ''; - $sql .= ($down_add) ? ", down_add = down_add + $down_add" : ''; + $sql .= $up_add ? ", up_add = up_add + $up_add" : ''; + $sql .= $down_add ? ", down_add = down_add + $down_add" : ''; $sql .= ", speed_up = $speed_up"; $sql .= ", speed_down = $speed_down"; @@ -370,10 +352,6 @@ if ($lp_info) { DB()->query($sql); $peer_info_updated = DB()->affected_rows(); - - if (DBG_LOG) { - dbg_log(' ', 'this_peer-update' . ($peer_info_updated ? '' : '-FAIL')); - } } if (!$lp_info || !$peer_info_updated) { @@ -381,10 +359,6 @@ if (!$lp_info || !$peer_info_updated) { $values = "'$peer_hash', $topic_id, $user_id, '$ip_sql', $port, $seeder, $releaser, $tor_type, $uploaded, $downloaded, $left, $speed_up, $speed_down, $up_add, $down_add, $update_time"; DB()->query("REPLACE INTO " . BB_BT_TRACKER . " ($columns) VALUES ($values)"); - - if (DBG_LOG) { - dbg_log(' ', 'this_peer-insert'); - } } // Exit if stopped @@ -406,17 +380,9 @@ $lp_info = array( $lp_info_cached = CACHE('tr_cache')->set(PEER_HASH_PREFIX . $peer_hash, $lp_info, PEER_HASH_EXPIRE); -if (DBG_LOG && !$lp_info_cached) { - dbg_log(' ', '$lp_info-caching-FAIL'); -} - // Get cached output $output = CACHE('tr_cache')->get(PEERS_LIST_PREFIX . $topic_id); -if (DBG_LOG) { - dbg_log(' ', '$output-get_from-CACHE-' . ($output !== false ? 'hit' : 'miss')); -} - if (!$output) { // Retrieve peers $numwant = (int)$bb_cfg['tracker']['numwant']; @@ -471,14 +437,9 @@ if (!$output) { ); $peers_list_cached = CACHE('tr_cache')->set(PEERS_LIST_PREFIX . $topic_id, $output, PEERS_LIST_EXPIRE); - - if (DBG_LOG && !$peers_list_cached) { - dbg_log(' ', '$output-caching-FAIL'); - } } // Return data to client echo \Rych\Bencode\Bencode::encode($output); -tracker_exit(); exit; diff --git a/bt/includes/init_tr.php b/bt/includes/init_tr.php index c2abe73af..76b24e982 100644 --- a/bt/includes/init_tr.php +++ b/bt/includes/init_tr.php @@ -37,45 +37,18 @@ if ($bb_cfg['tracker']['off']) { // // Functions // -function tracker_exit() -{ - global $DBS; - - if (DBG_LOG && DBG_TRACKER) { - if ($gen_time = utime() - TIMESTART) { - $sql_init_perc = round($DBS->sql_inittime * 100 / $gen_time); - $sql_total_perc = round($DBS->sql_timetotal * 100 / $gen_time); - - $str = array(); - $str[] = substr(TIMENOW, -4, 4); - $str[] = sprintf('%.4f', $gen_time); - $str[] = sprintf('%.4f' . LOG_SEPR . '%02d%%', $DBS->sql_inittime, $sql_init_perc); - $str[] = sprintf('%.4f' . LOG_SEPR . '%02d%%', $DBS->sql_timetotal, $sql_total_perc); - $str[] = $DBS->num_queries; - $str[] = sprintf('%.1f', sys('la')); - $str = implode(LOG_SEPR, $str) . LOG_LF; - dbg_log($str, '!!gentime'); - } - } - exit; -} - function silent_exit() { ob_end_clean(); - tracker_exit(); + exit; } function error_exit($msg = '') { - if (DBG_LOG) { - dbg_log(' ', '!err-' . clean_filename($msg)); - } - silent_exit(); echo \Rych\Bencode\Bencode::encode(['failure reason' => str_compact($msg)]); - tracker_exit(); + exit; } diff --git a/bt/scrape.php b/bt/scrape.php index e4e926bca..9f5f02d27 100644 --- a/bt/scrape.php +++ b/bt/scrape.php @@ -46,10 +46,6 @@ $info_hash = $_GET['info_hash']; function msg_die($msg) { - if (DBG_LOG) { - dbg_log(' ', '!die-' . clean_filename($msg)); - } - $output = \Rych\Bencode\Bencode::encode([ 'min interval' => (int)1800, 'failure reason' => (string)$msg, @@ -79,5 +75,4 @@ $output['files'][$info_hash] = array( echo \Rych\Bencode\Bencode::encode($output); -tracker_exit(); exit; diff --git a/library/defines.php b/library/defines.php index 616907117..bbd9a0cbd 100644 --- a/library/defines.php +++ b/library/defines.php @@ -65,8 +65,6 @@ define('XS_TAG_ENDIF', 8); define('XS_TAG_BEGINELSE', 11); // Debug -define('DBG_LOG', false); // enable forum debug (off on production) -define('DBG_TRACKER', false); // enable tracker debug (off on production) define('COOKIE_DBG', 'bb_dbg'); // debug cookie name define('SQL_DEBUG', true); // enable forum sql & cache debug define('SQL_LOG_ERRORS', true); // all SQL_xxx options enabled only if SQL_DEBUG == TRUE diff --git a/library/includes/cron/jobs/tr_cleanup_and_dlstat.php b/library/includes/cron/jobs/tr_cleanup_and_dlstat.php index ca5a1d8b5..fa21fb186 100644 --- a/library/includes/cron/jobs/tr_cleanup_and_dlstat.php +++ b/library/includes/cron/jobs/tr_cleanup_and_dlstat.php @@ -58,7 +58,7 @@ if ($bb_cfg['tracker']['update_dlstat']) { topic_id, user_id, IF(releaser, $releaser, seeder), SUM(up_add), SUM(down_add), IF(releaser, SUM(up_add), 0), SUM(speed_up), SUM(speed_down) FROM " . BB_BT_TRACKER . " WHERE (up_add != 0 OR down_add != 0) - GROUP BY topic_id, user_id, releaser, seeder + GROUP BY topic_id, user_id "); // Reset up/down additions in tracker diff --git a/src/Legacy/Cache/Memcache.php b/src/Legacy/Cache/Memcache.php index 1b10d2c2e..5b6e57038 100644 --- a/src/Legacy/Cache/Memcache.php +++ b/src/Legacy/Cache/Memcache.php @@ -61,10 +61,6 @@ class Memcache extends Common $this->connected = true; } - if (DBG_LOG) { - dbg_log(' ', 'CACHE-connect' . ($this->connected ? '' : '-FAIL')); - } - if (!$this->connected && $this->cfg['con_required']) { die('Could not connect to memcached server'); } diff --git a/src/Legacy/Cache/SqliteCommon.php b/src/Legacy/Cache/SqliteCommon.php index fdc2056ca..0938a1671 100644 --- a/src/Legacy/Cache/SqliteCommon.php +++ b/src/Legacy/Cache/SqliteCommon.php @@ -65,10 +65,6 @@ class SqliteCommon extends Common $this->connected = true; } - if (DBG_LOG) { - dbg_log(' ', $this->cfg['log_name'] . '-connect' . ($this->connected ? '' : '-FAIL')); - } - if (!$this->connected && $this->cfg['con_required']) { trigger_error('SQLite not connected', E_USER_ERROR); } diff --git a/src/Legacy/Datastore/Memcache.php b/src/Legacy/Datastore/Memcache.php index 18c4e536c..ac6fad891 100644 --- a/src/Legacy/Datastore/Memcache.php +++ b/src/Legacy/Datastore/Memcache.php @@ -60,10 +60,6 @@ class Memcache extends Common $this->connected = true; } - if (DBG_LOG) { - dbg_log(' ', 'CACHE-connect' . ($this->connected ? '' : '-FAIL')); - } - if (!$this->connected && $this->cfg['con_required']) { die('Could not connect to memcached server'); } diff --git a/src/Legacy/Datastore/SqliteCommon.php b/src/Legacy/Datastore/SqliteCommon.php index 029a1d82e..6a8a21885 100644 --- a/src/Legacy/Datastore/SqliteCommon.php +++ b/src/Legacy/Datastore/SqliteCommon.php @@ -65,10 +65,6 @@ class SqliteCommon extends Common $this->connected = true; } - if (DBG_LOG) { - dbg_log(' ', $this->cfg['log_name'] . '-connect' . ($this->connected ? '' : '-FAIL')); - } - if (!$this->connected && $this->cfg['con_required']) { trigger_error('SQLite not connected', E_USER_ERROR); } diff --git a/src/Legacy/SqlDb.php b/src/Legacy/SqlDb.php index 6e4a5885f..c3c27277f 100644 --- a/src/Legacy/SqlDb.php +++ b/src/Legacy/SqlDb.php @@ -805,7 +805,7 @@ class SqlDb $dbg =& $this->dbg[$id]; if ($mode == 'start') { - if (SQL_CALC_QUERY_TIME || DBG_LOG || SQL_LOG_SLOW_QUERIES) { + if (SQL_CALC_QUERY_TIME || SQL_LOG_SLOW_QUERIES) { $this->sql_starttime = utime(); } if ($this->dbg_enabled) { @@ -821,7 +821,7 @@ class SqlDb $this->explain('start'); } } elseif ($mode == 'stop') { - if (SQL_CALC_QUERY_TIME || DBG_LOG || SQL_LOG_SLOW_QUERIES) { + if (SQL_CALC_QUERY_TIME || SQL_LOG_SLOW_QUERIES) { $this->cur_query_time = utime() - $this->sql_starttime; $this->sql_timetotal += $this->cur_query_time; $this->DBS['sql_timetotal'] += $this->cur_query_time; @@ -855,13 +855,7 @@ class SqlDb public function trigger_error($msg = 'DB Error') { if (error_reporting()) { - if (DBG_LOG === true) { - $err = $this->sql_error(); - $msg .= "\n" . trim(sprintf('#%06d %s', $err['code'], $err['message'])); - } else { - $msg .= ' [' . $this->debug_find_source() . ']'; - } - + $msg .= ' [' . $this->debug_find_source() . ']'; trigger_error($msg, E_USER_ERROR); } } diff --git a/styles/templates/default/viewtopic_attach.tpl b/styles/templates/default/viewtopic_attach.tpl index 0fc3b92cb..0f95e5903 100644 --- a/styles/templates/default/viewtopic_attach.tpl +++ b/styles/templates/default/viewtopic_attach.tpl @@ -223,11 +223,6 @@ {L_SIZE}: {postrow.attach.tor_reged.TORRENT_SIZE} - - - {postrow.attach.tor_reged.comment.COMMENT} - -