X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders.php;h=f727337be6ac07b42effff21ec0c53edafcaa00d;hb=f740c049d91feb836dd9633be9e8ff52c00d066f;hp=23d741048c29af88d67082f43f4fb086c52528ba;hpb=1181f3bf405948537de4f4c020c533f6332e9804;p=squirrelmail.git

diff --git a/src/folders.php b/src/folders.php
index 23d74104..f727337b 100644
--- a/src/folders.php
+++ b/src/folders.php
@@ -12,21 +12,13 @@
     **  $Id$
     **/
 
-   session_start();
-
-   if (!isset($strings_php))
-      include("../functions/strings.php");
-   if (!isset($config_php))
-      include("../config/config.php");
-   if (!isset($page_header_php))
-      include("../functions/page_header.php");
-   if (!isset($imap_php))
-      include("../functions/imap.php");
-   if (!isset($array_php))
-      include("../functions/array.php");
-   if (!isset($plugin_php))
-      include("../functions/plugin.php");
-
+   include('../src/validate.php');
+   include("../functions/strings.php");
+   include("../config/config.php");
+   include("../functions/page_header.php");
+   include("../functions/imap.php");
+   include("../functions/array.php");
+   include("../functions/plugin.php");
    include("../src/load_prefs.php");
 
    displayPageHeader($color, _("None"));
@@ -132,7 +124,7 @@
 	      strtolower($boxes[$i]["unformatted"]) != "inbox.trash"))
 	    {
 	       $box = $boxes[$i]["unformatted-dm"];
-	       $box2 = replace_spaces($boxes[$i]["unformatted-disp"]);
+	       $box2 = str_replace(' ', ' ', $boxes[$i]["unformatted-disp"]);
 	       echo "         <OPTION VALUE=\"$box\">$box2\n";
 	    }
       }
@@ -159,41 +151,20 @@
    echo "<TT><SELECT NAME=subfolder>\n";
    if (strtolower($imap_server_type) != "courier"){
      if ($default_sub_of_inbox == false)
-       echo '<OPTION SELECTED>[ '._("None")." ]\n";
+       echo '<OPTION SELECTED VALUE="">[ '._("None")." ]\n";
      else
-       echo '<OPTION>[ '._("None")." ]\n";
+       echo '<OPTION VALUE="">[ '._("None")." ]\n";
    }
 
    for ($i = 0; $i < count($boxes); $i++) {
-      if (count($boxes[$i]["flags"]) > 0) {
-         $noinf = false;
-         for ($j = 0; $j < count($boxes[$i]["flags"]); $j++) {
-            if ($boxes[$i]["flags"][$j] == "noinferiors") {
-               $noinf = true;
-               continue;
-            }
-         }    
-         if ($noinf == false) {
-            if ((strtolower($boxes[$i]["unformatted"]) == "inbox") && ($default_sub_of_inbox == true)) {
-               $box = $boxes[$i]["unformatted"];
-               $box2 = replace_spaces($boxes[$i]["unformatted-disp"]);
-               echo "<OPTION SELECTED VALUE=\"$box\">$box2\n";
-            } else {
-               $box = $boxes[$i]["unformatted"];
-               $box2 = replace_spaces($boxes[$i]["unformatted-disp"]);
-               if (strtolower($imap_server_type) != "courier" ||
-                  strtolower($box) != "inbox.trash")
-                echo "<OPTION VALUE=\"$box\">$box2\n";
-            }
-         }
-      } else {
+      if (!in_array('noinferiors', $boxes[$i]['flags'])) {
          if ((strtolower($boxes[$i]["unformatted"]) == "inbox") && ($default_sub_of_inbox == true)) {
             $box = $boxes[$i]["unformatted"];
-            $box2 = replace_spaces($boxes[$i]["unformatted-disp"]);
+            $box2 = str_replace(' ', '&nbsp;', $boxes[$i]["unformatted-disp"]);
             echo "<OPTION SELECTED VALUE=\"$box\">$box2\n";
          } else {
             $box = $boxes[$i]["unformatted"];
-            $box2 = replace_spaces($boxes[$i]["unformatted-disp"]);
+            $box2 = str_replace(' ', '&nbsp;', $boxes[$i]["unformatted-disp"]);
            if (strtolower($imap_server_type) != "courier" ||
                strtolower($box) != "inbox.trash")
              echo "<OPTION VALUE=\"$box\">$box2\n";
@@ -227,7 +198,7 @@
 	     ($boxes[$i]["unformatted"] != $sent_folder)) 
 	    {	
 	       $box = $boxes[$i]["unformatted-dm"];
-	       $box2 = replace_spaces($boxes[$i]["unformatted-disp"]);
+	       $box2 = str_replace(' ', '&nbsp;', $boxes[$i]["unformatted-disp"]);
 	       if (strtolower($imap_server_type) != "courier" || strtolower($box) != "inbox.trash")
 		  echo "<OPTION VALUE=\"$box\">$box2\n";
 	    }
@@ -260,7 +231,7 @@
 	     ($boxes[$i]["unformatted"] != $sent_folder)) 
 	    {	
 	       $box = $boxes[$i]["unformatted-dm"];
-	       $box2 = replace_spaces($boxes[$i]["unformatted-disp"]);
+	       $box2 = str_replace(' ', '&nbsp;', $boxes[$i]["unformatted-disp"]);
 	       echo "         <OPTION VALUE=\"$box\">$box2\n";
 	    }
       }