Twigify EMail-template

f5b47d25 · Tim van Dijen · a8260318 · f5b47d25 · f5b47d25
Commit f5b47d25 authored 6 years ago by Tim van Dijen
--- a/lib/SimpleSAML/XHTML/EMail.php
+++ b/lib/SimpleSAML/XHTML/EMail.php
@@ -5,7 +5,7 @@ namespace SimpleSAML\XHTML;
 /**
 * A minimalistic Emailer class. Creates and sends HTML emails.
 *
- * @author Andreas kre Solberg, UNINETT AS. <andreas.solberg@uninett.no>
+ * @author Andreas Åkre Solberg, UNINETT AS. <andreas.solberg@uninett.no>
 * @package SimpleSAMLphp
 */

@@ -48,30 +48,10 @@ class EMail
     */
    private function getHTML($body)
    {
-        return '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-	<title>SimpleSAMLphp Email report</title>
-	<style type="text/css">
-pre, div.box {
-	margin: .4em 2em .4em 1em;
-	padding: 4px;
-
-}
-pre {
-	background: #eee;
-	border: 1px solid #aaa;
-}
-	</style>
-</head>
-<body>
-<div class="container" style="background: #fafafa; border: 1px solid #eee; margin: 2em; padding: .6em;">
-'.$body.'
-</div>
-</body>
-</html>';
+        $config = \SimpleSAML\Configuration::getInstance();
+        $t = new \SimpleSAML\XHTML\Template($config, 'errorreport_mail.twig');
+        $twig = $t->getTwig();
+        return $twig->render('errorreport_mail.twig', ['body' => $body]);
    }



--- a/templates/errorreport_mail.twig
+++ b/templates/errorreport_mail.twig
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+    <title>SimpleSAMLphp Email report</title>
+    <style type="text/css">
+pre, div.box {
+        margin: .4em 2em .4em 1em;
+        padding: 4px;
+
+}
+pre {
+        background: #eee;
+        border: 1px solid #aaa;
+}
+div.container {
+        background: #fafafa;
+        border: 1px solid #eee;
+        margin: 2em;
+        padding: .6em;
+}
+    </style>
+</head>
+<body>
+<div class="container">
+{{ body }}
+</div>
+</body>
+</html>