fixed bug that didn't display folders with spaces in the name

[squirrelmail.git] / src / options_folder.php

diff --git a/src/options_folder.php b/src/options_folder.php
index d1cc444fd8de7021684fae62408704c0856bc98b..dd5f21f0579c4abb1f70a50eacbb9815dbf3c7aa 100644 (file)
--- a/src/options_folder.php
+++ b/src/options_folder.php
@@ -10,26 +10,17 @@
     **  $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($display_messages_php))
-      include('../functions/display_messages.php');
-   if (!isset($imap_php))
-      include('../functions/imap.php');
-   if (!isset($array_php))
-      include('../functions/array.php');
-   if (!isset($i18n_php))
-      include('../functions/i18n.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/display_messages.php');
+   include('../functions/imap.php');
+   include('../functions/array.php');
+   include('../functions/i18n.php');
+   include('../functions/plugin.php');
    include('../src/load_prefs.php');
+   
    displayPageHeader($color, 'None');
 
    $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
@@ -136,7 +127,7 @@
                <?php echo _("Collapseable folders"); ?>:
             </td>
             <td>
-               <input type=checkbox name=collapsefolders <?php if ($collapse_folders) echo " checked"; ?>>
+               <input type=checkbox name=collapsefolders <?php if (isset($collapse_folders) && $collapse_folders) echo " checked"; ?>>
                 <?php echo _("Enable Collapseable Folders"); ?>
             </td>
          </tr>