From d76f27f46aeb78dd7678a29da800e863fa047dfc Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 19 Mar 2013 11:34:33 -0400
Subject: [PATCH] Fixed: FS#2776 - Add new Website make error when System->Server services-> Webserver - disabled and no slave server
---
interface/web/help/form/support_message.tform.php | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/interface/web/help/form/support_message.tform.php b/interface/web/help/form/support_message.tform.php
index c1d22d0..29c337f 100644
--- a/interface/web/help/form/support_message.tform.php
+++ b/interface/web/help/form/support_message.tform.php
@@ -54,6 +54,8 @@
}
}
+$authsql = $app->tform->getAuthSQL('r', 'client');
+
//* Begin of the form definition of the first tab. The name of the tab is called "message". We refer
//* to this name in the $form["tab_default"] setting above.
$form["tabs"]['message'] = array (
@@ -69,9 +71,9 @@
'formtype' => 'SELECT',
'default' => $sm_default_recipient_id,
'datasource' => array ( 'type' => 'SQL',
- 'querystring' => 'SELECT userid,username FROM sys_user WHERE userid != 1 AND {AUTHSQL} ORDER BY username',
+ 'querystring' => "SELECT sys_user.userid, CONCAT(sys_user.username,' :: ',client.company_name,' :: ',client.contact_name) as contactname FROM sys_user, client WHERE sys_user.userid != 1 AND sys_user.client_id = client.client_id AND $authsql ORDER BY sys_user.username",
'keyfield' => 'userid',
- 'valuefield' => 'username'
+ 'valuefield' => 'contactname'
),
'validators' => array ( 0 => array ( 'type' => 'ISINT',
'errmsg'=> 'recipient_id_is_not_integer'),
--
Gitblit v1.9.1