From 06339e0c8ac8fdbbf5d2784df8019704da9bd6eb Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 13 Jan 2015 12:28:33 -0500
Subject: [PATCH] - fixed javascript call in json file
---
interface/web/login/index.php | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/interface/web/login/index.php b/interface/web/login/index.php
index 48d3af6..80c4d17 100644
--- a/interface/web/login/index.php
+++ b/interface/web/login/index.php
@@ -160,7 +160,7 @@
} else {
if(stristr($username, '@')) {
//* mailuser login
- $sql = "SELECT * FROM mail_user WHERE login = '$username'";
+ $sql = "SELECT * FROM mail_user WHERE login = '$username' or email = '$username'";
$mailuser = $app->db->queryOneRecord($sql);
$user = false;
if($mailuser) {
@@ -325,6 +325,15 @@
$error = '<div class="box box_error"><h1>Error</h1>'.$error.'</div>';
}
+ $app->load('getconf');
+
+ $security_config = $app->getconf->get_security_config('permissions');
+ if($security_config['password_reset_allowed'] == 'yes') {
+ $app->tpl->setVar('pw_lost_show', 1);
+ } else {
+ $app->tpl->setVar('pw_lost_show', 0);
+ }
+
$app->tpl->setVar('error', $error);
$app->tpl->setVar('pw_lost_txt', $app->lng('pw_lost_txt'));
$app->tpl->setVar('username_txt', $app->lng('username_txt'));
--
Gitblit v1.9.1