[Phpgroupware-cvs] CVS: addressbook/inc class.uiaddressbook.inc.php, 1.36.2.15.2.5, 1.36.2.15.2.6

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/addressbook/inc
In directory subversions:/tmp/cvs-serv28818/inc

Modified Files:
      Tag: Version-0_9_16-branch
        class.uiaddressbook.inc.php 
Log Message:
fixed uiaddressbook::copy to work with register_globals off and made the 
"copied from ..." message translatable


Index: class.uiaddressbook.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/class.uiaddressbook.inc.php,v
retrieving revision 1.36.2.15.2.5
retrieving revision 1.36.2.15.2.6
diff -C2 -r1.36.2.15.2.5 -r1.36.2.15.2.6
*** class.uiaddressbook.inc.php 2 Jul 2003 01:39:38 -0000       1.36.2.15.2.5
--- class.uiaddressbook.inc.php 8 Aug 2003 11:50:33 -0000       1.36.2.15.2.6
***************
*** 579,592 ****
                function copy()
                {
!                       $addnew = $this->bo->read_entry(array('id' => 
$GLOBALS['ab_id'], 'fields' => $this->contacts->stock_contact_fields));
  
!                       $addnew[0]['note'] .= "\nCopied from " . 
$GLOBALS['phpgw']->accounts->id2name($addnew[0]['owner']).", record 
#".$addnew[0]['id'].'.';
!                       $addnew[0]['owner'] = 
$GLOBALS['phpgw_info']['user']['account_id'];
!                       unset($addnew[0]['id']);
!                       $fields = $addnew[0];
  
!                       $ab_id = $this->bo->add_entry($fields);
  
!                       Header('Location: ' . 
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.edit&ab_id='
 . $ab_id));
                }
  
--- 579,594 ----
                function copy()
                {
!                       list($addnew) = $this->bo->read_entry(array(
!                               'id' => $_GET['ab_id'],
!                               'fields' => 
$this->contacts->stock_contact_fields
!                       ));
  
!                       $addnew['note'] .= "\n".lang("Copied by %1, from record 
#%2.",$GLOBALS['phpgw']->accounts->id2name($addnew['owner']),$addnew['id']);
!                       $addnew['owner'] = 
$GLOBALS['phpgw_info']['user']['account_id'];
!                       unset($addnew['id']);
  
!                       $ab_id = $this->bo->add_entry($addnew);
  
!                       
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=addressbook.uiaddressbook.edit&ab_id='
 . $ab_id);
                }