[Phpgroupware-cvs] phpgwapi/setup tables_update.inc.php, 1.53.2.9.2.16, 1.53.2.9.2.17

[Dave Hall <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_16-branch
        tables_update.inc.php 
Log Message:
Fixes for bugs 5144, 5148, 5518 - from eald


Index: tables_update.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/setup/tables_update.inc.php,v
retrieving revision 1.53.2.9.2.16
retrieving revision 1.53.2.9.2.17
diff -C2 -d -r1.53.2.9.2.16 -r1.53.2.9.2.17
*** tables_update.inc.php       9 Sep 2003 23:51:52 -0000       1.53.2.9.2.16
--- tables_update.inc.php       26 Sep 2003 00:03:08 -0000      1.53.2.9.2.17
***************
*** 1084,1098 ****
                // add three columns to ease migration .. delete later
                
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_contact','ab_id',array(
!                       'type' => 'varchar',
                        'precision' => '4',
                        'nullable' => True
                ));
                
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_contact_person','ab_id',array(
!                       'type' => 'varchar',
                        'precision' => '4',
                        'nullable' => True
                ));
                
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_contact_org','ab_id',array(
!                       'type' => 'varchar',
                        'precision' => '4',
                        'nullable' => True
--- 1084,1098 ----
                // add three columns to ease migration .. delete later
                
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_contact','ab_id',array(
!                       'type' => 'int',
                        'precision' => '4',
                        'nullable' => True
                ));
                
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_contact_person','ab_id',array(
!                       'type' => 'int',
                        'precision' => '4',
                        'nullable' => True
                ));
                
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_contact_org','ab_id',array(
!                       'type' => 'int',
                        'precision' => '4',
                        'nullable' => True
***************
*** 1216,1220 ****
                $GLOBALS['phpgw_setup']->oProc->query("SELECT note_type_id FROM 
phpgw_contact_note_type WHERE description='label'");
                  $GLOBALS['phpgw_setup']->oProc->next_record();
!               $note_type_id = 
$GLOBALS['phpgw_setup']->oProc->f('contact_type_id');
                $GLOBALS['phpgw_setup']->oProc->query("SELECT ab.label, 
o.org_id, o.created_on, o.created_by, o.modified_on, o.modified_by FROM 
phpgw_addressbook AS ab 
                        INNER JOIN phpgw_contact_org AS o ON ab.id = o.ab_id 
WHERE NOT (ab.label IS NULL OR ab.label='');");
--- 1216,1220 ----
                $GLOBALS['phpgw_setup']->oProc->query("SELECT note_type_id FROM 
phpgw_contact_note_type WHERE description='label'");
                  $GLOBALS['phpgw_setup']->oProc->next_record();
!               $note_type_id = 
$GLOBALS['phpgw_setup']->oProc->f('note_type_id');
                $GLOBALS['phpgw_setup']->oProc->query("SELECT ab.label, 
o.org_id, o.created_on, o.created_by, o.modified_on, o.modified_by FROM 
phpgw_addressbook AS ab 
                        INNER JOIN phpgw_contact_org AS o ON ab.id = o.ab_id 
WHERE NOT (ab.label IS NULL OR ab.label='');");
***************
*** 1288,1292 ****
                        . ", '" . 
$db1->db_addslashes($GLOBALS['phpgw_setup']->oProc->f('adr_one_countryname')) 
." '"
                        . ", " . intval($GLOBALS['phpgw_setup']->oProc->f('tz'))
!                       . ", " . 
($GLOBALS['phpgw_setup']->oProc->f('addr_type_id') )? 
$GLOBALS['phpgw_setup']->oProc->f('addr_type_id') : $addr_type 
                        . ", " . 
$GLOBALS['phpgw_setup']->oProc->f('created_on') 
                        . ", " . 
$GLOBALS['phpgw_setup']->oProc->f('created_by') 
--- 1288,1292 ----
                        . ", '" . 
$db1->db_addslashes($GLOBALS['phpgw_setup']->oProc->f('adr_one_countryname')) 
." '"
                        . ", " . intval($GLOBALS['phpgw_setup']->oProc->f('tz'))
!                       . ", " . 
($GLOBALS['phpgw_setup']->oProc->f('addr_type_id')? 
$GLOBALS['phpgw_setup']->oProc->f('addr_type_id') : $addr_type)
                        . ", " . 
$GLOBALS['phpgw_setup']->oProc->f('created_on') 
                        . ", " . 
$GLOBALS['phpgw_setup']->oProc->f('created_by') 
***************
*** 1314,1318 ****
                        . ", '" . 
$db1->db_addslashes($GLOBALS['phpgw_setup']->oProc->f('adr_two_countryname')) 
." '"
                        . ", " . intval($GLOBALS['phpgw_setup']->oProc->f('tz'))
!                       . ", " . 
($GLOBALS['phpgw_setup']->oProc->f('addr_type_id')) ? 
$GLOBALS['phpgw_setup']->oProc->f('addr_type_id') : $addr_type
                        . ", " . 
$GLOBALS['phpgw_setup']->oProc->f('created_on') 
                        . ", " . 
$GLOBALS['phpgw_setup']->oProc->f('created_by') 
--- 1314,1318 ----
                        . ", '" . 
$db1->db_addslashes($GLOBALS['phpgw_setup']->oProc->f('adr_two_countryname')) 
." '"
                        . ", " . intval($GLOBALS['phpgw_setup']->oProc->f('tz'))
!                       . ", " . 
($GLOBALS['phpgw_setup']->oProc->f('addr_type_id')? 
$GLOBALS['phpgw_setup']->oProc->f('addr_type_id') : $addr_type)
                        . ", " . 
$GLOBALS['phpgw_setup']->oProc->f('created_on') 
                        . ", " . 
$GLOBALS['phpgw_setup']->oProc->f('created_by')