X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Foptions_order.php;h=f0de44f78ab77f44987f674bcc7cedcfddf4fbd3;hb=7980d56953a6e590191fb29ca2efd04545a2f8cb;hp=f18e44d32d484387a275d85f87d1b287e80379f2;hpb=e7db48afbf9565737173583af6962520d2491acc;p=squirrelmail.git

diff --git a/src/options_order.php b/src/options_order.php
index f18e44d3..f0de44f7 100644
--- 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-2002 The SquirrelMail Project 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,19 +39,16 @@
       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>
+<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=100% cellpadding=2 cellspacing=0 border=0>
 <?php
 
    $available[1] = _("Checkbox");
@@ -70,7 +83,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
@@ -134,9 +147,6 @@
    echo '<p><a href="../src/options.php">' . _("Return to options page") . '</a></p><br>';
 
 ?>
-   </td></tr>
-   </table>
-
     </td></tr>
     </table>