X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=plugins%2Ffilters%2Foptions.php;h=8056a83dc5cb2cefe04fc1a91ef8827be3ff8e34;hp=2bae70545588d5216a02c1caa95e17965689bc89;hb=7af343f176b34839e17d03e5f2ea9dc45b56f6d2;hpb=8e7241121f714d9a08e1c8900d4ca274a7b22a9c
diff --git a/plugins/filters/options.php b/plugins/filters/options.php
index 2bae7054..8056a83d 100644
--- a/plugins/filters/options.php
+++ b/plugins/filters/options.php
@@ -1,94 +1,89 @@
');
- $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') {
+/**
+ * Include the SquirrelMail initialization file.
+ */
+require('../../include/init.php');
+include_once(SM_PATH . 'functions/imap_general.php');
+include_once(SM_PATH . 'functions/forms.php');
+include_once(SM_PATH . 'plugins/filters/filters.php');
+
+displayPageHeader($color, 'None');
+
+/* get globals */
+sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
+
+sqgetGlobalVar('theid', $theid);
+sqgetGlobalVar('action', $action, SQ_GET);
+
+if (sqgetGlobalVar('filter_submit',$filter_submit,SQ_POST)) {
+
+ if(! isset($theid) ) $theid = 0;
+
+ $complete_post=true;
+
+ // 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;
+ }
+
+ sqgetGlobalVar('filter_where', $filter_where, SQ_POST);
+ if (!sqgetGlobalVar('filter_where', $filter_where, SQ_POST)) {
+ 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;
+ }
+
+ 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);
+
+ 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');
@@ -96,76 +91,86 @@ require_once(SM_PATH . 'plugins/filters/filters.php');
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')) {
- $username = $_SESSION['username'];
- $key = $_COOKIE['key'];
- $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+ $imapConnection = sqimap_login($username, false, $imapServerAddress, $imapPort, 0);
$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++) {
@@ -210,36 +216,42 @@ require_once(SM_PATH . 'plugins/filters/filters.php');
echo html_tag( 'tr', '', '', $clr ) .
html_tag( 'td',
'' .
- "[" . _("Edit") . ']'.
+ "[" . _("Edit") . ']'.
'' ,
'left' ) .
html_tag( 'td',
'' .
- "[" . _("Delete") . ']'.
+ "[" . _("Delete") . ']'.
'' ,
- 'left' ) .
- html_tag( 'td', '', 'center' ) . '[';
+ 'left' );
- if (isset($filters[$i + 1])) {
- echo "" . _("Down") . '';
+ 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'].'',
+ ''.htmlspecialchars(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"' );
-?>
+ echo '