![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 06a9648d1782d875d72483966014d5fc683af4be..d16d8658061a3b88e9f37c96e3f1e6e597b4c41b 100644 (file)
var $ocMapping= array();
var $groups= array();
var $result_cache =array();
- var $ignoreACL = FALSE;
+ var $ignoreACL = NULL;
var $ACLperPath = array();
var $ACLperPath_usesFilter = array();
$this->uid= $attrs['uid'][0];
$this->ip= $_SERVER['REMOTE_ADDR'];
- $this->ignoreACL = ($this->config->get_cfg_value("ignoreAcl") == $this->dn);
-
/* Initialize ACL_CACHE */
$this->reset_acl_cache();
}
function loadACL()
{
$this->ACL= array();
+ $this->allACLs= array();
$this->groups= array();
$this->result_cache =array();
$this->reset_acl_cache();
}
/* User inside the members? */
- if (preg_replace('/^U:/', '', $grp) == $this->dn){
+ if (mb_strtoupper(preg_replace('/^U:/', '', $grp)) == mb_strtoupper($this->dn)){
$interresting= TRUE;
}
+
+ /* Wildcard? */
+ if (preg_match('/^G:\*/', $grp)){
+ $interresting= TRUE;
+ }
+ $this->allACLs[$dn][$idx]= $type;
}
}
/* Remove all acl entries which are especially for the current user (self acl)
*/
- foreach($acl_set['acl'] as $object => $object_acls){
- if(isset($object_acls[0]) && strpos($object_acls[0],"s")){
- unset($without_self_acl[$sdn][$dn][$acl_id]['acl'][$object]);
- }
+ if(isset($acl_set['acl'])){
+ foreach($acl_set['acl'] as $object => $object_acls){
+ if(isset($object_acls[0]) && strpos($object_acls[0],"s") !== FALSE){
+ unset($without_self_acl[$sdn][$dn][$acl_id]['acl'][$object]);
+ }
+ }
}
}
}
function get_category_permissions($dn, $category, $any_acl = FALSE)
{
- return(@$this->get_permissions($dn,$category.'/0',""));
+ return($this->get_permissions($dn,$category.'/0',""));
}
return($ret);
}
+ /* Check for correct category and class values... */
+ if(strpos($object,'/') !== FALSE){
+ list($aclCategory, $aclClass) = preg_split("!/!", $object);
+ }else{
+ $aclCategory = $object;
+ }
+
+ if($this->config->boolValueIsTrue("core","developmentMode")){
+
+ if(!isset($this->ocMapping[$aclCategory])){
+ trigger_error("Invalid ACL category '".$aclCategory."'! ({$object})");
+ return("");
+ }elseif(isset($aclClass) && !in_array_strict($aclClass, $this->ocMapping[$aclCategory])){
+ trigger_error("Invalid ACL class '".$aclClass."'! ({$object})");
+ return("");
+ }
+ if(isset($aclClass) && $aclClass != '0' && class_available($aclClass)){
+ $plInfo = call_user_func(array($aclClass, 'plInfo'));
+ if(!empty($attribute) && !isset($plInfo['plProvidedAcls'][$attribute])){
+ trigger_error("Invalid ACL attribute '".$attribute."'! ({$object})");
+ return("");
+ }
+ }
+ }
+
/* Detect the set of ACLs we have to check for this object
*/
$adn = $dn;
$acl= array("r" => "", "w" => "", "c" => "", "d" => "", "m" => "", "a" => "");
/* Build dn array */
- $path= split(',', $dn);
+ $path= explode(',', $dn);
$path= array_reverse($path);
/* Walk along the path to evaluate the acl */
/* Inspect this ACL, place the result into ACL */
foreach ($ACL[$cpath] as $subacl){
- /* Reset? Just clean the ACL and turn over to the next one... */
- if ($subacl['type'] == 'reset'){
- $acl= $this->cleanACL($acl, TRUE);
- continue;
- }
-
if($subacl['type'] == "role") {
echo "role skipped";
continue;
}
}
+ /* Reset? Just clean the ACL and turn over to the next one... */
+ if ($subacl['type'] == 'reset'){
+ $acl= $this->cleanACL($acl, TRUE);
+ continue;
+ }
+
/* Self ACLs?
*/
if($dn != $this->dn && isset($subacl['acl'][$object][0]) && (strpos($subacl['acl'][$object][0],"s") !== FALSE)){
}
/* Global ACL? */
+ if (isset($subacl['acl']['all/all'][0])){
+ $acl= $this->mergeACL($acl, $subacl['type'], $subacl['acl']['all/all'][0]);
+ continue;
+ }
+
+ /* Global ACL? - Old style global ACL - Was removed since class_core.inc was created */
if (isset($subacl['acl']['all'][0])){
$acl= $this->mergeACL($acl, $subacl['type'], $subacl['acl']['all'][0]);
continue;
foreach($this->ocMapping[$ocs] as $oc){
if (isset($subacl['acl'][$ocs.'/'.$oc])){
- if($dn != $this->dn && strpos($subacl['acl'][$ocs.'/'.$oc][0],"s") !== FALSE) continue;
+ // Skip ACLs wich are defined for ourselfs only - if not checking against ($ui->dn)
+ if(isset($subacl['acl'][$ocs.'/'.$oc][0]) &&
+ $dn != $this->dn &&
+ strpos($subacl['acl'][$ocs.'/'.$oc][0],"s") !== FALSE) continue;
foreach($subacl['acl'][$ocs.'/'.$oc] as $attr => $dummy){
$acl= $this->mergeACL($acl, $subacl['type'], $subacl['acl'][$ocs.'/'.$oc][$attr]);
foreach($this->ACL as $dn => $infos){
foreach($infos as $info){
$found = FALSE;
- foreach($info['acl'] as $cat => $data){
-
- /* Skip self acls? */
- if($skip_self_acls && isset($data['0']) && (strpos($data['0'], "s") !== FALSE)) continue;
- if(preg_match("/^".preg_quote($mod, '/')."/",$cat)){
- $found =TRUE;
- break;
- }
- }
+ if(isset($info['acl'])){
+ foreach($info['acl'] as $cat => $data){
+
+ /* Skip self acls? */
+ if($skip_self_acls && isset($data['0']) && (strpos($data['0'], "s") !== FALSE)) continue;
+ if(preg_match("/^".preg_quote($mod, '/')."/",$cat)){
+ $found =TRUE;
+ break;
+ }
+ }
+ }
if($found && !isset($this->config->idepartments[$dn])){
while(!isset($this->config->idepartments[$dn]) && strpos($dn, ",")){
}
}
}else{
- trigger_error("Invalid type of category ".$category);
+ if($this->config->boolValueIsTrue("core","developmentMode")){
+ trigger_error("Invalid type of category ".$category);
+ }
$acl = "";
}
$this->result_cache['has_complete_category_acls'][$dn][$category] = $acl;
*/
function ignore_acl_for_current_user()
{
+ if($this->ignoreACL === NULL){
+ $this->ignoreACL = ($this->config->get_cfg_value("core","ignoreAcl") == $this->dn);
+ }
return($this->ignoreACL);
}