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/mail_mailinglist_list.php | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/interface/web/mail/mail_mailinglist_list.php b/interface/web/mail/mail_mailinglist_list.php
index 732b143..e1e2daf 100644
--- a/interface/web/mail/mail_mailinglist_list.php
+++ b/interface/web/mail/mail_mailinglist_list.php
@@ -1,6 +1,6 @@
<?php
-require_once('../../lib/config.inc.php');
-require_once('../../lib/app.inc.php');
+require_once '../../lib/config.inc.php';
+require_once '../../lib/app.inc.php';
/******************************************
* Begin Form configuration
@@ -19,26 +19,26 @@
class list_action extends listform_actions {
-
+
function onShow() {
- global $app,$conf;
-
+ global $app, $conf;
+
$app->uses('getconf');
$global_config = $app->getconf->get_global_config('mail');
-
+
if($global_config['mailmailinglist_link'] == 'y') {
- $app->tpl->setVar('mailmailinglist_link',1);
+ $app->tpl->setVar('mailmailinglist_link', 1);
} else {
- $app->tpl->setVar('mailmailinglist_link',0);
+ $app->tpl->setVar('mailmailinglist_link', 0);
}
-
+
parent::onShow();
}
-
+
}
$list = new list_action;
$list->onLoad();
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1