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

[nomail]

Update of /phpgwapi/inc
Modified Files:
        Branch: Version-0_9_16-branch
          class.contacts_sql.inc.php

date: 2004/06/17 09:11:15;  author: fipsfuchs;  state: Exp;  lines: +15 -16

Log Message:
better field mapping - thx to skwashd
=====================================================================
Index: phpgwapi/inc/class.contacts_sql.inc.php
diff -u phpgwapi/inc/class.contacts_sql.inc.php:1.17.2.2.2.61 
phpgwapi/inc/class.contacts_sql.inc.php:1.17.2.2.2.62
--- phpgwapi/inc/class.contacts_sql.inc.php:1.17.2.2.2.61       Tue Apr 13 
22:42:29 2004
+++ phpgwapi/inc/class.contacts_sql.inc.php     Thu Jun 17 09:11:15 2004
@@ -3824,40 +3824,39 @@
                        $dn = 'uid=' . $uid.',' . 
$GLOBALS['phpgw_info']['server']['ldap_contact_context'];
 
                        /* Requerid attributes */
-                       $attributes['objectClass'][]                    = 
'person';
-                       $attributes['objectClass'][]                    = 
'organizationalPerson';
-                       $attributes['objectClass'][]                    = 
'inetOrgPerson';
-                       $attributes['cn'][]                             = 
utf8_encode($person[0]['per_full_name']);
-                       $attributes['sn'][]                             = 
utf8_encode($person[0]['per_full_name']);
+                       $attributes['objectClass'][]            = 'person';
+                       $attributes['objectClass'][]            = 
'organizationalPerson';
+                       $attributes['objectClass'][]            = 
'inetOrgPerson';
+                       $attributes['cn'][]                     = 
utf8_encode($person[0]['per_full_name']);
+                       $attributes['sn'][]                     = 
utf8_encode($person[0]['per_last_name']);
                        /* Optional attributes */
-                       $attributes['uid'][]                            = 
utf8_encode($uid);
+                       $attributes['uid'][]                    = 
utf8_encode($uid);
                        if($person[0]['org_name'])
                        {
-                               $attributes['o'][]                              
= utf8_encode($person[0]['org_name']);
+                               $attributes['o'][]              = 
utf8_encode($person[0]['org_name']);
                        }
                        if($person[0]['per_title'])
                        {
-                               $attributes['title'][]                          
= utf8_encode($person[0]['per_title']);
+                               $attributes['title'][]          = 
utf8_encode($person[0]['per_title']);
                        }
                        if($person[0]['per_first_name'])
                        {
-                               $attributes['displayName'][]                    
= utf8_encode($person[0]['per_first_name']);
+                               $attributes['givenName'][]      = 
utf8_encode($person[0]['per_first_name']);
                        }
-                       if($person[0]['per_last_name'])
+                       /*if($person[0]['per_last_name'])
                        {
-                               $attributes['givenName'][]                      
= utf8_encode($person[0]['per_last_name']);
-                       }
+                       }*/
                        if($person[0]['per_initials'])
                        {
-                               $attributes['initials'][]                       
= utf8_encode($person[0]['per_initials']);
+                               $attributes['initials'][]       = 
utf8_encode($person[0]['per_initials']);
                        }
                        if($person[0]['per_department'])
                        {
-                               $attributes['ou'][]                             
= utf8_encode($person[0]['per_department']);
+                               $attributes['ou'][]             = 
utf8_encode($person[0]['per_department']);
                        }
                        if($person[0]['contact_id'])
                        {
-                               $attributes['employeeNumber'][]                 
= utf8_encode($person[0]['contact_id']);
+                               $attributes['employeeNumber'][] = 
utf8_encode($person[0]['contact_id']);
                        }
 
                        unset($person);