X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Foptions_order.php;h=a91f865da6d66a8ceec8032868d824b4faa17daf;hp=20f413b39ff4781a305963c6529e843e2459f02b;hb=6c84ba1ec45ab854c37b6f65c5b4d84ab1c7aad4;hpb=99aaff8b9e275cf29a0771a740f67bb8fb9f5f75
diff --git a/src/options_order.php b/src/options_order.php
index 20f413b3..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
@@ -28,7 +28,7 @@ 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);
@@ -38,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] ) .
'' . _("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];
@@ -67,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) {
@@ -78,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 */
@@ -87,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]);
@@ -99,8 +99,8 @@ displayPageHeader($color, 'None');
_("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";
@@ -116,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] );
@@ -124,10 +124,10 @@ displayPageHeader($color, 'None');
}
echo '' . "\n";
}
-
+
if (count($index_order) != count($available)) {
- $opts = array();
+ $opts = array();
for ($i=1; $i <= count($available); $i++) {
$found = false;
for ($j=1; $j <= count($index_order); $j++) {
@@ -136,18 +136,18 @@ displayPageHeader($color, 'None');
}
}
if (!$found) {
- $opts[$i] = $available[$i];
+ $opts[$i] = $available[$i];
}
}
-
+
echo addForm('options_order.php', 'post', 'f');
- echo addSelect('add', $opts, '', TRUE);
+ echo addSelect('add', $opts, '', TRUE);
echo addHidden('method', 'add');
- echo addSubmit(_("Add"), 'submit');
+ echo addSubmit(_("Add"), 'submit');
echo '';
}
-
- echo html_tag( 'p', '' . _("Return to options page") . '