From ce49b85c5baca3c2b569fc41ae019db78e3b6e65 Mon Sep 17 00:00:00 2001 From: Ashleigh Sims Date: Wed, 1 Apr 2020 10:54:13 +0100 Subject: [PATCH 01/11] Add unsuspend to user controller. --- controllers/Users.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/controllers/Users.php b/controllers/Users.php index a31cf2de..2363b66f 100644 --- a/controllers/Users.php +++ b/controllers/Users.php @@ -221,6 +221,22 @@ public function preview_onImpersonateUser($recordId) Flash::success(Lang::get('rainlab.user::lang.users.impersonate_success')); } + /** + * Unsuspend this user + */ + public function preview_onUnsuspendUser($recordId) + { + $model = $this->formFindModelObject($recordId); + + $model->unsuspend(); + + Flash::success(Lang::get('rainlab.user::lang.users.unsuspend_success')); + + if ($redirect = $this->makeRedirect('update-close', $model)) { + return $redirect; + } + } + /** * Force delete a user. */ From a1d2cee71f11e716f879253af801af84a1845c1e Mon Sep 17 00:00:00 2001 From: Ashleigh Sims Date: Wed, 1 Apr 2020 10:55:02 +0100 Subject: [PATCH 02/11] Addition of unsuspend button. --- controllers/users/_preview_toolbar.htm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/controllers/users/_preview_toolbar.htm b/controllers/users/_preview_toolbar.htm index 1390b368..d0fe87d7 100644 --- a/controllers/users/_preview_toolbar.htm +++ b/controllers/users/_preview_toolbar.htm @@ -17,6 +17,15 @@ + + + + + From bc54450234319d8cddf1b9d30e6a52ba34c66445 Mon Sep 17 00:00:00 2001 From: Ashleigh Sims Date: Wed, 1 Apr 2020 10:55:45 +0100 Subject: [PATCH 03/11] Unsuspend method added. --- models/User.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/models/User.php b/models/User.php index 9278a92e..2cd6808e 100644 --- a/models/User.php +++ b/models/User.php @@ -357,6 +357,19 @@ public function isBanned() return $throttle ? $throttle->is_banned : false; } + // + // Suspending + // + + /** + * Remove the ban on this user. + * @return void + */ + public function unsuspend() + { + Auth::findThrottleByUserId($this->id)->unsuspend(); + } + // // IP Recording and Throttle // From 5a7bdee9a9202287f109d0d9fa001c595a9c837e Mon Sep 17 00:00:00 2001 From: Ashleigh Sims Date: Wed, 1 Apr 2020 10:56:14 +0100 Subject: [PATCH 04/11] Add english translations for the buttons. --- lang/en/lang.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lang/en/lang.php b/lang/en/lang.php index 7bcfda7c..7baa76fe 100644 --- a/lang/en/lang.php +++ b/lang/en/lang.php @@ -63,6 +63,9 @@ 'unban_selected_confirm' => 'Unban the selected users?', 'unban_selected_empty' => 'There are no selected users to unban.', 'unban_selected_success' => 'Successfully unbanned the selected users.', + 'unsuspend' => 'Unsuspend', + 'unsuspend_success' => 'User has been unsuspended.', + 'unsuspend_confirm' => 'Unsuspend this user?' ], 'settings' => [ 'users' => 'Users', From 0d2c3110bda404283f7d08beccb3f457112f0c1f Mon Sep 17 00:00:00 2001 From: Ashleigh Sims Date: Thu, 2 Apr 2020 10:16:45 +0100 Subject: [PATCH 05/11] Wrap a conditional around the unsuspend button. --- controllers/users/_preview_toolbar.htm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/controllers/users/_preview_toolbar.htm b/controllers/users/_preview_toolbar.htm index d0fe87d7..24e4b148 100644 --- a/controllers/users/_preview_toolbar.htm +++ b/controllers/users/_preview_toolbar.htm @@ -18,6 +18,7 @@ +isSuspended()): ?> + Date: Thu, 2 Apr 2020 10:17:29 +0100 Subject: [PATCH 06/11] Check if user is suspended. --- models/User.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/models/User.php b/models/User.php index 2cd6808e..4bd01d9b 100644 --- a/models/User.php +++ b/models/User.php @@ -362,7 +362,16 @@ public function isBanned() // /** - * Remove the ban on this user. + * Check if the user is suspended. + * @return bool + */ + public function isSuspended() + { + return Auth::findThrottleByUserId($this->id)->checkSuspended(); + } + + /** + * Remove the suspension on this user. * @return void */ public function unsuspend() From 23af701dff3971cd096ee87d60f9f8185a0fb75f Mon Sep 17 00:00:00 2001 From: Ashleigh Sims Date: Thu, 2 Apr 2020 15:46:55 +0100 Subject: [PATCH 07/11] Indent button to match other code indentations. --- controllers/users/_preview_toolbar.htm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/controllers/users/_preview_toolbar.htm b/controllers/users/_preview_toolbar.htm index 24e4b148..1792a1ec 100644 --- a/controllers/users/_preview_toolbar.htm +++ b/controllers/users/_preview_toolbar.htm @@ -19,13 +19,13 @@ isSuspended()): ?> - - - + + + Date: Thu, 2 Apr 2020 16:39:14 +0100 Subject: [PATCH 08/11] Change the icon for unsuspend. --- controllers/users/_preview_toolbar.htm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/users/_preview_toolbar.htm b/controllers/users/_preview_toolbar.htm index 1792a1ec..dd25e4f9 100644 --- a/controllers/users/_preview_toolbar.htm +++ b/controllers/users/_preview_toolbar.htm @@ -23,7 +23,7 @@ href="javascript:;" data-request="onUnsuspendUser" data-request-confirm="" - class="btn btn-default oc-icon-undo"> + class="btn btn-default oc-icon-unlock-alt"> From a4c493a067147ee80e3d4d83ff903ab18825abb8 Mon Sep 17 00:00:00 2001 From: Ashleigh Sims Date: Thu, 2 Apr 2020 17:28:39 +0100 Subject: [PATCH 09/11] Change redirect to use Redirect facade. --- controllers/Users.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/controllers/Users.php b/controllers/Users.php index 2363b66f..1543c6fc 100644 --- a/controllers/Users.php +++ b/controllers/Users.php @@ -1,6 +1,7 @@ makeRedirect('delete', $model)) { - return $redirect; - } + return Redirect::refresh(); } /** From d9496ab66d43dbf9920b92935e525dc01b7ccdd7 Mon Sep 17 00:00:00 2001 From: Ashleigh Sims Date: Thu, 2 Apr 2020 17:58:56 +0100 Subject: [PATCH 10/11] Use the OctoberCMS Redirect facade. --- controllers/Users.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/Users.php b/controllers/Users.php index 1543c6fc..2241d027 100644 --- a/controllers/Users.php +++ b/controllers/Users.php @@ -1,7 +1,7 @@ Date: Thu, 2 Apr 2020 18:29:02 +0100 Subject: [PATCH 11/11] Correct changes. --- controllers/Users.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/controllers/Users.php b/controllers/Users.php index 2241d027..159e4eff 100644 --- a/controllers/Users.php +++ b/controllers/Users.php @@ -1,10 +1,10 @@ makeRedirect('update-close', $model)) { - return $redirect; - } + return Redirect::refresh(); } /** @@ -249,7 +247,9 @@ public function update_onDelete($recordId = null) Flash::success(Lang::get('backend::lang.form.delete_success')); - return Redirect::refresh(); + if ($redirect = $this->makeRedirect('delete', $model)) { + return $redirect; + } } /**