[Phpgroupware-cvs] addressbook/inc/import Import_from_Outlook_-_English, 1.4 Import_from_Outlook_-_Deutsch, 1.4 Import_Multiple_VCard, 1.4

[skwashd]

Update of addressbook/inc/import

Modified Files:
     Branch: MAIN
            Import_from_Outlook_-_English lines: +1 -1
            Import_from_Outlook_-_Deutsch lines: +5 -5
            Import_Multiple_VCard lines: +1 -1

Log Message:
merge from 16

====================================================
Index: addressbook/inc/import/Import_from_Outlook_-_English
diff -u addressbook/inc/import/Import_from_Outlook_-_English:1.3 
addressbook/inc/import/Import_from_Outlook_-_English:1.4
--- addressbook/inc/import/Import_from_Outlook_-_English:1.3    Fri Dec 31 
04:55:24 2004
+++ addressbook/inc/import/Import_from_Outlook_-_English        Sun May 15 
13:34:30 2005
@@ -127,7 +127,7 @@
                function import_new_attrib($buffer,$name,$value)
                {
                        $value = trim($value);
-                       $value = str_replace('\n','<BR>',$value);
+                       $value = str_replace('\n','<br />',$value);
                        $value = str_replace('\r','',$value);

                        $method = $name[0];

====================================================
Index: addressbook/inc/import/Import_from_Outlook_-_Deutsch
diff -u addressbook/inc/import/Import_from_Outlook_-_Deutsch:1.3 
addressbook/inc/import/Import_from_Outlook_-_Deutsch:1.4
--- addressbook/inc/import/Import_from_Outlook_-_Deutsch:1.3    Fri Dec 31 
04:55:24 2004
+++ addressbook/inc/import/Import_from_Outlook_-_Deutsch        Sun May 15 
13:34:30 2005
@@ -136,7 +136,7 @@
                function import_new_attrib($buffer,$name,$value)
                {
                        $value = trim($value);
-                       $value = str_replace('\n','<BR>',$value);
+                       $value = str_replace('\n','<br />',$value);
                        $value = str_replace('\r','',$value);
 //                     $this->currentrecord += array($name => $value);

@@ -155,7 +155,7 @@
 //                     while ( list($name, $value) = 
each($this->currentrecord))
 //                     {
 //                             $buffer[$this->id][$name] = $value;
-//                             //echo '<br>'.$name.' => '.$value;
+//                             //echo '<br />'.$name.' => '.$value;
 //                     }
 //                     return $buffer;

@@ -180,19 +180,19 @@
                        return lang('Successfully imported %1 records into your 
addressbook.',$num);

 //                     $contacts = CreateObject('phpgwapi.contacts');
-//                     //echo '<br>';
+//                     //echo '<br />';
 //                     for ($i=1;$i<=count($buffer);$i++)
 //                     {
 //                             while ( list($name,$value) = @each($buffer[$i]) 
)
 //                             {
-//                                     //echo '<br>'.$i.': '.$name.' => 
'.$value;
+//                                     //echo '<br />'.$i.': '.$name.' => 
'.$value;
 //                                     $entry[$i][$name] = $value;
 //                             }
 //                             $entry[$i]['email_type']      = 'INTERNET';
 //                             $entry[$i]['email_home_type'] = 'INTERNET';
 //                             $entry[$i]['adr_one_type']    = 'intl';
 //                             $entry[$i]['adr_two_type']    = 'intl';
-//                             //echo '<br>';
+//                             //echo '<br />';
 //                             
$contacts->add($GLOBALS['phpgw_info']['user']['account_id'],$entry[$i],$access,$cat_id);
 //                     }
 //                     $num = $i - 1;

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