Improve handling

Marius Burkard · Marius Burkard · commit a708a9659152 · 2020-09-22T09:58:18.000+02:00
diff --git a/interface/web/mail/mail_forward_edit.php b/interface/web/mail/mail_forward_edit.php
@@ -123,13 +123,14 @@ function onSubmit() {
 		if(trim($this->dataRecord['destination']) == '') {
 			$app->tform->errorMessage .= $app->tform->lng('destination_error_empty') . '<br />';
 		} else {
-			$targets = preg_split('/\s*[,;]\s*/', trim($this->dataRecord['destination']));
+			$targets = preg_split('/[,;\s]+/', trim($this->dataRecord['destination']));
 			foreach($targets as $target) {
 				if(!$target || filter_var($target, FILTER_VALIDATE_EMAIL) === false) {
 					$app->tform->errorMessage .= $app->tform->lng('destination_error_isemail') . '<br />';
 					break;
 				}
 			}
+			$this->dataRecord['destination'] = implode(', ', $targets);
 		}
 
 		//* Check if there is no active mailbox with this address

Original file line number	Diff line number	Diff line change
`@@ -123,13 +123,14 @@ function onSubmit() {`
`123`	`123`	`if(trim($this->dataRecord['destination']) == '') {`
`124`	`124`	`$app->tform->errorMessage .= $app->tform->lng('destination_error_empty') . '<br />';`
`125`	`125`	`} else {`
`126`		`- $targets = preg_split('/\s[,;]\s/', trim($this->dataRecord['destination']));`
	`126`	`+ $targets = preg_split('/[,;\s]+/', trim($this->dataRecord['destination']));`
`127`	`127`	`foreach($targets as $target) {`
`128`	`128`	`if(!$target \|\| filter_var($target, FILTER_VALIDATE_EMAIL) === false) {`
`129`	`129`	`$app->tform->errorMessage .= $app->tform->lng('destination_error_isemail') . '<br />';`
`130`	`130`	`break;`
`131`	`131`	`}`
`132`	`132`	`}`
	`133`	`+ $this->dataRecord['destination'] = implode(', ', $targets);`
`133`	`134`	`}`
`134`	`135`
`135`	`136`	`//* Check if there is no active mailbox with this address`