From 8b5ccd302bd1497de721a25e4ce086bebf95173f Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 08 Jun 2008 15:32:42 -0400
Subject: [PATCH] Fixed a problem with the logout when the php session has ended.
---
interface/web/login/index.php | 180 +++++++++++++++++++++++++++++++++---------------------------
1 files changed, 99 insertions(+), 81 deletions(-)
diff --git a/interface/web/login/index.php b/interface/web/login/index.php
index 79a2ba0..a63e6b9 100644
--- a/interface/web/login/index.php
+++ b/interface/web/login/index.php
@@ -32,92 +32,110 @@
class login_index {
-public $status = '';
-private $target = '';
-
-public function render() {
- if(isset($_SESSION['s']['user']) && is_array($_SESSION['s']['user']) && is_array($_SESSION['s']['module'])) {
- die('HEADER_REDIRECT:'.$_SESSION['s']['module']['startpage']);
+ public $status = '';
+ private $target = '';
+ private $app;
+ private $conf;
+
+ public function __construct()
+ {
+ global $app, $conf;
+ $this->app = $app;
+ $this->conf = $conf;
}
- global $app;
- $app->uses('tpl');
- $app->tpl->newTemplate('form.tpl.htm');
-
- $error = '';
-
-
- //* Login Formular wurde abgesandt
- if(count($_POST) > 0) {
- //die('Hier');
- // importiere Variablen
- $username = $app->db->quote($_POST['username']);
- $passwort = $app->db->quote($_POST['passwort']);
-
- if($username != '' and $passwort != '') {
- $sql = "SELECT * FROM sys_user WHERE USERNAME = '$username' and ( PASSWORT = '".md5($passwort)."' or PASSWORT = password('$passwort') )";
- if($user = $app->db->queryOneRecord($sql)) {
- if($user['active'] == 1) {
- $user = $app->db->toLower($user);
- $_SESSION = array();
- $_SESSION['s']['user'] = $user;
- $_SESSION['s']['user']['theme'] = $user['app_theme'];
- $_SESSION['s']['language'] = $user['language'];
-
- if(is_file($_SESSION['s']['user']['startmodule'].'/lib/module.conf.php')) {
- include_once($_SESSION['s']['user']['startmodule'].'/lib/module.conf.php');
- $_SESSION['s']['module'] = $module;
- }
-
- //$site = $app->db->queryOneRecord("SELECT * FROM mb_sites WHERE name = '".$user["site_preset"]."'");
- //$_SESSION["s"]["site"] = $site;
-
- //header ("HTTP/1.0 307 Temporary redirect");
- //header("Location: http://localhost:8080/ispconfig3_export/interface/web/admin/index.php");
-
- /*header("Location: ../capp.php?mod=".$user["startmodule"]."&phpsessid=".$_SESSION["s"]["id"]);*/
- //header('Content-type: text/javascript');
- /*echo "<script language=\"javascript\" type=\"text/javascript\">loadContent('admin/users_list.php','')</script>";*/
- //$this->status = 'REDIRECT';
- //$this->target = 'admin:index';
- //return '';
-
- echo 'HEADER_REDIRECT:'.$_SESSION['s']['module']['startpage'];
- //echo 'HEADER_REDIRECT:content.php?s_mod=admin&s_pg=index';
- exit;
- } else {
- $error = $app->lng(1003);
- }
- } else {
- // Username oder Passwort falsch
- $error = $app->lng(1002);
- if($app->db->errorMessage != '') $error .= '<br>'.$app->db->errorMessage != '';
- }
- } else {
- // Username oder Passwort leer
- $error = $app->lng(1001);
- }
- }
- if($error != ''){
- $error = '<table width="100%" border="0" cellspacing="0" cellpadding="2">
- <tr>
- <td class="error"><b>Error:</b><br>'.$error.'</td>
- </tr>
- </table>';
- }
-
-
-
- $app->tpl->setVar('error', $error);
- $app->tpl->setInclude('content_tpl','login/templates/index.htm');
- $app->tpl_defaults();
- //$app->tpl->pparse();
+ public function render() {
+
+ if(isset($_SESSION['s']['user']) && is_array($_SESSION['s']['user']) && is_array($_SESSION['s']['module'])) {
+ die('HEADER_REDIRECT:'.$_SESSION['s']['module']['startpage']);
+ }
+
+ $this->app->uses('tpl');
+ $this->app->tpl->newTemplate('form.tpl.htm');
+
+ $error = '';
- $this->status = 'OK';
- return $app->tpl->grab();
+ //* Login Form was send
+ if(count($_POST) > 0) {
-} // << end function
+ // iporting variables
+ $ip = $this->app->db->quote(ip2long($_SERVER['REMOTE_ADDR']));
+ $username = $this->app->db->quote($_POST['username']);
+ $passwort = $this->app->db->quote($_POST['passwort']);
+
+ if($username != '' and $passwort != '') {
+ //* Check if there already wrong logins
+ $sql = "SELECT * FROM `attempts_login` WHERE `ip`= '{$ip}' AND `login_time` < NOW() + INTERVAL 15 MINUTE LIMIT 1";
+ $alreadyfailed = $this->app->db->queryOneRecord($sql);
+ //* login to much wrong
+ if($alreadyfailed['times'] > 5) {
+ $error = $this->app->lng(1004);
+ } else {
+ $sql = "SELECT * FROM sys_user WHERE USERNAME = '$username' and ( PASSWORT = '".md5($passwort)."' or PASSWORT = password('$passwort') )";
+ $user = $this->app->db->queryOneRecord($sql);
+ if($user) {
+ if($user['active'] == 1) {
+ // User login right, so attempts can be deleted
+ $sql = "DELETE FROM `attempts_login` WHERE `ip`='{$ip}'";
+ $this->app->db->query($sql);
+ $user = $this->app->db->toLower($user);
+ $_SESSION = array();
+ $_SESSION['s']['user'] = $user;
+ $_SESSION['s']['user']['theme'] = isset($user['app_theme']) ? $user['app_theme'] : 'default';
+ $_SESSION['s']['language'] = $user['language'];
+ $_SESSION["s"]['theme'] = $_SESSION['s']['user']['theme'];
+
+ if(is_file($_SESSION['s']['user']['startmodule'].'/lib/module.conf.php')) {
+ include_once($_SESSION['s']['user']['startmodule'].'/lib/module.conf.php');
+ $_SESSION['s']['module'] = $module;
+ }
+ echo 'HEADER_REDIRECT:'.$_SESSION['s']['module']['startpage'];
+
+ exit;
+ } else {
+ $error = $this->app->lng(1003);
+ }
+ } else {
+ if(!$alreadyfailed['times'] )
+ {
+ //* user login the first time wrong
+ $sql = "INSERT INTO `attempts_login` (`ip`, `times`, `login_time`) VALUES ('{$ip}', 1, NOW())";
+ $this->app->db->query($sql);
+ } elseif($alreadyfailed['times'] >= 1) {
+ //* update times wrong
+ $sql = "UPDATE `attempts_login` SET `times`=`times`+1, `login_time`=NOW() WHERE `login_time` >= '{$time}' LIMIT 1";
+ $this->app->db->query($sql);
+ }
+ //* Incorrect login - Username and password incorrect
+ $error = $this->app->lng(1002);
+ if($this->app->db->errorMessage != '') $error .= '<br />'.$this->app->db->errorMessage != '';
+ }
+ }
+ } else {
+ //* Username or password empty
+ $error = $this->app->lng(1001);
+ }
+ }
+ if($error != ''){
+ $error = '<table class="error">
+ <tr>
+ <td><strong>Error:</strong><br>'.$error.'</td>
+ </tr>
+ </table>';
+ }
+
+
+
+ $this->app->tpl->setVar('error', $error);
+ $this->app->tpl->setInclude('content_tpl','login/templates/index.htm');
+ $this->app->tpl_defaults();
+
+ $this->status = 'OK';
+
+ return $this->app->tpl->grab();
+
+ } // << end function
} // << end class
--
Gitblit v1.9.1