Added first fixes for use with existing DN's with an escaped comma inside

[gosa.git] / plugins / admin / groups / class_groupManagement.inc

diff --git a/plugins/admin/groups/class_groupManagement.inc b/plugins/admin/groups/class_groupManagement.inc
index 4f9dd781968b6387e30d0d1e3b0c34ea279dbbc6..05befca60da1a606b5102b542a8341c8dbb47680 100644 (file)
--- a/plugins/admin/groups/class_groupManagement.inc
+++ b/plugins/admin/groups/class_groupManagement.inc
@@ -56,8 +56,8 @@ class groupManagement extends plugin
 
   function execute()
   {
-       /* Call parent execute */
-//     plugin::execute();
+       /* Call parent execute */
+       plugin::execute();
 
     /* Save data */
     $groupfilter= get_global("groupfilter");
@@ -182,6 +182,9 @@ class groupManagement extends plugin
       /* Create new usertab object */
       $this->grouptab= new grouptabs($this->config,
           $this->config->data['TABS']['GROUPTABS'], $this->dn);
+      /* Set up the users ACL's for this 'dn' */
+      $acl= get_permissions ($groupfilter['depselect'], $this->ui->subtreeACL);
+      $this->grouptab->set_acl($acl);
     }
 
     /* Cancel dialogs */
@@ -235,7 +238,10 @@ class groupManagement extends plugin
 
       /* Check locking, save current plugin in 'back_plugin', so
          the dialog knows where to return. */
-      if (($user= get_lock($this->dn)) != ""){
+
+      $user = get_lock($this->dn);
+
+      if ($user != ""){
         return(gen_locked_message ($user, $this->dn));
       }
 
@@ -353,30 +359,30 @@ class groupManagement extends plugin
       " <img class='center' src='images/list_seperator.png' alt='' height='16' width='1'>&nbsp;".
       " <input type='image' class='center' src='images/list_new_group.png' title='"._("Create new group")."' alt='"._("New")."' name='group_new'>&nbsp;".
       " <img class='center' src='images/list_seperator.png' alt='' height='16' width='1'>&nbsp;".
-      _("Current base")."&nbsp;<select name='depselect' onChange='mainform.submit()'>$options</select>".
+      _("Current base")."&nbsp;<select name='depselect' onChange='mainform.submit()' class='center'>$options</select>".
        " <input type='image' class='center' src='images/list_submit.png' title='"._("Submit department")."' name='submit_department' alt='"._("Submit")."'>&nbsp;".
       "</div>";
 
     
-    $actions = "<input type='image' src='images/edit.png' alt='"._("edit")."' name='group_edit_%KEY%' title='"._("Edit this entry")."'>";
-    $actions.= "<input type='image' src='images/edittrash.png' alt='"._("delete")."' name='group_del_%KEY%' title='"._("Delete this entry")."'>";
+    $actions = "<input class='center' type='image' src='images/edit.png' alt='"._("edit")."' name='group_edit_%KEY%' title='"._("Edit this entry")."'>";
+    $actions.= "<input class='center' type='image' src='images/edittrash.png' alt='"._("delete")."' name='group_del_%KEY%' title='"._("Delete this entry")."'>";
 
     // Defining Links
     $linkopen = "<a href='?plug=".$_GET['plug']."&amp;act=dep_open&amp;dep_id=%s'>%s</a>";
 
     // image Buttons 
     $editlink = "<a href='?plug=".$_GET['plug']."&amp;id=%s&amp;act=edit_entry'>%s</a>";
-    $userimg  = "<img src='images/select_groups.png' alt='User'    title='%s'>";
+    $userimg  = "<img class='center' src='images/select_groups.png' alt='User'    title='%s'>";
 
     // Extension images 
-    $posiximg = "<img src='images/select_groups.png'        alt='P'  title='"._("Posix")  ."'>";
-    $mailimg  = "<img src='images/mailto.png'             alt='M'  title='"._("Mail")   ."'>";
-    $sambaimg = "<img src='images/select_winstation.png'  alt='S'  title='"._("Samba")  ."'>";
-    $applimg  = "<img src='images/select_application.png' alt='A'  title='"._("Application")."'>"; 
-    $phoneimg = "<img src='images/select_phone.png'      alt='Ph' title='"._("Phone")  ."'>"; 
-    $envimg   = "<img src='images/network.png'      alt='E' title='"._("Environment")  ."'>"; 
+    $posiximg = "<img class='center' src='images/select_groups.png'        alt='P'  title='"._("Posix")  ."'>";
+    $mailimg  = "<img class='center' src='images/mailto.png'             alt='M'  title='"._("Mail")   ."'>";
+    $sambaimg = "<img class='center' src='images/select_winstation.png'  alt='S'  title='"._("Samba")  ."'>";
+    $applimg  = "<img class='center' src='images/select_application.png' alt='A'  title='"._("Application")."'>"; 
+    $phoneimg = "<img class='center' src='images/select_phone.png'      alt='Ph' title='"._("Phone")  ."'>"; 
+    $envimg   = "<img class='center' src='images/smallenv.png'      alt='E' title='"._("Environment")  ."'>"; 
     // Space
-    $empty    = "<img src='images/empty.png' style='width:16px;height:16px;' alt=''>";
+    $empty    = "<img class='center' src='images/empty.png' style='width:16px;height:16px;' alt=''>";
 
 
     $divlist = new divlist("groupstab");