Change "idpdisco.url.saml2" to "idpdisco.url.saml20", to be consistent with...

Change "idpdisco.url.saml2" to "idpdisco.url.saml20", to be consistent with the rest of simpleSAMLphp. Also include a forgotten change from the last patch.


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

config-templates/config.php

@@ -181,7 +181,7 @@ $config = array (
 	 * By default simpleSAMLphp will use its builtin IdP discovery service.
 	 */
 	'idpdisco.url.shib13' => NULL,
-	'idpdisco.url.saml2' => NULL,
+	'idpdisco.url.saml20' => NULL,
 	
 	/*
 	 * IdP Discovery service look configuration. 

docs/source/simplesamlphp-sp.xml

@@ -293,7 +293,7 @@
             <glossdef>
               <para>Set which IdP discovery service this SP should use. If
               this is unset, the IdP discovery service specified in the global
-              option <literal>idpdisco.url.saml2</literal> in
+              option <literal>idpdisco.url.saml20</literal> in
               <filename>config/config.php</filename> will be used. If that one
               is also unset, the builtin default discovery service will be
               used.</para>

www/saml2/sp/initSSO.php

@@ -31,7 +31,7 @@ try {
 
 	if($idpentityid === NULL) {
 		/* We are going to need the SP metadata to determine which IdP discovery service we should use. */
-		$spmetadata = $metadata->getMetaData($spentityid);
+		$spmetadata = $metadata->getMetaDataCurrent('saml20-sp-hosted');
 	}
 
 } catch (Exception $exception) {
@@ -51,8 +51,8 @@ if ($idpentityid == null) {
 	 */
 	if(array_key_exists('idpdisco.url', $spmetadata)) {
 		$discourl = $spmetadata['idpdisco.url'];
-	} elseif($config->getValue('idpdisco.url.saml2', NULL) !== NULL) {
-		$discourl = $config->getValue('idpdisco.url.saml2', NULL);
+	} elseif($config->getValue('idpdisco.url.saml20', NULL) !== NULL) {
+		$discourl = $config->getValue('idpdisco.url.saml20', NULL);
 	} else {
 		$discourl = '/' . $config->getBaseURL() . 'saml2/sp/idpdisco.php';
 	}