From 869ad08b236ff6c6a62354c9423de5f108ea2053 Mon Sep 17 00:00:00 2001 From: pherum83 Date: Sun, 23 Sep 2012 17:25:08 +0000 Subject: [PATCH] r457 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit пол в топике, праздничный торт git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@457 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293 --- upload/config.php | 4 +- upload/language/lang_english/lang_main.php | 1 + upload/language/lang_russian/lang_main.php | 1 + upload/templates/default/css/main.css | 1 + .../default/images/icon_birthday.gif | Bin 0 -> 1198 bytes .../templates/default/images/icon_female.gif | Bin 0 -> 141 bytes upload/templates/default/images/icon_male.gif | Bin 0 -> 143 bytes upload/templates/default/tpl_config.php | 4 ++ upload/templates/default/viewtopic.tpl | 3 + upload/viewtopic.php | 56 +++++++++++------- 10 files changed, 46 insertions(+), 24 deletions(-) create mode 100644 upload/templates/default/images/icon_birthday.gif create mode 100644 upload/templates/default/images/icon_female.gif create mode 100644 upload/templates/default/images/icon_male.gif diff --git a/upload/config.php b/upload/config.php index 72a566fb8..157020fea 100644 --- a/upload/config.php +++ b/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_date'] = '07-09-2012'; +$bb_cfg['tp_release_state'] = 'R457'; +$bb_cfg['tp_release_date'] = '23-09-2012'; // Database $charset = 'utf8'; diff --git a/upload/language/lang_english/lang_main.php b/upload/language/lang_english/lang_main.php index 767889c20..7b4dc7131 100644 --- a/upload/language/lang_english/lang_main.php +++ b/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'; diff --git a/upload/language/lang_russian/lang_main.php b/upload/language/lang_russian/lang_main.php index 550821d41..08fa29295 100644 --- a/upload/language/lang_russian/lang_main.php +++ b/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 лет'; diff --git a/upload/templates/default/css/main.css b/upload/templates/default/css/main.css index 4ce6b03eb..a05e72edc 100644 --- a/upload/templates/default/css/main.css +++ b/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; } diff --git a/upload/templates/default/images/icon_birthday.gif b/upload/templates/default/images/icon_birthday.gif new file mode 100644 index 0000000000000000000000000000000000000000..c17cba9427b902b735c8857e411b5787cbb39a60 GIT binary patch literal 1198 zcmV;f1X24(Nk%w1VJHA70Oo%Ht6L1lbph+VlU`oKMHr`^d=3ZJ5N>>Hh!UtpDrEZ)tk} z{rJ1q>v*j3|NsB*@9+NT#rEpt+`*U2>Hoaj{mO4}_Hb~ya~6AhS8i%S*%^4kCY{g;4a z_2I$v{{K>l$mzt1i%1S>n*03x{QLR%k5L_?QUuC}e)#|YzvBMKWdO%+0R8{}tYZwA zQ53Sz<-BhNa_sac((s=L0w|HBovfI2>U>tCSu<3c0+`})t&(f9N0t85ka_4To0 z5zgT0;kbdG%>4FVAn)DLkWdf4M>Ca95B>f8wN*#tdrXZ*KL7v!A^8LW004ggEC2ui z04M+`000O7fPaF6goTEOh>41XGYv6|kdcCHd5@Bph7J`KKA4_@M{G$Id{&>BeWOV_ zr;Y7&_6%zsr9!yw;3a|k=JW)g=1IHFkWB~p_nQ~wia}Dqf zXmoKR8Wi?eWI(5c0MUF;T0Bys#1V^MBzQ(NWk9_gb0i& z-@!)!0D*>%Fy|FQ0~S~;uz(!zbrHgXWykchoG?z#UJ}gim0PbC< z;DRAU7-4<^P-r0*8L}|MAtqFD03HP{5F&gFdZFWq5~}E-1$uO##s`I@P(>6|F!AC4 zjU(=eqJ$OxNW}y-sDS|?8}I-_1~eMTWR5yMnWB#@hLPM016(P{1~$MDg#uKB0b+t+ z@`$33Oi*!vavKzI!XQJu@C6JHbg)Bpbe0(AlN0Wj#SR*L;RFe4m_gPbA8Zf>3|q|6 z0TKv`a9y1!>KFkWNN7MtKqRbD07Qj+fC3j=a7uy;1Qa1b8W7}=!x+BikVYC3bU?ry z5A3nU13XAkz@>zc0R#$lkPt-+%cf9+4K9e`tr#wFQ3DCdI`KdaLO6Sd6N|(^zyK(0 zPzM(zko&;B_&!iC7j?YgED&y(a!Cws5CFsg2&16z!U!X5#u*9hF-{B^xN*V@85m=H Mf*T3E5lJ8bJ0hYoYXATM literal 0 HcmV?d00001 diff --git a/upload/templates/default/images/icon_female.gif b/upload/templates/default/images/icon_female.gif new file mode 100644 index 0000000000000000000000000000000000000000..321f2c96daf28cc561dcbbb03bb51bff4cccc996 GIT binary patch literal 141 zcmZ?wbhEHbUoeb3B;Z^q<8p$-b(2C< qm0qu43s;i?n?Xyb@Im$v9f|qQ6B`XUnATo+8Og-Py3&V*!5RRUh&AQ_ literal 0 HcmV?d00001 diff --git a/upload/templates/default/images/icon_male.gif b/upload/templates/default/images/icon_male.gif new file mode 100644 index 0000000000000000000000000000000000000000..bc98e06893a714f37cb9021b4af727d1484a88ea GIT binary patch literal 143 zcmV;A0C4|DNk%w1VG95Y0J8u9F=KQqc#$%Wt~jK~Wtyy4vCnJJ@qw3~f}Ew2vAeXn zyNR^IpuNVQ&fdVlzyJUMA^8LW000gEEC2ui01E&M000C$&`H^9Ws{m+R(1@t3B>0# xi$I=@Q7yz05LHoZWg;L=0T6?MAY%w9PK5w*;OQwRjKPfnID8hufHe~V06QkPHWmN? literal 0 HcmV?d00001 diff --git a/upload/templates/default/tpl_config.php b/upload/templates/default/tpl_config.php index 5346dc651..e96b0a876 100644 --- a/upload/templates/default/tpl_config.php +++ b/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'; diff --git a/upload/templates/default/viewtopic.tpl b/upload/templates/default/viewtopic.tpl index fc5065b63..3d93624f8 100644 --- a/upload/templates/default/viewtopic.tpl +++ b/upload/templates/default/viewtopic.tpl @@ -286,9 +286,12 @@ ajax.callback.mod_action = function(data) {

{postrow.POSTER_RANK}

{postrow.RANK_IMAGE}

{postrow.POSTER_AVATAR}

+

{L_GENDER}: {postrow.POSTER_GENDER}

{L_LONGEVITY}: {postrow.POSTER_JOINED}

{L_POSTS}: {postrow.POSTER_POSTS}

{L_LOCATION}: {postrow.POSTER_FROM}

+ +

{postrow.POSTER_BIRTHDAY}

diff --git a/upload/viewtopic.php b/upload/viewtopic.php index 8fd3f962e..6efc9160f 100644 --- a/upload/viewtopic.php +++ b/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.user_regdate, u.user_rank, u.user_sig, + u.username, u.user_id, u.user_rank, u.user_posts, u.user_from, + 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.user_regdate, u.user_rank, u.user_sig, + u.username, u.user_id, u.user_rank, u.user_posts, u.user_from, + 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 = ''; - $profile_btn = ''; - - $delpost_btn = ''; - $edit_btn = ''; - $ip_btn = ''; - $quote_btn = ''; + $pm_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 = ''; + break; + case FEMALE: + $gender = ''; + 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, - 'PROFILE' => $profile_btn, + 'PM' => $pm_btn, + 'PROFILE' => $profile_btn, - 'QUOTE' => $quote_btn, - 'EDIT' => $edit_btn, - 'DELETE' => $delpost_btn, - 'IP' => $ip_btn, + 'QUOTE' => $quote_btn, + 'EDIT' => $edit_btn, + 'DELETE' => $delpost_btn, + 'IP' => $ip_btn, - // Report - 'REPORT' => ($bb_cfg['text_buttons']) ? $report : $report_img, - // Report [END] + 'REPORT' => ($bb_cfg['text_buttons']) ? $report : $report_img, + 'POSTER_BIRTHDAY' => ($bb_cfg['birthday_enabled'] && $this_date == $poster_birthday) ? '' : '', )); if ($postrow[$i]['post_attachment'] && $is_auth['auth_download'] && function_exists('display_post_attachments'))