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

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@7538 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/vcard.php b/src/vcard.php
index 664dfe27c4bfe70904cc27333153aafc17e43200..ecbaefd1c7ad392dec3debacc9bde6d74f510255 100644 (file)
--- a/src/vcard.php
+++ b/src/vcard.php
@@ -42,13 +42,9 @@ sqimap_mailbox_select($imapConnection, $mailbox);
 
 displayPageHeader($color, 'None');
 
-?>
-<br />
-<table width="100%" border="0" cellspacing="0" cellpadding="2" align="center">
-<tr>
-<?php
-
-echo '<td bgcolor="' . $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") . " - ";
 $msg_url = 'read_body.php?mailbox='.urlencode($mailbox).
@@ -120,7 +116,7 @@ $ShowValues = array(
     'tel;fax' =>        _("Fax"),
     'note' =>           _("Note"));
 
-echo '<tr><td><br />' .
+echo '<tr><td><br>' .
         '<TABLE border=0 cellpadding=2 cellspacing=0 align=center>' . "\n";
 
 if (isset($vcard_safe['email;internet'])) {
@@ -140,23 +136,24 @@ foreach ($ShowValues as $k => $v) {
     }
 }
 
-?>
-</table>
-<br />
-</td></tr></table>
-<table width="100%" border="0" cellspacing="0" cellpadding="2" align="center">
-<tr><td bgcolor="<?php echo $color[0]; ?>" align="center">
-<b><?php echo _("Add to Addressbook"); ?></b>
-</td></tr>
-<tr><td align="center">
-<?php addForm('../src/addressbook.php', 'POST', 'f_add') ?>
-<table border="0" cellpadding="2" cellspacing="0" align="center">
-<tr><td align="right"><b><?php echo _("Nickname:"); ?></b></td>
-<td>
-<?php addInput('addaddr[nickname]', $vcard_safe['firstname'] . '-' . $vcard_safe['lastname'], '20'); ?>
-</td></tr>
-<tr><td align="right"><b><?php echo _("Note Field Contains:"); ?></b></td><td>
-<?php
+echo '</table>' .
+        '<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>' ;
 
 $opts = array();
 if (isset($vcard_nice['url'])) {
@@ -190,34 +187,27 @@ if (isset($vcard_nice['note'])) {
     $opts[$vcard_nice['note']] = _("Note");
 }
 
-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]');
-
-?>
-</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>';
+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>';
 
 ?>
-</td></tr></table>
-<table border="0" cellspacing="0" cellpadding="2" align="center">
-<tr><td bgcolor="<?php echo $color[4]; ?>"></td></tr>
-</table>
-</body></html>