Merge branch '6431-rspamd-user-config-deleted-on-mail-user-changes' into 'develop'

Till Brehm · Till Brehm · commit ba91d9141ad8 · 2023-04-14T06:49:27.000Z
fixes #6431 // make sure config file is deleted only during spamfilter_user event.

Closes #6431

See merge request ispconfig/ispconfig3!1674
diff --git a/server/plugins-available/rspamd_plugin.inc.php b/server/plugins-available/rspamd_plugin.inc.php
@@ -281,7 +281,7 @@ function user_settings_update($event_name, $data, $internal = false) {
 				$app->system->mkdirpath($this->users_config_dir);
 			}
 
-			if((!$this->isValidEmail($app->functions->idn_encode($email_address))) || intval($data['new']['policy_id']) == 0) {
+			if((!$this->isValidEmail($app->functions->idn_encode($email_address))) || intval($data['new']['policy_id']) == 0 && $type == 'spamfilter_user') {
 				if(is_file($settings_file)) {
 					unlink($settings_file);
 				}

Original file line number	Diff line number	Diff line change
`@@ -281,7 +281,7 @@ function user_settings_update($event_name, $data, $internal = false) {`
`281`	`281`	`$app->system->mkdirpath($this->users_config_dir);`
`282`	`282`	`}`
`283`	`283`
`284`		`- if((!$this->isValidEmail($app->functions->idn_encode($email_address))) \|\| intval($data['new']['policy_id']) == 0) {`
	`284`	`+ if((!$this->isValidEmail($app->functions->idn_encode($email_address))) \|\| intval($data['new']['policy_id']) == 0 && $type == 'spamfilter_user') {`
`285`	`285`	`if(is_file($settings_file)) {`
`286`	`286`	`unlink($settings_file);`
`287`	`287`	`}`