X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=plugins%2Ffilters%2Foptions.php;h=8056a83dc5cb2cefe04fc1a91ef8827be3ff8e34;hb=d95b10b37612d4ccb3712a90a3f9be85fd92910f;hp=7cc848b716c709ec22a3315d4707d41e8e404c0d;hpb=4b4abf93a9624311afef0c385023724ee46a2b60;p=squirrelmail.git
diff --git a/plugins/filters/options.php b/plugins/filters/options.php
index 7cc848b7..8056a83d 100644
--- a/plugins/filters/options.php
+++ b/plugins/filters/options.php
@@ -3,7 +3,7 @@
/**
* Message and Spam Filter Plugin - Filtering Options
*
- * @copyright © 1999-2005 The SquirrelMail Project Team
+ * @copyright © 1999-2007 The SquirrelMail Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package plugins
@@ -11,22 +11,16 @@
*/
/**
- * Path for SquirrelMail required files.
- * @ignore
+ * Include the SquirrelMail initialization file.
*/
-define('SM_PATH','../../');
-
-/* SquirrelMail required files. */
-require_once(SM_PATH . 'include/validate.php');
-include_once(SM_PATH . 'functions/imap.php');
+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('username', $username, SQ_SESSION);
-sqgetGlobalVar('key', $key, SQ_COOKIE);
-sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION);
sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
sqgetGlobalVar('theid', $theid);
@@ -88,7 +82,7 @@ if (sqgetGlobalVar('filter_submit',$filter_submit,SQ_POST)) {
} 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";
+ echo '
'._("Saved Scan type")."
\n";
}
$filters = load_filters();
@@ -97,15 +91,14 @@ if (sqgetGlobalVar('filter_submit',$filter_submit,SQ_POST)) {
echo html_tag( 'table',
html_tag( 'tr',
html_tag( 'td',
- '' . _("Options") . ' - ' . _("Message Filtering") . '' ,
+ '' . _("Options") . ' - ' . _("Message Filtering") . '
' ,
'left', $color[0]
)
),
'center', '', 'width="95%" border="0" cellpadding="2" cellspacing="0"'
) .
'
'.
html_tag( 'div', '[' . _("New") .
@@ -133,7 +125,7 @@ if (sqgetGlobalVar('filter_submit',$filter_submit,SQ_POST)) {
if (isset($action) && ($action == 'add' || $action == 'edit')) {
- $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++) {
@@ -202,8 +194,8 @@ if (sqgetGlobalVar('filter_submit',$filter_submit,SQ_POST)) {
if ( isset($filters[$theid]['folder']) )
$selected = array(strtolower($filters[$theid]['folder']));
echo sqimap_mailbox_option_list(0, $selected, 0, $boxes);
- echo ''.
- ''.
+ echo ''.
+ ''.
''.
''.
''.
@@ -214,6 +206,7 @@ if (sqgetGlobalVar('filter_submit',$filter_submit,SQ_POST)) {
}
+if (count($filters)) {
echo html_tag( 'table', '', 'center', '', 'border="0" cellpadding="3" cellspacing="0"' );
for ($i=0, $num = count($filters); $i < $num; $i++) {
@@ -250,15 +243,15 @@ if (sqgetGlobalVar('filter_submit',$filter_submit,SQ_POST)) {
printf( _("If %s contains %s then move to %s"),
''.$filters[$i]['where'].'',
''.$filters[$i]['what'].'',
- ''.imap_utf7_decode_local($fdr).'');
+ ''.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 '