[Phpgroupware-cvs] addressbook/inc/export Palm_PDB, 1.4 Multiple_VCard, 1.4 Netscape_LDIF, 1.4 Outlook_CSV_-_Deutsch, 1.4 Outlook_CSV_-_English, 1.4 phpgw_LDIF, 1.4

[skwashd]

Update of addressbook/inc/export

Modified Files:
     Branch: MAIN
            Palm_PDB lines: +1 -1
            Multiple_VCard lines: +1 -1
            Netscape_LDIF lines: +2 -2
            Outlook_CSV_-_Deutsch lines: +1 -1
            Outlook_CSV_-_English lines: +1 -1
            phpgw_LDIF lines: +2 -2

Log Message:
merge from 16

====================================================
Index: addressbook/inc/export/Palm_PDB
diff -u addressbook/inc/export/Palm_PDB:1.3 addressbook/inc/export/Palm_PDB:1.4
--- addressbook/inc/export/Palm_PDB:1.3 Fri Dec 31 04:55:24 2004
+++ addressbook/inc/export/Palm_PDB     Sun May 15 13:34:30 2005
@@ -166,7 +166,7 @@
                        if ($this->export[$name])
                        {
                                $buffer[$this->id][$this->export[$name]] = 
$value;
-                               //echo '<br>'.$this->id.' - 
'.$this->export[$name].': '.$buffer[$this->id][$this->export[$name]];
+                               //echo '<br />'.$this->id.' - 
'.$this->export[$name].': '.$buffer[$this->id][$this->export[$name]];
                        }
                        return $buffer;
                }

====================================================
Index: addressbook/inc/export/Multiple_VCard
diff -u addressbook/inc/export/Multiple_VCard:1.3 
addressbook/inc/export/Multiple_VCard:1.4
--- addressbook/inc/export/Multiple_VCard:1.3   Fri Dec 31 04:55:24 2004
+++ addressbook/inc/export/Multiple_VCard       Sun May 15 13:34:30 2005
@@ -161,7 +161,7 @@
                        if ($this->export[$name] && ($value != '') )
                        {
                                $buffer[$this->id][$this->export[$name]] = 
$value;
-                               /* echo '<br>'.$this->id.' - 
'.$this->export[$name].': '.$buffer[$this->id][$this->export[$name]]; */
+                               /* echo '<br />'.$this->id.' - 
'.$this->export[$name].': '.$buffer[$this->id][$this->export[$name]]; */
                        }
                        return $buffer;
                }

====================================================
Index: addressbook/inc/export/Netscape_LDIF
diff -u addressbook/inc/export/Netscape_LDIF:1.3 
addressbook/inc/export/Netscape_LDIF:1.4
--- addressbook/inc/export/Netscape_LDIF:1.3    Fri Dec 31 04:55:24 2004
+++ addressbook/inc/export/Netscape_LDIF        Sun May 15 13:34:30 2005
@@ -148,7 +148,7 @@
                                         $value = ' '.$value;
                                }
                                $buffer[$this->id][$this->export[$name]] = 
$value;
-                               //echo '<br>'.$this->id.' - 
'.$this->export[$name].': '.$buffer[$this->id][$this->export[$name]];
+                               //echo '<br />'.$this->id.' - 
'.$this->export[$name].': '.$buffer[$this->id][$this->export[$name]];
                        }
                        return $buffer;
                }
@@ -168,7 +168,7 @@
                        {
                                $buffer[$this->id]['xmozillaanyphone']        = 
$buffer[$this->id]['telephonenumber'];
                        }
-                       //echo '<br>'.$this->id.' - '.$buffer[$this->id]['dn'];
+                       //echo '<br />'.$this->id.' - 
'.$buffer[$this->id]['dn'];
                        return $buffer;
                }


====================================================
Index: addressbook/inc/export/Outlook_CSV_-_Deutsch
diff -u addressbook/inc/export/Outlook_CSV_-_Deutsch:1.3 
addressbook/inc/export/Outlook_CSV_-_Deutsch:1.4
--- addressbook/inc/export/Outlook_CSV_-_Deutsch:1.3    Fri Dec 31 04:55:24 2004
+++ addressbook/inc/export/Outlook_CSV_-_Deutsch        Sun May 15 13:34:30 2005
@@ -170,7 +170,7 @@
                        if ($this->export[$name])
                        {
                                $buffer[$this->id][$this->export[$name]] = 
$value;
-                               //echo '<br>'.$this->id.' - 
'.$this->export[$name].': '.$buffer[$this->id][$this->export[$name]];
+                               //echo '<br />'.$this->id.' - 
'.$this->export[$name].': '.$buffer[$this->id][$this->export[$name]];
                        }
                        return $buffer;
                }

====================================================
Index: addressbook/inc/export/Outlook_CSV_-_English
diff -u addressbook/inc/export/Outlook_CSV_-_English:1.3 
addressbook/inc/export/Outlook_CSV_-_English:1.4
--- addressbook/inc/export/Outlook_CSV_-_English:1.3    Fri Dec 31 04:55:24 2004
+++ addressbook/inc/export/Outlook_CSV_-_English        Sun May 15 13:34:30 2005
@@ -173,7 +173,7 @@
                        if ($this->export[$name])
                        {
                                $buffer[$this->id][$this->export[$name]] = 
$value;
-                               //echo '<br>'.$this->id.' - 
'.$this->export[$name].': '.$buffer[$this->id][$this->export[$name]];
+                               //echo '<br />'.$this->id.' - 
'.$this->export[$name].': '.$buffer[$this->id][$this->export[$name]];
                        }
                        return $buffer;
                }

====================================================
Index: addressbook/inc/export/phpgw_LDIF
diff -u addressbook/inc/export/phpgw_LDIF:1.3 
addressbook/inc/export/phpgw_LDIF:1.4
--- addressbook/inc/export/phpgw_LDIF:1.3       Fri Dec 31 04:55:24 2004
+++ addressbook/inc/export/phpgw_LDIF   Sun May 15 13:34:30 2005
@@ -144,7 +144,7 @@
                        if ($this->export[$name] && ($value != '') )
                        {
                                $buffer[$this->id][$this->export[$name]] = 
$value;
-                               //echo '<br>'.$this->id.' - 
'.$this->export[$name].': '.$buffer[$this->id][$this->export[$name]];
+                               //echo '<br />'.$this->id.' - 
'.$this->export[$name].': '.$buffer[$this->id][$this->export[$name]];
                        }
                        return $buffer;
                }
@@ -160,7 +160,7 @@
                        $cn = ereg_replace(',','',$buffer[$this->id]['cn']);
                        $buffer[$this->id]['dn']  = 
'uid='.$buffer[$this->id]['uid'].','.$context;
 //                     $buffer[$this->id]['description'] = 
ereg_replace("\r\n",';',$buffer[$this->id]['description']);
-                       //echo '<br>'.$this->id.' - '.$buffer[$this->id]['dn'];
+                       //echo '<br />'.$this->id.' - 
'.$buffer[$this->id]['dn'];
                        return $buffer;
                }