From 89e62c95a7ffd71a8e860f59378ecd13d6cbb196 Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Tue, 9 Oct 2018 21:47:31 +0200
Subject: Changed more functions :tada:

---
 includes/controller/user_worklog_controller.php | 27 ++++++++++++++-----------
 1 file changed, 15 insertions(+), 12 deletions(-)

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

diff --git a/includes/controller/user_worklog_controller.php b/includes/controller/user_worklog_controller.php
index a431643f..e1b3ee86 100644
--- a/includes/controller/user_worklog_controller.php
+++ b/includes/controller/user_worklog_controller.php
@@ -1,5 +1,7 @@
 <?php
 
+use Engelsystem\Models\User\User;
+
 /**
  * Delete a work log entry.
  *
@@ -7,20 +9,20 @@
  */
 function user_worklog_delete_controller()
 {
-    global $user;
+    $user = auth()->user();
 
     $request = request();
     $userWorkLog = UserWorkLog($request->input('user_worklog_id'));
     if (empty($userWorkLog)) {
-        redirect(user_link($user['UID']));
+        redirect(user_link($user->id));
     }
-    $user_source = User($userWorkLog['user_id']);
+    $user_source = User::find($userWorkLog['user_id']);
 
     if ($request->has('confirmed')) {
         UserWorkLog_delete($userWorkLog);
 
         success(__('Work log entry deleted.'));
-        redirect(user_link($user_source['UID']));
+        redirect(user_link($user_source->id));
     }
 
     return [
@@ -36,12 +38,12 @@ function user_worklog_delete_controller()
  */
 function user_worklog_edit_controller()
 {
-    global $user;
+    $user = auth()->user();
 
     $request = request();
     $userWorkLog = UserWorkLog($request->input('user_worklog_id'));
     if (empty($userWorkLog)) {
-        redirect(user_link($user['UID']));
+        redirect(user_link($user->id));
     }
     $user_source = User($userWorkLog['user_id']);
 
@@ -108,15 +110,15 @@ function user_worklog_from_request($userWorkLog)
  */
 function user_worklog_add_controller()
 {
-    global $user;
+    $user = auth()->user();
 
     $request = request();
     $user_source = User($request->input('user_id'));
     if (empty($user_source)) {
-        redirect(user_link($user['UID']));
+        redirect(user_link($user->id));
     }
 
-    $userWorkLog = UserWorkLog_new($user_source);
+    $userWorkLog = UserWorkLog_new($user_source['UID']);
 
     if ($request->has('submit')) {
         list ($valid, $userWorkLog) = user_worklog_from_request($userWorkLog);
@@ -186,16 +188,17 @@ function user_worklog_delete_link($userWorkLog, $parameters = [])
  */
 function user_worklog_controller()
 {
-    global $user, $privileges;
+    global $privileges;
+    $user = auth()->user();
 
     if (!in_array('admin_user_worklog', $privileges)) {
-        redirect(user_link($user['UID']));
+        redirect(user_link($user->id));
     }
 
     $request = request();
     $action = $request->input('action');
     if (!$request->has('action')) {
-        redirect(user_link($user['UID']));
+        redirect(user_link($user->id));
     }
 
     switch ($action) {
-- 
cgit v1.2.3-54-g00ecf