From d9bcf68e395d6156645a7974b1a992aa6e6c00aa Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 14 Oct 2013 08:57:25 -0400
Subject: [PATCH] Added missing empty directories from svn import
---
interface/web/login/index.php | 105 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 72 insertions(+), 33 deletions(-)
diff --git a/interface/web/login/index.php b/interface/web/login/index.php
index 65b2362..2c596f8 100644
--- a/interface/web/login/index.php
+++ b/interface/web/login/index.php
@@ -36,25 +36,25 @@
private $target = '';
private $app;
private $conf;
-
+
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');
-
+
// Maintenance mode
$maintenance_mode = false;
$maintenance_mode_error = '';
@@ -64,21 +64,21 @@
$maintenance_mode = true;
$maintenance_mode_error = $app->lng('error_maintenance_mode');
}
-
- //* Login Form was send
+
+ //* Login Form was sent
if(count($_POST) > 0) {
-
+
//** Check variables
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
$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
@@ -115,7 +115,7 @@
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);
@@ -141,28 +141,29 @@
$user['username'] = $username;
$user['language'] = $conf['language'];
$user['theme'] = $conf['theme'];
+ $user['app_theme'] = $conf['theme'];
$user['mailuser_id'] = $mailuser['mailuser_id'];
$user['default_group'] = $mailuser['sys_groupid'];
}
}
-
+
} else {
//* 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;
@@ -173,7 +174,7 @@
}
}
}
-
+
if($user) {
if($user['active'] == 1) {
// Maintenance mode - allow logins only when maintenance mode is off or if the user is admin
@@ -182,33 +183,64 @@
$sql = "DELETE FROM `attempts_login` WHERE `ip`='{$ip}'";
$app->db->query($sql);
$user = $app->db->toLower($user);
-
+
if ($loginAs) $oldSession = $_SESSION['s'];
+ session_regenerate_id();
$_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');
+ $menu_dir = ISPC_WEB_PATH.'/' . $_SESSION['s']['user']['startmodule'] . '/lib/menu.d';
+
+ if (is_dir($menu_dir)) {
+ if ($dh = opendir($menu_dir)) {
+ //** Go through all files in the menu dir
+ while (($file = readdir($dh)) !== false) {
+ if ($file != '.' && $file != '..' && substr($file, -9, 9) == '.menu.php' && $file != 'dns_resync.menu.php') {
+ include_once($menu_dir . '/' . $file);
+ }
+ }
+ }
+ }
$_SESSION['s']['module'] = $module;
}
-
+
+ // check if the user theme is valid
+ if($_SESSION['s']['user']['theme'] != 'default') {
+ $tmp_path = ISPC_THEMES_PATH."/".$_SESSION['s']['user']['theme'];
+ if(!@is_dir($tmp_path) || !@file_exists($tmp_path."/ispconfig_version") || trim(file_get_contents($tmp_path."/ispconfig_version")) != ISPC_APP_VERSION) {
+ // fall back to default theme if this one is not compatible with current ispc version
+ $_SESSION['s']['user']['theme'] = 'default';
+ $_SESSION['s']['theme'] = 'default';
+ $_SESSION['show_error_msg'] = $app->lng('theme_not_compatible');
+ }
+ }
+
$app->plugin->raiseEvent('login',$this);
-
+
+ //* Save successfull login message to var
+ $authlog = 'Successful login for user \''. $username .'\' from '. long2ip($ip) .' at '. date('Y-m-d H:i:s');
+ $authlog_handle = fopen($conf['ispconfig_log_dir'].'/auth.log', 'a');
+ fwrite($authlog_handle, $authlog ."\n");
+ fclose($authlog_handle);
+
/*
* 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'] )
{
@@ -223,36 +255,43 @@
//* 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);
+
+ $app->plugin->raiseEvent('login_failed',$this);
+
+ //* Save failed login message to var
+ $authlog = 'Failed login for user \''. $username .'\' from '. long2ip($ip) .' at '. date('Y-m-d H:i:s');
+ $authlog_handle = fopen($conf['ispconfig_log_dir'].'/auth.log', 'a');
+ fwrite($authlog_handle, $authlog ."\n");
+ fclose($authlog_handle);
}
}
+
} else {
//* Username or password empty
if($error == '') $error = $app->lng('error_user_password_empty');
-
+
$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('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'));
$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