Extended MetaShare publish to support SAML 2.0 SP & Shib 1.3 IdP/SP metadata.

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@683 44740490-163a-0410-bde0-09ae8108e29a

dictionaries/frontpage.php

@@ -536,9 +536,18 @@ $lang = array(
 		'hr' => 'Održavanje i konfiguriranje simpleSAMLphp-a',
 		'hu' => 'SimpleSAMLphp karbantartása és beállítása',
 	),
-	'link_publish' => array (
+	'link_publish_saml20-idp' => array (
 		'en' => 'Publish my SAML 2.0 IdP metadata to the configured MetaShare',
 	),
+	'link_publish_saml20-sp' => array (
+		'en' => 'Publish my SAML 2.0 SP metadata to the configured MetaShare',
+	),
+	'link_publish_shib13-idp' => array (
+		'en' => 'Publish my Shib 1.3 IdP metadata to the configured MetaShare',
+	),
+	'link_publish_shib13-sp' => array (
+		'en' => 'Publish my Shib 1.3 SP metadata to the configured MetaShare',
+	),
 
 );
 

www/index.php

@@ -60,14 +60,25 @@ if($config->getBoolean('idpdisco.enableremember', FALSE)) {
 		);
 }
 
-if ($config->getValue('enable.saml20-idp') === TRUE) {
-	$publishURL = $config->getString('metashare.publishurl', NULL);
-	if ($publishURL !== NULL) {
-		$metadataURL = SimpleSAML_Utilities::resolveURL('saml2/idp/metadata.php');
-		$publishURL = SimpleSAML_Utilities::addURLparameter($publishURL, 'url=' . urlencode($metadataURL));
+
+$publishURL = $config->getString('metashare.publishurl', NULL);
+if ($publishURL !== NULL) {
+	$metadataSources = array(
+		'saml20-idp' => 'saml2/idp/metadata.php',
+		'saml20-sp' => 'saml2/sp/metadata.php',
+		'shib13-idp' => 'shib13/idp/metadata.php',
+		'shib13-sp' => 'shib13/sp/metadata.php',
+		);
+	foreach($metadataSources as $name => $url) {
+		if(!$config->getBoolean('enable.' . $name, FALSE)) {
+			continue;
+		}
+
+		$url = SimpleSAML_Utilities::resolveURL($url);
+		$linkTarget = SimpleSAML_Utilities::addURLparameter($publishURL, 'url=' . urlencode($url));
 		$links[] = array(
-			'href' => $publishURL,
-			'text' => 'link_publish',
+			'href' => $linkTarget,
+			'text' => 'link_publish_' . $name,
 			);
 	}
 }