X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fvcard.php;h=a1f8005e366aa9133cb55f42177967894305eb29;hb=cd60d6082e0060ed5d5182baa24e1cab6db5ad05;hp=1fac0172c3c353303ffd81d0910213fd3fd0b8f3;hpb=164584f0e97ba654bfe742bf6641dc53ae0f6827;p=squirrelmail.git
diff --git a/src/vcard.php b/src/vcard.php
index 1fac0172..a1f8005e 100644
--- a/src/vcard.php
+++ b/src/vcard.php
@@ -3,32 +3,37 @@
/**
* 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-2007 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('mailbox', $mailbox, SQ_GET);
@@ -36,32 +41,21 @@ sqgetGlobalVar('ent_id', $ent_id, SQ_GET);
sqgetGlobalVar('startMessage', $startMessage, SQ_GET);
/* end globals */
-$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+$imapConnection = sqimap_login($username, false, $imapServerAddress, $imapPort, 0);
sqimap_mailbox_select($imapConnection, $mailbox);
+displayPageHeader($color);
-displayPageHeader($color, 'None');
-
-echo '
' . "\n" .
- '' .
- '' .
- _("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 ' |
';
-
$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 +86,11 @@ if ($vcard_nice['version'] == '2.1') {
$vcard_nice['email;internet'] = $vcard_nice['email;pref;internet'];
}
} else {
- echo 'vCard Version ' . $vcard_nice['version'] .
- ' is not supported. Some information might not be converted ' .
- "correctly. |
\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['lastname'] = '';
}
foreach ($vcard_nice as $k => $v) {
@@ -106,7 +102,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 +112,36 @@ $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_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];
}
}
-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: | ' ;
+$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 +157,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 +175,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") . '' .
- ' |
' .
-
- '' .
- '