X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fvcard.php;h=21b5133861802312ba463d9d5d6a5c76b39d9dec;hp=46207d5c5f427014b1efba91f421a5e452be27d6;hb=24d1619523e7005477feb74d9a54da6a0efc58a6;hpb=b3494a627ff4dc90067a0511e42b65858171fa40;ds=sidebyside

diff --git a/src/vcard.php b/src/vcard.php
index 46207d5c..21b51338 100644
--- a/src/vcard.php
+++ b/src/vcard.php
@@ -23,29 +23,22 @@ sqimap_mailbox_select($imapConnection, $mailbox);
 
 displayPageHeader($color, 'None');
 
-echo '<br>' .
-    html_tag( 'table', '', 'center', '', 'width="100%" border="0" cellspacing="0" cellpadding="2"' ) ."\n" .
-    html_tag( 'tr' ) . "\n" .
-    html_tag( 'td', '', 'left', $color[0] ) .
+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") . ' - ';
-if (isset($where) && isset($what)) {
-    // from a search
-    echo '<a href="../src/read_body.php?mailbox=' . urlencode($mailbox) .
-            '&amp;passed_id=' . $passed_id . '&amp;where=' . urlencode($where) .
-            '&amp;what=' . urlencode($what). '">' . _("View message") . '</a>';
-} else {
-    echo '<a href="../src/read_body.php?mailbox=' . urlencode($mailbox) .
-        '&amp;passed_id=' . $passed_id . '&amp;startMessage=' . $startMessage .
-        '&amp;show_more=0">' . _("View message") . '</a>';
-}
+        _("Viewing a Business Card") . " - ";
+$msg_url = 'read_body.php?' . $QUERY_STRING;
+$msg_url = set_url_var($msg_url, 'ent_id', 0);
+echo '<a href="'.$msg_url.'">'. _("View message") . '</a>';
+
 echo '</center></b></td></tr>';
 
 $message = sqimap_get_message($imapConnection, $passed_id, $mailbox);
 
-$entity_vcard = getEntity($message,$passed_ent_id);
+$entity_vcard = getEntity($message,$ent_id);
 
-$vcard = mime_fetch_body ($imapConnection, $passed_id, $passed_ent_id);
+$vcard = mime_fetch_body ($imapConnection, $passed_id, $ent_id);
 $vcard = decodeBody($vcard, $entity_vcard->header->encoding);
 $vcard = explode ("\n",$vcard);
 foreach ($vcard as $l) {
@@ -71,12 +64,9 @@ if ($vcard_nice['version'] == '2.1') {
     $vcard_nice["lastname"] = substr($vcard_nice["n"], 0,
         strpos($vcard_nice["n"], "\n"));
 } else {
-    echo html_tag( 'tr',
-               html_tag( 'td', 'vCard Version ' . $vcard_nice['version'] .
-                    ' is not supported.  Some information might not be converted ' .
-                    'correctly.' ,
-               'center' )
-           ) . "\n";
+    echo '<tr><td align=center>vCard Version ' . $vcard_nice['version'] .
+        ' is not supported.  Some information might not be converted ' .
+    "correctly.</td></tr>\n";
 }
 
 foreach ($vcard_nice as $k => $v) {
@@ -98,53 +88,43 @@ $ShowValues = array(
     'tel;fax' =>        _("Fax"),
     'note' =>           _("Note"));
 
-echo html_tag( 'tr' ) . html_tag( 'td', '', 'left' ) . '<br>' .
-        html_tag( 'table', '', 'center', '', 'border="0" cellpadding="2" cellspacing="0"' ) . "\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'] = '<a href="../src/compose.php?send_to=' .
+if (isset($vcard_safe['email;internet'])) {     $vcard_safe['email;internet'] = '<A HREF="../src/compose.php?send_to=' .
         $vcard_safe['email;internet'] . '">' . $vcard_safe['email;internet'] .
-        '</a>';
+        '</A>';
 }
 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 html_tag( 'tr',
-                   html_tag( 'td', '<b>' . $v . ':</b>', 'right' ) .
-                   html_tag( 'td', $vcard_safe[$k], 'left' )
-               ) . "\n";
+        echo "<tr><td align=right><b>$v:</b></td><td>" . $vcard_safe[$k] .
+                "</td><tr>\n";
     }
 }
 
 echo '</table>' .
         '<br>' .
         '</td></tr></table>' .
