From 2cb1563f63386b35a69e460051aa9b4a2851d104 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Wed, 30 May 2012 07:30:44 -0400
Subject: [PATCH] - Added (clickable) placeholders to client messaging function. - Added check so that the client password isn't inserted into the message (for security reasons).
---
interface/web/login/index.php | 137 ++++++++++++++++++++++++++++++---------------
1 files changed, 90 insertions(+), 47 deletions(-)
diff --git a/interface/web/login/index.php b/interface/web/login/index.php
index 9216f79..101442a 100644
--- a/interface/web/login/index.php
+++ b/interface/web/login/index.php
@@ -54,13 +54,22 @@
$error = '';
$app->load_language_file('web/login/lib/lang/'.$conf["language"].'.lng');
-
+
+ // Maintenance mode
+ $maintenance_mode = false;
+ $maintenance_mode_error = '';
+ $app->uses('ini_parser,getconf');
+ $server_config_array = $app->getconf->get_global_config('misc');
+ if($server_config_array['maintenance_mode'] == 'y'){
+ $maintenance_mode = true;
+ $maintenance_mode_error = $app->lng('error_maintenance_mode');
+ }
//* 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("/^[\w\.\-\_\@]{1,128}$/", $_POST['username'])) $error = $app->lng('user_regex_error');
if(!preg_match("/^.{1,64}$/i", $_POST['passwort'])) $error = $app->lng('pw_error_length');
//** iporting variables
@@ -111,60 +120,92 @@
$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 && $user['active'] == 1) {
-
- $saved_password = stripslashes($user['passwort']);
-
- if(substr($saved_password,0,3) == '$1$') {
- //* The password is crypt-md5 encrypted
+ if(stristr($username,'@')) {
+ //* mailuser login
+ $sql = "SELECT * FROM mail_user WHERE login = '$username'";
+ $mailuser = $app->db->queryOneRecord($sql);
+ $user = false;
+ if($mailuser) {
+ $saved_password = stripslashes($mailuser['password']);
$salt = '$1$'.substr($saved_password,3,8).'$';
-
- if(crypt($passwort,$salt) != $saved_password) {
- $user = false;
- }
- } else {
-
- //* The password is md5 encrypted
- if(md5($passwort) != $saved_password) {
- $user = false;
+ //* Check if mailuser password is correct
+ if(crypt(stripslashes($passwort),$salt) == $saved_password) {
+ //* we build a fake user here which has access to the mailuser module only and userid 0
+ $user = array();
+ $user['userid'] = 0;
+ $user['active'] = 1;
+ $user['startmodule'] = 'mailuser';
+ $user['modules'] = 'mailuser';
+ $user['typ'] = 'user';
+ $user['email'] = $mailuser['email'];
+ $user['username'] = $username;
+ $user['language'] = $conf['language'];
+ $user['theme'] = $conf['theme'];
+ $user['mailuser_id'] = $mailuser['mailuser_id'];
+ $user['default_group'] = $mailuser['sys_groupid'];
}
}
+
} else {
- $user = false;
+ //* normal cp user login
+ $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;
+ }
}
}
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'];
+ // Maintenance mode - allow logins only when maintenance mode is off or if the user is admin
+ if(!$maintenance_mode || $user['typ'] == 'admin'){
+ // 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;
+ 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;
}
-
- $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');
}
@@ -193,13 +234,15 @@
$app->plugin->raiseEvent('login_empty',$this);
}
}
+
+ // Maintenance mode - show message when people try to log in and also when people are forcedly logged off
+ if($maintenance_mode_error != '') $error = '<strong>'.$maintenance_mode_error.'</strong><br><br>'.$error;
if($error != ''){
$error = '<div class="box box_error"><h1>Error</h1>'.$error.'</div>';
}
-
-
$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'));
$app->tpl->setVar('password_txt', $app->lng('password_txt'));
$app->tpl->setVar('login_button_txt', $app->lng('login_button_txt'));
--
Gitblit v1.9.1