[Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php,1.37,1.38 class.boinvoice.inc.php,1.13,1.14 class.socommon.inc.php,1.16,1.17 class.soinvoice.inc.php,1.18,1.19 class.uidrawing.inc.php,1.8,1.9 class.uiwo_hour.inc.php,1.15,1.16 class.uiXport.inc.php,1.20,1.21

[Sigurd Nes <address@hidden>]

Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv9855/inc

Modified Files:
        class.bocommon.inc.php class.boinvoice.inc.php 
        class.socommon.inc.php class.soinvoice.inc.php 
        class.uidrawing.inc.php class.uiwo_hour.inc.php 
        class.uiXport.inc.php 
Log Message:
no message

Index: class.bocommon.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bocommon.inc.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -r1.37 -r1.38
*** class.bocommon.inc.php      23 Apr 2003 07:21:34 -0000      1.37
--- class.bocommon.inc.php      25 Apr 2003 09:46:13 -0000      1.38
***************
*** 192,195 ****
--- 192,229 ----
                }
  
+ 
+               function 
get_user_list_right($right='',$selected='',$acl_location='')
+               {
+                       
$employees=$this->socommon->get_user_list_right($right,$acl_location);
+                       while (is_array($employees) && list(,$user) = 
each($employees))
+                       {
+                               $sel_user = '';
+                               if ($user['account_lid']==$selected)
+                               {
+                                       $sel_user = 'selected';
+                               }
+ 
+                               $user_list[] = array
+                               (
+                                       'lid'                   => 
$user['account_lid'],
+                                       'firstname'             => 
$user['account_firstname'],
+                                       'lastname'              => 
$user['account_lastname'],
+                                       'selected'              => $sel_user
+                               );
+                       }
+ 
+                       for ($i=0;$i<count($user_list);$i++)
+                       {
+                               if ($user_list[$i]['selected'] != 'selected')
+                               {
+                                       unset($user_list[$i]['selected']);
+                               }
+                       }
+ 
+                       return $user_list;
+               }
+ 
+ 
+ 
                function get_location()
                {

Index: class.boinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boinvoice.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** class.boinvoice.inc.php     23 Apr 2003 15:07:16 -0000      1.13
--- class.boinvoice.inc.php     25 Apr 2003 09:46:14 -0000      1.14
***************
*** 355,390 ****
                }
  
-               function get_list_role($role='',$selected='')
-               {
-                       $employees=$this->so->get_list_role($role);
-                       while (is_array($employees) && list(,$user) = 
each($employees))
-                       {
-                               $sel_user = '';
-                               if ($user['account_lid']==$selected)
-                               {
-                                       $sel_user = 'selected';
-                               }
- 
-                               $user_list[] = array
-                               (
-                                       'lid'                   => 
$user['account_lid'],
-                                       'firstname'             => 
$user['account_firstname'],
-                                       'lastname'              => 
$user['account_lastname'],
-                                       'selected'              => $sel_user
-                               );
-                       }
- 
-                       for ($i=0;$i<count($user_list);$i++)
-                       {
-                               if ($user_list[$i]['selected'] != 'selected')
-                               {
-                                       unset($user_list[$i]['selected']);
-                               }
-                       }
- 
-                       return $user_list;
-               }
- 
- 
                function select_account_class($selected='')
                {
--- 355,358 ----

Index: class.socommon.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.socommon.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** class.socommon.inc.php      8 Apr 2003 12:38:09 -0000       1.16
--- class.socommon.inc.php      25 Apr 2003 09:46:14 -0000      1.17
***************
*** 13,20 ****
--- 13,22 ----
                function socommon()
                {
+                       $this->currentapp       = 
$GLOBALS['phpgw_info']['flags']['currentapp'];
                        $this->db               = $GLOBALS['phpgw']->db;
                        $this->db2              = $this->db;
                        $this->grants   = 
$GLOBALS['phpgw']->acl->get_grants('property');
                        $this->account  = 
$GLOBALS['phpgw_info']['user']['account_id'];
+                       $this->acl2     = 
CreateObject($this->currentapp.'.acl2','##DEFAULT##','##DEFAULT##');
  
                        if 
($GLOBALS['phpgw_info']['server']['db_type']=='pgsql')
***************
*** 28,31 ****
--- 30,56 ----
  
  
+               }
+ 
+               function get_user_list_right($right='',$acl_location='')
+               {
+ 
+                       $sql = "SELECT * FROM phpgw_accounts $this->join 
fm_acl2 on phpgw_accounts.account_id=fm_acl2.acl_account where acl_location 
LIKE '%$acl_location%'";
+                       $this->db->query($sql,__LINE__,__FILE__);
+                       while ($this->db->next_record())
+                       {
+                               
if($this->acl2->check($acl_location,$right,$this->db->f('account_id')))
+                               {
+                                       $employees[] = Array(
+                                               'account_id'        => 
$this->db->f('account_id'),
+                                               'account_lid'       => 
$this->db->f('account_lid'),
+                                               'account_type'      => 
$this->db->f('account_type'),
+                                               'account_firstname' => 
$this->db->f('account_firstname'),
+                                               'account_lastname'  => 
$this->db->f('account_lastname'),
+                                               'account_status'    => 
$this->db->f('account_status'),
+                                               'account_expires'   => 
$this->db->f('account_expires')
+                                       );
+                               }
+                       }
+                       return $employees;
                }
  

Index: class.soinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soinvoice.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** class.soinvoice.inc.php     23 Apr 2003 15:07:16 -0000      1.18
--- class.soinvoice.inc.php     25 Apr 2003 09:46:14 -0000      1.19
***************
*** 27,31 ****
                        $this->bocommon         = 
CreateObject($this->currentapp.'.bocommon');
                        $this->account_id       = 
$GLOBALS['phpgw_info']['user']['account_id'];
!                       $this->acl2             = 
CreateObject($this->currentapp.'.acl2');
  
                        if 
($GLOBALS['phpgw_info']['server']['db_type']=='pgsql')
--- 27,31 ----
                        $this->bocommon         = 
CreateObject($this->currentapp.'.bocommon');
                        $this->account_id       = 
$GLOBALS['phpgw_info']['user']['account_id'];
!                       $this->acl2             = 
CreateObject($this->currentapp.'.acl2','##DEFAULT##','##DEFAULT##');
  
                        if 
($GLOBALS['phpgw_info']['server']['db_type']=='pgsql')
***************
*** 790,815 ****
                        }
                        return $tax_code_list;
