index 2996bc78cfb355847042bd5b92df62ab6755b9e7..19bde859ef949ad4d2c218dae64b68204cf9a6c0 100644 (file)
$ldap->search('(&(objectClass=gosaAccount)(gosaUnitTag='.$tag.'))', array('uid', 'cn'));
}
while ($attrs= $ldap->fetch()){
- $this->users['U:'.$attrs['dn']]= $attrs['cn'][0].' ['.$attrs['uid'][0].']';
+
+ // Allow objects without cn to be listed without causing an error.
+ if(!isset($attrs['cn'][0]) && isset($attrs['uid'][0])){
+ $this->users['U:'.$attrs['dn']]= $attrs['uid'][0];
+ }elseif(!isset($attrs['uid'][0]) && isset($attrs['cn'][0])){
+ $this->users['U:'.$attrs['dn']]= $attrs['cn'][0];
+ }elseif(!isset($attrs['uid'][0]) && !isset($attrs['cn'][0])){
+ $this->users['U:'.$attrs['dn']]= $attrs['dn'];
+ }else{
+ $this->users['U:'.$attrs['dn']]= $attrs['cn'][0].' ['.$attrs['uid'][0].']';
+ }
+
}
ksort($this->users);
/* 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];
/* Get the overall plugin acls
$overall_acl = $currentAcl[0];
}
+ // Detect configured plugins
+ $expand = count($currentAcl) > 1 || $currentAcl[0] != "";
+
/* Object header */
$tname= preg_replace("/[^a-z0-9]/i","_",$name);
+
+ if($expand){
+ $back_color = "#C8C8FF";
+ }else{
+ $back_color = "#C8C8C8";
+ }
+
if(session::global_get('js')) {
if(isset($_SERVER['HTTP_USER_AGENT']) &&
(preg_match("/gecko/i",$_SERVER['HTTP_USER_AGENT'])) ||
(preg_match("/presto/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(\"$tname\");' value='"._("Show/hide advanced settings")."' /></td>".
+ "\n <td style='background-color:{$back_color};height:1.8em;' colspan=".($cols-1)."><b>"._("Object").": $name</b></td>".
+ "\n <td align='right' style='background-color:{$back_color};height:1.8em;'>".
+ "\n <input type='button' onclick='divGOsa_toggle(\"$tname\");' 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(\"$tname\");' value='"._("Show/hide advanced settings")."' /></td>".
+ "\n <input type='button' onclick='divGOsa_toggle(\"$tname\");' value='"._("Show/hide advanced settings")."' /></td>".
"\n </tr>";
} else {
$display.= "\n<table style='width:100%;border:1px solid #A0A0A0' cellspacing=0 cellpadding=2>".
}else{
}
}
+
+
foreach($splist as $attr => $dsc){
/* Skip pl* attributes, they are internal... */
}
}
+
/* Summarize members */
- if ($summary != ""){
- $summary.= ", ";
- }
- if (count($entry['members'])){
- $summary.= _("Members").": ";
- foreach ($entry['members'] as $cn){
- $cn= preg_replace('/ \[.*$/', '', $cn);
- $summary.= $cn.", ";
+ if(!($this instanceOf aclrole)){
+ if ($summary != ""){
+ $summary.= ", ";
+ }
+ if (count($entry['members'])){
+ $summary.= _("Members").": ";
+ foreach ($entry['members'] as $cn){
+ $cn= preg_replace('/ \[.*$/', '', $cn);
+ $summary.= $cn.", ";
+ }
+ } else {
+ $summary.= "<font color='red'><i>"._("inactive")." - "._("No members")."</i></font>";
}
- } else {
- $summary.= _("ACL takes effect for all users");
}
-
return (preg_replace('/, $/', '', $summary));
}
}
if (!$ldap->success()){
- msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, LDAP_MOD, get_class()));
+ msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, LDAP_MOD, get_class()), ERROR_DIALOG);
}
/* Refresh users ACLs */