Lots of little changes...

[squirrelmail.git] / src / options_order.php

diff --git a/src/options_order.php b/src/options_order.php
index 21bc43fc662d4c4a05ef713719d43ef6506df5a7..042048a7b495234dadd8e151ced6fc1bdfba4896 100644 (file)
--- a/src/options_order.php
+++ b/src/options_order.php
@@ -1,21 +1,37 @@
 <?php
-   /**
-    **  options_highlight.php
-    **
-    **  Copyright (c) 1999-2000 The SquirrelMail development team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **
-    **  Displays message highlighting options
-    **
-    **  $Id$
-    **/
-
-   include('../src/validate.php');
-   include('../functions/page_header.php');
-   include('../functions/display_messages.php');
-   include('../functions/imap.php');
-   include('../functions/array.php');
-   include('../functions/plugin.php');
+
+/**
+ * options_order.php
+ *
+ * Copyright (c) 1999-2001 The SquirrelMail Development Team
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
+ *
+ * Displays message highlighting options
+ *
+ * $Id$
+ */
+
+/*****************************************************************/
+/*** THIS FILE NEEDS TO HAVE ITS FORMATTING FIXED!!!           ***/
+/*** PLEASE DO SO AND REMOVE THIS COMMENT SECTION.             ***/
+/***    + Base level indent should begin at left margin, as    ***/
+/***      the require_once below looks.                        ***/
+/***    + All identation should consist of four space blocks   ***/
+/***    + Tab characters are evil.                             ***/
+/***    + all comments should use "slash-star ... star-slash"  ***/
+/***      style -- no pound characters, no slash-slash style   ***/
+/***    + FLOW CONTROL STATEMENTS (if, while, etc) SHOULD      ***/
+/***      ALWAYS USE { AND } CHARACTERS!!!                     ***/
+/***    + Please use ' instead of ", when possible. Note "     ***/
+/***      should always be used in _( ) function calls.        ***/
+/*** Thank you for your help making the SM code more readable. ***/
+/*****************************************************************/
+
+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 = ''; }
@@ -23,15 +39,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="100%" border="0" cellpadding="1" cellspacing="1">
+    <tr><td bgcolor="<?php echo $color[4] ?>" align="center"><br>
 
-   <table width=95% align=center border=0><tr><td>
+      <table width=100% cellpadding=2 cellspacing=0 border=0>
 <?php
 
    $available[1] = _("Checkbox");
@@ -66,7 +85,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
@@ -81,14 +100,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];
@@ -107,31 +124,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>
+   </td></tr>
+   </table>
+
+    </td></tr>
+    </table>
+
+</td></tr>
+</table>
 </body></html>