Updated environment entry locking.

Fixed ACL checks for shares.

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@11619 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-plugins/goto/personal/environment/class_environment.inc b/gosa-plugins/goto/personal/environment/class_environment.inc
index 5dd34b65c78352e4df9d2e789cdb2dcf321fafbf..4488e5568de4df06d00a974b1a16157a8526a459 100644 (file)
--- a/gosa-plugins/goto/personal/environment/class_environment.inc
+++ b/gosa-plugins/goto/personal/environment/class_environment.inc
@@ -739,7 +739,7 @@ class environment extends plugin
 
 
     $tmp = array();
-    if($this->acl_is_readable("gotoShares")){
+    if($this->acl_is_readable("gotoShare")){
       $tmp = $this->printOutAssignedShares();
     }
 
@@ -1772,19 +1772,15 @@ class environment extends plugin
 
           "plProvidedAcls"  => array(
 
-            "gotoProfileFlagL"    => _("Resolution changeable during session") ,
-            "gotoProfileFlagC"    => _("Cache profile localy") ,
-
-            "gotoProfileQuota"    => _("Profile quota") ,
             "gotoProfileServer"   => _("Profile server") ,
-
-            "gotoXResolution"     => _("Resolution") ,
-            "gotoKioskProfile"    => _("Kiosk profile") ,
-
-            "gosaDefaultPrinter"  => _("Default printer") ,
-            "gotoLogonScript"     => _("Logon script") ,
+            "gotoProfileQuota"    => _("Profile quota") ,
+            "gotoProfileFlagC"    => _("Cache profile localy") ,
+            "gotoShare"           => _("Shares"),
             "gotoHotplugDevice"   => _("Hotplug devices"),
-            "gotoShare"           => _("Shares"))
+            "gotoKioskProfile"    => _("Kiosk profile") ,
+            "gotoProfileFlagL"    => _("Resolution changeable during session") ,
+            "gotoXResolution"     => _("Resolution") ,
+            "gotoLogonScript"     => _("Logon script"))
             ));
   }
 }

diff --git a/gosa-plugins/goto/personal/environment/main.inc b/gosa-plugins/goto/personal/environment/main.inc
index 12a3b7a2bc66103ff2936e3286eb866da98add3e..c807c3f7adbb82fa866116df9e8eadcba4271142 100644 (file)
--- a/gosa-plugins/goto/personal/environment/main.inc
+++ b/gosa-plugins/goto/personal/environment/main.inc
@@ -19,10 +19,11 @@
  */
 $lock_msg = "";
 if (!$remove_lock){
+
   /* Reset requested? */
   if (isset($_POST['edit_cancel']) || 
       (isset($_GET['reset']) && $_GET['reset'] == 1)){
-#    del_lock ($ui->dn);
+    del_lock ($ui->dn);
     session::un_set ('edit');
     session::un_set ('environment');
   }