X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fvcard.php;h=210c5d6878e78f2745c8773828cb3e8f51327677;hb=ee27709d9224cc01e605c2478de9d9e4dd41f84c;hp=c96dab567ede1657accf722b87142d8c41b4c45d;hpb=2841ba1579830841e23ff7b5eb15e4230fce8e14;p=squirrelmail.git
diff --git a/src/vcard.php b/src/vcard.php
index c96dab56..210c5d68 100644
--- a/src/vcard.php
+++ b/src/vcard.php
@@ -3,7 +3,7 @@
/**
* vcard.php
*
- * Copyright (c) 1999-2004 The SquirrelMail Project Team
+ * Copyright (c) 1999-2005 The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* This file shows an attched vcard
@@ -20,10 +20,8 @@ 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');
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,13 +37,11 @@ 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") . " - ";
$msg_url = 'read_body.php?mailbox='.urlencode($mailbox).
@@ -54,15 +50,14 @@ $msg_url = 'read_body.php?mailbox='.urlencode($mailbox).
$msg_url = set_url_var($msg_url, 'ent_id', 0);
-echo ''. _("View message") . '';
-
-echo ' | ';
+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) {
@@ -94,8 +89,11 @@ if ($vcard_nice['version'] == '2.1') {
}
} else {
echo '' .
- sprintf(_("vCard Version %s is not supported. Some information might not be converted correctly."),$vcard_nice['version']) .
+ sprintf(_("vCard Version %s is not supported. Some information might not be converted correctly."),
+ htmlspecialchars($vcard_nice['version'])) .
" |
\n";
+ $vcard_nice['firstname'] = '';
+ $vcard_nice['lastname'] = '';
}
foreach ($vcard_nice as $k => $v) {
@@ -132,29 +130,50 @@ if (isset($vcard_safe['url'])) {
foreach ($ShowValues as $k => $v) {
if (isset($vcard_safe[$k]) && $vcard_safe[$k]) {
- echo "$v: | " . $vcard_safe[$k] .
- " |
\n";
+ echo "
$v: | " .
+ $vcard_safe[$k] . " |
\n";
}
}
-echo '
' .
- '
' .
- '' .
- '' .
- '' .
- '' .
- '' .
- _("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'])) {
@@ -188,15 +207,26 @@ if (isset($vcard_nice['note'])) {
$opts[$vcard_nice['note']] = _("Note");
}
-echo addSelect('addaddr[label]', $opts, '', TRUE);
+/*
+ * 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);
+}
+
?>
|
-
+ |
|
@@ -204,14 +234,13 @@ echo addHidden('addaddr[email]', $vcard_nice['email;internet']).
|
'.
+ '&ent_id=' . urlencode($ent_id) . '">' .
_("Download this as a file") . '';
?>
|
-
-