From 9394da99feee60c8d1518510231dd830cd6fb928 Mon Sep 17 00:00:00 2001
From: nanosimbiot <nanosimbiot@a8ac35ab-4ca4-ca47-4c2d-a49a94f06293>
Date: Thu, 14 Jul 2011 18:32:14 +0000
Subject: [PATCH] r110

 git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@110 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
---
 upload/config.php                          | 6 +++---
 upload/includes/functions.php              | 2 +-
 upload/includes/ucp/usercp_register.php    | 2 +-
 upload/language/lang_russian/lang_main.php | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/upload/config.php b/upload/config.php
index ee213ec8e..9f4a549b3 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -57,7 +57,7 @@ $bb_cfg['css_ver'] = 1;
 
 // Increase number of revision after update
 $bb_cfg['tp_version'] = '2.0.2';
-$bb_cfg['tp_release_state'] = 'TP II r109';
+$bb_cfg['tp_release_state'] = 'TP II r110';
 $bb_cfg['tp_release_date'] = '15-07-2011';
 
 $bb_cfg['board_disabled_msg'] = 'форум временно отключен'; // 'forums temporarily disabled'; // show this msg if board has been disabled via ON/OFF trigger
@@ -253,8 +253,8 @@ $bb_cfg['cookie_prefix'] = 'bb_';                  # 'bb_'
 define('COOKIE_DBG', 'bb_dbg');                    // debug cookie name
 
 // Server
-$bb_cfg['server_name'] = 'torrentpier.me';         // The domain name from which this board runs
-$bb_cfg['server_port'] = 80;                       // The port your server is running on
+$bb_cfg['server_name'] = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : 'torrentpier.me';         // The domain name from which this board runs
+$bb_cfg['server_port'] = (!empty($_SERVER['SERVER_PORT'])) ? $_SERVER['SERVER_PORT'] : 80;                       // The port your server is running on
 $bb_cfg['script_path'] = '/';                      // The path where FORUM is located relative to the domain name
 $bb_cfg['sitename'] = 'TorrentPier II - Torrent Tracker (see $bb_cfg[\'sitename\'] in config.php)';               // Name of your site
 
diff --git a/upload/includes/functions.php b/upload/includes/functions.php
index 7460a68e6..9907a57e1 100644
--- a/upload/includes/functions.php
+++ b/upload/includes/functions.php
@@ -949,7 +949,7 @@ class Date_Delta
 		60        => 'seconds',   // set granularity to "seconds" if delta less then 1 minute
 		10800     => 'minutes',   // 3 hours
 		259200    => 'hours',     // 3 days
-		15681600  => 'mday',      // 6 months + 1d+12h
+		31363200  => 'mday',      // 12 months + 1d+12h
 		311040000 => 'mon',       // 10 years
 	);
 	var $intervals = array();
diff --git a/upload/includes/ucp/usercp_register.php b/upload/includes/ucp/usercp_register.php
index 955e28b3a..4d66556f4 100644
--- a/upload/includes/ucp/usercp_register.php
+++ b/upload/includes/ucp/usercp_register.php
@@ -699,7 +699,7 @@ foreach ($profile_fields as $field => $can_edit)
 
 if($bb_cfg['birthday']['enabled'] && $mode != 'register')
 {
-	$days = array($lang['DELTA_TIME']['INTERVALS']['mon'][0] => 0);
+	$days = array($lang['DELTA_TIME']['INTERVALS']['mday'][0] => 0);
 	for($i=1; $i<=31; $i++)
 	{
 		$days[$i] = $i;
diff --git a/upload/language/lang_russian/lang_main.php b/upload/language/lang_russian/lang_main.php
index edfb175c9..f07c9ae68 100644
--- a/upload/language/lang_russian/lang_main.php
+++ b/upload/language/lang_russian/lang_main.php
@@ -569,7 +569,7 @@ $lang['GENDER_SELECT'] = array(
 	2 => 'Женский'
 );
 $lang['BIRTHDAY'] = 'День рождения';
-$lang['WRONG_BIRTHDAY_FORMAT'] = 'Дата рождения указан не верно.';
+$lang['WRONG_BIRTHDAY_FORMAT'] = 'Дата рождения указана не верно';
 $lang['AGE'] = 'Возраст';
 $lang['BIRTHDAY_TO_HIGH'] = 'Извините, сайт запрещено посещать людям старше %d лет';
 $lang['BIRTHDAY_TO_LOW'] = 'Извините, сайт запрещено посещать детям младше %d лет';