-               }
- 
- //------------------------
-               function get_list_role($role='')
-               {
- 
-                       $sql = "SELECT * FROM phpgw_accounts $this->join 
fm_admin on phpgw_accounts.account_id=fm_admin.account_id where $role ='1'";
-                       $this->db->query($sql,__LINE__,__FILE__);
-                       while ($this->db->next_record())
-                       {
-                               $employees[] = Array(
-                                       'account_id'        => 
$this->db->f('account_id'),
-                                       'account_lid'       => 
$this->db->f('account_lid'),
-                                       'account_type'      => 
$this->db->f('account_type'),
-                                       'account_firstname' => 
$this->db->f('account_firstname'),
-                                       'account_lastname'  => 
$this->db->f('account_lastname'),
-                                       'account_status'    => 
$this->db->f('account_status'),
-                                       'account_expires'   => 
$this->db->f('account_expires')
-                               );
-                       }
- //_debug_array($employees);
-                       return $employees;
                }
  
--- 790,793 ----

Index: class.uidrawing.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uidrawing.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.uidrawing.inc.php     24 Apr 2003 10:42:08 -0000      1.8
--- class.uidrawing.inc.php     25 Apr 2003 09:46:14 -0000      1.9
***************
*** 270,275 ****
                function view_file($file_array='')
                {
!                       define('PHPGW_FINAL',True);
! 
                        $drawing_id             = 
get_var('drawing_id',array('POST','GET'));
                        $values = $this->bo->read_single($drawing_id);
--- 270,275 ----
                function view_file($file_array='')
                {
! //                    define('PHPGW_FINAL',True);
! $GLOBALS['phpgw_info']['flags']['noframework'] = True;
                        $drawing_id             = 
get_var('drawing_id',array('POST','GET'));
                        $values = $this->bo->read_single($drawing_id);

Index: class.uiwo_hour.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiwo_hour.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** class.uiwo_hour.inc.php     24 Apr 2003 10:42:08 -0000      1.15
--- class.uiwo_hour.inc.php     25 Apr 2003 09:46:14 -0000      1.16
***************
*** 16,21 ****
                var $order;
                var $filter;
-               var $part_of_town_id;
-               var $sub;
                var $currentapp;
  
--- 16,19 ----
***************
*** 27,33 ****
                        'template'              => True,
                        'save_template' => True,
- 
                        'prizebook'             => True,
-                       'view'                  => True,
                        'add'                   => True,
                        'edit'                  => True,
--- 25,29 ----

Index: class.uiXport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiXport.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** class.uiXport.inc.php       24 Apr 2003 10:42:08 -0000      1.20
--- class.uiXport.inc.php       25 Apr 2003 09:46:14 -0000      1.21
***************
*** 337,341 ****
  
                                'lang_janitor'                                  
=> lang('Janitor'),
!                               'janitor_list'                                  
=> $this->invoice->get_list_role('janitor',$janitor),
                                'select_janitor'                                
=> 'janitor',
                                'lang_no_janitor'                               
=> lang('No janitor'),
--- 337,341 ----
  
                                'lang_janitor'                                  
=> lang('Janitor'),
!                               'janitor_list'                                  
=> $this->bocommon->get_user_list_right(32,$janitor,'.invoice'),
                                'select_janitor'                                
=> 'janitor',
                                'lang_no_janitor'                               
=> lang('No janitor'),
***************
*** 343,347 ****
  
                                'lang_supervisor'                               
=> lang('Supervisor'),
!                               'supervisor_list'                               
=> $this->invoice->get_list_role('supervisor',$supervisor),
                                'select_supervisor'                             
=> 'supervisor',
                                'lang_no_supervisor'                    => 
lang('No supervisor'),
--- 343,347 ----
  
                                'lang_supervisor'                               
=> lang('Supervisor'),
!                               'supervisor_list'                               
=> $this->bocommon->get_user_list_right(64,$supervisor,'.invoice'),
                                'select_supervisor'                             
=> 'supervisor',
                                'lang_no_supervisor'                    => 
lang('No supervisor'),
***************
*** 349,353 ****
  
                                'lang_budget_responsible'               => 
lang('B - responsible'),
!                               'budget_responsible_list'               => 
$this->invoice->get_list_role('budget_responsible',$budget_responsible),
                                'select_budget_responsible'             => 
'budget_responsible',
                                'lang_select_budget_responsible'=> lang('Select 
B-Responsible'),
--- 349,353 ----
  
                                'lang_budget_responsible'               => 
lang('B - responsible'),
!                               'budget_responsible_list'               => 
$this->bocommon->get_user_list_right(128,$budget_responsible,'.invoice'),
                                'select_budget_responsible'             => 
'budget_responsible',
                                'lang_select_budget_responsible'=> lang('Select 
B-Responsible'),