From 07a0ed37ec0cd87e6fa3bf23e7baa4c47c87eb0c Mon Sep 17 00:00:00 2001
From: msquare <msquare@notrademark.de>
Date: Mon, 26 Dec 2016 23:47:10 +0100
Subject: fix angeltype supporter privilege for signing up users to shift

---
 includes/model/Shifts_model.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'includes')

diff --git a/includes/model/Shifts_model.php b/includes/model/Shifts_model.php
index 8107f707..ed484e1b 100644
--- a/includes/model/Shifts_model.php
+++ b/includes/model/Shifts_model.php
@@ -172,6 +172,18 @@ function Shift_signup_allowed_angel($user, $shift, $angeltype, $user_angeltype,
   return new ShiftSignupState(ShiftSignupState::FREE, $free_entries);
 }
 
+/**
+ * Check if an angeltype supporter can sign up a user to a shift.
+ */
+function Shift_signup_allowed_angeltype_supporter($shift, $angeltype) {
+  $free_entries = Shift_free_entries($shift['SID'], $angeltype['id']);
+  if ($free_entries == 0) {
+    return new ShiftSignupState(ShiftSignupState::OCCUPIED, $free_entries);
+  }
+  
+  return new ShiftSignupState(ShiftSignupState::FREE, $free_entries);
+}
+
 /**
  * Check if an admin can sign up a user to a shift.
  *
@@ -208,7 +220,7 @@ function Shift_signup_allowed($signup_user, $shift, $angeltype, $user_angeltype
   }
   
   if (in_array('shiftentry_edit_angeltype_supporter', $privileges) && User_is_AngelType_supporter($user, $angeltype)) {
-    return Shift_signup_allowed_angel($signup_user, $shift, $angeltype, $user_angeltype, $user_shifts, true);
+    return Shift_signup_allowed_angeltype_supporter($shift, $angeltype);
   }
   
   return Shift_signup_allowed_angel($signup_user, $shift, $angeltype, $user_angeltype, $user_shifts, false);
-- 
cgit v1.2.3-54-g00ecf