From a48eba8f9a66dfe0aca3b22ac14bbdbeaedf80bf Mon Sep 17 00:00:00 2001 From: jangliss Date: Fri, 7 Mar 2003 17:42:08 +0000 Subject: [PATCH] Fixed incorrect decoding of mailbox name... $_GET vars are already decoded. There are probably a whole bunch of other ones laying about, but this one is fairly big in respect that you can view a folder that has a + in the name (ie test+folder), but you cannot read mail in that folder. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@4610 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- functions/mime.php | 2 +- src/download.php | 1 - src/printer_friendly_bottom.php | 1 - src/read_body.php | 4 ---- 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/functions/mime.php b/functions/mime.php index 5654520f..b957f986 100644 --- a/functions/mime.php +++ b/functions/mime.php @@ -34,7 +34,7 @@ function mime_structure ($bodystructure, $flags=array()) { if (!is_object($msg)) { include_once(SM_PATH . 'functions/display_messages.php'); global $color, $mailbox; - displayPageHeader( $color, urldecode($mailbox) ); + displayPageHeader( $color, $mailbox ); echo "\n\n" . ''; $errormessage = _("SquirrelMail could not decode the bodystructure of the message"); diff --git a/src/download.php b/src/download.php index 16d93dcd..dcbc23a6 100644 --- a/src/download.php +++ b/src/download.php @@ -36,7 +36,6 @@ if ( sqgetGlobalVar('passed_id', $temp, SQ_GET) ) { } /* end globals */ -$mailbox = urldecode($mailbox); global $uid_support; diff --git a/src/printer_friendly_bottom.php b/src/printer_friendly_bottom.php index c93048be..c334b0d2 100644 --- a/src/printer_friendly_bottom.php +++ b/src/printer_friendly_bottom.php @@ -42,7 +42,6 @@ if (!isset($_GET['passed_ent_id'])) { /* end globals */ $pf_cleandisplay = getPref($data_dir, $username, 'pf_cleandisplay'); -$mailbox = urldecode($mailbox); $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); $mbx_response = sqimap_mailbox_select($imapConnection, $mailbox); if (isset($messages[$mbx_response['UIDVALIDITY']][$passed_id])) { diff --git a/src/read_body.php b/src/read_body.php index c3a2ec76..535bcde3 100644 --- a/src/read_body.php +++ b/src/read_body.php @@ -694,10 +694,6 @@ if ( sqgetGlobalVar('startMessage', $temp) ) { /* end of get globals */ global $uid_support, $sqimap_capabilities; -if (isset($mailbox)) { - $mailbox = urldecode( $mailbox ); -} - $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); $mbx_response = sqimap_mailbox_select($imapConnection, $mailbox, false, false, true); -- 2.25.1