- adjusted PHP settings regex to allow |, (, and ) (like in "error_reporting = E_ALL & ~(E_NOTICE | E_DEPRECATED | E_STRICT)")

falkotimme · falkotimme · commit b00e475250e2 · 2014-07-15T17:43:09.000+02:00
diff --git a/interface/web/sites/web_domain_edit.php b/interface/web/sites/web_domain_edit.php
@@ -749,7 +749,7 @@ function onSubmit() {
 					// value inside ''
 					if(preg_match('@^\s*;*\s*[a-zA-Z0-9._]*\s*=\s*\'.*\'\s*;*\s*$@', $custom_php_ini_settings_line)) continue;
 					// everything else
-					if(preg_match('@^\s*;*\s*[a-zA-Z0-9._]*\s*=\s*[-a-zA-Z0-9~&=_\@/,.#\s]*\s*;*\s*$@', $custom_php_ini_settings_line)) continue;
+					if(preg_match('@^\s*;*\s*[a-zA-Z0-9._]*\s*=\s*[-a-zA-Z0-9~&=_\@/,.#\s|()]*\s*;*\s*$@', $custom_php_ini_settings_line)) continue;
 					$custom_php_ini_settings_are_valid = false;
 					break;
 				}

Original file line number	Diff line number	Diff line change
`@@ -749,7 +749,7 @@ function onSubmit() {`
`749`	`749`	`// value inside ''`
`750`	`750`	`if(preg_match('@^\s;\s[a-zA-Z0-9._]\s=\s\'.\'\s;\s$@', $custom_php_ini_settings_line)) continue;`
`751`	`751`	`// everything else`
`752`		`- if(preg_match('@^\s;\s[a-zA-Z0-9._]\s=\s[-a-zA-Z0-9~&=_\@/,.#\s]\s;\s$@', $custom_php_ini_settings_line)) continue;`
	`752`	`+ if(preg_match('@^\s;\s[a-zA-Z0-9._]\s=\s[-a-zA-Z0-9~&=_\@/,.#\s\|()]\s;\s$@', $custom_php_ini_settings_line)) continue;`
`753`	`753`	`$custom_php_ini_settings_are_valid = false;`
`754`	`754`	`break;`
`755`	`755`	`}`