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

diff --git a/functions/mime.php b/functions/mime.php
index 44f198ff48afa9f47eb28c8de4b5824899406023..5e0e82cc38570955c66a3706df909891a7e5f9b0 100644 (file)
--- 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 cd104b9a6c98e87bd50997b15ffceba0ba08b30f..da4a7a63216b2eeb82990789539cd330150b672e 100644 (file)
--- 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 486a222083eded621810f74070b1241981e40c73..3e1f6e35beaf9c46f7a6a165cb3c5b7e2c5f94a9 100644 (file)
--- 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 a333a1eb843dc3d61d0fa1e3ea4f1c88242a563f..fef15fe555e13da7f4dac929abb29eb3ef4c5eba 100644 (file)
--- 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 ebbb24ac0d1157e72bf29dbd750ecfc6533cca44..2ca66d47358b4dc95feb78c68eb968240dc7be98 100644 (file)
--- 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') {