From 7c6afc2bfe3263b91ecabf5530da57fe1162ea0b Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Wed, 10 Oct 2018 03:10:28 +0200
Subject: Removed `User($id)` function :tada:

---
 includes/controller/angeltypes_controller.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'includes/controller/angeltypes_controller.php')

diff --git a/includes/controller/angeltypes_controller.php b/includes/controller/angeltypes_controller.php
index b161266d..82cbf935 100644
--- a/includes/controller/angeltypes_controller.php
+++ b/includes/controller/angeltypes_controller.php
@@ -105,7 +105,7 @@ function angeltype_delete_controller()
  */
 function angeltype_edit_controller()
 {
-    global $privileges, $user;
+    global $privileges;
 
     // In supporter mode only allow to modify description
     $supporter_mode = !in_array('admin_angel_types', $privileges);
@@ -115,7 +115,7 @@ function angeltype_edit_controller()
         // Edit existing angeltype
         $angeltype = load_angeltype();
 
-        if (!User_is_AngelType_supporter($user, $angeltype)) {
+        if (!User_is_AngelType_supporter(auth()->user(), $angeltype)) {
             redirect(page_link_to('angeltypes'));
         }
     } else {
@@ -178,15 +178,16 @@ function angeltype_edit_controller()
  */
 function angeltype_controller()
 {
-    global $privileges, $user;
+    global $privileges;
+    $user = auth()->user();
 
     if (!in_array('angeltypes', $privileges)) {
         redirect(page_link_to('/'));
     }
 
     $angeltype = load_angeltype();
-    $user_angeltype = UserAngelType_by_User_and_AngelType($user['UID'], $angeltype);
-    $user_driver_license = UserDriverLicense($user['UID']);
+    $user_angeltype = UserAngelType_by_User_and_AngelType($user->id, $angeltype);
+    $user_driver_license = UserDriverLicense($user->id);
     $members = Users_by_angeltype($angeltype);
 
     $days = angeltype_controller_shiftsFilterDays($angeltype);
-- 
cgit v1.2.3-70-g09d2