X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fhtml%2Fmain.php;h=68941ebfa48a6f871031e715c21cbd71b539fd88;hb=7dc3c7182b1bc782815ead845b9178d809e1229c;hp=251196c790aeec09e416d6215a88baf382e0a5b9;hpb=fc5f3c616a7a783704d1549b2f92cdc2d6a01058;p=gosa.git

diff --git a/gosa-core/html/main.php b/gosa-core/html/main.php
index 251196c79..68941ebfa 100644
--- a/gosa-core/html/main.php
+++ b/gosa-core/html/main.php
@@ -61,6 +61,7 @@ if ($_SERVER['REMOTE_ADDR'] != $ui->ip){
   exit;
 }
 $config= session::get('config');
+$config->check_config_version();
 $config->check_and_reload();
 
 /* Enable compressed output */
@@ -200,7 +201,7 @@ if (isset($_GET['plug'])){
 }
 
 /* Check if we need to delete a lock */
-if ($old_plugin_dir != $plugin_dir){
+if ($old_plugin_dir != $plugin_dir && $old_plugin_dir != ""){
   if (is_file("$old_plugin_dir/main.inc")){
     $remove_lock= true;
     require_once ("$old_plugin_dir/main.inc");
@@ -214,7 +215,7 @@ eval_sizelimit();
 /* Check for memory */
 if (function_exists("memory_get_usage")){
   if (memory_get_usage() > (to_byte(ini_get('memory_limit')) - 2048000 )){
-    msg_dialog::display(_("Configuration warning"), _("Running out of memory!"), WARNING_DIALOG);
+    msg_dialog::display(_("Configuration error"), _("Running out of memory!"), WARNING_DIALOG);
   }
 }
 
@@ -287,11 +288,15 @@ if (session::get('js')==FALSE){
   $smarty->assign("help_method"," onclick=\"return popup('helpviewer.php$plug','GOsa help');\"");
 }
 
-$smarty->assign ("username", $ui->username);
+if($ui->ignore_acl_for_current_user()){
+  $smarty->assign ("username", "<font color='#FF0000';>"._("User ACL checks disabled")."</font>&nbsp;".$ui->username);
+}else{
+  $smarty->assign ("username", $ui->username);
+}
 $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'));
-$smarty->assign ("go_out", get_template_path('images/stop.png'));
+$smarty->assign ("go_out", get_template_path('images/logout.png'));
 $smarty->assign ("go_top", get_template_path('images/go_top.png'));
 $smarty->assign ("go_corner", get_template_path('images/go_corner.png'));
 $smarty->assign ("go_left", get_template_path('images/go_left.png'));
@@ -353,7 +358,7 @@ if((isset($config->data['MAIN']['ACCOUNT_EXPIRATION'])) &&
 
   if ($expired == 2){
     new log("security","gosa","",array(),"password for user \"$ui->username\" is about to expire") ;
-    msg_dialog::display(_("Password reminder"), _("Your password is about to expire, please change your password!"), INFO_DIALOG);
+    msg_dialog::display(_("Password change"), _("Your password is about to expire, please change your password!"), INFO_DIALOG);
   }
 }
 
@@ -363,20 +368,13 @@ if (is_file("$plugin_dir/main.inc")){
 } else {
   msg_dialog::display(
             _("Plugin"),
-            sprintf(_("FATAL: Can't find any plugin definitions for plugin '%s'!"), $plug),
+            sprintf(_("FATAL: Cannot find any plugin definitions for plugin '%s'!"), $plug),
             FATAL_ERROR_DIALOG);
   exit();
 }
 
 
 /* Print_out last ErrorMessage repeated string. */
-if(isset($_GET['add'])){
-msg_dialog::display("Error"   ,"Kann datei nicht schreiben, bla",ERROR_DIALOG);
-msg_dialog::display("Warning" ,"Kann datei nicht schreiben, bla",WARNING_DIALOG);
-msg_dialog::display("Info"    ,"Kann datei nicht schreiben, bla",INFO_DIALOG);
-msg_dialog::display("Confirm" ,"Kann datei nicht schreiben, bla",CONFIRM_DIALOG);
-}
-
 $smarty->assign("msg_dialogs", msg_dialog::get_dialogs());
 $smarty->assign("contents", $display);