Twigify IframeLogouthandler

a082954d · Tim van Dijen · 6e54aff3 · a082954d · a082954d
Commit a082954d authored 6 years ago by Tim van Dijen
--- a/lib/SimpleSAML/IdP/IFrameLogoutHandler.php
+++ b/lib/SimpleSAML/IdP/IFrameLogoutHandler.php
@@ -20,7 +20,6 @@ class IFrameLogoutHandler implements LogoutHandlerInterface
     */
    private $idp;

-
    /**
     * LogoutIFrame constructor.
     *
@@ -90,30 +89,14 @@ class IFrameLogoutHandler implements LogoutHandlerInterface
    {
        assert(is_string($assocId));

-        $spId = sha1($assocId);
+        $config = \SimpleSAML\Configuration::getInstance();
        $this->idp->terminateAssociation($assocId);

-        $header = <<<HEADER
-<!DOCTYPE html>
-<html>
- <head>
-  <title>Logout response from %s</title>
-  <script>
-HEADER;
-        printf($header, htmlspecialchars(var_export($assocId, true)));
-        if ($error) {
-            $errorMsg = $error->getMessage();
-            echo('window.parent.logoutFailed("'.$spId.'", "'.addslashes($errorMsg).'");');
-        } else {
-            echo('window.parent.logoutCompleted("'.$spId.'");');
-        }
-        echo <<<FOOTER
-  </script>
- </head>
- <body>
- </body>
-</html>
-FOOTER;
+        $t = new \SimpleSAML\XHTML\Template($config, 'IFrameLogoutHandler.twig');
+        $t->data['assocId'] = var_export($assocId, true);
+        $t->data['spId'] = sha($assocId);
+        $t->data['errorMsg'] = $error->getMessage();
+        $t->show();
        exit(0);
    }
 }
--- a/templates/IFrameLogoutHandler.twig
+++ b/templates/IFrameLogoutHandler.twig
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Logout response from {{ assocId|escape('html') }}</title>
+        <script>
+{% if error %}
+            window.parent.logoutFailed("{{ spId }}", "{{ errorMsg|escape }}");
+{% else %}
+            window.parent.logoutCompleted("{{ spId }}");
+{% endif %}
+        </script>
+    </head>
+    <body>
+    </body>
+</html>
+