diff options
| author | zotlabs <mike@macgirvin.com> | 2017-05-11 19:01:04 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-05-11 19:01:04 -0700 |
| commit | 1de1b58a087afbadb55b7f18b93fb0b502a2de3a (patch) | |
| tree | 4ccf01cfea90497acca5f58697653ec734b1cc02 /include | |
| parent | 4f577cbdebea44dfedece4eeddb99138d5f02f65 (diff) | |
| download | volse-hubzilla-1de1b58a087afbadb55b7f18b93fb0b502a2de3a.tar.gz volse-hubzilla-1de1b58a087afbadb55b7f18b93fb0b502a2de3a.tar.bz2 volse-hubzilla-1de1b58a087afbadb55b7f18b93fb0b502a2de3a.zip | |
consolidate email validation checks
Diffstat (limited to 'include')
| -rw-r--r-- | include/account.php | 2 | ||||
| -rw-r--r-- | include/text.php | 13 |
2 files changed, 1 insertions, 14 deletions
diff --git a/include/account.php b/include/account.php index 5e57d53a8..c188ce0d7 100644 --- a/include/account.php +++ b/include/account.php @@ -31,7 +31,7 @@ function check_account_email($email) { if(! strlen($email)) return $result; - if((! valid_email($email)) || (! validate_email($email))) + if(! validate_email($email)) $result['message'] .= t('Not a valid email address') . EOL; elseif(! allowed_email($email)) $result['message'] = t('Your email domain is not among those allowed on this site'); diff --git a/include/text.php b/include/text.php index dc01f97bd..fb39313a2 100644 --- a/include/text.php +++ b/include/text.php @@ -1042,19 +1042,6 @@ function searchbox($s,$id='search-box',$url='/search',$save = false) { )); } -function valid_email_regex($x){ - if(preg_match('/^[_a-zA-Z0-9\-\+]+(\.[_a-zA-Z0-9\-\+]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+$/',$x)) - return true; - return false; -} - -function valid_email($x){ - if(get_config('system','disable_email_validation')) - return true; - - return valid_email_regex($x); -} - /** * @brief Replace naked text hyperlink with HTML formatted hyperlink. * |