From 3fd30add3c7f66cef8e40d80183591b6d2126db7 Mon Sep 17 00:00:00 2001 From: msquare Date: Wed, 23 Nov 2016 22:31:11 +0100 Subject: fix NPE --- includes/controller/shifts_controller.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/includes/controller/shifts_controller.php b/includes/controller/shifts_controller.php index f273c097..3086b948 100644 --- a/includes/controller/shifts_controller.php +++ b/includes/controller/shifts_controller.php @@ -1,5 +1,6 @@ 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(-) 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 From ff31d0a1c59efc2c6dc3c66a803eac697041f572 Mon Sep 17 00:00:00 2001 From: msquare Date: Thu, 24 Nov 2016 09:32:32 +0100 Subject: fix shift signup state being combined to null --- includes/controller/shifts_controller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/controller/shifts_controller.php b/includes/controller/shifts_controller.php index 3086b948..1500b449 100644 --- a/includes/controller/shifts_controller.php +++ b/includes/controller/shifts_controller.php @@ -207,7 +207,7 @@ function shift_controller() { if ($shift_signup_state == null) { $shift_signup_state = $angeltype_signup_state; } else { - $shift_signup_state = $shift_signup_state->combineWith($angeltype_signup_state); + $shift_signup_state->combineWith($angeltype_signup_state); } } -- cgit v1.2.3-54-g00ecf From 7b32a403086d8ef4994093da155c580b752bd5d2 Mon Sep 17 00:00:00 2001 From: gnomus Date: Thu, 24 Nov 2016 12:21:41 +0100 Subject: Update default.po --- locale/de_DE.UTF-8/LC_MESSAGES/default.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.po b/locale/de_DE.UTF-8/LC_MESSAGES/default.po index e8c64a22..2d6b805d 100644 --- a/locale/de_DE.UTF-8/LC_MESSAGES/default.po +++ b/locale/de_DE.UTF-8/LC_MESSAGES/default.po @@ -1544,7 +1544,7 @@ msgstr "Gib bitte ein Passwort ein." #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:309 msgid "" "No user was found with that Nickname. Please try again. If you are still " -"having problems, ask an Dispatcher." +"having problems, ask a Dispatcher." msgstr "" "Es wurde kein Engel mit diesem Namen gefunden. Probiere es bitte noch " "einmal. Wenn das Problem weiterhin besteht, frage einen Dispatcher." -- cgit v1.2.3-54-g00ecf From dc49b9af414f079f323112832ac61bc0e798c77d Mon Sep 17 00:00:00 2001 From: gnomus Date: Thu, 24 Nov 2016 12:22:18 +0100 Subject: Update guest_login.php --- includes/pages/guest_login.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/pages/guest_login.php b/includes/pages/guest_login.php index 31780f10..e0a32423 100644 --- a/includes/pages/guest_login.php +++ b/includes/pages/guest_login.php @@ -306,7 +306,7 @@ function guest_login() { } } else { $valid = false; - error(_("No user was found with that Nickname. Please try again. If you are still having problems, ask an Dispatcher.")); + error(_("No user was found with that Nickname. Please try again. If you are still having problems, ask a Dispatcher.")); } } else { $valid = false; -- cgit v1.2.3-54-g00ecf