X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Foptions_highlight.php;h=aa6fae03e5a241cc9dbc555be44dbca2e43738c5;hb=1ce76674256f43e3daf0a08b81d134dd646121c8;hp=7b2ff63504348dc7f74ef1fd3995dbc31d6424c6;hpb=1c159927990ad2cfc7b44abb7102437383263e74;p=squirrelmail.git diff --git a/src/options_highlight.php b/src/options_highlight.php index 7b2ff635..aa6fae03 100644 --- a/src/options_highlight.php +++ b/src/options_highlight.php @@ -3,57 +3,39 @@ /** * options_highlight.php * - * Copyright (c) 1999-2002 The SquirrelMail Project Team - * Licensed under the GNU GPL. For full terms see the file COPYING. - * * Displays message highlighting options * - * $Id$ + * @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. */ -define('SM_PATH','../'); +/** + * Include the SquirrelMail initialization file. + */ +require('../include/init.php'); -/* 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'); +// include_once(SM_PATH . 'functions/imap.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"; } @@ -64,19 +46,40 @@ if (! isset($message_highlight_list)) { $message_highlight_list = array(); } -if ($action == 'delete' && isset($theid)) { - +if (isset($theid) && ($action == 'delete') || + ($action == 'up') || + ($action == 'down')) { $new_rules = array(); - foreach($message_highlight_list as $rid => $rule) { - if($rid != $theid) { - $new_rules[] = $rule; - } + switch($action) { + case('delete'): + foreach($message_highlight_list as $rid => $rule) { + if($rid != $theid) { + $new_rules[] = $rule; + } + } + break; + case('down'): + $theid++; + case('up'): + foreach($message_highlight_list as $rid => $rule) { + if($rid == $theid) { + $temp_rule = $new_rules[$rid-1]; + $new_rules[$rid-1] = $rule; + $new_rules[$rid] = $temp_rule; + } else { + $new_rules[$rid] = $rule; + } + } + break; + default: + $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)); - header( 'Location: options_highlight.php' ); + header( 'Location: ' .get_location(). '/options_highlight.php' ); exit; } else if ($action == 'save') { @@ -90,11 +93,11 @@ if ($action == 'delete' && isset($theid)) { $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 ); } @@ -106,18 +109,19 @@ displayPageHeader($color, 'None'); echo html_tag( 'table', "\n" . html_tag( 'tr', "\n" . - html_tag( 'td', '