projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Check for flags column
[squirrelmail.git]
/
src
/
vcard.php
diff --git
a/src/vcard.php
b/src/vcard.php
index b3d42b10b55ec549c8145f986190df8ef184b759..210c5d6878e78f2745c8773828cb3e8f51327677 100644
(file)
--- a/
src/vcard.php
+++ b/
src/vcard.php
@@
-3,7
+3,7
@@
/**
* vcard.php
*
/**
* vcard.php
*
- * Copyright (c) 1999-200
4
The SquirrelMail Project Team
+ * Copyright (c) 1999-200
5
The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* This file shows an attched vcard
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* This file shows an attched vcard
@@
-21,6
+21,7
@@
Define('SM_PATH','../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
require_once(SM_PATH . 'functions/mime.php');
/* SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
require_once(SM_PATH . 'functions/mime.php');
+require_once(SM_PATH . 'functions/url_parser.php');
/* globals */
sqgetGlobalVar('username', $username, SQ_SESSION);
/* globals */
sqgetGlobalVar('username', $username, SQ_SESSION);
@@
-153,19
+154,22
@@
echo addInput('addaddr[nickname]', $vcard_safe['firstname'] .
'-' . $vcard_safe['lastname'], '20');
/*
'-' . $vcard_safe['lastname'], '20');
/*
- * If the v
c
ard comes with an e-mail address it should be added to the
+ * If the v
C
ard comes with an e-mail address it should be added to the
* address book, otherwise the user must add one manually to avoid an
* address book, otherwise the user must add one manually to avoid an
- * error message in src/addressbook.php.
- *
- * TODO: If there's no e-mail address in the vcard, use the sender's address
- * instead of letting the user entering it manually.
+ * error message in src/addressbook.php. SquirrelMail is nice enough to
+ * suggest the e-mail address of the sender though.
*/
if (isset($vcard_nice['email;internet'])) {
echo addHidden('addaddr[email]', $vcard_nice['email;internet']);
} else {
*/
if (isset($vcard_nice['email;internet'])) {
echo addHidden('addaddr[email]', $vcard_nice['email;internet']);
} else {
+ $message = sqimap_get_message($imapConnection, $passed_id, $mailbox);
+ $header = $message->rfc822_header;
+ $from_name = $header->getAddr_s('from');
+
echo '</td></tr>' .
'<tr><td align="right"><b>' . _("E-mail address") . ':</b></td><td>' .
echo '</td></tr>' .
'<tr><td align="right"><b>' . _("E-mail address") . ':</b></td><td>' .
- addInput('addaddr[email]', '', '20');
+ addInput('addaddr[email]',
+ getEmail(decodeHeader($from_name)), '20');
}
echo '</td></tr>' .
}
echo '</td></tr>' .
@@
-239,4
+243,4
@@
echo '<a href="../src/download.php?absolute_dl=true&passed_id=' .
<table border="0" cellspacing="0" cellpadding="2" align="center">
<tr><td bgcolor="<?php echo $color[4]; ?>">
</td></tr></table>
<table border="0" cellspacing="0" cellpadding="2" align="center">
<tr><td bgcolor="<?php echo $color[4]; ?>">
</td></tr></table>
-</body></html>
+</body></html>
\ No newline at end of file