Merge pull request hestiacp#792 from tjebbeke/patch-7

serghey-rodin · web-flow · commit cc91141f8d37 · 2016-08-30T00:12:21.000+03:00
Improve email validation
diff --git a/func/main.sh b/func/main.sh
@@ -613,7 +613,7 @@ is_dns_record_format_valid() {
 
 # Email format validator
 is_email_format_valid() {
-    if [[ ! "$1" =~ "@" ]] ; then
+    if [[ ! "$1" =~ ^[A-Za-z0-9._%+-]+@[[:alnum:].-]+\.[A-Za-z]{2,63}$ ]] ; then
         check_result $E_INVALID "invalid email format :: $1"
     fi
 }

Original file line number	Diff line number	Diff line change
`@@ -613,7 +613,7 @@ is_dns_record_format_valid() {`
`613`	`613`
`614`	`614`	`# Email format validator`
`615`	`615`	`is_email_format_valid() {`
`616`		`- if [[ ! "$1" =~ "@" ]] ; then`
	`616`	`+ if [[ ! "$1" =~ ^[A-Za-z0-9._%+-]+@[[:alnum:].-]+\.[A-Za-z]{2,63}$ ]] ; then`
`617`	`617`	`check_result $E_INVALID "invalid email format :: $1"`
`618`	`618`	`fi`
`619`	`619`	`}`