|
@@ -43,20 +43,11 @@ sqimap_mailbox_select($imapConnection, $mailbox);
|
|
|
|
|
|
displayPageHeader($color, 'None');
|
|
displayPageHeader($color, 'None');
|
|
|
|
|
|
-echo '<br /><table width="100%" border="0" cellspacing="0" cellpadding="2" ' .
|
|
|
|
- 'align="center">' . "\n" .
|
|
|
|
- '<tr><td bgcolor="' . $color[0] . '"><b><div style="text-align: center;">' .
|
|
|
|
- _("Viewing a Business Card") . " - ";
|
|
|
|
-
|
|
|
|
$msg_url = 'read_body.php?mailbox='.urlencode($mailbox).
|
|
$msg_url = 'read_body.php?mailbox='.urlencode($mailbox).
|
|
'&startMessage='.urlencode($startMessage).
|
|
'&startMessage='.urlencode($startMessage).
|
|
'&passed_id='.urlencode($passed_id);
|
|
'&passed_id='.urlencode($passed_id);
|
|
-
|
|
|
|
$msg_url = set_url_var($msg_url, 'ent_id', 0);
|
|
$msg_url = set_url_var($msg_url, 'ent_id', 0);
|
|
|
|
|
|
-echo '<a href="'.$msg_url.'">'. _("View message") . '</a>' .
|
|
|
|
- '</div></b></td></tr>';
|
|
|
|
-
|
|
|
|
$message = sqimap_get_message($imapConnection, $passed_id, $mailbox);
|
|
$message = sqimap_get_message($imapConnection, $passed_id, $mailbox);
|
|
|
|
|
|
$entity_vcard = getEntity($message,$ent_id);
|
|
$entity_vcard = getEntity($message,$ent_id);
|
|
@@ -92,10 +83,9 @@ if ($vcard_nice['version'] == '2.1') {
|
|
$vcard_nice['email;internet'] = $vcard_nice['email;pref;internet'];
|
|
$vcard_nice['email;internet'] = $vcard_nice['email;pref;internet'];
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
- echo '<tr><td align="center">' .
|
|
|
|
- sprintf(_("vCard Version %s is not supported. Some information might not be converted correctly."),
|
|
|
|
- htmlspecialchars($vcard_nice['version'])) .
|
|
|
|
- "</td></tr>\n";
|
|
|
|
|
|
+ $oTemplate->assign('note', sprintf(_("vCard Version %s is not supported. Some information might not be converted correctly."), htmlspecialchars($vcard_nice['version'])));
|
|
|
|
+ $oTemplate->display('note.tpl');
|
|
|
|
+
|
|
$vcard_nice['firstname'] = '';
|
|
$vcard_nice['firstname'] = '';
|
|
$vcard_nice['lastname'] = '';
|
|
$vcard_nice['lastname'] = '';
|
|
}
|
|
}
|
|
@@ -119,66 +109,37 @@ $ShowValues = array(
|
|
'tel;fax' => _("Fax"),
|
|
'tel;fax' => _("Fax"),
|
|
'note' => _("Note"));
|
|
'note' => _("Note"));
|
|
|
|
|
|
-echo '<tr><td><br />' .
|
|
|
|
- '<table border="0" cellpadding="2" cellspacing="0" align="center">' . "\n";
|
|
|
|
-
|
|
|
|
if (isset($vcard_safe['email;internet'])) {
|
|
if (isset($vcard_safe['email;internet'])) {
|
|
$vcard_safe['email;internet'] = makeComposeLink('src/compose.php?send_to='.urlencode($vcard_safe['email;internet']),
|
|
$vcard_safe['email;internet'] = makeComposeLink('src/compose.php?send_to='.urlencode($vcard_safe['email;internet']),
|
|
$vcard_safe['email;internet']);
|
|
$vcard_safe['email;internet']);
|
|
}
|
|
}
|
|
|
|
|
|
if (isset($vcard_safe['url'])) {
|
|
if (isset($vcard_safe['url'])) {
|
|
- $vcard_safe['url'] = '<a href="' . $vcard_safe['url'] . '">' .
|
|
|
|
|
|
+ $vcard_safe['url'] = '<a href="' . $vcard_safe['url'] . '" target="_blank">' .
|
|
$vcard_safe['url'] . '</a>';
|
|
$vcard_safe['url'] . '</a>';
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+$vcard = array();
|
|
foreach ($ShowValues as $k => $v) {
|
|
foreach ($ShowValues as $k => $v) {
|
|
- if (isset($vcard_safe[$k]) && $vcard_safe[$k]) {
|
|
|
|
- echo "<tr><td align=\"right\" valign=\"top\"><b>$v:</b></td><td>" .
|
|
|
|
- $vcard_safe[$k] . "</td><tr>\n";
|
|
|
|
|
|
+ if (isset($vcard_safe[$k]) && $vcard_safe[$k]) {
|
|
|
|
+ $vcard[$v] = $vcard_safe[$k];
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
-?>
|
|
|
|
-</table>
|
|
|
|
-<br />
|
|
|
|
-</td></tr></table>
|
|
|
|
-<table width="100%" border="0" cellspacing="0" cellpadding="2" align="center">
|
|
|
|
-<tr><td bgcolor="<?php echo $color[0]; ?>">
|
|
|
|
-<div style="text-align: center;"><b><?php echo _("Add to address book"); ?></b></div>
|
|
|
|
-</td></tr>
|
|
|
|
-<tr><td align="center">
|
|
|
|
-<?php echo addForm('../src/addressbook.php', 'post', 'f_add'); ?><br />
|
|
|
|
-<table border="0" cellpadding="2" cellspacing="0" align="center">
|
|
|
|
-<tr><td align="right"><b><?php echo _("Nickname"); ?>:</b></td>
|
|
|
|
-<td>
|
|
|
|
-<?php
|
|
|
|
-
|
|
|
|
-echo addInput('addaddr[nickname]', $vcard_safe['firstname'] .
|
|
|
|
- '-' . $vcard_safe['lastname'], '20');
|
|
|
|
|
|
+$dl = '../src/download.php?absolute_dl=true&passed_id=' .
|
|
|
|
+ urlencode($passed_id) . '&mailbox=' . urlencode($mailbox) .
|
|
|
|
+ '&ent_id=' . urlencode($ent_id);
|
|
|
|
|
|
-/*
|
|
|
|
- * If the vCard comes with an e-mail address it should be added to the
|
|
|
|
- * address book, otherwise the user must add one manually to avoid an
|
|
|
|
- * error message in src/addressbook.php. SquirrelMail is nice enough to
|
|
|
|
- * suggest the e-mail address of the sender though.
|
|
|
|
- */
|
|
|
|
if (isset($vcard_nice['email;internet'])) {
|
|
if (isset($vcard_nice['email;internet'])) {
|
|
- echo addHidden('addaddr[email]', $vcard_nice['email;internet']);
|
|
|
|
|
|
+ $email = $vcard_nice['email;internet'];
|
|
} else {
|
|
} else {
|
|
$message = sqimap_get_message($imapConnection, $passed_id, $mailbox);
|
|
$message = sqimap_get_message($imapConnection, $passed_id, $mailbox);
|
|
$header = $message->rfc822_header;
|
|
$header = $message->rfc822_header;
|
|
$from_name = $header->getAddr_s('from');
|
|
$from_name = $header->getAddr_s('from');
|
|
|
|
|
|
- echo '</td></tr>' .
|
|
|
|
- '<tr><td align="right"><b>' . _("E-mail address") . ':</b></td><td>' .
|
|
|
|
- addInput('addaddr[email]',
|
|
|
|
- getEmail(decodeHeader($from_name)), '20');
|
|
|
|
|
|
+ $email = getEmail(decodeHeader($from_name));
|
|
}
|
|
}
|
|
|
|
|
|
-echo '</td></tr>' .
|
|
|
|
- '<tr><td align="right"><b>' . _("Additional info") . ':</b></td><td>';
|
|
|
|
-
|
|
|
|
$opts = array();
|
|
$opts = array();
|
|
if (isset($vcard_nice['url'])) {
|
|
if (isset($vcard_nice['url'])) {
|
|
$opts[$vcard_nice['url']] = _("Web Page");
|
|
$opts[$vcard_nice['url']] = _("Web Page");
|
|
@@ -211,42 +172,17 @@ if (isset($vcard_nice['note'])) {
|
|
$opts[$vcard_nice['note']] = _("Note");
|
|
$opts[$vcard_nice['note']] = _("Note");
|
|
}
|
|
}
|
|
|
|
|
|
-/*
|
|
|
|
- * If the vcard comes with nothing but name and e-mail address, the user gets
|
|
|
|
- * the chance to type some additional info. If there's more info in the card,
|
|
|
|
- * the user gets to choose what will be added as additional info.
|
|
|
|
- */
|
|
|
|
-if (count($opts) == 0) {
|
|
|
|
- echo addInput('addaddr[label]', '', '20');
|
|
|
|
-} else {
|
|
|
|
- echo addSelect('addaddr[label]', $opts, '', TRUE);
|
|
|
|
-}
|
|
|
|
|
|
+$oTemplate->assign('view_message_link', $msg_url);
|
|
|
|
+$oTemplate->assign('download_link', $dl);
|
|
|
|
+$oTemplate->assign('vcard', $vcard);
|
|
|
|
|
|
-?>
|
|
|
|
-</td></tr>
|
|
|
|
-<tr><td colspan="2" align="center"><br />
|
|
|
|
-<?php
|
|
|
|
|
|
+$oTemplate->assign('nickname', $vcard_nice['firstname'].'-'.$vcard_safe['lastname']);
|
|
|
|
+$oTemplate->assign('firstname', $vcard_safe['firstname']);
|
|
|
|
+$oTemplate->assign('lastname', $vcard_safe['lastname']);
|
|
|
|
+$oTemplate->assign('email', $email);
|
|
|
|
+$oTemplate->assign('info', $opts);
|
|
|
|
|
|
-echo addHidden('addaddr[firstname]', $vcard_safe['firstname']) .
|
|
|
|
- addHidden('addaddr[lastname]', $vcard_safe['lastname']) .
|
|
|
|
- addSubmit(_("Add to address book"), 'addaddr[SUBMIT]');
|
|
|
|
|
|
+$oTemplate->display('vcard.tpl');
|
|
|
|
|
|
-?>
|
|
|
|
-</td></tr>
|
|
|
|
-</table>
|
|
|
|
-</form>
|
|
|
|
-</td></tr>
|
|
|
|
-<tr><td align="center">
|
|
|
|
-<?php
|
|
|
|
-echo '<a href="../src/download.php?absolute_dl=true&passed_id=' .
|
|
|
|
- urlencode($passed_id) . '&mailbox=' . urlencode($mailbox) .
|
|
|
|
- '&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>
|
|
|
|
-<?php
|
|
|
|
$oTemplate->display('footer.tpl');
|
|
$oTemplate->display('footer.tpl');
|
|
-?>
|
|
|
|
|
|
+?>
|