X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Foptions_highlight.php;h=aa6fae03e5a241cc9dbc555be44dbca2e43738c5;hb=190dc452bedb05364a6f5842142b5e484995b1ca;hp=1e635b837074114f138ffc7f67f525344d593852;hpb=30967a1e09679c395b31929cbdb1a0e88b13f01e;p=squirrelmail.git
diff --git a/src/options_highlight.php b/src/options_highlight.php
index 1e635b83..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 */
@@ -38,11 +31,11 @@ sqGetGlobalVar('match_type', $match_type);
sqGetGlobalVar('value', $value);
/* end of get globals */
-
+
function oh_opt( $val, $sel, $tit ) {
echo "\n";
}
@@ -82,7 +75,7 @@ if (isset($theid) && ($action == 'delete') ||
$new_rules = $message_highlight_list;
break;
}
- $message_highlight_list = $new_rules;
+ $message_highlight_list = $new_rules;
setPref($data_dir, $username, 'hililist', serialize($message_highlight_list));
@@ -100,11 +93,11 @@ if (isset($theid) && ($action == 'delete') ||
$value = str_replace(',', ' ', $value);
if(isset($theid)) {
- $message_highlight_list[$theid] =
+ $message_highlight_list[$theid] =
array( 'name' => $identname, 'color' => $newcolor,
'value' => $value, 'match_type' => $match_type );
} else {
- $message_highlight_list[] =
+ $message_highlight_list[] =
array( 'name' => $identname, 'color' => $newcolor,
'value' => $value, 'match_type' => $match_type );
}
@@ -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"' ) .
+ '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,13 +164,13 @@ 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";
+ "
\n";
} else {
- echo '' . _("No highlighting is defined") . "
\n".
- "
\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";
@@ -386,37 +379,37 @@ if ($action == 'edit' || $action == 'add') {
echo ' '.addRadioBox('color_type', $selected_choose, '1');
$selops = array (
- $color_list[0] => _("Dark Blue"),
- $color_list[1] => _("Dark Green"),
- $color_list[2] => _("Dark Yellow"),
- $color_list[3] => _("Dark Cyan"),
- $color_list[4] => _("Dark Magenta"),
- $color_list[5] => _("Light Blue"),
- $color_list[6] => _("Light Green"),
- $color_list[7] => _("Light Yellow"),
- $color_list[8] => _("Light Cyan"),
- $color_list[9] => _("Light Magenta"),
- $color_list[10] => _("Dark Gray"),
- $color_list[11] => _("Medium Gray"),
- $color_list[12] => _("Light Gray"),
- $color_list[13] => _("White") );
-
+ $color_list[0] => _("Dark Blue"),
+ $color_list[1] => _("Dark Green"),
+ $color_list[2] => _("Dark Yellow"),
+ $color_list[3] => _("Dark Cyan"),
+ $color_list[4] => _("Dark Magenta"),
+ $color_list[5] => _("Light Blue"),
+ $color_list[6] => _("Light Green"),
+ $color_list[7] => _("Light Yellow"),
+ $color_list[8] => _("Light Cyan"),
+ $color_list[9] => _("Light Magenta"),
+ $color_list[10] => _("Dark Gray"),
+ $color_list[11] => _("Medium Gray"),
+ $color_list[12] => _("Light Gray"),
+ $color_list[13] => _("White") );
+
echo addSelect('newcolor_choose', $selops, $selected_i, TRUE);
- echo "
\n";
+ echo "
\n";
echo ' '.addRadioBox('color_type', $selected_input, 2).
' '. _("Other:") .
- addInput('newcolor_input',
- (($selected_input && isset($theid)) ? $message_highlight_list[$theid]['color'] : ''),
- '7');
- echo _("Ex: 63aa7f")."
\n";
+ addInput('newcolor_input',
+ (($selected_input && isset($theid)) ? $message_highlight_list[$theid]['color'] : ''),
+ '7');
+ echo _("Ex: 63aa7f")."
\n";
echo " \n";
echo " \n";
# Show grid of color choices
echo html_tag( 'tr', '', '', $color[0] ) . "\n";
echo html_tag( 'td', '', 'left', '', 'colspan="2"' );
- echo html_tag( 'table', '', 'center', '', 'border=0 cellpadding="2" cellspacing="1"' ) . "\n";
+ echo html_tag( 'table', '', 'center', '', 'border="0" cellpadding="2" cellspacing="1"' ) . "\n";
for($x = 0; $x < 5; $x++) {
echo html_tag( 'tr' ) . "\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";
}
@@ -434,7 +427,7 @@ if ($action == 'edit' || $action == 'add') {
echo html_tag( 'tr', html_tag( 'td', ' ', 'left' ) ) . "\n";
echo html_tag( 'tr', '', '', $color[0] ) . "\n";
echo html_tag( 'td', '', 'center', '', 'colspan="2"' ) . "\n";
- echo "