Remove unused globals

[squirrelmail.git] / src / options_order.php

diff --git a/src/options_order.php b/src/options_order.php
index 7309da7b3a31423077d919e4ec820285a508cddb..56c8340a6f84fc48cc011eee2f559f2ee2fb0a24 100644 (file)
--- a/src/options_order.php
+++ b/src/options_order.php
@@ -3,15 +3,19 @@
 /**
  * options_order.php
  *
- * Copyright (c) 1999-2003 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 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. */
@@ -21,6 +25,7 @@ require_once(SM_PATH . 'functions/display_messages.php');
 require_once(SM_PATH . 'functions/imap.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);  
@@ -91,10 +96,10 @@ 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";
+            '', '', '', 'width="65%" border="0" cellpadding="0" cellspacing="0"' ) . "<br />\n";
  
     if (count($index_order))
     {
@@ -121,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++) {
@@ -131,16 +136,18 @@ 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>';
     }
  
-    echo html_tag( 'p', '<a href="../src/options.php">' . _("Return to options page") . '</a></p><br>' );
+    echo html_tag( 'p', '<a href="../src/options.php">' . _("Return to options page") . '</a></p><br />' );
 
 ?>
     </td></tr>