r457

пол в топике, праздничный торт git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@457 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293

upload/config.php

@@ -56,8 +56,8 @@ $domain_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : $do
 
 // Increase number of revision after update
 $bb_cfg['tp_version'] = '2.5 Beta';
-$bb_cfg['tp_release_state'] = 'R456';
+$bb_cfg['tp_release_state'] = 'R457';
-$bb_cfg['tp_release_date'] = '07-09-2012';
+$bb_cfg['tp_release_date'] = '23-09-2012';
 
 // Database
 $charset  = 'utf8';

upload/language/lang_english/lang_main.php

@@ -563,6 +563,7 @@ $lang['GENDER_SELECT'] = array(
 );
 
 $lang['BIRTHDAY'] = 'Birthday';
+$lang['HAPPY_BIRTHDAY'] = 'Happy Birthday!';
 $lang['WRONG_BIRTHDAY_FORMAT'] = 'The birthday format was entered incorrectly.';
 $lang['AGE'] = 'Age';
 $lang['BIRTHDAY_TO_HIGH'] = 'Sorry, this site, does not accept user older than %d years old';

upload/language/lang_russian/lang_main.php

@@ -570,6 +570,7 @@ $lang['GENDER_SELECT'] = array(
 $lang['MODULE_OFF'] = 'Модуль отключен!';
 
 $lang['BIRTHDAY'] = 'День рождения';
+$lang['HAPPY_BIRTHDAY'] = 'С Днем Рождения!';
 $lang['WRONG_BIRTHDAY_FORMAT'] = 'Дата рождения указана неверно';
 $lang['AGE'] = 'Возраст';
 $lang['BIRTHDAY_TO_HIGH'] = 'Извините, сайт запрещено посещать пользователям старше %d лет';

upload/templates/default/css/main.css

@@ -780,6 +780,7 @@ table.topic { width: 100%; }
 	.poster_info p       { margin: 2px 0; color: #444444; }
 	.poster_info .nick   { margin: 0 0 4px; color: #333333; line-height: 110%; }
 	.poster_info .avatar { margin: 5px 0 4px; max-width: 100px; max-height: 100px; overflow: hidden; }
+	.poster_info .birthday { margin: 5px 0; text-align: center !important;}
 		.avatar imgreflect        { display: block; }
 	.poster_info em      { font-style: normal; color: #000000; }
 

upload/templates/default/tpl_config.php

@@ -22,6 +22,10 @@ $images['icon_mod']            = $_main .'icon_mod.gif';
 $images['icon_www']            = $_lang .'icon_www.gif';
 $images['icon_icq']            = $_lang .'icon_icq_add.gif';
 
+$images['icon_birthday']       = $_main .'icon_birthday.gif';
+$images['icon_male']           = $_main .'icon_male.gif';
+$images['icon_female']         = $_main .'icon_female.gif';
+
 // post_icons
 $images['icon_minipost']       = $_main .'icon_minipost.gif';
 $images['icon_gotopost']       = $_main .'icon_minipost.gif';

upload/templates/default/viewtopic.tpl

@@ -286,9 +286,12 @@ ajax.callback.mod_action = function(data) {
 		<!-- IF postrow.POSTER_RANK --><p class="rank_txt">{postrow.POSTER_RANK}</p><!-- ENDIF -->
 		<!-- IF postrow.RANK_IMAGE --><p class="rank_img">{postrow.RANK_IMAGE}</p><!-- ENDIF -->
 		<!-- IF postrow.POSTER_AVATAR --><p class="avatar">{postrow.POSTER_AVATAR}</p><!-- ENDIF -->
+		<!-- IF postrow.POSTER_GENDER --><p class="joined"><em>{L_GENDER}:</em> {postrow.POSTER_GENDER}</p><!-- ENDIF -->
 		<!-- IF postrow.POSTER_JOINED --><p class="joined" title="{postrow.POSTER_JOINED_DATE}"><em>{L_LONGEVITY}:</em> {postrow.POSTER_JOINED}</p><!-- ENDIF -->
 		<!-- IF postrow.POSTER_POSTS --><p class="posts"><em>{L_POSTS}:</em> {postrow.POSTER_POSTS}</p><!-- ENDIF -->
 		<!-- IF postrow.POSTER_FROM --><p class="from"><em>{L_LOCATION}:</em> {postrow.POSTER_FROM}</p><!-- ENDIF -->
+		
+		<!-- IF postrow.POSTER_BIRTHDAY --><p class="birthday">{postrow.POSTER_BIRTHDAY}</p><!-- ENDIF -->
 	<!-- ENDIF -->
 
 	<p><img src="{SPACER}" width="{TOPIC_LEFT_COL_SPACER_WITDH}" height="<!-- IF postrow.POSTER_AVATAR || postrow.RANK_IMAGE -->2<!-- ELSE -->30<!-- ENDIF -->" border="0" alt="" /></p>

upload/viewtopic.php

@@ -375,10 +375,10 @@ if ($t_data['topic_show_first_post'] && $start)
 {
 	$first_post = DB()->fetch_rowset("
 		SELECT
-		  u.username, u.user_id, u.user_posts, u.user_from,
+		  u.username, u.user_id, u.user_rank, u.user_posts, u.user_from,
-		  u.user_regdate, u.user_rank, u.user_sig,
+		  u.user_regdate, u.user_sig,
 		  u.user_avatar, u.user_avatar_type,
-		  u.user_opt,
+		  u.user_opt, u.user_gender, u.user_birthday,
 		  p.*,
 		  h.post_html, IF(h.post_html IS NULL, pt.post_text, NULL) AS post_text
 		FROM      ". BB_POSTS      ." p
@@ -393,10 +393,10 @@ if ($t_data['topic_show_first_post'] && $start)
 // 2. All others posts
 $sql = "
 	SELECT
-	  u.username, u.user_id, u.user_posts, u.user_from,
+	  u.username, u.user_id, u.user_rank, u.user_posts, u.user_from,
-	  u.user_regdate, u.user_rank, u.user_sig,
+	  u.user_regdate, u.user_sig,
 	  u.user_avatar, u.user_avatar_type,
-	  u.user_opt,
+	  u.user_opt, u.user_gender, u.user_birthday,
 	  p.*,
 	  h.post_html, IF(h.post_html IS NULL, pt.post_text, NULL) AS post_text
 	FROM      ". BB_POSTS      ." p
@@ -807,6 +807,8 @@ require_once(INC_DIR ."functions_report.php");
 $report_post = report_modules('name', 'report_post');
 // Report [END]
 
+$this_date = bb_date(TIMENOW ,'md', 'false');
+
 //
 // Okay, let's do the loop, yeah come on baby let's do the loop
 // and it goes like this ...
@@ -816,6 +818,8 @@ for($i = 0; $i < $total_posts; $i++)
 	$poster_id = $postrow[$i]['user_id'];
 	$poster = ( $poster_id == ANONYMOUS ) ? $lang['GUEST'] : $postrow[$i]['username'];
 
+    $poster_birthday = ($postrow[$i]['user_id'] != ANONYMOUS) ? realdate($postrow[$i]['user_birthday'], 'md') : 0;
+
 	$post_date = bb_date($postrow[$i]['post_time'], $bb_cfg['post_date_format']);
 	$max_post_time = max($max_post_time, $postrow[$i]['post_time']);
 
@@ -855,13 +859,7 @@ for($i = 0; $i < $total_posts; $i++)
 	}
 
 	// Buttons
-	$pm_btn = '';
+	$pm_btn = $profile_btn = $delpost_btn = $edit_btn = $ip_btn = $quote_btn = '';
-	$profile_btn = '';
-
-	$delpost_btn = '';
-	$edit_btn = '';
-	$ip_btn = '';
-	$quote_btn = '';
 
 	if ($poster_id != ANONYMOUS)
 	{
@@ -975,6 +973,20 @@ for($i = 0; $i < $total_posts; $i++)
 		$report_img = $report = '';
 	}
 	// Report [END]
+	
+	// Gender
+	switch($postrow[$i]['user_gender']) 
+    { 
+	    case MALE: 
+		    $gender = '<img src="'. $images['icon_male'] .'" alt="" title="'. $lang['GENDER_SELECT'][1] .'" border="0" />';
+		    break; 
+	    case FEMALE: 
+		    $gender = '<img src="'. $images['icon_female'] .'" alt="" title="'. $lang['GENDER_SELECT'][2] .'" border="0" />';
+			break; 
+	    default: 
+		    $gender = '';
+            break;			
+    }
 
 	$template->assign_block_vars('postrow', array(
 		'ROW_CLASS'          => !($i % 2) ? 'row1' : 'row2',
@@ -992,6 +1004,7 @@ for($i = 0; $i < $total_posts; $i++)
 		'POSTER_BOT'         => ($poster_id == BOT_UID),
 		'POSTER_ID'          => $poster_id,
 		'POSTER_AUTHOR'      => ($poster_id == $t_data['topic_poster']),
+		'POSTER_GENDER'      => ($bb_cfg['gender'] && $gender) ? $gender : '',
 		'POSTED_AFTER'       => ($prev_post_time) ? delta_time($postrow[$i]['post_time'], $prev_post_time) : '',
 		'IS_UNREAD'          => is_unread($postrow[$i]['post_time'], $topic_id, $forum_id),
 		'IS_FIRST_POST'      => (!$start && ($postrow[$i]['post_id'] == $t_data['topic_first_post_id'])),
@@ -1003,17 +1016,16 @@ for($i = 0; $i < $total_posts; $i++)
 		'SIGNATURE'          => $user_sig,
 		'EDITED_MESSAGE'     => $l_edited_by,
 
-		'PM'      => $pm_btn,
+		'PM'                 => $pm_btn,
-		'PROFILE' => $profile_btn,
+		'PROFILE'            => $profile_btn,
 
-		'QUOTE'   => $quote_btn,
+		'QUOTE'              => $quote_btn,
-		'EDIT'    => $edit_btn,
+		'EDIT'               => $edit_btn,
-		'DELETE'  => $delpost_btn,
+		'DELETE'             => $delpost_btn,
-		'IP'      => $ip_btn,
+		'IP'                 => $ip_btn,
 
-		// Report
+		'REPORT'             => ($bb_cfg['text_buttons']) ? $report : $report_img,
-		'REPORT'  => ($bb_cfg['text_buttons']) ? $report : $report_img,
+		'POSTER_BIRTHDAY'    => ($bb_cfg['birthday_enabled'] && $this_date == $poster_birthday) ? '<img src="'. $images['icon_birthday'] .'" alt="" title="'. $lang['HAPPY_BIRTHDAY'] .'" border="0" />' : '',
-		// Report [END]
 	));
 
 	if ($postrow[$i]['post_attachment'] && $is_auth['auth_download'] && function_exists('display_post_attachments'))