X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Foptions_order.php;h=a91f865da6d66a8ceec8032868d824b4faa17daf;hb=d4eaadbe7c054eee5d869ff29ffc8775bfcaffe9;hp=967b9a288005916288a19bb71c469860ae67f9ab;hpb=30967a1e09679c395b31929cbdb1a0e88b13f01e;p=squirrelmail.git

diff --git a/src/options_order.php b/src/options_order.php
index 967b9a28..a91f865d 100644
--- a/src/options_order.php
+++ b/src/options_order.php
@@ -3,7 +3,7 @@
 /**
  * options_order.php
  *
- * Copyright (c) 1999-2004 The SquirrelMail Project Team
+ * Copyright (c) 1999-2005 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * Displays messagelist column order options
@@ -25,9 +25,10 @@ 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);  
+sqgetGlobalVar('num',       $num,       SQ_GET);
 sqgetGlobalVar('add',       $add,       SQ_POST);
 
 sqgetGlobalVar('submit',    $submit);
@@ -37,23 +38,23 @@ sqgetGlobalVar('method',    $method);
 displayPageHeader($color, 'None');
 
    echo
-   html_tag( 'table', '', 'center', '', 'width="95%" border="0" cellpadding="1" cellspacing="0"' ) . 
-   html_tag( 'tr' ) . 
+   html_tag( 'table', '', 'center', '', 'width="95%" border="0" cellpadding="1" cellspacing="0"' ) .
+   html_tag( 'tr' ) .
    html_tag( 'td', '', 'center', $color[0] ) .
    '<b>' . _("Options") . ' - ' . _("Index Order") . '</b>' .
-   html_tag( 'table', '', '', '', 'width="100%" border="0" cellpadding="8" cellspacing="0"' ) . 
-   html_tag( 'tr' ) . 
+   html_tag( 'table', '', '', '', 'width="100%" border="0" cellpadding="8" cellspacing="0"' ) .
+   html_tag( 'tr' ) .
    html_tag( 'td', '', 'center', $color[4] );
- 
+
     $available[1] = _("Checkbox");
     $available[2] = _("From");
     $available[3] = _("Date");
     $available[4] = _("Subject");
     $available[5] = _("Flags");
     $available[6] = _("Size");
-    
+
     if (! isset($method)) { $method = ''; }
- 
+
     if ($method == 'up' && $num > 1) {
         $prev = $num-1;
         $tmp = $index_order[$prev];
@@ -66,7 +67,7 @@ displayPageHeader($color, 'None');
         $index_order[$num] = $tmp;
     } else if ($method == 'remove' && $num) {
         for ($i=1; $i < 8; $i++) {
-            removePref($data_dir, $username, "order$i"); 
+            removePref($data_dir, $username, "order$i");
         }
         for ($j=1,$i=1; $i <= count($index_order); $i++) {
            if ($i != $num) {
@@ -77,7 +78,7 @@ displayPageHeader($color, 'None');
         $index_order = array();
         $index_order = $new_ary;
         if (count($index_order) < 1) {
-           include_once('../src/load_prefs.php');
+           include_once(SM_PATH . 'include/load_prefs.php');
         }
     } else if ($method == 'add' && $add) {
         /* User should not be able to insert PHP-code here */
@@ -86,7 +87,7 @@ displayPageHeader($color, 'None');
         $add = str_replace ('<%', '..', $add);
         $index_order[count($index_order)+1] = $add;
     }
- 
+
     if ($method) {
         for ($i=1; $i <= count($index_order); $i++) {
            setPref($data_dir, $username, "order$i", $index_order[$i]);
@@ -95,11 +96,11 @@ 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))
     {
         echo html_tag( 'table', '', '', '', ' cellspacing="0" cellpadding="0" border="0"' ) . "\n";
@@ -115,7 +116,7 @@ displayPageHeader($color, 'None');
             if ($tmp != 4)
                echo '<small><a href="options_order.php?method=remove&amp;num=' . $i . '">' . _("remove") . '</a></small>';
             else
-               echo '&nbsp;'; 
+               echo '&nbsp;';
             echo '</td>';
             echo html_tag( 'td', '<small>&nbsp;-&nbsp;</small>' );
             echo html_tag( 'td', $available[$tmp] );
@@ -123,10 +124,10 @@ displayPageHeader($color, 'None');
         }
         echo '</table>' . "\n";
     }
-    
+
     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++) {
@@ -135,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>
@@ -152,4 +155,4 @@ displayPageHeader($color, 'None');
 
 </td></tr>
 </table>
-</body></html>
+</body></html>
\ No newline at end of file