diff options
| author | Mario <mario@mariovavti.com> | 2021-04-28 13:17:45 +0200 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2021-04-28 13:17:45 +0200 |
| commit | 94f1c001f1fe2cefd17c5d535ec1fcd0e68c8df5 (patch) | |
| tree | 74d98ca46111e066d9b42e06ff5416315a29f653 /include/account.php | |
| parent | 531a03562dac2e8a5d0e3c76170e24c8e5d4b64b (diff) | |
| download | volse-hubzilla-94f1c001f1fe2cefd17c5d535ec1fcd0e68c8df5.tar.gz volse-hubzilla-94f1c001f1fe2cefd17c5d535ec1fcd0e68c8df5.tar.bz2 volse-hubzilla-94f1c001f1fe2cefd17c5d535ec1fcd0e68c8df5.zip | |
register: more testing and fixes
Diffstat (limited to 'include/account.php')
| -rw-r--r-- | include/account.php | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/include/account.php b/include/account.php index 36fad58c4..4c5437594 100644 --- a/include/account.php +++ b/include/account.php @@ -35,15 +35,20 @@ function check_account_email($email) { return $result; if(! validate_email($email)) - $result['message'] .= t('Email address not valid') . EOL; + $result['message'] = t('The provided email address is not valid') . EOL; elseif(! allowed_email($email)) - $result['message'] = t('Your email domain is not among those allowed on this site'); + $result['message'] = t('The provided email domain is not among those allowed on this site'); else { $r = q("select account_email from account where account_email = '%s' limit 1", dbesc($email) ); + if (!$r) { + $r = q("select reg_did2 from register where reg_did2 = '%s' limit 1", + dbesc($email) + ); + } if($r) { - $result['message'] .= t('Your email address is already registered at this site.'); + $result['message'] = t('The provided email address is already registered at this site'); } } if($result['message']) |