X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Foptions_highlight.php;h=167169f071be3dea502cb86fb0bec16c8e10bd98;hb=df6daca8f6ed0c99f8a67e0568f4305f6d57c180;hp=c4dfba067c46487919b489cb7cbe7b712c35e79a;hpb=a2b193bc8c1cefe3db9f4b38ce346f0527a0ec0e;p=squirrelmail.git
diff --git a/src/options_highlight.php b/src/options_highlight.php
index c4dfba06..167169f0 100644
--- a/src/options_highlight.php
+++ b/src/options_highlight.php
@@ -3,11 +3,10 @@
/**
* options_highlight.php
*
- * Copyright (c) 1999-2005 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
@@ -20,7 +19,7 @@
define('SM_PATH','../');
/* SquirrelMail required files. */
-require_once(SM_PATH . 'include/validate.php');
+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');
@@ -117,15 +116,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";
@@ -172,12 +171,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') {
@@ -425,7 +424,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";
}
@@ -461,10 +460,13 @@ if ($action == 'edit' || $action == 'add') {
echo " \n";
echo " \n";
echo "\n";
- echo '\n";
+ echo '\n";
echo "\n";
}
do_hook('options_highlight_bottom');
?>
-