From ed30c60150ffda0301eb1f8d30c93cac94de41df Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 25 Jul 2011 10:38:22 -0400
Subject: [PATCH] Fixed some warnings in the installer.
---
interface/web/login/index.php | 253 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 172 insertions(+), 81 deletions(-)
diff --git a/interface/web/login/index.php b/interface/web/login/index.php
index f1b49e3..9216f79 100644
--- a/interface/web/login/index.php
+++ b/interface/web/login/index.php
@@ -32,94 +32,185 @@
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;
- global $app;
- $app->uses('tpl');
- $app->tpl->newTemplate('form.tpl.htm');
-
- $error = '';
+ public function render() {
+
+ global $app, $conf;
+
+ /* Redirect to page, if login form was NOT send */
+ if(count($_POST) == 0) {
+ if(isset($_SESSION['s']['user']) && is_array($_SESSION['s']['user']) && is_array($_SESSION['s']['module'])) {
+ die('HEADER_REDIRECT:'.$_SESSION['s']['module']['startpage']);
+ }
+ }
+
+ $app->uses('tpl');
+ $app->tpl->newTemplate('form.tpl.htm');
+
+ $error = '';
+
+ $app->load_language_file('web/login/lib/lang/'.$conf["language"].'.lng');
+
+
+ //* Login Form was send
+ if(count($_POST) > 0) {
+
+ //** 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']);
+ $loginAs = false;
+ $time = time();
+
+ if($username != '' && $passwort != '' && $error == '') {
+ /*
+ * Check, if there is a "login as" instead of a "normal" login
+ */
+ 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
+ * is logout and has to start again!
+ */
+ if ($_SESSION['s']['user']['typ'] != 'admin') {
+ /*
+ * The actual user is NOT a admin, but maybe the admin
+ * has logged in as "normal" user bevore...
+ */
+ if (isset($_SESSION['s_old'])&& ($_SESSION['s_old']['user']['typ'] == 'admin')){
+ /* The "old" user is admin, so everything is ok */
+ }
+ else {
+ die("You don't have the right to 'login as'!");
+ }
+ }
+ $loginAs = true;
+ }
+ else {
+ /* normal login */
+ $loginAs = false;
+ }
+ //* 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('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);
- //* 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') )";
- $user = $app->db->queryOneRecord($sql);
- if($user) {
- if($user['active'] == 1) {
- $user = $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'];
- //print_r($_SESSION);
- 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;
- }
-
- // TODO: What is all this - pedro
- //$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 '';
+ if($user && $user['active'] == 1) {
+
+ $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).'$';
- 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 {
- //* Incorrect login - Username and password incorrect
- $error = $app->lng(1002);
- if($app->db->errorMessage != '') $error .= '<br>'.$app->db->errorMessage != '';
- }
- } else {
- //* Username or password empty
- $error = $app->lng(1001);
- }
- }
- if($error != ''){
- $error = '<table class="error">
- <tr>
- <td><strong>Error:</strong><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();
+ if(crypt($passwort,$salt) != $saved_password) {
+ $user = false;
+ }
+ } else {
+
+ //* The password is md5 encrypted
+ if(md5($passwort) != $saved_password) {
+ $user = false;
+ }
+ }
+ } else {
+ $user = false;
+ }
+ }
+
+ if($user) {
+ if($user['active'] == 1) {
+ // User login right, so attempts can be deleted
+ $sql = "DELETE FROM `attempts_login` WHERE `ip`='{$ip}'";
+ $app->db->query($sql);
+ $user = $app->db->toLower($user);
+ if ($loginAs) $oldSession = $_SESSION['s'];
+ $_SESSION = array();
+ if ($loginAs) $_SESSION['s_old'] = $oldSession; // keep the way back!
+ $_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;
+ }
+
+ $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('error_user_blocked');
+ }
+ } else {
+ if(!$alreadyfailed['times'] )
+ {
+ //* user login the first time wrong
+ $sql = "INSERT INTO `attempts_login` (`ip`, `times`, `login_time`) VALUES ('{$ip}', 1, NOW())";
+ $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";
+ $app->db->query($sql);
+ }
+ //* Incorrect login - Username and password incorrect
+ $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
+ if($error == '') $error = $app->lng('error_user_password_empty');
+
+ $app->plugin->raiseEvent('login_empty',$this);
+ }
+ }
+ if($error != ''){
+ $error = '<div class="box box_error"><h1>Error</h1>'.$error.'</div>';
+ }
- $this->status = 'OK';
- return $app->tpl->grab();
-} // << end function
+ $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();
+
+ $this->status = 'OK';
+
+ return $app->tpl->grab();
+
+ } // << end function
} // << end class
--
Gitblit v1.9.1