Merge branch 'stable-3.1' into 'stable-3.1'

Till Brehm · Till Brehm · commit 41e1628b440d · 2018-01-25T15:11:30.000+01:00
Fix #4931 Allow underscore in cron domain names

See merge request ispconfig/ispconfig3!717
diff --git a/interface/lib/classes/validate_cron.inc.php b/interface/lib/classes/validate_cron.inc.php
@@ -52,7 +52,7 @@ function command_format($field_name, $field_value, $validator) {
 
 			if($parsed["scheme"] != "http" && $parsed["scheme"] != "https") return $this->get_error($validator['errmsg']);
 
-			if(preg_match("'^([a-z0-9][a-z0-9\-]{0,62}\.)+([A-Za-z0-9\-]{2,30})$'i", $parsed["host"]) == false) return $this->get_error($validator['errmsg']);
+			if(preg_match("'^([a-z0-9][a-z0-9_\-]{0,62}\.)+([A-Za-z0-9\-]{2,30})$'i", $parsed["host"]) == false) return $this->get_error($validator['errmsg']);
 		}
 		if(strpos($field_value, "\n") !== false || strpos($field_value, "\r") !== false || strpos($field_value, chr(0)) !== false) {
 			return $this->get_error($validator['errmsg']);

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ function command_format($field_name, $field_value, $validator) {`
`52`	`52`
`53`	`53`	`if($parsed["scheme"] != "http" && $parsed["scheme"] != "https") return $this->get_error($validator['errmsg']);`
`54`	`54`
`55`		`- if(preg_match("'^([a-z0-9][a-z0-9\-]{0,62}\.)+([A-Za-z0-9\-]{2,30})$'i", $parsed["host"]) == false) return $this->get_error($validator['errmsg']);`
	`55`	`+ if(preg_match("'^([a-z0-9][a-z0-9_\-]{0,62}\.)+([A-Za-z0-9\-]{2,30})$'i", $parsed["host"]) == false) return $this->get_error($validator['errmsg']);`
`56`	`56`	`}`
`57`	`57`	`if(strpos($field_value, "\n") !== false \|\| strpos($field_value, "\r") !== false \|\| strpos($field_value, chr(0)) !== false) {`
`58`	`58`	`return $this->get_error($validator['errmsg']);`