[bugs] [Bug 1285] Changed - Carriage Return Line Feed supposed to be only line feed in multiline entries in LDAP

[bugs at bugs.horde.org]

http://bugs.horde.org/show_bug.cgi?id=1285

*** shadow/1285	Tue Jun 17 16:43:24 2003
--- shadow/1285.tmp.18249	Tue Jun 17 16:45:17 2003
***************
*** 23,25 ****
--- 23,60 ----
  
  Patch for Turba 1.2 AND CVS HEAD
  
+ 
+ ------- Additional Comments From urkle at drip.ws  06/17/03 16:45 -------
+ CVS HEAD Patch
+ --- ldap.php.orig	Fri Jun 13 10:21:15 2003
+ +++ ldap.php	Tue Jun 17 14:41:25 2003
+ @@ -302,10 +302,10 @@
+          // Don't add empty attributes.
+          $attributes = array_filter($attributes, array($this,
+ 'cleanEmptyAttributes'));
+  
+ -        // Encode entries.
+ +        // Encode entries & do CRLF to LF conversion
+          foreach ($attributes as $key => $val) {
+              if (!is_array($val)) {
+ -                $attributes[$key] = String::convertCharset($val,
+ NLS::getCharset(), $this->charset);
+ +                $attributes[$key] =
+ String::convertCharset(str_replace("\r\n",\n",$val), NLS::getCharset(),
+ $this->charset);
+              }
+          }
+  
+ @@ -377,7 +377,7 @@
+          // Encode entries.
+          foreach ($attributes as $key => $val) {
+              if (!is_array($val)) {
+ -                $attributes[$key] = String::convertCharset($val,
+ NLS::getCharset(), $this->charset);
+ +                $attributes[$key] =
+ String::convertCharset(str_replace("\r\n","\n",$val), NLS::getCharset(),
+ $this->charset);
+              }
+          }
+  
+