X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders.php;h=5c023af17970c7edd122449e9bd31e29ebd2e64c;hb=565020a5098bcf897fbbd1d2a2723849e8dfd732;hp=63562be77a7ff94c4625bbbce056d24ab57b22c8;hpb=11f6f685916051e54fb7b728d76fdd6f5a62fe18;p=squirrelmail.git
diff --git a/src/folders.php b/src/folders.php
index 63562be7..5c023af1 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(' ', ' ', $boxes[$i]['unformatted-disp']);
+ $box2 = str_replace(' ', ' ',
+ imap_utf7_decode_local($boxes[$i]['unformatted-disp']));
echo "\n";
} else {
$box = $boxes[$i]['unformatted'];
- $box2 = str_replace(' ', ' ', $boxes[$i]['unformatted-disp']);
+ $box2 = str_replace(' ', ' ',
+ imap_utf7_decode_local($boxes[$i]['unformatted-disp']));
if (strtolower($imap_server_type) != 'courier' ||
strtolower($box) != "inbox.trash")
echo "\n";
@@ -149,7 +153,8 @@ if ($count_special_folders < count($boxes)) {
($boxes[$i]['unformatted'] != $draft_folder)) {
$box = $boxes[$i]['unformatted-dm'];
- $box2 = str_replace(' ', ' ', $boxes[$i]['unformatted-disp']);
+ $box2 = str_replace(' ', ' ',
+ imap_utf7_decode_local($boxes[$i]['unformatted-disp']));
if (strtolower($imap_server_type) != 'courier' || strtolower($box) != 'inbox.trash') {
echo "\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(' ', ' ', $boxes[$i]['unformatted-disp']);
+ $box2 = str_replace(' ', ' ',
+ imap_utf7_decode_local($boxes[$i]['unformatted-disp']));
echo " \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(' ', ' ', $boxes[$i]["unformatted-disp"]);
+ $box2 = str_replace(' ', ' ',
+ imap_utf7_decode_local($boxes[$i]["unformatted-disp"]));
echo "