Added modified menu templates, removed unused templates

[gosa.git] / include / class_userinfo.inc

diff --git a/include/class_userinfo.inc b/include/class_userinfo.inc
index 85417cdb150254e873884e716683968338515409..097c7ccdc90f2030cdd4cbc0d35b5e28ba0ff126 100644 (file)
--- a/include/class_userinfo.inc
+++ b/include/class_userinfo.inc
@@ -37,8 +37,8 @@ class userinfo
 
   /* get acl's an put them into the userinfo object
      attr subtreeACL (userdn:components, userdn:component1#sub1#sub2,component2,...) */
-  function userinfo($config, $userdn){
-    $this->config= $config;
+  function userinfo(&$config, $userdn){
+    $this->config= &$config;
     $ldap= $this->config->get_ldap_link();
     $ldap->cat($userdn,array('sn', 'givenName', 'uid', 'gidNumber', 'preferredLanguage', 'gosaUnitTag'));
     $attrs= $ldap->fetch();
@@ -64,39 +64,25 @@ class userinfo
     $this->dn= $userdn;
     $this->uid= $attrs['uid'][0];
     $this->ip= $_SERVER['REMOTE_ADDR'];
+
+    /* Initialize ACL_CACHE */
+    $_SESSION['ACL_CACHE']= array();
+    $this->reset_acl_cache();
   }
 
 
-  function loadACL()
+  public function reset_acl_cache()
   {
+    /* Initialize ACL_CACHE */
+    $_SESSION['ACL_CACHE']= array();
+  }
 
-#--------------------------------------------------------------------------OLD-BUT-ACTIVE-----------------------------
-    $ldap= $this->config->get_ldap_link();
-
-    /* Load ACL's from all groups we're in */
-    $this->subtreeACL= array();
-    $ldap->cd($this->config->current['BASE']);
-    if ($this->gidNumber == -1){
-      $ldap->search("(&(objectClass=posixGroup)(objectClass=gosaObject)".
-          "(memberUid=$this->username))");
-    } else {
-      $ldap->search("(&(objectClass=posixGroup)(objectClass=gosaObject)".
-          "(|(memberUid=$this->username)(gidNumber=$this->gidNumber)))");
-    }
-
-    while($attrs = $ldap->fetch()){
-      $base= preg_replace('/^[^,]+,ou=[^,]+,/i', "",$ldap->getDN());
-      $base= preg_replace("/[ ]*,[ ]*/", ",", $base);
-
-      for ($i= 0; $i<$attrs["gosaSubtreeACL"]["count"]; $i++){
-        $this->subtreeACL[$base][]= $attrs["gosaSubtreeACL"][$i];
-      }
-    }
-#echo "NEW ACL LOADING --------------------------------------------------------------------------------------------<br>";
-
+  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']);
 
@@ -122,6 +108,31 @@ class userinfo
       $aclc[$attrs['dn']]= $ol;
     }
 
+    /* Resolve roles here. 
+     */
+    foreach($aclc as $dn => $data){
+      foreach($data as $prio => $aclc_value)  {
+        if($aclc_value['type'] == "role"){
+
+          unset($aclc[$dn][$prio]);
+
+          $ldap->cat($aclc_value['acl'],array("gosaAclTemplate"));
+          $attrs = $ldap->fetch();
+
+          if(isset($attrs['gosaAclTemplate'])){
+            for($i= 0; $i<$attrs['gosaAclTemplate']['count']; $i++){
+              $tmp = @acl::explodeAcl($attrs['gosaAclTemplate'][$i]);  
+
+              foreach($tmp as $new_acl){
+                $new_acl['members'] = $aclc_value['members'];
+                $aclc[$dn][] =$new_acl;
+              }
+            }      
+          }
+        }
+      }
+    }
+
     /* ACL's read, sort for tree depth */
     asort($aclp);
 
@@ -159,7 +170,6 @@ class userinfo
       }
 
     }
-
   }
 
 
@@ -179,6 +189,18 @@ class userinfo
 
   function get_permissions($dn, $object, $attribute= "", $skip_write= FALSE)
   {
+    /* Push cache answer? */
+    if (isset($_SESSION['ACL_CACHE']["$dn+$object+$attribute"])){
+
+      /* Remove write if needed */
+      if ($skip_write){
+        $ret = preg_replace('/w/', '', $_SESSION['ACL_CACHE']["$dn+$object+$attribute"]);
+      }else{
+        $ret = $_SESSION['ACL_CACHE']["$dn+$object+$attribute"];
+      } 
+      return($ret);
+    }
+
     $acl= array("r" => "", "w" => "", "c" => "", "d" => "", "m" => "", "a" => "");
 
     /* Build dn array */
@@ -208,6 +230,11 @@ class userinfo
             continue;
           }
 
+          if($subacl['type'] == "role") {
+            echo "role skipped";
+            continue;
+          }
+
           /* Per attribute ACL? */
           if (isset($subacl['acl'][$object][$attribute])){
             $acl= $this->mergeACL($acl, $subacl['type'], $subacl['acl'][$object][$attribute]);
@@ -246,11 +273,12 @@ class userinfo
       }
     }
 
+    $_SESSION['ACL_CACHE']["$dn+$object+$attribute"]= $ret;
+
     /* Remove write if needed */
     if ($skip_write){
       $ret= preg_replace('/w/', '', $ret);
     }
-
     return ($ret);
   }
 
@@ -259,6 +287,11 @@ class userinfo
      accessible department) */
   function get_module_departments($module)
   {
+    /* Use cached results if possilbe */
+    if(isset($_SESSION['ACL_CACHE']['MODULE_DEPARTMENTS'][serialize($module)])){
+      return($_SESSION['ACL_CACHE']['MODULE_DEPARTMENTS'][serialize($module)]);
+    }
+
     global $plist;
 
     $objects= array();
@@ -312,6 +345,11 @@ class userinfo
               $acl= $this->cleanACL($acl, TRUE);
               continue;
             }
+    
+            if($subacl['type'] == 'role'){
+              echo "role skipped";
+              continue;
+            }
 
             /* Per object ACL? */
             foreach ($objects as $object){
@@ -346,12 +384,17 @@ class userinfo
       }
     }
 
+    $_SESSION['ACL_CACHE']['MODULE_DEPARTMENTS'][serialize($module)] = $deps;
     return ($deps);
   }
 
 
   function mergeACL($acl, $type, $newACL)
   {
+    if (strpos($newACL, 'w') !== FALSE && strpos($newACL, 'r') === FALSE){
+      $newACL .= "r";
+    }
+
     foreach(str_split($newACL) as $char){
 
       /* Ignore invalid characters */
@@ -391,20 +434,20 @@ class userinfo
 
   function cleanACL($acl, $reset= FALSE)
   {
-    foreach ($acl as $key => $value){
+    foreach ($acl as &$value){
 
       /* Reset removes everything but 'p' */
       if ($reset && $value != 'p'){
-        $acl[$key]= "";
+        $value= "";
         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 {
-          $acl[$key]= "";
+          $value= "";
         }
       }
     }
@@ -426,7 +469,6 @@ class userinfo
     $acl    = "rwcdm";
     $types  = "rwcdm";
 
-
     if(!is_string($category)){
       trigger_error("category must be string");   
       $acl = "";