[Phpgroupware-cvs] phpgwapi/inc class.contacts_sql.inc.php, 1.17.2.2.2.24, 1.17.2.2.2.25

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

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv3483/inc

Modified Files:
      Tag: Version-0_9_16-branch
        class.contacts_sql.inc.php 
Log Message:
Minor bugfixes from eald



Index: class.contacts_sql.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.contacts_sql.inc.php,v
retrieving revision 1.17.2.2.2.24
retrieving revision 1.17.2.2.2.25
diff -C2 -d -r1.17.2.2.2.24 -r1.17.2.2.2.25
*** class.contacts_sql.inc.php  21 Oct 2003 01:08:14 -0000      1.17.2.2.2.24
--- class.contacts_sql.inc.php  21 Oct 2003 01:57:53 -0000      1.17.2.2.2.25
***************
*** 3278,3282 ****
                function contact_import($fields, $type = '')
                {
!                       if((isset($fields['first_name']) && 
!isset($fields['org_name'])) || $type == $this->_contact_person)
                        {
                                $contact['contact_id']          = 
$fields['contact_id'];
--- 3278,3283 ----
                function contact_import($fields, $type = '')
                {
!                       $type = empty($type) ? 
$this->search_contact_type($this->_contact_person) : $type;
!                       if((isset($fields['first_name']) && 
!isset($fields['org_name'])) || $type)
                        {
                                $contact['contact_id']          = 
$fields['contact_id'];
***************
*** 3402,3406 ****
                                {
                                        $description_id = 
$this->search_comm_descr($description_input);
!                                       if(!empty($comm_description))
                                        {
                                                $comm['comm_descr']     = 
$description_id;
--- 3403,3407 ----
                                {
                                        $description_id = 
$this->search_comm_descr($description_input);
!                                       if(!empty($description_id))
                                        {
                                                $comm['comm_descr']     = 
$description_id;
***************
*** 3427,3431 ****
                        }
                        // FIXME: Jarg needs to check this
!                       $this->add_contact($type, $contact, $comm_media, 
$locations, $categories, $others, $contact['relations']);
                        return $contact;
                }
--- 3428,3432 ----
                        }
                        // FIXME: Jarg needs to check this
!                       $this->add_contact($type, $contact, $comm_media, 
$locations, $contact['categories'], $others, $contact['relations']);
                        return $contact;
                }