From 897af06af9522ded99b1e0f46730299e89856ffe Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 11 Jun 2012 05:00:57 -0400
Subject: [PATCH] Updated version number to 3.0.4.6
---
interface/web/login/index.php | 80 +++++++++++++++++++++++++++++++--------
1 files changed, 63 insertions(+), 17 deletions(-)
diff --git a/interface/web/login/index.php b/interface/web/login/index.php
index 3698f08..1c5dc91 100644
--- a/interface/web/login/index.php
+++ b/interface/web/login/index.php
@@ -51,22 +51,30 @@
$app->uses('tpl');
$app->tpl->newTemplate('form.tpl.htm');
- $error = '';
+ $error = '';
+
+ $app->load_language_file('web/login/lib/lang/'.$conf["language"].'.lng');
//* Login Form was send
if(count($_POST) > 0) {
-
- // iporting variables
+
+ //** Check variables
+ if(!preg_match("/^[\w\.\-\_]{1,64}$/", $_POST['username'])) $error = $app->lng('user_regex_error');
+ if(!preg_match("/^.{1,64}$/i", $_POST['passwort'])) $error = $app->lng('pw_error_length');
+
+ //** iporting variables
$ip = $app->db->quote(ip2long($_SERVER['REMOTE_ADDR']));
$username = $app->db->quote($_POST['username']);
- $passwort = $app->db->quote($_POST['passwort']);
+ $passwort = $app->db->quote($_POST['passwort']);
+ $loginAs = false;
+ $time = time();
- if($username != '' and $passwort != '') {
+ if($username != '' && $passwort != '' && $error == '') {
/*
* Check, if there is a "login as" instead of a "normal" login
*/
- if (isset($_SESSION['s']['user'])){
+ if (isset($_SESSION['s']['user']) && $_SESSION['s']['user']['active'] == 1){
/*
* only the admin can "login as" so if the user is NOT a admin, we
* open the startpage (after killing the old session), so the user
@@ -91,20 +99,44 @@
$loginAs = false;
}
- //* Check if there already wrong logins
- $sql = "SELECT * FROM `attempts_login` WHERE `ip`= '{$ip}' AND `login_time` < NOW() + INTERVAL 15 MINUTE LIMIT 1";
+ //* Check if there are already wrong logins
+ $sql = "SELECT * FROM `attempts_login` WHERE `ip`= '{$ip}' AND `login_time` > (NOW() - INTERVAL 1 MINUTE) LIMIT 1";
$alreadyfailed = $app->db->queryOneRecord($sql);
//* login to much wrong
if($alreadyfailed['times'] > 5) {
- $error = $app->lng(1004);
+ $error = $app->lng('error_user_too_many_logins');
} else {
+
if ($loginAs){
$sql = "SELECT * FROM sys_user WHERE USERNAME = '$username' and PASSWORT = '". $passwort. "'";
+ $user = $app->db->queryOneRecord($sql);
+ } else {
+ $sql = "SELECT * FROM sys_user WHERE USERNAME = '$username'";
+ $user = $app->db->queryOneRecord($sql);
+
+ if($user) {
+
+ $saved_password = stripslashes($user['passwort']);
+
+ if(substr($saved_password,0,3) == '$1$') {
+ //* The password is crypt-md5 encrypted
+ $salt = '$1$'.substr($saved_password,3,8).'$';
+
+ if(crypt(stripslashes($passwort),$salt) != $saved_password) {
+ $user = false;
+ }
+ } else {
+
+ //* The password is md5 encrypted
+ if(md5($passwort) != $saved_password) {
+ $user = false;
+ }
+ }
+ } else {
+ $user = false;
+ }
}
- else {
- $sql = "SELECT * FROM sys_user WHERE USERNAME = '$username' and ( PASSWORT = '".md5($passwort)."' or PASSWORT = password('$passwort') )";
- }
- $user = $app->db->queryOneRecord($sql);
+
if($user) {
if($user['active'] == 1) {
// User login right, so attempts can be deleted
@@ -123,11 +155,18 @@
include_once($_SESSION['s']['user']['startmodule'].'/lib/module.conf.php');
$_SESSION['s']['module'] = $module;
}
- echo 'HEADER_REDIRECT:'.$_SESSION['s']['module']['startpage'];
+
+ $app->plugin->raiseEvent('login',$this);
+
+ /*
+ * We need LOGIN_REDIRECT instead of HEADER_REDIRECT to load the
+ * new theme, if the logged-in user has another
+ */
+ echo 'LOGIN_REDIRECT:'.$_SESSION['s']['module']['startpage'];
exit;
} else {
- $error = $app->lng(1003);
+ $error = $app->lng('error_user_blocked');
}
} else {
if(!$alreadyfailed['times'] )
@@ -141,13 +180,17 @@
$app->db->query($sql);
}
//* Incorrect login - Username and password incorrect
- $error = $app->lng(1002);
+ $error = $app->lng('error_user_password_incorrect');
if($app->db->errorMessage != '') $error .= '<br />'.$app->db->errorMessage != '';
+
+ $app->plugin->raiseEvent('login_failed',$this);
}
}
} else {
//* Username or password empty
- $error = $app->lng(1001);
+ if($error == '') $error = $app->lng('error_user_password_empty');
+
+ $app->plugin->raiseEvent('login_empty',$this);
}
}
if($error != ''){
@@ -157,6 +200,9 @@
$app->tpl->setVar('error', $error);
+ $app->tpl->setVar('username_txt', $app->lng('username_txt'));
+ $app->tpl->setVar('password_txt', $app->lng('password_txt'));
+ $app->tpl->setVar('login_button_txt', $app->lng('login_button_txt'));
$app->tpl->setInclude('content_tpl','login/templates/index.htm');
$app->tpl_defaults();
--
Gitblit v1.9.1