You should check you can read a dir, and it exists before attempting to use

[squirrelmail.git] / src / options_order.php

diff --git a/src/options_order.php b/src/options_order.php
index 296bbc7d5610f1ba2becf958606a673927982fde..20f413b39ff4781a305963c6529e843e2459f02b 100644 (file)
--- a/src/options_order.php
+++ b/src/options_order.php
@@ -3,30 +3,38 @@
 /**
  * options_order.php
  *
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2004 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
- * Displays message highlighting options
+ * Displays messagelist column order options
  *
- * $Id$
+ * @version $Id$
+ * @package squirrelmail
  */
 
-/* Path for SquirrelMail required files. */
+/**
+ * Path for SquirrelMail required files.
+ * @ignore
+ */
 define('SM_PATH','../');
 
 /* SquirrelMail required files. */
 require_once(SM_PATH . 'include/validate.php');
+require_once(SM_PATH . 'functions/global.php');
 require_once(SM_PATH . 'functions/display_messages.php');
 require_once(SM_PATH . 'functions/imap.php');
-require_once(SM_PATH . 'functions/array.php');
 require_once(SM_PATH . 'functions/plugin.php');
 require_once(SM_PATH . 'functions/html.php');
+require_once(SM_PATH . 'functions/forms.php');
+
+/* get globals */
+sqgetGlobalVar('num',       $num,       SQ_GET);  
+sqgetGlobalVar('add',       $add,       SQ_POST);
+
+sqgetGlobalVar('submit',    $submit);
+sqgetGlobalVar('method',    $method);
+/* end of get globals */
 
-if (! isset($action)) { $action = ''; }
-if ($action == 'delete' && isset($theid)) {
-    removePref($data_dir, $username, "highlight$theid");
-} elseif ($action == 'save') {
-} 
 displayPageHeader($color, 'None');
 
    echo
@@ -88,7 +96,7 @@ displayPageHeader($color, 'None');
     echo html_tag( 'table',
                 html_tag( 'tr',
                     html_tag( 'td',
-                        _("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.")
+                        _("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.")
                     )
                 ) ,
             '', '', '', 'width="65%" border="0" cellpadding="0" cellspacing="0"' ) . "<br>\n";
@@ -118,8 +126,8 @@ displayPageHeader($color, 'None');
     }
     
     if (count($index_order) != count($available)) {
-        echo '<form name="f" method="post" action="options_order.php">';
-        echo '<select name="add">';
+
+       $opts = array();
         for ($i=1; $i <= count($available); $i++) {
             $found = false;
             for ($j=1; $j <= count($index_order); $j++) {
@@ -128,12 +136,14 @@ displayPageHeader($color, 'None');
                 }
             }
             if (!$found) {
-                echo "<option value=\"$i\">$available[$i]</option>";
+               $opts[$i] = $available[$i];
             }
         }
-        echo '</select>';
-        echo '<input type="hidden" value="add" name="method">';
-        echo '<input type="submit" value="'._("Add").'" name="submit">';
+       
+        echo addForm('options_order.php', 'post', 'f');
+       echo addSelect('add', $opts, '', TRUE);
+        echo addHidden('method', 'add');
+       echo addSubmit(_("Add"), 'submit');
         echo '</form>';
     }