Fixed: FS#1298 - mailfilter saving file in DOS format causing script to error

tbrehm · tbrehm · commit b6912ffe12ad · 2010-09-16T11:48:17.000Z
diff --git a/server/plugins-available/maildrop_plugin.inc.php b/server/plugins-available/maildrop_plugin.inc.php
@@ -196,6 +196,9 @@ function update($event_name,$data) {
 					}
 					$mailfilter_content .= $data["new"]["custom_mailfilter"];
 					
+					// Replace windows linebreaks in mailfilter file
+					$mailfilter_content = str_replace("\r\n","\n",$mailfilter_content);
+					
 					file_put_contents($config_file_path,$mailfilter_content);
 					$app->log("Writing new custom Mailfiter".$config_file_path,LOGLEVEL_DEBUG);
 					chmod($config_file_path, 0770);

Original file line number	Diff line number	Diff line change
`@@ -196,6 +196,9 @@ function update($event_name,$data) {`
`196`	`196`	`}`
`197`	`197`	`$mailfilter_content .= $data["new"]["custom_mailfilter"];`
`198`	`198`
	`199`	`+ // Replace windows linebreaks in mailfilter file`
	`200`	`+ $mailfilter_content = str_replace("\r\n","\n",$mailfilter_content);`
	`201`	`+`
`199`	`202`	`file_put_contents($config_file_path,$mailfilter_content);`
`200`	`203`	`$app->log("Writing new custom Mailfiter".$config_file_path,LOGLEVEL_DEBUG);`
`201`	`204`	`chmod($config_file_path, 0770);`