X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fvcard.php;h=cde642417bed0cf9e66398131dfd1c1a2340d458;hp=ecbaefd1c7ad392dec3debacc9bde6d74f510255;hb=c4faef335b2362c81b8ebf026d4066c12d70536c;hpb=89ac34a4a6247d9cc428a37368502d323775a0a5 diff --git a/src/vcard.php b/src/vcard.php index ecbaefd1..cde64241 100644 --- a/src/vcard.php +++ b/src/vcard.php @@ -3,65 +3,60 @@ /** * vcard.php * - * Copyright (c) 1999-2004 The SquirrelMail Project Team - * Licensed under the GNU GPL. For full terms see the file COPYING. - * * This file shows an attched vcard * + * @copyright 1999-2020 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'); + /** - * Path for SquirrelMail required files. - * @ignore + * Include the SquirrelMail initialization file. */ -Define('SM_PATH','../'); +require('../include/init.php'); /* SquirrelMail required files. */ -require_once(SM_PATH . 'include/validate.php'); -require_once(SM_PATH . 'functions/date.php'); -require_once(SM_PATH . 'functions/page_header.php'); -require_once(SM_PATH . 'functions/mime.php'); -require_once(SM_PATH . 'include/load_prefs.php'); + +/** imap functions depend on date functions */ +include_once(SM_PATH . 'functions/date.php'); +/** form functions */ +include_once(SM_PATH . 'functions/forms.php'); +/** mime decoding */ +include_once(SM_PATH . 'functions/mime.php'); +/** url parser */ +include_once(SM_PATH . 'functions/url_parser.php'); +/** imap functions used to retrieve vcard */ +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); -displayPageHeader($color, 'None'); - -echo '
' . "\n" . - ''; - $message = sqimap_get_message($imapConnection, $passed_id, $mailbox); $entity_vcard = getEntity($message,$ent_id); -$vcard = mime_fetch_body ($imapConnection, $passed_id, $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) { @@ -92,13 +87,15 @@ if ($vcard_nice['version'] == '2.1') { $vcard_nice['email;internet'] = $vcard_nice['email;pref;internet']; } } else { - echo '\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)); } @@ -106,7 +103,7 @@ foreach ($vcard_nice as $k => $v) { $ShowValues = array( 'fn' => _("Name"), 'title' => _("Title"), - 'email;internet' => _("Email"), + 'email;internet' => _("E-mail"), 'url' => _("Web Page"), 'org' => _("Organization / Department"), 'adr' => _("Address"), @@ -116,44 +113,36 @@ $ShowValues = array( 'tel;fax' => _("Fax"), 'note' => _("Note")); -echo '
' . - '
' . - _("Viewing a Business Card") . " - "; $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") . ''; - -echo '
' . - sprintf(_("vCard Version %s is not supported. Some information might not be converted correctly."),$vcard_nice['version']) . - "

' . - '' . "\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_safe['url'] . ''; } +$vcard = array(); foreach ($ShowValues as $k => $v) { - if (isset($vcard_safe[$k]) && $vcard_safe[$k]) { - echo "\n"; + if (isset($vcard_safe[$k]) && $vcard_safe[$k]) { + $vcard[$v] = $vcard_safe[$k]; } } -echo '
$v:" . $vcard_safe[$k] . - "
' . - '
' . - '
' . - '' . - '' . - '' . - '' . - '
' . - '
' . - _("Add to Addressbook") . - '
' . - addForm('../src/addressbook.php', 'POST', 'f_add') . - '' . - '' . - '' . - '' . - '' . - '
Nickname:'. - addInput('addaddr[nickname]', $vcard_safe['firstname'] . '-' . $vcard_safe['lastname'], '20'). - '
Note Field Contains:' ; +$dl = '../src/download.php?absolute_dl=true&passed_id=' . + urlencode($passed_id) . '&mailbox=' . urlencode($mailbox) . + '&ent_id=' . urlencode($ent_id); + +if (isset($vcard_nice['email;internet'])) { + $email = $vcard_nice['email;internet']; +} else { + $message = sqimap_get_message($imapConnection, $passed_id, $mailbox); + $header = $message->rfc822_header; + $from_name = $header->getAddr_s('from'); + + $email = getEmail(decodeHeader($from_name)); +} $opts = array(); if (isset($vcard_nice['url'])) { @@ -169,7 +158,7 @@ if (isset($vcard_nice['org'])) { $opts[$vcard_nice['org']] = _("Organization / Department"); } if (isset($vcard_nice['title'])) { - $opts[$vcard_nice['title'].'; '.$vcard_nice['org']] = _("Title & Org. / Dept."); + $opts[$vcard_nice['title'].'; '.$vcard_nice['org']] = _("Title & Org. / Dept."); } if (isset($vcard_nice['tel;work'])) { $opts[$vcard_nice['tel;work']] = _("Work Phone"); @@ -187,27 +176,16 @@ if (isset($vcard_nice['note'])) { $opts[$vcard_nice['note']] = _("Note"); } -echo addSelect('addaddr[label]', $opts, '', TRUE); -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]'). - '
' . - '' . - '
' . - '' . - _("Download this as a file") . '' . - '
' . - - '' . - '
' . - '
' . - ''; - -?> +$oTemplate->assign('view_message_link', $msg_url); +$oTemplate->assign('download_link', $dl); +$oTemplate->assign('vcard', $vcard); + +$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); + +$oTemplate->display('vcard.tpl'); + +$oTemplate->display('footer.tpl');