Move custom php in front of snippet data

Marius Burkard · Marius Burkard · commit 3a93952c4c9c · 2020-09-29T10:02:30.000+02:00
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
@@ -1256,6 +1256,8 @@ function update($event_name, $data) {
 
 			$php_ini_content = $this->get_master_php_ini_content($data['new']);
 
+			$php_ini_content .= "\n".str_replace("\r", '', trim($data['new']['custom_php_ini']));
+
 			if(intval($data['new']['directive_snippets_id']) > 0){
 				$snippet = $app->db->queryOneRecord("SELECT * FROM directive_snippets WHERE directive_snippets_id = ? AND type = 'apache' AND active = 'y' AND customer_viewable = 'y'", intval($data['new']['directive_snippets_id']));
 				if(isset($snippet['required_php_snippets']) && trim($snippet['required_php_snippets']) != ''){
@@ -1275,7 +1277,6 @@ function update($event_name, $data) {
 					}
 				}
 			}
-			$php_ini_content .= "\n".str_replace("\r", '', trim($data['new']['custom_php_ini']));
 
 			$custom_sendmail_path = false;
 			$line = strtok($php_ini_content, '\n');

Original file line number	Diff line number	Diff line change
`@@ -1256,6 +1256,8 @@ function update($event_name, $data) {`
`1256`	`1256`
`1257`	`1257`	`$php_ini_content = $this->get_master_php_ini_content($data['new']);`
`1258`	`1258`
	`1259`	`+ $php_ini_content .= "\n".str_replace("\r", '', trim($data['new']['custom_php_ini']));`
	`1260`	`+`
`1259`	`1261`	`if(intval($data['new']['directive_snippets_id']) > 0){`
`1260`	`1262`	`$snippet = $app->db->queryOneRecord("SELECT * FROM directive_snippets WHERE directive_snippets_id = ? AND type = 'apache' AND active = 'y' AND customer_viewable = 'y'", intval($data['new']['directive_snippets_id']));`
`1261`	`1263`	`if(isset($snippet['required_php_snippets']) && trim($snippet['required_php_snippets']) != ''){`
`@@ -1275,7 +1277,6 @@ function update($event_name, $data) {`
`1275`	`1277`	`}`
`1276`	`1278`	`}`
`1277`	`1279`	`}`
`1278`		`- $php_ini_content .= "\n".str_replace("\r", '', trim($data['new']['custom_php_ini']));`
`1279`	`1280`
`1280`	`1281`	`$custom_sendmail_path = false;`
`1281`	`1282`	`$line = strtok($php_ini_content, '\n');`