[Phpgroupware-cvs] property/inc class.boadmin.inc.php

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    property
Changes by:     Sigurd Nes <sigurdne>   06/10/04 08:18:49

Modified files:
        inc            : class.boadmin.inc.php 

Log message:
        E_NOTICES

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.boadmin.inc.php?cvsroot=phpgroupware&r1=1.11&r2=1.12

Patches:
Index: class.boadmin.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.boadmin.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- class.boadmin.inc.php       18 Apr 2006 11:31:10 -0000      1.11
+++ class.boadmin.inc.php       4 Oct 2006 08:18:49 -0000       1.12
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage admin
-       * @version $Id: class.boadmin.inc.php,v 1.11 2006/04/18 11:31:10 
sigurdne Exp $
+       * @version $Id: class.boadmin.inc.php,v 1.12 2006/10/04 08:18:49 
sigurdne Exp $
        */
 
        /**
@@ -24,6 +24,7 @@
                var $sort;
                var $order;
                var $cat_id;
+               var $offset;
 
                function boadmin($session='')
                {
@@ -198,6 +199,10 @@
                        while(list($rowinfo,$perm) = each($values))
                        {
                                list($user_id,$rights) = split('_',$rowinfo);
+                               if(!isset($totalacl[$user_id]))
+                               {
+                                       $totalacl[$user_id] =0;
+                               }
                                $totalacl[$user_id] += $rights;
                        }
                        @reset($totalacl);
@@ -208,7 +213,7 @@
                                
$this->acl2->set($this->location,$rights,$user_id,$type);
                        }
 
-                       if(is_array($r_processed) && is_array($user_checked))
+                       if( (isset($r_processed) && is_array($r_processed)) && 
(isset($user_checked) && is_array($user_checked)) )
                        {
                                $user_delete    = array_diff($r_processed, 
$user_checked);
                        }
@@ -216,7 +221,7 @@
                        {
                                $user_delete    = $r_processed;
                        }
-                       if(is_array($user_delete) && count($user_delete)>0)
+                       if(isset($user_delete) && is_array($user_delete) && 
count($user_delete)>0)
                        {
                                $user_delete= explode("_",implode("_", 
$user_delete));
 
@@ -233,11 +238,11 @@
 
                        $r_processed=explode("_",$r_processed);
 
-                       if(!$values['right'])
+                       if(!isset($values['right']))
                        {
                                $values['right'] = array();
                        }
-                       if(!$values['mask'])
+                       if(!isset($values['mask']))
                        {
                                $values['mask'] = array();
                        }
@@ -259,6 +264,11 @@
                        while(list($rowinfo,$perm) = each($values))
                        {
                                list($user_id,$rights) = split('_',$rowinfo);
+                               if(!isset($totalacl[$user_id]))
+                               {
+                                       $totalacl[$user_id] =0;
+                               }
+       
                                $totalacl[$user_id] += $rights;
                        }
                        @reset($totalacl);
@@ -269,7 +279,7 @@
                                
$this->acl2->set_grant($this->location,$rights,$user_id,$type,$this->granting_group);
                        }
 
-                       if(is_array($r_processed) && is_array($user_checked))
+                       if( isset($r_processed) && is_array($r_processed) && 
isset($user_checked) && is_array($user_checked))
                        {
                                $user_delete    = array_diff($r_processed, 
$user_checked);
                        }
@@ -277,7 +287,7 @@
                        {
                                $user_delete    = $r_processed;
                        }
-                       if(is_array($user_delete) && count($user_delete)>0)
+                       if( isset($user_delete) && is_array($user_delete) && 
count($user_delete)>0)
                        {
                                $user_delete= explode("_",implode("_", 
$user_delete));
 
@@ -290,11 +300,11 @@
                {
                        $r_processed=explode("_",$r_processed);
 
-                       if(!$values['right'])
+                       if(!isset($values['right']))
                        {
                                $values['right'] = array();
                        }
-                       if(!$values['mask'])
+                       if(!isset($values['mask']))
                        {
                                $values['mask'] = array();
                        }
@@ -390,7 +400,7 @@
                                                }
                                                else
                                                {
-                                                       
$user_list[$j]['result'] = $user_list[$j]['right'];
+                                                       
$user_list[$j]['result'] = 
(isset($user_list[$j]['right'])?$user_list[$j]['right']:'');
                                                }
 
                                                $user_list[$j]['right']['type'] 
= 'right';
@@ -410,7 +420,7 @@
                }
 
 
-               function get_user_list2($type='',$app_id='')
+               function get_user_list2($type='')
                {
                        $right=$this->right;
 
@@ -453,7 +463,7 @@
                                        }
                                        else
                                        {
-                                               $user_list[$j]['result'] = 
$user_list[$j]['right'];
+                                               $user_list[$j]['result'] = 
(isset($user_list[$j]['right'])?$user_list[$j]['right']:'');
                                        }
 
                                        $user_list[$j]['right']['type'] = 
'right';