wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects 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; return true;
} }
function onStartValidateUserEmail($user, $email, &$valid) function onEndValidateUserEmail($user, $email, &$valid)
{ {
if (!$this->matchesWhitelist($email)) { if ($valid) { // it's otherwise valid
$whitelist = $this->getWhitelist(); if (!$this->matchesWhitelist($email)) {
if (count($whitelist) == 1) { $whitelist = $this->getWhitelist();
$message = sprintf(_("Email address must be in this domain: %s"), if (count($whitelist) == 1) {
$whitelist[0]); $message = sprintf(_("Email address must be in this domain: %s"),
} else { $whitelist[0]);
$message = sprintf(_("Email address must be in one of these domains: %s"), } else {
implode(', ', $whitelist)); $message = sprintf(_("Email address must be in one of these domains: %s"),
implode(', ', $whitelist));
}
throw new ClientException($message);
} }
throw new ClientException($message);
} }
return true; return true;
} }