Revision: 3722
http://covide.svn.sourceforge.net/covide/?rev=3722&view=rev
Author: mvanbaak
Date: 2008-03-07 03:52:52 -0800 (Fri, 07 Mar 2008)
Log Message:
-----------
Merged revisions 3718,3721 via svnmerge from
https://covide.svn.sourceforge.net/svnroot/covide/branches/covide-stable
........
r3718 | mvanbaak | 2008-03-06 14:26:46 +0100 (Thu, 06 Mar 2008) | 2 lines
htmlentities with UTF-8 detection in select option values.
........
r3721 | mvanbaak | 2008-03-07 12:48:27 +0100 (Fri, 07 Mar 2008) | 2 lines
added even more fields to businesscard import
........
Modified Paths:
--------------
trunk/classes/address/inc/show_import_step2.php
trunk/classes/tpl/inc/handleFormData.php
Property Changed:
----------------
trunk/
Property changes on: trunk
___________________________________________________________________
Name: svnmerge-integrated
- /branches/covide-stable:1-3087,3089-3349,3351-3501,3503-3515,3517-3523,3527-3531,3533-3534,3536-3618,3620-3634,3636-3661,3663-3713
+ /branches/covide-stable:1-3087,3089-3349,3351-3501,3503-3515,3517-3523,3527-3531,3533-3534,3536-3618,3620-3634,3636-3661,3663-3721
Modified: trunk/classes/address/inc/show_import_step2.php
===================================================================
--- trunk/classes/address/inc/show_import_step2.php 2008-03-07 11:48:27 UTC (rev 3721)
+++ trunk/classes/address/inc/show_import_step2.php 2008-03-07 11:52:52 UTC (rev 3722)
@@ -51,6 +51,20 @@
"personal_zipcode" => "p: ".gettext("zipcode"),
"personal_city" => "p: ".gettext("city")
),
+ gettext("other address fields") => array(
+ "other_phone_nr" => "o: ".gettext("telephone number"),
+ "other_fax_nr" => "o: ".gettext("fax number"),
+ "other_mobile_nr" => "o: ".gettext("mobile phone number"),
+ "other_email" => "o: ".gettext("email"),
+ "other_address" => "o: ".gettext("address"),
+ "other_zipcode" => "o: ".gettext("zipcode"),
+ "other_city" => "o: ".gettext("city")
+ ),
+ gettext("pobox fields") => array(
+ "pobox" => gettext("pobox"),
+ "pobox_zipcode" => gettext("zipcode"),
+ "pobox_city" => gettext("city")
+ ),
gettext("contact fields") => array(
"initials" => gettext("initials"),
"givenname" => gettext("given name"),
Modified: trunk/classes/tpl/inc/handleFormData.php
===================================================================
--- trunk/classes/tpl/inc/handleFormData.php 2008-03-07 11:48:27 UTC (rev 3721)
+++ trunk/classes/tpl/inc/handleFormData.php 2008-03-07 11:52:52 UTC (rev 3722)
@@ -183,7 +183,7 @@
$seltemp = explode("\n", $formitem["field_value"]);
$sel = array();
foreach ($seltemp as $vv) {
- $sel[$vv] = $vv;
+ $sel[htmlentities($vv, ENT_NOQUOTES, "UTF-8")] = $vv;
}
$tbl->addSelectField(sprintf("data[%s]", $formitem["field_name"]), $sel, array(
"style" => "text-align: left;"
@@ -316,4 +316,4 @@
$tbl->endTableData();
$tbl->endTableRow();
$tbl->endTable();
-?>
\ No newline at end of file
+?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|