Merge branch 'crit-error-custom-postfix' into 'develop'

Marius Burkard · Marius Burkard · commit 4191a7d72107 · 2021-03-11T14:58:59.000Z
Fix critical error with new custom Postfix config

See merge request ispconfig/ispconfig3!1440
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
@@ -1177,7 +1177,7 @@ public function configure_postfix($options = '') {
 		}
 		$configfile = 'postfix_custom.conf';
 		if(file_exists($conf['ispconfig_install_dir'].'/server/conf-custom/install/' . $configfile . '.master')) {
-			$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$configfile.'.master');
+			$content = file_get_contents($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$configfile.'.master');
 			$content = strtr($content, $postconf_placeholders);
 			$postconf_commands = array_merge($postconf_commands, array_filter(explode("\n", $content)));
 		}

Original file line number	Diff line number	Diff line change
`@@ -1177,7 +1177,7 @@ public function configure_postfix($options = '') {`
`1177`	`1177`	`}`
`1178`	`1178`	`$configfile = 'postfix_custom.conf';`
`1179`	`1179`	`if(file_exists($conf['ispconfig_install_dir'].'/server/conf-custom/install/' . $configfile . '.master')) {`
`1180`		`- $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$configfile.'.master');`
	`1180`	`+ $content = file_get_contents($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$configfile.'.master');`
`1181`	`1181`	`$content = strtr($content, $postconf_placeholders);`
`1182`	`1182`	`$postconf_commands = array_merge($postconf_commands, array_filter(explode("\n", $content)));`
`1183`	`1183`	`}`