r330

- Перенос настроек в один файл (убираем лишний инклуд); - Смена принципа нумерации минорных версий движка; - Убираем дискриминацию пользователей старше 50 лет (появилась в r328); - Уменьшаем максимальный размер загружаемой картинки через галерею; - Пара незначительных мелочей. git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@330 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293

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'] : '';

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...

upload/config_mods.php

@@ -1,62 +0,0 @@
-<?php
-
-/*
-  This is a modules config!
-  This file contain the 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['board_disabled_msg'] = 'форум временно отключен'; // 'forums temporarily disabled'; // show this msg if board has been disabled via ON/OFF trigger
-$bb_cfg['srv_overloaded_msg'] = "Извините, в данный момент сервер перегружен\nПопробуйте повторить запрос через несколько минут";
-
-// 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'] = 5*1024*1024; // 5 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'] = 50;
-$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...

upload/cron.php

@@ -1,7 +1,6 @@
 <?php
 
 define('START_CRON', true);
-define('BB_ROOT', dirname ( __FILE__ ) .'/');
-require(BB_ROOT. 'common.php');
+define('BB_ROOT', dirname ( __FILE__ ) . '/');
 
-?>
+require(BB_ROOT. 'common.php');

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'] = 'Подфорумы';
 
 //