X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Foptions_highlight.php;h=264980c540ccfa0922181c26850306e49bbf02fb;hp=490d24b2d7f9dd31cca39059adff28a656dd9254;hb=23d6bd09c631285eae8c45af3a37aa7c86be3cfa;hpb=d7d3c4d435ff1820555e557fcccc9a9d52bf9e93
diff --git a/src/options_highlight.php b/src/options_highlight.php
index 490d24b2..264980c5 100644
--- a/src/options_highlight.php
+++ b/src/options_highlight.php
@@ -7,136 +7,260 @@
**
** Displays message highlighting options
**
+ ** $Id$
**/
- session_start();
+ require_once('../src/validate.php');
+ require_once('../functions/display_messages.php');
+ require_once('../functions/imap.php');
+ require_once('../functions/array.php');
+ require_once('../functions/plugin.php');
- if (!isset($config_php))
- include("../config/config.php");
- if (!isset($strings_php))
- include("../functions/strings.php");
- if (!isset($page_header_php))
- include("../functions/page_header.php");
- if (!isset($display_messages_php))
- include("../functions/display_messages.php");
- if (!isset($imap_php))
- include("../functions/imap.php");
- if (!isset($array_php))
- include("../functions/array.php");
- if (!isset($i18n_php))
- include("../functions/i18n.php");
- if (!isset($plugin_php))
- include("../functions/plugin.php");
+ if (! isset($action))
+ $action = '';
+ if (! isset($message_highlight_list))
+ $message_highlight_list = array();
-
- if ($action == "delete" && isset($theid)) {
+ if ($action == 'delete' && isset($theid)) {
removePref($data_dir, $username, "highlight$theid");
- } else if ($action == "save") {
+ } else if ($action == 'save') {
if (!$theid) $theid = 0;
- $identname = ereg_replace(",", " ", $identname);
- $identname = str_replace("\\\\", "\\", $identname);
- $identname = str_replace("\\\"", "\"", $identname);
- $identname = str_replace("\"", """, $identname);
+ $identname = ereg_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";
- $value = ereg_replace(",", " ", $value);
- $value = str_replace("\\\\", "\\", $value);
- $value = str_replace("\\\"", "\"", $value);
- $value = str_replace("\"", """, $value);
+ $newcolor = ereg_replace(',', '', $newcolor);
+ $newcolor = ereg_replace('#', '', $newcolor);
+ $newcolor = ereg_replace('"', '', $newcolor);
+ $newcolor = ereg_replace('\'', '', $newcolor);
+ $value = ereg_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;
+ 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");
+ displayPageHeader($color, 'None');
?>
-
-
\n"; + echo ' '."\n"; if (count($message_highlight_list) >= 1) { - echo "
|