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

[Dave Hall]

CVSROOT:        /sources/phpgwapi
Module name:    phpgwapi
Changes by:     Dave Hall <skwashd>     06/10/23 10:31:02

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

Log message:
        fix the account_id fix now that the function is fixed, fix the instance 
variables and add some more phpdocs

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

Patches:
Index: class.acl.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/class.acl.inc.php,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -b -r1.98 -r1.99
--- class.acl.inc.php   23 Oct 2006 08:09:33 -0000      1.98
+++ class.acl.inc.php   23 Oct 2006 10:31:02 -0000      1.99
@@ -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.98 2006/10/23 08:09:33 sigurdne 
Exp $
+       * @version $Id: class.acl.inc.php,v 1.99 2006/10/23 10:31:02 skwashd 
Exp $
        */
 
        /**
@@ -38,7 +38,7 @@
                * Array with ACL records
                * @var array Array with ACL records
                */
-               var $data = Array();
+               var $data = array();
                /**
                * Database connection
                * @var object Database connection
@@ -46,9 +46,24 @@
                var $db;
 
                /**
+               * @var object $db2 cloned database object
+               */
+               var $bb2;
+
+               /**
+               * @var string like ???
+               */
+               var $like = 'LIKE';
+
+               /**
+               * @var string $join ???
+               */
+               var $join = 'JOIN';
+
+               /**
                * @var bool $load_from_shm  ACL data loaded from shared memory
                */
-               var $load_from_shm;
+               var $load_from_shm = false;
 
                /**
                * ACL constructor for setting account id
@@ -57,13 +72,13 @@
                * Some functions are specific to this account, and others are 
generic.
                * @param integer $account_id Account id
                */
-               function acl($account_id = '')
+               function acl($account_id = 0)
                {       
                        $this->db =& $GLOBALS['phpgw']->db;
                        $this->db2 = clone($this->db);
 
-                       $this->like = $this->db->like;
-                       $this->join = $this->db->join;
+                       $this->like =& $this->db->like;
+                       $this->join =& $this->db->join;
                        
                        if (!($this->account_id = intval($account_id)))
                        {