Fix for 566887 (Dispalying of folders names with blanks)

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2942 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/folders.php b/src/folders.php
index 26b9709b85d92353bd7fcd4a4f5283fb5b888ee3..5c023af17970c7edd122449e9bd31e29ebd2e64c 100644 (file)
--- a/src/folders.php
+++ b/src/folders.php
@@ -83,13 +83,13 @@ for ($i = 0; $i < count($boxes); $i++) {
             $default_sub_of_inbox) {
 
             $box = $boxes[$i]['unformatted'];
-            $box2 = imap_utf7_decode_local(
-                     str_replace(' ', '&nbsp;', $boxes[$i]['unformatted-disp']));
+            $box2 = str_replace(' ', '&nbsp;',
+                                imap_utf7_decode_local($boxes[$i]['unformatted-disp']));
             echo "<OPTION SELECTED VALUE=\"$box\">$box2</option>\n";
         } else {
             $box = $boxes[$i]['unformatted'];
-            $box2 = imap_utf7_decode_local(
-                     str_replace(' ', '&nbsp;', $boxes[$i]['unformatted-disp']));
+            $box2 = str_replace(' ', '&nbsp;',
+                                imap_utf7_decode_local($boxes[$i]['unformatted-disp'])); 
             if (strtolower($imap_server_type) != 'courier' ||
                   strtolower($box) != "inbox.trash")
                 echo "<OPTION VALUE=\"$box\">$box2</option>\n";
@@ -153,8 +153,8 @@ if ($count_special_folders < count($boxes)) {
             ($boxes[$i]['unformatted'] != $draft_folder)) {
             $box = $boxes[$i]['unformatted-dm'];
 
-            $box2 = imap_utf7_decode_local(
-                     str_replace(' ', '&nbsp;', $boxes[$i]['unformatted-disp']));
+            $box2 = str_replace(' ', '&nbsp;',
+                                imap_utf7_decode_local($boxes[$i]['unformatted-disp']));
             if (strtolower($imap_server_type) != 'courier' || strtolower($box) != 'inbox.trash') {
                 echo "<OPTION VALUE=\"$box\">$box2</option>\n";
             }
@@ -192,8 +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 = imap_utf7_decode_local(
-                     str_replace(' ', '&nbsp;', $boxes[$i]['unformatted-disp']));
+            $box2 = str_replace(' ', '&nbsp;',
+                                imap_utf7_decode_local($boxes[$i]['unformatted-disp']));
             echo "         <OPTION VALUE=\"$box\">$box2</option>\n";
         }
     }
@@ -223,8 +223,8 @@ if ($count_special_folders < count($boxes)) {
             ($boxes[$i]["unformatted"] != $sent_folder) &&
             ($boxes[$i]["unformatted"] != $draft_folder)) {
             $box = $boxes[$i]["unformatted-dm"];
-            $box2 = imap_utf7_decode_local(
-                     str_replace(' ', '&nbsp;', $boxes[$i]["unformatted-disp"]));
+            $box2 = str_replace(' ', '&nbsp;',
+                                imap_utf7_decode_local($boxes[$i]["unformatted-disp"]));
             echo "         <OPTION VALUE=\"$box\">$box2\n";
         }
     }

diff --git a/src/search.php b/src/search.php
index 1c29fe064158efa19bb1960c49c0314f377c9b88..1888e9e1d9e2c1a64e83f7045406ea80c84dbd76 100644 (file)
--- a/src/search.php
+++ b/src/search.php
@@ -313,7 +313,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 = imap_utf7_decode_local(str_replace(' ', '&nbsp;', $boxes[$i]['unformatted-disp']));
+        $box2 = str_replace(' ', '&nbsp;', 
+                         imap_utf7_decode_local($boxes[$i]['unformatted-disp']));
         if( $box2 == 'INBOX' ) {
             $box2 = _("INBOX");
         }