From 7725064b8974efd32b7de625a5264a5071cf4480 Mon Sep 17 00:00:00 2001 From: Roman Kelesidis Date: Sat, 1 Apr 2023 12:01:57 +0700 Subject: [PATCH] Default value for user_birthday causes exception on user password change (#100) torrentpier/torrentpier#449 --- library/includes/datastore/build_stats.php | 1 + library/includes/ucp/register.php | 7 +++---- library/includes/ucp/viewprofile.php | 4 ++-- viewtopic.php | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/library/includes/datastore/build_stats.php b/library/includes/datastore/build_stats.php index 30d3cc85..68aeaf4d 100644 --- a/library/includes/datastore/build_stats.php +++ b/library/includes/datastore/build_stats.php @@ -54,6 +54,7 @@ if ($bb_cfg['birthday_check_day'] && $bb_cfg['birthday_enabled']) FROM ". BB_USERS ." WHERE user_id NOT IN(". EXCLUDED_USERS_CSV .") AND user_birthday != '0000-00-00' + AND user_birthday IS NOT NULL AND user_active = 1 ORDER BY user_level DESC, username "); diff --git a/library/includes/ucp/register.php b/library/includes/ucp/register.php index 35983886..8eff2251 100644 --- a/library/includes/ucp/register.php +++ b/library/includes/ucp/register.php @@ -334,9 +334,9 @@ foreach ($profile_fields as $field => $can_edit) * Возраст (edit) */ case 'user_birthday': - $user_birthday = isset($_POST['user_birthday']) ? (string) $_POST['user_birthday'] : $pr_data['user_birthday']; + $user_birthday = !empty($_POST['user_birthday']) ? (string) $_POST['user_birthday'] : $pr_data['user_birthday']; - if ($submit && $user_birthday != $pr_data['user_birthday']) + if ($submit && $user_birthday !== $pr_data['user_birthday']) { $birthday_date = date_parse($user_birthday); @@ -356,8 +356,7 @@ foreach ($profile_fields as $field => $can_edit) } } - $pr_data['user_birthday'] = $user_birthday; - $db_data['user_birthday'] = $user_birthday; + $pr_data['user_birthday'] = $db_data['user_birthday'] = !empty($user_birthday) ? $user_birthday : null; } $tp_data['USER_BIRTHDAY'] = $pr_data['user_birthday']; break; diff --git a/library/includes/ucp/viewprofile.php b/library/includes/ucp/viewprofile.php index 84ab4e7f..62febcae 100644 --- a/library/includes/ucp/viewprofile.php +++ b/library/includes/ucp/viewprofile.php @@ -104,8 +104,8 @@ $template->assign_vars(array( 'TWITTER' => $profiledata['user_twitter'], 'USER_POINTS' => $profiledata['user_points'], 'GENDER' => ($bb_cfg['gender']) ? $lang['GENDER_SELECT'][$profiledata['user_gender']] : '', - 'BIRTHDAY' => ($bb_cfg['birthday_enabled'] && $profiledata['user_birthday'] != '0000-00-00') ? $profiledata['user_birthday'] : '', - 'AGE' => ($bb_cfg['birthday_enabled'] && $profiledata['user_birthday'] != '0000-00-00') ? birthday_age($profiledata['user_birthday']) : '', + 'BIRTHDAY' => ($bb_cfg['birthday_enabled'] && !empty($profiledata['user_birthday']) && $profiledata['user_birthday'] != '0000-00-00') ? $profiledata['user_birthday'] : '', + 'AGE' => ($bb_cfg['birthday_enabled'] && !empty($profiledata['user_birthday']) && $profiledata['user_birthday'] != '0000-00-00') ? birthday_age($profiledata['user_birthday']) : '', 'L_VIEWING_PROFILE' => sprintf($lang['VIEWING_USER_PROFILE'], $profiledata['username']), 'L_MY_PROFILE' => sprintf($lang['VIEWING_MY_PROFILE'], 'profile.php?mode=editprofile'), diff --git a/viewtopic.php b/viewtopic.php index b90cb309..c9661a22 100644 --- a/viewtopic.php +++ b/viewtopic.php @@ -649,7 +649,7 @@ for($i = 0; $i < $total_posts; $i++) { $poster_id = $postrow[$i]['user_id']; $poster = ($poster_id == GUEST_UID) ? $lang['GUEST'] : $postrow[$i]['username']; - $poster_birthday = ($poster_id != GUEST_UID && $postrow[$i]['user_birthday'] != '0000-00-00') ? date('md', strtotime($postrow[$i]['user_birthday'])) : ''; + $poster_birthday = ($poster_id != GUEST_UID && !empty($postrow[$i]['user_birthday']) && $postrow[$i]['user_birthday'] != '0000-00-00') ? date('md', strtotime($postrow[$i]['user_birthday'])) : ''; $post_date = bb_date($postrow[$i]['post_time'], $bb_cfg['post_date_format']); $max_post_time = max($max_post_time, $postrow[$i]['post_time']); $poster_posts = ($poster_id != GUEST_UID) ? $postrow[$i]['user_posts'] : '';