Create a PHP template for IFrameLogoutHandler

This was inline in the script, and later migrated to a twig template. This made us force the use of twig, or otherwise the template would not work for the old user interface. We shouldn't do that, and we should have a proper PHP template in place.

Create a PHP template for IFrameLogoutHandler
This was inline in the script, and later migrated to a twig template. This made us force the use of twig, or otherwise the template would not work for the old user interface. We shouldn't do that, and we should have a proper PHP template in place.
59e1dd5f · Jaime Pérez Crespo · 014992c8 · 59e1dd5f · 59e1dd5f
Unverified Commit 59e1dd5f authored 5 years ago by Jaime Pérez Crespo
--- a/lib/SimpleSAML/IdP/IFrameLogoutHandler.php
+++ b/lib/SimpleSAML/IdP/IFrameLogoutHandler.php
@@ -99,32 +99,14 @@ class IFrameLogoutHandler implements LogoutHandlerInterface
        $this->idp->terminateAssociation($assocId);
        $config = Configuration::getInstance();
-        $usenewui = $config->getBoolean('usenewui', false);
-        // Force the use of Twig for this method. Remove if-clause in 2.0
+        $t = new Template($config, 'IFrameLogoutHandler.tpl.php');
-        if ($usenewui === false) {
-            $config = Configuration::loadFromArray([
-                'usenewui' => true,
-            ]);
-        }
-        $t = new Template($config, 'IFrameLogoutHandler.twig');
        $t->data['assocId'] = var_export($assocId, true);
        $t->data['spId'] = sha1($assocId);
        if (!is_null($error)) {
            $t->data['errorMsg'] = $error->getMessage();
        }
-        // Remove the if-clause in 2.0, leave the else-part
+        $t->show();
-        if ($usenewui === false) {
-            $twig = $t->getTwig();
-            if (!isset($twig)) {
-                throw new \Exception('Even though we explicitly configure that we want Twig, the Template class does not give us Twig. This is a bug.');
-            }
-            $result = $twig->render('IFrameLogoutHandler.twig', $t->data);
-            echo $result;
-        } else {
-            $t->show();
-        }
    }
 }
--- a/templates/IFrameLogoutHandler.tpl.php
+++ b/templates/IFrameLogoutHandler.tpl.php
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Logout response from <?= htmlspecialchars(var_export($this->data['assocId'])); ?></title>
+    <script>
+<?php
+    if (array_key_exists('errorMsg', $this->data)) {
+        echo 'window.parent.logoutFailed("'.$this->data['spId'].'", "'.addslashes($this->data['errorMsg']).'");';
+    } else {
+        echo 'window.parent.logoutCompleted("'.$this->data['spId'].'");';
+    }
+?>
+    </script>
+  </head>
+  <body></body>
+</html>