From 994163eb8736c770db8cd848a043f41d19e553e6 Mon Sep 17 00:00:00 2001
From: centaurix <centaurix@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Thu, 16 May 2002 12:17:49 +0000
Subject: [PATCH] patch #551871 for feature request #545070 from Stefan Tietke
 (stfn) regarding ut f7 imap encoding

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2834 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 src/folders.php | 19 +++++++++++++------
 src/search.php  |  4 +++-
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/folders.php b/src/folders.php
index 63562be7..26b9709b 100644
--- a/src/folders.php
+++ b/src/folders.php
@@ -14,6 +14,7 @@
  */
 
 require_once('../src/validate.php');
+require_once('../functions/imap_utf7_decode_local.php');
 require_once('../functions/imap.php');
 require_once('../functions/array.php');
 require_once('../functions/plugin.php');
@@ -80,12 +81,15 @@ for ($i = 0; $i < count($boxes); $i++) {
     if (!in_array('noinferiors', $boxes[$i]['flags'])) {
         if ((strtolower($boxes[$i]['unformatted']) == 'inbox') &&
             $default_sub_of_inbox) {
+
             $box = $boxes[$i]['unformatted'];
-            $box2 = str_replace(' ', '&nbsp;', $boxes[$i]['unformatted-disp']);
+            $box2 = imap_utf7_decode_local(
+		      str_replace(' ', '&nbsp;', $boxes[$i]['unformatted-disp']));
             echo "<OPTION SELECTED VALUE=\"$box\">$box2</option>\n";
         } else {
             $box = $boxes[$i]['unformatted'];
-            $box2 = str_replace(' ', '&nbsp;', $boxes[$i]['unformatted-disp']);
+            $box2 = imap_utf7_decode_local(
+		      str_replace(' ', '&nbsp;', $boxes[$i]['unformatted-disp']));
             if (strtolower($imap_server_type) != 'courier' ||
                   strtolower($box) != "inbox.trash")
                 echo "<OPTION VALUE=\"$box\">$box2</option>\n";
@@ -149,7 +153,8 @@ if ($count_special_folders < count($boxes)) {
             ($boxes[$i]['unformatted'] != $draft_folder)) {
             $box = $boxes[$i]['unformatted-dm'];
 
-            $box2 = str_replace(' ', '&nbsp;', $boxes[$i]['unformatted-disp']);
+            $box2 = imap_utf7_decode_local(
+		      str_replace(' ', '&nbsp;', $boxes[$i]['unformatted-disp']));
             if (strtolower($imap_server_type) != 'courier' || strtolower($box) != 'inbox.trash') {
                 echo "<OPTION VALUE=\"$box\">$box2</option>\n";
             }
@@ -187,7 +192,8 @@ if ($count_special_folders < count($boxes)) {
             ((strtolower($imap_server_type) != 'courier') ||
              (strtolower($boxes[$i]['unformatted']) != 'inbox.trash'))) {
             $box = $boxes[$i]['unformatted-dm'];
-            $box2 = str_replace(' ', '&nbsp;', $boxes[$i]['unformatted-disp']);
+            $box2 = imap_utf7_decode_local(
+		      str_replace(' ', '&nbsp;', $boxes[$i]['unformatted-disp']));
             echo "         <OPTION VALUE=\"$box\">$box2</option>\n";
         }
     }
@@ -217,7 +223,8 @@ if ($count_special_folders < count($boxes)) {
             ($boxes[$i]["unformatted"] != $sent_folder) &&
             ($boxes[$i]["unformatted"] != $draft_folder)) {
             $box = $boxes[$i]["unformatted-dm"];
-            $box2 = str_replace(' ', '&nbsp;', $boxes[$i]["unformatted-disp"]);
+            $box2 = imap_utf7_decode_local(
+		      str_replace(' ', '&nbsp;', $boxes[$i]["unformatted-disp"]));
             echo "         <OPTION VALUE=\"$box\">$box2\n";
         }
     }
@@ -250,7 +257,7 @@ for ($i = 0, $q = 0; $i < count($boxes_all); $i++) {
     }
     if ($use_folder == true) {
         $box[$q] = $boxes_all[$i]["unformatted-dm"];
-        $box2[$q] = $boxes_all[$i]["unformatted-disp"];
+        $box2[$q] = imap_utf7_decode_local($boxes_all[$i]["unformatted-disp"]);
         $q++;
     }
 }
diff --git a/src/search.php b/src/search.php
index 3d49744e..321226ec 100644
--- a/src/search.php
+++ b/src/search.php
@@ -12,6 +12,7 @@
 require_once('../src/validate.php');
 require_once('../functions/imap.php');
 require_once('../functions/imap_search.php');
+require_once('../functions/imap_utf7_decode_local.php');
 require_once('../functions/array.php');
 require_once('../functions/strings.php');
 
@@ -307,7 +308,8 @@ echo '<B>' . _("Current Search") . '</B>'
 for ($i = 0; $i < count($boxes); $i++) {
     if (!in_array('noselect', $boxes[$i]['flags'])) {
         $box = $boxes[$i]['unformatted'];
-        $box2 = str_replace(' ', '&nbsp;', $boxes[$i]['unformatted-disp']);
+        $box2 = imap_utf7_decode_local(
+		  str_replace(' ', '&nbsp;', $boxes[$i]['unformatted-disp']));
         if( $box2 == 'INBOX' ) {
             $box2 = _("INBOX");
         }
-- 
2.25.1