makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/new-tz-handling] Replace gmmktime() and mktime() with phpbb_datetime

Browse source 
PHPBB3-9558
This commit is contained in:
Joas Schilling 2012-06-04 23:14:41 +02:00
parent f9bc825264
commit 963d4afc2c
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
phpBB/includes/functions_user.php
View file

@ -197,7 +197,6 @@ function user_add($user_row, $cp_data = false)
'user_lastpost_time' => 0, 'user_lastpost_time' => 0,
'user_lastpage' => '', 'user_lastpage' => '',
'user_posts' => 0, 'user_posts' => 0,
'user_dst' => (int) $config['board_dst'],
'user_colour' => '', 'user_colour' => '',
'user_occ' => '', 'user_occ' => '',
'user_interests' => '', 'user_interests' => '',
@ -677,8 +676,10 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas
if (sizeof($ban_other) == 3 && ((int)$ban_other[0] < 9999) && if (sizeof($ban_other) == 3 && ((int)$ban_other[0] < 9999) &&
(strlen($ban_other[0]) == 4) && (strlen($ban_other[1]) == 2) && (strlen($ban_other[2]) == 2)) (strlen($ban_other[0]) == 4) && (strlen($ban_other[1]) == 2) && (strlen($ban_other[2]) == 2))
{ {
$time_offset = (isset($user->timezone) && isset($user->dst)) ? (int) $user->timezone + (int) $user->dst : 0; $ban_end = max($current_time, $user->create_datetime()
$ban_end = max($current_time, gmmktime(0, 0, 0, (int)$ban_other[1], (int)$ban_other[2], (int)$ban_other[0]) - $time_offset); ->setDate((int) $ban_other[0], (int) $ban_other[1], (int) $ban_other[2])
->setTime(0, 0, 0)
->getTimestamp() + $user->tz->getOffset(new DateTime('UTC')));
} }
else else
{ {

7
phpBB/includes/ucp/ucp_register.php
View file

@ -120,7 +120,10 @@ class ucp_register
if ($coppa === false && $config['coppa_enable']) if ($coppa === false && $config['coppa_enable'])
{ {
$now = getdate(); $now = getdate();
$coppa_birthday = $user->format_date(mktime($now['hours'] + $user->data['user_dst'], $now['minutes'], $now['seconds'], $now['mon'], $now['mday'] - 1, $now['year'] - 13), $user->lang['DATE_FORMAT']); $coppa_birthday = $user->create_datetime()
->setDate($now['year'] - 13, $now['mon'], $now['mday'] - 1)
->setTime(0, 0, 0)
->format($user->lang['DATE_FORMAT'], true);
unset($now); unset($now);
$template->assign_vars(array( $template->assign_vars(array(
@ -163,7 +166,6 @@ class ucp_register
$captcha->init(CONFIRM_REG); $captcha->init(CONFIRM_REG);
} }
$is_dst = $config['board_dst'];
$timezone = $config['board_timezone']; $timezone = $config['board_timezone'];
$data = array( $data = array(
@ -280,7 +282,6 @@ class ucp_register
'user_email' => $data['email'], 'user_email' => $data['email'],
'group_id' => (int) $group_id, 'group_id' => (int) $group_id,
'user_timezone' => $data['tz'], 'user_timezone' => $data['tz'],
'user_dst' => $is_dst,
'user_lang' => $data['lang'], 'user_lang' => $data['lang'],
'user_type' => $user_type, 'user_type' => $user_type,
'user_actkey' => $user_actkey, 'user_actkey' => $user_actkey,