X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fvcard.php;h=c96dab567ede1657accf722b87142d8c41b4c45d;hb=2841ba1579830841e23ff7b5eb15e4230fce8e14;hp=46207d5c5f427014b1efba91f421a5e452be27d6;hpb=6b4bd11ff9e790990d819c03a04eab069d52e0d6;p=squirrelmail.git

diff --git a/src/vcard.php b/src/vcard.php
index 46207d5c..c96dab56 100644
--- a/src/vcard.php
+++ b/src/vcard.php
@@ -3,19 +3,38 @@
 /**
  * vcard.php
  *
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * 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
  *
- * $Id$
+ * @version $Id$
+ * @package squirrelmail
  */
 
-require_once('../src/validate.php');
-require_once('../functions/date.php');
-require_once('../functions/page_header.php');
-require_once('../functions/mime.php');
-require_once('../src/load_prefs.php');
+/**
+ * Path for SquirrelMail required files.
+ * @ignore
+ */
+Define('SM_PATH','../');
+
+/* 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');
+
+/* 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);
+sqgetGlobalVar('ent_id', $ent_id, SQ_GET);
+sqgetGlobalVar('startMessage', $startMessage, SQ_GET);
+/* end globals */
 
 $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
 sqimap_mailbox_select($imapConnection, $mailbox);
@@ -23,29 +42,27 @@ sqimap_mailbox_select($imapConnection, $mailbox);
 
 displayPageHeader($color, 'None');
 
-echo '<br>' .
-    html_tag( 'table', '', 'center', '', 'width="100%" border="0" cellspacing="0" cellpadding="2"' ) ."\n" .
-    html_tag( 'tr' ) . "\n" .
-    html_tag( 'td', '', 'left', $color[0] ) .
-        '<b><center>' .
-        _("Viewing a Business Card") . ' - ';
-if (isset($where) && isset($what)) {
-    // from a search
-    echo '<a href="../src/read_body.php?mailbox=' . urlencode($mailbox) .
-            '&amp;passed_id=' . $passed_id . '&amp;where=' . urlencode($where) .
-            '&amp;what=' . urlencode($what). '">' . _("View message") . '</a>';
-} else {
-    echo '<a href="../src/read_body.php?mailbox=' . urlencode($mailbox) .
-        '&amp;passed_id=' . $passed_id . '&amp;startMessage=' . $startMessage .
-        '&amp;show_more=0">' . _("View message") . '</a>';
-}
+echo '<br /><table width="100%" border="0" cellspacing="0" cellpadding="2" ' .
+        'align="center">' . "\n" .
+     '<tr><td bgcolor="' . $color[0] . '">' .
+     '<b><center>' .
+     _("Viewing a Business Card") . " - ";
+
+$msg_url = 'read_body.php?mailbox='.urlencode($mailbox).
+    '&amp;startMessage='.urlencode($startMessage).
+    '&amp;passed_id='.urlencode($passed_id);
+
+$msg_url = set_url_var($msg_url, 'ent_id', 0);
+
+echo '<a href="'.$msg_url.'">'. _("View message") . '</a>';
+
 echo '</center></b></td></tr>';
 
 $message = sqimap_get_message($imapConnection, $passed_id, $mailbox);
 
-$entity_vcard = getEntity($message,$passed_ent_id);
+$entity_vcard = getEntity($message,$ent_id);
 
