X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=include%2Fclass_acl.inc;h=a8fd374e1f7abacb20e811909ad1b3014abfc88b;hb=4e21fc2c719f4175c9b0e72ee9fbc95249a16ddf;hp=cbd8a0c19e2ed5966a18649bfddb49a5c09df4d0;hpb=1665e20373dd8fe4d5900d8d4b919aecb73d05c3;p=gosa.git

diff --git a/include/class_acl.inc b/include/class_acl.inc
index cbd8a0c19..a8fd374e1 100644
--- a/include/class_acl.inc
+++ b/include/class_acl.inc
@@ -21,6 +21,7 @@ class acl extends plugin
   var $aclObjects= array();
   var $aclMyObjects= array();
   var $users= array();
+  var $roles= array();
   var $groups= array();
   var $recipients= array();
   var $isContainer= FALSE;
@@ -28,7 +29,7 @@ class acl extends plugin
   var $wasNewEntry= FALSE;
   var $ocMapping= array();
   var $savedAclContents= array();
-
+  var $myAclObjects = array();
 
   function acl ($config, $parent, $dn= NULL)
   {
@@ -49,7 +50,7 @@ class acl extends plugin
     $this->parent= $parent;
 
     /* Container? */
-    if (preg_match('/^(ou|c|l|dc)=/i', $dn)){
+    if (preg_match('/^(o|ou|c|l|dc)=/i', $dn)){
       $this->isContainer= TRUE;
     }
 
@@ -84,10 +85,34 @@ class acl extends plugin
     }
     ksort($this->groups);
 
+    /* Roles */
+    $ldap->cd($config->current['BASE']);
+    if ($tag == ""){
+      $ldap->search('(objectClass=gosaRole)', array('cn', 'description','gosaAclTemplate','dn'));
+    } else {
+      $ldap->search('(&(objectClass=gosaRole)(gosaUnitTag='.$tag.'))', array('cn', 'description','gosaAclTemplate','dn'));
+    }
+    while ($attrs= $ldap->fetch()){
+      $dsc= "";
+      if (isset($attrs['description'][0])){
+        $dsc= $attrs['description'][0];
+      }
+
+      $role_id = $attrs['dn'];
+
+      $this->roles[$role_id]['acls'] =array();
+      for ($i= 0; $i < $attrs['gosaAclTemplate']['count']; $i++){
+        $acl= $attrs['gosaAclTemplate'][$i];
+        $this->roles[$role_id]['acls'] = array_merge($this->roles[$role_id]['acls'],$this->explodeACL($acl));
+      }
+      $this->roles[$role_id]['description'] = $dsc;
+      $this->roles[$role_id]['cn'] = $attrs['cn'][0];
+    }
+
     /* Objects */
     $tmp= get_global('plist');
     $plist= $tmp->info;
-    if (isset($this->parent)){
+    if (isset($this->parent) && $this->parent != NULL){
       $oc= array();
       foreach ($this->parent->by_object as $key => $obj){
         $oc= array_merge($oc, $obj->objectclasses);
@@ -98,34 +123,55 @@ class acl extends plugin
     } else {
       $oc=  $this->attrs['objectClass'];
     }
+
+
+    /* Extract available categories from plugin info list */
     foreach ($plist as $class => $acls){
-      if (isset($acls['plDescription'])){
-        /* Only feed categories */
-        if (isset($acls['plDepends']['description'])){
-          $this->aclObjects[$acls['plDepends']['objectClass']]= $acls['plDepends']['description'];
-        }
 
-        /* Additionally filter the classes we're interested in in "self edit" mode */
-        if (in_array_ics($acls['plDepends']['objectClass'], $oc)){
-          $this->myAclObjects[$class]= $acls['plDescription'];
-        }
-      }
-    }
+      /* Only feed categories */
+      if (isset($acls['plCategory'])){
 
-    /* Add category for all objects */
-    asort($this->aclObjects);
+        /* Walk through supplied list and feed only translated categories */
+        foreach($acls['plCategory'] as $idx => $data){
+
+          /* Non numeric index means -> base object containing more informations */
+          if (preg_match('/^[0-9]+$/', $idx)){
+            if (!isset($this->ocMapping[$data])){
+              $this->ocMapping[$data]= array();
+              $this->ocMapping[$data][]= '0';
+            }
+            $this->ocMapping[$data][]= $class;
+          } else {
+            if (!isset($this->ocMapping[$idx])){
+              $this->ocMapping[$idx]= array();
+              $this->ocMapping[$idx][]= '0';
+            }
+            $this->ocMapping[$idx][]= $class;
+            $this->aclObjects[$idx]= $data['description'];
+
+            /* Additionally filter the classes we're interested in in "self edit" mode */
+            if (is_array($data['objectClass'])){
+              foreach($data['objectClass'] as $objectClass){
+                if (in_array_ics($objectClass, $oc)){
+                  $this->myAclObjects[$idx.'/'.$class]= $acls['plDescription'];
+                  break;
+                }
+              }
+            } else {
+              if (in_array_ics($data['objectClass'], $oc)){
+                $this->myAclObjects[$idx.'/'.$class]= $acls['plDescription'];
+              }
+            }
+          }
 
-    /* Generate mapping object */
-    foreach ($plist as $oc => $pl){
-      if (isset($pl['plDepends']['objectClass'])){
-        $class= $pl['plDepends']['objectClass'];
-        if (!isset($this->ocMapping[$class])){
-          $this->ocMapping[$class]= array();
-          $this->ocMapping[$class][]= '0';
         }
-        $this->ocMapping[$class][]= $oc;
       }
     }
+    $this->aclObjects['all']= '*&nbsp;'._("All categories");
+    $this->ocMapping['all']= array('0' => 'all');
+
+    /* Sort categories */
+    asort($this->aclObjects);
 
     /* Fill acl types */
     if ($this->isContainer){
@@ -133,8 +179,8 @@ class acl extends plugin
                              "one" => _("One level"),
                              "base" => _("Current object"),
                              "sub" => _("Complete subtree"),
-                             "psub" => _("Complete subtree (permanent)"));
-                             //"role" => _("Use ACL defined in role"));
+                             "psub" => _("Complete subtree (permanent)"),
+                             "role" => _("Use ACL defined in role"));
     } else {
       $this->aclTypes= array("base" => _("Current object"),
           "role" => _("Use ACL defined in role"));
@@ -152,7 +198,7 @@ class acl extends plugin
   {
     /* Call parent execute */
     plugin::execute();
-
+  
     $tmp= get_global('plist');
     $plist= $tmp->info;
 
@@ -166,11 +212,13 @@ class acl extends plugin
 
     $new_acl= array();
     $aclDialog= FALSE;
+    $firstedit= FALSE;
     foreach($_POST as $name => $post){
 
       /* Actions... */
       if (preg_match('/^acl_edit_.*_x/', $name)){
         $this->dialogState= 'create';
+        $firstedit= TRUE;
         $this->dialog= TRUE;
         $this->currentIndex= preg_replace('/^acl_edit_([0-9]+).*$/', '\1', $name);
         $this->loadAclEntry();
@@ -194,7 +242,7 @@ class acl extends plugin
       if (preg_match('/^cat_del_.*_x/', $name)){
         $idx= preg_replace('/^cat_del_([^_]+)_.*$/', '\1', $name);
         foreach ($this->ocMapping[$idx] as $key){
-          unset($this->aclContents[$key]);
+          unset($this->aclContents["$idx/$key"]);
         }
         continue;
       }
@@ -224,6 +272,11 @@ class acl extends plugin
         $aclDialog= TRUE;
         list($dummy, $object, $attribute, $value)= split('_', $name);
 
+        /* Skip for detection entry */
+        if ($object == 'dummy') {
+          continue;
+        }
+
         /* Ordinary ACLs */
         if (!isset($new_acl[$object])){
           $new_acl[$object]= array();
@@ -234,20 +287,30 @@ class acl extends plugin
           $new_acl[$object][$attribute]= $value;
         }
       }
+
+      if(isset($_POST['selected_role'])){
+        $this->aclContents = "";
+        $this->aclContents = base64_decode($_POST['selected_role']);
+      }
     }
     
     /* Only be interested in new acl's, if we're in the right _POST place */
-    if ($aclDialog && isset($this->ocMapping[$this->aclObject])){
+    if ($aclDialog && $this->aclObject != "" && is_array($this->ocMapping[$this->aclObject])){
+
       foreach ($this->ocMapping[$this->aclObject] as $oc){
         unset($this->aclContents[$oc]);
+        unset($this->aclContents[$this->aclObject.'/'.$oc]);
         if (isset($new_acl[$oc])){
           $this->aclContents[$oc]= $new_acl[$oc];
         }
+        if (isset($new_acl[$this->aclObject.'/'.$oc])){
+          $this->aclContents[$this->aclObject.'/'.$oc]= $new_acl[$this->aclObject.'/'.$oc];
+        }
       }
     }
 
     /* Save new acl in case of base edit mode */
-    if ($this->aclType == 'base'){
+    if ($this->aclType == 'base' && !$firstedit){
       $this->aclContents= $new_acl;
     }
 
@@ -332,14 +395,14 @@ class acl extends plugin
       
       /* Fill in entries */
       foreach ($this->gosaAclEntry as $key => $entry){
-        $field1= array("string" => $this->aclTypes[$entry['type']], "attach" => "style='width:100px'");
+        $field1= array("string" => $this->aclTypes[$entry['type']], "attach" => "style='width:150px'");
         $field2= array("string" => $this->assembleAclSummary($entry));
         $action= "<input type='image' name='sortup_$key' alt='up' title='"._("Up")."' src='images/sort_up.png' align='top'>";
         $action.= "<input type='image' name='sortdown_$key' alt='down' title='"._("Down")."' src='images/sort_down.png'>";
         $action.= "<input class='center' type='image' src='images/edit.png' alt='"._("edit")."' name='acl_edit_$key' title='"._("Edit ACL")."'>";
         $action.= "<input class='center' type='image' src='images/edittrash.png' alt='"._("delete")."' name='acl_del_$key' title='"._("Delete ACL")."'>";
 
-        $field3= array("string" => $action, "attach" => "style='border-right:0px;width:50px';text-align:right");
+        $field3= array("string" => $action, "attach" => "style='border-right:0px;width:50px;text-align:right;'");
         $aclList->AddEntry(array($field1, $field2, $field3));
       }
 
@@ -352,19 +415,23 @@ class acl extends plugin
       $aclList->SetHeight(150);
 
       /* Add settings for all categories to the (permanent) list */
-      foreach ($this->aclObjects as $oc => $dsc){
+      foreach ($this->aclObjects as $section => $dsc){
         $summary= "";
-        foreach ($plist as $key => $plugin){
-          if (isset($plugin['plDepends']['objectClass']) && $plugin['plDepends']['objectClass'] == $oc &&
-              isset($this->aclContents[$key])){
-            if (count($this->aclContents[$key]) && isset($this->aclContents[$key][0]) &&
-                $this->aclContents[$key][0] != ""){
-              $summary.= "$key, ";
-              continue;
-            }
-            if (!isset($this->aclContents[$key][0]) && count($this->aclContents[$key])){
-              $summary.= "$key, ";
-            }
+        foreach($this->ocMapping[$section] as $oc){
+          if (isset($this->aclContents[$oc]) && count($this->aclContents[$oc]) && isset($this->aclContents[$oc][0]) &&
+              $this->aclContents[$oc][0] != ""){
+
+            $summary.= "$oc, ";
+            continue;
+          }
+          if (isset($this->aclContents["$section/$oc"]) && count($this->aclContents["$section/$oc"]) && isset($this->aclContents["$section/$oc"][0]) &&
+              $this->aclContents["$section/$oc"][0] != ""){
+
+            $summary.= "$oc, ";
+            continue;
+          }
+          if (isset($this->aclContents[$oc]) && !isset($this->aclContents[$oc][0]) && count($this->aclContents[$oc])){
+            $summary.= "$oc, ";
           }
         }
 
@@ -377,8 +444,8 @@ class acl extends plugin
 
         $field1= array("string" => $dsc, "attach" => "style='width:100px'");
         $field2= array("string" => $summary);
-        $action= "<input class='center' type='image' src='images/edit.png' alt='"._("edit")."' name='cat_edit_$oc' title='"._("Edit categories ACLs")."'>";
-        $action.= "<input class='center' type='image' src='images/edittrash.png' alt='"._("delete")."' name='cat_del_$oc' title='"._("Clear categories ACLs")."'>";
+        $action= "<input class='center' type='image' src='images/edit.png' alt='"._("edit")."' name='cat_edit_$section' title='"._("Edit categories ACLs")."'>";
+        $action.= "<input class='center' type='image' src='images/edittrash.png' alt='"._("delete")."' name='cat_del_$section' title='"._("Clear categories ACLs")."'>";
         $field3= array("string" => $action, "attach" => "style='border-right:0px;width:50px'");
         $aclList->AddEntry(array($field1, $field2, $field3));
       }
@@ -414,21 +481,34 @@ class acl extends plugin
       if ($this->aclType == 'base'){
         $smarty->assign('aclSelector', $this->buildAclSelector($this->myAclObjects));
       }
+
+      /* Role selector if scope is base */
+      if ($this->aclType == 'role'){
+        $smarty->assign('roleSelector', "Role selector");#, $this->buildRoleSelector($this->myAclObjects));
+        $smarty->assign('roleSelector', $this->buildRoleSelector($this->roles));
+      }
     }
 
     if ($this->dialogState == 'edit'){
       $smarty->assign('headline', sprintf(_("Edit ACL for '%s', scope is '%s'"), $this->aclObjects[$this->aclObject], $this->aclTypes[$this->aclType]));
 
       /* Collect objects for selected category */
-      $aclObjects= array();
-
-      foreach ($plist as $class => $acls){
-        if (isset($acls['plDepends']['objectClass']) && $acls['plDepends']['objectClass'] == $this->aclObject){
-          $aclObjects[$class]= $acls['plDescription'];
+      foreach ($this->ocMapping[$this->aclObject] as $idx => $class){
+        if ($idx == 0){
+          continue;
         }
+        $aclObjects[$this->aclObject.'/'.$class]= $plist[$class]['plDescription'];
+      }
+      if ($this->aclObject == 'all'){
+        $aclObjects['all']= _("All objects in current subtree");
       }
 
-      $smarty->assign('aclSelector', $this->buildAclSelector($aclObjects));
+      /* Role selector if scope is base */
+      if ($this->aclType == 'role'){
+        $smarty->assign('roleSelector', $this->buildRoleSelector($this->roles));
+      } else {
+        $smarty->assign('aclSelector', $this->buildAclSelector($aclObjects));
+      }
     }
 
     /* Show main page */
@@ -437,28 +517,140 @@ class acl extends plugin
     return ($smarty->fetch (get_template_path('acl.tpl')));
   }
 
-  
+
+  function sort_by_priority($list)
+  {
+    $tmp= get_global('plist');
+    $plist= $tmp->info;
+    asort($plist);
+    $newSort = array();
+
+    foreach($list as $name => $translation){
+      $na  =  preg_replace("/^.*\//","",$name);
+      $prio = 0;
+      if(isset($plist[$na]['plPriority'])){
+        $prio=  $plist[$na]['plPriority'] ;
+      }
+
+      $newSort[$name] = $prio;
+    }
+
+    asort($newSort);
+
+    $ret = array();
+    foreach($newSort as $name => $prio){
+      $ret[$name] = $list[$name];
+    }
+    return($ret);
+  }
+
+
+  function buildRoleSelector($list)
+  {
+    $D_List =new DivSelectBox("Acl_Roles");
+ 
+    $selected = $this->aclContents;
+    if(!is_string($this->aclContents) || !isset($list[$this->aclContents])){
+      $selected = key($list);
+    }
+
+    $str ="";
+    foreach($list as $dn => $values){
+
+      if($dn == $selected){    
+        $option = "<input type='radio' name='selected_role' value='".base64_encode($dn)."' checked>";
+      }else{
+        $option = "<input type='radio' name='selected_role' value='".base64_encode($dn)."'>";
+      }
+ 
+      $field1 = array("string" => $option) ;
+      $field2 = array("string" => $values['cn'], "attach" => "style='width:200px;'") ;
+      $field3 = array("string" => $values['description'],"attach" => "style='border-right:0px;'") ;
+
+      $D_List->AddEntry(array($field1,$field2,$field3));
+    }
+    return($D_List->DrawList());
+  } 
+
+
   function buildAclSelector($list)
   {
-    $display= "";
-    $cols= 4;
+    $display= "<input type='hidden' name='acl_dummy_0_0_0' value='1'>";
+    $cols= 3;
     $tmp= get_global('plist');
     $plist= $tmp->info;
     asort($plist);
 
+    /* Add select all/none buttons */
+    $style = "style='width:100px;'";
+
+    $display .= "<input ".$style." type='button' name='toggle_all_create' onClick=\"acl_toggle_all('_0_c$');\" value='Toggle C'>";
+    $display .= "<input ".$style." type='button' name='toggle_all_move'   onClick=\"acl_toggle_all('_0_m$');\" value='Toggle M'>";
+    $display .= "<input ".$style." type='button' name='toggle_all_remove' onClick=\"acl_toggle_all('_0_d$');\" value='Toggle D'> - ";
+    $display .= "<input ".$style." type='button' name='toggle_all_read'   onClick=\"acl_toggle_all('_0_r$');\" value='Toggle R'>";
+    $display .= "<input ".$style." type='button' name='toggle_all_write'  onClick=\"acl_toggle_all('_0_w$');\" value='Toggle W'> - ";
+    
+    $display .= "<input ".$style." type='button' name='toggle_all_sub_read'  onClick=\"acl_toggle_all('[^0]_r$');\" value='R+'>";
+    $display .= "<input ".$style." type='button' name='toggle_all_sub_write'  onClick=\"acl_toggle_all('[^0]_w$');\" value='W+'>";
+  
+    $display .= "<br>";
+  
+    $style = "style='width:50px;'";
+    $display .= "<input ".$style." type='button' name='set_true_all_create' onClick=\"acl_set_all('_0_c$',true);\" value='C+'>";
+    $display .= "<input ".$style." type='button' name='set_false_all_create' onClick=\"acl_set_all('_0_c$',false);\" value='C-'>";
+    $display .= "<input ".$style." type='button' name='set_true_all_move' onClick=\"acl_set_all('_0_m$',true);\" value='M+'>";
+    $display .= "<input ".$style." type='button' name='set_false_all_move' onClick=\"acl_set_all('_0_m$',false);\" value='M-'>";
+    $display .= "<input ".$style." type='button' name='set_true_all_remove' onClick=\"acl_set_all('_0_d$',true);\" value='D+'>";
+    $display .= "<input ".$style." type='button' name='set_false_all_remove' onClick=\"acl_set_all('_0_d$',false);\" value='D-'> - ";
+    $display .= "<input ".$style." type='button' name='set_true_all_read' onClick=\"acl_set_all('_0_r$',true);\" value='R+'>";
+    $display .= "<input ".$style." type='button' name='set_false_all_read' onClick=\"acl_set_all('_0_r$',false);\" value='R-'>";
+    $display .= "<input ".$style." type='button' name='set_true_all_write' onClick=\"acl_set_all('_0_w$',true);\" value='W+'>";
+    $display .= "<input ".$style." type='button' name='set_false_all_write' onClick=\"acl_set_all('_0_w$',false);\" value='W-'> - ";
+
+    $display .= "<input ".$style." type='button' name='set_true_all_read' onClick=\"acl_set_all('[^0]_r$',true);\" value='R+'>";
+    $display .= "<input ".$style." type='button' name='set_false_all_read' onClick=\"acl_set_all('[^0]_r$',false);\" value='R-'>";
+    $display .= "<input ".$style." type='button' name='set_true_all_write' onClick=\"acl_set_all('[^0]_w$',true);\" value='W+'>";
+    $display .= "<input ".$style." type='button' name='set_false_all_write' onClick=\"acl_set_all('[^0]_w$',false);\" value='W-'>";
+
+    /* Build general objects */
+    $list =$this->sort_by_priority($list);
     foreach ($list as $key => $name){
 
       /* Create sub acl if it does not exist */
       if (!isset($this->aclContents[$key])){
         $this->aclContents[$key]= array();
-      }
-      if (!isset($this->aclContents[$key][0])){
         $this->aclContents[$key][0]= '';
       }
       $currentAcl= $this->aclContents[$key];
 
       /* Object header */
-      $display.= "<table style='width:100%;border:1px solid #A0A0A0' cellspacing=0 cellpadding=2><tr><td style='background-color:#C8C8C8;height:1.8em' colspan=$cols><b>"._("Object").": $name</b></td></tr>";
+      if($_SESSION['js']) {
+        if(isset($_SERVER['HTTP_USER_AGENT']) && preg_match("/gecko/i",$_SERVER['HTTP_USER_AGENT'])) {
+          $display.= "\n<table style='width:100%;border:1px solid #A0A0A0' cellspacing=0 cellpadding=2>".
+                     "\n  <tr>".
+                     "\n    <td style='background-color:#C8C8C8;height:1.8em;' colspan=".($cols-1)."><b>"._("Object").": $name</b></td>".
+                     "\n    <td align='right' style='background-color:#C8C8C8;height:1.8em;'>".
+                     "\n    <input type='button' onclick='divtoggle(\"".preg_replace("/[^a-z0-9]/i","_",$name)."\");' value='"._("Show/Hide Advanced Settings")."' /></td>".
+                     "\n  </tr>";
+        } else if (isset($_SERVER['HTTP_USER_AGENT']) && preg_match("/ie/i",$_SERVER['HTTP_USER_AGENT'])) {
+          $display.= "\n<table style='width:100%;border:1px solid #A0A0A0' cellspacing=0 cellpadding=2>".
+                     "\n  <tr>".
+                     "\n    <td style='background-color:#C8C8C8;height:1.8em;' colspan=".($cols-1)."><b>"._("Object").": $name</b></td>".
+                     "\n    <td align='right' style='background-color:#C8C8C8;height:1.8em;'>".
+                     "\n    <input type='button' onclick='divtoggle(\"".preg_replace("/[^a-z0-9]/i","_",$name)."\");' value='"._("Show/Hide Advanced Settings")."' /></td>".
+                     "\n  </tr>";
+        } else {
+          $display.= "\n<table style='width:100%;border:1px solid #A0A0A0' cellspacing=0 cellpadding=2>".
+                     "\n  <tr>".
+                     "\n    <td style='background-color:#C8C8C8;height:1.8em;' colspan=$cols><b>"._("Object").": $name</b></td>".
+                     "\n  </tr>";
+        }
+      } else {
+          $display.= "\n<table style='width:100%;border:1px solid #A0A0A0' cellspacing=0 cellpadding=2>".
+                     "\n  <tr>".
+                     "\n    <td style='background-color:#C8C8C8;height:1.8em;' colspan=$cols><b>"._("Object").": $name</b></td>".
+                     "\n  </tr>";
+      }
 
       /* Generate options */
       $spc= "&nbsp;&nbsp;";
@@ -466,13 +658,13 @@ class acl extends plugin
         $options= $this->mkchkbx($key."_0_c",  _("Create objects"), preg_match('/c/', $currentAcl[0])).$spc;
         $options.= $this->mkchkbx($key."_0_m", _("Move objects"), preg_match('/m/', $currentAcl[0])).$spc;
         $options.= $this->mkchkbx($key."_0_d", _("Remove objects"), preg_match('/d/', $currentAcl[0])).$spc;
-        if ($plist[$key]['plSelfModify']){
+        if ($plist[preg_replace('%^.*/%', '', $key)]['plSelfModify']){
           $options.= $this->mkchkbx($key."_0_s", _("Modifyable by owner"), preg_match('/s/', $currentAcl[0])).$spc;
         }
       } else {
         $options= $this->mkchkbx($key."_0_m", _("Move object"), preg_match('/m/', $currentAcl[0])).$spc;
         $options.= $this->mkchkbx($key."_0_d", _("Remove object"), preg_match('/d/', $currentAcl[0])).$spc;
-        if ($plist[$key]['plSelfModify']){
+        if ($plist[preg_replace('%^.*/%', '', $key)]['plSelfModify']){
           $options.= $this->mkchkbx($key."_0_s", _("Modifyable by owner"), preg_match('/s/', $currentAcl[0])).$spc;
         }
       }
@@ -481,12 +673,28 @@ class acl extends plugin
       $more_options= $this->mkchkbx($key."_0_r",  _("read"), preg_match('/r/', $currentAcl[0])).$spc;
       $more_options.= $this->mkchkbx($key."_0_w", _("write"), preg_match('/w/', $currentAcl[0]));
 
-      $display.= "<tr><td style='background-color:#E0E0E0' colspan=".($cols-1).">$options</td><td style='background-color:#D4D4D4'>&nbsp;".("Complete object:")." $more_options</td></tr>";
+      $display.= "\n  <tr>".
+                 "\n    <td style='background-color:#E0E0E0' colspan=".($cols-1).">$options</td>".
+                 "\n    <td style='background-color:#D4D4D4'>&nbsp;"._("Complete object").": $more_options</td>".
+                 "\n  </tr>";
 
       /* Walk through the list of attributes */
       $cnt= 1;
-      $splist= $plist[$key];
+      $splist= $plist[preg_replace('%^.*/%', '', $key)]['plProvidedAcls'];
       asort($splist);
+      if($_SESSION['js']) {
+        if(isset($_SERVER['HTTP_USER_AGENT']) && preg_match("/gecko/i",$_SERVER['HTTP_USER_AGENT'])) {
+          $display.= "\n  <tr id='tr_".preg_replace("/[^a-z0-9]/i","_",$name)."' style='vertical-align:top;height:0px;'>".
+                     "\n    <td colspan=".$cols.">".
+                     "\n      <div id='".preg_replace("/[^a-z0-9]/i","_",$name)."' style='overflow:hidden;visibility:hidden;height:0px;vertical-align:top;width:100%;'>".
+                     "\n        <table style='width:100%;'>";
+        } else if (isset($_SERVER['HTTP_USER_AGENT']) && preg_match("/ie/i",$_SERVER['HTTP_USER_AGENT'])) {
+          $display.= "\n  <tr id='tr_".preg_replace("/[^a-z0-9]/i","_",$name)."' style='vertical-align:top;height:0px;'>".
+                     "\n    <td colspan=".$cols.">".
+                     "\n      <div id='".preg_replace("/[^a-z0-9]/i","_",$name)."' style='position:absolute;overflow:hidden;visibility:hidden;height:0px;vertical-align:top;width:100%;'>".
+                     "\n        <table style='width:100%;'>";
+        }
+      }
       foreach($splist as $attr => $dsc){
 
         /* Skip pl* attributes, they are internal... */
@@ -496,14 +704,14 @@ class acl extends plugin
 
         /* Open table row */
         if ($cnt == 1){
-          $display.= "<tr>";
+          $display.= "\n  <tr>";
         }
 
         /* Close table row */
         if ($cnt == $cols){
           $cnt= 1;
           $rb= "";
-          $end= "</tr>";
+          $end= "\n  </tr>";
         } else {
           $cnt++;
           $rb= "border-right:1px solid #A0A0A0;";
@@ -515,15 +723,25 @@ class acl extends plugin
         if (isset($currentAcl[$attr])){
           $state= $currentAcl[$attr];
         }
-        $display.= "<td style='border-top:1px solid #A0A0A0;${rb}width:".(int)(100/$cols)."%'><b>$dsc</b> ($attr)<br>".$this->mkrwbx($key."_".$attr, $state)."</td>$end";
+        $display.= "\n    <td style='border-top:1px solid #A0A0A0;${rb}width:".(int)(100/$cols)."%'>".
+                   "\n      <b>$dsc</b> ($attr)<br>".$this->mkrwbx($key."_".$attr, $state)."</td>$end";
       }
       
       /* Fill missing td's if needed */
       if (--$cnt != $cols && $cnt != 0){
-       $display.= str_repeat("<td style='border-top:1px solid #A0A0A0; width:".(int)(100/$cols)."%'>&nbsp;</td>", $cols-$cnt); 
+       $display.= str_repeat("\n    <td style='border-top:1px solid #A0A0A0; width:".(int)(100/$cols)."%'>&nbsp;</td>", $cols-$cnt); 
       }
 
-      $display.= "</table><br>";
+      if($_SESSION['js']) {
+        if(isset($_SERVER['HTTP_USER_AGENT']) && (preg_match("/gecko/i",$_SERVER['HTTP_USER_AGENT'])) || (preg_match("/ie/i",$_SERVER['HTTP_USER_AGENT']))) {
+          $display.= "\n        </table>".
+                     "\n      </div>".
+                     "\n    </td>".
+                     "\n  </tr>";
+        }
+      }
+
+      $display.= "\n</table><br />\n";
     }
 
     return ($display);
@@ -533,7 +751,8 @@ class acl extends plugin
   function mkchkbx($name, $text, $state= FALSE)
   {
     $state= $state?"checked":"";
-    return "<input id='acl_$name' type=checkbox name='acl_$name' $state><label for='acl_$name'>$text</label>";
+    return "\n      <input id='acl_".preg_replace("/[^a-z0-9]/i","_",$name)."' type=checkbox name='acl_$name' $state>".
+           "\n      <label for='acl_".preg_replace("/[^a-z0-9]/i","_",$name)."'>$text</label>";
   }
 
 
@@ -541,8 +760,10 @@ class acl extends plugin
   {
     $rstate= preg_match('/r/', $state)?'checked':'';
     $wstate= preg_match('/w/', $state)?'checked':'';
-    return ("<input id='acl_${name}_r' type=checkbox name='acl_${name}_r' $rstate><label for='acl_${name}_r'>"._("read")."</label>".
-            "<input id='acl_${name}_w' type=checkbox name='acl_${name}_w' $wstate><label for='acl_${name}_w'>"._("write")."</label>");
+    return ("\n      <input id='acl_".preg_replace("/[^a-z0-9]/i","_",$name)."_r' type=checkbox name='acl_${name}_r' $rstate>".
+            "\n      <label for='acl_".preg_replace("/[^a-z0-9]/i","_",$name)."_r'>"._("read")."</label>".
+            "\n      <input id='acl_".preg_replace("/[^a-z0-9]/i","_",$name)."_w' type=checkbox name='acl_${name}_w' $wstate>".
+            "\n      <label for='acl_".preg_replace("/[^a-z0-9]/i","_",$name)."_w'>"._("write")."</label>");
   }
 
 
@@ -550,8 +771,8 @@ class acl extends plugin
   {
     list($index, $type)= split(':', $acl);
     $a= array( $index => array("type" => $type,
-                               "members" => acl::extractMembers($acl)));
-    
+                               "members" => acl::extractMembers($acl,$type == "role")));
+   
     /* Handle different types */
     switch ($type){
 
@@ -563,7 +784,7 @@ class acl extends plugin
         break;
       
       case 'role':
-        echo "Role";
+        $a[$index]['acl']= base64_decode(preg_replace('/^[^:]+:[^:]+:([^:]+).*$/', '\1', $acl));
         break;
 
       case 'reset':
@@ -573,18 +794,21 @@ class acl extends plugin
         print_red(sprintf(_("Unkown ACL type '%s'. Don't know how to handle it."), $type));
         $a= array();
     }
-    
     return ($a);
   }
 
 
-  function extractMembers($acl)
+  function extractMembers($acl,$role = FALSE)
   {
     global $config;
     $a= array();
 
     /* Rip acl off the string, seperate by ',' and place it in an array */
-    $ms= preg_replace('/^[^:]+:[^:]+:([^:]+).*$/', '\1', $acl);
+    if($role){
+      $ms= preg_replace('/^[^:]+:[^:]+:[^:]+:([^:]+).*$/', '\1', $acl);
+    }else{
+      $ms= preg_replace('/^[^:]+:[^:]+:([^:]+).*$/', '\1', $acl);
+    }
     if ($ms == $acl){
       return $a;
     }
@@ -666,12 +890,22 @@ class acl extends plugin
     /* Summarize ACL */
     if (isset($entry['acl'])){
       $acl= "";
-      foreach ($entry['acl'] as $name => $object){
-        if (count($object)){
-          $acl.= "$name, ";
+
+      if($entry['type'] == "role"){
+
+        if(isset($this->roles[$entry['acl']])){  
+          $summary.= sprintf(_("Role: %s"), $this->roles[$entry['acl']]['cn']);
+        }else{
+          $summary.= sprintf(_("Role: %s"), "<i>"._("Unknown role, possibly removed")."</i>");
+        }
+      }else{
+        foreach ($entry['acl'] as $name => $object){
+          if (count($object)){
+            $acl.= "$name, ";
+          }
         }
+        $summary.= sprintf(_("Contains settings for these objects: %s"), preg_replace('/, $/', '', $acl));
       }
-      $summary.= sprintf(_("Contains settings for these objects: %s"), preg_replace('/, $/', '', $acl));
     }
 
     /* Summarize members */
@@ -733,7 +967,12 @@ class acl extends plugin
           $members.= base64_encode(preg_replace('/^.:/', '', $key)).',';
         }
       }
-      $final= $prio.":".$entry['type'].":".preg_replace('/,$/', '', $members);
+
+      if($entry['type'] != "role"){
+        $final= $prio.":".$entry['type'].":".preg_replace('/,$/', '', $members);
+      }else{
+        $final= $prio.":".$entry['type'].":".base64_encode($entry['acl']).":".preg_replace('/,$/', '', $members);
+      }
 
       /* ACL's if needed */
       if ($entry['type'] != "reset" && $entry['type'] != "role"){
@@ -794,11 +1033,27 @@ class acl extends plugin
     $ldap->modify ($this->attrs);
 
     show_ldap_error($ldap->get_error(), sprintf(_("Saving ACLs with dn '%s' failed."),$this->dn));
+
+    /* Refresh users ACLs */
+    $ui= get_userinfo();
+    $ui->loadACL();
+    $_SESSION['ui']= $ui;
   }
 
 
   function remove_from_parent()
   {
+    plugin::remove_from_parent();
+
+    /* include global link_info */
+    $ldap= $this->config->get_ldap_link();
+
+    $ldap->cd($this->dn);
+    $this->cleanup();
+    $ldap->modify ($this->attrs);
+
+    /* Optionally execute a command after we're done */
+    $this->handle_post_events("remove",array("uid" => $this->uid));
   }
 
 }