X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fvcard.php;h=12da6a735081aac01aaf28f3966c6bf1de03865a;hp=9db7437d4f2c16be9908a119c44aa3c42b11fe2b;hb=407e70327abb65df0d3da60110eb27d477776898;hpb=64c9e87e68537c4a9a2a20d4d75ea369f0c4a8e1;ds=sidebyside diff --git a/src/vcard.php b/src/vcard.php index 9db7437d..12da6a73 100644 --- a/src/vcard.php +++ b/src/vcard.php @@ -3,11 +3,10 @@ /** * 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-2006 The SquirrelMail Project Team + * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail */ @@ -19,11 +18,9 @@ Define('SM_PATH','../'); /* 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'); +include_once(SM_PATH . 'include/validate.php'); require_once(SM_PATH . 'functions/mime.php'); -require_once(SM_PATH . 'include/load_prefs.php'); +require_once(SM_PATH . 'functions/url_parser.php'); /* globals */ sqgetGlobalVar('username', $username, SQ_SESSION); @@ -39,29 +36,27 @@ sqgetGlobalVar('startMessage', $startMessage, SQ_GET); $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); sqimap_mailbox_select($imapConnection, $mailbox); - displayPageHeader($color, 'None'); -echo '
' . "\n" . - ' +
' . - '
' . - _("Viewing a Business Card") . " - "; +echo '
' . "\n" . + ''; +echo ''. _("View message") . '' . + ''; $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,9 +87,12 @@ if ($vcard_nice['version'] == '2.1') { $vcard_nice['email;internet'] = $vcard_nice['email;pref;internet']; } } else { - echo '\n"; + echo '\n"; + $vcard_nice['firstname'] = ''; + $vcard_nice['lastname'] = ''; } foreach ($vcard_nice as $k => $v) { @@ -106,7 +104,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,8 +114,8 @@ $ShowValues = array( 'tel;fax' => _("Fax"), 'note' => _("Note")); -echo ' + +
' . + _("Viewing a Business Card") . " - "; + $msg_url = 'read_body.php?mailbox='.urlencode($mailbox). - '&startMessage='.$startMessage. - '&passed_id='.$passed_id; + '&startMessage='.urlencode($startMessage). + '&passed_id='.urlencode($passed_id); $msg_url = set_url_var($msg_url, 'ent_id', 0); -echo ''. _("View message") . ''; - -echo '
vCard Version ' . $vcard_nice['version'] . - ' is not supported. Some information might not be converted ' . - "correctly.
' . + sprintf(_("vCard Version %s is not supported. Some information might not be converted correctly."), + htmlspecialchars($vcard_nice['version'])) . + "

' . - '' . "\n"; +echo '

' . + '' . "\n"; if (isset($vcard_safe['email;internet'])) { $vcard_safe['email;internet'] = makeComposeLink('src/compose.php?send_to='.urlencode($vcard_safe['email;internet']), @@ -125,35 +123,56 @@ if (isset($vcard_safe['email;internet'])) { } if (isset($vcard_safe['url'])) { - $vcard_safe['url'] = '' . - $vcard_safe['url'] . ''; + $vcard_safe['url'] = '' . + $vcard_safe['url'] . ''; } foreach ($ShowValues as $k => $v) { if (isset($vcard_safe[$k]) && $vcard_safe[$k]) { - echo "\n"; + echo "\n"; } } -echo '
$v:" . $vcard_safe[$k] . - "
$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:' ; +?> +
+
+
+ + +' . - '
+
+
+
+ + +' . + '' . + '' . - '' . - '
: +rfc822_header; + $from_name = $header->getAddr_s('from'); + + echo '
' . _("E-mail address") . ':' . + addInput('addaddr[email]', + getEmail(decodeHeader($from_name)), '20'); +} + +echo '
' . _("Additional info") . ':'; $opts = array(); if (isset($vcard_nice['url'])) { @@ -169,7 +188,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 +206,42 @@ 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") . '' . - '
' . - - '' . - '
' . - '
' . - ''; +/* + * 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); +} + +?> +

+ +
+ +
+' . + _("Download this as a file") . ''; +?> +
+ +
+
+display('footer.tpl'); +?>