[Phpgroupware-cvs] addressbook/inc class.soaddressbook.inc.php, 1.14.2.3.2.17, 1.14.2.3.2.18 class.boaddressbook.inc.php, 1.21.2.2.2.17, 1.21.2.2.2.18

[Jonathan Rivera <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_16-branch
        class.soaddressbook.inc.php class.boaddressbook.inc.php 
Log Message:
Vcard import now works


Index: class.boaddressbook.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/class.boaddressbook.inc.php,v
retrieving revision 1.21.2.2.2.17
retrieving revision 1.21.2.2.2.18
diff -C2 -d -r1.21.2.2.2.17 -r1.21.2.2.2.18
*** class.boaddressbook.inc.php 26 Oct 2003 03:13:40 -0000      1.21.2.2.2.17
--- class.boaddressbook.inc.php 28 Oct 2003 16:17:45 -0000      1.21.2.2.2.18
***************
*** 317,329 ****
                                $entry['owner'] = 
$GLOBALS['phpgw_info']['user']['account_id'];
                                $entry['access'] = 'private';
!                               $entry['tid'] = 'n';
                                /* _debug_array($entry);exit; */
!                               $this->so->add_entry($entry);
!                               $ab_id = $this->get_lastid();
  
                                /* Delete the temp file. */
                                unlink($filename);
                                unlink($filename . '.info');
!                               Header('Location: ' . 
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.view&ab_id='
 . $ab_id));
                        }
                }
--- 317,331 ----
                                $entry['owner'] = 
$GLOBALS['phpgw_info']['user']['account_id'];
                                $entry['access'] = 'private';
!                               //$entry['tid'] = 'n';
                                /* _debug_array($entry);exit; */
! //                            $this->so->add_entry($entry);
! //                            $ab_id = $this->get_lastid();
  
+                               $ab_id = $this->so->contact_import($entry);
+                               
                                /* Delete the temp file. */
                                unlink($filename);
                                unlink($filename . '.info');
!                               Header('Location: ' . 
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.view_person&ab_id='
 . $ab_id));
                        }
                }

Index: class.soaddressbook.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/class.soaddressbook.inc.php,v
retrieving revision 1.14.2.3.2.17
retrieving revision 1.14.2.3.2.18
diff -C2 -d -r1.14.2.3.2.17 -r1.14.2.3.2.18
*** class.soaddressbook.inc.php 16 Oct 2003 23:14:35 -0000      1.14.2.3.2.17
--- class.soaddressbook.inc.php 28 Oct 2003 16:17:45 -0000      1.14.2.3.2.18
***************
*** 764,768 ****
                }
  
! 
        }
  ?>
--- 764,771 ----
                }
  
!               function contact_import($entry)
!               {
!                       return $this->contacts->contact_import($entry);
!               }
        }
  ?>