diff --git a/modules/consentAdmin/templates/consentadmin.php b/modules/consentAdmin/templates/consentadmin.php index cf643b1b3940b1115c3b0bf624ee00b382657c87..77ac8770e29cf81632ba6dbdd1cc9db131e28fcd 100644 --- a/modules/consentAdmin/templates/consentadmin.php +++ b/modules/consentAdmin/templates/consentadmin.php @@ -47,10 +47,6 @@ TRSTART; echo "\n<ul>\n"; foreach ($attributes as $name => $value) { - if (isset($this->data['attribute_'.htmlspecialchars(strtolower($name))])) { - $name = $this->data['attribute_'.htmlspecialchars(strtolower($name))]; - } - $name = $this->getTranslator()->getAttributeTranslation($name); // translate if (sizeof($value) > 1) { echo "<li>".htmlspecialchars($name).":\n<ul>\n"; foreach ($value as $v) { diff --git a/modules/consentAdmin/www/consentAdmin.php b/modules/consentAdmin/www/consentAdmin.php index bebc9ad99a5e0091eeba4e497b8747f58dddfb85..16c09651d594fd314c939497cdf3023a575a5a68 100644 --- a/modules/consentAdmin/www/consentAdmin.php +++ b/modules/consentAdmin/www/consentAdmin.php @@ -229,6 +229,17 @@ foreach ($all_sp_metadata as $sp_entityid => $sp_values) { list($targeted_id, $attribute_hash, $attributes_new) = driveProcessingChain($idp_metadata, $source, $sp_metadata, $sp_entityid, $attributes, $userid, $hashAttributes, $excludeAttributes); + // Translate attribute-names + foreach ($attributes_new as $orig_name => $value) { + if (isset($template->data['attribute_'.htmlspecialchars(strtolower($orig_name))])) { + $old_name = $template->data['attribute_'.htmlspecialchars(strtolower($orig_name))]; + } + $name = $translator->getAttributeTranslation(strtolower($orig_name)); // translate + + $attributes_new[$name] = $value; + unset($attributes_new[$orig_name]); + } + // Check if consent exists if (array_key_exists($targeted_id, $user_consent)) { $sp_status = "changed";