X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Foptions_order.php;h=caf72036d6f3bcd011662d4d00e54e2a4462074a;hb=c720eadda2bcf0e3710754ca4e642d641a9a1395;hp=14a366cae5c9b0d04a84e60db1b44f1b9658dd89;hpb=625c8b787b79d07a1e53ba05213f66451d73651e;p=squirrelmail.git
diff --git a/src/options_order.php b/src/options_order.php
index 14a366ca..caf72036 100644
--- a/src/options_order.php
+++ b/src/options_order.php
@@ -3,73 +3,58 @@
/**
* 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/plugin.php');
require_once(SM_PATH . 'functions/html.php');
+require_once(SM_PATH . 'functions/forms.php');
/* get globals */
-if (isset($_GET['action'])) {
- $action = $_GET['action'];
-}
-if (isset($_GET['num'])) {
- $num = $_GET['num'];
-}
-if (isset($_GET['method'])) {
- $method = $_GET['method'];
-}
-elseif (isset($_POST['method'])) {
- $method = $_POST['method'];
-}
-if (isset($_POST['add'])) {
- $add = $_POST['add'];
-}
-if (isset($_GET['submit'])) {
- $submit = $_GET['submit'];
-}
-elseif (isset($_POST['submit'])) {
- $submit = $_POST['submit'];
-}
+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
- 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] ) .
'' . _("Options") . ' - ' . _("Index Order") . '' .
- 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];
@@ -82,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) {
@@ -93,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 */
@@ -102,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]);
@@ -111,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"' ) . "
\n";
-
+ '', '', '', 'width="65%" border="0" cellpadding="0" cellspacing="0"' ) . "
\n";
+
if (count($index_order))
{
echo html_tag( 'table', '', '', '', ' cellspacing="0" cellpadding="0" border="0"' ) . "\n";
@@ -131,7 +116,7 @@ displayPageHeader($color, 'None');
if ($tmp != 4)
echo '' . _("remove") . '';
else
- echo ' ';
+ echo ' ';
echo '';
echo html_tag( 'td', ' - ' );
echo html_tag( 'td', $available[$tmp] );
@@ -139,10 +124,10 @@ displayPageHeader($color, 'None');
}
echo '' . "\n";
}
-
+
if (count($index_order) != count($available)) {
- echo '