Mirrors/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2024-07-25 13:54:59 +02:00
Code Issues Actions 26 Packages Projects Releases Wiki Activity

extend logon page to display multiple error messages

Browse Source
This commit is contained in:
Michael Göhler 2012-10-12 16:12:43 +02:00
parent 9f9206cd0b
commit 7095b3a083
3 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/templates/login.php
View File

@ -2,9 +2,20 @@
<form method="post">
<fieldset>
<?php if(!empty($_['redirect'])) { echo '<input type="hidden" name="redirect_url" value="'.$_['redirect'].'" />'; } ?>
<?php if($_['display_lostpassword']): ?>
<a href="./core/lostpassword/"><?php echo $l->t('Lost your password?'); ?></a>
<ul>
<?php if($_['invalidcookie']): ?>
<li class="errors">
<?php echo $l->t('Automatic logon rejected!'); ?><br>
<small><?php echo $l->t('If you did not change your password recently, your account may be compromised!'); ?></small><br>
<small><?php echo $l->t('Please change your password to secure your account again.'); ?></small>
</li>
<?php endif; ?>
<?php if($_['invalidpassword']): ?>
<a href="./core/lostpassword/"><li class="errors">
<?php echo $l->t('Lost your password?'); ?>
</li></a>
<?php endif; ?>
</ul>
<p class="infield">
<label for="user" class="infield"><?php echo $l->t( 'Username' ); ?></label>
<input type="text" name="user" id="user" value="<?php echo $_['username']; ?>"<?php echo $_['user_autofocus']?' autofocus':''; ?> autocomplete="on" required />

10
lib/base.php
View File

@ -494,20 +494,20 @@ class OC{
protected static function handleLogin() {
OC_App::loadApps(array('prelogin'));
$error = false;
$error = array();
// remember was checked after last login
if (OC::tryRememberLogin()) {
// nothing more to do
$error[] = 'invalidcookie';
// Someone wants to log in :
} elseif (OC::tryFormLogin()) {
$error = true;
$error[] = 'invalidpassword';
// The user is already authenticated using Apaches AuthType Basic... very usable in combination with LDAP
} elseif (OC::tryBasicAuthLogin()) {
$error = true;
$error[] = 'invalidpassword';
}
OC_Util::displayLoginPage($error);
OC_Util::displayLoginPage(array_unique($error));
}
protected static function tryRememberLogin() {

6
lib/util.php
View File

@ -308,9 +308,11 @@ class OC_Util {
return $errors;
}
public static function displayLoginPage($display_lostpassword) {
public static function displayLoginPage($errors = array()) {
$parameters = array();
$parameters['display_lostpassword'] = $display_lostpassword;
foreach( $errors as $key => $value ) {
$parameters[$value] = true;
}
if (!empty($_POST['user'])) {
$parameters["username"] =
OC_Util::sanitizeHTML($_POST['user']).'"';