From 16e9a69c0dc66cc81e52e748c5a04301351cd204 Mon Sep 17 00:00:00 2001 From: msquare Date: Thu, 24 Nov 2016 09:25:17 +0100 Subject: fixes #277 date parsing returns the start of the day now --- includes/pages/guest_login.php | 2 +- includes/pages/user_settings.php | 4 ++-- includes/sys_page.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'includes') diff --git a/includes/pages/guest_login.php b/includes/pages/guest_login.php index b7f85555..31780f10 100644 --- a/includes/pages/guest_login.php +++ b/includes/pages/guest_login.php @@ -106,7 +106,7 @@ function guest_register() { $msg .= error(sprintf(_("Your password is too short (please use at least %s characters)."), MIN_PASSWORD_LENGTH), true); } - if (isset($_REQUEST['planned_arrival_date']) && $tmp = parse_date("Y-m-d", $_REQUEST['planned_arrival_date'])) { + if (isset($_REQUEST['planned_arrival_date']) && $tmp = parse_date("Y-m-d H:i", $_REQUEST['planned_arrival_date'] . " 00:00")) { $planned_arrival_date = $tmp; } else { $valid = false; diff --git a/includes/pages/user_settings.php b/includes/pages/user_settings.php index 02c61a20..a147b437 100644 --- a/includes/pages/user_settings.php +++ b/includes/pages/user_settings.php @@ -44,7 +44,7 @@ function user_settings_main($user_source, $enable_tshirt_size, $tshirt_sizes) { } if (isset($_REQUEST['planned_arrival_date'])) { - $tmp = parse_date("Y-m-d", $_REQUEST['planned_arrival_date']); + $tmp = parse_date("Y-m-d H:i", $_REQUEST['planned_arrival_date'] . " 00:00"); $result = User_validate_planned_arrival_date($tmp); $user_source['planned_arrival_date'] = $result->getValue(); if (! $result->isValid()) { @@ -54,7 +54,7 @@ function user_settings_main($user_source, $enable_tshirt_size, $tshirt_sizes) { } if (isset($_REQUEST['planned_departure_date'])) { - $tmp = parse_date("Y-m-d", $_REQUEST['planned_departure_date']); + $tmp = parse_date("Y-m-d H:i", $_REQUEST['planned_departure_date'] . " 00:00"); $result = User_validate_planned_departure_date($user_source['planned_arrival_date'], $tmp); $user_source['planned_departure_date'] = $result->getValue(); if (! $result->isValid()) { diff --git a/includes/sys_page.php b/includes/sys_page.php index 8eb32962..82ce9896 100644 --- a/includes/sys_page.php +++ b/includes/sys_page.php @@ -132,7 +132,7 @@ function check_request_date($name, $error_message = null, $null_allowed = false) * @return ValidationResult containing the parsed date */ function check_date($input, $error_message = null, $null_allowed = false) { - if ($tmp = parse_date("Y-m-d", trim($input))) { + if ($tmp = parse_date("Y-m-d H:i", trim($input) . " 00:00")) { return new ValidationResult(true, $tmp); } if ($null_allowed) { -- cgit v1.2.3-54-g00ecf