From 795bb10b6f5da1eca53f860b9fc3875f24e8516b Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Thu, 26 May 2016 08:08:04 -0400
Subject: [PATCH] Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1
---
interface/web/help/support_message_edit.php | 2 +-
interface/web/help/list/support_message.list.php | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/interface/web/help/list/support_message.list.php b/interface/web/help/list/support_message.list.php
index 1724c54..efb2432 100644
--- a/interface/web/help/list/support_message.list.php
+++ b/interface/web/help/list/support_message.list.php
@@ -43,7 +43,8 @@
'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'
),
diff --git a/interface/web/help/support_message_edit.php b/interface/web/help/support_message_edit.php
index 4fcf5da..9886541 100644
--- a/interface/web/help/support_message_edit.php
+++ b/interface/web/help/support_message_edit.php
@@ -73,7 +73,7 @@
}
$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 />";
}
--
Gitblit v1.9.1