From ab16703315bed9655387e06e7a8c108ac5e2d256 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaime=20Pe=CC=81rez=20Crespo?= <jaime.perez@uninett.no>
Date: Mon, 26 Aug 2019 10:31:58 +0200
Subject: [PATCH] Move the metadata.php template back to the main templates
directory
Old PHP templates are going to disappear anyway, so let's not break anything for a change that will be removed in the near future. We keep the .tpl.php extension though.
---
modules/saml/www/sp/metadata.php | 2 +-
{modules/saml/templates => templates}/metadata.tpl.php | 0
www/saml2/idp/metadata.php | 2 +-
www/shib13/idp/metadata.php | 2 +-
4 files changed, 3 insertions(+), 3 deletions(-)
rename {modules/saml/templates => templates}/metadata.tpl.php (100%)
diff --git a/modules/saml/www/sp/metadata.php b/modules/saml/www/sp/metadata.php
index ebf1a9481..220d30181 100644
--- a/modules/saml/www/sp/metadata.php
+++ b/modules/saml/www/sp/metadata.php
@@ -270,7 +270,7 @@ if (isset($metaArray20['attributes']) && is_array($metaArray20['attributes'])) {
$xml = \SimpleSAML\Metadata\Signer::sign($xml, $spconfig->toArray(), 'SAML 2 SP');
if (array_key_exists('output', $_REQUEST) && $_REQUEST['output'] == 'xhtml') {
- $t = new \SimpleSAML\XHTML\Template($config, 'saml:metadata.tpl.php', 'admin');
+ $t = new \SimpleSAML\XHTML\Template($config, 'metadata.tpl.php', 'admin');
$t->data['clipboard.js'] = true;
$t->data['header'] = 'saml20-sp'; // TODO: Replace with headerString in 2.0
diff --git a/modules/saml/templates/metadata.tpl.php b/templates/metadata.tpl.php
similarity index 100%
rename from modules/saml/templates/metadata.tpl.php
rename to templates/metadata.tpl.php
diff --git a/www/saml2/idp/metadata.php b/www/saml2/idp/metadata.php
index 1fce62b9d..15ee592f5 100644
--- a/www/saml2/idp/metadata.php
+++ b/www/saml2/idp/metadata.php
@@ -214,7 +214,7 @@ try {
if (array_key_exists('output', $_GET) && $_GET['output'] == 'xhtml') {
$defaultidp = $config->getString('default-saml20-idp', null);
- $t = new \SimpleSAML\XHTML\Template($config, 'saml:metadata.php', 'admin');
+ $t = new \SimpleSAML\XHTML\Template($config, 'metadata.tpl.php', 'admin');
$t->data['clipboard.js'] = true;
$t->data['available_certs'] = $availableCerts;
diff --git a/www/shib13/idp/metadata.php b/www/shib13/idp/metadata.php
index d1f012e19..d8063b444 100644
--- a/www/shib13/idp/metadata.php
+++ b/www/shib13/idp/metadata.php
@@ -84,7 +84,7 @@ try {
if (array_key_exists('output', $_GET) && $_GET['output'] == 'xhtml') {
$defaultidp = $config->getString('default-shib13-idp', null);
- $t = new \SimpleSAML\XHTML\Template($config, 'saml:metadata.php', 'admin');
+ $t = new \SimpleSAML\XHTML\Template($config, 'metadata.tpl.php', 'admin');
$t->data['clipboard.js'] = true;
$t->data['header'] = 'shib13-idp'; // TODO: Replace with headerString in 2.0
--
GitLab