ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unset the specific arrays we don’t want to keep

Browse Source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe
2023-11-22 20:50:46 +00:00
parent a7f76f9860
commit 22246dd099
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Observers/UserObserver.php
+19 -12
View File
@@ -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');