[Phpgroupware-cvs] phpgwapi/inc class.contacts_sql.inc.php, 1.17.2.2.2.31, 1.17.2.2.2.32

[Dave Hall <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_16-branch
        class.contacts_sql.inc.php 
Log Message:
fix some typos, add some error supression, fixed logic in fips ldapSync patch

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.31
retrieving revision 1.17.2.2.2.32
diff -C2 -d -r1.17.2.2.2.31 -r1.17.2.2.2.32
*** class.contacts_sql.inc.php  28 Oct 2003 07:24:07 -0000      1.17.2.2.2.31
--- class.contacts_sql.inc.php  28 Oct 2003 08:29:24 -0000      1.17.2.2.2.32
***************
*** 571,575 ****
                        }
                        
!                       if ($GLOBALS['phpgw_info']['server']['ldap_host'])
                        {
                                $this->LDAPSyncEnabled = true;
--- 571,575 ----
                        }
                        
!                       if 
(!$GLOBALS['phpgw_info']['server']['contact_repository'] == 'ldap')
                        {
                                $this->LDAPSyncEnabled = true;
***************
*** 695,699 ****
                        $return_fields = &$this->db->Record;
  
!                       $return_extra_fields = read_extra_fields(intval($id));
  
                        return array_merge($return_fields,$return_extra_fields);
--- 695,699 ----
                        $return_fields = &$this->db->Record;
  
!                       $return_extra_fields = 
$this->read_extra_fields(intval($id));
  
                        return array_merge($return_fields,$return_extra_fields);
***************
*** 744,748 ****
                        {
                                // we need search for a this communication media
!                               if(array_key_exists($field, $comm_old))
                                {
                                        $comms[] = array($field, 'comm_descr');
--- 744,748 ----
                        {
                                // we need search for a this communication media
!                               if(@array_key_exists($field, $comm_old))
                                {
                                        $comms[] = array($field, 'comm_descr');
***************
*** 754,758 ****
                        {
                                // We'll get first address
!                               if(in_array($field, $adr_old[0]))
                                {
                                        $adr[0] = $adr[0] + $field;
--- 754,758 ----
                        {
                                // We'll get first address
!                               if(@in_array($field, $adr_old[0]))
                                {
                                        $adr[0] = $adr[0] + $field;
***************
*** 760,764 ****
                                }
  
!                               if(in_array($field, $adr_old[1]))
                                {
                                        $adr[1] = $adr[1] + $field;
--- 760,764 ----
                                }
  
!                               if(@in_array($field, $adr_old[1]))
                                {
                                        $adr[1] = $adr[1] + $field;
***************
*** 1056,1060 ****
                function read_extra_fields($id)
                {
!                       $this->requests(array(contact_name,contact_value));
                        $this->criteria(array('other_contact_id' => $id));
                        $sql_select = $this->map['other_contact_id']->select();
--- 1056,1060 ----
                function read_extra_fields($id)
                {
!                       $this->request(array(contact_name,contact_value));
                        $this->criteria(array('other_contact_id' => $id));
                        $sql_select = $this->map['other_contact_id']->select();
***************
*** 1065,1069 ****
                                $return_extra_fields['other_name'] = 
$this->db->f('other_value');
                        }
- 
                        return $return_extra_fields;
                }
--- 1065,1068 ----