[Phpgroupware-cvs] addressbook/csv_import.php, 1.4.2.6.2.5

[nomail]

Update of /addressbook
Modified Files:
        Branch: Version-0_9_16-branch
          csv_import.php

date: 2004/11/06 16:13:49;  author: powerstat;  state: Exp;  lines: +9 -9

Log Message:
replaced <br> with <br /> and <hr> with <hr /> for better w3c compatibility
=====================================================================
Index: addressbook/csv_import.php
diff -u addressbook/csv_import.php:1.4.2.6.2.4 
addressbook/csv_import.php:1.4.2.6.2.5
--- addressbook/csv_import.php:1.4.2.6.2.4      Sun Oct 26 04:50:42 2003
+++ addressbook/csv_import.php  Sat Nov  6 16:13:49 2004
@@ -180,33 +180,33 @@
                        $hiddenvars .= '<input type="hidden" name="csvfile" 
value="'.$csvfile.'">';
                        $mktime_lotus = "${PSep}0?([0-9]+)[ .:-]+0?([0-9]*)[ 
.:-]+0?([0-9]*)[ .:-]+0?([0-9]*)[ .:-]+0?([0-9]*)[ 
.:-]+0?([0-9]*)address@hidden(${VPre}4,${VPre}5,${VPre}6,${VPre}2,${VPre}3,${VPre}1)";
                        $help_on_trans = "<a name=\"help\"></a><b>How to use 
Translation's</b><p>".
-                               "Translations enable you to change / adapt the 
content of each CSV field for your needs. <br>".
-                               "General syntax is: <b>pattern1 ${ASep} 
replacement1 ${PSep} ... ${PSep} patternN ${ASep} replacementN</b><br>".
+                               "Translations enable you to change / adapt the 
content of each CSV field for your needs. <br />".
+                               "General syntax is: <b>pattern1 ${ASep} 
replacement1 ${PSep} ... ${PSep} patternN ${ASep} replacementN</b><br />".
                                "If the pattern-part of a pair is ommited it 
will match everything ('^.*$'), which is only ".
                                "usefull for the last pair, as they are worked 
from left to right.<p>".
-                               "First example: 
<b>1${ASep}private${PSep}public</b><br>".
+                               "First example: 
<b>1${ASep}private${PSep}public</b><br />".
                                "This will translate a '1' in the CSV field to 
'privat' and everything else to 'public'.<p>".
                                "Patterns as well as the replacement can be 
regular expressions (the replacement is done via ereg_replace). ".
                                "If, after all replacements, the value starts 
with an '@' the whole value is eval()'ed, so you ".
                                "may use all php, phpgw plus your own 
functions. This is quiet powerfull, but <u>circumvents all ACL</u>.<p>".
-                               "Example using regular expressions and 
'@'-eval(): <br><b>$mktime_lotus</b><br>".
+                               "Example using regular expressions and 
'@'-eval(): <br /><b>$mktime_lotus</b><br />".
                                "It will read a date of the form '2001-05-20 
08:00:00.00000000000000000' (and many more, see the regular expr.). ".
                                "The&nbsp;[&nbsp;.:-]-separated fields are read 
and assigned in different order to @mktime(). Please note to use ".
                                "${VPre} insted of a backslash (I couldn't get 
backslash through all the involved templates and forms.) ".
                                "plus the field-number of the pattern.<p>".
                                "In addintion to the fields assign by the 
pattern of the reg.exp. you can use all other CSV-fields, with the ".
-                               "syntax <b>${CPre}CSV-FIELDNAME$CPos</b>. Here 
is an example: <br>".
-                               "<b>.+$ASep${CPre}Company$CPos: 
${CPre}NFamily$CPos, ${CPre}NGiven$CPos$PSep${CPre}NFamily$CPos, 
${CPre}NGiven$CPos</b><br>".
+                               "syntax <b>${CPre}CSV-FIELDNAME$CPos</b>. Here 
is an example: <br />".
+                               "<b>.+$ASep${CPre}Company$CPos: 
${CPre}NFamily$CPos, ${CPre}NGiven$CPos$PSep${CPre}NFamily$CPos, 
${CPre}NGiven$CPos</b><br />".
                                "It is used on the CSV-field 'Company' and 
constructs a something like <i>Company: FamilyName, GivenName</i> or ".
                                "<i>FamilyName, GivenName</i> if 'Company' is 
empty.<p>".
                                "You can use the 'No CSV #'-fields to assign 
csv-values to more than on field, the following example uses the ".
                                "csv-field 'Note' (which gots already assingned 
to the description) and construct a short subject: ".
                                "<b>@substr(${CPre}Note$CPos,0,60).' 
...'</b><p>".
-                               "Their is one important user-function for the 
Info Log:<br>".
+                               "Their is one important user-function for the 
Info Log:<br />".
                                
"<b>@addr_id(${CPre}NFamily$CPos,${CPre}NGiven$CPos,${CPre}Company$CPos)</b> ".
                                "searches the addressbook for an address and 
returns the id if it founds an exact match of at least ".
                                "<i>NFamily</i> AND (<i>NGiven</i> OR 
<i>Company</i>). This is necessary to link your imported InfoLog-entrys ".
-                               "with the addressbook.<br>".
+                               "with the addressbook.<br />".
                                "<b>@cat_id(Cat1,...,CatN)</b> returns a 
(','-separated) list with the cat_id's. If a category isn't found, it ".
                                "will be automaticaly added.<p>".
                                "I hope that helped to understand the features, 
if not <a href='mailto:address@hidden'>ask</a>.";