prevent empty support messages in help module (Fixes: #3697)

Florian Schaal · Florian Schaal · commit 52a8e7e2f53b · 2016-05-26T02:05:33.000-04:00
diff --git a/interface/web/help/support_message_edit.php b/interface/web/help/support_message_edit.php
@@ -73,7 +73,7 @@ function onSubmit()
 			}
 			$confirmation_message .= "\n\n".$app->tform->lng('message_txt').": \"".$this->dataRecord['message']."\"";
 			$confirmation_message .= "\n\nISPConfig: ".($_SERVER['HTTPS'] == 'on' ? 'https://' : 'http://').$_SERVER['HTTP_HOST'];
-			$app->functions->mail($sender_email, $subject, $confirmation_message, $recipient_email);
+			if ($this->dataRecord['subject'] != '' && $this->dataRecord['message'] != '') $app->functions->mail($sender_email, $subject, $confirmation_message, $recipient_email);
 		} else {
 			$app->tform->errorMessage .= $app->tform->lng("recipient_or_sender_email_address_not_valid_txt")."<br />";
 		}

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ function onSubmit()`
`73`	`73`	`}`
`74`	`74`	`$confirmation_message .= "\n\n".$app->tform->lng('message_txt').": \"".$this->dataRecord['message']."\"";`
`75`	`75`	`$confirmation_message .= "\n\nISPConfig: ".($_SERVER['HTTPS'] == 'on' ? 'https://' : 'http://').$_SERVER['HTTP_HOST'];`
`76`		`- $app->functions->mail($sender_email, $subject, $confirmation_message, $recipient_email);`
	`76`	`+ if ($this->dataRecord['subject'] != '' && $this->dataRecord['message'] != '') $app->functions->mail($sender_email, $subject, $confirmation_message, $recipient_email);`
`77`	`77`	`} else {`
`78`	`78`	`$app->tform->errorMessage .= $app->tform->lng("recipient_or_sender_email_address_not_valid_txt")."<br />";`
`79`	`79`	`}`