From 1da8db11d888f9484c497bdf9715fb36bee4d3a0 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 30 Jul 2010 10:06:55 +0000
Subject: [PATCH] Updated logged in message of the titlebar -It now includes
 the location name

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@19296 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 gosa-core/html/main.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gosa-core/html/main.php b/gosa-core/html/main.php
index 07c69d1db..c03c69b9d 100644
--- a/gosa-core/html/main.php
+++ b/gosa-core/html/main.php
@@ -329,11 +329,14 @@ if (session::global_get('js')==FALSE){
   $smarty->assign("help_method"," onclick=\"return popup('helpviewer.php$plug','GOsa help');\"");
 }
 
+
+$loggedin = sprintf(_("You're logged in as %s"), 
+    "<span>".$ui->cn." [".$ui->username."] / ".$config->current['NAME']."</span> &nbsp;");
 if($ui->ignore_acl_for_current_user()){
-  $smarty->assign ("loggedin", "<font color='red'>"._("ACLs are disabled")."</font>&nbsp;".sprintf(_("You're logged in as %s"), "<span>".$ui->cn." [".$ui->username."]</span>"));
-}else{
-  $smarty->assign ("loggedin", sprintf(_("You're logged in as %s"), "<span>".$ui->cn." [".$ui->username."]</span>"));
+    $loggedin = "<font color='red'>"._("ACLs are disabled")."</font>&nbsp;".$loggedin;
 }
+
+$smarty->assign ("loggedin", $loggedin);
 $smarty->assign ("go_logo", get_template_path('images/go_logo.png'));
 $smarty->assign ("go_base", get_template_path('images/dtree.png'));
 $smarty->assign ("go_home", get_template_path('images/gohome.png'));
-- 
2.30.2