X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fvcard.php;h=b7555a9bccb9ce24d4632deec02417eee1a5acf8;hp=d22b9687b158fe44e2260b51f9283e5f0bf12128;hb=353d074afac6827c90f4bb03e846c5e453d3b5b1;hpb=ae299e07a2ee3003dde7c2f69b6f2cd2d0703793
diff --git a/src/vcard.php b/src/vcard.php
index d22b9687..b7555a9b 100644
--- a/src/vcard.php
+++ b/src/vcard.php
@@ -5,12 +5,15 @@
*
* This file shows an attched vcard
*
- * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @copyright 1999-2018 The SquirrelMail Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
*/
+/** This is the vcard page */
+define('PAGE_NAME', 'vcard');
+
/**
* Include the SquirrelMail initialization file.
*/
@@ -31,35 +34,24 @@ include_once(SM_PATH . 'functions/imap_general.php');
include_once(SM_PATH . 'functions/imap_messages.php');
/* globals */
-sqgetGlobalVar('username', $username, SQ_SESSION);
-sqgetGlobalVar('key', $key, SQ_COOKIE);
-sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION);
-sqgetGlobalVar('passed_id', $passed_id, SQ_GET);
+sqgetGlobalVar('passed_id', $passed_id, SQ_GET, NULL, SQ_TYPE_BIGINT);
sqgetGlobalVar('mailbox', $mailbox, SQ_GET);
sqgetGlobalVar('ent_id', $ent_id, SQ_GET);
sqgetGlobalVar('startMessage', $startMessage, SQ_GET);
/* end globals */
-$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+global $imap_stream_options; // in case not defined in config
+$imapConnection = sqimap_login($username, false, $imapServerAddress, $imapPort, 0, $imap_stream_options);
sqimap_mailbox_select($imapConnection, $mailbox);
-displayPageHeader($color, 'None');
-
-echo '
' . "\n" .
- '' .
- _("Viewing a Business Card") . " - ";
+displayPageHeader($color);
$msg_url = 'read_body.php?mailbox='.urlencode($mailbox).
'&startMessage='.urlencode($startMessage).
'&passed_id='.urlencode($passed_id);
-
$msg_url = set_url_var($msg_url, 'ent_id', 0);
-echo ' '. _("View message") . '' .
- ' |
';
-
$message = sqimap_get_message($imapConnection, $passed_id, $mailbox);
$entity_vcard = getEntity($message,$ent_id);
@@ -95,16 +87,15 @@ if ($vcard_nice['version'] == '2.1') {
$vcard_nice['email;internet'] = $vcard_nice['email;pref;internet'];
}
} else {
- echo '' .
- sprintf(_("vCard Version %s is not supported. Some information might not be converted correctly."),
- htmlspecialchars($vcard_nice['version'])) .
- " |
\n";
+ $oTemplate->assign('note', sprintf(_("vCard Version %s is not supported. Some information might not be converted correctly."), sm_encode_html_special_chars($vcard_nice['version'])));
+ $oTemplate->display('note.tpl');
+
$vcard_nice['firstname'] = '';
$vcard_nice['lastname'] = '';
}
foreach ($vcard_nice as $k => $v) {
- $v = htmlspecialchars($v);
+ $v = sm_encode_html_special_chars($v);
$v = trim($v);
$vcard_safe[$k] = trim(nl2br($v));
}
@@ -122,66 +113,37 @@ $ShowValues = array(
'tel;fax' => _("Fax"),
'note' => _("Note"));
-echo ' ' .
- '' . "\n";
-
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']);
}
if (isset($vcard_safe['url'])) {
- $vcard_safe['url'] = '' .
+ $vcard_safe['url'] = '' .
$vcard_safe['url'] . '';
}
+$vcard = array();
foreach ($ShowValues as $k => $v) {
- if (isset($vcard_safe[$k]) && $vcard_safe[$k]) {
- echo "$v: | " .
- $vcard_safe[$k] . " | \n";
+ if (isset($vcard_safe[$k]) && $vcard_safe[$k]) {
+ $vcard[$v] = $vcard_safe[$k];
}
}
-?>
-
-
- |
-
-
-
- |
-
-
-
-: |
-
-rfc822_header;
$from_name = $header->getAddr_s('from');
- echo ' | ' .
- '' . _("E-mail address") . ': | ' .
- addInput('addaddr[email]',
- getEmail(decodeHeader($from_name)), '20');
+ $email = getEmail(decodeHeader($from_name));
}
-echo ' | ' .
- '' . _("Additional info") . ': | ';
-
$opts = array();
if (isset($vcard_nice['url'])) {
$opts[$vcard_nice['url']] = _("Web Page");
@@ -214,42 +176,16 @@ if (isset($vcard_nice['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);
-?>
- |
-
-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');
-?>
- |
-
-
- |
-
-' .
- _("Download this as a file") . '';
-?>
- |
-
-display('footer.tpl');
-?>
\ No newline at end of file