From 082f38ef497b1149f437c473119686f9250bc70e Mon Sep 17 00:00:00 2001
From: coderkun
Date: Sun, 25 May 2014 22:34:55 +0200
Subject: [PATCH] set linker for Text- and HTML-mails
---
controllers/HtmlmailController.inc | 4 ++--
controllers/TextmailController.inc | 4 ++--
views/htmlmail/htmlmail.tpl | 4 +++-
views/textmail/textmail.tpl | 2 +-
4 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/controllers/HtmlmailController.inc b/controllers/HtmlmailController.inc
index e36da004..72e9dede 100644
--- a/controllers/HtmlmailController.inc
+++ b/controllers/HtmlmailController.inc
@@ -34,8 +34,8 @@
parent::preFilter($request, $response);
- // Set application URL
- $this->set('url', \nre\configs\AppConfig::$app['url']);
+ // Set linker
+ $this->set('linker', ($request instanceof \hhu\z\requests\MailRequest && !is_null($request->getLinker())) ? $request->getLinker() : null);
}
diff --git a/controllers/TextmailController.inc b/controllers/TextmailController.inc
index 563c6bd6..a35976cd 100644
--- a/controllers/TextmailController.inc
+++ b/controllers/TextmailController.inc
@@ -35,8 +35,8 @@
parent::preFilter($request, $response);
- // Set application URL
- $this->set('url', \nre\configs\AppConfig::$app['url']);
+ // Set linker
+ $this->set('linker', ($request instanceof \hhu\z\requests\MailRequest && !is_null($request->getLinker())) ? $request->getLinker() : null);
}
diff --git a/views/htmlmail/htmlmail.tpl b/views/htmlmail/htmlmail.tpl
index d6f2a4c0..ea9da24c 100644
--- a/views/htmlmail/htmlmail.tpl
+++ b/views/htmlmail/htmlmail.tpl
@@ -11,7 +11,9 @@
=$intermediate?>
- – =$appname?>
+ –
+ =$appname?>=$appname?>
+