[Phpgroupware-cvs] phpgwapi/inc class.acl.inc.php

[Sigurd Nes]

CVSROOT:        /sources/phpgwapi
Module name:    phpgwapi
Changes by:     Sigurd Nes <sigurdne>   06/10/11 08:45:18

Modified files:
        inc            : class.acl.inc.php 

Log message:
        enable acl-shm for multiple databases on same server

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.acl.inc.php?cvsroot=phpgwapi&r1=1.92&r2=1.93

Patches:
Index: class.acl.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/class.acl.inc.php,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -b -r1.92 -r1.93
--- class.acl.inc.php   10 Oct 2006 19:55:11 -0000      1.92
+++ class.acl.inc.php   11 Oct 2006 08:45:18 -0000      1.93
@@ -6,7 +6,7 @@
        * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General 
Public License
        * @package phpgwapi
        * @subpackage accounts
-       * @version $Id: class.acl.inc.php,v 1.92 2006/10/10 19:55:11 sigurdne 
Exp $
+       * @version $Id: class.acl.inc.php,v 1.93 2006/10/11 08:45:18 sigurdne 
Exp $
        */
 
        /**
@@ -80,7 +80,7 @@
                        {
                                if ( (!isset($this->data) || 
count($this->data)==0))
                                {
-                                       if($this->data = 
$GLOBALS['phpgw']->shm->get_value('acl_data'))
+                                       if($this->data = 
$GLOBALS['phpgw']->shm->get_value($GLOBALS['phpgw_info']['user']['domain'] . 
'acl_data'))
                                        {
 //_debug_array($this->data);
 //die();
@@ -166,9 +166,12 @@
                                $this->acl();
                        }
 
-                       if(isset($this->loaded_from_shm) && 
$this->loaded_from_shm && count($this->data)==0)
+                       if(isset($this->loaded_from_shm) && 
$this->loaded_from_shm)
                        {
-                               $this->data = 
$GLOBALS['phpgw']->shm->get_value('acl_data');
+                               if(count($this->data)==0)
+                               {
+                                       $this->data = 
$GLOBALS['phpgw']->shm->get_value($GLOBALS['phpgw_info']['user']['domain'] . 
'acl_data');
+                               }
                        }
                        else
                        {
@@ -1215,6 +1218,6 @@
                        }
 //_debug_array($this->data);
 //die();
-                       
$GLOBALS['phpgw']->shm->store_value('acl_data',$this->data);
+                       
$GLOBALS['phpgw']->shm->store_value($GLOBALS['phpgw_info']['user']['domain'] . 
'acl_data',$this->data);
                }               
        }