projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove $version, use SM_VERSION constant instead
[squirrelmail.git]
/
plugins
/
filters
/
filters.php
diff --git
a/plugins/filters/filters.php
b/plugins/filters/filters.php
index cd08095dc0aa8b0441a3dfa07f39a2d4e1253ab3..aefbf659add4e7767357fced35c1fbf8e960c6c2 100644
(file)
--- a/
plugins/filters/filters.php
+++ b/
plugins/filters/filters.php
@@
-3,7
+3,7
@@
/**
* Message and Spam Filter Plugin - Filtering Functions
*
/**
* Message and Spam Filter Plugin - Filtering Functions
*
- * @copyright © 1999-200
6
The SquirrelMail Project Team
+ * @copyright © 1999-200
7
The SquirrelMail Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package plugins
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package plugins
@@
-13,8
+13,7
@@
/**
* do not allow to call this file directly
*/
/**
* do not allow to call this file directly
*/
-if ((isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) ||
- (isset($HTTP_SERVER_SERVER['SCRIPT_FILENAME']) && $HTTP_SERVER_SERVER['SCRIPT_FILENAME'] == __FILE__) ) {
+if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) {
header("Location: ../../src/login.php");
die();
}
header("Location: ../../src/login.php");
die();
}
@@
-26,7
+25,7
@@
global $UseSeparateImapConnection,
$SpamFilters_CacheTTL;
/**
$SpamFilters_CacheTTL;
/**
- * load required functions. Plugin depends on IMAP functions and they are not
+ * load required functions. Plugin depends on IMAP functions and they are not
* loaded in src/webmail.php
*/
include_once (SM_PATH . 'functions/imap.php');
* loaded in src/webmail.php
*/
include_once (SM_PATH . 'functions/imap.php');
@@
-212,7
+211,7
@@
function start_filters($hook_args) {
$AllowSpamFilters = false;
foreach($spamfilters as $filterskey=>$value) {
$AllowSpamFilters = false;
foreach($spamfilters as $filterskey=>$value) {
- if ($value['enabled'] ==
'yes'
) {
+ if ($value['enabled'] ==
SMPREF_ON
) {
$AllowSpamFilters = true;
break;
}
$AllowSpamFilters = true;
break;
}
@@
-548,8
+547,12
@@
function filters_spam_check_site($a, $b, $c, $d, &$filters) {
foreach ($filters as $key => $value) {
if ($filters[$key]['enabled']) {
if ($filters[$key]['dns']) {
foreach ($filters as $key => $value) {
if ($filters[$key]['enabled']) {
if ($filters[$key]['dns']) {
+ /**
+ * RFC allows . on end of hostname to force domain lookup
+ * to not use search domain from resolv.conf
+ */
$filter_revip = $d . '.' . $c . '.' . $b . '.' . $a . '.' .
$filter_revip = $d . '.' . $c . '.' . $b . '.' . $a . '.' .
- $filters[$key]['dns'];
+ $filters[$key]['dns']
. '.'
;
if(!isset($SpamFilters_DNScache[$filter_revip]['L']))
$SpamFilters_DNScache[$filter_revip]['L'] = '';
if(!isset($SpamFilters_DNScache[$filter_revip]['L']))
$SpamFilters_DNScache[$filter_revip]['L'] = '';
@@
-563,8
+566,12
@@
function filters_spam_check_site($a, $b, $c, $d, &$filters) {
$SpamFilters_DNScache[$filter_revip]['T'] =
time() + $SpamFilters_CacheTTL;
}
$SpamFilters_DNScache[$filter_revip]['T'] =
time() + $SpamFilters_CacheTTL;
}
- if ($SpamFilters_DNScache[$filter_revip]['L'] ==
- $filters[$key]['result']) {
+
+ /**
+ * gethostbyname returns ip if resolved, or returns original
+ * host query if no resolution
+ */
+ if ($SpamFilters_DNScache[$filter_revip]['L'] != $filter_revip) {
return 1;
}
}
return 1;
}
}
@@
-717,7
+724,7
@@
function load_spam_filters() {
$filters['SPAMhaus']['name'] = 'SPAMhaus Lists';
$filters['SPAMhaus']['link'] = 'http://www.spamhaus.org';
$filters['SPAMhaus']['dns'] = 'sbl.spamhaus.org';
$filters['SPAMhaus']['name'] = 'SPAMhaus Lists';
$filters['SPAMhaus']['link'] = 'http://www.spamhaus.org';
$filters['SPAMhaus']['dns'] = 'sbl.spamhaus.org';
- $filters['SPAMhaus']['result'] = '127.0.0.
6
';
+ $filters['SPAMhaus']['result'] = '127.0.0.
2
';
$filters['SPAMhaus']['comment'] =
_("FREE - SPAMhaus - A list of well-known SPAM sources.");
$filters['SPAMhaus']['comment'] =
_("FREE - SPAMhaus - A list of well-known SPAM sources.");
@@
-858,7
+865,7
@@
function load_spam_filters() {
_("FREE - Distributed Sender Boycott List - UN-Confirmed Relays");
foreach ($filters as $Key => $Value) {
_("FREE - Distributed Sender Boycott List - UN-Confirmed Relays");
foreach ($filters as $Key => $Value) {
- $filters[$Key]['enabled'] = getPref($data_dir, $username, $filters[$Key]['prefname']);
+ $filters[$Key]['enabled'] =
(bool)
getPref($data_dir, $username, $filters[$Key]['prefname']);
}
return $filters;
}
return $filters;