From 846a3a21ff43063ac5e7d77a686010df3fe0fb2d Mon Sep 17 00:00:00 2001 From: stekkel Date: Wed, 25 Sep 2002 18:41:54 +0000 Subject: [PATCH] rg=0 updates git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@3738 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- functions/attachment_common.php | 16 ++++++++++------ src/vcard.php | 10 +++++----- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/functions/attachment_common.php b/functions/attachment_common.php index 3ee385a3..4033468b 100644 --- a/functions/attachment_common.php +++ b/functions/attachment_common.php @@ -27,6 +27,7 @@ $FileExtensionToMimeType = array('bmp' => 'image/x-bitmap', 'txt' => 'text/plain', 'vcf' => 'text/x-vcard'); + /* Register browser-supported image types */ if (isset($attachment_common_types)) { /* Don't run this before being logged in. That may happen @@ -93,8 +94,8 @@ function attachment_common_link_text(&$Args) $Args[1]['attachment_common']['href'] = Where it links to This sets the 'href' of this plugin for a new link. */ - - global $QUERY_STRING; + $QUERY_STRING = $_SERVER['QUERY_STRING'];; + $Args[1]['attachment_common']['href'] = '../src/view_text.php?'. $QUERY_STRING; $Args[1]['attachment_common']['href'] = set_url_var($Args[1]['attachment_common']['href'], @@ -128,9 +129,10 @@ function attachment_common_link_message(&$Args) } -function attachment_common_link_html(&$Args) +function attachment_common_link_html(&$Args) { - global $QUERY_STRING; + $QUERY_STRING = $_SERVER['QUERY_STRING'];; + $Args[1]['attachment_common']['href'] = '../src/view_text.php?'. $QUERY_STRING. /* why use the overridetype? can this be removed */ '&override_type0=text&override_type1=html'; @@ -145,7 +147,9 @@ function attachment_common_link_html(&$Args) function attachment_common_link_image(&$Args) { + $QUERY_STRING = $_SERVER['QUERY_STRING'];; global $attachment_common_show_images, $attachment_common_show_images_list; + $info['passed_id'] = $Args[3]; $info['mailbox'] = $Args[4]; @@ -153,7 +157,6 @@ function attachment_common_link_image(&$Args) $attachment_common_show_images_list[] = $info; - global $QUERY_STRING; $Args[1]['attachment_common']['href'] = '../src/image.php?'. $QUERY_STRING; $Args[1]['attachment_common']['href'] = set_url_var($Args[1]['attachment_common']['href'], @@ -168,7 +171,8 @@ function attachment_common_link_image(&$Args) function attachment_common_link_vcard(&$Args) { - global $QUERY_STRING; + $QUERY_STRING = $_SERVER['QUERY_STRING'];; + $Args[1]['attachment_common']['href'] = '../src/vcard.php?'. $QUERY_STRING; $Args[1]['attachment_common']['href'] = set_url_var($Args[1]['attachment_common']['href'], diff --git a/src/vcard.php b/src/vcard.php index 4c3790a2..b242a68f 100644 --- a/src/vcard.php +++ b/src/vcard.php @@ -12,7 +12,7 @@ */ /* Path for SquirrelMail required files. */ -define('SM_PATH','../'); +Define('SM_PATH','../'); /* SquirrelMail required files. */ require_once(SM_PATH . 'include/validate.php'); @@ -24,12 +24,12 @@ require_once(SM_PATH . 'include/load_prefs.php'); /* globals */ $key = $_COOKIE['key']; $username = $_SESSION['username']; -$onetimepad = $_SESISON['onetimepad']; - -$mailbox = $_GET['mailbox']; +$onetimepad = $_SESSION['onetimepad']; +$mailbox = decodeHeader($_GET['mailbox']); $passed_id = $_GET['passed_id']; +$ent_id = $_GET['ent_id']; $passed_ent_id = $_GET['passed_ent_id']; - +$QUERY_STRING = $_SERVER['QUERY_STRING']; /* end globals */ $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); -- 2.25.1