X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Foptions_highlight.php;h=aa6fae03e5a241cc9dbc555be44dbca2e43738c5;hb=190dc452bedb05364a6f5842142b5e484995b1ca;hp=f68c1da203e52393c24fbe94367cc1c05bff6f42;hpb=5c4ff7bfc6e04337bd6bcf76743b1fbb92556233;p=squirrelmail.git
diff --git a/src/options_highlight.php b/src/options_highlight.php
index f68c1da2..aa6fae03 100644
--- a/src/options_highlight.php
+++ b/src/options_highlight.php
@@ -13,19 +13,12 @@
*/
/**
- * Path for SquirrelMail required files.
- * @ignore
+ * Include the SquirrelMail initialization file.
*/
-define('SM_PATH','../');
+require('../include/init.php');
-/* SquirrelMail required files. */
-include_once(SM_PATH . 'include/validate.php');
-include_once(SM_PATH . 'functions/display_messages.php');
-include_once(SM_PATH . 'functions/imap.php');
-include_once(SM_PATH . 'functions/plugin.php');
-include_once(SM_PATH . 'functions/strings.php');
-include_once(SM_PATH . 'functions/html.php');
-include_once(SM_PATH . 'functions/forms.php');
+// include_once(SM_PATH . 'functions/imap.php');
+require_once(SM_PATH . 'functions/forms.php');
/* get globals */
sqGetGlobalVar('action', $action);
@@ -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";
@@ -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') {
@@ -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,7 +453,7 @@ if ($action == 'edit' || $action == 'add') {
echo " \n";
echo " \n";
echo "\n";
- echo '\n";
+ echo '\n";
echo "\n";
}
do_hook('options_highlight_bottom');