Updated system management winstation were not detect in all cases.

[gosa.git] / html / index.php

diff --git a/html/index.php b/html/index.php
index 4ace274aa5653e116629c7174fbd5f39069dffca..a4fec5c67ea4dfae6f6d8a1fc6a4a922cb96df99 100644 (file)
--- a/html/index.php
+++ b/html/index.php
@@ -32,6 +32,12 @@ function displayLogin()
     if(isset($_POST["username"])){
       $username= $_POST["username"];
     }
+
+    /* Place ie workaround if needed */
+    if (isset($config->data['MAIN']['IE_PNG_WORKAROUND']) && preg_match("/true/i",$config->data['MAIN']['IE_PNG_WORKAROUND'])){
+      $smarty->assign('ieworkaround', 1);
+    }
+
     $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'));
@@ -70,7 +76,7 @@ function displayLogin()
       $smarty->assign("errors", $_SESSION['errors']);
     }
     if ($error_collector != ""){
-      $smarty->assign("php_errors", $error_collector."</div>");
+      $smarty->assign("php_errors", preg_replace("/%BUGBODY%/",$error_collector_mailto,$error_collector)."</div>");
     } else {
       $smarty->assign("php_errors", "");
     }
@@ -102,9 +108,6 @@ if (!file_exists(CONFIG_DIR."/".CONFIG_FILE)){
   exit();
 }
 
-/* Reset errors */
-$_SESSION['errors']= "";
-
 /* Check for java script */
 if(isset($_POST['javascript']) && $_POST['javascript'] == "true") {
   $_SESSION['js']= TRUE;
@@ -143,13 +146,7 @@ if (!(is_dir($smarty->compile_dir) && is_writable($smarty->compile_dir))){
 /* Check for old files in compile directory */
 clean_smarty_compile_dir($smarty->compile_dir);
 
-/* Language setup */
-if ($config->data['MAIN']['LANG'] == ""){
-  $lang= get_browser_language();
-} else {
-  $lang= $config->data['MAIN']['LANG'];
-}
-$lang.=".UTF-8";
+$lang= get_browser_language();
 putenv("LANGUAGE=");
 putenv("LANG=$lang");
 setlocale(LC_ALL, $lang);
@@ -261,7 +258,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])){
 
   /* Check for valid input */
   $username= $_POST["username"];
-  if (!ereg("^[A-Za-z0-9_.-]+$", $username)){
+  if (!ereg("^[@A-Za-z0-9_.-]+$", $username)){
     $message= _("Please specify a valid username!");
   } elseif (mb_strlen($_POST["password"], 'UTF-8') == 0){
     $message= _("Please specify your password!");
@@ -378,16 +375,11 @@ if ($error_collector != ""){
 } else {
   $smarty->assign("php_errors", "");
 }
-displayLogin();
 
-/* Set focus to the error button if we've an error message */
-if (isset($_SESSION['errors']) && $_SESSION['errors'] != ""){
-  echo '<script language="JavaScript" type="text/javascript">';
-  echo 'document.forms[0].error_accept.focus();';
-  echo '</script>';
-}
+displayLogin();
 
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
+
 ?>
 
 </body>