Minor update to quote who code.

[squirrelmail.git] / src / options_folder.php

diff --git a/src/options_folder.php b/src/options_folder.php
index d1cc444fd8de7021684fae62408704c0856bc98b..1f05f8ba6533e2371a7e8693b3566a8c70ecc90e 100644 (file)
--- a/src/options_folder.php
+++ b/src/options_folder.php
@@ -10,26 +10,12 @@
     **  $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/load_prefs.php');
+   include('../src/validate.php');
+   include('../functions/display_messages.php');
+   include('../functions/imap.php');
+   include('../functions/array.php');
+   include('../functions/plugin.php');
+   
    displayPageHeader($color, 'None');
 
    $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
@@ -37,12 +23,17 @@
    sqimap_logout($imapConnection);
 ?>
    <br>
-   <table width="95%" align="center" border="0" cellpadding="2" cellspacing="0"><tr><td bgcolor="<?php echo $color[0] ?>">
-      <center><b><?php echo _("Options") . " - " . _("Folder Preferences"); ?></b></center>
-   </td></tr></table>
+<table width="95%" align="center" border="0" cellpadding="2" cellspacing="0">
+<tr><td bgcolor="<?php echo $color[0] ?>" align="center">
+
+      <b><?php echo _("Options") . " - " . _("Folder Preferences"); ?></b>
+
+    <table width="100%" border="0" cellpadding="1" cellspacing="1">
+    <tr><td bgcolor="<?php echo $color[4] ?>" align="center">
 
-   <form name="f" action="options.php" method="post">
-      <table width="100%" cellpadding="0" cellspacing="5" border="0">
+   <form name="f" action="options.php" method="post"><br>
+
+      <table width="100%" cellpadding="2" cellspacing="0" border="0">
 
 <?php if ($show_prefix_option == true) {   ?>   
          <tr>
@@ -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>
@@ -149,5 +140,12 @@
          </tr>
       </table>
    </form>
+
    <?php do_hook('options_folders_bottom'); ?>
+
+    </td></tr>
+    </table>
+
+</td></tr>
+</table>
 </body></html>