Merge branch 'develop' into 'develop'

Marius Burkard · Marius Burkard · commit aee0071eab2a · 2020-11-09T11:29:32.000+01:00
Fix bug with Array-String in postfix main.cf

Closes #5872

See merge request ispconfig/ispconfig3!1309
diff --git a/server/plugins-available/postfix_server_plugin.inc.php b/server/plugins-available/postfix_server_plugin.inc.php
@@ -193,7 +193,7 @@ function update($event_name, $data) {
 					}
 				}
 				if ($i == count($new_options)) {
-					$new_options[] = array('reject_unknown_client_hostname');
+					$new_options[] = 'reject_unknown_client_hostname';
 				}
 
 				$app->system->exec_safe("postconf -e ?", 'smtpd_client_restrictions = '.implode(", ", $new_options));
@@ -231,7 +231,7 @@ function update($event_name, $data) {
 					}
 				}
 				if ($i == count($new_options)) {
-					$new_options[] = array('reject_unknown_helo_hostname');
+					$new_options[] = 'reject_unknown_helo_hostname';
 				}
 
 				$app->system->exec_safe("postconf -e ?", 'smtpd_helo_restrictions = '.implode(", ", $new_options));

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ function update($event_name, $data) {`
`193`	`193`	`}`
`194`	`194`	`}`
`195`	`195`	`if ($i == count($new_options)) {`
`196`		`- $new_options[] = array('reject_unknown_client_hostname');`
	`196`	`+ $new_options[] = 'reject_unknown_client_hostname';`
`197`	`197`	`}`
`198`	`198`
`199`	`199`	`$app->system->exec_safe("postconf -e ?", 'smtpd_client_restrictions = '.implode(", ", $new_options));`
`@@ -231,7 +231,7 @@ function update($event_name, $data) {`
`231`	`231`	`}`
`232`	`232`	`}`
`233`	`233`	`if ($i == count($new_options)) {`
`234`		`- $new_options[] = array('reject_unknown_helo_hostname');`
	`234`	`+ $new_options[] = 'reject_unknown_helo_hostname';`
`235`	`235`	`}`
`236`	`236`
`237`	`237`	`$app->system->exec_safe("postconf -e ?", 'smtpd_helo_restrictions = '.implode(", ", $new_options));`