From cb2ccf4b70bc3028fc4c2dfefec9cd9d6e2149e1 Mon Sep 17 00:00:00 2001 From: bbice Date: Thu, 29 Nov 2001 12:26:06 +0000 Subject: [PATCH] Fixed five-ten filters and made Options page edit forms always at top of page git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1814 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- plugins/filters/filters.php | 36 ++++---- plugins/filters/options.php | 165 ++++++++++++++++++------------------ 2 files changed, 101 insertions(+), 100 deletions(-) diff --git a/plugins/filters/filters.php b/plugins/filters/filters.php index 5273b353..52f5dfae 100644 --- a/plugins/filters/filters.php +++ b/plugins/filters/filters.php @@ -488,28 +488,28 @@ $filters['FiveTen Others']['comment'] = _("FREE - Five-Ten-sg.com - Other misc. servers."); - $filters['FiveTen Others']['prefname'] = 'filters_spam_fiveten_ss'; - $filters['FiveTen Others']['name'] = 'Five-Ten-sg.com Single Stage Servers'; - $filters['FiveTen Others']['link'] = 'http://www.five-ten-sg.com/blackhole.php'; - $filters['FiveTen Others']['dns'] = 'blackholes.five-ten-sg.com'; - $filters['FiveTen Others']['result'] = '127.0.0.6'; - $filters['FiveTen Others']['comment'] = + $filters['FiveTen Single Stage']['prefname'] = 'filters_spam_fiveten_ss'; + $filters['FiveTen Single Stage']['name'] = 'Five-Ten-sg.com Single Stage Servers'; + $filters['FiveTen Single Stage']['link'] = 'http://www.five-ten-sg.com/blackhole.php'; + $filters['FiveTen Single Stage']['dns'] = 'blackholes.five-ten-sg.com'; + $filters['FiveTen Single Stage']['result'] = '127.0.0.6'; + $filters['FiveTen Single Stage']['comment'] = _("FREE - Five-Ten-sg.com - Single Stage servers."); - $filters['FiveTen Others']['prefname'] = 'filters_spam_fiveten_supp'; - $filters['FiveTen Others']['name'] = 'Five-Ten-sg.com SPAM Support Servers'; - $filters['FiveTen Others']['link'] = 'http://www.five-ten-sg.com/blackhole.php'; - $filters['FiveTen Others']['dns'] = 'blackholes.five-ten-sg.com'; - $filters['FiveTen Others']['result'] = '127.0.0.7'; - $filters['FiveTen Others']['comment'] = + $filters['FiveTen SPAM Support']['prefname'] = 'filters_spam_fiveten_supp'; + $filters['FiveTen SPAM Support']['name'] = 'Five-Ten-sg.com SPAM Support Servers'; + $filters['FiveTen SPAM Support']['link'] = 'http://www.five-ten-sg.com/blackhole.php'; + $filters['FiveTen SPAM Support']['dns'] = 'blackholes.five-ten-sg.com'; + $filters['FiveTen SPAM Support']['result'] = '127.0.0.7'; + $filters['FiveTen SPAM Support']['comment'] = _("FREE - Five-Ten-sg.com - SPAM Support servers."); - $filters['FiveTen Others']['prefname'] = 'filters_spam_fiveten_wf'; - $filters['FiveTen Others']['name'] = 'Five-Ten-sg.com Web Form IPs'; - $filters['FiveTen Others']['link'] = 'http://www.five-ten-sg.com/blackhole.php'; - $filters['FiveTen Others']['dns'] = 'blackholes.five-ten-sg.com'; - $filters['FiveTen Others']['result'] = '127.0.0.8'; - $filters['FiveTen Others']['comment'] = + $filters['FiveTen Web forms']['prefname'] = 'filters_spam_fiveten_wf'; + $filters['FiveTen Web forms']['name'] = 'Five-Ten-sg.com Web Form IPs'; + $filters['FiveTen Web forms']['link'] = 'http://www.five-ten-sg.com/blackhole.php'; + $filters['FiveTen Web forms']['dns'] = 'blackholes.five-ten-sg.com'; + $filters['FiveTen Web forms']['result'] = '127.0.0.8'; + $filters['FiveTen Web forms']['comment'] = _("FREE - Five-Ten-sg.com - Web Form IPs."); $filters['Dorkslayers']['prefname'] = 'filters_spam_dorks'; diff --git a/plugins/filters/options.php b/plugins/filters/options.php index 9d658a5c..421975b3 100644 --- a/plugins/filters/options.php +++ b/plugins/filters/options.php @@ -67,88 +67,6 @@ } $filters = load_filters(); - echo '
' . - ''. - "
". - '
' . _("Options") . ' - ' . _("Message Filtering") . '
'. - '
'. - '
[' . _("New") . - '] - [' . _("Done") . ']

