X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=plugins%2Ffilters%2Foptions.php;h=0df8e832ba89b6289bf6aefeec7068f5a178259c;hp=74eb85f50183c6081693a35407c0d7a709dd4f6c;hb=f197ec8835b64975ff47dc6cd86dae75605baebf;hpb=1d80c108a1d741b7dcb562ea1cf6d2214322b192
diff --git a/plugins/filters/options.php b/plugins/filters/options.php
index 74eb85f5..0df8e832 100644
--- a/plugins/filters/options.php
+++ b/plugins/filters/options.php
@@ -1,93 +1,90 @@
');
- $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') {
+ if (empty($filter_what)) {
+ do_error(_("WARNING! You must enter something to search for."));
+ $action = 'edit';
+ }
+
+ if (($filter_where == 'Header') && (strchr($filter_what,':') == '')) {
+ do_error(_("WARNING! Header filters should be of the format "Header: value""));
+ $action = 'edit';
+ }
+ if ($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') {
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 (isset($_POST['user_submit'])) {
- setPref($data_dir, $username, 'filters_user_scan', $_POST['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');
@@ -95,74 +92,86 @@ sqgetGlobalVar('action', $action, SQ_GET);
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"' ) .
-
- '
'.
html_tag( 'div', '[' . _("New") .
'] - [' . _("Done") . ']' ,
- 'center' ) . '
';
+ 'center' ) . '
';
if (isset($action) && ($action == 'add' || $action == 'edit')) {
- $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+ $imapConnection = sqimap_login($username, false, $imapServerAddress, $imapPort, 0, $imap_stream_options);
$boxes = sqimap_mailbox_list($imapConnection);
+
+ for ($a = 0, $cnt = count($boxes); $a < $cnt; $a++) {
+ if (strtolower($boxes[$a]['formatted']) == 'inbox') {
+ unset($boxes[$a]);
+ }
+ }
+
sqimap_logout($imapConnection);
if ( !isset($theid) ) {
$theid = count($filters);
}
echo html_tag( 'div', '', 'center' ) .
- ''.
'';
}
- echo html_tag( 'table', '', 'center', '', 'border="0" cellpadding="3" cellspacing="0"' );
+if (count($filters)) {
+ echo html_tag( 'table', '', 'center', '', 'border="0" cellpadding="3" cellspacing="0"' );
for ($i=0, $num = count($filters); $i < $num; $i++) {
@@ -207,38 +217,42 @@ sqgetGlobalVar('action', $action, SQ_GET);
echo html_tag( 'tr', '', '', $clr ) .
html_tag( 'td',
'' .
- "[" . _("Edit") . ']'.
+ "[" . _("Edit") . ']'.
'' ,
'left' ) .
html_tag( 'td',
'' .
- "[" . _("Delete") . ']'.
+ "[" . _("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' );
- printf( _("If %s contains %s then move to %s"), _($filters[$i]['where']), $filters[$i]['what'], $fdr );
+ echo html_tag( 'td', '-', 'left' ) .
+ html_tag( 'td', '', 'left' );
+ printf( _("If %s contains %s then move to %s"),
+ ''.$filters[$i]['where'].'',
+ ''.$filters[$i]['what'].'',
+ ''.sm_encode_html_special_chars(imap_utf7_decode_local($fdr)).'');
echo '';
}
- echo ''.
- html_tag( 'table',
+ echo '';
+}
+ echo html_tag( 'table',
html_tag( 'tr',
html_tag( 'td', ' ', 'left' )
) ,
'center', '', 'width="80%" border="0" cellpadding="2" cellspacing="0"' );
- noframes_bottom();
-
-?>
\ No newline at end of file
+ echo '