From 01b6157ff5cc78e32923bb9b55082308f2a3b4a0 Mon Sep 17 00:00:00 2001
From: Mads Freek Petersen <freek@wayf.dk>
Date: Mon, 15 Sep 2008 18:02:30 +0000
Subject: [PATCH] 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 | 3 ++-
www/saml2/idp/SSOService.php | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/templates/default/consent.php b/templates/default/consent.php
index 47a869714..af9d738b0 100644
--- a/templates/default/consent.php
+++ b/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) {
diff --git a/www/saml2/idp/SSOService.php b/www/saml2/idp/SSOService.php
index b71d18711..cadad790d 100644
--- a/www/saml2/idp/SSOService.php
+++ b/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;
--
GitLab