Incorrect columns were passed through calcfetchColumns with as result the

[squirrelmail.git] / src / vcard.php

diff --git a/src/vcard.php b/src/vcard.php
index b4f77e5a8f57f5f65033bf0fd5cc0503088d3450..995afb8cca231e5098e844eab505b50cac5d1a77 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
  */
@@ -19,7 +18,7 @@
 Define('SM_PATH','../');
 
 /* SquirrelMail required files. */
-require_once(SM_PATH . 'include/validate.php');
+include_once(SM_PATH . 'include/validate.php');
 require_once(SM_PATH . 'functions/mime.php');
 require_once(SM_PATH . 'functions/url_parser.php');
 
@@ -41,7 +40,7 @@ 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 +50,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 +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"),
@@ -141,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>
+<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 />
@@ -225,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>
@@ -243,4 +242,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');
+?>
\ No newline at end of file