X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Foptions_highlight.php;h=2bfe3b0cfc0d4c6b2fe16b4ecd90fee331f4752b;hp=3aa5ce0bbdaf197ac33af413fe1b6dd90aa505e2;hb=e697b6cc39af08f80d3ee3743c9d4088791af634;hpb=7106ac9c23260fe6ac6a29f465084d8d36f9606a
diff --git a/src/options_highlight.php b/src/options_highlight.php
index 3aa5ce0b..2bfe3b0c 100644
--- a/src/options_highlight.php
+++ b/src/options_highlight.php
@@ -1,8 +1,9 @@
$tit\n";
+ }
if (! isset($action))
$action = '';
@@ -39,27 +34,22 @@
} else if ($action == 'save') {
if (!$theid) $theid = 0;
$identname = ereg_replace(',', ' ', $identname);
- $identname = str_replace('\\\\', '\\', $identname);
- $identname = str_replace('\\"', '"', $identname);
- $identname = str_replace('"', '"', $identname);
if ($color_type == 1) $newcolor = $newcolor_choose;
- else $newcolor = $newcolor_input;
-
+ elseif ($color_type == 2) $newcolor = $newcolor_input;
+ else $newcolor = $color_type;
+
$newcolor = ereg_replace(',', '', $newcolor);
$newcolor = ereg_replace('#', '', $newcolor);
- $newcolor = "$newcolor";
+ $newcolor = ereg_replace('"', '', $newcolor);
+ $newcolor = ereg_replace('\'', '', $newcolor);
$value = ereg_replace(',', ' ', $value);
- $value = str_replace('\\\\', '\\', $value);
- $value = str_replace('\\"', '"', $value);
- $value = str_replace('"', '"', $value);
setPref($data_dir, $username, "highlight$theid", $identname.','.$newcolor.','.$value.','.$match_type);
$message_highlight_list[$theid]['name'] = $identname;
$message_highlight_list[$theid]['color'] = $newcolor;
$message_highlight_list[$theid]['value'] = $value;
$message_highlight_list[$theid]['match_type'] = $match_type;
- }
- include('../src/load_prefs.php');
+ }
displayPageHeader($color, 'None');
?>
@@ -68,33 +58,37 @@
[' . _("New") . ']';
- echo ' - ['._("Done").']
'."\n";
+ echo '
[' . _("New") . ']'.
+ ' - ['._("Done").']
'."\n";
if (count($message_highlight_list) >= 1) {
echo ''."\n";
for ($i=0; $i < count($message_highlight_list); $i++) {
- echo "\n";
- echo ' \n";
- echo "[" . _("Edit") . "] ["._("Delete")."]\n";
- echo ' | ';
- echo ' \n";
- echo ' ' . $message_highlight_list[$i]['name'] . ' ';
- echo " | \n";
- echo ' \n";
- echo ' '.$message_highlight_list[$i]['match_type'].' = ' . $message_highlight_list[$i]['value'];
- echo " | \n";
- echo "
\n";
+ echo ''.
+ "".
+ "[".
+ _("Edit") .
+ '] [' . _("Delete") . ']'.
+ ' | '.
+ htmlspecialchars($message_highlight_list[$i]['name']) .
+ ' | '.
+ $message_highlight_list[$i]['match_type'] . ' = ' .
+ htmlspecialchars($message_highlight_list[$i]['value']).
+ ' |
';
}
- echo "
\n";
- echo "
\n";
+ echo "\n".
+ "
\n";
} else {
- echo '' . _("No highlighting is defined") . "
\n";
- echo "
\n";
+ echo '' . _("No highlighting is defined") . "
\n".
+ "
\n";
}
if ($action == 'edit' || $action == 'add') {
- if (!isset($theid)) $theid = count($message_highlight_list);
- $message_highlight_list[$theid] = array();
-
+ if (!isset($theid))
+ {
+ $theid = count($message_highlight_list);
+ $message_highlight_list[$theid] = array();
+ }
+
$color_list[0] = '4444aa';
$color_list[1] = '44aa44';
$color_list[2] = 'aaaa44';
@@ -108,10 +102,132 @@
$color_list[10] = 'aaaaaa';
$color_list[11] = 'bfbfbf';
$color_list[12] = 'dfdfdf';
- $color_list[13] = 'ffffff';
+ $color_list[13] = 'ffffff';
+
+ # helpful color chart from http://www.visibone.com/colorlab/big.html
+ $new_color_list["0,0"] = 'cccccc';
+ $new_color_list["0,1"] = '999999';
+ $new_color_list["0,2"] = '666666';
+ $new_color_list["0,3"] = '333333';
+ $new_color_list["0,4"] = '000000';
- $selected_input = '';
+ # red
+ $new_color_list["1,0"] = 'ff0000';
+ $new_color_list["1,1"] = 'cc0000';
+ $new_color_list["1,2"] = '990000';
+ $new_color_list["1,3"] = '660000';
+ $new_color_list["1,4"] = '330000';
+
+ $new_color_list["2,0"] = 'ffcccc';
+ $new_color_list["2,1"] = 'cc9999';
+ $new_color_list["2,2"] = '996666';
+ $new_color_list["2,3"] = '663333';
+ $new_color_list["2,4"] = '330000';
+
+ $new_color_list["3,0"] = 'ffcccc';
+ $new_color_list["3,1"] = 'ff9999';
+ $new_color_list["3,2"] = 'ff6666';
+ $new_color_list["3,3"] = 'ff3333';
+ $new_color_list["3,4"] = 'ff0000';
+
+ # green
+ $new_color_list["4,0"] = '00ff00';
+ $new_color_list["4,1"] = '00cc00';
+ $new_color_list["4,2"] = '009900';
+ $new_color_list["4,3"] = '006600';
+ $new_color_list["4,4"] = '003300';
+
+ $new_color_list["5,0"] = 'ccffcc';
+ $new_color_list["5,1"] = '99cc99';
+ $new_color_list["5,2"] = '669966';
+ $new_color_list["5,3"] = '336633';
+ $new_color_list["5,4"] = '003300';
+
+ $new_color_list["6,0"] = 'ccffcc';
+ $new_color_list["6,1"] = '99ff99';
+ $new_color_list["6,2"] = '66ff66';
+ $new_color_list["6,3"] = '33ff33';
+ $new_color_list["6,4"] = '00ff00';
+
+ # blue
+ $new_color_list["7,0"] = '0000ff';
+ $new_color_list["7,1"] = '0000cc';
+ $new_color_list["7,2"] = '000099';
+ $new_color_list["7,3"] = '000066';
+ $new_color_list["7,4"] = '000033';
+ $new_color_list["8,0"] = 'ccccff';
+ $new_color_list["8,1"] = '9999cc';
+ $new_color_list["8,2"] = '666699';
+ $new_color_list["8,3"] = '333366';
+ $new_color_list["8,4"] = '000033';
+
+ $new_color_list["9,0"] = 'ccccff';
+ $new_color_list["9,1"] = '9999ff';
+ $new_color_list["9,2"] = '6666ff';
+ $new_color_list["9,3"] = '3333ff';
+ $new_color_list["9,4"] = '0000ff';
+
+ # yellow
+ $new_color_list["10,0"] = 'ffff00';
+ $new_color_list["10,1"] = 'cccc00';
+ $new_color_list["10,2"] = '999900';
+ $new_color_list["10,3"] = '666600';
+ $new_color_list["10,4"] = '333300';
+
+ $new_color_list["11,0"] = 'ffffcc';
+ $new_color_list["11,1"] = 'cccc99';
+ $new_color_list["11,2"] = '999966';
+ $new_color_list["11,3"] = '666633';
+ $new_color_list["11,4"] = '333300';
+
+ $new_color_list["12,0"] = 'ffffcc';
+ $new_color_list["12,1"] = 'ffff99';
+ $new_color_list["12,2"] = 'ffff66';
+ $new_color_list["12,3"] = 'ffff33';
+ $new_color_list["12,4"] = 'ffff00';
+
+ # cyan
+ $new_color_list["13,0"] = '00ffff';
+ $new_color_list["13,1"] = '00cccc';
+ $new_color_list["13,2"] = '009999';
+ $new_color_list["13,3"] = '006666';
+ $new_color_list["13,4"] = '003333';
+
+ $new_color_list["14,0"] = 'ccffff';
+ $new_color_list["14,1"] = '99cccc';
+ $new_color_list["14,2"] = '669999';
+ $new_color_list["14,3"] = '336666';
+ $new_color_list["14,4"] = '003333';
+
+ $new_color_list["15,0"] = 'ccffff';
+ $new_color_list["15,1"] = '99ffff';
+ $new_color_list["15,2"] = '66ffff';
+ $new_color_list["15,3"] = '33ffff';
+ $new_color_list["15,4"] = '00ffff';
+
+ # magenta
+ $new_color_list["16,0"] = 'ff00ff';
+ $new_color_list["16,1"] = 'cc00cc';
+ $new_color_list["16,2"] = '990099';
+ $new_color_list["16,3"] = '660066';
+ $new_color_list["16,4"] = '330033';
+
+ $new_color_list["17,0"] = 'ffccff';
+ $new_color_list["17,1"] = 'cc99cc';
+ $new_color_list["17,2"] = '996699';
+ $new_color_list["17,3"] = '663366';
+ $new_color_list["17,4"] = '330033';
+
+ $new_color_list["18,0"] = 'ffccff';
+ $new_color_list["18,1"] = 'ff99ff';
+ $new_color_list["18,2"] = 'ff66ff';
+ $new_color_list["18,3"] = 'ff33ff';
+ $new_color_list["18,4"] = 'ff00ff';
+
+ $selected_input = '';
+ $selected_choose = '';
+
for ($i=0; $i < 14; $i++) {
${"selected".$i} = '';
}
@@ -122,11 +238,11 @@
${"selected".$i} = ' selected';
continue;
}
- }
+ }
}
if (!isset($message_highlight_list[$theid]['color']))
$selected_choose = ' checked';
- else if (!isset($selected_choose))
+ else if ($selected_choose == '')
$selected_input = ' checked';
echo '\n";
- do_hook('options_highlight_bottom');
- }
+ }
+ do_hook('options_highlight_bottom');
?>
-