Applied patch from Harald Hannelius which adds the SP entity id to the...

Applied patch from Harald Hannelius which adds the SP entity id to the parameters passed to the consent-template.

Also added the same code to SAML2 SSOService.


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

www/saml2/idp/SSOService.php

@@ -268,6 +268,7 @@ if($needAuth && !$isPassive) {
 				$t = new SimpleSAML_XHTML_Template($config, 'consent.php', 'attributes.php');
 				$t->data['header'] = 'Consent';
 				$t->data['sp_name'] = $sp_name;
+				$t->data['spentityid'] = $spentityid;
 				$t->data['attributes'] = $filteredattributes;
 				$t->data['consenturl'] = SimpleSAML_Utilities::selfURLNoQuery();
 				$t->data['requestid'] = $authId;

www/shib13/idp/SSOService.php

@@ -187,6 +187,7 @@ if (!$session->isAuthenticated($authority) ) {
 				$t = new SimpleSAML_XHTML_Template($config, 'consent.php', 'attributes.php');
 				$t->data['header'] = 'Consent';
 				$t->data['sp_name'] = $sp_name;
+				$t->data['spentityid'] = $spentityid;
 				$t->data['attributes'] = $filteredattributes;
 				$t->data['consenturl'] = SimpleSAML_Utilities::selfURLNoQuery();
 				$t->data['requestid'] = $authId;