Revision: 1880
Author: olavmrk
Date: Tue Oct 20 02:14:40 2009
Log: www/{saml2,shib13}/sp/metadata.php: Remove some unused template
parameters.
http://code.google.com/p/simplesamlphp/source/detail?r=1880
Modified:
/trunk/www/saml2/sp/metadata.php
/trunk/www/shib13/sp/metadata.php
=======================================
--- /trunk/www/saml2/sp/metadata.php Fri Aug 14 04:07:44 2009
+++ /trunk/www/saml2/sp/metadata.php Tue Oct 20 02:14:40 2009
@@ -142,8 +142,6 @@
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 @@
$t->data['techemail'] =
$config->getString('technicalcontact_email',
NULL);
-// $t->data['version'] = $config->getString('version', 'na');
-// $t->data['defaultidp'] = $defaultidp;
-
$t->show();
} else {
=======================================
--- /trunk/www/shib13/sp/metadata.php Fri Aug 14 04:07:44 2009
+++ /trunk/www/shib13/sp/metadata.php Tue Oct 20 02:14:40 2009
@@ -65,27 +65,12 @@
$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 {
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"simpleSAMLphp commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/simplesamlphp-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
