GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

let other validity checks go through first

Browse Source
This commit is contained in:
Evan Prodromou 2011-04-18 10:46:40 -04:00
parent 55ebddb5fd
commit 2019d32b3d
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
plugins/DomainWhitelist/DomainWhitelistPlugin.php
View File

@ -52,18 +52,20 @@ class DomainWhitelistPlugin extends Plugin
return true;
}
function onStartValidateUserEmail($user, $email, &$valid)
function onEndValidateUserEmail($user, $email, &$valid)
{
if (!$this->matchesWhitelist($email)) {
$whitelist = $this->getWhitelist();
if (count($whitelist) == 1) {
$message = sprintf(_("Email address must be in this domain: %s"),
$whitelist[0]);
} else {
$message = sprintf(_("Email address must be in one of these domains: %s"),
implode(', ', $whitelist));
if ($valid) { // it's otherwise valid
if (!$this->matchesWhitelist($email)) {
$whitelist = $this->getWhitelist();
if (count($whitelist) == 1) {
$message = sprintf(_("Email address must be in this domain: %s"),
$whitelist[0]);
} else {
$message = sprintf(_("Email address must be in one of these domains: %s"),
implode(', ', $whitelist));
}
throw new ClientException($message);
}
throw new ClientException($message);
}
return true;
}