X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Foptions_highlight.php;h=0fd3d4cb9a81abca8892c42c4e6ea97238628f72;hb=f898445986a37f967770c5e6c7f813d90c9404d0;hp=fe5b24dba7fadc7b656e2ae82674af956fb3ea06;hpb=8415b2d3c0d33a6e4b4053496ffffd1d1f61bc22;p=squirrelmail.git diff --git a/src/options_highlight.php b/src/options_highlight.php index fe5b24db..0fd3d4cb 100644 --- a/src/options_highlight.php +++ b/src/options_highlight.php @@ -3,15 +3,16 @@ /** * options_highlight.php * - * Copyright (c) 1999-2003 The SquirrelMail Project Team + * Copyright (c) 1999-2004 The SquirrelMail Project Team * Licensed under the GNU GPL. For full terms see the file COPYING. * * Displays message highlighting options * * $Id$ + * @package squirrelmail */ -/* Path for SquirrelMail required files. */ +/** Path for SquirrelMail required files. */ define('SM_PATH','../'); /* SquirrelMail required files. */ @@ -21,32 +22,17 @@ 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 */ @@ -97,7 +83,7 @@ if (isset($theid) && ($action == 'delete') || 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') { @@ -328,8 +314,10 @@ if ($action == 'edit' || $action == 'add') { $new_color_list["18,3"] = 'ff33ff'; $new_color_list["18,4"] = 'ff00ff'; - $selected_input = ''; - $selected_choose = ''; + $selected_input = FALSE; + $selected_i = null; + $selected_choose = FALSE; + $selected_predefined = FALSE; for ($i=0; $i < 14; $i++) { ${"selected".$i} = ''; @@ -337,8 +325,8 @@ if ($action == 'edit' || $action == 'add') { if ($action == 'edit' && isset($theid) && isset($message_highlight_list[$theid]['color'])) { for ($i=0; $i < 14; $i++) { if ($color_list[$i] == $message_highlight_list[$theid]['color']) { - $selected_choose = ' checked'; - ${"selected".$i} = ' selected'; + $selected_choose = TRUE; + $selected_i = $color_list[$i]; continue; } } @@ -351,6 +339,7 @@ if ($action == 'edit' || $action == 'add') { $current_color = '63aa7f'; } + $pre_defined_color = 0; for($x = 0; $x < 5; $x++) { for($y = 0; $y < 19; $y++) { $gridindex = "$y,$x"; @@ -362,17 +351,18 @@ if ($action == 'edit' || $action == 'add') { } } - if (!isset($message_highlight_list[$theid]['color'])) - $selected_choose = ' checked'; + if (isset($theid) && !isset($message_highlight_list[$theid]['color'])) + $selected_choose = TRUE; else if ($pre_defined_color) - $selected_predefined = ' checked'; + $selected_predefined = TRUE; else if ($selected_choose == '') - $selected_input = ' checked'; + $selected_input = TRUE; - echo '
' . "\n"; - echo '' . "\n"; - if($action == 'edit') - echo '' . "\n"; + echo addForm('options_highlight.php', 'POST', 'f'). + addHidden('action', 'save'); + if($action == 'edit') { + echo addHidden('theid', (isset($theid)?$theid:'')); + } echo html_tag( 'table', '', 'center', '', 'width="80%" cellpadding="3" cellspacing="0" border="0"' ) . "\n"; echo html_tag( 'tr', '', '', $color[0] ) . "\n"; echo html_tag( 'td', '', 'right', '', 'nowrap' ) . "\n"; @@ -383,33 +373,40 @@ if ($action == 'edit' || $action == 'add') { $disp = $message_highlight_list[$theid]['name']; else $disp = ''; - $disp = htmlspecialchars($disp); - echo " "; + echo " ".addInput('identname', $disp); echo " \n"; echo " \n"; echo html_tag( 'tr', html_tag( 'td', ' ', 'left' ) ) ."\n"; echo html_tag( 'tr', '', '', $color[0] ) . "\n"; echo html_tag( 'td', ''. _("Color") . ':', 'right' ); echo html_tag( 'td', '', 'left' ); - echo "  
\n"; - echo "  ". _("Other:") ." '._("Ex: 63aa7f")."
\n"; + echo ' '.addRadioBox('color_type', $selected_choose, '1'); + + $selops = array ( + $color_list[0] => _("Dark Blue"), + $color_list[1] => _("Dark Green"), + $color_list[2] => _("Dark Yellow"), + $color_list[3] => _("Dark Cyan"), + $color_list[4] => _("Dark Magenta"), + $color_list[5] => _("Light Blue"), + $color_list[6] => _("Light Green"), + $color_list[7] => _("Light Yellow"), + $color_list[8] => _("Light Cyan"), + $color_list[9] => _("Light Magenta"), + $color_list[10] => _("Dark Gray"), + $color_list[11] => _("Medium Gray"), + $color_list[12] => _("Light Gray"), + $color_list[13] => _("White") ); + + echo addSelect('newcolor_choose', $selops, $selected_i, TRUE); + echo "
\n"; + + echo ' '.addRadioBox('color_type', $selected_input, 2). + '  '. _("Other:") . + addInput('newcolor_input', + (($selected_input && isset($theid)) ? $message_highlight_list[$theid]['color'] : ''), + '7'); + echo _("Ex: 63aa7f")."
\n"; echo " \n"; echo " \n"; @@ -423,8 +420,8 @@ if ($action == 'edit' || $action == 'add') { for($y = 0; $y < 19; $y++) { $gridindex = "$y,$x"; $gridcolor = $new_color_list[$gridindex]; - $selected = ($gridcolor == $current_color) ? ' checked' : '' ; - echo html_tag( 'td', '', 'left', $gridcolor, 'colspan="2"' ); + echo html_tag( 'td', addRadioBox('color_type', ($gridcolor == $current_color), '#'.$gridcolor), + 'left', $gridcolor, 'colspan="2"' ); } echo "\n"; } @@ -456,9 +453,7 @@ if ($action == 'edit' || $action == 'add') { $disp = $message_highlight_list[$theid]['value']; else $disp = ''; - $disp = htmlspecialchars($disp); - echo ' '; + echo ' '.addInput('value', $disp, 40); echo " \n"; echo " \n"; echo "\n";