[Phpgroupware-cvs] CVS: phpgwapi/inc class.contacts_ldap.inc.php,1.11.2.2,1.11.2.3

[Lars Kneschke <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_14-branch
        class.contacts_ldap.inc.php 
Log Message:
added utf8_encode to all fields


Index: class.contacts_ldap.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.contacts_ldap.inc.php,v
retrieving revision 1.11.2.2
retrieving revision 1.11.2.3
diff -C2 -r1.11.2.2 -r1.11.2.3
*** class.contacts_ldap.inc.php 24 Apr 2002 11:51:30 -0000      1.11.2.2
--- class.contacts_ldap.inc.php 23 Mar 2003 10:42:42 -0000      1.11.2.3
***************
*** 197,201 ****
                                
while(list($name,$value)=each($stock_fieldnames))
                                {
!                                       $return_fields[0][$name] = 
$ldap_fields[0][$value][0];
                                }
                        }
--- 197,201 ----
                                
while(list($name,$value)=each($stock_fieldnames))
                                {
!                                       $return_fields[0][$name] = 
utf8_decode($ldap_fields[0][$value][0]);
                                }
                        }
***************
*** 264,268 ****
                                
while(list($name,$value)=each($stock_fieldnames))
                                {
!                                       $return_fields[0][$name] = 
$ldap_fields[0][$value][0];
                                }
                        }
--- 264,268 ----
                                
while(list($name,$value)=each($stock_fieldnames))
                                {
!                                       $return_fields[0][$name] = 
utf8_decode($ldap_fields[0][$value][0]);
                                }
                        }
***************
*** 456,460 ****
                                                while (list($f_name,$f_value) = 
each($stock_fieldnames))
                                                {
!                                                       
$return_fields[$j][$f_name] = $ldap_fields[$i][$f_value][0];
                                                }
                                                reset($stock_fieldnames);
--- 456,460 ----
                                                while (list($f_name,$f_value) = 
each($stock_fieldnames))
                                                {
!                                                       
$return_fields[$j][$f_name] = utf8_decode($ldap_fields[$i][$f_value][0]);
                                                }
                                                reset($stock_fieldnames);
***************
*** 626,630 ****
                                        if ($stock_fields[$name] != '')
                                        {
!                                               $ldap_fields[$value] = 
$stock_fields[$name];
                                        }
                                }
--- 626,630 ----
                                        if ($stock_fields[$name] != '')
                                        {
!                                               $ldap_fields[$value] = 
utf8_encode($stock_fields[$name]);
                                        }
                                }
***************
*** 795,804 ****
                                                {
                                                        /* echo "<br>".$fname." 
=> ".$fvalue." was there"; */
!                                                       $err = 
ldap_modify($this->ldap,$dn,array($fvalue => $stock_fields[$fname]));
                                                }
                                                elseif 
(!$ldap_fields[0][$fvalue] && $stock_fields[$fname])
                                                {
                                                        /* echo "<br>".$fname." 
not there - '".$fvalue."'"; */
!                                                       $err = 
ldap_mod_add($this->ldap,$dn,array($fvalue => $stock_fields[$fname]));
                                                }
                                                elseif 
($ldap_fields[0][$fvalue] && !$stock_fields[$fname])
--- 795,804 ----
                                                {
                                                        /* echo "<br>".$fname." 
=> ".$fvalue." was there"; */
!                                                       $err = 
ldap_modify($this->ldap,$dn,array($fvalue => 
utf8_encode($stock_fields[$fname])));
                                                }
                                                elseif 
(!$ldap_fields[0][$fvalue] && $stock_fields[$fname])
                                                {
                                                        /* echo "<br>".$fname." 
not there - '".$fvalue."'"; */
!                                                       $err = 
ldap_mod_add($this->ldap,$dn,array($fvalue => 
utf8_encode($stock_fields[$fname])));
                                                }
                                                elseif 
($ldap_fields[0][$fvalue] && !$stock_fields[$fname])
***************
*** 912,914 ****
                }
        }
! ?>
--- 912,914 ----
                }
        }
! ?>
\ No newline at end of file