From 6cedf278590a516879c9c83260cfd4892b586c9c Mon Sep 17 00:00:00 2001
From: Hanne Moa <hanne.moa@uninett.no>
Date: Tue, 13 Sep 2016 13:19:13 +0200
Subject: [PATCH] Remove concat: translated header in metadata.php
For #455
---
modules/adfs/www/idp/metadata.php | 3 ++-
modules/saml/www/sp/metadata.php | 3 ++-
templates/metadata.php | 2 +-
www/saml2/idp/metadata.php | 3 ++-
www/shib13/idp/metadata.php | 3 ++-
5 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/modules/adfs/www/idp/metadata.php b/modules/adfs/www/idp/metadata.php
index df59f5ada..b52f8ef5b 100644
--- a/modules/adfs/www/idp/metadata.php
+++ b/modules/adfs/www/idp/metadata.php
@@ -148,7 +148,8 @@ try {
$t->data['clipboard.js'] = true;
$t->data['available_certs'] = $availableCerts;
- $t->data['header'] = 'adfs-idp';
+ $t->data['header'] = 'adfs-idp'; // TODO: Replace with headerString in 2.0
+ $t->data['headerString'] = $t->noop('metadata_adfs-idp');
$t->data['metaurl'] = \SimpleSAML\Utils\HTTP::getSelfURLNoQuery();
$t->data['metadata'] = htmlspecialchars($metaxml);
$t->data['metadataflat'] = htmlspecialchars($metaflat);
diff --git a/modules/saml/www/sp/metadata.php b/modules/saml/www/sp/metadata.php
index 3adf70df0..781d00703 100644
--- a/modules/saml/www/sp/metadata.php
+++ b/modules/saml/www/sp/metadata.php
@@ -242,7 +242,8 @@ if (array_key_exists('output', $_REQUEST) && $_REQUEST['output'] == 'xhtml') {
$t = new SimpleSAML_XHTML_Template($config, 'metadata.php', 'admin');
$t->data['clipboard.js'] = true;
- $t->data['header'] = 'saml20-sp';
+ $t->data['header'] = 'saml20-sp'; // TODO: Replace with headerString in 2.0
+ $t->data['headerString'] = $t->noop('metadata_saml20-sp');
$t->data['metadata'] = htmlspecialchars($xml);
$t->data['metadataflat'] = '$metadata['.var_export($entityId, true).'] = '.var_export($metaArray20, true).';';
$t->data['metaurl'] = $source->getMetadataURL();
diff --git a/templates/metadata.php b/templates/metadata.php
index 99f5f60fe..483a321be 100644
--- a/templates/metadata.php
+++ b/templates/metadata.php
@@ -1,5 +1,5 @@
<?php
-$this->data['header'] = $this->t('metadata_'.$this->data['header']);
+$this-data['header'] = $this->t($this->data['headerString']);
$this->includeAtTemplateBase('includes/header.php'); ?>
<h2><?php echo $this->data['header']; ?></h2>
<p><?php echo $this->t('metadata_intro'); ?></p>
diff --git a/www/saml2/idp/metadata.php b/www/saml2/idp/metadata.php
index 269764018..897f22d31 100644
--- a/www/saml2/idp/metadata.php
+++ b/www/saml2/idp/metadata.php
@@ -211,7 +211,8 @@ try {
$t->data['clipboard.js'] = true;
$t->data['available_certs'] = $availableCerts;
- $t->data['header'] = 'saml20-idp';
+ $t->data['header'] = 'saml20-idp'; // TODO: Replace with headerString in 2.0
+ $t->data['headerString'] = $t->noop('metadata_saml20-idp');
$t->data['metaurl'] = HTTP::getSelfURLNoQuery();
$t->data['metadata'] = htmlspecialchars($metaxml);
$t->data['metadataflat'] = htmlspecialchars($metaflat);
diff --git a/www/shib13/idp/metadata.php b/www/shib13/idp/metadata.php
index f9f5af315..23c3f6857 100644
--- a/www/shib13/idp/metadata.php
+++ b/www/shib13/idp/metadata.php
@@ -90,7 +90,8 @@ try {
$t = new SimpleSAML_XHTML_Template($config, 'metadata.php', 'admin');
$t->data['clipboard.js'] = true;
- $t->data['header'] = 'shib13-idp';
+ $t->data['header'] = 'shib13-idp'; // TODO: Replace with headerString in 2.0
+ $t->data['headerString'] = $t->noop('metadata_shib13-idp');
$t->data['metaurl'] = \SimpleSAML\Utils\HTTP::addURLParameters(
\SimpleSAML\Utils\HTTP::getSelfURLNoQuery(),
array('output' => 'xml')
--
GitLab