diff --git a/CHANGELOG.md b/CHANGELOG.md index dc4648b6..9f14d75c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ - Release v2.1.5-2023.10 🎉 - Updated Text_LangCorrect class [\#309](https://github.com/torrentpier/torrentpier-lts/pull/309) ([belomaxorka](https://github.com/belomaxorka)) -- Minor improvements [\#297](https://github.com/torrentpier/torrentpier-lts/pull/297), [\#298](https://github.com/torrentpier/torrentpier-lts/pull/298), [\#300](https://github.com/torrentpier/torrentpier-lts/pull/300), [\#301](https://github.com/torrentpier/torrentpier-lts/pull/301), [\#302](https://github.com/torrentpier/torrentpier-lts/pull/302), [\#303](https://github.com/torrentpier/torrentpier-lts/pull/303), [\#305](https://github.com/torrentpier/torrentpier-lts/pull/305), [\#306](https://github.com/torrentpier/torrentpier-lts/pull/306), [\#307](https://github.com/torrentpier/torrentpier-lts/pull/307), [\#310](https://github.com/torrentpier/torrentpier-lts/pull/310), [\#312](https://github.com/torrentpier/torrentpier-lts/pull/312), [\#313](https://github.com/torrentpier/torrentpier-lts/pull/313) ([belomaxorka](https://github.com/belomaxorka)) +- Minor improvements [\#297](https://github.com/torrentpier/torrentpier-lts/pull/297), [\#298](https://github.com/torrentpier/torrentpier-lts/pull/298), [\#300](https://github.com/torrentpier/torrentpier-lts/pull/300), [\#301](https://github.com/torrentpier/torrentpier-lts/pull/301), [\#302](https://github.com/torrentpier/torrentpier-lts/pull/302), [\#303](https://github.com/torrentpier/torrentpier-lts/pull/303), [\#305](https://github.com/torrentpier/torrentpier-lts/pull/305), [\#306](https://github.com/torrentpier/torrentpier-lts/pull/306), [\#307](https://github.com/torrentpier/torrentpier-lts/pull/307), [\#310](https://github.com/torrentpier/torrentpier-lts/pull/310), [\#312](https://github.com/torrentpier/torrentpier-lts/pull/312), [\#313](https://github.com/torrentpier/torrentpier-lts/pull/313), [\#315](https://github.com/torrentpier/torrentpier-lts/pull/315) ([belomaxorka](https://github.com/belomaxorka)) ## [v2.1.5-2023.09](https://github.com/torrentpier/torrentpier-lts/tree/v2.1.5-2023.09) (2023-10-04) [Full Changelog](https://github.com/torrentpier/torrentpier-lts/compare/v2.1.5-2023.08-HotFix...v2.1.5-2023.09) diff --git a/library/includes/ucp/viewprofile.php b/library/includes/ucp/viewprofile.php index 80f80e7c..f6812e48 100644 --- a/library/includes/ucp/viewprofile.php +++ b/library/includes/ucp/viewprofile.php @@ -82,6 +82,9 @@ else if ($signature) $signature = bbcode2html($signature); } +$this_date = bb_date(TIMENOW, 'md', false); +$poster_birthday = ($profiledata['user_id'] != GUEST_UID && !empty($profiledata['user_birthday']) && $profiledata['user_birthday'] != '1900-01-01') ? bb_date(strtotime($profiledata['user_birthday']), 'md', false) : ''; + $template->assign_vars(array( 'PAGE_TITLE' => sprintf($lang['VIEWING_USER_PROFILE'], $profiledata['username']), 'USERNAME' => $profiledata['username'], @@ -108,6 +111,7 @@ $template->assign_vars(array( 'USER_POINTS' => $profiledata['user_points'], 'GENDER' => ($bb_cfg['gender']) ? $lang['GENDER_SELECT'][$profiledata['user_gender']] : '', 'BIRTHDAY' => ($bb_cfg['birthday_enabled'] && !empty($profiledata['user_birthday']) && $profiledata['user_birthday'] != '1900-01-01') ? $profiledata['user_birthday'] : '', + 'BIRTHDAY_ICON' => ($bb_cfg['birthday_enabled'] && $this_date == $poster_birthday) ? '' . $lang['HAPPY_BIRTHDAY'] . '' : '', 'AGE' => ($bb_cfg['birthday_enabled'] && !empty($profiledata['user_birthday']) && $profiledata['user_birthday'] != '1900-01-01') ? birthday_age($profiledata['user_birthday']) : '', 'L_VIEWING_PROFILE' => sprintf($lang['VIEWING_USER_PROFILE'], $profiledata['username']), diff --git a/memberlist.php b/memberlist.php index 3886be01..fceb2bbf 100644 --- a/memberlist.php +++ b/memberlist.php @@ -152,7 +152,7 @@ $template->assign_vars(array( )); // per-letter selection end -$sql = "SELECT username, user_id, user_rank, user_opt, user_posts, user_regdate, user_from, user_website, user_email FROM ". BB_USERS ." WHERE user_id NOT IN(". EXCLUDED_USERS_CSV .")"; +$sql = "SELECT username, user_id, user_rank, user_opt, user_posts, user_regdate, user_from, user_website, user_email, avatar_ext_id FROM ". BB_USERS ." WHERE user_id NOT IN(". EXCLUDED_USERS_CSV .")"; if ( $username ) { $username = preg_replace('/\*/', '%', clean_username($username)); @@ -200,6 +200,7 @@ if ($result = DB()->fetch_rowset($sql)) 'ROW_NUMBER' => $i + ( $start + 1 ), 'ROW_CLASS' => $row_class, 'USER' => profile_url($row), + 'AVATAR_IMG' => get_avatar($row['user_id'], $row['avatar_ext_id'], !bf($row['user_opt'], 'user_opt', 'dis_avatar'), '', 50, 50), 'FROM' => $from, 'JOINED_RAW' => $row['user_regdate'], 'JOINED' => $joined, diff --git a/styles/templates/default/memberlist.tpl b/styles/templates/default/memberlist.tpl index 5de5fef2..bfe997fd 100644 --- a/styles/templates/default/memberlist.tpl +++ b/styles/templates/default/memberlist.tpl @@ -39,7 +39,7 @@ {memberrow.ROW_NUMBER} - {memberrow.USER} +
{memberrow.AVATAR_IMG}
{memberrow.USER} {memberrow.PM} {memberrow.EMAIL} {memberrow.FROM} diff --git a/styles/templates/default/usercp_viewprofile.tpl b/styles/templates/default/usercp_viewprofile.tpl index 6d0b005d..cef42236 100644 --- a/styles/templates/default/usercp_viewprofile.tpl +++ b/styles/templates/default/usercp_viewprofile.tpl @@ -221,6 +221,7 @@ ajax.callback.gen_passkey = function(data){ {RANK_IMAGE}

+
{BIRTHDAY_ICON}

{L_CONTACT} {USERNAME}

diff --git a/styles/templates/default/viewtopic.tpl b/styles/templates/default/viewtopic.tpl index 61358f18..bd6d136b 100644 --- a/styles/templates/default/viewtopic.tpl +++ b/styles/templates/default/viewtopic.tpl @@ -378,7 +378,7 @@ function build_poll_add_form (src_el)

{MINIPOST_IMG_NEW}{MINIPOST_IMG} - {postrow.POST_DATE} + {postrow.POST_DATE} | #{postrow.POST_NUMBER} ({L_POSTED_AFTER} {postrow.POSTED_AFTER}) @@ -640,4 +640,4 @@ function build_poll_add_form (src_el)

- \ No newline at end of file + diff --git a/viewtopic.php b/viewtopic.php index 3e4cc0e9..cfc722f5 100644 --- a/viewtopic.php +++ b/viewtopic.php @@ -367,7 +367,7 @@ if ($t_data['topic_show_first_post'] && $start) u.user_regdate, u.user_sig, u.avatar_ext_id, u.user_opt, u.user_gender, u.user_birthday, - p.*, g.group_name, g.group_id, g.group_signature, g.avatar_ext_id as rg_avatar_id, + p.*, g.group_name, g.group_id, g.group_description, g.group_signature, g.avatar_ext_id as rg_avatar_id, u2.username as mc_username, u2.user_rank as mc_user_rank, h.post_html, IF(h.post_html IS NULL, pt.post_text, NULL) AS post_text FROM ". BB_POSTS ." p @@ -648,7 +648,7 @@ if ($topic_has_poll) $prev_post_time = $max_post_time = 0; -$this_date = bb_date(TIMENOW ,'md', false); +$this_date = bb_date(TIMENOW, 'md', false); for($i = 0; $i < $total_posts; $i++) { @@ -669,6 +669,7 @@ for($i = 0; $i < $total_posts; $i++) $rg_id = ($postrow[$i]['poster_rg_id']) ? $postrow[$i]['poster_rg_id'] : 0; $rg_avatar = get_avatar(GROUP_AVATAR_MASK . $rg_id, $postrow[$i]['rg_avatar_id']); $rg_name = ($postrow[$i]['group_name']) ? htmlCHR($postrow[$i]['group_name']) : ''; + $rg_desc = ($postrow[$i]['group_description']) ? bbcode2html(htmlCHR($postrow[$i]['group_description'])) : ''; $rg_signature = ($postrow[$i]['group_signature']) ? bbcode2html(htmlCHR($postrow[$i]['group_signature'])) : ''; $poster_avatar = ''; @@ -814,7 +815,7 @@ for($i = 0; $i < $total_posts; $i++) 'DELETE' => $delpost_btn, 'IP' => $ip_btn, - 'POSTER_BIRTHDAY' => ($bb_cfg['birthday_enabled'] && $this_date == $poster_birthday) ? '' : '', + 'POSTER_BIRTHDAY' => ($bb_cfg['birthday_enabled'] && $this_date == $poster_birthday) ? ''. $lang['HAPPY_BIRTHDAY'] .'' : '', 'MC_COMMENT' => ($mc_type) ? bbcode2html($mc_comment) : '', 'MC_BBCODE' => ($mc_type) ? $mc_comment : '', @@ -824,6 +825,7 @@ for($i = 0; $i < $total_posts; $i++) 'RG_AVATAR' => $rg_avatar, 'RG_NAME' => $rg_name, + 'RG_DESC' => $rg_desc, 'RG_URL' => GROUP_URL . $rg_id, 'RG_FIND_URL' => 'tracker.php?srg='. $rg_id, 'RG_SIG' => $rg_signature,