X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fvcard.php;h=a0994cff9ddb574b24a2cbaa2c4e53191aa8a7a0;hb=6fd953618853477f6ffe569ce3c9733ca9f9c2d0;hp=cd104b9a6c98e87bd50997b15ffceba0ba08b30f;hpb=0fa230016e399929e51d8e007b1509421424c7de;p=squirrelmail.git
diff --git a/src/vcard.php b/src/vcard.php
index cd104b9a..a0994cff 100644
--- a/src/vcard.php
+++ b/src/vcard.php
@@ -3,15 +3,19 @@
/**
* vcard.php
*
- * Copyright (c) 1999-2003 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,13 +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 = urldecode($_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);
@@ -37,14 +42,15 @@ 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);
@@ -87,9 +93,9 @@ 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."),$vcard_nice['version']) .
+ " | \n";
}
foreach ($vcard_nice as $k => $v) {
@@ -111,111 +117,98 @@ $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") .
- ' | ' .
- '' .
- ' | ' .
+
+ '' .
' |