From fdc9d9b593d6588e23877751d42ee6ca29e0ba6a Mon Sep 17 00:00:00 2001
From: jangliss <jangliss@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Sat, 8 Mar 2003 05:01:56 +0000
Subject: [PATCH] A few more unnecessary urldecodes when not needed.  Now we
 can view headers and text of a message when viewing a mailbox with + in the
 name.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@4621 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 functions/mime.php  | 2 +-
 src/vcard.php       | 2 +-
 src/view_header.php | 2 +-
 src/view_text.php   | 2 +-
 src/webmail.php     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/functions/mime.php b/functions/mime.php
index 44f198ff..5e0e82cc 100644
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -396,7 +396,7 @@ function formatAttachments($message, $exclude_id, $mailbox, $id) {
     $urlMailbox = urlencode($mailbox);
 
     foreach ($att_ar as $att) {
-        $ent = urldecode($att->entity_id);
+        $ent = $att->entity_id;
         $header = $att->header;
         $type0 = strtolower($header->type0);
         $type1 = strtolower($header->type1);
diff --git a/src/vcard.php b/src/vcard.php
index cd104b9a..da4a7a63 100644
--- a/src/vcard.php
+++ b/src/vcard.php
@@ -25,7 +25,7 @@ require_once(SM_PATH . 'include/load_prefs.php');
 $key  = $_COOKIE['key'];
 $username = $_SESSION['username'];
 $onetimepad = $_SESSION['onetimepad'];
-$mailbox = urldecode($_GET['mailbox']);
+$mailbox = $_GET['mailbox'];
 $passed_id = (int) $_GET['passed_id'];
 $ent_id = $_GET['ent_id'];
 $startMessage = (int) $_GET['startMessage'];
diff --git a/src/view_header.php b/src/view_header.php
index 486a2220..3e1f6e35 100644
--- a/src/view_header.php
+++ b/src/view_header.php
@@ -107,7 +107,7 @@ if ( sqgetGlobalVar('passed_id', $temp, SQ_GET) ) {
   $passed_id = (int) $temp;
 }
 if ( sqgetGlobalVar('mailbox', $temp, SQ_GET) ) {
-  $mailbox = urldecode($temp);
+  $mailbox = $temp;
 }
 if ( !sqgetGlobalVar('passed_ent_id', $passed_ent_id, SQ_GET) ) {
   $passed_ent_id = '';
diff --git a/src/view_text.php b/src/view_text.php
index a333a1eb..fef15fe5 100644
--- a/src/view_text.php
+++ b/src/view_text.php
@@ -32,7 +32,7 @@ sqgetGlobalVar('messages', $messages);
 sqgetGlobalVar('passed_id', $passed_id, SQ_GET);
 
 if ( sqgetGlobalVar('mailbox', $temp, SQ_GET) ) {
-  $mailbox = urldecode($temp);
+  $mailbox = $temp;
 }
 if ( !sqgetGlobalVar('ent_id', $ent_id, SQ_GET) ) {
   $ent_id = '';
diff --git a/src/webmail.php b/src/webmail.php
index ebbb24ac..2ca66d47 100644
--- a/src/webmail.php
+++ b/src/webmail.php
@@ -129,7 +129,7 @@ if ($right_frame == 'right_main.php') {
 } else if ($right_frame == '') {
     $right_frame_url = 'right_main.php';
 } else {
-    $right_frame_url =  urldecode($right_frame);
+    $right_frame_url =  $right_frame;
 }
 
 if ($location_of_bar == 'right') {
-- 
2.25.1