X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fvcard.php;h=c96dab567ede1657accf722b87142d8c41b4c45d;hb=7fcab811a919289459e616f0e47388c1cb27195a;hp=9db7437d4f2c16be9908a119c44aa3c42b11fe2b;hpb=64c9e87e68537c4a9a2a20d4d75ea369f0c4a8e1;p=squirrelmail.git

diff --git a/src/vcard.php b/src/vcard.php
index 9db7437d..c96dab56 100644
--- a/src/vcard.php
+++ b/src/vcard.php
@@ -42,14 +42,15 @@ sqimap_mailbox_select($imapConnection, $mailbox);
 
 displayPageHeader($color, 'None');
 
-echo '<br><table width="100%" border="0" cellspacing="0" cellpadding="2" ' .
-            'align="center">' . "\n" .
-        '<tr><td bgcolor="' . $color[0] . '">' .
-        '<b><center>' .
-        _("Viewing a Business Card") . " - ";
+echo '<br /><table width="100%" border="0" cellspacing="0" cellpadding="2" ' .
+        'align="center">' . "\n" .
+     '<tr><td bgcolor="' . $color[0] . '">' .
+     '<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 +93,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) {
@@ -116,8 +117,8 @@ $ShowValues = array(
     'tel;fax' =>        _("Fax"),
     'note' =>           _("Note"));
 
-echo '<tr><td><br>' .
-        '<TABLE border=0 cellpadding=2 cellspacing=0 align=center>' . "\n";
+echo '<tr><td><br />' .
+     '<table border="0" cellpadding="2" cellspacing="0" align="center">' . "\n";
 
 if (isset($vcard_safe['email;internet'])) {
     $vcard_safe['email;internet'] = makeComposeLink('src/compose.php?send_to='.urlencode($vcard_safe['email;internet']),
@@ -125,35 +126,35 @@ if (isset($vcard_safe['email;internet'])) {
 }
 
 if (isset($vcard_safe['url'])) {
-    $vcard_safe['url'] = '<A HREF="' . $vcard_safe['url'] . '">' .
-        $vcard_safe['url'] . '</A>';
+    $vcard_safe['url'] = '<a href="' . $vcard_safe['url'] . '">' .
+        $vcard_safe['url'] . '</a>';
 }
 
 foreach ($ShowValues as $k => $v) {
     if (isset($vcard_safe[$k]) && $vcard_safe[$k])     {
-        echo "<tr><td align=right><b>$v:</b></td><td>" . $vcard_safe[$k] .
+        echo "<tr><td align=\"right\"><b>$v:</b></td><td>" . $vcard_safe[$k] .
                 "</td><tr>\n";
     }
 }
 
 echo '</table>' .
-        '<br>' .
-        '</td></tr></table>' .
-        '<table width="100%" border="0" cellspacing="0" cellpadding="2" ' .
+     '<br />' .
+     '</td></tr></table>' .
+     '<table width="100%" border="0" cellspacing="0" cellpadding="2" ' .
         'align="center">' .
-        '<tr>' .
-        '<td bgcolor="' . $color[0] . '">' .
-        '<b><center>' .
-        _("Add to Addressbook") .
-        '</td></tr>' .
-        '<tr><td align=center>' .
-	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></tr>' .
-        '<tr><td align=right><b>Note Field Contains:</b></td><td>' ;
+     '<tr>' .
+     '<td bgcolor="' . $color[0] . '">' .
+     '<b><center>' .
+     _("Add to Addressbook") .
+     '</td></tr>' .
+     '<tr><td align="center">' .
+     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></tr>' .
+     '<tr><td align="right"><b>' . _("Note Field Contains:") . '</b></td><td>' ;
 
 $opts = array();
 if (isset($vcard_nice['url'])) {
@@ -188,26 +189,29 @@ 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=' .
-        $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>';
-
 ?>
+</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]');
+?>
+</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>