Added description of sp to consent template and SSOService.php.

Use SPDESC as replacement string in dictionary.


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

templates/default/consent.php

@@ -4,12 +4,13 @@
 	$this->includeLanguageFile('consent.php'); 
 	$this->includeInlineTranslation('spname', $this->data['sp_name']);
 	$this->includeInlineTranslation('IDPNAME', $this->data['idp_name']);
+	$this->includeInlineTranslation('SPDESC', $this->data['sp_description']);
 ?>
 
 	<div id="content">
 
 		<p><?php echo htmlspecialchars($this->t('consent_notice')); ?> <strong><?php echo htmlspecialchars($this->t('spname')); ?></strong>.
-		<?php echo htmlspecialchars($this->t('consent_accept', array('IDPNAME' => ''))) ?>
+		<?php echo htmlspecialchars($this->t('consent_accept', array('IDPNAME' => '', 'SPDESC' => ''))) ?>
 		</p>
 
 		<?php if ($this->data['sppp'] !== FALSE) {

www/saml2/idp/SSOService.php

@@ -331,6 +331,7 @@ if($needAuth && !$isPassive) {
 				$t = new SimpleSAML_XHTML_Template($config, 'consent.php', 'attributes');
 				$t->data['header'] = 'Consent';
 				$t->data['sp_name'] = $sp_name;
+				$t->data['sp_description'] = (isset($spmetadata['description']) ? $spmetadata['description'] : "SP DESCRIPTION");
 				$t->data['idp_name'] = (isset($idpmetadata['name']) ? $idpmetadata['name'] : $idpentityid);
 				$t->data['spentityid'] = $spentityid;
 				$t->data['spmetadata'] = $spmetadata;