X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fvcard.php;h=2a9de1201231f156aac26b621489dd7958009faa;hb=d3ab62601e195e75cfa8f871a89a380be5ed443e;hp=2560fe6210c2c53d1ca520aef29e7609ae124000;hpb=76911253eb850bacde3d86c8cb7b4af072e67ebe;p=squirrelmail.git
diff --git a/src/vcard.php b/src/vcard.php
index 2560fe62..2a9de120 100644
--- a/src/vcard.php
+++ b/src/vcard.php
@@ -3,61 +3,59 @@
/**
* vcard.php
*
- * Copyright (c) 1999-2003 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
* This file shows an attched vcard
*
- * $Id$
+ * @copyright © 1999-2007 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
+ * @package squirrelmail
*/
-/* Path for SquirrelMail required files. */
-Define('SM_PATH','../');
+/** This is the vcard page */
+define('PAGE_NAME', 'vcard');
+
+/**
+ * Include the SquirrelMail initialization file.
+ */
+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 */
-$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'];
-$startMessage = (int) $_GET['startMessage'];
+
+sqgetGlobalVar('passed_id', $passed_id, SQ_GET, NULL, SQ_TYPE_BIGINT);
+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);
+$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='.$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 ' |
';
-
$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) {
@@ -69,7 +67,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);
@@ -78,14 +76,21 @@ 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";
+ $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) {
@@ -97,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"),
@@ -107,111 +112,79 @@ $ShowValues = array(
'tel;fax' => _("Fax"),
'note' => _("Note"));
-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'] . '';
}
+$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 ' ' .
- ' ' .
- ' |
' .
- '' .
-
- '' .
- '