Minor cleanup

[squirrelmail.git] / src / vcard.php

diff --git a/src/vcard.php b/src/vcard.php
index a0994cff9ddb574b24a2cbaa2c4e53191aa8a7a0..4760c7efc2b8491ff42aec5d574cfff41d8b4f43 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']) .
-       "</td></tr>\n";
+         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) {
@@ -148,11 +151,12 @@ echo '</table>' .
      _("Add to Addressbook") .
      '</td></tr>' .
      '<tr><td align="center">' .
-     addForm('../src/addressbook.php', 'POST', 'f_add') .
+     addForm('../src/addressbook.php', 'post', 'f_add') .
      '<table border="0" cellpadding="2" cellspacing="0" align="center">' .
      '<tr><td align="right"><b>' . _("Nickname:") . '</b></td>' .
-     '<td>'.
-     addInput('addaddr[nickname]', $vcard_safe['firstname'] . '-' . $vcard_safe['lastname'], '20').
+     '<td>' .
+     addInput('addaddr[nickname]', $vcard_safe['firstname'] . '-' .
+             $vcard_safe['lastname'], '20') .
      '</td></tr>' .
      '<tr><td align="right"><b>' . _("Note Field Contains:") . '</b></td><td>' ;
 
@@ -189,26 +193,32 @@ if (isset($vcard_nice['note'])) {
 }
 
 echo    addSelect('addaddr[label]', $opts, '', TRUE);
-echo    '</td></tr>' .
-        '<tr><td colspan="2" align="center">' .
-       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]').
-        '</td></tr>' .
-        '</table>' .
-        '</form>' .
-        '</td></tr>' .
-        '<tr><td align="center">' .
-        '<a href="../src/download.php?absolute_dl=true&amp;passed_id=' .
-            urlencode($passed_id) . '&amp;mailbox=' . urlencode($mailbox) .
-            '&amp;ent_id=' . urlencode($ent_id) . '">' .
-        _("Download this as a file") . '</a>' .
-        '</td></tr></table>' .
-
-        '<table border="0" cellspacing="0" cellpadding="2" align="center">' .
-        '<tr><td bgcolor="' . $color[4] . '">' .
-        '</td></tr></table>' .
-        '</body></html>';
-
-?>
\ No newline at end of file
+?>
+</td></tr>
+<tr><td colspan="2" align="center">
+<?php
+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>
+</form>
+</td></tr>
+<tr><td align="center">
+<?php
+echo '<a href="../src/download.php?absolute_dl=true&amp;passed_id='.
+     urlencode($passed_id) . '&amp;mailbox=' . urlencode($mailbox) .
+     '&amp;ent_id=' . urlencode($ent_id) .'">'.
+     _("Download this as a file") . '</a>';
+?>
+</td></tr></table>
+
+<table border="0" cellspacing="0" cellpadding="2" align="center">
+<tr><td bgcolor="<?php echo $color[4]; ?>">
+</td></tr></table>
+</body></html>