Updated ACL && Priority

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

diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc
index 816c3166c7fd19d3a22ffde65ba2e9ef0666850e..345c0b79ea1ec5c25f1dba0ca2f6bb3aeafca166 100644 (file)
--- a/plugins/personal/generic/class_user.inc
+++ b/plugins/personal/generic/class_user.inc
@@ -1311,7 +1311,7 @@ class user extends plugin
         "plDescription" => _("Generic user settings"),
         "plSelfModify"  => TRUE,
         "plDepends"     => array(),
-        "plPriority"    => 0,
+        "plPriority"    => 1,
         "plSection"     => array("personal" => _("My account")),
         "plCategory"    => array("users" => array("description" => _("Users"),
                                                   "objectClass" => "gosaAccount")),

diff --git a/plugins/personal/generic/main.inc b/plugins/personal/generic/main.inc
index 474087f4a77c7b3c66eb63e3d281b04074c343e2..48c1a225fd53475778fbcb584b1d0b0d54e775a7 100644 (file)
--- a/plugins/personal/generic/main.inc
+++ b/plugins/personal/generic/main.inc
@@ -46,7 +46,7 @@ if (!$remove_lock){
   }
 
   /* Enter edit mode? */
-  if ((isset($_POST['edit'])) && (!isset( $_SESSION['edit']))){
+  if ((isset($_POST['edit'])) && (!isset( $_SESSION['edit'])) &&preg_match("/w/",$ui->get_permissions($ui->dn,"users/user"))){
 
     /* Check locking */
     if (($username= get_lock($ui->dn)) != ""){
@@ -135,7 +135,7 @@ if (!$remove_lock){
 
   /* Execute formular */
   if($lock_msg){
-    $display = $lock_msg;
+    $display.= $lock_msg;
   }else{
     $display.= $user->execute ();
   }