-        html_tag( 'table', '', 'center', '', 'border="0" cellpadding="2" cellspacing="0" width="100%"' ) . "\n";
-        html_tag( 'tr',
-            html_tag( 'td',
-                '<b><center>' .
-                _("Add to Addressbook") . '</b></center>' ,
-            'left', $color[0] )
-        ) .
-        html_tag( 'tr' ) .
-        html_tag( 'td', '', 'center' ) .
-        '<form action="../src/addressbook.php" method="post" name="f_add">' .
-        html_tag( 'table', '', 'center', '', 'border="0" cellpadding="2" cellspacing="0" width="100%"' ) .
-        html_tag( 'tr',
-            html_tag( 'td',
-                '<b>Nickname:</b>' ,
-            'right' ) .
-            html_tag( 'td',
-                '<input type=text name="addaddr[nickname]" size=20 value="' .
-                $vcard_safe['firstname'] . '-' . $vcard_safe['lastname'] . '">' ,
-            'left' )
-        ) .
-        html_tag( 'tr' ) .
-        html_tag( 'td', '<b>Note Field Contains:</b>', 'right' ) .
-        html_tag( 'td', '', 'left' ) .
+        '<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>' .
+        '<FORM ACTION="../src/addressbook.php" METHOD="POST" NAME=f_add>' .
+        '<table border=0 cellpadding=2 cellspacing=0 align=center>' .
+        '<tr><td align=right><b>Nickname:</b></td>' .
+        '<td><input type=text name="addaddr[nickname]" size=20 value="' .
+        $vcard_safe['firstname'] . '-' . $vcard_safe['lastname'] .
+        '"></td></tr>' .
+        '<tr><td align=right><b>Note Field Contains:</b></td><td>' .
         '<select name="addaddr[label]">';
 
 if (isset($vcard_nice['url'])) {
@@ -190,36 +170,29 @@ if (isset($vcard_nice['note'])) {
 }
 echo '</select>' .
         '</td></tr>' .
-        html_tag( 'tr',
-            html_tag( 'td',
-                '<input name="addaddr[email]" type=hidden value="' .
-                htmlspecialchars($vcard_nice['email;internet']) . '">' .
-                '<input name="addaddr[firstname]" type=hidden value="' .
-                $vcard_safe['firstname'] . '">' .
-                '<input name="addaddr[lastname]" type=hidden value="' .
-                $vcard_safe['lastname'] . '">' .
-                '<input type="submit" name="addaddr[SUBMIT]" ' .
-                'value="Add to Address Book">' ,
-            'center', '', 'colspan="2"' )
-        ) .
-        '</table>' .
-        '</form>' .
+        '<tr><td colspan=2 align=center>' .
+        '<INPUT NAME="addaddr[email]" type=hidden value="' .
+        htmlspecialchars($vcard_nice['email;internet']) . '">' .
+        '<INPUT NAME="addaddr[firstname]" type=hidden value="' .
+        $vcard_safe['firstname'] . '">' .
+        '<INPUT NAME="addaddr[lastname]" type=hidden value="' .
+        $vcard_safe['lastname'] . '">' .
+        '<INPUT TYPE=submit NAME="addaddr[SUBMIT]" ' .
+        'VALUE="Add to Address Book">' .
         '</td></tr>' .
-        html_tag( 'tr',
-            html_tag( 'td',
-                '<a href="../src/download.php?absolute_dl=true&amp;passed_id=' .
-                $passed_id . '&amp;mailbox=' . urlencode($mailbox) .
-                '&amp;passed_ent_id=' . $passed_ent_id . '">' .
-                _("Download this as a file") . '</a>' ,
-            'center' )
-        ) .
         '</table>' .
-
-        html_tag( 'table',
-            html_tag( 'tr',
-                html_tag( 'td', '&nbsp;', 'left', $color[4] )
-            ) ,
-        'center', '', 'border="0" cellspacing="0" cellpadding="2"' ) .
+        '</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;passed_ent_id=' . $passed_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>';
 
 ?>