diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-11-09 14:39:00 +1100 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-11-09 14:39:00 +1100 |
| commit | dfb49558f470f94300e6f97b47d1c9c4f0e6b580 (patch) | |
| tree | bd87d91fcaead4428acbf4ac02e786f7f410c641 /include/text.php | |
| parent | 4e1c308162877d7d6cd79c066f15b4d761e14853 (diff) | |
| parent | 9c240de3032212ea95474319e382aaabd25c977e (diff) | |
| download | volse-hubzilla-dfb49558f470f94300e6f97b47d1c9c4f0e6b580.tar.gz volse-hubzilla-dfb49558f470f94300e6f97b47d1c9c4f0e6b580.tar.bz2 volse-hubzilla-dfb49558f470f94300e6f97b47d1c9c4f0e6b580.zip | |
Merge pull request #132 from kenrestivo/test-for-email
Add unit tests for valid email function.
Diffstat (limited to 'include/text.php')
| -rw-r--r-- | include/text.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/text.php b/include/text.php index c2573da0c..edaa8dcd3 100644 --- a/include/text.php +++ b/include/text.php @@ -872,15 +872,17 @@ 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; - if(preg_match('/^[_a-zA-Z0-9\-\+]+(\.[_a-zA-Z0-9\-\+]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+$/',$x)) - return true; - - return false; + return valid_email_regex($x); } /** |