From 41021df28f8e6423909b46873bd3b78d721a25cf Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 17 Sep 2010 13:52:15 +0000
Subject: [PATCH] Fixed: FS#1285 - Support messages are not listed for the
 client under Help > Support > View messages

---
 interface/web/help/form/support_message.tform.php     |  2 +-
 interface/web/help/templates/support_message_view.htm | 11 ++---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/interface/web/help/form/support_message.tform.php b/interface/web/help/form/support_message.tform.php
index 41e501febf..80c483a230 100644
--- a/interface/web/help/form/support_message.tform.php
+++ b/interface/web/help/form/support_message.tform.php
@@ -62,7 +62,7 @@ $form["tabs"]['message'] = array (
 			'validators'	=> array ( 	0 => array (	'type'	=> 'ISINT',
 														'errmsg'=> 'recipient_id_is_not_integer'),
 									),
-			'value'		=> array(1 => 'Administrator')
+			'value'		=> ($_SESSION['s']['user']['typ'] != 'admin')?array(1 => 'Administrator'):''
 		),
 		'sender_id' => array (
 			'datatype'	=> 'INTEGER',
diff --git a/interface/web/help/templates/support_message_view.htm b/interface/web/help/templates/support_message_view.htm
index 37cb1e4b3f..3dd29fa2bb 100644
--- a/interface/web/help/templates/support_message_view.htm
+++ b/interface/web/help/templates/support_message_view.htm
@@ -7,20 +7,13 @@
     <fieldset class="inlineLabels"><legend>Message</legend>
       <div class="ctrlHolder">
       	<label for="subject">{tmpl_var name='subject_txt'}</label>
-        <input name="subject" id="subject" value="{tmpl_var name='subject'}" size="30" maxlength="255" type="text" class="textInput" />
+        <p>{tmpl_var name='subject'}</p>
 			</div>
       <div class="ctrlHolder">
       	<label for="message">{tmpl_var name='message_txt'}</label>
-        <textarea name="message" id="message" rows='10' cols='30'>{tmpl_var name='message'}</textarea>
+        <p>{tmpl_var name='message'}</p>
       </div>
     </fieldset>
-
-    <input type="hidden" name="id" value="{tmpl_var name='id'}">
-
-    <div class="buttonHolder buttons">
-      <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','help/support_message_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
-      <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('help/support_message_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
-    </div>
   </div>
   
 </div>
-- 
GitLab