-$vcard = mime_fetch_body ($imapConnection, $passed_id, $passed_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) {
@@ -57,7 +74,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);
@@ -66,17 +83,19 @@ 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 html_tag( 'tr',
-               html_tag( 'td', 'vCard Version ' . $vcard_nice['version'] .
-                    ' is not supported.  Some information might not be converted ' .
-                    'correctly.' ,
-               'center' )
-           ) . "\n";
+    echo '<tr><td align="center">' .
+         sprintf(_("vCard Version %s is not supported. Some information might not be converted correctly."),$vcard_nice['version']) .
+         "</td></tr>\n";
 }
 
 foreach ($vcard_nice as $k => $v) {
@@ -98,13 +117,14 @@ $ShowValues = array(
     'tel;fax' =>        _("Fax"),
     'note' =>           _("Note"));
 
-echo html_tag( 'tr' ) . html_tag( 'td', '', 'left' ) . '<br>' .
-        html_tag( 'table', '', 'center', '', 'border="0" cellpadding="2" cellspacing="0"' ) . "\n";
+echo '<tr><td><br />' .
+     '<table border="0" cellpadding="2" cellspacing="0" align="center">' . "\n";
 
-if (isset($vcard_safe['email;internet'])) {     $vcard_safe['email;internet'] = '<a href="../src/compose.php?send_to=' .
-        $vcard_safe['email;internet'] . '">' . $vcard_safe['email;internet'] .
-        '</a>';
+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'] = '<a href="' . $vcard_safe['url'] . '">' .
         $vcard_safe['url'] . '</a>';
@@ -112,114 +132,86 @@ if (isset($vcard_safe['url'])) {
 
 foreach ($ShowValues as $k => $v) {
     if (isset($vcard_safe[$k]) && $vcard_safe[$k])     {
-        echo html_tag( 'tr',
-                   html_tag( 'td', '<b>' . $v . ':</b>', 'right' ) .
-                   html_tag( 'td', $vcard_safe[$k], 'left' )
-               ) . "\n";
+        echo "<tr><td align=\"right\"><b>$v:</b></td><td>" . $vcard_safe[$k] .
+                "</td><tr>\n";
     }
 }
 
 echo '</table>' .
-        '<br>' .
-        '</td></tr></table>' .
-        html_tag( 'table', '', 'center', '', 'border="0" cellpadding="2" cellspacing="0" width="100%"' ) . "\n";
-        html_tag( 'tr',
-            html_tag( 'td',
-                '<b><center>' .
-                _("Add to Addressbook") . '</b></center>' ,
-            'left', $color[0] )
-        ) .
-        html_tag( 'tr' ) .
-        html_tag( 'td', '', 'center' ) .
-        '<form action="../src/addressbook.php" method="post" name="f_add">' .
-        html_tag( 'table', '', 'center', '', 'border="0" cellpadding="2" cellspacing="0" width="100%"' ) .
-        html_tag( 'tr',
-            html_tag( 'td',
-                '<b>Nickname:</b>' ,
-            'right' ) .
-            html_tag( 'td',
-                '<input type=text name="addaddr[nickname]" size=20 value="' .
-                $vcard_safe['firstname'] . '-' . $vcard_safe['lastname'] . '">' ,
-            'left' )
-        ) .
-        html_tag( 'tr' ) .
-        html_tag( 'td', '<b>Note Field Contains:</b>', 'right' ) .
-        html_tag( 'td', '', 'left' ) .
-        '<select name="addaddr[label]">';
-
+     '<br />' .
+     '</td></tr></table>' .
+     '<table width="100%" border="0" cellspacing="0" cellpadding="2" ' .
+        'align="center">' .
+     '<tr>' .
+     '<td bgcolor="' . $color[0] . '">' .
+     '<b><center>' .
+     _("Add to Addressbook") .
+     '</td></tr>' .
+     '<tr><td align="center">' .
+     addForm('../src/addressbook.php', 'post', 'f_add') .
+     '<table border="0" cellpadding="2" cellspacing="0" align="center">' .
+     '<tr><td align="right"><b>' . _("Nickname:") . '</b></td>' .
+     '<td>'.
+     addInput('addaddr[nickname]', $vcard_safe['firstname'] . '-' . $vcard_safe['lastname'], '20').
+     '</td></tr>' .
+     '<tr><td align="right"><b>' . _("Note Field Contains:") . '</b></td><td>' ;
+
+$opts = array();
 if (isset($vcard_nice['url'])) {
-    echo '<option value="' . htmlspecialchars($vcard_nice['url']) .
-        '">' . _("Web Page") . "</option>\n";
+    $opts[$vcard_nice['url']] = _("Web Page");
 }
 if (isset($vcard_nice['adr'])) {
-    echo '<option value="' . $vcard_nice['adr'] .
-        '">' . _("Address") . "</option>\n";
+    $opts[$vcard_nice['adr']] = _("Address");
 }
 if (isset($vcard_nice['title'])) {
-    echo '<option value="' . $vcard_nice['title'] .
-        '">' . _("Title") . "</option>\n";
+    $opts[$vcard_nice['title']] = _("Title");
 }
 if (isset($vcard_nice['org'])) {
-    echo '<option value="' . $vcard_nice['org'] .
-        '">' . _("Organization / Department") . "</option>\n";
+    $opts[$vcard_nice['org']] = _("Organization / Department");
 }
 if (isset($vcard_nice['title'])) {
-    echo '<option value="' . $vcard_nice['title'] .
-        '; ' . $vcard_nice['org'] .
-        '">' . _("Title & Org. / Dept.") . "</option>\n";
+    $opts[$vcard_nice['title'].'; '.$vcard_nice['org']] = _("Title & Org. / Dept.");
 }
 if (isset($vcard_nice['tel;work'])) {
-    echo '<option value="' . $vcard_nice['tel;work'] .
-        '">' . _("Work Phone") . "</option>\n";
+    $opts[$vcard_nice['tel;work']] = _("Work Phone");
 }
 if (isset($vcard_nice['tel;home'])) {
-    echo '<option value="' . $vcard_nice['tel;home'] .
-        '">' . _("Home Phone") . "</option>\n";
+    $opts[$vcard_nice['tel;home']] = _("Home Phone");
 }
 if (isset($vcard_nice['tel;cell'])) {
-    echo '<option value="' . $vcard_nice['tel;cell'] .
-        '">' . _("Cellular Phone") . "</option>\n";
+    $opts[$vcard_nice['tel;cell']] = _("Cellular Phone");
 }
 if (isset($vcard_nice['tel;fax'])) {
-    echo '<option value="' . $vcard_nice['tel;fax'] .
-        '">' . _("Fax") . "</option>\n";
+    $opts[$vcard_nice['tel;fax']] = _("Fax");
 }
 if (isset($vcard_nice['note'])) {
-    echo '<option value="' . $vcard_nice['note'] .
-        '">' . _("Note") . "</option>\n";
-}
-echo '</select>' .
-        '</td></tr>' .
-        html_tag( 'tr',
-            html_tag( 'td',
-                '<input name="addaddr[email]" type=hidden value="' .
-                htmlspecialchars($vcard_nice['email;internet']) . '">' .
-                '<input name="addaddr[firstname]" type=hidden value="' .
-                $vcard_safe['firstname'] . '">' .
-                '<input name="addaddr[lastname]" type=hidden value="' .
-                $vcard_safe['lastname'] . '">' .
-                '<input type="submit" name="addaddr[SUBMIT]" ' .
-                'value="Add to Address Book">' ,
-            'center', '', 'colspan="2"' )
-        ) .
-        '</table>' .
-        '</form>' .
-        '</td></tr>' .
-        html_tag( 'tr',
-            html_tag( 'td',
-                '<a href="../src/download.php?absolute_dl=true&amp;passed_id=' .
-                $passed_id . '&amp;mailbox=' . urlencode($mailbox) .
-                '&amp;passed_ent_id=' . $passed_ent_id . '">' .
-                _("Download this as a file") . '</a>' ,
-            'center' )
-        ) .
-        '</table>' .
-
-        html_tag( 'table',
-            html_tag( 'tr',
-                html_tag( 'td', '&nbsp;', 'left', $color[4] )
-            ) ,
-        'center', '', 'border="0" cellspacing="0" cellpadding="2"' ) .
-        '</body></html>';
+    $opts[$vcard_nice['note']] = _("Note");
+}
 
+echo    addSelect('addaddr[label]', $opts, '', TRUE);
+?>
+</td></tr>
+<tr><td colspan="2" align="center">
+<?php
+echo addHidden('addaddr[email]', $vcard_nice['email;internet']).
+     addHidden('addaddr[firstname]', $vcard_safe['firstname']).
+     addHidden('addaddr[lastname]', $vcard_safe['lastname']).
+     addSubmit(_("Add to Address Book"), 'addaddr[SUBMIT]');
+?>
+</td></tr>
+</table>
+</form>
+</td></tr>
+<tr><td align="center">
+<?php
+echo '<a href="../src/download.php?absolute_dl=true&amp;passed_id='.
+     urlencode($passed_id) . '&amp;mailbox=' . urlencode($mailbox) .
+     '&amp;ent_id=' . urlencode($ent_id) .'">'.
+     _("Download this as a file") . '</a>';
 ?>
+</td></tr></table>
+
+<table border="0" cellspacing="0" cellpadding="2" align="center">
+<tr><td bgcolor="<?php echo $color[4]; ?>">
+</td></tr></table>
+</body></html>