fixed toggle all link for browsers without JS support. older implementation

[squirrelmail.git] / src / vcard.php

diff --git a/src/vcard.php b/src/vcard.php
index c96dab567ede1657accf722b87142d8c41b4c45d..c09b0945b2dfee9e54a768776e4be02504b72c2a 100644 (file)
--- a/src/vcard.php
+++ b/src/vcard.php
@@ -94,8 +94,11 @@ if ($vcard_nice['version'] == '2.1') {
     }
 } else {
     echo '<tr><td align="center">' .
-         sprintf(_("vCard Version %s is not supported. Some information might not be converted correctly."),$vcard_nice['version']) .
+         sprintf(_("vCard Version %s is not supported. Some information might not be converted correctly."),
+                 htmlspecialchars($vcard_nice['version'])) .
          "</td></tr>\n";
+    $vcard_nice['firstname']='';
+    $vcard_nice['lastname']='';
 }
 
 foreach ($vcard_nice as $k => $v) {
@@ -193,10 +196,12 @@ echo    addSelect('addaddr[label]', $opts, '', TRUE);
 </td></tr>
 <tr><td colspan="2" align="center">
 <?php
-echo addHidden('addaddr[email]', $vcard_nice['email;internet']).
-     addHidden('addaddr[firstname]', $vcard_safe['firstname']).
-     addHidden('addaddr[lastname]', $vcard_safe['lastname']).
-     addSubmit(_("Add to Address Book"), 'addaddr[SUBMIT]');
+if (isset($vcard_nice['email;internet']))
+    echo addHidden('addaddr[email]', $vcard_nice['email;internet']);
+
+echo addHidden('addaddr[firstname]', $vcard_safe['firstname']).
+    addHidden('addaddr[lastname]', $vcard_safe['lastname']).
+    addSubmit(_("Add to Address Book"), 'addaddr[SUBMIT]');
 ?>
 </td></tr>
 </table>