Oops. This wasn't supposed to be commited. Going back to 1.32

[squirrelmail.git] / src / vcard.php

diff --git a/src/vcard.php b/src/vcard.php
index 9db7437d4f2c16be9908a119c44aa3c42b11fe2b..ecbaefd1c7ad392dec3debacc9bde6d74f510255 100644 (file)
--- a/src/vcard.php
+++ b/src/vcard.php
@@ -48,8 +48,8 @@ echo '<br><table width="100%" border="0" cellspacing="0" cellpadding="2" ' .
         '<b><center>' .
         _("Viewing a Business Card") . " - ";
 $msg_url = 'read_body.php?mailbox='.urlencode($mailbox).
-    '&amp;startMessage='.$startMessage.
-    '&amp;passed_id='.$passed_id;
+    '&amp;startMessage='.urlencode($startMessage).
+    '&amp;passed_id='.urlencode($passed_id);
 
 $msg_url = set_url_var($msg_url, 'ent_id', 0);
 
@@ -92,9 +92,9 @@ if ($vcard_nice['version'] == '2.1') {
        $vcard_nice['email;internet'] = $vcard_nice['email;pref;internet'];
     }
 } else {
-    echo '<tr><td align=center>vCard Version ' . $vcard_nice['version'] .
-        ' is not supported.  Some information might not be converted ' .
-    "correctly.</td></tr>\n";
+    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";
 }
 
 foreach ($vcard_nice as $k => $v) {
@@ -200,7 +200,7 @@ echo    '</td></tr>' .
         '</td></tr>' .
         '<tr><td align=center>' .
         '<a href="../src/download.php?absolute_dl=true&amp;passed_id=' .
-        $passed_id . '&amp;mailbox=' . urlencode($mailbox) .
+        urlencode($passed_id) . '&amp;mailbox=' . urlencode($mailbox) .
         '&amp;ent_id=' . urlencode($ent_id) . '">' .
         _("Download this as a file") . '</A>' .
         '</TD></TR></TABLE>' .