X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Foptions_highlight.php;h=5822f8892ea4d2cfe0331153654f402fb6a1e934;hp=1c2da7c3cb29c6c503d84b702b49faa8ef205571;hb=91e0dccca7b2452d8b450791cae3aa4125e8889e;hpb=82d304a0501324b276cabab1870755d5352bd21c diff --git a/src/options_highlight.php b/src/options_highlight.php index 1c2da7c3..5822f889 100644 --- a/src/options_highlight.php +++ b/src/options_highlight.php @@ -8,11 +8,14 @@ * * 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', '
' . _("Options") . ' - ' . _("Message Highlighting") . '
', 'left') ), - 'center', $color[9], 'width="95%" border="0" cellpadding="1" cellspacing="0"' ) . "
\n" . -html_tag( 'table', '', '', '', 'width="100%" border="0" cellpadding="1" cellspacing="0"' ) . + 'center', $color[9], 'width="95%" border="0" cellpadding="1" cellspacing="0"' ) . "
\n" . +html_tag( 'table', '', '', '', 'width="100%" border="0" cellpadding="1" cellspacing="0"' ) . html_tag( 'tr' ) . "\n" . html_tag( 'td', '', 'left' ); echo '
[' . _("New") . ']'. - ' - ['._("Done").']

'."\n"; + ' - ['._("Done").']
'."\n"; $mhl_count = count($message_highlight_list); if ($mhl_count > 0) { echo html_tag( 'table', '', 'center', '', 'width="80%" border="0" cellpadding="3" cellspacing="0"' ) . "\n"; @@ -186,10 +174,10 @@ if ($mhl_count > 0) { '', $message_highlight_list[$i]['color'] ) . "\n"; } echo "\n". - "
\n"; + "
\n"; } else { - echo '
' . _("No highlighting is defined") . "

\n". - "
\n"; + echo '
' . _("No highlighting is defined") . "

\n". + "
\n"; } if ($action == 'edit' || $action == 'add') { @@ -329,8 +317,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} = ''; @@ -338,8 +328,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; } } @@ -364,17 +354,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"; @@ -385,48 +376,55 @@ 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"; # Show grid of color choices echo html_tag( 'tr', '', '', $color[0] ) . "\n"; echo html_tag( 'td', '', 'left', '', 'colspan="2"' ); - echo html_tag( 'table', '', 'center', '', 'border=0 cellpadding="2" cellspacing="1"' ) . "\n"; + echo html_tag( 'table', '', 'center', '', 'border="0" cellpadding="2" cellspacing="1"' ) . "\n"; for($x = 0; $x < 5; $x++) { echo html_tag( 'tr' ) . "\n"; 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"; } @@ -436,7 +434,7 @@ if ($action == 'edit' || $action == 'add') { echo html_tag( 'tr', html_tag( 'td', ' ', 'left' ) ) . "\n"; echo html_tag( 'tr', '', '', $color[0] ) . "\n"; echo html_tag( 'td', '', 'center', '', 'colspan="2"' ) . "\n"; - echo " \n"; oh_opt( 'from', (isset($theid)?$message_highlight_list[$theid]['match_type'] == 'from':1), _("From") ); @@ -458,15 +456,13 @@ 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"; - echo '
\n"; + echo '
\n"; echo "\n"; } do_hook('options_highlight_bottom'); ?> - + \ No newline at end of file