' . - ''; - - for ($i=0; $i < count($filters); $i++) { - - $clr = (($i % 2)?$color[0]:$color[9]); - $fdr = ($folder_prefix)?str_replace($folder_prefix, "", $filters[$i]["folder"]):$filters[$i]["folder"]; - echo "'; - - } - echo '
". - "[" . _("Edit") . ']'. - ''. - "[" . _("Delete") . ']'. - '['; - - if (isset($filters[$i + 1])) { - echo "" . _("Down") . ''; - if ($i > 0) { - echo ' | '; - } - } - if ($i > 0) { - echo "" . _("Up") . ''; - } - echo '] - '; - printf( _("If %s contains %s then move to %s"), _($filters[$i]['where']), $filters[$i]['what'], $fdr ); - echo '
'. - ''. - ''. - '
 
'; - - - if ($AllowSpamFilters) { - - echo "". - ''. - '
' . _("Spam Filtering") . '
'; - if (! isset($action) || $action != 'spam') { - - echo '

[' . _("Edit") . ']
'; - printf( _("Spam is sent to %s"), ($filters_spam_folder?$filters_spam_folder:_("[not set yet]") ) ); - echo '
'; - printf( _("Spam scan is limited to %s"), (($filters_spam_scan == 'new')?_("New Messages Only"):_("All Messages") ) ); - echo '

'. - ""; - - $spam_filters = load_spam_filters(); - - foreach ($spam_filters as $Key => $Value) { - echo '\n"; - } - echo '
'; - - if ($spam_filters[$Key]['enabled']) { - echo _("ON"); - } else { - echo _("OFF"); - } - - echo ' - '; - - if ($spam_filters[$Key]['link']) { - echo ''; - } - - echo $spam_filters[$Key]['name']; - if ($spam_filters[$Key]['link']) { - echo ''; - } - echo "
'; - } - } - if (isset($action) && ($action == 'add' || $action == 'edit')) { $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); $boxes = sqimap_mailbox_list($imapConnection); @@ -309,4 +227,87 @@ sqimap_logout($imapConnection); } + + echo '
' . + ''. + "
". + '
' . _("Options") . ' - ' . _("Message Filtering") . '
'. + '
'. + '
[' . _("New") . + '] - [' . _("Done") . ']

' . + ''; + + for ($i=0; $i < count($filters); $i++) { + + $clr = (($i % 2)?$color[0]:$color[9]); + $fdr = ($folder_prefix)?str_replace($folder_prefix, "", $filters[$i]["folder"]):$filters[$i]["folder"]; + echo "'; + + } + echo '
". + "[" . _("Edit") . ']'. + ''. + "[" . _("Delete") . ']'. + '['; + + if (isset($filters[$i + 1])) { + echo "" . _("Down") . ''; + if ($i > 0) { + echo ' | '; + } + } + if ($i > 0) { + echo "" . _("Up") . ''; + } + echo '] - '; + printf( _("If %s contains %s then move to %s"), _($filters[$i]['where']), $filters[$i]['what'], $fdr ); + echo '
'. + ''. + ''. + '
 
'; + + + if ($AllowSpamFilters) { + + echo "". + ''. + '
' . _("Spam Filtering") . '
'; + if (! isset($action) || $action != 'spam') { + + echo '

[' . _("Edit") . ']
'; + printf( _("Spam is sent to %s"), ($filters_spam_folder?$filters_spam_folder:_("[not set yet]") ) ); + echo '
'; + printf( _("Spam scan is limited to %s"), (($filters_spam_scan == 'new')?_("New Messages Only"):_("All Messages") ) ); + echo '

'. + ""; + + $spam_filters = load_spam_filters(); + + foreach ($spam_filters as $Key => $Value) { + echo '\n"; + } + echo '
'; + + if ($spam_filters[$Key]['enabled']) { + echo _("ON"); + } else { + echo _("OFF"); + } + + echo ' - '; + + if ($spam_filters[$Key]['link']) { + echo ''; + } + + echo $spam_filters[$Key]['name']; + if ($spam_filters[$Key]['link']) { + echo ''; + } + echo "
'; + } + } + ?> -- 2.25.1