fixed toggle all link for browsers without JS support. older implementation

[squirrelmail.git] / src / vcard.php

diff --git a/src/vcard.php b/src/vcard.php
index 664dfe27c4bfe70904cc27333153aafc17e43200..c09b0945b2dfee9e54a768776e4be02504b72c2a 100644 (file)
--- a/src/vcard.php
+++ b/src/vcard.php
@@ -42,15 +42,12 @@ sqimap_mailbox_select($imapConnection, $mailbox);
 
 displayPageHeader($color, 'None');
 
-?>
-<br />
-<table width="100%" border="0" cellspacing="0" cellpadding="2" align="center">
-<tr>
-<?php
+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 '<td bgcolor="' . $color[0] . '">' .
-        '<b><center>' .
-        _("Viewing a Business Card") . " - ";
 $msg_url = 'read_body.php?mailbox='.urlencode($mailbox).
     '&amp;startMessage='.urlencode($startMessage).
     '&amp;passed_id='.urlencode($passed_id);
@@ -97,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) {
@@ -121,7 +121,7 @@ $ShowValues = array(
     'note' =>           _("Note"));
 
 echo '<tr><td><br />' .
-        '<TABLE border=0 cellpadding=2 cellspacing=0 align=center>' . "\n";
+     '<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']),
@@ -129,34 +129,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";
     }
 }
 
-?>
-</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,18 +191,17 @@ if (isset($vcard_nice['note'])) {
     $opts[$vcard_nice['note']] = _("Note");
 }
 
-echo addSelect('addaddr[label]', $opts, '', TRUE);
-
+echo    addSelect('addaddr[label]', $opts, '', TRUE);
 ?>
 </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[email]', $vcard_nice['email;internet']).
-     addHidden('addaddr[firstname]', $vcard_safe['firstname']).
-     addHidden('addaddr[lastname]', $vcard_safe['lastname']).
-     addSubmit(_("Add to Address Book"), 'addaddr[SUBMIT]');
-
+echo addHidden('addaddr[firstname]', $vcard_safe['firstname']).
+    addHidden('addaddr[lastname]', $vcard_safe['lastname']).
+    addSubmit(_("Add to Address Book"), 'addaddr[SUBMIT]');
 ?>
 </td></tr>
 </table>
@@ -209,15 +209,14 @@ echo addHidden('addaddr[email]', $vcard_nice['email;internet']).
 </td></tr>
 <tr><td align="center">
 <?php
-
-echo '<a href="../src/download.php?absolute_dl=true&amp;passed_id=' .
+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) . '">' .
+     '&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>                                
+<tr><td bgcolor="<?php echo $color[4]; ?>">
+</td></tr></table>
+</body></html>