From 00a6e7ff9f6644bc94a2a96b38a986061bc377fd Mon Sep 17 00:00:00 2001 From: flashwave Date: Sat, 15 Dec 2018 19:46:48 +0100 Subject: [PATCH] Convert audit log strings to constants. --- public/auth.php | 2 +- public/manage/changelog.php | 16 +++++++-------- public/settings.php | 8 ++++---- src/audit_log.php | 40 +++++++++++++++++++++++++------------ 4 files changed, 40 insertions(+), 26 deletions(-) diff --git a/public/auth.php b/public/auth.php index 33e82f6a..be9df340 100644 --- a/public/auth.php +++ b/public/auth.php @@ -109,7 +109,7 @@ switch ($authMode) { } if (user_password_set($resetUser['user_id'], $authPassword['new'])) { - audit_log('PASSWORD_RESET', $resetUser['user_id']); + audit_log(MSZ_AUDIT_PASSWORD_RESET, $resetUser['user_id']); } else { throw new UnexpectedValueException('Password reset failed.'); } diff --git a/public/manage/changelog.php b/public/manage/changelog.php index 47defd26..be090da4 100644 --- a/public/manage/changelog.php +++ b/public/manage/changelog.php @@ -111,11 +111,11 @@ switch ($_GET['v'] ?? null) { if ($changeId < 1) { $changeId = db_last_insert_id(); - audit_log('CHANGELOG_ENTRY_CREATE', user_session_current('user_id', 0), [$changeId]); + audit_log(MSZ_AUDIT_CHANGELOG_ENTRY_CREATE, user_session_current('user_id', 0), [$changeId]); header('Location: ?v=change&c=' . $changeId); return; } else { - audit_log('CHANGELOG_ENTRY_EDIT', user_session_current('user_id', 0), [$changeId]); + audit_log(MSZ_AUDIT_CHANGELOG_ENTRY_EDIT, user_session_current('user_id', 0), [$changeId]); } } @@ -125,7 +125,7 @@ switch ($_GET['v'] ?? null) { $addTag->bindValue('tag_id', $_POST['add_tag']); if ($addTag->execute()) { - audit_log('CHANGELOG_TAG_ADD', user_session_current('user_id', 0), [ + audit_log(MSZ_AUDIT_CHANGELOG_TAG_ADD, user_session_current('user_id', 0), [ $changeId, $_POST['add_tag'] ]); @@ -142,7 +142,7 @@ switch ($_GET['v'] ?? null) { $removeTag->bindValue('tag_id', $_POST['remove_tag']); if ($removeTag->execute()) { - audit_log('CHANGELOG_TAG_REMOVE', user_session_current('user_id', 0), [ + audit_log(MSZ_AUDIT_CHANGELOG_TAG_REMOVE, user_session_current('user_id', 0), [ $changeId, $_POST['remove_tag'] ]); @@ -286,11 +286,11 @@ switch ($_GET['v'] ?? null) { if ($tagId < 1) { $tagId = db_last_insert_id(); - audit_log('CHANGELOG_TAG_EDIT', user_session_current('user_id', 0), [$tagId]); + audit_log(MSZ_AUDIT_CHANGELOG_TAG_EDIT, user_session_current('user_id', 0), [$tagId]); header('Location: ?v=tag&t=' . $tagId); return; } else { - audit_log('CHANGELOG_TAG_CREATE', user_session_current('user_id', 0), [$tagId]); + audit_log(MSZ_AUDIT_CHANGELOG_TAG_CREATE, user_session_current('user_id', 0), [$tagId]); } } } @@ -360,11 +360,11 @@ switch ($_GET['v'] ?? null) { if ($actionId < 1) { $actionId = db_last_insert_id(); - audit_log('CHANGELOG_ACTION_CREATE', user_session_current('user_id', 0), [$actionId]); + audit_log(MSZ_AUDIT_CHANGELOG_ACTION_CREATE, user_session_current('user_id', 0), [$actionId]); header('Location: ?v=action&a=' . $actionId); return; } else { - audit_log('CHANGELOG_ACTION_EDIT', user_session_current('user_id', 0), [$actionId]); + audit_log(MSZ_AUDIT_CHANGELOG_ACTION_EDIT, user_session_current('user_id', 0), [$actionId]); } } } diff --git a/public/settings.php b/public/settings.php index 147ca007..6723a1ea 100644 --- a/public/settings.php +++ b/public/settings.php @@ -35,14 +35,14 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') { } user_session_delete($session['session_id']); - audit_log('PERSONAL_SESSION_DESTROY', user_session_current('user_id'), [ + audit_log(MSZ_AUDIT_PERSONAL_SESSION_DESTROY, user_session_current('user_id'), [ $session['session_id'], ]); } } elseif ($_POST['session'] === 'all') { $currentSessionKilled = true; user_session_purge_all(user_session_current('user_id')); - audit_log('PERSONAL_SESSION_DESTROY_ALL', user_session_current('user_id')); + audit_log(MSZ_AUDIT_PERSONAL_SESSION_DESTROY_ALL, user_session_current('user_id')); } if ($currentSessionKilled) { @@ -105,7 +105,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') { } } else { user_email_set(user_session_current('user_id'), $_POST['email']['new']); - audit_log('PERSONAL_EMAIL_CHANGE', user_session_current('user_id'), [ + audit_log(MSZ_AUDIT_PERSONAL_EMAIL_CHANGE, user_session_current('user_id'), [ $_POST['email']['new'], ]); } @@ -123,7 +123,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') { $errors[] = 'The given passwords was too weak.'; } else { user_password_set(user_session_current('user_id'), $_POST['password']['new']); - audit_log('PERSONAL_PASSWORD_CHANGE', user_session_current('user_id')); + audit_log(MSZ_AUDIT_PERSONAL_PASSWORD_CHANGE, user_session_current('user_id')); } } } diff --git a/src/audit_log.php b/src/audit_log.php index 53ffaeca..4be729a5 100644 --- a/src/audit_log.php +++ b/src/audit_log.php @@ -1,19 +1,33 @@ 'Changed e-mail address to %s.', - 'PERSONAL_PASSWORD_CHANGE' => 'Changed account password.', - 'PERSONAL_SESSION_DESTROY' => 'Ended session #%d.', - 'PERSONAL_SESSION_DESTROY_ALL' => 'Ended all personal sessions.', - 'PASSWORD_RESET' => 'Successfully used the password reset form to change password.', - 'CHANGELOG_ENTRY_CREATE' => 'Created a new changelog entry #%d.', - 'CHANGELOG_ENTRY_EDIT' => 'Edited changelog entry #%d.', - 'CHANGELOG_TAG_ADD' => 'Added tag #%2$d to changelog entry #%1$d.', - 'CHANGELOG_TAG_REMOVE' => 'Removed tag #%2$d from changelog entry #%1$d.', - 'CHANGELOG_TAG_CREATE' => 'Created new changelog tag #%d.', - 'CHANGELOG_TAG_EDIT' => 'Edited changelog tag #%d.', - 'CHANGELOG_ACTION_CREATE' => 'Created new changelog action #%d.', - 'CHANGELOG_ACTION_EDIT' => 'Edited changelog action #%d.', + MSZ_AUDIT_PERSONAL_EMAIL_CHANGE => 'Changed e-mail address to %s.', + MSZ_AUDIT_PERSONAL_PASSWORD_CHANGE => 'Changed account password.', + MSZ_AUDIT_PERSONAL_SESSION_DESTROY => 'Ended session #%d.', + MSZ_AUDIT_PERSONAL_SESSION_DESTROY_ALL => 'Ended all personal sessions.', + MSZ_AUDIT_PASSWORD_RESET => 'Successfully used the password reset form to change password.', + MSZ_AUDIT_CHANGELOG_ENTRY_CREATE => 'Created a new changelog entry #%d.', + MSZ_AUDIT_CHANGELOG_ENTRY_EDIT => 'Edited changelog entry #%d.', + MSZ_AUDIT_CHANGELOG_TAG_ADD => 'Added tag #%2$d to changelog entry #%1$d.', + MSZ_AUDIT_CHANGELOG_TAG_REMOVE => 'Removed tag #%2$d from changelog entry #%1$d.', + MSZ_AUDIT_CHANGELOG_TAG_CREATE => 'Created new changelog tag #%d.', + MSZ_AUDIT_CHANGELOG_TAG_EDIT => 'Edited changelog tag #%d.', + MSZ_AUDIT_CHANGELOG_ACTION_CREATE => 'Created new changelog action #%d.', + MSZ_AUDIT_CHANGELOG_ACTION_EDIT => 'Edited changelog action #%d.', ]); function audit_log(