[Phpgroupware-cvs] CVS: projects/inc class.boprojects.inc.php, 1.42.2.5.2.28, 1.42.2.5.2.29 class.uiprojects.inc.php, 1.47.2.7.2.32, 1.47.2.7.2.33

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/projects/inc
In directory subversions:/tmp/cvs-serv10387/inc

Modified Files:
      Tag: Version-0_9_16-branch
        class.boprojects.inc.php class.uiprojects.inc.php 
Log Message:
update

Index: class.boprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.boprojects.inc.php,v
retrieving revision 1.42.2.5.2.28
retrieving revision 1.42.2.5.2.29
diff -C2 -r1.42.2.5.2.28 -r1.42.2.5.2.29
*** class.boprojects.inc.php    11 Sep 2003 02:45:51 -0000      1.42.2.5.2.28
--- class.boprojects.inc.php    11 Sep 2003 21:12:24 -0000      1.42.2.5.2.29
***************
*** 164,171 ****
                        $this->accounts->read_repository();
  
!                       
$cached_data[$this->accounts->data['account_id']]['account_id']                 
= $this->accounts->data['account_id'];
!                       
$cached_data[$this->accounts->data['account_id']]['account_lid']                
= $this->accounts->data['account_lid'];
!                       
$cached_data[$this->accounts->data['account_id']]['account_firstname']  = 
$this->accounts->data['account_firstname'];
!                       
$cached_data[$this->accounts->data['account_id']]['account_lastname']   = 
$this->accounts->data['account_lastname'];
  
                        return $cached_data;
--- 164,171 ----
                        $this->accounts->read_repository();
  
!                       
$cached_data[$this->accounts->data['account_id']]['account_id']         = 
$this->accounts->data['account_id'];
!                       
$cached_data[$this->accounts->data['account_id']]['account_lid']        = 
$this->accounts->data['account_lid'];
!                       
$cached_data[$this->accounts->data['account_id']]['firstname']          = 
$this->accounts->data['firstname'];
!                       
$cached_data[$this->accounts->data['account_id']]['lastname']           = 
$this->accounts->data['lastname'];
  
                        return $cached_data;
***************
*** 342,347 ****
                                                'account_id'            => 
$this->accounts->data['account_id'],
                                                'account_lid'           => 
$this->accounts->data['account_lid'],
!                                               'account_firstname'     => 
$this->accounts->data['account_firstname'],
!                                               'account_lastname'      => 
$this->accounts->data['account_lastname']
                                        );
                                }
--- 342,347 ----
                                                'account_id'            => 
$this->accounts->data['account_id'],
                                                'account_lid'           => 
$this->accounts->data['account_lid'],
!                                               'account_firstname'     => 
$this->accounts->data['firstname'],
!                                               'account_lastname'      => 
$this->accounts->data['lastname']
                                        );
                                }
***************
*** 448,453 ****
                                $cached_data = 
$this->cached_accounts($pro['coordinator']);
                                $coordinatorout = 
$GLOBALS['phpgw']->strip_html($cached_data[$pro['coordinator']]['account_lid']
!                                         . ' [' . 
$cached_data[$pro['coordinator']]['account_firstname'] . ' '
!                                         . 
$cached_data[$pro['coordinator']]['account_lastname'] . ' ]');
                                /*if ($pro['customer'])
                                {
--- 448,453 ----
                                $cached_data = 
$this->cached_accounts($pro['coordinator']);
                                $coordinatorout = 
$GLOBALS['phpgw']->strip_html($cached_data[$pro['coordinator']]['account_lid']
!                                         . ' [' . 
$cached_data[$pro['coordinator']]['firstname'] . ' '
!                                         . 
$cached_data[$pro['coordinator']]['lastname'] . ' ]');
                                /*if ($pro['customer'])
                                {

Index: class.uiprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uiprojects.inc.php,v
retrieving revision 1.47.2.7.2.32
retrieving revision 1.47.2.7.2.33
diff -C2 -r1.47.2.7.2.32 -r1.47.2.7.2.33
*** class.uiprojects.inc.php    11 Sep 2003 02:45:51 -0000      1.47.2.7.2.32
--- class.uiprojects.inc.php    11 Sep 2003 21:12:24 -0000      1.47.2.7.2.33
***************
*** 776,780 ****
                                                $co = 
$GLOBALS['phpgw']->accounts->get_account_data($values['coordinator']);
                                                
$GLOBALS['phpgw']->template->set_var('accountname',$GLOBALS['phpgw']->common->display_fullname($co[$values['coordinator']]['lid'],
!                                                                               
                                                                        
$co[$values['coordinator']]['account_firstname'],$co[$values['coordinator']]['account_lastname']));
                                        }
                                        
$GLOBALS['phpgw']->template->set_var('clisthandle','');
--- 776,780 ----
                                                $co = 
$GLOBALS['phpgw']->accounts->get_account_data($values['coordinator']);
                                                
$GLOBALS['phpgw']->template->set_var('accountname',$GLOBALS['phpgw']->common->display_fullname($co[$values['coordinator']]['lid'],
!                                                                               
                                                                        
$co[$values['coordinator']]['firstname'],$co[$values['coordinator']]['lastname']));
                                        }
                                        
$GLOBALS['phpgw']->template->set_var('clisthandle','');
***************
*** 799,804 ****
                        $abid = $values['customer'];
                        $customer = $this->bo->read_single_contact($abid);
!             if ($customer[0]['org_name'] == '') { $name = 
$customer[0]['n_given'] . ' ' . $customer[0]['n_family']; }
!             else { $name = $customer[0]['org_name'] . ' [ ' . 
$customer[0]['n_given'] . ' ' . $customer[0]['n_family'] . ' ]'; }
  
                        $GLOBALS['phpgw']->template->set_var('name',$name);
--- 799,805 ----
                        $abid = $values['customer'];
                        $customer = $this->bo->read_single_contact($abid);
! 
!                       if ($customer[0]['org_name'] == '') { $name = 
$customer[0]['per_first_name'] . ' ' . $customer[0]['per_last_name']; }
!             else { $name = $customer[0]['org_name'] . ' [ ' . 
$customer[0]['per_first_name'] . ' ' . $customer[0]['per_last_name'] . ' ]'; }
  
                        $GLOBALS['phpgw']->template->set_var('name',$name);