Commit 965b2520 authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

Merge "Allow a $cfg->bounces_ratio of 0"

parents 9cfc2768 044a5f39
......@@ -202,6 +202,7 @@ $cfg->bounces_min = 5;
* before disabling mail for that user.
* e.g. If using the default bounces_ratio of 0.20 and 20 mails are sent to
* a user, at least 4 must be returned before email is disabled.
* (Set this to 0 to ignore bounces_ratio and rely solely on bounces_min)
*/
$cfg->bounces_ratio = 0.20;
/**
......@@ -543,4 +544,4 @@ $cfg->usersuniquebyusername = false;
* @global string $cfg->opensslcnf Allows manual setting of path to openssl.cnf file for ssl key generation if not
* being automatically detected. Needed for extra-site networking.
*/
// $cfg->opensslcnf = '';
\ No newline at end of file
// $cfg->opensslcnf = '';
......@@ -697,7 +697,10 @@ function check_overcount($mailinfo) {
return false;
}
if ((! $minbounces = get_config('bounces_min')) || (! $bounceratio = get_config('bounces_ratio'))) {
$minbounces = get_config('bounces_min');
$bounceratio = get_config('bounces_ratio');
// If they haven't set a minbounces value, then we can't proceed
if (!$minbounces) {
return false;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment