diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2011-09-30 23:48:20 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2011-09-30 23:48:20 +0200 |
| commit | 21a88613a150c550e32d63df9a9ef8bf3d5107d0 (patch) | |
| tree | 45e76fbae9349265489dbebe5aef090f45e49a85 /core | |
| parent | ddd28aae67d7e67b7e39c1fe58fe52659d1dd755 (diff) | |
| parent | 5fbf378d1021da91977caa6c7df9944c353d4786 (diff) | |
| download | nextcloud-server-21a88613a150c550e32d63df9a9ef8bf3d5107d0.tar.gz nextcloud-server-21a88613a150c550e32d63df9a9ef8bf3d5107d0.zip | |
Merge branch 'lostpassword'
Conflicts:
core/templates/login.php
index.php
lib/util.php
Diffstat (limited to 'core')
| -rw-r--r-- | core/templates/login.php | 4 | ||||
| -rw-r--r-- | core/templates/lostpassword.php | 14 | ||||
| -rw-r--r-- | core/templates/resetpassword.php | 10 |
3 files changed, 2 insertions, 26 deletions
diff --git a/core/templates/login.php b/core/templates/login.php index 641e0adb6e0..6564847014b 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -1,8 +1,8 @@ <form action="index.php" method="post"> <fieldset> - <?php /*if($_['error']): ?> + <?php if($_['error']): ?> <a href="index.php?lostpassword"><?php echo $l->t('Lost your password?'); ?></a> - <?php endif;*/ ?> + <?php endif; ?> <?php if(empty($_['username'])): ?> <input type="text" name="user" id="user" placeholder="<?php echo $l->t( 'Username' ); ?>" value="<?php echo !empty($_POST['user'])?$_POST['user'].'"':'" autofocus'; ?> autocomplete="off" required /> <input type="password" name="password" id="password" placeholder="<?php echo $l->t( 'Password' ); ?>" value="" required <?php echo !empty($_POST['user'])?'autofocus':''; ?> /> diff --git a/core/templates/lostpassword.php b/core/templates/lostpassword.php deleted file mode 100644 index 67e34164d08..00000000000 --- a/core/templates/lostpassword.php +++ /dev/null @@ -1,14 +0,0 @@ -<form action="index.php?lostpassword" method="post"> - <fieldset> - <?php echo $l->t('You will receive a link to reset your password via Email.'); ?> - <?php if ($_['requested']): ?> - <?php echo $l->t('Requested'); ?> - <?php else: ?> - <?php if ($_['error']): ?> - <?php echo $l->t('Login failed!'); ?> - <?php endif; ?> - <input type="text" name="user" id="user" placeholder="<?php echo $l->t('Username or Email'); ?>" value="" autocomplete="off" required autofocus /> - <input type="submit" id="submit" value="<?php echo $l->t('Request reset'); ?>" /> - <?php endif; ?> - </fieldset> -</form>
\ No newline at end of file diff --git a/core/templates/resetpassword.php b/core/templates/resetpassword.php deleted file mode 100644 index 2f43a93cfb5..00000000000 --- a/core/templates/resetpassword.php +++ /dev/null @@ -1,10 +0,0 @@ -<form action="<?php echo 'index.php?'.$_SERVER['QUERY_STRING']; ?>" method="post"> - <fieldset> - <?php if($_['success']): ?> - <?php echo $l->t('Your password was reset'); ?> - <?php else: ?> - <input type="password" name="password" id="password" placeholder="<?php echo $l->t('New password'); ?>" value="" required /> - <input type="submit" id="submit" value="<?php echo $l->t('Reset password'); ?>" /> - <?php endif; ?> - </fieldset> -</form> |