From d8faa4e7e3fb74e554f6c9339f6fe4e2883c3bf1 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Fri, 18 Sep 2015 13:43:03 -0400
Subject: [PATCH] Fix by dirkd: Since file() doesn't remove "\n" from the lines read the condition $lines[$l] == '' never evaluated to true. So $mailHeaders would always contain every line from the template while $mailBody contained none of them.
---
interface/web/help/templates/support_message_edit.htm | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/interface/web/help/templates/support_message_edit.htm b/interface/web/help/templates/support_message_edit.htm
index f0eba3e..fb54578 100644
--- a/interface/web/help/templates/support_message_edit.htm
+++ b/interface/web/help/templates/support_message_edit.htm
@@ -9,15 +9,14 @@
<label for="recipient_id" class="col-sm-3 control-label">{tmpl_var name='recipient_id_txt'}</label>
<div class="col-sm-9"><select name="recipient_id" id="recipient_id" class="form-control">
{tmpl_var name='recipient_id'}
- </select>
- </div></div>
+ </select></div>
+ </div>
<div class="form-group">
<label for="subject" class="col-sm-3 control-label">{tmpl_var name='subject_txt'}</label>
- <div class="col-sm-9"><input type="text" name="subject" id="subject" value="{tmpl_var name='subject'}" class="form-control" />
- </div></div>
+ <div class="col-sm-9"><input type="text" name="subject" id="subject" value="{tmpl_var name='subject'}" class="form-control" /></div></div>
<div class="form-group">
<label for="message" class="col-sm-3 control-label">{tmpl_var name='message_txt'}</label>
- <textarea name="message" id="message" rows='10' cols='30'>{tmpl_var name='message'}</textarea>
+ <div class="col-sm-9"><textarea class="form-control" name="message" id="message" rows='10' cols='30'>{tmpl_var name='message'}</textarea></div>
</div>
@@ -25,6 +24,6 @@
<input type="hidden" name="tstamp" value="{tmpl_var name='tstamp'}">
<div class="clear"><div class="right">
- <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','help/support_message_edit.php');">{tmpl_var name='btn_save_txt'}</button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="help/support_message_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="help/support_message_edit.php">{tmpl_var name='btn_save_txt'}</button>
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="help/support_message_list.php">{tmpl_var name='btn_cancel_txt'}</button>
</div></div>
\ No newline at end of file
--
Gitblit v1.9.1