[Phpgroupware-cvs] property/inc class.uiadmin.inc.php class.boadmi...

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    property
Changes by:     Sigurd Nes <sigurdne>   06/10/05 13:13:08

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

Log message:
        E_NOTICES

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uiadmin.inc.php?cvsroot=phpgroupware&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.boadmin.inc.php?cvsroot=phpgroupware&r1=1.13&r2=1.14

Patches:
Index: class.uiadmin.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uiadmin.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- class.uiadmin.inc.php       5 Oct 2006 11:33:53 -0000       1.17
+++ class.uiadmin.inc.php       5 Oct 2006 13:13:08 -0000       1.18
@@ -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.uiadmin.inc.php,v 1.17 2006/10/05 11:33:53 
sigurdne Exp $
+       * @version $Id: class.uiadmin.inc.php,v 1.18 2006/10/05 13:13:08 
sigurdne Exp $
        */
 
        /**
@@ -57,7 +57,7 @@
                        $this->acl_delete                       = 
$this->acl->check($this->acl_location,8);
                        $this->acl_manage                       = 
$this->acl->check($this->acl_location,16);
 
-                       $this->acl_app                  = $this->bo->acl_app;
+       //              $this->acl_app                  = $this->bo->acl_app;
                        $this->start                    = $this->bo->start;
                        $this->query                    = $this->bo->query;
                        $this->sort                             = 
$this->bo->sort;
@@ -346,7 +346,7 @@
                                                        'janitor_result'        
                => (isset($user['result'][32])?$user['result'][32]:''),
                                                        'supervisor_result'     
                => (isset($user['result'][64])?$user['result'][64]:''),
                                                        
'budget_responsible_result'     => 
(isset($user['result'][128])?$user['result'][128]:''),
-                                                       'initials'              
                        => $user['initials'],
+                                                       'initials'              
                        => (isset($user['initials'])?$user['initials']:''),
                                                        'lang_right'            
                => lang('right'),
                                                        'lang_mask'             
                        => lang('mask'),
                                                        'lang_result'           
                => lang('result'),
@@ -394,7 +394,7 @@
                                                        'edit_result'           
                => (isset($group['result'][4])?$group['result'][4]:''),
                                                        'delete_result'         
                => (isset($group['result'][8])?$group['result'][8]:''),
                                                        'manage_result'         
                => (isset($group['result'][16])?$group['result'][16]:''),
-                                                       'initials'              
                        => $group['initials'],
+                               //                      'initials'              
                        => (isset($group['initials'])?$group['initials']:''),
                                                        'lang_right'            
                => lang('right'),
                                                        'lang_mask'             
                        => lang('mask'),
                                                        'lang_result'           
                => lang('result'),

Index: class.boadmin.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.boadmin.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- class.boadmin.inc.php       5 Oct 2006 11:33:53 -0000       1.13
+++ class.boadmin.inc.php       5 Oct 2006 13:13:08 -0000       1.14
@@ -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.13 2006/10/05 11:33:53 
sigurdne Exp $
+       * @version $Id: class.boadmin.inc.php,v 1.14 2006/10/05 13:13:08 
sigurdne Exp $
        */
 
        /**
@@ -25,6 +25,7 @@
                var $order;
                var $cat_id;
                var $offset;
+               var $acl_app;
 
                function boadmin($session='')
                {
@@ -52,6 +53,7 @@
                        $module = get_var('module',array('POST','GET'));
                        $granting_group = 
get_var('granting_group',array('POST','GET'));
                        $allrows        = 
get_var('allrows',array('POST','GET'));
+                       $acl_app        = 
get_var('acl_app',array('POST','GET'));
 
                        if ($start)
                        {
@@ -95,6 +97,11 @@
                                $this->allrows = $allrows;
                        }
 
+                       if(isset($acl_app))
+                       {
+                               $this->acl_app = $acl_app;
+                       }
+
                        if ($this->allrows)
                        {
                                $this->start = -1;