Merge branch 'stable-3.1' into 'stable-3.1'

Till Brehm · Till Brehm · commit 0ae0dab1943b · 2017-02-01T13:41:21.000+01:00
Fix #4332 (password reset empty From address)



See merge request !515
diff --git a/interface/web/login/password_reset.php b/interface/web/login/password_reset.php
@@ -85,6 +85,7 @@
 			if(isset($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] != '443') $server_domain .= ':' . $_SERVER['SERVER_PORT'];
 			
 			$app->uses('getconf,ispcmail');
+			$server_config_array = $app->getconf->get_global_config();
 			$mail_config = $server_config_array['mail'];
 			if($mail_config['smtp_enabled'] == 'y') {
 				$mail_config['use_smtp'] = true;
diff --git a/server/plugins-available/postfix_filter_plugin.inc.php b/server/plugins-available/postfix_filter_plugin.inc.php
@@ -79,6 +79,8 @@ function update($event_name, $data) {
 		global $app, $conf;
 
 		$type = $data["new"]["type"];
+		$restart = false;
+
 		if($type != '') {
 			$sql = "SELECT * FROM mail_content_filter WHERE server_id = ? AND type = ? AND active = 'y'";
 			$rules = $app->db->queryAllRecords($sql, $conf["server_id"], $type);
@@ -91,21 +93,25 @@ function update($event_name, $data) {
 			if($type == 'header') {
 				file_put_contents('/etc/postfix/header_checks', $content);
 				$app->log("Writing /etc/postfix/header_checks", LOGLEVEL_DEBUG);
+				$restart = true;
 			}
 
 			if($type == 'mime_header') {
 				file_put_contents('/etc/postfix/mime_header_checks', $content);
 				$app->log("Writing /etc/postfix/mime_header_checks", LOGLEVEL_DEBUG);
+				$restart = true;
 			}
 
 			if($type == 'nested_header') {
 				file_put_contents('/etc/postfix/nested_header_checks', $content);
 				$app->log("Writing /etc/postfix/nested_header_checks", LOGLEVEL_DEBUG);
+				$restart = true;
 			}
 
 			if($type == 'body') {
 				file_put_contents('/etc/postfix/body_checks', $content);
 				$app->log("Writing /etc/postfix/body_checks", LOGLEVEL_DEBUG);
+				$restart = true;
 			}
 		}
 
@@ -122,23 +128,28 @@ function update($event_name, $data) {
 			if($type == 'header') {
 				file_put_contents('/etc/postfix/header_checks', $content);
 				$app->log("Writing /etc/postfix/header_checks", LOGLEVEL_DEBUG);
+				$restart = true;
 			}
 
 			if($type == 'mime_header') {
 				file_put_contents('/etc/postfix/mime_header_checks', $content);
 				$app->log("Writing /etc/postfix/mime_header_checks", LOGLEVEL_DEBUG);
+				$restart = true;
 			}
 
 			if($type == 'nested_header') {
 				file_put_contents('/etc/postfix/nested_header_checks', $content);
 				$app->log("Writing /etc/postfix/nested_header_checks", LOGLEVEL_DEBUG);
+				$restart = true;
 			}
 
 			if($type == 'body') {
 				file_put_contents('/etc/postfix/body_checks', $content);
 				$app->log("Writing /etc/postfix/body_checks", LOGLEVEL_DEBUG);
+				$restart = true;
 			}
 		}
+		if($restart) exec('postfix reload');
 	}
 
 	function delete($event_name, $data) {

Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,8 @@ function update($event_name, $data) {`
`79`	`79`	`global $app, $conf;`
`80`	`80`
`81`	`81`	`$type = $data["new"]["type"];`
	`82`	`+ $restart = false;`
	`83`	`+`
`82`	`84`	`if($type != '') {`
`83`	`85`	`$sql = "SELECT * FROM mail_content_filter WHERE server_id = ? AND type = ? AND active = 'y'";`
`84`	`86`	`$rules = $app->db->queryAllRecords($sql, $conf["server_id"], $type);`
`@@ -91,21 +93,25 @@ function update($event_name, $data) {`
`91`	`93`	`if($type == 'header') {`
`92`	`94`	`file_put_contents('/etc/postfix/header_checks', $content);`
`93`	`95`	`$app->log("Writing /etc/postfix/header_checks", LOGLEVEL_DEBUG);`
	`96`	`+ $restart = true;`
`94`	`97`	`}`
`95`	`98`
`96`	`99`	`if($type == 'mime_header') {`
`97`	`100`	`file_put_contents('/etc/postfix/mime_header_checks', $content);`
`98`	`101`	`$app->log("Writing /etc/postfix/mime_header_checks", LOGLEVEL_DEBUG);`
	`102`	`+ $restart = true;`
`99`	`103`	`}`
`100`	`104`
`101`	`105`	`if($type == 'nested_header') {`
`102`	`106`	`file_put_contents('/etc/postfix/nested_header_checks', $content);`
`103`	`107`	`$app->log("Writing /etc/postfix/nested_header_checks", LOGLEVEL_DEBUG);`
	`108`	`+ $restart = true;`
`104`	`109`	`}`
`105`	`110`
`106`	`111`	`if($type == 'body') {`
`107`	`112`	`file_put_contents('/etc/postfix/body_checks', $content);`
`108`	`113`	`$app->log("Writing /etc/postfix/body_checks", LOGLEVEL_DEBUG);`
	`114`	`+ $restart = true;`
`109`	`115`	`}`
`110`	`116`	`}`
`111`	`117`
`@@ -122,23 +128,28 @@ function update($event_name, $data) {`
`122`	`128`	`if($type == 'header') {`
`123`	`129`	`file_put_contents('/etc/postfix/header_checks', $content);`
`124`	`130`	`$app->log("Writing /etc/postfix/header_checks", LOGLEVEL_DEBUG);`
	`131`	`+ $restart = true;`
`125`	`132`	`}`
`126`	`133`
`127`	`134`	`if($type == 'mime_header') {`
`128`	`135`	`file_put_contents('/etc/postfix/mime_header_checks', $content);`
`129`	`136`	`$app->log("Writing /etc/postfix/mime_header_checks", LOGLEVEL_DEBUG);`
	`137`	`+ $restart = true;`
`130`	`138`	`}`
`131`	`139`
`132`	`140`	`if($type == 'nested_header') {`
`133`	`141`	`file_put_contents('/etc/postfix/nested_header_checks', $content);`
`134`	`142`	`$app->log("Writing /etc/postfix/nested_header_checks", LOGLEVEL_DEBUG);`
	`143`	`+ $restart = true;`
`135`	`144`	`}`
`136`	`145`
`137`	`146`	`if($type == 'body') {`
`138`	`147`	`file_put_contents('/etc/postfix/body_checks', $content);`
`139`	`148`	`$app->log("Writing /etc/postfix/body_checks", LOGLEVEL_DEBUG);`
	`149`	`+ $restart = true;`
`140`	`150`	`}`
`141`	`151`	`}`
	`152`	`+ if($restart) exec('postfix reload');`
`142`	`153`	`}`
`143`	`154`
`144`	`155`	`function delete($event_name, $data) {`