X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fhtml%2Findex.php;h=96f29ae922a3d60733d1a3a5b62d83e0770b7825;hb=ab302c2472a7c64058e4f0d7aa11a5cc639ad7ea;hp=7e27691e017134108311028d270a48952592d793;hpb=7389f1c45be733fb305798f96ea4ddf651df090d;p=gosa.git

diff --git a/gosa-core/html/index.php b/gosa-core/html/index.php
index 7e27691e0..96f29ae92 100644
--- a/gosa-core/html/index.php
+++ b/gosa-core/html/index.php
@@ -33,13 +33,26 @@ header("Content-type: text/html; charset=UTF-8");
  */
 function displayLogin()
 {
-  global $smarty,$message,$config,$ssl,$error_collector;
+  global $smarty,$message,$config,$ssl,$error_collector, $BASE_DIR;
   error_reporting(E_ALL | E_STRICT);
+
+  /* Check theme compatibility */
+  $theme= $config->get_cfg_value('theme', 'default');
+  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));
+      }
+    }
+  }
+
   /* Fill template with required values */
   $username = "";
   if(isset($_POST["username"])){
     $username= $_POST["username"];
   }
+  $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'));
@@ -54,14 +67,13 @@ function displayLogin()
 
   /* Displasy SSL mode warning? */
   if ($ssl != "" && $config->get_cfg_value('warnssl') == 'true'){
-    $smarty->assign ("ssl", _("Warning").": <a style=\"color:red;\" href=\"$ssl\">"._("Session is not encrypted!")."</a>");
+    $smarty->assign ("ssl", sprintf(_("This session is not ecrypted. Click %s to enter an encrypted session."), "<a href=\"$ssl\">"._("here")."</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."));
+    $smarty->assign ("lifetime", _("The session lifetime configured in your gosa.conf will be overridden by php.ini settings."));
   }else{
     $smarty->assign ("lifetime", "");
   }
@@ -307,7 +319,6 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
 
   if ($ok) {
 
-    session::global_set('config',$config);
     /* Login as user, initialize user ACL's */
     if ($htaccess_authenticated){
       $ui= ldap_login_user_htaccess($username);
@@ -321,6 +332,7 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
     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 */
@@ -409,15 +421,8 @@ if (!isset($message)){
 
 $smarty->assign ("message", $message);
 
-/* Displasy SSL mode warning? */
-if ($ssl != "" && $config->get_cfg_value('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!"));
+$smarty->assign ("cookies", _("Your browser has cookies disabled. Please enable cookies and reload this page before logging in!"));
 
 /* Generate server list */
 $servers= array();