X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Foptions_highlight.php;h=fe3563bb659d6a33f9cb437e8d5d2e73b0352471;hb=030dae845395b0b3d713d008253000bcddb7940a;hp=79e2d2ae8741f0b3fc0e8ca830206e716121dc92;hpb=df2c5bc9da19d9f5c18c94458291434d74c8ff56;p=squirrelmail.git diff --git a/src/options_highlight.php b/src/options_highlight.php index 79e2d2ae..fe3563bb 100644 --- a/src/options_highlight.php +++ b/src/options_highlight.php @@ -3,16 +3,19 @@ /** * options_highlight.php * - * Copyright (c) 1999-2003 The SquirrelMail Project Team + * Copyright (c) 1999-2005 The SquirrelMail Project Team * Licensed under the GNU GPL. For full terms see the file COPYING. * * Displays message highlighting options * - * $Id$ + * @version $Id$ * @package squirrelmail */ -/** Path for SquirrelMail required files. */ +/** + * Path for SquirrelMail required files. + * @ignore + */ define('SM_PATH','../'); /* SquirrelMail required files. */ @@ -22,39 +25,24 @@ 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_once(SM_PATH . 'functions/forms.php'); /* get globals */ -if (isset($_GET['action'])) { - $action = $_GET['action']; -} -if (isset($_GET['theid'])) { - $theid = $_GET['theid']; -} -if (isset($_GET['identname'])) { - $identname = $_GET['identname']; -} -if (isset($_GET['newcolor_choose'])) { - $newcolor_choose = $_GET['newcolor_choose']; -} -if (isset($_GET['newcolor_input'])) { - $newcolor_input = $_GET['newcolor_input']; -} -if (isset($_GET['color_type'])) { - $color_type = $_GET['color_type']; -} -if (isset($_GET['match_type'])) { - $match_type = $_GET['match_type']; -} -if (isset($_GET['value'])) { - $value = $_GET['value']; -} +sqGetGlobalVar('action', $action); +sqGetGlobalVar('theid', $theid); +sqGetGlobalVar('identname', $identname); +sqGetGlobalVar('newcolor_choose', $newcolor_choose); +sqGetGlobalVar('newcolor_input', $newcolor_input); +sqGetGlobalVar('color_type', $color_type); +sqGetGlobalVar('match_type', $match_type); +sqGetGlobalVar('value', $value); /* end of get globals */ - + function oh_opt( $val, $sel, $tit ) { echo "\n"; } @@ -94,7 +82,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)); @@ -112,11 +100,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 ); } @@ -130,13 +118,13 @@ html_tag( 'table', "\n" . html_tag( 'tr', "\n" . html_tag( 'td', '