Some improvements for Commit a39f367

Till Brehm · Till Brehm · commit 0e6d0529d5f9 · 2018-08-06T15:36:02.000+02:00
diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php
@@ -1101,6 +1101,14 @@
 			'validators' => array(	0 => array('type' => 'NOTEMPTY',
 										'errmsg' => 'php_default_name_error_empty'),
 			),
+			'filters'   => array(
+					0 => array( 'event' => 'SAVE',
+					'type' => 'TRIM'),
+					1 => array( 'event' => 'SAVE',
+					'type' => 'STRIPTAGS'),
+					2 => array( 'event' => 'SAVE',
+					'type' => 'STRIPNL')
+			),
 			'width' => '40',
 			'maxlength' => '255'
 		),
diff --git a/interface/web/sites/web_vhost_domain_edit.php b/interface/web/sites/web_vhost_domain_edit.php
@@ -257,7 +257,7 @@ function onShowEnd() {
 					$php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ? AND (client_id = 0 OR client_id=?) AND active = 'y'", $parent_domain['server_id'], $_SESSION['s']['user']['client_id']);
 				}
 			}
-			$php_select = "<option value=''>".$web_config['php_default_name']."</option>";
+			$php_select = "<option value=''>".$app->functions->htmlentities($web_config['php_default_name'])."</option>";
 			if(is_array($php_records) && !empty($php_records)) {
 				foreach( $php_records as $php_record) {
 					if($this->dataRecord['php'] == 'php-fpm' || ($this->dataRecord['php'] == 'hhvm' && $server_type == 'nginx')){
@@ -404,7 +404,7 @@ function onShowEnd() {
 					$php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ? AND (client_id = 0 OR client_id=?) AND active = 'y'", $parent_domain['server_id'], $_SESSION['s']['user']['client_id']);
 				}
 			}
-			$php_select = "<option value=''>".$web_config['php_default_name']."</option>";
+			$php_select = "<option value=''>".$app->functions->htmlentities($web_config['php_default_name'])."</option>";
 			if(is_array($php_records) && !empty($php_records)) {
 				foreach( $php_records as $php_record) {
 					if($this->dataRecord['php'] == 'php-fpm' || ($this->dataRecord['php'] == 'hhvm' && $server_type == 'nginx')){
@@ -624,7 +624,7 @@ function onShowEnd() {
 					$php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ? AND active = 'y'", $parent_domain['server_id']);
 				}
 			}
-			$php_select = "<option value=''>".$web_config['php_default_name']."</option>";
+			$php_select = "<option value=''>".$app->functions->htmlentities($web_config['php_default_name'])."</option>";
 			if(is_array($php_records) && !empty($php_records)) {
 				foreach( $php_records as $php_record) {
 					if($this->dataRecord['php'] == 'php-fpm' || ($this->dataRecord['php'] == 'hhvm' && $server_type == 'nginx')){

Original file line number	Diff line number	Diff line change
`@@ -257,7 +257,7 @@ function onShowEnd() {`
`257`	`257`	`$php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ? AND (client_id = 0 OR client_id=?) AND active = 'y'", $parent_domain['server_id'], $_SESSION['s']['user']['client_id']);`
`258`	`258`	`}`
`259`	`259`	`}`
`260`		`- $php_select = "<option value=''>".$web_config['php_default_name']."</option>";`
	`260`	`+ $php_select = "<option value=''>".$app->functions->htmlentities($web_config['php_default_name'])."</option>";`
`261`	`261`	`if(is_array($php_records) && !empty($php_records)) {`
`262`	`262`	`foreach( $php_records as $php_record) {`
`263`	`263`	`if($this->dataRecord['php'] == 'php-fpm' \|\| ($this->dataRecord['php'] == 'hhvm' && $server_type == 'nginx')){`
`@@ -404,7 +404,7 @@ function onShowEnd() {`
`404`	`404`	`$php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ? AND (client_id = 0 OR client_id=?) AND active = 'y'", $parent_domain['server_id'], $_SESSION['s']['user']['client_id']);`
`405`	`405`	`}`
`406`	`406`	`}`
`407`		`- $php_select = "<option value=''>".$web_config['php_default_name']."</option>";`
	`407`	`+ $php_select = "<option value=''>".$app->functions->htmlentities($web_config['php_default_name'])."</option>";`
`408`	`408`	`if(is_array($php_records) && !empty($php_records)) {`
`409`	`409`	`foreach( $php_records as $php_record) {`
`410`	`410`	`if($this->dataRecord['php'] == 'php-fpm' \|\| ($this->dataRecord['php'] == 'hhvm' && $server_type == 'nginx')){`
`@@ -624,7 +624,7 @@ function onShowEnd() {`
`624`	`624`	`$php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ? AND active = 'y'", $parent_domain['server_id']);`
`625`	`625`	`}`
`626`	`626`	`}`
`627`		`- $php_select = "<option value=''>".$web_config['php_default_name']."</option>";`
	`627`	`+ $php_select = "<option value=''>".$app->functions->htmlentities($web_config['php_default_name'])."</option>";`
`628`	`628`	`if(is_array($php_records) && !empty($php_records)) {`
`629`	`629`	`foreach( $php_records as $php_record) {`
`630`	`630`	`if($this->dataRecord['php'] == 'php-fpm' \|\| ($this->dataRecord['php'] == 'hhvm' && $server_type == 'nginx')){`