diff options
Diffstat (limited to 'includes/model')
| -rw-r--r-- | includes/model/AngelType_model.php | 2 | ||||
| -rw-r--r-- | includes/model/ShiftEntry_model.php | 4 | ||||
| -rw-r--r-- | includes/model/UserWorkLog_model.php | 6 | ||||
| -rw-r--r-- | includes/model/User_model.php | 13 |
4 files changed, 13 insertions, 12 deletions
diff --git a/includes/model/AngelType_model.php b/includes/model/AngelType_model.php index 9b35f2b8..713d0f74 100644 --- a/includes/model/AngelType_model.php +++ b/includes/model/AngelType_model.php @@ -48,7 +48,7 @@ function AngelType_delete($angeltype) WHERE `id`=? LIMIT 1 ', [$angeltype['id']]); - engelsystem_log('Deleted angeltype: ' . AngelType_name_render($angeltype)); + engelsystem_log('Deleted angeltype: ' . AngelType_name_render($angeltype, true)); } /** diff --git a/includes/model/ShiftEntry_model.php b/includes/model/ShiftEntry_model.php index 54837bac..a017a32c 100644 --- a/includes/model/ShiftEntry_model.php +++ b/includes/model/ShiftEntry_model.php @@ -94,7 +94,7 @@ function ShiftEntry_create($shift_entry) ] ); engelsystem_log( - 'User ' . User_Nick_render($user) + 'User ' . User_Nick_render($user, true) . ' signed up for shift ' . $shift['name'] . ' from ' . date('Y-m-d H:i', $shift['start']) . ' to ' . date('Y-m-d H:i', $shift['end']) @@ -156,7 +156,7 @@ function ShiftEntry_delete($shiftEntry) $angeltype = AngelType($shiftEntry['TID']); engelsystem_log( - 'Shift signout: ' . User_Nick_render($signout_user) . ' from shift ' . $shifttype['name'] + 'Shift signout: ' . User_Nick_render($signout_user, true) . ' from shift ' . $shifttype['name'] . ' at ' . $room['Name'] . ' from ' . date('Y-m-d H:i', $shift['start']) . ' to ' . date('Y-m-d H:i', $shift['end']) diff --git a/includes/model/UserWorkLog_model.php b/includes/model/UserWorkLog_model.php index 3b679cda..7b766c5e 100644 --- a/includes/model/UserWorkLog_model.php +++ b/includes/model/UserWorkLog_model.php @@ -47,7 +47,7 @@ function UserWorkLog_delete($userWorkLog) engelsystem_log(sprintf( 'Delete work log for %s, %s hours, %s', - User_Nick_render($user_source), + User_Nick_render($user_source, true), $userWorkLog['work_hours'], $userWorkLog['comment'] )); @@ -78,7 +78,7 @@ function UserWorkLog_update($userWorkLog) engelsystem_log(sprintf( 'Updated work log for %s, %s hours, %s', - User_Nick_render($user_source), + User_Nick_render($user_source, true), $userWorkLog['work_hours'], $userWorkLog['comment']) ); @@ -115,7 +115,7 @@ function UserWorkLog_create($userWorkLog) time() ]); - engelsystem_log(sprintf('Added work log entry for %s, %s hours, %s', User_Nick_render($user_source), + engelsystem_log(sprintf('Added work log entry for %s, %s hours, %s', User_Nick_render($user_source, true), $userWorkLog['work_hours'], $userWorkLog['comment'])); return $result; diff --git a/includes/model/User_model.php b/includes/model/User_model.php index a928d895..1994bc47 100644 --- a/includes/model/User_model.php +++ b/includes/model/User_model.php @@ -5,6 +5,7 @@ use Engelsystem\Database\DB; use Engelsystem\Models\User\PasswordReset; use Engelsystem\Models\User\User; use Engelsystem\ValidationResult; +use Illuminate\Database\Query\JoinClause; /** * User model @@ -117,14 +118,14 @@ function Users_by_angeltype($angeltype) function User_validate_Nick($nick) { $nick = trim($nick); - - if(strlen($nick) == 0 || strlen($nick) > 23) { + + if (strlen($nick) == 0 || strlen($nick) > 23) { return new ValidationResult(false, $nick); } - if(preg_match('/([^\p{L}\p{N}\-_. ]+)/ui', $nick)) { + if (preg_match('/([^\p{L}\p{N}\-_. ]+)/ui', $nick)) { return new ValidationResult(false, $nick); } - + return new ValidationResult(true, $nick); } @@ -222,7 +223,7 @@ function User_reset_api_key($user, $log = true) $user->save(); if ($log) { - engelsystem_log(sprintf('API key resetted (%s).', User_Nick_render($user))); + engelsystem_log(sprintf('API key resetted (%s).', User_Nick_render($user, true))); } } @@ -239,7 +240,7 @@ function User_generate_password_recovery_token($user) $reset->token = md5($user->name . time() . rand()); $reset->save(); - engelsystem_log('Password recovery for ' . User_Nick_render($user) . ' started.'); + engelsystem_log('Password recovery for ' . User_Nick_render($user, true) . ' started.'); return $reset->token; } |