X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fvcard.php;h=210c5d6878e78f2745c8773828cb3e8f51327677;hb=bf9e5efb35d382a8e022955e690d0c19c916c6eb;hp=da4a7a63216b2eeb82990789539cd330150b672e;hpb=fdc9d9b593d6588e23877751d42ee6ca29e0ba6a;p=squirrelmail.git
diff --git a/src/vcard.php b/src/vcard.php
index da4a7a63..210c5d68 100644
--- a/src/vcard.php
+++ b/src/vcard.php
@@ -3,60 +3,61 @@
/**
* vcard.php
*
- * Copyright (c) 1999-2003 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
*
- * $Id$
+ * @version $Id$
+ * @package squirrelmail
*/
-/* Path for SquirrelMail required files. */
+/**
+ * Path for SquirrelMail required files.
+ * @ignore
+ */
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 */
-$key = $_COOKIE['key'];
-$username = $_SESSION['username'];
-$onetimepad = $_SESSION['onetimepad'];
-$mailbox = $_GET['mailbox'];
-$passed_id = (int) $_GET['passed_id'];
-$ent_id = $_GET['ent_id'];
-$startMessage = (int) $_GET['startMessage'];
+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);
+sqgetGlobalVar('ent_id', $ent_id, SQ_GET);
+sqgetGlobalVar('startMessage', $startMessage, SQ_GET);
/* end globals */
$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
sqimap_mailbox_select($imapConnection, $mailbox);
-
displayPageHeader($color, 'None');
-echo '
' . "\n" .
- '' .
- '' .
- _("Viewing a Business Card") . " - ";
+echo '
' . "\n" .
+ '' .
+ _("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 ' | ';
+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) {
@@ -87,9 +88,12 @@ 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";
+ echo '' .
+ 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) {
@@ -111,111 +115,132 @@ $ShowValues = array(
'tel;fax' => _("Fax"),
'note' => _("Note"));
-echo ' ' .
- '' . "\n";
+echo ' ' .
+ '' . "\n";
-if (isset($vcard_safe['email;internet'])) { $vcard_safe['email;internet'] = '' . $vcard_safe['email;internet'] .
- '';
+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'] . '';
}
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") .
- ' | ' .
- '' .
- ' |
+' .
-
- '' .
- ' | |