copyright update

[squirrelmail.git] / src / vcard.php

diff --git a/src/vcard.php b/src/vcard.php
index b3d42b10b55ec549c8145f986190df8ef184b759..df93af005a6ec3c07a3396add1cbb37ba70775e9 100644 (file)
--- a/src/vcard.php
+++ b/src/vcard.php
@@ -3,11 +3,10 @@
 /**
  * vcard.php
  *
- * 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
  *
+ * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
  */
@@ -21,6 +20,7 @@ Define('SM_PATH','../');
 /* 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);
@@ -104,7 +104,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"),
@@ -140,7 +140,7 @@ foreach ($ShowValues as $k => $v) {
 </td></tr></table>
 <table width="100%" border="0" cellspacing="0" cellpadding="2" align="center">
 <tr><td bgcolor="<?php echo $color[0]; ?>">
-<center><b><?php echo _("Add to Addressbook"); ?></b></center>
+<center><b><?php echo _("Add to address book"); ?></b></center>
 </td></tr>
 <tr><td align="center">
 <?php echo addForm('../src/addressbook.php', 'post', 'f_add'); ?><br />
@@ -153,19 +153,22 @@ echo addInput('addaddr[nickname]', $vcard_safe['firstname'] .
         '-' . $vcard_safe['lastname'], '20');
 
 /*
- * If the vcard comes with an e-mail address it should be added to the
+ * If the vCard comes with an e-mail address it should be added to the
  * 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 {
+    $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>' .
-         addInput('addaddr[email]', '', '20');
+         addInput('addaddr[email]',
+                 getEmail(decodeHeader($from_name)), '20');
 }
 
 echo '</td></tr>' .
@@ -221,7 +224,7 @@ if (count($opts) == 0) {
 
 echo addHidden('addaddr[firstname]', $vcard_safe['firstname']) .
      addHidden('addaddr[lastname]', $vcard_safe['lastname']) .
-     addSubmit(_("Add to Address Book"), 'addaddr[SUBMIT]');
+     addSubmit(_("Add to address book"), 'addaddr[SUBMIT]');
 
 ?>
 </td></tr>
@@ -239,4 +242,4 @@ echo '<a href="../src/download.php?absolute_dl=true&amp;passed_id=' .
 <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