Minor update to consentAdmin.

Added config option to display description.


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

modules/consentAdmin/config-templates/module_consentAdmin.php

@@ -22,4 +22,7 @@ $config = array(
 
 	// Where to direct the user after logout
 	'relaystate' => 'www.wayf.dk',
+
+    // Shows description of the services if set to true (defaults to true)
+    'showDesription' => true, 
 );

modules/consentAdmin/dictionaries/consentadmin.php

@@ -194,7 +194,10 @@ WAYF foretager behandlinger af personoplysninger i henhold til persondataloven (
 		'en' => 'show/hide attributes',
         'da' => 'vis/skjul attributter',		
 		),
-		
+    'consentadmin_purpose' => array(
+        'en' => 'The purpose of the service is',
+        'da' => 'Formålet med tjenesten er',
+    ),        
 );
 
 

modules/consentAdmin/templates/consentadmin.php

@@ -75,8 +75,8 @@ span.showhide {
 			foreach ($spList AS $spName => $spValues) {
 				$this->includeInlineTranslation('spname', $spValues['name']);
 				$this->includeInlineTranslation('spdescription', $spValues['description']);
-				$htmlSpName = htmlspecialchars($this->t('spname', array(), false, true) );
-				$spDescription = htmlspecialchars($this->t('spdescription',array(), false, true));
+				$htmlSpName = $this->t('spname', array(), false, true);
+				$spDescription = $this->t('spdescription',array(), false, true);
 				$checkedAttr = $spValues['consentStatus'] == 'ok' ? "checked='yes'" : "";
 				$consentValue = $spValues['consentValue'];
 				$consentText = $spValues['consentStatus'] == 'changed' ? "attributes has changed" : "";
@@ -90,7 +90,10 @@ span.showhide {
 	  <tr><td colspan="2" class="caAttributes"><div id="attributes_$show_spid" style="display: none;">
 TRSTART;
 				$attributes = $spValues['attributes_by_sp'];
-				echo "\n<ul>\n";
+				if ($this->data['showDescription']) {
+                    echo '<p>' . $this->t('consentadmin_purpose') . ' ' . $spDescription . '</p>';
+                }
+                echo "\n<ul>\n";
 				foreach ($attributes AS $name => $value) {
 
 				if (isset($this->data['attribute_' . htmlspecialchars(strtolower($name)) ])) {

modules/consentAdmin/www/consentAdmin.php

@@ -241,5 +241,6 @@ $relaystate = $cA_config->getValue('relaystate');
 $et->data['header'] = 'Consent Administration';
 $et->data['logout'] = '<p>[ <a href="/' . $config->getBaseURL() . 'saml2/sp/initSLO.php?RelayState='. $relaystate .'">Logout</a> ]';
 $et->data['spList'] = $sp_list;
+$et->data['showDescription'] = $cA_config->getValue('showDescription');
 $et->show();
 ?>