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/mail/templates/mail_alias_edit.htm | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/interface/web/mail/templates/mail_alias_edit.htm b/interface/web/mail/templates/mail_alias_edit.htm
index 7046652..352210b 100644
--- a/interface/web/mail/templates/mail_alias_edit.htm
+++ b/interface/web/mail/templates/mail_alias_edit.htm
@@ -25,7 +25,12 @@
{tmpl_var name='active'}
</div>
</div>
-
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='greylisting_txt'}</label>
+ <div class="col-sm-9">
+ {tmpl_var name='greylisting'}
+ </div>
+ </div>
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<input type="hidden" name="type" value="alias">
@@ -33,4 +38,4 @@
<div class="clear"><div class="right">
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="mail/mail_alias_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="mail/mail_alias_list.php">{tmpl_var name='btn_cancel_txt'}</button>
- </div></div>
\ No newline at end of file
+ </div></div>
--
Gitblit v1.9.1