X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fvcard.php;h=c96dab567ede1657accf722b87142d8c41b4c45d;hb=7fcab811a919289459e616f0e47388c1cb27195a;hp=639097eee10216f0acfc94e562e94ad9a76c32e6;hpb=9b761dbdd92259ef09affe9b8f8b62362d0d7bb2;p=squirrelmail.git
diff --git a/src/vcard.php b/src/vcard.php
index 639097ee..c96dab56 100644
--- a/src/vcard.php
+++ b/src/vcard.php
@@ -3,15 +3,19 @@
/**
* vcard.php
*
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * 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
*
- * $Id$
+ * @version $Id$
+ * @package squirrelmail
*/
-/* Path for SquirrelMail required files. */
+/**
+ * Path for SquirrelMail required files.
+ * @ignore
+ */
Define('SM_PATH','../');
/* SquirrelMail required files. */
@@ -22,14 +26,14 @@ require_once(SM_PATH . 'functions/mime.php');
require_once(SM_PATH . 'include/load_prefs.php');
/* globals */
-$key = $_COOKIE['key'];
-$username = $_SESSION['username'];
-$onetimepad = $_SESSION['onetimepad'];
-$mailbox = decodeHeader($_GET['mailbox']);
-$passed_id = (int) $_GET['passed_id'];
-$ent_id = $_GET['ent_id'];
-$passed_ent_id = $_GET['passed_ent_id'];
-$QUERY_STRING = $_SERVER['QUERY_STRING'];
+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);
@@ -38,13 +42,18 @@ sqimap_mailbox_select($imapConnection, $mailbox);
displayPageHeader($color, 'None');
-echo '
' . "\n" .
- '' .
- '' .
- _("Viewing a Business Card") . " - ";
-$msg_url = 'read_body.php?' . urlencode(strip_tags(urldecode($QUERY_STRING)));
+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 ' | ';
@@ -65,7 +74,7 @@ foreach ($vcard as $l) {
if ($attr == 'quoted-printable')
$v = quoted_printable_decode($v);
else
- $k .= ';' . $attr;
+ $k .= ';' . strtolower($attr);
}
$v = str_replace(';', "\n", $v);
@@ -74,14 +83,19 @@ foreach ($vcard as $l) {
if ($vcard_nice['version'] == '2.1') {
// get firstname and lastname for sm addressbook
- $vcard_nice["firstname"] = substr($vcard_nice["n"],
- strpos($vcard_nice["n"], "\n") + 1, strlen($vcard_nice["n"]));
- $vcard_nice["lastname"] = substr($vcard_nice["n"], 0,
- strpos($vcard_nice["n"], "\n"));
+ $vcard_nice['firstname'] = substr($vcard_nice['n'],
+ strpos($vcard_nice['n'], "\n") + 1, strlen($vcard_nice['n']));
+ $vcard_nice['lastname'] = substr($vcard_nice['n'], 0,
+ strpos($vcard_nice['n'], "\n"));
+ // workaround for Outlook, should be fixed in a better way,
+ // maybe in new 'vCard' class.
+ if (isset($vcard_nice['email;pref;internet'])) {
+ $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."),$vcard_nice['version']) .
+ " | \n";
}
foreach ($vcard_nice as $k => $v) {
@@ -103,111 +117,101 @@ $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] .
+ echo " | $v: | " . $vcard_safe[$k] .
" | \n";
}
}
echo ' ' .
- ' ' .
- ' | ' .
- '' .
+ ' | ' .
+ '' .
- '' .
- '' .
- '' .
- _("Add to Addressbook") .
- ' | ' .
- '' .
- ' | |