Merge branch 'master' into 'stable-3.1'

Master



See merge request !347

interface/web/help/list/support_message.list.php

@@ -43,7 +43,8 @@ $liste['item'][] = array( 'field'  => 'sender_id',
 	'suffix' => '',
 	'width'  => '',
 	'datasource'=> array (  'type' => 'SQL',
-		'querystring'  => 'SELECT userid,username FROM sys_user WHERE {AUTHSQL} ORDER BY username',
+//		'querystring'  => 'SELECT userid,username FROM sys_user WHERE {AUTHSQL} ORDER BY username',
+		'querystring'  => 'SELECT userid,username FROM sys_user ORDER BY username',
 		'keyfield'  => 'userid',
 		'valuefield' => 'username'
 	),

interface/web/help/support_message_edit.php

@@ -73,7 +73,7 @@ class page_action extends tform_actions {
 			}
 			$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 />";
 		}