X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fhtml%2Findex.php;h=5c9207166009385b446d1fd04f92aed948fdc8af;hb=b82c2df0022dbb07126f30febb4b566fedad937e;hp=238c74b956136b32a5fccecb6c5d50b35d9dbfcc;hpb=1a24936bd4cd0e79d9bddb0e851ec424aa3880bb;p=gosa.git

diff --git a/gosa-core/html/index.php b/gosa-core/html/index.php
index 238c74b95..5c9207166 100644
--- a/gosa-core/html/index.php
+++ b/gosa-core/html/index.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * This code is part of GOsa (http://www.gosa-project.org)
  * Copyright (C) 2003-2008 GONICUS GmbH
  * 
@@ -21,9 +21,9 @@
  */
 
 /* Load required includes */
-require_once ("../include/php_setup.inc");
-require_once ("functions.inc");
-require_once ("class_log.inc");
+require_once "../include/php_setup.inc";
+require_once "functions.inc";
+require_once "class_log.inc";
 header("Content-type: text/html; charset=UTF-8");
 
 
@@ -33,66 +33,82 @@ header("Content-type: text/html; charset=UTF-8");
  */
 function displayLogin()
 {
-  global $smarty,$message,$config,$ssl,$error_collector;
-  error_reporting(E_ALL | E_STRICT);
-  /* Fill template with required values */
-  $username = "";
-  if(isset($_POST["username"])){
-    $username= $_POST["username"];
-  }
-  $smarty->assign ('date', gmdate("D, d M Y H:i:s"));
-  $smarty->assign ('username', $username);
-  $smarty->assign ('personal_img', get_template_path('images/personal.png'));
-  $smarty->assign ('password_img', get_template_path('images/password.png'));
-  $smarty->assign ('directory_img', get_template_path('images/ldapserver.png'));
-
-  /* Some error to display? */
-  if (!isset($message)){
-    $message= "";
-  }
-  $smarty->assign ("message", $message);
-
-  /* Displasy SSL mode warning? */
-  if ($ssl != "" && $config->data['MAIN']['WARNSSL'] == 'true'){
-    $smarty->assign ("ssl", _("Warning").": <a style=\"color:red;\" href=\"$ssl\">"._("Session is not encrypted!")."</a>");
-  } else {
-    $smarty->assign ("ssl", "");
-  }
-
-  if(!$config->check_session_lifetime()){
-    $smarty->assign ("lifetime", _("Warning").": ".
-                                 _("The session lifetime configured in your gosa.conf will be overridden by php.ini settings."));
-  }else{
-    $smarty->assign ("lifetime", "");
-  }
-
-  /* Generate server list */
-  $servers= array();
-  if (isset($_POST['server'])){
-    $selected= validate($_POST['server']);
-  } else {
-    $selected= $config->data['MAIN']['DEFAULT'];
-  }
-  foreach ($config->data['LOCATIONS'] as $key => $ignored){
-    $servers[$key]= $key;
-  }
-  $smarty->assign ("server_options", $servers);
-  $smarty->assign ("server_id", $selected);
+    global $smarty,$message,$config,$ssl,$error_collector, $BASE_DIR;
+    error_reporting(E_ALL | E_STRICT);
+
+    /* Check theme compatibility */
+    $theme= $config->get_cfg_value("core",'theme');
+    if (file_exists("$BASE_DIR/ihtml/themes/$theme/blacklist")) {
+        $blocks= file("$BASE_DIR/ihtml/themes/$theme/blacklist");
+        foreach ($blocks as $block) {
+            if (preg_match('/'.preg_quote($block).'/', $_SERVER['HTTP_USER_AGENT'])) {
+                die(sprintf(_("Your browser (%s) is blacklisted for the current theme!"), $block));
+            }
+        }
+    }
 
-  /* show login screen */
-  $smarty->assign ("PHPSESSID", session_id());
-  if (session::is_set('errors')){
-    $smarty->assign("errors", session::get('errors'));
-  }
-  if ($error_collector != ""){
-    $smarty->assign("php_errors", $error_collector."</div>");
-  } else {
-    $smarty->assign("php_errors", "");
-  }
-  $smarty->assign("msg_dialogs", msg_dialog::get_dialogs());
-  $smarty->display (get_template_path('headers.tpl'));
-  $smarty->display(get_template_path('login.tpl'));
-  exit();
+    /* Fill template with required values */
+    $username = "";
+    if(isset($_POST["username"])) {
+        $username= $_POST["username"];
+    }
+    
+    $smarty->assign ("title","GOsa");
+    $smarty->assign("logo", image(get_template_path("images/logo.png")));
+    $smarty->assign('date', gmdate("D, d M Y H:i:s"));
+    $smarty->assign('username', $username);
+    $smarty->assign('personal_img', get_template_path('images/login-head.png'));
+    $smarty->assign('password_img', get_template_path('images/password.png'));
+    $smarty->assign('directory_img', get_template_path('images/ldapserver.png'));
+
+    /* Some error to display? */
+    if (!isset($message)) {
+        $message= "";
+    }
+    $smarty->assign("message", $message);
+
+    /* Displasy SSL mode warning? */
+    if ($ssl != "" && $config->get_cfg_value("core",'warnSSL') == 'true') {
+        $smarty->assign("ssl", sprintf(_("This session is not encrypted. Click %s to enter an encrypted session."), "<a href=\"$ssl\">".bold(_("here"))."</a>"));
+    } else {
+        $smarty->assign("ssl", "");
+    }
+
+    if(!$config->check_session_lifetime()) {
+        $smarty->assign ("lifetime", _("The configured session lifetime will be overridden by php.ini settings!"));
+    } else {
+        $smarty->assign ("lifetime", "");
+    }
+
+    /* Generate server list */
+    $servers= array();
+    if (isset($_POST['server'])) {
+        $selected= get_post('server');
+    } else {
+        $selected= $config->data['MAIN']['DEFAULT'];
+    }
+    foreach ($config->data['LOCATIONS'] as $key => $ignored) {
+        $servers[$key]= $key;
+    }
+    $smarty->assign ("server_options", $servers);
+    $smarty->assign ("server_id", $selected);
+
+    /* show login screen */
+    $smarty->assign ("PHPSESSID", session_id());
+    if (session::is_set('errors')) {
+        $smarty->assign("errors", session::get('errors'));
+    }
+    if ($error_collector != "") {
+        $smarty->assign("php_errors", $error_collector."</div>");
+    } else {
+        $smarty->assign("php_errors", "");
+    }
+    $smarty->assign("msg_dialogs", msg_dialog::get_dialogs());
+
+    $smarty->display (get_template_path('headers.tpl'));
+    $smarty->assign("version",get_gosa_version());
+    $smarty->display(get_template_path('login.tpl'));
+    exit();
 }
 
 
@@ -102,15 +118,15 @@ function displayLogin()
  *****************************************************************************/
 
 /* Set error handler to own one, initialize time calculation
-   and start session. */
+and start session. */
 session::start();
 session::set('errorsAlreadyPosted',array());
 
 /* Destroy old session if exists. 
-   Else you will get your old session back, if you not logged out correctly. */
-if(is_array(session::get_all()) && count(session::get_all())){
-  session::destroy();
-  session::start();
+Else you will get your old session back, if you not logged out correctly. */
+if(is_array(session::get_all()) && count(session::get_all())) {
+    session::destroy();
+    session::start();
 }
 
 $username= "";
@@ -121,9 +137,9 @@ session::set('errorsAlreadyPosted',"");
 session::set('LastError',"");
 
 /* Check if we need to run setup */
-if (!file_exists(CONFIG_DIR."/".CONFIG_FILE)){
-  header("location:setup.php");
-  exit();
+if (!file_exists(CONFIG_DIR."/".CONFIG_FILE)) {
+    header("location:setup.php");
+    exit();
 }
 
 /* Reset errors */
@@ -131,41 +147,38 @@ session::set('errors',"");
 
 /* Check for java script */
 if(isset($_POST['javascript']) && $_POST['javascript'] == "true") {
-  session::set('js',TRUE);
+    session::global_set('js',TRUE);
 }elseif(isset($_POST['javascript'])) {
-  session::set('js',FALSE);
+    session::global_set('js',FALSE);
 }
 
 /* Check if gosa.conf (.CONFIG_FILE) is accessible */
-if (!is_readable(CONFIG_DIR."/".CONFIG_FILE)){
-  msg_dialog::display(_("Configuration accessibility"),sprintf(_("GOsa configuration %s/%s is not readable. Aborted."), CONFIG_DIR,CONFIG_FILE),FATAL_ERROR_DIALOG);
-  exit();
+if (!is_readable(CONFIG_DIR."/".CONFIG_FILE)) {
+    msg_dialog::display(_("Configuration error"),sprintf(_("GOsa configuration %s/%s is not readable. Aborted."), CONFIG_DIR,CONFIG_FILE),FATAL_ERROR_DIALOG);
+    exit();
 }
 
 /* Parse configuration file */
 $config= new config(CONFIG_DIR."/".CONFIG_FILE, $BASE_DIR);
-session::set('DEBUGLEVEL',$config->data['MAIN']['DEBUGLEVEL']);
-if ($_SERVER["REQUEST_METHOD"] != "POST"){
-  @DEBUG (DEBUG_CONFIG, __LINE__, __FUNCTION__, __FILE__, $config->data, "config");
+session::global_set('debugLevel',$config->get_cfg_value("core",'debugLevel'));
+if ($_SERVER["REQUEST_METHOD"] != "POST") {
+    @DEBUG (DEBUG_CONFIG, __LINE__, __FUNCTION__, __FILE__, $config->data, "config");
 }
 
 /* Enable compressed output */
-if (isset($config->data['MAIN']['COMPRESSED']) && preg_match('/^(true|on)$/i', $config->data['MAIN']['COMPRESSED'])){
-  ob_start("ob_gzhandler");
+if ($config->get_cfg_value("core","sendCompressedOutput") != "") {
+    ob_start("ob_gzhandler");
 }
 
 /* Set template compile directory */
-if (isset ($config->data['MAIN']['COMPILE'])){
-  $smarty->compile_dir= $config->data['MAIN']['COMPILE'];
-} else {
-  $smarty->compile_dir= '/var/spool/gosa';
-}
+$smarty->compile_dir= $config->get_cfg_value("core","templateCompileDirectory");
+$smarty->error_unassigned= true;
 
 /* Check for compile directory */
-if (!(is_dir($smarty->compile_dir) && is_writable($smarty->compile_dir))){
-  msg_dialog::display(_("Smarty"),sprintf(_("Directory '%s' specified as compile directory is not accessible!"),
-    $smarty->compile_dir),FATAL_ERROR_DIALOG);
-  exit();
+if (!(is_dir($smarty->compile_dir) && is_writable($smarty->compile_dir))) {
+    msg_dialog::display(_("Smarty error"),sprintf(_("Compile directory %s is not accessible!"),
+        $smarty->compile_dir),FATAL_ERROR_DIALOG);
+    exit();
 }
 
 /* Check for old files in compile directory */
@@ -185,8 +198,11 @@ bindtextdomain($domain, LOCALE_DIR);
 textdomain($domain);
 $smarty->assign ('nextfield', 'username');
 
-if ($_SERVER["REQUEST_METHOD"] != "POST"){
-  @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $lang, "Setting language to");
+/* Translation of cookie-warning. Whether to display it, is determined by JavaScript */
+$smarty->assign ("cookies", _("Your browser has cookies disabled: please enable cookies and reload this page before logging in!"));
+
+if ($_SERVER["REQUEST_METHOD"] != "POST") {
+    @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $lang, "Setting language to");
 }
 
 
@@ -195,270 +211,224 @@ $ssl= "";
 if (!isset($_SERVER['HTTPS']) ||
     !stristr($_SERVER['HTTPS'], "on")) {
 
-  if (empty($_SERVER['REQUEST_URI'])) {
-    $ssl= "https://".$_SERVER['HTTP_HOST'].
-      $_SERVER['PATH_INFO'];
-  } else {
-    $ssl= "https://".$_SERVER['HTTP_HOST'].
-      $_SERVER['REQUEST_URI'];
-  }
-}
+        if (empty($_SERVER['REQUEST_URI'])) {
+            $ssl= "https://".$_SERVER['HTTP_HOST'].
+                $_SERVER['PATH_INFO'];
+        } else {
+            $ssl= "https://".$_SERVER['HTTP_HOST'].
+                $_SERVER['REQUEST_URI'];
+        }
+    }
 
 /* If SSL is forced, just forward to the SSL enabled site */
-if ($config->data['MAIN']['FORCESSL'] == 'true' && $ssl != ''){
-  header ("Location: $ssl");
-  exit;
+if ($config->get_cfg_value("core","forceSSL") == 'true' && $ssl != '') {
+    header ("Location: $ssl");
+    exit;
 }
 
 /* Do we have htaccess authentification enabled? */
 $htaccess_authenticated= FALSE;
-if (isset($config->data['MAIN']['HTACCESS_AUTH']) && preg_match('/^(yes|true)$/i', $config->data['MAIN']['HTACCESS_AUTH'])){
-  if (!isset($_SERVER['REMOTE_USER'])){
-    msg_dialog::display(_("Configuration error"), _("There is a problem with the authentication setup!"), FATAL_ERROR_DIALOG);
-    exit;
-  }
+if ($config->get_cfg_value("core","htaccessAuthentication") == "true" ) {
+    if (!isset($_SERVER['REMOTE_USER'])) {
+        msg_dialog::display(_("Configuration error"), _("Broken HTTP authentication setup!"), FATAL_ERROR_DIALOG);
+        exit;
+    }
 
-  $tmp= process_htaccess($_SERVER['REMOTE_USER'], isset($_SERVER['KRB5CCNAME']));
-  $username= $tmp['username'];
-  $server= $tmp['server'];
-  if ($username == ""){
-    msg_dialog::display(_("Error"), _("Cannot find a valid user for the current authentication setup!"), FATAL_ERROR_DIALOG);
-    exit;
-  }
-  if ($server == ""){
-    msg_dialog::display(_("Error"), _("User information is not unique accross the configured LDAP trees!"), FATAL_ERROR_DIALOG);
-    exit;
-  }
+    $tmp= process_htaccess($_SERVER['REMOTE_USER'], isset($_SERVER['KRB5CCNAME']));
+    $username= $tmp['username'];
+    $server= $tmp['server'];
+    if ($username == "") {
+        msg_dialog::display(_("Error"), _("Cannot find a valid user for the current HTTP authentication!"), FATAL_ERROR_DIALOG);
+        exit;
+    }
+    if ($server == "") {
+        msg_dialog::display(_("Error"), _("Cannot find a unique user for the current HTTP authentication!"), FATAL_ERROR_DIALOG);
+        exit;
+    }
 
-  $htaccess_authenticated= TRUE;
+    $htaccess_authenticated= TRUE;
 }
 
 /* Got a formular answer, validate and try to log in */
-if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htaccess_authenticated){
-
-  /* Reset error messages */
-  $message= "";
-
-  /* Destroy old sessions, they cause a successfull login to relog again ...*/
-  if(session::is_set('_LAST_PAGE_REQUEST')){
-    session::set('_LAST_PAGE_REQUEST',time());
-  }
-
-  if (!$htaccess_authenticated){
-    $server= validate($_POST["server"]);
-  }
-  $config->set_current($server);
-
-  /* Admin-logon and verify */
-  $ldap = $config->get_ldap_link();
-  if (is_null($ldap) || (is_int($ldap) && $ldap == 0)){
-    msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, 0, get_class()));
-    displayLogin();
-    exit();
-  }
-
-  /* Check for schema file presence */
-  if(!isset($config->data['MAIN']['SCHEMA_CHECK'])){
-    $config->data['MAIN']['SCHEMA_CHECK'] = "true";
-  }
-  if(isset($config->data['MAIN']['SCHEMA_CHECK'])&&preg_match("/true/i",$config->data['MAIN']['SCHEMA_CHECK'])){
-    $recursive = (isset($config->current['RECURSIVE']) && $config->current['RECURSIVE'] == "true");
-    $tls =       (isset($config->current['TLS'])       && $config->current['TLS'] == "true");
-
-    if(!count($ldap->get_objectclasses())){
-      msg_dialog::display(_("LDAP error"), _("Cannot detect information about the installed LDAP schema!"), ERROR_DIALOG);
-      displayLogin();
-      exit()  ;
-    }else{
-      $cfg = array();
-      $cfg['admin']     = $config->current['ADMIN'];
-      $cfg['password']  = $config->current['PASSWORD'];
-      $cfg['connection']= $config->current['SERVER'];
-      $cfg['tls']       = $tls;
-      $str = check_schema($cfg,isset($config->current['RFC2307BIS']) && preg_match("/(true|yes|on|1)/i",$config->current['RFC2307BIS']));
-      $checkarr = array();
-      foreach($str as $tr){
-        if(isset($tr['IS_MUST_HAVE']) && !$tr['STATUS']){
-          msg_dialog::display(_("LDAP error"), _("Your ldap setup contains old schema definitions:")."<br><br><i>".$tr['MSG']."</i>", ERROR_DIALOG);
-          displayLogin();
-          exit();
-        }
-      }
+if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htaccess_authenticated) {
+
+    /* Reset error messages */
+    $message= "";
+
+    /* Destroy old sessions, they cause a successfull login to relog again ...*/
+    if(session::global_is_set('_LAST_PAGE_REQUEST')) {
+        session::global_set('_LAST_PAGE_REQUEST',time());
     }
-  }
-
-  /* Check for locking area */
-  $ldap->cat($config->current['CONFIG'], array("dn"));
-  $attrs= $ldap->fetch();
-  if (!count ($attrs)){
-    $ldap->cd($config->current['BASE']);
-    $ldap->create_missing_trees($config->current['CONFIG']);
-  }
-
-  /* Check for valid input */
-  $ok= true;
-  if (!$htaccess_authenticated){
-    $username= $_POST["username"];
-    if (!ereg("^[@A-Za-z0-9_.-]+$", $username)){
-      $message= _("Please specify a valid username!");
-      $ok= false;
-    } elseif (mb_strlen($_POST["password"], 'UTF-8') == 0){
-      $message= _("Please specify your password!");
-      $smarty->assign ('nextfield', 'password');
-      $ok= false;
+
+    if (!$htaccess_authenticated) {
+        $server= get_post("server");
     }
-  }
-  
-  if ($ok) {
-
-    /* Login as user, initialize user ACL's */
-    if ($htaccess_authenticated){
-      $ui= ldap_login_user_htaccess($username);
-      if ($ui === NULL || !$ui){
-        msg_dialog::display(_("Authentication error"), _("Cannot retrieve user information for htaccess authentication!"), FATAL_ERROR_DIALOG);
-        exit;
-      }
-    } else {
-      $ui= ldap_login_user($username, $_POST["password"]);
+    $config->set_current($server);
+
+    /* Admin-logon and verify */
+    $ldap = $config->get_ldap_link();
+    if (is_null($ldap) || (is_int($ldap) && $ldap == 0)) {
+        msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, 0, get_class()));
+        displayLogin();
+        exit();
+    }
+
+    /* Check for locking area */
+    $ldap->cat($config->get_cfg_value("core","config"), array("dn"));
+    $attrs= $ldap->fetch();
+    if (!count ($attrs)) {
+        $ldap->cd($config->current['BASE']);
+        $ldap->create_missing_trees($config->get_cfg_value("core","config"));
     }
-    if ($ui === NULL || !$ui){
-      $message= _("Please check the username/password combination.");
-      $smarty->assign ('nextfield', 'password');
-      new log("security","login","",array(),"Authentication failed for user \"$username\"") ;
-    } else {
-      /* Remove all locks of this user */
-      del_user_locks($ui->dn);
 
-      /* Save userinfo and plugin structure */
-      session::set('ui',$ui);
-      session::set('session_cnt',0);
+    /* Check for valid input */
+    $ok= true;
+    if (!$htaccess_authenticated) {
+        $username= $_POST["username"];
+        if (!preg_match("/^[@A-Za-z0-9_.-]+$/", $username)) {
+            $message= _("Please specify a valid user name!");
+            $ok= false;
+        } elseif (mb_strlen($_POST["password"], 'UTF-8') == 0) {
+            $message= _("Please specify your password!");
+            $smarty->assign ('nextfield', 'password');
+            $ok= false;
+        }
+    }
+
+    if ($ok) {
+
+        /* Login as user, initialize user ACL's */
+        if ($htaccess_authenticated) {
+            $ui= ldap_login_user_htaccess($username);
+            if ($ui === NULL || !$ui) {
+                msg_dialog::display(_("Authentication error"), _("Cannot retrieve user information for HTTP authentication!"), FATAL_ERROR_DIALOG);
+                exit;
+            }
+        } else {
+            $ui= ldap_login_user($username, $_POST["password"]);
+        }
+        if ($ui === NULL || !$ui) {
+            $message= _("Please check the username/password combination!");
+            $smarty->assign ('nextfield', 'password');
+            session::global_set('config',$config);
+            new log("security","login","",array(),"Authentication failed for user \"$username\"");
+        } else {
+            /* Remove all locks of this user */
+            del_user_locks($ui->dn);
+
+            /* Save userinfo and plugin structure */
+            session::global_set('ui',$ui);
+            session::global_set('session_cnt',0);
 
       /* Let GOsa trigger a new connection for each POST, save
-         config to session. */
-      $config->get_departments();
-      $config->make_idepartments();
-      session::set('config',$config);
-
-      /* Restore filter settings from cookie, if available */
-      if(isset($config->data['MAIN']['SAVE_FILTER']) && preg_match("/true/",$config->data['MAIN']['SAVE_FILTER'])){
-
-        if(isset($_COOKIE['GOsa_Filter_Settings']) || isset($HTTP_COOKIE_VARS['GOsa_Filter_Settings'])){
-
-          if(isset($_COOKIE['GOsa_Filter_Settings'])){
-            $cookie_all = unserialize(base64_decode($_COOKIE['GOsa_Filter_Settings']));
-          }else{
-            $cookie_all = unserialize(base64_decode($HTTP_COOKIE_VARS['GOsa_Filter_Settings']));
-          }
-          if(isset($cookie_all[$ui->dn])){
-            $cookie = $cookie_all[$ui->dn];
-            $cookie_vars= array("MultiDialogFilters","CurrentMainBase","plug");
-            foreach($cookie_vars as $var){
-              if(isset($cookie[$var])){
-                session::set($var,$cookie[$var]);
-              }
+      config to session. */
+            $config->get_departments();
+            $config->make_idepartments();
+            session::global_set('config',$config);
+
+            /* Restore filter settings from cookie, if available */
+            if($config->get_cfg_value("core","storeFilterSettings") == "true") {
+
+                if(isset($_COOKIE['GOsa_Filter_Settings']) || isset($HTTP_COOKIE_VARS['GOsa_Filter_Settings'])) {
+
+                    if(isset($_COOKIE['GOsa_Filter_Settings'])) {
+                        $cookie_all = unserialize(base64_decode($_COOKIE['GOsa_Filter_Settings']));
+                    }else{
+                        $cookie_all = unserialize(base64_decode($HTTP_COOKIE_VARS['GOsa_Filter_Settings']));
+                    }
+                    if(isset($cookie_all[$ui->dn])) {
+                        $cookie = $cookie_all[$ui->dn];
+                        $cookie_vars= array("MultiDialogFilters","CurrentMainBase","plug");
+                        foreach($cookie_vars as $var) {
+                            if(isset($cookie[$var])) {
+                                session::global_set($var,$cookie[$var]);
+                            }
+                        }
+                        if(isset($cookie['plug'])) {
+                            $plug =$cookie['plug'];
+                        }
+                    }
+                }
             }
-            if(isset($cookie['plug'])){
-              $plug =$cookie['plug'];
+
+            /* are we using accountexpiration */
+            if ($config->boolValueIsTrue("core","handleExpiredAccounts")) {
+                $expired= ldap_expired_account($config, $ui->dn, $ui->username);
+
+                if ($expired == POSIX_ACCOUNT_EXPIRED) {
+                    $message= _("Account locked. Please contact your system administrator!");
+                    $smarty->assign ('nextfield', 'password');
+                    new log("security","login","",array(),"Account for user \"$username\" has expired") ;
+                    displayLogin();
+                    exit();
+                }
             }
-          }
-        }
-      }
-
-      /* are we using accountexpiration */
-      if((isset($config->data['MAIN']['ACCOUNT_EXPIRATION'])) && 
-          preg_match('/true/i', $config->data['MAIN']['ACCOUNT_EXPIRATION'])){
-
-        $expired= ldap_expired_account($config, $ui->dn, $ui->username);
-
-        if ($expired == 1){
-          $message= _("Account locked. Please contact your system administrator.");
-          $smarty->assign ('nextfield', 'password');
-          new log("security","login","",array(),"Account for user \"$username\" has expired") ;
-        } elseif ($expired == 3){
-          $plist= new pluglist($config, $ui);
-          foreach ($plist->dirlist as $key => $value){
-            if (preg_match("/\bpassword\b/i",$value)){
-              $plug=$key;
-              new log("security","login","",array(),"User \"$username\" password forced to change") ;
-              header ("Location: main.php?plug=$plug&amp;reset=1");
-              exit;
+
+            /* Not account expired or password forced change go to main page */
+            new log("security","login","",array(),"User \"$username\" logged in successfully") ;
+            $plist= new pluglist($config, $ui);
+
+            stats::log('global', 'global', array(),  $action = 'login', $amount = 1, 0);
+
+            if(isset($plug) && isset($plist->dirlist[$plug])) {
+                header ("Location: main.php?plug=".$plug."&amp;global_check=1");
+            }else{
+                header ("Location: main.php?global_check=1");
             }
-          }
+            exit;
         }
-      }
-
-      /* Not account expired or password forced change go to main page */
-      new log("security","login","",array(),"User \"$username\" logged in successfully") ;
-      $plist= new pluglist($config, $ui);
-      if(isset($plug) && isset($plist->dirlist[$plug])){
-        header ("Location: main.php?plug=".$plug."&amp;global_check=1");
-      }else{
-        header ("Location: main.php?global_check=1");
-      }
-      exit;
     }
-  }
 }
 
 /* Fill template with required values */
 $smarty->assign ('date', gmdate("D, d M Y H:i:s"));
 $smarty->assign ('username', $username);
-$smarty->assign ('personal_img', get_template_path('images/personal.png'));
+$smarty->assign ('personal_img', get_template_path('images/login-head.png'));
 $smarty->assign ('password_img', get_template_path('images/password.png'));
 $smarty->assign ('directory_img', get_template_path('images/ldapserver.png'));
 
 /* Some error to display? */
-if (!isset($message)){
-  $message= "";
+if (!isset($message)) {
+    $message= "";
 }
 
 $smarty->assign ("message", $message);
 
-/* Displasy SSL mode warning? */
-if ($ssl != "" && $config->data['MAIN']['WARNSSL'] == 'true'){
-  $smarty->assign ("ssl", "<b>"._("Warning").":<\/b> "._("Session will not be encrypted.")." <a style=\"color:red;\" href=\"$ssl\"><b>"._("Enter SSL session")."<\/b></a>!");
-} else {
-  $smarty->assign ("ssl", "");
-}
-
-/* Translation of cookie-warning. Whether to display it, is determined by JavaScript */
-$smarty->assign ("cookies", "<b>"._("Warning").":<\/b> "._("Your browser has cookies disabled. Please enable cookies and reload this page before logging in!"));
-
 /* Generate server list */
 $servers= array();
 if (isset($_POST['server'])){
-  $selected= validate($_POST['server']);
+    $selected= get_post('server');
 } else {
-  $selected= $config->data['MAIN']['DEFAULT'];
+    $selected= $config->data['MAIN']['DEFAULT'];
 }
-foreach ($config->data['LOCATIONS'] as $key => $ignored){
-  $servers[$key]= $key;
+foreach ($config->data['LOCATIONS'] as $key => $ignored) {
+    $servers[$key]= $key;
 }
 $smarty->assign ("server_options", $servers);
 $smarty->assign ("server_id", $selected);
 
 /* show login screen */
 $smarty->assign ("PHPSESSID", session_id());
-if (session::is_set('errors')){
-  $smarty->assign("errors", session::get('errors'));
+if (session::is_set('errors')) {
+    $smarty->assign("errors", session::get('errors'));
 }
-if ($error_collector != ""){
-  $smarty->assign("php_errors", preg_replace("/%BUGBODY%/",$error_collector_mailto,$error_collector)."</div>");
+if ($error_collector != "") {
+    $smarty->assign("php_errors", preg_replace("/%BUGBODY%/",$error_collector_mailto,$error_collector)."</div>");
 } else {
-  $smarty->assign("php_errors", "");
+    $smarty->assign("php_errors", "");
 }
 
 /* Set focus to the error button if we've an error message */
 $focus= "";
-if (session::is_set('errors') && session::get('errors') != ""){
-  $focus= '<script language="JavaScript" type="text/javascript">';
-  $focus.= 'document.forms[0].error_accept.focus();';
-  $focus.= '</script>';
+if (session::is_set('errors') && session::get('errors') != "") {
+    $focus= '<script language="JavaScript" type="text/javascript">';
+    $focus.= 'document.forms[0].error_accept.focus();';
+    $focus.= '</script>';
 }
 $smarty->assign("focus", $focus);
 displayLogin();
 
-// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
+// vim:tabstop=2:expandtab:shiftwidth=2:softtabstop=2:filetype=php:syntax:ruler:
 ?>
 
 </body>