X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fvcard.php;h=bd1818e09c18f01bcd0a41d31b450eb0316089b8;hb=d725f88c364863bc4581884e99e768e7ce3c489f;hp=639097eee10216f0acfc94e562e94ad9a76c32e6;hpb=9b761dbdd92259ef09affe9b8f8b62362d0d7bb2;p=squirrelmail.git
diff --git a/src/vcard.php b/src/vcard.php
index 639097ee..bd1818e0 100644
--- a/src/vcard.php
+++ b/src/vcard.php
@@ -3,15 +3,16 @@
/**
* 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$
+ * @package squirrelmail
*/
-/* Path for SquirrelMail required files. */
+/** Path for SquirrelMail required files. */
Define('SM_PATH','../');
/* SquirrelMail required files. */
@@ -22,14 +23,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);
@@ -43,8 +44,12 @@ echo '
' .
' | ';
@@ -65,7 +70,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,10 +79,15 @@ 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 ' . @@ -106,10 +116,11 @@ $ShowValues = array( echo ' | |
' . '
|