index 9c8deabb105061a9dfebc5327a0ef4c408c7fd46..68455e08765db4dd6345f8a8193c21a04c790bb4 100644 (file)
#echo "NEW ACL LOADING --------------------------------------------------------------------------------------------<br>";
$this->ACL= array();
#echo "NEW ACL LOADING --------------------------------------------------------------------------------------------<br>";
$this->ACL= array();
- $this->ocMapping= array();
$this->groups= array();
$ldap= $this->config->get_ldap_link();
$ldap->cd($this->config->current['BASE']);
$this->groups= array();
$ldap= $this->config->get_ldap_link();
$ldap->cd($this->config->current['BASE']);
/* No members? This is good for all users... */
if (!count($type['members'])){
$interresting= TRUE;
/* No members? This is good for all users... */
if (!count($type['members'])){
$interresting= TRUE;
- }
+ } else {
- /* Inspect members... */
- foreach ($type['members'] as $grp => $grpdsc){
- /* Some group inside the members that is relevant for us? */
- if (in_array_ics(preg_replace('/^G:/', '', $grp), $this->groups)){
- $interresting= TRUE;
- }
+ /* Inspect members... */
+ foreach ($type['members'] as $grp => $grpdsc){
+ /* Some group inside the members that is relevant for us? */
+ if (in_array_ics(preg_replace('/^G:/', '', $grp), $this->groups)){
+ $interresting= TRUE;
+ }
- /* User inside the members? */
- if (preg_replace('/^U:/', '', $grp) == $this->dn){
- $interresting= TRUE;
+ /* User inside the members? */
+ if (preg_replace('/^U:/', '', $grp) == $this->dn){
+ $interresting= TRUE;
+ }
}
}
}
}
$acl= "";
if (isset($this->ocMapping[$category])){
foreach($this->ocMapping[$category] as $oc){
$acl= "";
if (isset($this->ocMapping[$category])){
foreach($this->ocMapping[$category] as $oc){
- $acl.= $this->get_permissions($dn, $oc, "");
+ $acl.= $this->get_permissions($dn, $category."/".$oc);
}
}
}
}
}
}
- function get_permissions($dn, $object, $attribute, $skip_write= FALSE)
+ function get_permissions($dn, $object, $attribute= "", $skip_write= FALSE)
{
$acl= array("r" => "", "w" => "", "c" => "", "d" => "", "m" => "", "a" => "");
{
$acl= array("r" => "", "w" => "", "c" => "", "d" => "", "m" => "", "a" => "");
}
}
+ /* Extract all departments that are accessible (direct or 'on the way' to an
+ accessible department) */
function get_module_departments($module)
{
global $plist;
function get_module_departments($module)
{
global $plist;
}
}
}
}
- /* Get all gosaDepartments */
- $ldap= $this->config->get_ldap_link();
- $ldap->cd($this->config->current['BASE']);
- $ldap->search('objectClass=gosaDepartment', array('dn'));
- while ($attrs= $ldap->fetch()){
+ /* For all gosaDepartments */
+ foreach ($this->config->departments as $dn){
$acl= array("r" => "", "w" => "", "c" => "", "d" => "", "m" => "", "a" => "");
/* Build dn array */
$acl= array("r" => "", "w" => "", "c" => "", "d" => "", "m" => "", "a" => "");
/* Build dn array */
- $path= split(',', $attrs['dn']);
+ $path= split(',', $dn);
$path= array_reverse($path);
/* Walk along the path to evaluate the acl */
$path= array_reverse($path);
/* Walk along the path to evaluate the acl */
/* Per object ACL? */
foreach ($objects as $object){
/* Per object ACL? */
foreach ($objects as $object){
- if (isset($subacl['acl'][$object])){
- foreach($subacl['acl'][$object] as $attribute => $dcl){
- if (isset($subacl['acl'][$object][$attribute])){
- $acl= $this->mergeACL($acl, $subacl['type'], preg_replace('/[cdm]/', '', $subacl['acl'][$object][$attribute]));
- }
+ if (isset($subacl['acl']["$module/$object"])){
+ foreach($subacl['acl']["$module/$object"] as $attribute => $dcl){
+ $acl= $this->mergeACL($acl, $subacl['type'], $subacl['acl']["$module/$object"][$attribute]);
}
}
}
/* Global ACL? */
}
}
}
/* Global ACL? */
- if (isset($subacl['acl'][0])){
- $acl= $this->mergeACL($acl, $subacl['type'], preg_replace('/[cdm]/', '', $subacl['acl'][0]));
+ if (isset($subacl['acl']["$module/all"][0])){
+ $acl= $this->mergeACL($acl, $subacl['type'], $subacl['acl']["$module/all"][0]);
+ continue;
+ }
+
+ /* Global ACL? */
+ if (isset($subacl['acl']["all"][0])){
+ $acl= $this->mergeACL($acl, $subacl['type'], $subacl['acl']["all"][0]);
continue;
}
}
}
}
continue;
}
}
}
}
- /* Add department, if we have (some) permissions for the requred module */
+ /* Add department, if we have (some) permissions for the required module */
foreach ($acl as $val){
if ($val != ""){
foreach ($acl as $val){
if ($val != ""){
- $deps[]= $attrs['dn'];
+ $deps[]= $dn;
break;
}
}
break;
}
}