More work on options...

[squirrelmail.git] / src / options_order.php

diff --git a/src/options_order.php b/src/options_order.php
index 670a54897cd27a8c7e2bfceb7b8871462585fb13..9c37465dd76099617b8a71b5c289970cd86ff58c 100644 (file)
--- a/src/options_order.php
+++ b/src/options_order.php
@@ -1,6 +1,6 @@
 <?php
    /**
-    **  options_highlight.php
+    **  options_order.php
     **
     **  Copyright (c) 1999-2000 The SquirrelMail development team
     **  Licensed under the GNU GPL. For full terms see the file COPYING.
@@ -10,24 +10,11 @@
     **  $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');
+   require_once('../src/validate.php');
+   require_once('../functions/display_messages.php');
+   require_once('../functions/imap.php');
+   require_once('../functions/array.php');
+   require_once('../functions/plugin.php');
 
 
    if (! isset($action)) { $action = ''; }
@@ -35,15 +22,18 @@
       removePref($data_dir, $username, "highlight$theid");
    } else if ($action == 'save') {
    } 
-   include('../src/load_prefs.php');
    displayPageHeader($color, 'None');
 ?>
    <br>
-   <table width=95% align=center border=0 cellpadding=2 cellspacing=0><tr><td bgcolor="<?php echo $color[0] ?>">
-      <center><b><?php echo _("Options") . " - " . _("Index Order"); ?></b></center>
-   </td></tr></table>
+<table width=95% align=center border=0 cellpadding=2 cellspacing=0>
+<tr><td align="center" bgcolor="<?php echo $color[0] ?>">
+
+      <b><?php echo _("Options") . " - " . _("Index Order"); ?></b>
 
-   <table width=95% align=center border=0><tr><td>
+    <table width="100%" border="0" cellpadding="1" cellspacing="1">
+    <tr><td bgcolor="<?php echo $color[4] ?>" align="center"><br>
+
+      <table width=100% cellpadding=2 cellspacing=0 border=0>
 <?php
 
    $available[1] = _("Checkbox");
@@ -78,7 +68,7 @@
       $index_order = array();
       $index_order = $new_ary;
       if (count($index_order) < 1) {
-         include ('../src/load_prefs.php');
+         include_once('../src/load_prefs.php');
       }
    } else if ($method == 'add' && $add) {
       // User should not be able to insert PHP-code here
@@ -93,14 +83,12 @@
          setPref($data_dir, $username, "order$i", $index_order[$i]);
       }
    }
-   echo '<center>';
    echo '<table cellspacing="0" cellpadding="0" border="0" width="65%"><tr><td>' . "\n";
    echo _("The index order is the order that the columns are arranged in the message index.  You can add, remove, and move columns around to customize them to fit your needs.");
-   echo '</td></tr></table></center><br>';
+   echo '</td></tr></table><br>';
 
    if (count($index_order))
    {
-      echo '<center>';
       echo '<table cellspacing="0" cellpadding="0" border="0">' . "\n";
       for ($i=1; $i <= count($index_order); $i++) {
          $tmp = $index_order[$i];
@@ -119,31 +107,37 @@
          echo "</tr>\n";
       }
       echo "</table>\n";
-      echo '</center>';
    }
    
    if (count($index_order) != count($available)) {
-   echo '<center><form name="f" method="post" action="options_order.php">';
-   echo '<select name="add">';
-   for ($i=1; $i <= count($available); $i++) {
-      $found = false;
-      for ($j=1; $j <= count($index_order); $j++) {
-         if ($index_order[$j] == $i) {
-            $found = true;
+      echo '<form name="f" method="post" action="options_order.php">';
+      echo '<select name="add">';
+      for ($i=1; $i <= count($available); $i++) {
+         $found = false;
+         for ($j=1; $j <= count($index_order); $j++) {
+            if ($index_order[$j] == $i) {
+               $found = true;
+            }
+         }
+         if (!$found) {
+            echo "<option value=\"$i\">$available[$i]</option>";
          }
       }
-      if (!$found) {
-         echo "<option value=\"$i\">$available[$i]</option>";
-      }
-   }
-   echo '</select>';
-   echo '<input type="hidden" value="add" name="method">';
-   echo '<input type="submit" value="'._("Add").'" name="submit">';
-   echo '</form></center>';
+      echo '</select>';
+      echo '<input type="hidden" value="add" name="method">';
+      echo '<input type="submit" value="'._("Add").'" name="submit">';
+      echo '</form>';
    }
 
-   echo '<br><center><a href="../src/options.php">' . _("Return to options page") . '</a></center>';
+   echo '<p><a href="../src/options.php">' . _("Return to options page") . '</a></p><br>';
 
 ?>
-   </td></tr></table>
-</body></html>
+   </td></tr>
+   </table>
+
+    </td></tr>
+    </table>
+
+</td></tr>
+</table>
+</body></html>
\ No newline at end of file