From 3b94163a44fd63151f63042abd8fd57b7cad13e4 Mon Sep 17 00:00:00 2001 From: indiri69 Date: Wed, 2 Jun 2004 16:54:39 +0000 Subject: [PATCH] Don't show empty braces when there's only one filter git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@7591 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- plugins/filters/options.php | 89 +++++++++++++++++++------------------ 1 file changed, 46 insertions(+), 43 deletions(-) diff --git a/plugins/filters/options.php b/plugins/filters/options.php index 5706aad5..40bff9c1 100644 --- a/plugins/filters/options.php +++ b/plugins/filters/options.php @@ -62,48 +62,48 @@ if (sqgetGlobalVar('filter_submit',$filter_submit,SQ_POST)) { // FIXME: write human readable error messages sqgetGlobalVar('filter_what', $filter_what, SQ_POST); if (!sqgetGlobalVar('filter_what', $filter_what, SQ_POST)) { - do_error("Post error"); - $complete_post=false; + do_error("Post error"); + $complete_post=false; } sqgetGlobalVar('filter_where', $filter_where, SQ_POST); if (!sqgetGlobalVar('filter_where', $filter_where, SQ_POST)) { - do_error("Post error"); - $complete_post=false; + do_error("Post error"); + $complete_post=false; } sqgetGlobalVar('filter_folder', $filter_folder, SQ_POST); if (!sqgetGlobalVar('filter_folder', $filter_folder, SQ_POST)) { - do_error("Post error"); - $complete_post=false; + do_error("Post error"); + $complete_post=false; } if ($complete_post) { - $filter_what = str_replace(',', ' ', $filter_what); + $filter_what = str_replace(',', ' ', $filter_what); $filter_what = str_replace("\\\\", "\\", $filter_what); $filter_what = str_replace("\\\"", '"', $filter_what); $filter_what = str_replace('"', '"', $filter_what); if (($filter_where == 'Header') && (strchr($filter_what,':') == '')) { - do_error(_("WARNING! Header filters should be of the format "Header: value"")); - $action = 'edit'; - } - setPref($data_dir, $username, 'filter'.$theid, $filter_where.','.$filter_what.','.$filter_folder); - $filters[$theid]['where'] = $filter_where; - $filters[$theid]['what'] = $filter_what; - $filters[$theid]['folder'] = $filter_folder; + do_error(_("WARNING! Header filters should be of the format "Header: value"")); + $action = 'edit'; + } + setPref($data_dir, $username, 'filter'.$theid, $filter_where.','.$filter_what.','.$filter_folder); + $filters[$theid]['where'] = $filter_where; + $filters[$theid]['what'] = $filter_what; + $filters[$theid]['folder'] = $filter_folder; } - } elseif (isset($action) && $action == 'delete') { +} elseif (isset($action) && $action == 'delete') { remove_filter($theid); - } elseif (isset($action) && $action == 'move_up') { +} elseif (isset($action) && $action == 'move_up') { filter_swap($theid, $theid - 1); - } elseif (isset($action) && $action == 'move_down') { +} elseif (isset($action) && $action == 'move_down') { filter_swap($theid, $theid + 1); - } elseif (sqgetGlobalVar('user_submit',$user_submit,SQ_POST)) { - sqgetGlobalVar('filters_user_scan_set',$filters_user_scan_set,SQ_POST); - setPref($data_dir, $username, 'filters_user_scan', $filters_user_scan_set); - echo '
'._("Saved Scan type")."
\n"; - } +} elseif (sqgetGlobalVar('user_submit',$user_submit,SQ_POST)) { + sqgetGlobalVar('filters_user_scan_set',$filters_user_scan_set,SQ_POST); + setPref($data_dir, $username, 'filters_user_scan', $filters_user_scan_set); + echo '
'._("Saved Scan type")."
\n"; +} $filters = load_filters(); $filters_user_scan = getPref($data_dir, $username, 'filters_user_scan'); @@ -111,11 +111,12 @@ if (sqgetGlobalVar('filter_submit',$filter_submit,SQ_POST)) { echo html_tag( 'table', html_tag( 'tr', html_tag( 'td', - '
' . _("Options") . ' - ' . _("Message Filtering") . '
' , - 'left', $color[0] ) - ) , - 'center', '', 'width="95%" border="0" cellpadding="2" cellspacing="0"' ) . - + '
' . _("Options") . ' - ' . _("Message Filtering") . '
' , + 'left', $color[0] + ) + ), + 'center', '', 'width="95%" border="0" cellpadding="2" cellspacing="0"' + ) . '
'. '
'. html_tag( 'table', '', '', '', 'border="0" cellpadding="2" cellspacing="0"' ) . @@ -214,7 +215,7 @@ if (sqgetGlobalVar('filter_submit',$filter_submit,SQ_POST)) { } - echo html_tag( 'table', '', 'center', '', 'border="0" cellpadding="3" cellspacing="0"' ); + echo html_tag( 'table', '', 'center', '', 'border="0" cellpadding="3" cellspacing="0"' ); for ($i=0, $num = count($filters); $i < $num; $i++) { @@ -230,25 +231,27 @@ if (sqgetGlobalVar('filter_submit',$filter_submit,SQ_POST)) { '' . "[" . _("Delete") . ']'. '' , - 'left' ) . - html_tag( 'td', '', 'center' ) . '['; - - if (isset($filters[$i + 1])) { - echo "" . _("Down") . ''; + 'left' ); + + if ($num > 1) { + echo html_tag( 'td', '', 'center' ) . '['; + if (isset($filters[$i + 1])) { + echo "" . _("Down") . ''; + if ($i > 0) { + echo ' | '; + } + } if ($i > 0) { - echo ' | '; + echo "" . _("Up") . ''; } + echo ']'; } - if ($i > 0) { - echo "" . _("Up") . ''; - } - echo ']'. - html_tag( 'td', '-', 'left' ) . - html_tag( 'td', '', 'left' ); + echo html_tag( 'td', '-', 'left' ) . + html_tag( 'td', '', 'left' ); printf( _("If %s contains %s then move to %s"), - ''.$filters[$i]['where'].'', - ''.$filters[$i]['what'].'', - ''.imap_utf7_decode_local($fdr).''); + ''.$filters[$i]['where'].'', + ''.$filters[$i]['what'].'', + ''.imap_utf7_decode_local($fdr).''); echo ''; } -- 2.25.1