From 3a481bac3914ad8faef99c54d83dd35101e4ed34 Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Tue, 20 Oct 2009 09:14:40 +0000
Subject: [PATCH] www/{saml2,shib13}/sp/metadata.php: Remove some unused
template parameters.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@1880 44740490-163a-0410-bde0-09ae8108e29a
---
www/saml2/sp/metadata.php | 5 -----
www/shib13/sp/metadata.php | 15 ---------------
2 files changed, 20 deletions(-)
diff --git a/www/saml2/sp/metadata.php b/www/saml2/sp/metadata.php
index 90d017392..12e10e1ce 100644
--- a/www/saml2/sp/metadata.php
+++ b/www/saml2/sp/metadata.php
@@ -142,8 +142,6 @@ try {
if (array_key_exists('output', $_REQUEST) && $_REQUEST['output'] == 'xhtml') {
- $defaultidp = $config->getString('default-saml20-idp', NULL);
-
$t = new SimpleSAML_XHTML_Template($config, 'metadata.php', 'admin');
$t->data['header'] = 'saml20-sp';
@@ -158,9 +156,6 @@ try {
$t->data['techemail'] = $config->getString('technicalcontact_email', NULL);
-// $t->data['version'] = $config->getString('version', 'na');
-// $t->data['defaultidp'] = $defaultidp;
-
$t->show();
} else {
diff --git a/www/shib13/sp/metadata.php b/www/shib13/sp/metadata.php
index 489de92da..1133b5781 100644
--- a/www/shib13/sp/metadata.php
+++ b/www/shib13/sp/metadata.php
@@ -65,27 +65,12 @@ try {
$metaxml = SimpleSAML_Metadata_Signer::sign($metaxml, $spmeta, 'Shib 1.3 SP');
if (array_key_exists('output', $_GET) && $_GET['output'] == 'xhtml') {
- $defaultidp = $config->getString('default-shib13-idp', NULL);
-
$t = new SimpleSAML_XHTML_Template($config, 'metadata.php', 'admin');
-
-
$t->data['header'] = 'shib13-sp';
$t->data['metadata'] = htmlspecialchars($metaxml);
$t->data['metadataflat'] = htmlspecialchars($metaflat);
$t->data['metaurl'] = SimpleSAML_Utilities::addURLparameter(SimpleSAML_Utilities::selfURLNoQuery(), array('output' => 'xml'));
-
- /*
- if (array_key_exists($defaultidp, $send_metadata_to_idp)) {
- $et->data['sendmetadatato'] = $send_metadata_to_idp[$defaultidp]['address'];
- $et->data['federationname'] = $send_metadata_to_idp[$defaultidp]['name'];
- }
- */
-
$t->data['techemail'] = $config->getString('technicalcontact_email', 'na');
- $t->data['version'] = $config->getString('version', 'na');
- $t->data['defaultidp'] = $defaultidp;
-
$t->show();
} else {
--
GitLab