From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 2 Nov 2006 07:39:31 +0000 (+0000)
Subject: Fixed base acl.
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=db95d3ca4567bce66014bdb7126ffa20f11d9c5f;p=gosa.git

Fixed base acl.


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

diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc
index e37f60677..816c3166c 100644
--- a/plugins/personal/generic/class_user.inc
+++ b/plugins/personal/generic/class_user.inc
@@ -501,15 +501,13 @@ class user extends plugin
 
     /* Create base acls */
     $baseACL = $this->getacl("base",(!is_object($this->parent) && !isset($_SESSION['edit'])));
-    if(!$this->acl_is_moveable()) {
+    if($this->dn == "new" && !$this->acl_is_createable()) {
+      $baseACL = preg_replace("/w/","",$baseACL);
+    }elseif($this->dn != "new" && !$this->acl_is_moveable()) {
       $baseACL = preg_replace("/w/","",$baseACL);
     }
     $smarty->assign("baseACL",          $baseACL);
-
-    /* Show us the edit screen */
     @$smarty->assign("bases", $this->allowedBasesToMoveTo());
-   #  $smarty->assign("bases", $this->config->idepartments);
-
 
     /* Save government mode attributes */
     if (isset($this->config->current['GOVERNMENTMODE']) &&
@@ -993,7 +991,7 @@ class user extends plugin
       $message[]= _("You have no permissions to create a user on this 'Base'.");
     } elseif ($this->dn != $new_dn && $this->dn != "new"){
       if (!$this->acl_is_writeable($this->dn, "user","create",(!is_object($this->parent) && !isset($_SESSION['edit'])))){
-        $message[]= _("You have no permissions to move a user from the original 'Base'.");
+        $message[]= _("You have no permissions to move this user to the spicified 'Base'.");
       }
     }