Merge pull request #1 from engelsystem/master

Merge with Master

4 files changed, 8 insertions, 7 deletions

diff --git a/includes/controller/shifts_controller.php b/includes/controller/shifts_controller.php
index f273c097..1500b449 100644
--- a/includes/controller/shifts_controller.php
+++ b/includes/controller/shifts_controller.php
@@ -1,5 +1,6 @@
 <?php
 
+use Engelsystem\ShiftSignupState;
 function shift_link($shift) {
   return page_link_to('shifts') . '&action=view&shift_id=' . $shift['SID'];
 }
@@ -200,13 +201,13 @@ function shift_controller() {
   $angeltypes = AngelTypes();
   $user_shifts = Shifts_by_user($user);
   
-  $shift_signup_state = null;
+  $shift_signup_state = new ShiftSignupState(ShiftSignupState::OCCUPIED, 0);
   foreach ($angeltypes as $angeltype) {
     $angeltype_signup_state = Shift_signup_allowed($user, $shift, $angeltype, null, $user_shifts);
     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);
     }
   }
   
diff --git a/includes/pages/guest_login.php b/includes/pages/guest_login.php
index b7f85555..e0a32423 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;
@@ -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;
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) {