From 22246dd09957fb0da150d22bb8abb2d4aece017b Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 22 Nov 2023 20:50:46 +0000 Subject: [PATCH] =?UTF-8?q?Unset=20the=20specific=20arrays=20we=20don?= =?UTF-8?q?=E2=80=99t=20want=20to=20keep?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: snipe --- app/Observers/UserObserver.php | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/app/Observers/UserObserver.php b/app/Observers/UserObserver.php index 454d6c33f7..087b70635c 100644 --- a/app/Observers/UserObserver.php +++ b/app/Observers/UserObserver.php @@ -22,23 +22,24 @@ class UserObserver if ($user->getRawOriginal()[$key] != $user->getAttributes()[$key]) { + $changed[$key]['old'] = $user->getRawOriginal()[$key]; + $changed[$key]['new'] = $user->getAttributes()[$key]; + // Do not store the hashed password in changes - if ($key!='password') { - $changed[$key]['old'] = $user->getRawOriginal()[$key]; - $changed[$key]['new'] = $user->getAttributes()[$key]; - } else { - $changed[$key]['old'] = '*************'; - $changed[$key]['new'] = '*************'; + if ($key == 'password') { + $changed['password']['old'] = '*************'; + $changed['password']['new'] = '*************'; } - if ($key!='last_login') { - unset($changed['last_login']['old']); - unset($changed['last_login']['new']); + // Do not store last login in changes + if ($key == 'last_login') { + unset($changed['last_login']); + unset($changed['last_login']); } - if ($key!='permissions') { - unset($changed['permissions']['old']); - unset($changed['permissions']['new']); + if ($key == 'permissions') { + unset($changed['permissions']); + unset($changed['permissions']); } } } @@ -46,6 +47,8 @@ class UserObserver $logAction = new Actionlog(); $logAction->item_type = User::class; $logAction->item_id = $user->id; + $logAction->target_type = User::class; // can we instead say $logAction->item = $asset ? + $logAction->target_id = $user->id; $logAction->created_at = date('Y-m-d H:i:s'); $logAction->user_id = Auth::id(); $logAction->log_meta = json_encode($changed); @@ -81,6 +84,8 @@ class UserObserver $logAction = new Actionlog(); $logAction->item_type = User::class; $logAction->item_id = $user->id; + $logAction->target_type = User::class; // can we instead say $logAction->item = $asset ? + $logAction->target_id = $user->id; $logAction->created_at = date('Y-m-d H:i:s'); $logAction->user_id = Auth::id(); $logAction->logaction('delete'); @@ -97,6 +102,8 @@ class UserObserver $logAction = new Actionlog(); $logAction->item_type = User::class; $logAction->item_id = $user->id; + $logAction->target_type = User::class; // can we instead say $logAction->item = $asset ? + $logAction->target_id = $user->id; $logAction->created_at = date('Y-m-d H:i:s'); $logAction->user_id = Auth::id(); $logAction->logaction('restore');