Fix email template of oldui interface to actually include the data.

This makes it mirror how it used to work and how the twig templates work. The solution is not pretty, but the longer term solution is to just get rid of the oldui exception. Also actually run the existing EMail unit tests. That might have caught this. Closes: #1269

Fix email template of oldui interface to actually include the data.
This makes it mirror how it used to work and how the twig templates work. The solution is not pretty, but the longer term solution is to just get rid of the oldui exception. Also actually run the existing EMail unit tests. That might have caught this. Closes: #1269
856eebd1 · Thijs Kinkhorst · 3deadfeb · 856eebd1 · 856eebd1
Commit 856eebd1 authored 5 years ago by Thijs Kinkhorst
--- a/lib/SimpleSAML/Utils/EMail.php
+++ b/lib/SimpleSAML/Utils/EMail.php
@@ -256,7 +256,7 @@ class EMail
        $newui = $config->getBoolean('usenewui', false);
        if ($newui === false) {
-            return '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+            $result = '<!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>
@@ -274,11 +274,17 @@ pre {
 	</style>
 </head>
 <body>
+<h1>' . htmlspecialchars($this->mail->Subject) . '</h1>
 <div class="container" style="background: #fafafa; border: 1px solid #eee; margin: 2em; padding: .6em;">
-' . $this->text . '
+<blockquote>"' . htmlspecialchars($this->text) . '"</blockquote>
-</div>
+</div>';
-</body>
+            foreach ($this->data as $name => $values) {
-</html>';
+                $result .= '<h2>' . htmlspecialchars($name) . '</h2><ul>';
+                foreach ($values as $value) {
+                    $result .= '<li><pre>' . htmlspecialchars($value) . '</pre></li>';
+                }
+                $result .= '</ul>';
+            }
        } else {
            $t = new Template($config, $template);
            $twig = $t->getTwig();
@@ -293,7 +299,7 @@ pre {
                'text' => $this->text,
                'data' => $this->data
            ]);
-            return $result;
        }
+        return $result;
    }
 }
--- a/tests/lib/SimpleSAML/Utils/EMailTestCase.php
+++ b/tests/lib/SimpleSAML/Utils/EMailTestCase.php
@@ -11,7 +11,7 @@ use SimpleSAML\Utils\EMail;
 /**
 * A base SSP test case that tests some simple e-mail related calls
 */
-class EMailTestCase extends ClearStateTestCase
+class EMailTest extends ClearStateTestCase
 {
    /**
     * @return void