From ce80f5f9565ce1ec29dfc569105d2967df6609d5 Mon Sep 17 00:00:00 2001 From: REJack Date: Mon, 17 Dec 2018 18:33:37 +0100 Subject: [PATCH] updated Admin/Users controller, en/Admin language & Users/Home view --- app/Controllers/Admin/Users.php | 7 +++---- app/Language/en/Admin.php | 2 +- app/Views/Admin/Users/Home.php | 6 +++--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/app/Controllers/Admin/Users.php b/app/Controllers/Admin/Users.php index d65a962..59bd259 100644 --- a/app/Controllers/Admin/Users.php +++ b/app/Controllers/Admin/Users.php @@ -118,7 +118,7 @@ class Users extends Controller $username = $this->request->getPost('username'); $password = $this->request->getPost('password'); - if (! $this->aauth->updateUser($userId, empty($email) ? null : $email, empty($password) ? null : $password, empty($username) ? null : $username)) + if (! $this->aauth->updateUser($userId, empty($email) ? null : $email, empty($password) ? null : $password, empty($username) ? null : $username)) { return redirect()->back()->with('errors', $this->aauth->getErrorsArray()); } @@ -153,9 +153,9 @@ class Users extends Controller } $id = $this->request->getPost('id'); - if ($userId == $id) + if ($userId === $id) { - if($this->aauth->deleteUser($userId)) + if ($this->aauth->deleteUser($userId)) { return redirect()->to('/admin/users'); } @@ -168,5 +168,4 @@ class Users extends Controller echo view('Templates/FooterAdmin'); } - } diff --git a/app/Language/en/Admin.php b/app/Language/en/Admin.php index ed09a9f..ee726ee 100644 --- a/app/Language/en/Admin.php +++ b/app/Language/en/Admin.php @@ -41,7 +41,7 @@ return [ 'usersEditSubmit' => 'Update user', 'usersShowHeader' => 'Show user', 'usersDeleteHeader' => 'Delete user', - 'usersDeleteSubmit' => 'Delete user', + 'usersDeleteSubmit' => 'Delete user', 'usersBreadcrumbTitle' => 'Users', 'usersLabelId' => 'Id', 'usersLabelEmail' => 'Email address', diff --git a/app/Views/Admin/Users/Home.php b/app/Views/Admin/Users/Home.php index d6f768b..94afc6d 100644 --- a/app/Views/Admin/Users/Home.php +++ b/app/Views/Admin/Users/Home.php @@ -34,12 +34,12 @@ - + - + @@ -53,7 +53,7 @@ - +