X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fvcard.php;h=8d61d4ea46000a93f0125904b870938ea901f873;hb=64033e1c54e52d462f6dbb93c3bb06a5c0050865;hp=210c5d6878e78f2745c8773828cb3e8f51327677;hpb=6c84ba1ec45ab854c37b6f65c5b4d84ab1c7aad4;p=squirrelmail.git

diff --git a/src/vcard.php b/src/vcard.php
index 210c5d68..8d61d4ea 100644
--- a/src/vcard.php
+++ b/src/vcard.php
@@ -3,30 +3,34 @@
 /**
  * vcard.php
  *
- * Copyright (c) 1999-2005 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
  */
 
 /**
- * Path for SquirrelMail required files.
- * @ignore
+ * Include the SquirrelMail initialization file.
  */
-Define('SM_PATH','../');
+require('../include/init.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');
+
+/** 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 */
-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);
@@ -34,14 +38,14 @@ 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, 'None');
 
 echo '<br /><table width="100%" border="0" cellspacing="0" cellpadding="2" ' .
         'align="center">' . "\n" .
-     '<tr><td bgcolor="' . $color[0] . '"><b><center>' .
+     '<tr><td bgcolor="' . $color[0] . '"><b><div style="text-align: center;">' .
      _("Viewing a Business Card") . " - ";
 
 $msg_url = 'read_body.php?mailbox='.urlencode($mailbox).
@@ -51,7 +55,7 @@ $msg_url = 'read_body.php?mailbox='.urlencode($mailbox).
 $msg_url = set_url_var($msg_url, 'ent_id', 0);
 
 echo '<a href="'.$msg_url.'">'. _("View message") . '</a>' .
-     '</center></b></td></tr>';
+     '</div></b></td></tr>';
 
 $message = sqimap_get_message($imapConnection, $passed_id, $mailbox);
 
@@ -105,7 +109,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"),
@@ -141,7 +145,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>
+<div style="text-align: center;"><b><?php echo _("Add to address book"); ?></b></div>
 </td></tr>
 <tr><td align="center">
 <?php echo addForm('../src/addressbook.php', 'post', 'f_add'); ?><br />
@@ -189,7 +193,7 @@ if (isset($vcard_nice['org'])) {
     $opts[$vcard_nice['org']] = _("Organization / Department");
 }
 if (isset($vcard_nice['title'])) {
-    $opts[$vcard_nice['title'].'; '.$vcard_nice['org']] = _("Title & Org. / Dept.");
+    $opts[$vcard_nice['title'].'; '.$vcard_nice['org']] = _("Title &amp; Org. / Dept.");
 }
 if (isset($vcard_nice['tel;work'])) {
     $opts[$vcard_nice['tel;work']] = _("Work Phone");
@@ -225,7 +229,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>
@@ -243,4 +247,6 @@ 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>
\ No newline at end of file
+<?php
+$oTemplate->display('footer.tpl');
+?>