Search CYRUSUNIXSTYLE in current location and in main

[gosa.git] / plugins / personal / environment / main.inc

diff --git a/plugins/personal/environment/main.inc b/plugins/personal/environment/main.inc
index 91883ab78c87743d22741d2ef36392524e95fa8e..57439cfbd963a5e5667b561bc0a897ee3710e4fd 100644 (file)
--- a/plugins/personal/environment/main.inc
+++ b/plugins/personal/environment/main.inc
@@ -57,10 +57,10 @@ if (!$remove_lock){
   /* Adjust acl's to mode */
   if (isset($_SESSION['edit'])){
     $acl= get_permissions ($ui->dn, $ui->subtreeACL);
-    $environment->acl= get_module_permission($acl, "environment", $ui->dn);
+    $environment->acl= get_module_permission($acl, "gotoEnvironment", $ui->dn);
   } else {
     $acl= get_permissions ($ui->dn, $ui->subtreeACL);
-    $editacl= get_module_permission($acl, "environment",$ui->dn);
+    $editacl= get_module_permission($acl, "gotoEnvironment",$ui->dn);
     $environment->acl= "#none#";
   }
 
@@ -100,8 +100,8 @@ if (!$remove_lock){
     $display.= "<p class=\"plugbottom\">";
 
     /* Are we in edit mode? */
-    if (isset($_SESSION['edit'])){
-      $display.= "<input type=submit name=\"edit_finish\" value=\""._("Finish")."\">\n";
+    if ((isset($_SESSION['edit']))&&($environment->dialog==NULL)){
+      $display.= "<input type=submit name=\"edit_finish\" style=\"width:80px\" value=\""._("Ok")."\">\n";
       $display.= "&nbsp;";
       $display.= "<input type=submit name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
       $info= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png').