X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Foptions_highlight.php;h=aa6fae03e5a241cc9dbc555be44dbca2e43738c5;hb=1ce76674256f43e3daf0a08b81d134dd646121c8;hp=5822f8892ea4d2cfe0331153654f402fb6a1e934;hpb=91e0dccca7b2452d8b450791cae3aa4125e8889e;p=squirrelmail.git
diff --git a/src/options_highlight.php b/src/options_highlight.php
index 5822f889..aa6fae03 100644
--- a/src/options_highlight.php
+++ b/src/options_highlight.php
@@ -3,28 +3,21 @@
/**
* options_highlight.php
*
- * Copyright (c) 1999-2004 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
* Displays message highlighting options
*
+ * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
+ * @subpackage prefs
*/
/**
- * Path for SquirrelMail required files.
- * @ignore
+ * Include the SquirrelMail initialization file.
*/
-define('SM_PATH','../');
-
-/* SquirrelMail required files. */
-require_once(SM_PATH . 'include/validate.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/strings.php');
-require_once(SM_PATH . 'functions/html.php');
+require('../include/init.php');
+
+// include_once(SM_PATH . 'functions/imap.php');
require_once(SM_PATH . 'functions/forms.php');
/* get globals */
@@ -116,15 +109,15 @@ displayPageHeader($color, 'None');
echo
html_tag( 'table', "\n" .
html_tag( 'tr', "\n" .
- html_tag( 'td', '
' . _("Options") . ' - ' . _("Message Highlighting") . '', 'left')
+ html_tag( 'td', '' . _("Options") . ' - ' . _("Message Highlighting") . '
', 'left')
),
'center', $color[9], 'width="95%" border="0" cellpadding="1" cellspacing="0"' ) . "
\n" .
html_tag( 'table', '', '', '', 'width="100%" border="0" cellpadding="1" cellspacing="0"' ) .
html_tag( 'tr' ) . "\n" .
html_tag( 'td', '', 'left' );
-echo '[' . _("New") . ']'.
- ' - ['._("Done").']
'."\n";
+echo '
'."\n";
$mhl_count = count($message_highlight_list);
if ($mhl_count > 0) {
echo html_tag( 'table', '', 'center', '', 'width="80%" border="0" cellpadding="3" cellspacing="0"' ) . "\n";
@@ -163,7 +156,7 @@ if ($mhl_count > 0) {
echo html_tag( 'tr',
html_tag( 'td',
$links,
- 'left', $color[4], 'width="20%" nowrap' ) .
+ 'left', $color[4], 'width="20%" style="white-space: nowrap;"' ) .
html_tag( 'td',
htmlspecialchars($message_highlight_list[$i]['name']) ,
'left' ) .
@@ -171,12 +164,12 @@ if ($mhl_count > 0) {
$match_type . ' = ' .
htmlspecialchars($message_highlight_list[$i]['value']) ,
'left' ) ,
- '', $message_highlight_list[$i]['color'] ) . "\n";
+ '', '#'.$message_highlight_list[$i]['color'] ) . "\n";
}
echo "\n".
"
\n";
} else {
- echo '' . _("No highlighting is defined") . "
\n".
+ echo '' . _("No highlighting is defined") . "
\n".
"
\n";
}
if ($action == 'edit' || $action == 'add') {
@@ -361,14 +354,14 @@ if ($action == 'edit' || $action == 'add') {
else if ($selected_choose == '')
$selected_input = TRUE;
- echo addForm('options_highlight.php', 'POST', 'f').
+ echo addForm('options_highlight.php', 'post', 'f').
addHidden('action', 'save');
if($action == 'edit') {
echo addHidden('theid', (isset($theid)?$theid:''));
}
echo html_tag( 'table', '', 'center', '', 'width="80%" cellpadding="3" cellspacing="0" border="0"' ) . "\n";
echo html_tag( 'tr', '', '', $color[0] ) . "\n";
- echo html_tag( 'td', '', 'right', '', 'nowrap' ) . "\n";
+ echo html_tag( 'td', '', 'right', '', 'style="white-space: nowrap;"' ) . "\n";
echo _("Identifying name") . ":";
echo ' ' . "\n";
echo html_tag( 'td', '', 'left' ) . "\n";
@@ -424,7 +417,7 @@ if ($action == 'edit' || $action == 'add') {
$gridindex = "$y,$x";
$gridcolor = $new_color_list[$gridindex];
echo html_tag( 'td', addRadioBox('color_type', ($gridcolor == $current_color), '#'.$gridcolor),
- 'left', $gridcolor, 'colspan="2"' );
+ 'left', '#'.$gridcolor, 'colspan="2"' );
}
echo "\n";
}
@@ -460,9 +453,13 @@ if ($action == 'edit' || $action == 'add') {
echo " \n";
echo " \n";
echo "\n";
- echo '\n";
+ echo '\n";
echo "\n";
}
do_hook('options_highlight_bottom');
+
?>
-