X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Foptions_highlight.php;h=f3f1f0802611093db49b527c9b492fd373ccfd06;hb=15e6162eacc97158393bc75aed3afeb7b19c24a6;hp=1bc8afb2d89eb0ee5d00d0fe4e219fd6c6c79355;hpb=895905c0f766ea03e85deab260b4bb1522dd0e3c;p=squirrelmail.git
diff --git a/src/options_highlight.php b/src/options_highlight.php
index 1bc8afb2..f3f1f080 100644
--- a/src/options_highlight.php
+++ b/src/options_highlight.php
@@ -1,21 +1,28 @@
$tit\n";
+}
if (! isset($action))
$action = '';
@@ -30,7 +37,7 @@
if ($color_type == 1) $newcolor = $newcolor_choose;
elseif ($color_type == 2) $newcolor = $newcolor_input;
else $newcolor = $color_type;
-
+
$newcolor = ereg_replace(',', '', $newcolor);
$newcolor = ereg_replace('#', '', $newcolor);
$newcolor = ereg_replace('"', '', $newcolor);
@@ -42,7 +49,7 @@
$message_highlight_list[$theid]['color'] = $newcolor;
$message_highlight_list[$theid]['value'] = $value;
$message_highlight_list[$theid]['match_type'] = $match_type;
- }
+ }
displayPageHeader($color, 'None');
?>
@@ -51,30 +58,29 @@
[' . _("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++) {
-?>
-
- [] []
- |
-
- |
-
- |
-'.
+ "".
+ "[".
+ _("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))
@@ -82,7 +88,7 @@
$theid = count($message_highlight_list);
$message_highlight_list[$theid] = array();
}
-
+
$color_list[0] = '4444aa';
$color_list[1] = '44aa44';
$color_list[2] = 'aaaa44';
@@ -96,8 +102,8 @@
$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';
@@ -142,7 +148,7 @@
$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';
@@ -221,7 +227,7 @@
$selected_input = '';
$selected_choose = '';
-
+
for ($i=0; $i < 14; $i++) {
${"selected".$i} = '';
}
@@ -232,7 +238,7 @@
${"selected".$i} = ' selected';
continue;
}
- }
+ }
}
if (!isset($message_highlight_list[$theid]['color']))
$selected_choose = ' checked';
@@ -251,7 +257,7 @@
if (isset($message_highlight_list[$theid]['name']))
$disp = $message_highlight_list[$theid]['name'];
else
- $disp = ' ';
+ $disp = '';
$disp = htmlspecialchars($disp);
echo " ";
echo " \n";
@@ -293,7 +299,7 @@
for($y = 0; $y < 19; $y++) {
$gridindex = "$y,$x";
$gridcolor = $new_color_list[$gridindex];
- $selected = ($gridcolor == $current_color)?'SELECTED':'' ;
+ $selected = ($gridcolor == $current_color)?'SELECTED':'' ;
echo "\n";
echo " | \n";
}
@@ -306,16 +312,21 @@
echo " \n";
echo ' ' . "\n";
echo " \n";
echo '' . _("Matches") . ': ';
if (isset($message_highlight_list[$theid]['value']))
@@ -330,7 +341,7 @@
echo "\n";
echo '\n";
echo "\n";
- }
+ }
do_hook('options_highlight_bottom');
?>
- |