From 93128886e51dc78d5c961fb5254cc27387976f6c Mon Sep 17 00:00:00 2001 From: glix08 Date: Sat, 26 Nov 2011 20:14:34 +0000 Subject: [PATCH] r330 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Перенос настроек в один файл (убираем лишний инклуд); - Смена принципа нумерации минорных версий движка; - Убираем дискриминацию пользователей старше 50 лет (появилась в r328); - Уменьшаем максимальный размер загружаемой картинки через галерею; - Пара незначительных мелочей. git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@330 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293 --- upload/common.php | 1 - upload/config.php | 68 ++++++++++++++++++++-- upload/config_mods.php | 62 -------------------- upload/cron.php | 5 +- upload/language/lang_russian/lang_main.php | 2 +- 5 files changed, 66 insertions(+), 72 deletions(-) delete mode 100644 upload/config_mods.php diff --git a/upload/common.php b/upload/common.php index aa9d6a175..ba308b5eb 100644 --- a/upload/common.php +++ b/upload/common.php @@ -11,7 +11,6 @@ if (!defined('IN_PHPBB') && !defined('IN_TRACKER')) define('IN_PHPBB', true); // Get initial config require(BB_ROOT .'config.php'); -require(BB_ROOT .'config_mods.php'); $server_protocol = ($bb_cfg['cookie_secure']) ? 'https://' : 'http://'; $server_port = ($bb_cfg['server_port'] != 80) ? ':'. $bb_cfg['server_port'] : ''; diff --git a/upload/config.php b/upload/config.php index 4da9be5aa..bc68f121b 100644 --- a/upload/config.php +++ b/upload/config.php @@ -44,15 +44,26 @@ * Ads * Misc * Captcha - **/ + + Modules settings for: + - Advanced Report Hack + - Gold/Silver releases + - Gallery + - Magnet links + - No avatar + - CallSeed + - News + - Network News + +**/ if (!defined('BB_ROOT')) die(basename(__FILE__)); $bb_cfg = $tr_cfg = $page_cfg = array(); // Increase number of revision after update -$bb_cfg['tp_version'] = '2.2 Beta'; -$bb_cfg['tp_release_state'] = 'R329'; +$bb_cfg['tp_version'] = '2.4 (beta)'; +$bb_cfg['tp_release_state'] = 'R330'; $bb_cfg['tp_release_date'] = '25-11-2011'; // Database @@ -113,6 +124,10 @@ $bb_cfg['tr_working_second'] = 0; // 0 - disable $bb_cfg['js_ver'] = 1; $bb_cfg['css_ver'] = 1; +// Information messages +$bb_cfg['board_disabled_msg'] = 'форум временно отключен'; // 'forums temporarily disabled'; // show this msg if board has been disabled via ON/OFF trigger +$bb_cfg['srv_overloaded_msg'] = "Извините, в данный момент сервер перегружен\nПопробуйте повторить запрос через несколько минут"; + // Backup $bb_cfg['db_backup_shell_cmd'] = ''; // '/path/to/db_backup.sh 2>&1' $bb_cfg['site_backup_shell_cmd'] = ''; @@ -516,8 +531,51 @@ $bb_cfg['advert_html_path'] = $bb_cfg['html_path'] .'advert.html'; # // Captcha $bb_cfg['captcha'] = array( - 'disabled' => false, + 'disabled' => false, 'secret_key' => 'secret_key', 'img_url' => './images/captcha/', # without '/' - 'img_path' => BB_PATH .'/images/captcha/', # without '/' + 'img_path' => BB_PATH .'/images/captcha/', # without '/' ); + +// Advanced Report Hack +$bb_cfg['reports_enabled'] = true; + +// Gold/Silver releases +$bb_cfg['gold_silver_enabled'] = true; + +// Gallery +$bb_cfg['gallery_enabled'] = true; +$bb_cfg['pic_dir'] = 'pictures/'; +$bb_cfg['pic_max_size'] = 3*1024*1024; // 3 MB +$bb_cfg['auto_delete_posted_pics'] = true; // Delete pictures while delete post? + +// Magnet links +$bb_cfg['magnet_links_enabled'] = true; + +// No avatar +$bb_cfg['no_avatar'] = 'images/avatars/gallery/noavatar.png'; + +// Birthday +$bb_cfg['birthday']['enabled'] = true; +$bb_cfg['birthday']['max_user_age'] = 99; +$bb_cfg['birthday']['min_user_age'] = 10; +$bb_cfg['birthday']['check_day'] = 7; + +// Gender +$bb_cfg['gender'] = true; + +// CallSeed +$bb_cfg['callseed'] = false; + +// Tracker stats +$bb_cfg['tor_stats'] = true; + +// News +$bb_cfg['show_latest_news'] = true; +$bb_cfg['latest_news_count'] = 5; +$bb_cfg['latest_news_forum_id'] = '1'; // (string) 1,2,3... + +// Network News +$bb_cfg['show_network_news'] = true; +$bb_cfg['network_news_count'] = 5; +$bb_cfg['network_news_forum_id'] = '2'; // (string) 1,2,3... \ No newline at end of file diff --git a/upload/config_mods.php b/upload/config_mods.php deleted file mode 100644 index c52fea3a4..000000000 --- a/upload/config_mods.php +++ /dev/null @@ -1,62 +0,0 @@ - \ No newline at end of file +require(BB_ROOT. 'common.php'); \ No newline at end of file diff --git a/upload/language/lang_russian/lang_main.php b/upload/language/lang_russian/lang_main.php index 627d60b0f..19ae8fbff 100644 --- a/upload/language/lang_russian/lang_main.php +++ b/upload/language/lang_russian/lang_main.php @@ -197,7 +197,7 @@ $lang['MARK_ALL_FORUMS_READ'] = 'Отметить все форумы как п $lang['FORUMS_MARKED_READ'] = 'Все форумы были отмечены как прочтённые'; $lang['LATEST_NEWS'] = 'Новости трекера'; -$lang['NETWORK_NEWS'] = 'Новости Сети'; +$lang['NETWORK_NEWS'] = 'Новости в сети'; $lang['SUBFORUMS'] = 'Подфорумы'; //