[Phpgroupware-cvs] phpgwapi/setup tables_update.inc.php, 1.53.2.9.2.28, 1.53.2.9.2.29

[Alejandro Borges (lex) <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/setup
In directory subversions:/tmp/cvs-serv4523/setup

Modified Files:
      Tag: Version-0_9_16-branch
        tables_update.inc.php 
Log Message:
Fixes 6931


Index: tables_update.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/setup/tables_update.inc.php,v
retrieving revision 1.53.2.9.2.28
retrieving revision 1.53.2.9.2.29
diff -C2 -d -r1.53.2.9.2.28 -r1.53.2.9.2.29
*** tables_update.inc.php       3 Dec 2003 01:26:58 -0000       1.53.2.9.2.28
--- tables_update.inc.php       3 Dec 2003 19:25:06 -0000       1.53.2.9.2.29
***************
*** 1287,1293 ****
                                }
  
!                               if($data['addr_one_stret'] || 
$data['adr_one_locality'] || $data['adr_one_region'] || 
$data['adr_one_postalcode'] || $data['adr_one_countryname'])
                                {
!                                       
$GLOBALS['phpgw_setup']->db->query("INSERT INTO phpgw_contact_addr 
(contact_id,add1,add2,add3,
                                        city, state, postal_code, country, tz, 
addr_type_id,
                                        
created_on,created_by,modified_on,modified_by) VALUES (" 
--- 1287,1294 ----
                                }
  
!                               if($data['addr_one_stret']!='' || 
$data['adr_one_locality']!='' || $data['adr_one_region']!='' || 
$data['adr_one_postalcode']!='' || $data['adr_one_countryname']!='')
                                {
!                                       $addr_preferred = 'Y';
!                                       
$GLOBALS['phpgw_setup']->db->query("INSERT INTO phpgw_contact_addr 
(contact_id,add1,add2,add3,preferred,
                                        city, state, postal_code, country, tz, 
addr_type_id,
                                        
created_on,created_by,modified_on,modified_by) VALUES (" 
***************
*** 1296,1299 ****
--- 1297,1301 ----
                                                    . ", '" . 
$GLOBALS['phpgw_setup']->db->db_addslashes($others[$key]['address2']['value']) 
." '"
                                                    . ", '" . 
$GLOBALS['phpgw_setup']->db->db_addslashes($others[$key]['address3']['value']) 
." '"
+                                                   . ", '" . $addr_preferred . 
" '"
                                                    . ", '" . 
$GLOBALS['phpgw_setup']->db->db_addslashes($data['adr_one_locality']) ." '"
                                                    . ", '" . 
$GLOBALS['phpgw_setup']->db->db_addslashes($data['adr_one_region']) ." '"
***************
*** 1309,1319 ****
                                }
  
!                               if($data['addr_two_stret'] || 
$data['adr_two_locality'] || $data['adr_two_region'] || 
$data['adr_two_postalcode'] || $data['adr_two_countryname'])
                                {
!                                       
$GLOBALS['phpgw_setup']->db->query("INSERT INTO phpgw_contact_addr 
(contact_id,add1,
                                        city, state, postal_code, country, tz, 
addr_type_id,
                                        
created_on,created_by,modified_on,modified_by) VALUES (" 
                                                    . $person_id 
                                                    . ", '" . 
$GLOBALS['phpgw_setup']->db->db_addslashes($data['adr_two_street']) ." '"
                                                    . ", '" . 
$GLOBALS['phpgw_setup']->db->db_addslashes($data['adr_two_locality']) ." '"
                                                    . ", '" . 
$GLOBALS['phpgw_setup']->db->db_addslashes($data['adr_two_region']) ." '"
--- 1311,1323 ----
                                }
  
!                               if($data['addr_two_stret']!='' || 
$data['adr_two_locality']!='' || $data['adr_two_region']!='' || 
$data['adr_two_postalcode']!='' || $data['adr_two_countryname']!='')
                                {
!                                       $addr_preferred = 
$addr_preferred=='Y'?'N':'Y';                                 
!                                       
$GLOBALS['phpgw_setup']->db->query("INSERT INTO phpgw_contact_addr 
(contact_id,add1,preferred,
                                        city, state, postal_code, country, tz, 
addr_type_id,
                                        
created_on,created_by,modified_on,modified_by) VALUES (" 
                                                    . $person_id 
                                                    . ", '" . 
$GLOBALS['phpgw_setup']->db->db_addslashes($data['adr_two_street']) ." '"
+                                                   . ", '" . $addr_preferred . 
" '"
                                                    . ", '" . 
$GLOBALS['phpgw_setup']->db->db_addslashes($data['adr_two_locality']) ." '"
                                                    . ", '" . 
$GLOBALS['phpgw_setup']->db->db_addslashes($data['adr_two_region']) ." '"
***************
*** 1321,1325 ****
                                                    . ", '" . 
$GLOBALS['phpgw_setup']->db->db_addslashes($data['adr_two_countryname']) ." '"
                                                    . ", " . intval($data['tz'])
!                                                   . ", " . $addr_work_type
                                                    . ", " . $time 
                                                    . ", " . $data['owner'] 
--- 1325,1329 ----
                                                    . ", '" . 
$GLOBALS['phpgw_setup']->db->db_addslashes($data['adr_two_countryname']) ." '"
                                                    . ", " . intval($data['tz'])
!                                                   . ", " . $addr_home_type
                                                    . ", " . $time 
                                                    . ", " . $data['owner']