index ac33f535d5d9ddf03e899ec9862ad6b2ae6b6fd7..2c46e9efcd63f72ca88a5fe53b5824f4845b36e5 100644 (file)
$this->dn= $userdn;
$this->uid= $attrs['uid'][0];
$this->ip= $_SERVER['REMOTE_ADDR'];
$this->dn= $userdn;
$this->uid= $attrs['uid'][0];
$this->ip= $_SERVER['REMOTE_ADDR'];
+
+ /* Initialize ACL_CACHE */
+ $_SESSION['ACL_CACHE']= array();
+ $this->reset_acl_cache();
}
}
+ public function reset_acl_cache()
+ {
+ /* Initialize ACL_CACHE */
+ $_SESSION['ACL_CACHE']= array();
+ }
+
function loadACL()
{
$this->ACL= array();
$this->groups= array();
$this->result_cache =array();
function loadACL()
{
$this->ACL= array();
$this->groups= array();
$this->result_cache =array();
+ $this->reset_acl_cache();
$ldap= $this->config->get_ldap_link();
$ldap->cd($this->config->current['BASE']);
$ldap= $this->config->get_ldap_link();
$ldap->cd($this->config->current['BASE']);
function get_permissions($dn, $object, $attribute= "", $skip_write= FALSE)
{
function get_permissions($dn, $object, $attribute= "", $skip_write= FALSE)
{
+ /* Push cache answer? */
+ if (isset($_SESSION['ACL_CACHE']["$dn+$object+$attribute"])){
+ return ($_SESSION['ACL_CACHE']["$dn+$object+$attribute"]);
+ }
+
$acl= array("r" => "", "w" => "", "c" => "", "d" => "", "m" => "", "a" => "");
/* Build dn array */
$acl= array("r" => "", "w" => "", "c" => "", "d" => "", "m" => "", "a" => "");
/* Build dn array */
$ret= preg_replace('/w/', '', $ret);
}
$ret= preg_replace('/w/', '', $ret);
}
+ $_SESSION['ACL_CACHE']["$dn+$object+$attribute"]= $ret;
return ($ret);
}
return ($ret);
}
function mergeACL($acl, $type, $newACL)
{
function mergeACL($acl, $type, $newACL)
{
- if(preg_match("/w/",$newACL) && !preg_match("/r/",$newACL)){
+ if (strpos($newACL, 'w') !== FALSE && strpos($newACL, 'r') === FALSE){
$newACL .= "r";
}
$newACL .= "r";
}
+
foreach(str_split($newACL) as $char){
/* Ignore invalid characters */
foreach(str_split($newACL) as $char){
/* Ignore invalid characters */
function cleanACL($acl, $reset= FALSE)
{
function cleanACL($acl, $reset= FALSE)
{
- foreach ($acl as $key => $value){
+ foreach ($acl as &$value){
/* Reset removes everything but 'p' */
if ($reset && $value != 'p'){
/* Reset removes everything but 'p' */
if ($reset && $value != 'p'){
- $acl[$key]= "";
+ $value= "";
continue;
}
/* Decrease tree level */
continue;
}
/* Decrease tree level */
- if (preg_match('/^[0-9]+$/', $value)){
- if ($value > 0){
- $acl[$key]= $value - 1;
+ if (is_int($value)){
+ if ($value){
+ $value--;
} else {
} else {
- $acl[$key]= "";
+ $value= "";
}
}
}
}
}
}
$acl = "rwcdm";
$types = "rwcdm";
$acl = "rwcdm";
$types = "rwcdm";
-
if(!is_string($category)){
trigger_error("category must be string");
$acl = "";
if(!is_string($category)){
trigger_error("category must be string");
$acl = "";