X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_userinfo.inc;h=3e18c076950cc0fd0c4a6fb101ed61ce09859008;hb=d304d276784b0675372dcdb402a61bfdd3f8488d;hp=77015dad2290a8992a921968fd50cb3281efdf62;hpb=951ff52238278141c5d423bda877eea92c86ce32;p=gosa.git

diff --git a/gosa-core/include/class_userinfo.inc b/gosa-core/include/class_userinfo.inc
index 77015dad2..3e18c0769 100644
--- a/gosa-core/include/class_userinfo.inc
+++ b/gosa-core/include/class_userinfo.inc
@@ -1,21 +1,23 @@
 <?php
 /*
-   This code is part of GOsa (https://gosa.gonicus.de)
-   Copyright (C) 2003-2005  Cajus Pollmeier
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This code is part of GOsa (http://www.gosa-project.org)
+ * Copyright (C) 2003-2008 GONICUS GmbH
+ *
+ * ID: $$Id$$
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 class userinfo
@@ -190,13 +192,14 @@ class userinfo
   function get_permissions($dn, $object, $attribute= "", $skip_write= FALSE)
   {
     /* Push cache answer? */
-    if (isset($_SESSION['ACL_CACHE']["$dn+$object+$attribute"])){
+    $ACL_CACHE = &session::get('ACL_CACHE');
+    if (isset($ACL_CACHE["$dn+$object+$attribute"])){
 
       /* Remove write if needed */
       if ($skip_write){
-        $ret = preg_replace('/w/', '', $_SESSION['ACL_CACHE']["$dn+$object+$attribute"]);
+        $ret = preg_replace('/w/', '', $ACL_CACHE["$dn+$object+$attribute"]);
       }else{
-        $ret = $_SESSION['ACL_CACHE']["$dn+$object+$attribute"];
+        $ret = $ACL_CACHE["$dn+$object+$attribute"];
       } 
       return($ret);
     }
@@ -273,7 +276,7 @@ class userinfo
       }
     }
 
-    $_SESSION['ACL_CACHE']["$dn+$object+$attribute"]= $ret;
+    $ACL_CACHE["$dn+$object+$attribute"]= $ret;
 
     /* Remove write if needed */
     if ($skip_write){
@@ -288,8 +291,9 @@ class userinfo
   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)]);
+    $ACL_CACHE = session::get('ACL_CACHE');
+    if(isset($ACL_CACHE['MODULE_DEPARTMENTS'][serialize($module)])){
+      return($ACL_CACHE['MODULE_DEPARTMENTS'][serialize($module)]);
     }
 
     global $plist;
@@ -384,7 +388,8 @@ class userinfo
       }
     }
 
-    $_SESSION['ACL_CACHE']['MODULE_DEPARTMENTS'][serialize($module)] = $deps;
+    $ACL_CACHE = &session::get('ACL_CACHE');
+    $ACL_CACHE['MODULE_DEPARTMENTS'][serialize($module)] = $deps;
     return ($deps);
   }