X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=include%2Fclass_acl.inc;h=a8fd374e1f7abacb20e811909ad1b3014abfc88b;hb=4e21fc2c719f4175c9b0e72ee9fbc95249a16ddf;hp=9024689fe136c322635f57f15903cc15f31a7f51;hpb=7cd8e100b582e4ee0176b366b16a9ccaef49d889;p=gosa.git diff --git a/include/class_acl.inc b/include/class_acl.inc index 9024689fe..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,6 +85,30 @@ 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; @@ -154,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")); @@ -173,7 +198,7 @@ class acl extends plugin { /* Call parent execute */ plugin::execute(); - + $tmp= get_global('plist'); $plist= $tmp->info; @@ -187,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(); @@ -260,10 +287,15 @@ 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 && is_array($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]); @@ -278,7 +310,7 @@ class acl extends plugin } /* Save new acl in case of base edit mode */ - if ($this->aclType == 'base'){ + if ($this->aclType == 'base' && !$firstedit){ $this->aclContents= $new_acl; } @@ -363,7 +395,7 @@ 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= ""; $action.= ""; @@ -449,6 +481,12 @@ 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'){ @@ -464,7 +502,13 @@ class acl extends plugin 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 */ @@ -473,15 +517,20 @@ 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= $plist[$na]['plPriority'] ; + $prio = 0; + if(isset($plist[$na]['plPriority'])){ + $prio= $plist[$na]['plPriority'] ; + } $newSort[$name] = $prio; } @@ -495,6 +544,35 @@ class acl extends plugin 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 = ""; + }else{ + $option = ""; + } + + $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= ""; @@ -504,16 +582,37 @@ class acl extends plugin asort($plist); /* Add select all/none buttons */ - $display .= " "; - $display .= " "; - $display .= " "; - $display .= " "; - $display .= " "; - - $display .= " "; - $display .= " "; - /* Build general objects */ + $style = "style='width:100px;'"; + $display .= ""; + $display .= ""; + $display .= " - "; + $display .= ""; + $display .= " - "; + + $display .= ""; + $display .= ""; + + $display .= "
"; + + $style = "style='width:50px;'"; + $display .= ""; + $display .= ""; + $display .= ""; + $display .= ""; + $display .= ""; + $display .= " - "; + $display .= ""; + $display .= ""; + $display .= ""; + $display .= " - "; + + $display .= ""; + $display .= ""; + $display .= ""; + $display .= ""; + + /* Build general objects */ $list =$this->sort_by_priority($list); foreach ($list as $key => $name){ @@ -576,7 +675,7 @@ class acl extends plugin $display.= "\n ". "\n $options". - "\n  ".("Complete object:")." $more_options". + "\n  "._("Complete object").": $more_options". "\n "; /* Walk through the list of attributes */ @@ -653,7 +752,7 @@ class acl extends plugin { $state= $state?"checked":""; return "\n ". - "\n "; + "\n "; } @@ -662,9 +761,9 @@ class acl extends plugin $rstate= preg_match('/r/', $state)?'checked':''; $wstate= preg_match('/w/', $state)?'checked':''; return ("\n ". - "\n ". + "\n ". "\n ". - "\n "); + "\n "); } @@ -672,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){ @@ -685,7 +784,7 @@ class acl extends plugin break; case 'role': - echo "Role"; + $a[$index]['acl']= base64_decode(preg_replace('/^[^:]+:[^:]+:([^:]+).*$/', '\1', $acl)); break; case 'reset': @@ -695,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; } @@ -788,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"), ""._("Unknown role, possibly removed").""); } + }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 */ @@ -855,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"){ @@ -926,6 +1043,17 @@ class acl extends plugin 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)); } }