diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2018-07-24 20:00:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-24 20:00:20 +0200 |
| commit | 71028fde6b201e35fa7efb224896c8bf3050a856 (patch) | |
| tree | 7e81164334ea5da0f7ac0d667057d54d5bd21aee /core/templates | |
| parent | 9b9d729acf8a6c46374d1ef55915c6fca988b191 (diff) | |
| parent | 801bf813178573b539a8d66bcb1420cd11455994 (diff) | |
| download | nextcloud-server-71028fde6b201e35fa7efb224896c8bf3050a856.tar.gz nextcloud-server-71028fde6b201e35fa7efb224896c8bf3050a856.zip | |
Merge pull request #10322 from weeman1337/feature-9978-improve-disabled-user-login-message
Login: Implements the "user disabled" message like the "wrong password" message
Diffstat (limited to 'core/templates')
| -rw-r--r-- | core/templates/login.php | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/core/templates/login.php b/core/templates/login.php index 8fc68edb92d..989ea1eaad5 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -2,6 +2,8 @@ <?php vendor_script('jsTimezoneDetect/jstz'); script('core', 'merged-login'); + +use OC\Core\Controller\LoginController; ?> <!--[if IE 8]><style>input[type="checkbox"]{padding:0;}</style><![endif]--> @@ -34,7 +36,7 @@ script('core', 'merged-login'); <!-- the following div ensures that the spinner is always inside the #message div --> <div style="clear: both;"></div> </div> - <p class="grouptop<?php if (!empty($_['invalidpassword'])) { ?> shake<?php } ?>"> + <p class="grouptop<?php if (!empty($_[LoginController::LOGIN_MSG_INVALIDPASSWORD])) { ?> shake<?php } ?>"> <input type="text" name="user" id="user" placeholder="<?php p($l->t('Username or email')); ?>" aria-label="<?php p($l->t('Username or email')); ?>" @@ -44,7 +46,7 @@ script('core', 'merged-login'); <label for="user" class="infield"><?php p($l->t('Username or email')); ?></label> </p> - <p class="groupbottom<?php if (!empty($_['invalidpassword'])) { ?> shake<?php } ?>"> + <p class="groupbottom<?php if (!empty($_[LoginController::LOGIN_MSG_INVALIDPASSWORD])) { ?> shake<?php } ?>"> <input type="password" name="password" id="password" value="" placeholder="<?php p($l->t('Password')); ?>" aria-label="<?php p($l->t('Password')); ?>" @@ -58,10 +60,14 @@ script('core', 'merged-login'); <div class="submit-icon icon-confirm-white"></div> </div> - <?php if (!empty($_['invalidpassword'])) { ?> + <?php if (!empty($_[LoginController::LOGIN_MSG_INVALIDPASSWORD])) { ?> <p class="warning wrongPasswordMsg"> <?php p($l->t('Wrong password.')); ?> </p> + <?php } else if (!empty($_[LoginController::LOGIN_MSG_USERDISABLED])) { ?> + <p class="warning userDisabledMsg"> + <?php p(\OC::$server->getL10N('lib')->t('User disabled')); ?> + </p> <?php } ?> <?php if ($_['throttle_delay'] > 5000) { ?> |