mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-24 09:52:58 +02:00
Merge branch 'next' into temp-c171-development
This commit is contained in:
@@ -283,6 +283,10 @@ sub checkmailsettings {
|
||||
$errormessage .= "$Lang::tr{'email invalid'} $Lang::tr{'email mailsender'}<br>";
|
||||
}
|
||||
}
|
||||
# Check for a valid recipient
|
||||
if (!&General::validemail($cgiparams{'txt_recipient'})) {
|
||||
$errormessage .= $Lang::tr{'email recipient invalid'} . "<br>";
|
||||
}
|
||||
return $errormessage;
|
||||
}
|
||||
|
||||
|
||||
@@ -2506,6 +2506,7 @@ sub check_acls
|
||||
if ($_)
|
||||
{
|
||||
if (/^\./) { $_ = '*'.$_; }
|
||||
unless (&General::validwildcarddomainname($_)) { $errormessage = $Lang::tr{'advproxy errmsg invalid url'} . ": " . &Header::escape($_); }
|
||||
$proxysettings{'DST_NOCACHE'} .= $_."\n";
|
||||
}
|
||||
}
|
||||
@@ -2604,6 +2605,7 @@ sub check_acls
|
||||
if ($_)
|
||||
{
|
||||
if (/^\./) { $_ = '*'.$_; }
|
||||
unless (&General::validwildcarddomainname($_)) { $errormessage = $Lang::tr{'advproxy errmsg invalid url'} . ": " . &Header::escape($_); }
|
||||
$proxysettings{'DST_NOPROXY_URL'} .= $_."\n";
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user