From e93dd774a5c8338b6c29b8b39b6d883925b9ac61 Mon Sep 17 00:00:00 2001 From: msquare Date: Wed, 19 Jul 2017 21:28:26 +0200 Subject: fix small issues on checking success of a db query --- includes/model/EventConfig_model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'includes/model') diff --git a/includes/model/EventConfig_model.php b/includes/model/EventConfig_model.php index f5846870..112ad457 100644 --- a/includes/model/EventConfig_model.php +++ b/includes/model/EventConfig_model.php @@ -64,7 +64,7 @@ function EventConfig_update( ); } - return (bool)DB::update(' + return DB::update(' UPDATE `EventConfig` SET `event_name` = ?, `buildup_start_date` = ?, -- cgit v1.2.3-70-g09d2 From 903a1f97902414fd2b5028726ee3a864e405f11a Mon Sep 17 00:00:00 2001 From: msquare Date: Wed, 19 Jul 2017 21:30:18 +0200 Subject: remove 24h shift filter time range limit --- includes/model/ShiftsFilter.php | 9 --------- 1 file changed, 9 deletions(-) (limited to 'includes/model') diff --git a/includes/model/ShiftsFilter.php b/includes/model/ShiftsFilter.php index 47ef50d7..3b691b55 100644 --- a/includes/model/ShiftsFilter.php +++ b/includes/model/ShiftsFilter.php @@ -9,12 +9,6 @@ namespace Engelsystem; */ class ShiftsFilter { - /** - * How long can the time interval be? - * 86400 = one day - */ - const MAX_DURATION = 86400; - /** * Shift is completely full. */ @@ -98,9 +92,6 @@ class ShiftsFilter */ public function setEndTime($endTime) { - if ($endTime - $this->startTime > ShiftsFilter::MAX_DURATION) { - $endTime = $this->startTime + ShiftsFilter::MAX_DURATION; - } $this->endTime = $endTime; } -- cgit v1.2.3-70-g09d2 From 8ae01236353dad099e98f555fdf9cbfbf5cdca6a Mon Sep 17 00:00:00 2001 From: msquare Date: Wed, 19 Jul 2017 21:32:42 +0200 Subject: unarrived angels can enter a shift (has been disabled for 33c3) --- includes/model/Shifts_model.php | 4 ---- 1 file changed, 4 deletions(-) (limited to 'includes/model') diff --git a/includes/model/Shifts_model.php b/includes/model/Shifts_model.php index b0269362..21abc888 100644 --- a/includes/model/Shifts_model.php +++ b/includes/model/Shifts_model.php @@ -266,10 +266,6 @@ function Shift_signup_allowed_angel( ) { $free_entries = Shift_free_entries($needed_angeltype, $shift_entries); - if ($user['Gekommen'] == 0) { - return new ShiftSignupState(ShiftSignupState::SHIFT_ENDED, $free_entries); - } - if ($user_shifts == null) { $user_shifts = Shifts_by_user($user); } -- cgit v1.2.3-70-g09d2