From c9f3cc835008c83b0a1808701c5e833b7f7c419d Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Sun, 12 Aug 2018 17:25:25 +0200
Subject: [PATCH] Improve readabilty
---
modules/core/www/idp/logout-iframe.php | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/modules/core/www/idp/logout-iframe.php b/modules/core/www/idp/logout-iframe.php
index 547d86a10..53f4a6373 100644
--- a/modules/core/www/idp/logout-iframe.php
+++ b/modules/core/www/idp/logout-iframe.php
@@ -112,22 +112,21 @@ foreach ($state['core:Logout-IFrame:Associations'] as $association) {
}
}
-$id = \SimpleSAML\Auth\State::saveState($state, 'core:Logout-IFrame');
$globalConfig = \SimpleSAML\Configuration::getInstance();
-
-$template_id = 'core:logout-iframe.php';
if ($type === 'nojs') {
- $template_id = 'core:logout-iframe-wrapper.php';
+ $t = new \SimpleSAML\XHTML\Template($globalConfig, 'core:logout-iframe-wrapper.php');
+} else {
+ $t = new \SimpleSAML\XHTML\Template($globalConfig, 'core:logout-iframe.php');
}
-$t = new \SimpleSAML\XHTML\Template($globalConfig, $template_id);
-$t->data['auth_state'] = $id;
-$t->data['header'] = $t->getTranslator()->t('{logout:progress}');
-
/**
* @deprecated The "id" variable will be removed. Please use "auth_state" instead.
*/
+$id = \SimpleSAML\Auth\State::saveState($state, 'core:Logout-IFrame');
$t->data['id'] = $id;
+$t->data['auth_state'] = $id;
+
+$t->data['header'] = $t->getTranslator()->t('{logout:progress}');
$t->data['type'] = $type;
$t->data['terminated_service'] = $terminated;
$t->data['remaining_services'] = $remaining;
--
GitLab