X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=plugins%2Ffilters%2Foptions.php;h=9cc1e54e93e4858c0c5c6043db046314920dc2fd;hb=fb0bcfdbbcbd1bfb5e8183c4b48b0ef184d21dbb;hp=58147c5e672d6d92e7d10c0d82fd2a9d40214f33;hpb=15d98101f0c2b3cae541e1e8de0f5edfaa820965;p=squirrelmail.git
diff --git a/plugins/filters/options.php b/plugins/filters/options.php
index 58147c5e..9cc1e54e 100644
--- a/plugins/filters/options.php
+++ b/plugins/filters/options.php
@@ -1,36 +1,26 @@
'._("Saved Scan type")."\n";
+ echo '
'._("Saved Scan type")."
\n";
}
$filters = load_filters();
@@ -101,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") .
@@ -137,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++) {
@@ -192,7 +180,7 @@ if (sqgetGlobalVar('filter_submit',$filter_submit,SQ_POST)) {
html_tag( 'td', '', 'left' ) .
''.
''.
@@ -206,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 ''.
+ ''.
''.
''.
''.
@@ -218,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++) {
@@ -254,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 '