projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ehh, hmm: include -> require
[squirrelmail.git]
/
src
/
options.php
diff --git
a/src/options.php
b/src/options.php
index 1d5e8fcc1f5d4276f21daee012d1ed6dfd5f6e7d..dad4282779dd1ed622c1355ce8aa1c1ee8884b97 100644
(file)
--- a/
src/options.php
+++ b/
src/options.php
@@
-3,7
+3,7
@@
/**
* options.php
*
/**
* options.php
*
- * Copyright (c) 1999-200
1 The Squirrelmail Developmen
t Team
+ * Copyright (c) 1999-200
2 The SquirrelMail Projec
t Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* Displays the options page. Pulls from proper user preference files
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* Displays the options page. Pulls from proper user preference files
@@
-17,6
+17,7
@@
require_once('../functions/display_messages.php');
require_once('../functions/imap.php');
require_once('../functions/array.php');
require_once('../functions/options.php');
require_once('../functions/imap.php');
require_once('../functions/array.php');
require_once('../functions/options.php');
+require_once('../functions/strings.php');
/* Set the base uri. */
ereg ("(^.*/)[^/]+/[^/]+$", $PHP_SELF, $regs);
/* Set the base uri. */
ereg ("(^.*/)[^/]+/[^/]+$", $PHP_SELF, $regs);
@@
-278,7
+279,7
@@
if ($optpage == SMOPT_PAGE_MAIN) {
$optpage_blocks[] = array(
'name' => _("Index Order"),
'url' => 'options_order.php',
$optpage_blocks[] = array(
'name' => _("Index Order"),
'url' => 'options_order.php',
- 'desc' => _("The order of the message index can be rearanged and changed to contain the headers in any order you want."),
+ 'desc' => _("The order of the message index can be rear
r
anged and changed to contain the headers in any order you want."),
'js' => false
);
'js' => false
);
@@
-305,7
+306,7
@@
if ($optpage == SMOPT_PAGE_MAIN) {
$first_optpage = false;
echo "<TABLE BGCOLOR=\"$color[4]\" WIDTH=\"100%\" CELLPADDING=0 CELLSPACING=\"5\" BORDER=\"0\">" .
'<TR><TD VALIGN="TOP">' .
$first_optpage = false;
echo "<TABLE BGCOLOR=\"$color[4]\" WIDTH=\"100%\" CELLPADDING=0 CELLSPACING=\"5\" BORDER=\"0\">" .
'<TR><TD VALIGN="TOP">' .
- "<TABLE BGCOLOR=\"$color[4]\" WIDTH=\"100%\" CELLPADDING=\"3\" CELLSPACING=\"0\" BORDER=\"0\">";
+ "<TABLE BGCOLOR=\"$color[4]\" WIDTH=\"100%\" CELLPADDING=\"3\" CELLSPACING=\"0\" BORDER=\"0\">
<TR><TD>
";
foreach ($optpage_blocks as $next_optpage) {
if ($first_optpage == false) {
$first_optpage = $next_optpage;
foreach ($optpage_blocks as $next_optpage) {
if ($first_optpage == false) {
$first_optpage = $next_optpage;
@@
-319,7
+320,7
@@
if ($optpage == SMOPT_PAGE_MAIN) {
print_optionpages_row($first_optpage);
}
print_optionpages_row($first_optpage);
}
- echo "</TABLE></TD></TR></TABLE>\n";
+ echo "</T
D></TR></T
ABLE></TD></TR></TABLE>\n";
do_hook('options_link_and_description');
do_hook('options_link_and_description');
@@
-329,9
+330,9
@@
if ($optpage == SMOPT_PAGE_MAIN) {
/*************************************************************************/
} else {
echo '<FORM NAME="f" ACTION="options.php" METHOD="POST"><BR>' . "\n"
/*************************************************************************/
} else {
echo '<FORM NAME="f" ACTION="options.php" METHOD="POST"><BR>' . "\n"
- . '<TABLE WIDTH="100%" CELLPADDING=2 CELLSPACING=0 BORDER=0>' . "\n"
. create_optpage_element($optpage)
. create_optpage_element($optpage)
- . create_optmode_element(SMOPT_MODE_SUBMIT);
+ . create_optmode_element(SMOPT_MODE_SUBMIT)
+ . '<TABLE WIDTH="100%" CELLPADDING=2 CELLSPACING=0 BORDER=0>' . "\n";
/* Output the option groups for this page. */
print_option_groups($optpage_data['options']);
/* Output the option groups for this page. */
print_option_groups($optpage_data['options']);
@@
-436,7
+437,7
@@
if ($optpage == SMOPT_PAGE_MAIN) {
echo "<TD VALIGN=top BGCOLOR=\"$color[4]\" WIDTH=\"50%\"> </TD>";
}
echo "<TD VALIGN=top BGCOLOR=\"$color[4]\" WIDTH=\"50%\"> </TD>";
}
- echo '</TR>' .
+ echo '</TR>' .
"\n" .
'<TR>' .
"<TD VALIGN=top BGCOLOR=\"$color[0]\" WIDTH=\"50%\">" .
$leftopt['desc'] .
'<TR>' .
"<TD VALIGN=top BGCOLOR=\"$color[0]\" WIDTH=\"50%\">" .
$leftopt['desc'] .
@@
-450,7
+451,7
@@
if ($optpage == SMOPT_PAGE_MAIN) {
echo "<TD VALIGN=top BGCOLOR=\"$color[4]\" WIDTH=\"50%\"> </TD>";
}
echo "<TD VALIGN=top BGCOLOR=\"$color[4]\" WIDTH=\"50%\"> </TD>";
}
- echo '</TR>' .
+ echo '</TR>' .
"\n" .
'</TABLE>' .
'</TD></TR>' .
"</TABLE>\n";
'</TABLE>' .
'</TD></TR>' .
"</TABLE>\n";