fixed link to password recovery. removed duplicated and unused code out of index.php.
This commit is contained in:
parent
0514a1925b
commit
c943f48547
|
@ -1,17 +1,11 @@
|
||||||
<form action="index.php" method="post">
|
<form action="index.php" method="post">
|
||||||
<fieldset>
|
<fieldset>
|
||||||
<?php if($_['error']): ?>
|
<?php if($_['error']): ?>
|
||||||
<a href="index.php?lostpassword"><?php echo $l->t('Lost your password?'); ?></a>
|
<a href="./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="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':''; ?> />
|
<input type="password" name="password" id="password" placeholder="<?php echo $l->t( 'Password' ); ?>" value="" required <?php echo !empty($_POST['user'])?'autofocus':''; ?> />
|
||||||
<input type="checkbox" name="remember_login" value="1" id="remember_login" /><label for="remember_login"><?php echo $l->t('remember'); ?></label>
|
<input type="checkbox" name="remember_login" value="1" id="remember_login" /><label for="remember_login"><?php echo $l->t('remember'); ?></label>
|
||||||
<?php else: ?>
|
|
||||||
<input type="text" name="user" id="user" placeholder="<?php echo $l->t( 'Username' ); ?>" value="<?php echo $_['username']; ?>" autocomplete="off" required >
|
|
||||||
<input type="password" name="password" id="password" placeholder="<?php echo $l->t( 'Password' ); ?>" value="" required autofocus />
|
|
||||||
<input type="checkbox" name="remember_login" value="1" id="remember_login" checked /><label for="remember_login"><?php echo $l->t('remember'); ?></label>
|
|
||||||
<?php endif; ?>
|
|
||||||
<input type="submit" id="submit" class="login" value="<?php echo $l->t( 'Log in' ); ?>" />
|
<input type="submit" id="submit" class="login" value="<?php echo $l->t( 'Log in' ); ?>" />
|
||||||
</fieldset>
|
</fieldset>
|
||||||
</form>
|
</form>
|
||||||
|
|
29
index.php
29
index.php
|
@ -52,27 +52,31 @@ elseif(OC_User::isLoggedIn()) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// remember was checked after last login
|
// For all others cases, we display the guest page :
|
||||||
elseif(isset($_COOKIE["oc_remember_login"]) && isset($_COOKIE["oc_token"]) && isset($_COOKIE["oc_username"]) && $_COOKIE["oc_remember_login"]) {
|
else {
|
||||||
OC_App::loadApps();
|
OC_App::loadApps();
|
||||||
if(defined("DEBUG") && DEBUG) {error_log("Trying to login from cookie");}
|
$error = false;
|
||||||
|
|
||||||
|
// remember was checked after last login
|
||||||
|
if(isset($_COOKIE["oc_remember_login"]) && isset($_COOKIE["oc_token"]) && isset($_COOKIE["oc_username"]) && $_COOKIE["oc_remember_login"]) {
|
||||||
|
if(defined("DEBUG") && DEBUG) {
|
||||||
|
error_log("Trying to login from cookie");
|
||||||
|
}
|
||||||
// confirm credentials in cookie
|
// confirm credentials in cookie
|
||||||
if(isset($_COOKIE['oc_token']) && OC_User::userExists($_COOKIE['oc_username']) &&
|
if(isset($_COOKIE['oc_token']) && OC_User::userExists($_COOKIE['oc_username']) &&
|
||||||
OC_Preferences::getValue($_COOKIE['oc_username'], "login", "token") == $_COOKIE['oc_token']) {
|
OC_Preferences::getValue($_COOKIE['oc_username'], "login", "token") == $_COOKIE['oc_token']) {
|
||||||
OC_User::setUserId($_COOKIE['oc_username']);
|
OC_User::setUserId($_COOKIE['oc_username']);
|
||||||
OC_Util::redirectToDefaultPage();
|
OC_Util::redirectToDefaultPage();
|
||||||
}
|
}
|
||||||
else {
|
|
||||||
OC_Util::displayLoginPage(array('error' => true));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Someone wants to log in :
|
// Someone wants to log in :
|
||||||
elseif(isset($_POST["user"]) && isset($_POST['password'])) {
|
elseif(isset($_POST["user"]) && isset($_POST['password'])) {
|
||||||
OC_App::loadApps();
|
|
||||||
if(OC_User::login($_POST["user"], $_POST["password"])) {
|
if(OC_User::login($_POST["user"], $_POST["password"])) {
|
||||||
if(!empty($_POST["remember_login"])){
|
if(!empty($_POST["remember_login"])){
|
||||||
if(defined("DEBUG") && DEBUG) {error_log("Setting remember login to cookie");}
|
if(defined("DEBUG") && DEBUG) {
|
||||||
|
error_log("Setting remember login to cookie");
|
||||||
|
}
|
||||||
$token = md5($_POST["user"].time());
|
$token = md5($_POST["user"].time());
|
||||||
OC_Preferences::setValue($_POST['user'], 'login', 'token', $token);
|
OC_Preferences::setValue($_POST['user'], 'login', 'token', $token);
|
||||||
OC_User::setMagicInCookie($_POST["user"], $token);
|
OC_User::setMagicInCookie($_POST["user"], $token);
|
||||||
|
@ -82,14 +86,9 @@ elseif(isset($_POST["user"]) && isset($_POST['password'])) {
|
||||||
}
|
}
|
||||||
OC_Util::redirectToDefaultPage();
|
OC_Util::redirectToDefaultPage();
|
||||||
} else {
|
} else {
|
||||||
OC_Util::displayLoginPage(array('error' => true));
|
$error = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// For all others cases, we display the guest page :
|
OC_Template::printGuestPage('', 'login', array('error' => $error ));
|
||||||
else {
|
|
||||||
OC_App::loadApps();
|
|
||||||
OC_Util::displayLoginPage(array('error' => false));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
Loading…
Reference in New Issue