MDL-79193 core_auth: Notify about suspended account on login page.

lucaboesch · Jan 31, 2025 · bb402dd · bb402dd
1 parent 07881a5
commit bb402dd
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/lang/en/moodle.php b/lang/en/moodle.php
@@ -2177,6 +2177,7 @@
 $string['successduration'] = 'Success ({$a} seconds)';
 $string['summary'] = 'Summary';
 $string['suspended'] = 'Suspended';
+$string['suspendedlogin'] = 'Your account has been suspended. Please contact the site administrator.';
 $string['suspendedusers'] = 'Suspended users';
 $string['switchdevicedefault'] = 'Switch to the standard theme';
 $string['switchdevicerecommended'] = 'Switch to the recommended theme for your device';

diff --git a/login/index.php b/login/index.php
@@ -286,6 +286,8 @@
         if (empty($errormsg)) {
             if ($errorcode == AUTH_LOGIN_UNAUTHORISED) {
                 $errormsg = get_string("unauthorisedlogin", "", $frm->username);
+            } else if ($errorcode == AUTH_LOGIN_SUSPENDED) {
+                $errormsg = get_string('suspendedlogin');
             } else if ($errorcode == AUTH_LOGIN_FAILED_RECAPTCHA) {
                 $errormsg = get_string('missingrecaptchachallengefield');
             } else {

diff --git a/login/tests/behat/change_password.feature b/login/tests/behat/change_password.feature
@@ -62,3 +62,15 @@ Feature: Change password
     And I click on "Continue" "button"
     And I am on site homepage
     And I should see "Course 1"
+
+  @javascript
+  Scenario: A user with a suspended account tries to log in
+    Given I log in as "admin"
+    And I navigate to "Users > Accounts > Browse list of users" in site administration
+    And I press "Suspend user account" action in the "Test User" report row
+    And I log out
+    When I follow "Log in"
+    And I set the field "Username" to "testuser"
+    And I set the field "Password" to "testuser"
+    And I press "Log in"
+    Then I should see "Your account has been suspended. Please contact the site administrator."