From bea05a39a06deba7451b0e7d385edbc273d09cfc Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Wed, 13 Mar 2019 23:43:13 +0100
Subject: [PATCH 001/135] Initial import

---
 .codecov.yml                               |  11 +
 .php_cs.dist                               |  17 +
 .travis.yml                                |  32 ++
 bin/check-syntax.sh                        |  15 +
 composer.json                              |  45 ++
 config-templates/module_consentAdmin.php   |  35 ++
 default-enable                             |   3 +
 dictionaries/consentadmin.definition.json  |  65 +++
 dictionaries/consentadmin.translation.json | 607 +++++++++++++++++++++
 docs/consentAdmin.md                       |  77 +++
 hooks/hook_configpage.php                  |  15 +
 hooks/hook_frontpage.php                   |  19 +
 locales/ar/LC_MESSAGES/consentAdmin.po     | 157 ++++++
 locales/cs/LC_MESSAGES/consentAdmin.po     | 159 ++++++
 locales/da/LC_MESSAGES/consentAdmin.po     | 204 +++++++
 locales/de/LC_MESSAGES/consentAdmin.po     | 166 ++++++
 locales/el/LC_MESSAGES/consentAdmin.po     | 158 ++++++
 locales/en/LC_MESSAGES/consentAdmin.po     | 173 ++++++
 locales/es/LC_MESSAGES/consentAdmin.po     | 166 ++++++
 locales/et/LC_MESSAGES/consentAdmin.po     | 160 ++++++
 locales/eu/LC_MESSAGES/consentAdmin.po     | 160 ++++++
 locales/fr/LC_MESSAGES/consentAdmin.po     | 164 ++++++
 locales/he/LC_MESSAGES/consentAdmin.po     | 158 ++++++
 locales/hr/LC_MESSAGES/consentAdmin.po     | 161 ++++++
 locales/hu/LC_MESSAGES/consentAdmin.po     | 158 ++++++
 locales/id/LC_MESSAGES/consentAdmin.po     | 164 ++++++
 locales/it/LC_MESSAGES/consentAdmin.po     | 164 ++++++
 locales/ja/LC_MESSAGES/consentAdmin.po     | 158 ++++++
 locales/lt/LC_MESSAGES/consentAdmin.po     | 159 ++++++
 locales/lv/LC_MESSAGES/consentAdmin.po     | 161 ++++++
 locales/nb/LC_MESSAGES/consentAdmin.po     | 162 ++++++
 locales/nl/LC_MESSAGES/consentAdmin.po     | 164 ++++++
 locales/nn/LC_MESSAGES/consentAdmin.po     | 162 ++++++
 locales/pt/LC_MESSAGES/consentAdmin.po     | 158 ++++++
 locales/ro/LC_MESSAGES/consentAdmin.po     | 163 ++++++
 locales/ru/LC_MESSAGES/consentAdmin.po     | 161 ++++++
 locales/sl/LC_MESSAGES/consentAdmin.po     | 159 ++++++
 locales/sr/LC_MESSAGES/consentAdmin.po     | 161 ++++++
 locales/sv/LC_MESSAGES/consentAdmin.po     | 160 ++++++
 locales/zh-tw/LC_MESSAGES/consentAdmin.po  | 158 ++++++
 locales/zh/LC_MESSAGES/consentAdmin.po     | 158 ++++++
 phpunit.xml                                |  19 +
 psalm.xml                                  |  30 +
 templates/consentadmin.php                 |  90 +++
 templates/consentadmin.twig                |  82 +++
 templates/consentadminajax.php             |   2 +
 templates/consentadminajax.twig            |   3 +
 tests/bootstrap.php                        |  11 +
 www/assets/css/consentAdmin.css            |  39 ++
 www/assets/js/consentAdmin.js              |  79 +++
 www/consentAdmin.php                       | 338 ++++++++++++
 51 files changed, 6350 insertions(+)
 create mode 100644 .codecov.yml
 create mode 100644 .php_cs.dist
 create mode 100644 .travis.yml
 create mode 100755 bin/check-syntax.sh
 create mode 100644 composer.json
 create mode 100644 config-templates/module_consentAdmin.php
 create mode 100644 default-enable
 create mode 100644 dictionaries/consentadmin.definition.json
 create mode 100644 dictionaries/consentadmin.translation.json
 create mode 100644 docs/consentAdmin.md
 create mode 100644 hooks/hook_configpage.php
 create mode 100644 hooks/hook_frontpage.php
 create mode 100644 locales/ar/LC_MESSAGES/consentAdmin.po
 create mode 100644 locales/cs/LC_MESSAGES/consentAdmin.po
 create mode 100644 locales/da/LC_MESSAGES/consentAdmin.po
 create mode 100644 locales/de/LC_MESSAGES/consentAdmin.po
 create mode 100644 locales/el/LC_MESSAGES/consentAdmin.po
 create mode 100644 locales/en/LC_MESSAGES/consentAdmin.po
 create mode 100644 locales/es/LC_MESSAGES/consentAdmin.po
 create mode 100644 locales/et/LC_MESSAGES/consentAdmin.po
 create mode 100644 locales/eu/LC_MESSAGES/consentAdmin.po
 create mode 100644 locales/fr/LC_MESSAGES/consentAdmin.po
 create mode 100644 locales/he/LC_MESSAGES/consentAdmin.po
 create mode 100644 locales/hr/LC_MESSAGES/consentAdmin.po
 create mode 100644 locales/hu/LC_MESSAGES/consentAdmin.po
 create mode 100644 locales/id/LC_MESSAGES/consentAdmin.po
 create mode 100644 locales/it/LC_MESSAGES/consentAdmin.po
 create mode 100644 locales/ja/LC_MESSAGES/consentAdmin.po
 create mode 100644 locales/lt/LC_MESSAGES/consentAdmin.po
 create mode 100644 locales/lv/LC_MESSAGES/consentAdmin.po
 create mode 100644 locales/nb/LC_MESSAGES/consentAdmin.po
 create mode 100644 locales/nl/LC_MESSAGES/consentAdmin.po
 create mode 100644 locales/nn/LC_MESSAGES/consentAdmin.po
 create mode 100644 locales/pt/LC_MESSAGES/consentAdmin.po
 create mode 100644 locales/ro/LC_MESSAGES/consentAdmin.po
 create mode 100644 locales/ru/LC_MESSAGES/consentAdmin.po
 create mode 100644 locales/sl/LC_MESSAGES/consentAdmin.po
 create mode 100644 locales/sr/LC_MESSAGES/consentAdmin.po
 create mode 100644 locales/sv/LC_MESSAGES/consentAdmin.po
 create mode 100644 locales/zh-tw/LC_MESSAGES/consentAdmin.po
 create mode 100644 locales/zh/LC_MESSAGES/consentAdmin.po
 create mode 100644 phpunit.xml
 create mode 100644 psalm.xml
 create mode 100644 templates/consentadmin.php
 create mode 100644 templates/consentadmin.twig
 create mode 100644 templates/consentadminajax.php
 create mode 100644 templates/consentadminajax.twig
 create mode 100644 tests/bootstrap.php
 create mode 100644 www/assets/css/consentAdmin.css
 create mode 100644 www/assets/js/consentAdmin.js
 create mode 100644 www/consentAdmin.php

diff --git a/.codecov.yml b/.codecov.yml
new file mode 100644
index 0000000..f7f39e1
--- /dev/null
+++ b/.codecov.yml
@@ -0,0 +1,11 @@
+coverage:
+  status:
+    project: yes
+
+comment:
+  layout: "diff"
+  behavior: once
+  require_changes: true
+  require_base: no
+  require_head: yes
+  branches: null
diff --git a/.php_cs.dist b/.php_cs.dist
new file mode 100644
index 0000000..6a85976
--- /dev/null
+++ b/.php_cs.dist
@@ -0,0 +1,17 @@
+<?php
+$finder = PhpCsFixer\Finder::create()
+    ->in([
+        __DIR__ . '/config-templates',
+        __DIR__ . '/hooks',
+        __DIR__ . '/tests',
+        __DIR__ . '/www',
+    ])
+;
+return PhpCsFixer\Config::create()
+    ->setRules([
+        '@PSR2' => true,
+        '@PSR4' => true,
+        '@PSR5' => true,
+    ])
+    ->setFinder($finder)
+;
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..c47ac23
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,32 @@
+sudo: required
+
+language: php
+
+php:
+  - 5.5
+  - 5.6
+  - 7.0
+  - 7.1
+  - 7.2
+  - 7.3
+
+env:
+  - SIMPLESAMLPHP_VERSION=1.17.*
+
+before_script:
+  - composer require "simplesamlphp/simplesamlphp:${SIMPLESAMLPHP_VERSION}" --no-update
+  - composer update --no-interaction
+  - if [[ "$TRAVIS_PHP_VERSION" == "7.3" ]]; then composer require --dev vimeo/psalm:1.1.9; fi
+
+script:
+  - bin/check-syntax.sh
+  - if [[ "$TRAVIS_PHP_VERSION" == "5.6" ]]; then php vendor/phpunit/phpunit/phpunit; else php vendor/phpunit/phpunit/phpunit --no-coverage; fi
+  - if [[ "$TRAVIS_PHP_VERSION" == "7.3" ]]; then vendor/bin/psalm; fi
+
+after_success:
+  # Codecov, need to edit bash uploader for incorrect TRAVIS_PYTHON_VERSION environment variable matching, at least until codecov/codecov-bash#133 is resolved
+  - curl -s https://codecov.io/bash > .codecov
+  - sed -i -e 's/TRAVIS_.*_VERSION/^TRAVIS_.*_VERSION=/' .codecov
+  - chmod +x .codecov
+  - if [[ $TRAVIS_PHP_VERSION == "5.6" ]]; then ./.codecov -X gcov; fi
+# - if [[ "$TRAVIS_PHP_VERSION" == "5.6" ]]; then bash <(curl -s https://codecov.io/bash); fi
diff --git a/bin/check-syntax.sh b/bin/check-syntax.sh
new file mode 100755
index 0000000..718d5d5
--- /dev/null
+++ b/bin/check-syntax.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+PHP='/usr/bin/env php'
+RETURN=0
+
+# check PHP files
+for FILE in `find config-templates hooks tests templates www -name "*.php"`; do
+    $PHP -l $FILE > /dev/null 2>&1
+    if [ $? -ne 0 ]; then
+        echo "Syntax check failed for ${FILE}"
+        RETURN=`expr ${RETURN} + 1`
+    fi
+done
+
+exit $RETURN
diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..d4062d1
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,45 @@
+{
+    "name": "simplesamlphp/simplesamlphp-module-consentadmin",
+    "description": "A module that allows users to manage their consent",
+    "type": "simplesamlphp-module",
+    "keywords": ["simplesamlphp", "consentadmin"],
+    "license": "LGPL-3.0-or-later",
+    "authors": [
+        {
+            "name": "Jacob Christiansen",
+            "email": "jach@wayf.dk"
+        },
+        {
+            "name": "Olav Morken",
+            "email": "lavmrk@gmail.com"
+        }
+    ],
+    "config": {
+        "preferred-install": {
+            "simplesamlphp/simplesamlphp": "source",
+            "*": "dist"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "SimpleSAML\\Test\\Utils\\": "vendor/simplesamlphp/simplesamlphp/tests/Utils"
+        }
+    },
+    "require": {
+        "php": ">=5.5",
+        "simplesamlphp/composer-module-installer": "~1.1",
+        "simplesamlphp/simplesamlphp-module-consent": "^1.0",
+        "webmozart/assert": "~1.4"
+    },
+    "require-dev": {
+        "simplesamlphp/simplesamlphp": "^1.17",
+        "phpunit/phpunit": "~4.8.36"
+    },
+    "extra": {
+        "ssp-mixedcase-module-name": "consentAdmin"
+    },
+    "support": {
+        "issues": "https://github.com/tvdijen/simplesamlphp-module-consentadmin/issues",
+        "source": "https://github.com/tvdijen/simplesamlphp-module-consentadmin"
+    }
+}
diff --git a/config-templates/module_consentAdmin.php b/config-templates/module_consentAdmin.php
new file mode 100644
index 0000000..9c54203
--- /dev/null
+++ b/config-templates/module_consentAdmin.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Config file for consentAdmin
+ *
+ * @author Jacob Christiansen, <jach@wayf.dk>
+ * @package SimpleSAMLphp
+ */
+$config = [
+    /*
+     * Configuration for the database connection.
+     */
+    'consentadmin'  => [
+        'consent:Database',
+        'dsn'       =>  'mysql:host=DBHOST;dbname=DBNAME',
+        'username'  =>  'USERNAME',
+        'password'  =>  'PASSWORD',
+    ],
+
+    // Hash attributes including values or not
+    'attributes.hash' => true,
+
+    // If you set attributes.exclude in the consent module, this must match
+    // 'attributes.exclude' => [],
+
+    // Where to direct the user after logout
+    // REMEMBER to prefix with http:// otherwise the relaystate is only appended
+    // to saml2 logout URL
+    'returnURL' => 'http://www.wayf.dk',
+
+    // Shows description of the services if set to true (defaults to true)
+    'showDescription' => true,
+
+    // Set authority
+    'authority' => 'saml2',
+];
diff --git a/default-enable b/default-enable
new file mode 100644
index 0000000..25615cb
--- /dev/null
+++ b/default-enable
@@ -0,0 +1,3 @@
+This file indicates that the default state of this module
+is enabled. To disable, create a file named disable in the
+same directory as this file.
diff --git a/dictionaries/consentadmin.definition.json b/dictionaries/consentadmin.definition.json
new file mode 100644
index 0000000..7864ff1
--- /dev/null
+++ b/dictionaries/consentadmin.definition.json
@@ -0,0 +1,65 @@
+{
+	"sp_empty_description": {
+		"en": "(no description)"
+	},
+	"attribute_org": {
+		"en": "Organisation"
+	},
+	"added": {
+		"en": "Consent Added"
+	},
+	"removed": {
+		"en": "Consent Removed"
+	},
+	"updated": {
+		"en": "Consent Updated"
+	},
+	"unknown": {
+		"en": "Unknown ..."
+	},
+	"attribute_id": {
+		"en": "Identity"
+	},
+	"attribute_injected": {
+		"en": "Injected attribut"
+	},
+	"show": {
+		"en": "Show"
+	},
+	"hide": {
+		"en": "Hide"
+	},
+	"attributes_text": {
+		"en": "attributes"
+	},
+	"consentadmin_header": {
+		"en": "Consent Administration"
+	},
+	"consentadmin_description1": {
+		"en": "Here you can view and edit your consent for the Service Providers."
+	},
+	"consentadmin_description2": {
+		"en": "\n<h3>How to delete your consent<\/h3>\nUncheck the box corresponding to the service provider\n\n<h3>Links<\/h3>\n<ul>\n<li><a href=\"https:\/\/www.wayf.dk\">Start<\/a> <\/li>\n\n<li><a href=\"https:\/\/www.wayf.dk\/FAQ\">FAQ<\/a> <\/li>\n<\/ul>\n"
+	},
+	"login": {
+		"en": "login"
+	},
+	"service_providers_for": {
+		"en": "Service Providers for"
+	},
+	"service_provider_header": {
+		"en": "Service Provider"
+	},
+	"status_header": {
+		"en": "Consent status"
+	},
+	"show_hide_attributes": {
+		"en": "show\/hide attributes"
+	},
+	"consentadmin_purpose": {
+		"en": "The purpose of the service is"
+	},
+	"link_consentAdmin": {
+		"en": "Consent administration"
+	}
+}
diff --git a/dictionaries/consentadmin.translation.json b/dictionaries/consentadmin.translation.json
new file mode 100644
index 0000000..fcc1ef5
--- /dev/null
+++ b/dictionaries/consentadmin.translation.json
@@ -0,0 +1,607 @@
+{
+	"sp_empty_description": {
+		"da": "(ingen beskrivelse)",
+		"no": "(ingen beskrivelse)",
+		"de": "(keine Beschreibung)",
+		"sl": "(brez opisa)",
+		"pt": "(sem descri\u00e7\u00e3o)",
+		"sv": "(ingen beskrivning)",
+		"fr": "(pas de description)",
+		"hr": "(nema opisa)",
+		"hu": "(nincs le\u00edr\u00e1s)",
+		"it": "(nessuna descrizione)",
+		"es": "(sin descripci\u00f3n)",
+		"lt": "(apib\u016bdinimas nenurodytas)",
+		"nl": "(geen omschrijving)",
+		"ja": "(\u8a18\u8ff0\u7121\u3057)",
+		"zh-tw": "(\u7121\u63cf\u8ff0)",
+		"nn": "(mangler informasjon)",
+		"et": "(kirjeldus puudub)",
+		"he": "(\u05d0\u05d9\u05df \u05ea\u05d9\u05d0\u05d5\u05e8)",
+		"zh": "\uff08\u6ca1\u6709\u63cf\u8ff0\uff09",
+		"ar": "\u0644\u0627 \u064a\u0648\u062c\u062f \u0648\u0635\u0641",
+		"lv": "(nav apraksta)",
+		"id": "(Tidak ada penjelasan)",
+		"sr": "(nema opisa)",
+		"ro": "(f\u0103r\u0103 descriere)",
+		"ru": "(\u043e\u043f\u0438\u0441\u0430\u043d\u0438\u0435 \u043e\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u0435\u0442)",
+		"cs": "(\u017e\u00e1dn\u00fd popis)",
+		"eu": "(deskribapenik gabe)",
+		"el": "(\u03c7\u03c9\u03c1\u03af\u03c2 \u03c0\u03b5\u03c1\u03b9\u03b3\u03c1\u03b1\u03c6\u03ae)"
+	},
+	"attribute_org": {
+		"da": "Organisation",
+		"no": "Organisasjon",
+		"de": "Organisation",
+		"sl": "Organizacija",
+		"pt": "Organiza\u00e7\u00e3o",
+		"sv": "Organisation",
+		"fr": "Institution",
+		"hr": "Ustanova",
+		"hu": "Int\u00e9zm\u00e9ny",
+		"it": "Organizzazione",
+		"es": "Organizaci\u00f3n",
+		"lt": "Organizacija",
+		"nl": "Organisatie",
+		"ja": "\u7d44\u7e54",
+		"zh-tw": "\u7d44\u7e54",
+		"nn": "Organisasjon",
+		"et": "Organisatsioon",
+		"he": "\u05d0\u05d9\u05e8\u05d2\u05d5\u05df",
+		"zh": "\u7ec4\u7ec7",
+		"ar": "\u0627\u0644\u0645\u0646\u0638\u0645\u0629",
+		"lv": "Organiz\u0101cija",
+		"id": "Organisasi",
+		"sr": "Institucija",
+		"ro": "Institu\u021bie",
+		"ru": "\u041e\u0440\u0433\u0430\u043d\u0438\u0437\u0430\u0446\u0438\u044f",
+		"cs": "Organizace",
+		"eu": "Erakundea",
+		"el": "\u039f\u03c1\u03b3\u03b1\u03bd\u03b9\u03c3\u03bc\u03cc\u03c2"
+	},
+	"added": {
+		"da": "Samtykke givet",
+		"no": "Samtykke gitt",
+		"de": "Einverst\u00e4ndnis hinzugef\u00fcgt",
+		"sl": "Privolitev dodana",
+		"pt": "Consentimento adicionado",
+		"sv": "Samtycke tillagt",
+		"fr": "Consentement ajout\u00e9",
+		"hr": "Dozvola dodana",
+		"hu": "Hozz\u00e1j\u00e1rul\u00e1s r\u00f6gz\u00edtve",
+		"it": "Consenso Aggiunto",
+		"es": "Consentimiento a\u00f1adido",
+		"lt": "Leidimas prid\u0117tas",
+		"ja": "\u627f\u8a8d\u304c\u8ffd\u52a0\u3055\u308c\u307e\u3057\u305f",
+		"zh-tw": "\u540c\u610f\u65b0\u589e",
+		"nn": "Samtykke lagt til",
+		"nl": "Toestemming Toegevoegd",
+		"et": "N\u00f5usolek lisatud",
+		"he": "\u05d4\u05e1\u05db\u05de\u05d4 \u05d4\u05d5\u05e1\u05e4\u05d4",
+		"zh": "\u5df2\u7ecf\u6dfb\u52a0\u7684\u8bb8\u53ef",
+		"ar": "\u062a\u0645\u062a \u0627\u0636\u0627\u0641\u0629 \u0627\u0644\u0645\u0648\u0627\u0641\u0642\u0629",
+		"lv": "Pievienotie noteikumi",
+		"id": "Consent telah ditambahkan",
+		"sr": "Dozvola dodata",
+		"ro": "Acordul a fost ad\u0103ugat",
+		"ru": "\u0421\u043e\u0433\u043b\u0430\u0441\u0438\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e",
+		"cs": "Ud\u011blen\u00e9 povolen\u00ed",
+		"eu": "Onespena gehitua",
+		"el": "\u0397 \u03c3\u03c5\u03b3\u03ba\u03b1\u03c4\u03ac\u03b8\u03b5\u03c3\u03b7 \u03c0\u03c1\u03bf\u03c3\u03c4\u03ad\u03b8\u03b7\u03ba\u03b5"
+	},
+	"removed": {
+		"da": "Samtykke slettet",
+		"no": "Samtykke trukket tilbake",
+		"de": "Einverst\u00e4ndnis entfernt",
+		"sl": "Privolitev razveljavljena",
+		"pt": "Consentimento removido",
+		"sv": "Samtycke borttaget",
+		"fr": "Consentement r\u00e9voqu\u00e9",
+		"hr": "Dozvola uklonjena",
+		"hu": "Hozz\u00e1j\u00e1rul\u00e1s visszavonva",
+		"it": "Consenso Rimosso",
+		"es": "Consentimiento eliminado",
+		"lt": "Leidimas pa\u0161alintas",
+		"ja": "\u627f\u8a8d\u304c\u524a\u9664\u3055\u308c\u307e\u3057\u305f",
+		"zh-tw": "\u540c\u610f\u79fb\u9664",
+		"nn": "Samtykke trukke tilbake",
+		"nl": "Toestemming Verwijderd",
+		"et": "N\u00f5usolek eemaldatud",
+		"he": "\u05d4\u05e1\u05db\u05de\u05d4 \u05d4\u05d5\u05e1\u05e8\u05d4",
+		"zh": "\u5df2\u7ecf\u79fb\u9664\u7684\u8bb8\u53ef",
+		"ar": "\u062a\u0645 \u062d\u0630\u0641 \u0627\u0644\u0645\u0648\u0627\u0641\u0642\u0629",
+		"lv": "No\u0146emtie noteikumi",
+		"id": "Consent telah dibuang",
+		"sr": "Dozvola uklonjena",
+		"ro": "Acordul a fost \u00eenl\u0103turat",
+		"ru": "\u0421\u043e\u0433\u043b\u0430\u0441\u0438\u0435 \u043e\u0442\u043e\u0437\u0432\u0430\u043d\u043e",
+		"cs": "Odebran\u00e9 povolen\u00ed",
+		"eu": "Onespena ezabatua",
+		"el": "\u0397 \u03c3\u03c5\u03b3\u03ba\u03b1\u03c4\u03ac\u03b8\u03b5\u03c3\u03b7 \u03b1\u03bd\u03b1\u03b9\u03c1\u03ad\u03b8\u03b7\u03ba\u03b5"
+	},
+	"updated": {
+		"da": "Samtykke Opdateret",
+		"no": "Samtykke oppdatert",
+		"de": "Einverst\u00e4ndnis aktualisiert",
+		"sl": "Privolitev posodobljena",
+		"pt": "Consentimento actualizado",
+		"sv": "Samtycke uppdaterat",
+		"fr": "Consentement mis ) jour",
+		"hr": "Dozvola a\u017eurirana",
+		"hu": "Hozz\u00e1j\u00e1rul\u00e1s friss\u00edtve",
+		"it": "Consenso Aggiornato",
+		"es": "Consentimiento actualizado",
+		"lt": "Leidimas atnaujintas",
+		"ja": "\u627f\u8a8d\u304c\u66f4\u65b0\u3055\u308c\u307e\u3057\u305f",
+		"zh-tw": "\u540c\u610f\u66f4\u65b0",
+		"nn": "Samtykke oppdatert",
+		"nl": "Toestemming Bijgewerkt",
+		"et": "N\u00f5usolek uuendatud",
+		"he": "\u05d4\u05e1\u05db\u05de\u05d4 \u05e2\u05d5\u05d3\u05db\u05e0\u05d4",
+		"zh": "\u5df2\u7ecf\u66f4\u65b0\u7684\u8bb8\u53ef",
+		"ar": "\u062a\u062d\u062f\u064a\u062b \u0627\u0644\u0645\u0648\u0627\u0641\u0642\u0629",
+		"lv": "Uzlabotie noteikumi",
+		"id": "Consent telah diupdate",
+		"sr": "Dozvola a\u017eurirana",
+		"ro": "Acordul a fost actualizat",
+		"ru": "\u0421\u043e\u0433\u043b\u0430\u0441\u0438\u0435 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u043e",
+		"cs": "Aktualizovan\u00e9 povolen\u00ed",
+		"eu": "Onespena eguneratua",
+		"el": "\u0397 \u03c3\u03c5\u03b3\u03ba\u03b1\u03c4\u03ac\u03b8\u03b5\u03c3\u03b7 \u03b5\u03bd\u03b7\u03bc\u03b5\u03c1\u03ce\u03b8\u03b7\u03ba\u03b5"
+	},
+	"unknown": {
+		"da": "Ukendt ...",
+		"no": "Ukjent...",
+		"de": "Unbekannt...",
+		"sl": "Neznan...",
+		"pt": "Desconhecido ...",
+		"sv": "Ok\u00e4nd...",
+		"fr": "Inconnu ...",
+		"hr": "Nepoznato ...",
+		"hu": "Ismeretlen ...",
+		"it": "Sconosciuto...",
+		"es": "Desconocido ...",
+		"lt": "Ne\u017einoma...",
+		"ja": "\u4e0d\u660e\u2026",
+		"zh-tw": "\u672a\u77e5...",
+		"nn": "Ukjent...",
+		"nl": "Onbekend...",
+		"et": "Tundmatu...",
+		"he": "\u05dc\u05d0 \u05d9\u05d3\u05d5\u05e2...",
+		"zh": "\u672a\u77e5...",
+		"ar": "\u063a\u064a\u0631 \u0645\u0639\u0631\u0648\u0641",
+		"lv": "Nezin\u0101ms ...",
+		"id": "Tidak diketahui...",
+		"sr": "Nepoznato ...",
+		"ro": "Necunoscut ...",
+		"ru": "\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u043e..",
+		"cs": "Nezn\u00e1m\u00fd ...",
+		"eu": "Ezezaguna...",
+		"el": "\u0386\u03b3\u03bd\u03c9\u03c3\u03c4\u03bf..."
+	},
+	"attribute_id": {
+		"da": "Identitet",
+		"no": "Identitet",
+		"de": "Identit\u00e4t",
+		"sl": "Identiteta",
+		"pt": "Identidade",
+		"sv": "Identitet",
+		"fr": "Identit\u00e9",
+		"hr": "Identitet",
+		"hu": "Azonoss\u00e1g",
+		"it": "Identit\u00e0",
+		"es": "Identidad",
+		"lt": "Tapatyb\u0117",
+		"ja": "\u8b58\u5225\u5b50",
+		"zh-tw": "\u8eab\u5206",
+		"nn": "Identitet",
+		"nl": "Identiteit",
+		"et": "Identiteet",
+		"he": "\u05d6\u05d4\u05d5\u05ea",
+		"zh": "\u8eab\u4efd",
+		"ar": "\u0627\u0644\u0647\u0648\u064a\u0629",
+		"lv": "Identit\u0101te",
+		"id": "Identitas",
+		"sr": "Identitet",
+		"ro": "Identitate",
+		"ru": "\u0418\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u043e\u043d\u043d\u0430\u044f \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f",
+		"cs": "Identita",
+		"eu": "Identitatea",
+		"el": "\u03a4\u03b1\u03c5\u03c4\u03cc\u03c4\u03b7\u03c4\u03b1"
+	},
+	"attribute_injected": {
+		"da": "Injiceret attribut",
+		"no": "Persondata lagt til",
+		"de": "Eingekoppeltes Attribut",
+		"sl": "Vrinjen atribut",
+		"pt": "Atributo injectado",
+		"sv": "Tillf\u00f6rt attribut",
+		"fr": "Attribut ajout\u00e9",
+		"hr": "Uba\u010deni atribut",
+		"hu": "Attrib\u00fatum besz\u00far\u00e1sa",
+		"it": "Attributo inserito",
+		"es": "Atributo inyectado",
+		"lt": "\u012eterptas atributas",
+		"ja": "\u633f\u5165\u3055\u308c\u305f\u5c5e\u6027",
+		"zh-tw": "\u52a0\u5165\u5c6c\u6027",
+		"nn": "Persondata lagt til",
+		"nl": "Ge\u00efnjecteerd attibuut",
+		"et": "XXXS\u00fcstitud atribuut",
+		"he": "\u05de\u05d0\u05e4\u05d9\u05d9\u05df \u05de\u05d5\u05d6\u05e8\u05e7",
+		"zh": "\u6ce8\u5165\u7684\u5c5e\u6027",
+		"ar": "\u0627\u0644\u0633\u0645\u0627\u062a \u0627\u0644\u062a\u064a \u062a\u0645 \u062a\u0642\u062f\u064a\u0645\u0647\u0627",
+		"lv": "Ievietots atrib\u016bts",
+		"id": "Attribut yang diinjeksi",
+		"sr": "Uba\u010deni atribut",
+		"ro": "Atribut introdus",
+		"ru": "\u0412\u0432\u0435\u0434\u0435\u043d\u043d\u044b\u0439 \u0430\u0442\u0440\u0438\u0431\u0443\u0442",
+		"cs": "Vlo\u017een\u00fd atribut",
+		"eu": "Atributua sartuta",
+		"el": "\u0395\u03b9\u03c3\u03b1\u03c7\u03b8\u03ad\u03bd \u03c3\u03c4\u03bf\u03b9\u03c7\u03b5\u03af\u03bf"
+	},
+	"show": {
+		"da": "Vis",
+		"no": "Vis",
+		"de": "Zeige an",
+		"sl": "Prika\u017ei",
+		"pt": "Mostrar",
+		"sv": "Visa",
+		"fr": "Voir",
+		"hr": "Prika\u017ei",
+		"hu": "Attrib\u00fatumok megjelen\u00edt\u00e9se",
+		"it": "Mostra",
+		"es": "Mostrar",
+		"lt": "Parodyti",
+		"ja": "\u8868\u793a",
+		"zh-tw": "\u986f\u793a",
+		"nn": "Vis",
+		"nl": "Bekijk",
+		"et": "N\u00e4ita",
+		"he": "\u05d4\u05e6\u05d2",
+		"zh": "\u663e\u793a",
+		"ar": "\u0627\u0638\u0647\u0627\u0631",
+		"lv": "Par\u0101d\u012bt",
+		"id": "Perlihatkan",
+		"sr": "Prika\u017ei",
+		"ro": "Arat\u0103",
+		"ru": "\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u044c",
+		"cs": "Zobrazit",
+		"eu": "Erakutsi",
+		"el": "\u0395\u03bc\u03c6\u03ac\u03bd\u03b9\u03c3\u03b7"
+	},
+	"hide": {
+		"da": "Skjul",
+		"no": "Skjul",
+		"de": "Verstecke",
+		"sl": "Skrij",
+		"pt": "Esconder",
+		"sv": "G\u00f6m",
+		"fr": "Cacher",
+		"hr": "Sakrij",
+		"hu": "Attrib\u00fatumok rejt\u00e9se",
+		"it": "Nascondi",
+		"es": "Ocultar",
+		"lt": "Pasl\u0117pti",
+		"ja": "\u975e\u8868\u793a",
+		"zh-tw": "\u96b1\u85cf",
+		"nn": "Skjul",
+		"nl": "Verberg",
+		"et": "Peida",
+		"he": "\u05d4\u05e1\u05ea\u05e8",
+		"zh": "\u9690\u85cf",
+		"ar": "\u0627\u062e\u0641\u0627\u0621",
+		"lv": "Sl\u0113pt",
+		"id": "Sembunyikan",
+		"sr": "Sakrij",
+		"ro": "Ascunde",
+		"ru": "\u0421\u043a\u0440\u044b\u0442\u044c",
+		"cs": "Skr\u00fdt",
+		"eu": "Ezkutatu",
+		"el": "\u0391\u03c0\u03cc\u03ba\u03c1\u03c5\u03c8\u03b7"
+	},
+	"attributes_text": {
+		"da": "attributter",
+		"no": "persondata",
+		"de": "Attribute",
+		"sl": "atributi",
+		"pt": "atributos",
+		"sv": "attribut",
+		"fr": "attributs",
+		"hr": "atributi",
+		"hu": ".",
+		"it": "attributi",
+		"es": "Atributos",
+		"lt": "atributai",
+		"ja": "\u5c5e\u6027",
+		"zh-tw": "\u5c6c\u6027",
+		"nn": "persondata",
+		"nl": "attributen",
+		"et": "atribuudid",
+		"he": "\u05de\u05d0\u05e4\u05d9\u05d9\u05e0\u05d9\u05dd",
+		"zh": "\u5c5e\u6027",
+		"ar": "\u0627\u0644\u0633\u0645\u0627\u062a",
+		"lv": "atrib\u016bti",
+		"id": "Attribute",
+		"sr": "atributi",
+		"ro": "atribute",
+		"ru": "\u0430\u0442\u0440\u0438\u0431\u0443\u0442\u044b",
+		"cs": "atributy",
+		"eu": "Atributuak",
+		"el": "\u03c3\u03c4\u03bf\u03b9\u03c7\u03b5\u03af\u03c9\u03bd"
+	},
+	"consentadmin_header": {
+		"da": "Administrer dine samtykker",
+		"no": "Samtykkeadministrasjon",
+		"de": "Verwaltung von Einverst\u00e4ndniserkl\u00e4rungen",
+		"sl": "Upravljanje s privolitvami",
+		"pt": "Administra\u00e7\u00e3o de Consentimento",
+		"sv": "Samtyckesadministration",
+		"fr": "Administration des consentements",
+		"hr": "Administracija dozvola",
+		"hu": "Adatkezel\u00e9si hozz\u00e1j\u00e1rul\u00e1sok kezel\u00e9se",
+		"it": "Amministrazione del consenso",
+		"es": "Administraci\u00f3n de consentimiento",
+		"lt": "Leidim\u0173 administravimas",
+		"ja": "\u627f\u8a8d\u7ba1\u7406",
+		"zh-tw": "\u7ba1\u8f44\u8a31\u53ef",
+		"nn": "Samtykkeadministrasjon",
+		"nl": "Toestemming Beheer",
+		"et": "N\u00f5usoleku administreerimine",
+		"he": "\u05de\u05e0\u05d4\u05dc \u05d4\u05e1\u05db\u05de\u05d5\u05ea\u05ea",
+		"zh": "\u7ba1\u7406\u5458\u8bb8\u53ef",
+		"ar": "\u0627\u062f\u0627\u0631\u0629 \u0627\u0644\u0645\u0648\u0627\u0641\u0642\u0629",
+		"lv": "Noteikumu administrators",
+		"id": "Administrasi Consent",
+		"sr": "Administracija dozvola",
+		"ro": "Administrarea acordurilor (consim\u021b\u0103mintelor)",
+		"ru": "\u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0441\u043e\u0433\u043b\u0430\u0441\u0438\u0435\u043c",
+		"cs": "Administrace povolen\u00ed",
+		"eu": "Onespenaren kudeaketa",
+		"el": "\u0394\u03b9\u03b1\u03c7\u03b5\u03af\u03c1\u03b9\u03c3\u03b7 \u0394\u03b7\u03bb\u03ce\u03c3\u03b5\u03c9\u03bd \u03a3\u03c5\u03b3\u03ba\u03b1\u03c4\u03ac\u03b8\u03b5\u03c3\u03b7\u03c2"
+	},
+	"consentadmin_description1": {
+		"da": "WAYF videregiver kun oplysninger til eksterne tjenester, hvis du giver dit samtykke til det. Hvilke oplysninger det drejer sig om, varierer alt efter hvad tjenesteudbyderen har behov for. Det kan for eksempel v\u00e6re:<ul><li>Dit navn<li>Din e-mail-adresse<li>Din institution<li>Etc.<\/ul>Hvis du s\u00e6tter et flueben ud for <b>Husk dette samtykke<\/b>, vil du ikke blive spurgt, n\u00e6ste gang du bes\u00f8ger tjenesteudbyderen. S\u00e5 husker WAYF, at du allerede har givet samtykke til at videregive oplysninger til tjenesteudbyderen. <p>Nedenfor er opf\u00f8rt de tjenester, som du for \u00f8jeblikket har givet l\u00f8bende samtykke til:<\/a>",
+		"no": "Her kan du se og endre dine samtykker for tjenester.",
+		"de": "Hier k\u00f6nnen Sie Ihre Einverst\u00e4ndniserkl\u00e4rungen f\u00fcr die Diensteanbieter anzeigen und bearbeiten.",
+		"sl": "Pregled in urejanje privolitev za posamezen SP.",
+		"pt": "Nesta p\u00e1gina pode ver e editar o seu consentimento dado aos Fornecedores de Servi\u00e7os.",
+		"sv": "H\u00e4r kan du se och \u00e4ndra dina samtycken f\u00f6r olika tj\u00e4nsteleverant\u00f6rer.",
+		"fr": "Vous pouvez ici voir et modifier les consentements donn\u00e9s pour les fournisseurs de service.",
+		"hr": "Ovdje mo\u017eete pregledati i mijenjati va\u0161e dozvole davateljima usluga.",
+		"hu": "Ezen az oldalon lehet szolg\u00e1ltat\u00f3nk\u00e9nt (SP) az adakezel\u00e9si hozz\u00e1j\u00e1rul\u00e1sokat megtekinteni \u00e9s m\u00f3dos\u00edtani.",
+		"it": "Qui \u00e8 possibile vedere e modificare i consensi per i vari Service Provider.",
+		"es": "Aqu\u00ed puedes visualizar y editar tu consentimiento para los proveedores de servicio",
+		"lt": "\u010cia j\u016bs galite per\u017ei\u016br\u0117ti ir keisti savo leidimus paslaug\u0173 teik\u0117jams",
+		"ja": "\u3053\u3053\u306f\u3001\u30b5\u30fc\u30d3\u30b9\u30d7\u30ed\u30d0\u30a4\u30c0\u306e\u627f\u8a8d\u3092\u8868\u793a\u3057\u305f\u308a\u7de8\u96c6\u3059\u308b\u3053\u3068\u304c\u51fa\u6765\u307e\u3059\u3002",
+		"zh-tw": "\u9019\u908a\u53ef\u4ee5\u6aa2\u8996\u53ca\u4fee\u6539\u60a8\u540c\u610f\u7684\u670d\u52d9\u63d0\u4f9b\u8005\u3002",
+		"nn": "Her kan du sj\u00e5 og endra dine samtykke til tenestene.",
+		"et": "Siin saad n\u00e4ha ja muuta teenusepakkujatega n\u00f5usolekuid.",
+		"he": "\u05db\u05d0\u05df \u05d0\u05ea\u05d4 \u05d9\u05db\u05d5\u05dc \u05dc\u05e8\u05d0\u05d5\u05ea \u05d5\u05dc\u05e2\u05e8\u05d5\u05da \u05d0\u05ea \u05d4\u05e1\u05db\u05de\u05d5\u05ea\u05da \u05dc\u05e1\u05e4\u05e7\u05d9 \u05d4\u05e9\u05d9\u05e8\u05d5\u05ea",
+		"zh": "\u5728\u8fd9\u91cc\u4f60\u53ef\u4ee5\u67e5\u770b\u548c\u7f16\u8f91\u4f60\u7684SP\u8bb8\u53ef",
+		"ar": "\u064a\u0645\u0643\u0646\u0643 \u0631\u0624\u064a\u0629 \u0648\u062a\u0639\u062f\u064a\u0644 \u0645\u0648\u0627\u0641\u0642\u062a\u0643 \u0639\u0644\u064a \u0645\u0634\u063a\u0644\u064a \u0627\u0644\u062e\u062f\u0645\u0627\u062a \u0647\u0646\u0627 ",
+		"lv": "\u0160eit J\u016bs varat apl\u016bkot un labot noteikumus priek\u0161 servisu pieg\u0101d\u0101t\u0101jiem",
+		"id": "Disini anda dapat melihat dan mengedit consent anda untuk Service Provider.",
+		"sr": "Ovde mo\u017eete pregledati i menjati va\u0161e dozvole davaocima servisa.",
+		"nl": "Hier kunt u uw verleende toestemmingen voor dienstverleners bekijken en bewerken.",
+		"ro": "Aici pute\u021bi edita acordul\/consim\u021b\u0103m\u00e2ntul dumneavoastr\u0103 pentru Furnizorii de servicii.",
+		"ru": "\u0412 \u044d\u0442\u043e\u043c \u043f\u043e\u043b\u0435 \u043c\u043e\u0436\u043d\u043e \u043f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0435\u0442\u044c \u0438 \u043e\u0442\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0442\u0435\u043a\u0441\u0442 \u0432\u0430\u0448\u0435\u0433\u043e \u0441\u043e\u0433\u043b\u0430\u0441\u0438\u044f \u0434\u043b\u044f \u0441\u0435\u0440\u0432\u0438\u0441 \u043f\u0440\u043e\u0432\u0430\u0439\u0434\u0435\u0440\u043e\u0432.",
+		"cs": "Zde m\u016f\u017eete zobrazit a upravit va\u0161e povolen\u00ed pro Poskytovatele slu\u017eeb.",
+		"eu": "Hemen, zerbitzu hornitzaileentzat onespena bistara eta edita dezakezu",
+		"el": "\u0395\u03b4\u03ce \u03bc\u03c0\u03bf\u03c1\u03b5\u03af\u03c4\u03b5 \u03bd\u03b1 \u03b4\u03b5\u03af\u03c4\u03b5 \u03ba\u03b1\u03b9 \u03bd\u03b1 \u03b5\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03c4\u03b5\u03af\u03c4\u03b5 \u03c4\u03b9\u03c2 \u03b4\u03b7\u03bb\u03ce\u03c3\u03b5\u03b9\u03c2 \u03c3\u03c5\u03b3\u03ba\u03b1\u03c4\u03ac\u03b8\u03b5\u03c3\u03ae\u03c2 \u03c3\u03b1\u03c2 \u03b3\u03b9\u03b1 \u03c4\u03bf\u03c5\u03c2 \u03c0\u03b1\u03c1\u03cc\u03c7\u03bf\u03c5\u03c2 \u03c5\u03c0\u03b7\u03c1\u03b5\u03c3\u03b9\u03ce\u03bd"
+	},
+	"consentadmin_description2": {
+		"da": "<h3>S\u00e5dan sletter du et samtykke<\/h3>Fjern fluebenet ud for tjenesten, samtykket tilh\u00f8rer.<h3>Hvilke data gemmer WAYF om dig?<\/h3><ul><li>N\u00e5r du giver dit samtykke, henter WAYF dine oplysninger fra din institution og sender de relevante videre til tjenesteudbyderen<li>Ingen af oplysningerne gemmes af WAYF<li>Hvis du har bedt WAYF huske dit samtykke, gemmes personhenf\u00f8rbare data heller ikke hos WAYF. Oplysningen om, at du har givet dit samtykke, gemmes p\u00e5 en ikke-personhenf\u00f8rbar m\u00e5de<\/ul><h3>Hvilke rettigheder har du?<\/h3>Du har ret til at tr\u00e6kke et samtykke tilbage.<h3>Hvor l\u00e6nge gemmes dine samtykker?<\/h3>Et samtykke slettes tre \u00e5r efter, at du sidst har benyttet det.<h3>Hvordan beskyttes mine oplysninger?<\/h3>WAYF foretager behandlinger af personoplysninger i henhold til persondataloven (lov nr. 429 af 31. maj 2000 med senere \u00e6ndringer). Du kan l\u00e6se n\u00e6rmere om registreredes rettigheder i persondatalovens afsnit III.<a href=\"http:\/\/www.datatilsynet.dk\/lovgivning\/persondataloven\/\">Persondataloven<\/a><h3>Links<\/h3><ul><li><a href=\"https:\/\/www.wayf.dk\">Start<\/a> <\/li><li><a href=\"https:\/\/www.wayf.dk\/index.php\/da\/om-wayf\/faq-ofte-stillede-sporgsmal\">FAQ<\/a> <\/li><\/ul>",
+		"no": "<h3>Hvordan trekke samtykke tilbake<\/h3> Fjern haken i boksen for gitte tjenestetilbyder <h3>Lenker<\/h3> <ul> <li><a href=\"https:\/\/www.wayf.dk\">Start<\/a> <\/li> <li><a href=\"https:\/\/www.wayf.dk\/index.php\/da\/om-wayf\/faq-ofte-stillede-sporgsmal\">Ofte stilte sp\u00f8rsm\u00e5l<\/a> <\/li> <\/ul> ",
+		"de": "<h3>Wie Sie Ihre Einverst\u00e4ndniserkl\u00e4rung l\u00f6schen<\/h3> Entfernen Sie das H\u00e4kchen von der Box des jeweiligen Diensteanbieters<h3>Links<\/h3><ul><li><a href=\"https:\/\/www.wayf.dk\">Start<\/a> <\/li> <li><a href=\"https:\/\/www.wayf.dk\/index.php\/en\/about-wayf\/faq-frequently-asked-questions\">FAQ<\/a> <\/li> <\/ul> ",
+		"sl": "<h3>Kako razveljavim dano privolitev?<\/h3> Odstranite kljukico pred SPjem, za katerega \u017eelite razveljaviti dano privolitev<h3>Povezave<\/h3> <ul> <li><a href=\"https:\/\/aai.arnes.si\">Start<\/a> <\/li> <li><a href=\"https:\/\/aai.arnes.si\">FAQ<\/a> <\/li> <\/ul>",
+		"pt": "<h3>Como remover o seu consentimento<\/h3> Retire a marca correspondente ao fornecedor de servi\u00e7o que pretende remover.",
+		"sv": "<h3>Hur du tar bort ditt samtycke<\/h3> Ta bort markeringen i rutan kopplad till tj\u00e4nsteleverant\u00f6ren <h3>L\u00e4nkar<\/h3> <ul> <li><a href=\"https:\/\/www.wayf.dk\">Start<\/a> <\/li> <li><a href=\"https:\/\/www.wayf.dk\/index.php\/en\/about-wayf\/faq-frequently-asked-questions\">FAQ<\/a> <\/li> <\/ul> ",
+		"fr": "<h3>Comment r\u00e9voquer un consentement<\/h3>D\u00e9cochez la case correspondante au fournisseur de service <h3>Liens<\/h3><ul><li><a href=\"https:\/\/www.wayf.dk\">Commencer<\/a><li><li><a href=\"https:\/\/www.wayf.dk\/index.php\/en\/about-wayf\/faq-frequently-asked-questions\">FAQ<\/a><\/li><\/ul> ",
+		"hr": "<h3>Kako obrisati dozvolu<\/h3> Maknite kva\u010dicu iz polja koje se odnosi na davatelja usluge <h3>Poveznice<\/h3> <ul> <li><a href=\"https:\/\/www.wayf.dk\">Po\u010detna stranica<\/a> <\/li> <li><a href=\"https:\/\/www.wayf.dk\/index.php\/en\/about-wayf\/faq-frequently-asked-questions\">Pitanja i odgovori<\/a> <\/li> <\/ul> ",
+		"hu": "<h3>Hogyan kell visszavonni egy hozz\u00e1j\u00e1rul\u00e1st?<\/h3> A szolg\u00e1ltat\u00f3hoz tartoz\u00f3 jel\u00f6l\u0151n\u00e9gyzetben sz\u00fcntesse meg a kijel\u00f6l\u00e9st!",
+		"it": "<h3>Come rimuovere il consenso><\/h3> Togliere il segno di spunta al corrispondente service provider<h3>Collegamenti<\/h3><ul><li><a href=\"https:\/\/www.wayf.dk\">Inizio<\/a><\/li><li><a href=\"https:\/\/www.wayf.dk\/index.php\/en\/about-wayf\/faq-frequently-asked-questions\">FAQ<\/a><\/li><\/ul>",
+		"es": "<h3>Como eliminar su consentimiento<\/h3> Desmarque la opci\u00f3n correspondiente al proveedor de servicios <h3>V\u00ednculos<\/h3> <ul> <li><a href=\"https:\/\/www.wayf.dk\">Inicio<\/a> <\/li> <li><a href=\"https:\/\/www.wayf.dk\/index.php\/en\/about-wayf\/faq-frequently-asked-questions\">FAQ<\/a> <\/li> <\/ul>",
+		"lt": "<h3>Kaip pa\u0161alinti savo leidim\u0105<\/h3> Panaikinkite pa\u017eym\u0117jim\u0105 ties atitinkamu paslaugos teik\u0117ju <h3>Nuorodos<\/h3> <ul> <li><a href=\"https:\/\/www.wayf.dk\">Prad\u017eia<\/a> <\/li> <li><a href=\"https:\/\/www.wayf.dk\/FAQ\">FAQ<\/a> <\/li> <\/ul> ",
+		"ja": "<h3>\u627f\u8a8d\u306e\u524a\u9664\u65b9\u6cd5<\/h3> \u8a72\u5f53\u3059\u308b\u30b5\u30fc\u30d3\u30b9\u30d7\u30ed\u30d0\u30a4\u30c0\u306e\u30c1\u30a7\u30c3\u30af\u3092\u5916\u3057\u307e\u3059\u3002<h3>\u30ea\u30f3\u30af<\/h3> <ul> <li><a href=\"https:\/\/www.wayf.dk\">Start<\/a> <\/li> <li><a href=\"https:\/\/www.wayf.dk\/index.php\/en\/about-wayf\/faq-frequently-asked-questions\">FAQ<\/a> <\/li> <\/ul> ",
+		"zh-tw": "<h3>\u5728\u9019\u522a\u9664\u60a8\u7684\u6388\u6b0a<\/h3> \u53d6\u6d88\u52fe\u9078\u670d\u52d9\u63d0\u4f9b\u8005\u5c0d\u61c9\u7684\u6838\u53d6\u65b9\u584a <h3>\u9023\u7d50<\/h3> <ul> <li><a href=\"https:\/\/www.wayf.dk\">\u958b\u59cb<\/a> <\/li> <li><a href=\"https:\/\/www.wayf.dk\/index.php\/en\/about-wayf\/faq-frequently-asked-questions\">\u8aaa\u660e<\/a> <\/li> <\/ul> ",
+		"nn": "<h3>Korleis dra tilbake samtykke<\/h3> Fjern haka i boksen for enkelte tenester <h3>Lenker<\/h3> <ul> <li><a href=\"https:\/\/www.wayf.dk\">Start<\/a> <\/li> <li><a href=\"https:\/\/www.wayf.dk\/index.php\/da\/om-wayf\/faq-ofte-stillede-sporgsmal\">Ofte stilte sp\u00f8rsm\u00e5l<\/a> <\/li> <\/ul> ",
+		"nl": "<h3>Hoe verwijdert u toestemmingen<\/h3> Vinkt u het vakje af dat overeenkomt met de dienstverlener <h3>Links<\/h3> <ul> <li><a href=\"https:\/\/www.wayf.dk\">Start<\/a> <\/li> <li><a href=\"https:\/\/www.wayf.dk\/index.php\/en\/about-wayf\/faq-frequently-asked-questions\">FAQ<\/a> <\/li> <\/ul>",
+		"et": "<h3>Kuidas eemaldada n\u00f5usolekut<\/h3> Eemalda vastava teenusepakkuja juurest m\u00e4rge <h3>Viited<\/h3> <ul> <li><a href=\"https:\/\/www.wayf.dk\">Start<\/a> <\/li> <li><a href=\"https:\/\/www.wayf.dk\/index.php\/en\/about-wayf\/faq-frequently-asked-questions\">KKK<\/a> <\/li> <\/ul>",
+		"he": "<h3>\u05d0\u05d9\u05da \u05dc\u05d4\u05e1\u05d9\u05e8 \u05d0\u05ea \u05d4\u05e1\u05db\u05de\u05ea\u05da<\/h3> \u05dc\u05d7\u05e5 \u05d1\u05ea\u05d9\u05d1\u05d4 \u05d4\u05de\u05ea\u05d0\u05d9\u05de\u05d4 \u05dc\u05e1\u05e4\u05e7 \u05d4\u05e9\u05d9\u05e8\u05d5\u05ea <h3>\u05e7\u05d9\u05e9\u05d5\u05e8\u05d9\u05dd<\/h3>  <ul> <li><a href=\"https:\/\/www.wayf.dk\">\u05d4\u05ea\u05d7\u05dc\u05d4<\/a> <\/li> <li><a href=\"https:\/\/www.wayf.dk\/index.php\/en\/about-wayf\/faq-frequently-asked-questions\">\u05e9\u05d0\u05dc\u05d5\u05ea \u05e0\u05e4\u05d5\u05e6\u05d5\u05ea<\/a> <\/li> <\/ul> ",
+		"zh": "<h3>\u5982\u4f55\u5220\u9664\u4f60\u7684\u8bb8\u53ef<\/h3>\u53cd\u9009\u76f8\u5e94\u7684SP\u9009\u62e9\u6846<h3>Links<\/h3> <ul> <li><a href=\"https:\/\/www.wayf.dk\">\u5f00\u59cb<\/a> <\/li> <li><a href=\"https:\/\/www.wayf.dk\/index.php\/en\/about-wayf\/faq-frequently-asked-questions\">FAQ<\/a> <\/li> <\/ul>",
+		"ar": "\u0644\u062d\u0630\u0641 \u0645\u0648\u0627\u0641\u0642\u062a\u0643<\/h3>\u0627\u0644\u063a\u064a  \u0635\u0646\u062f\u0648\u0642 \u0645\u0634\u063a\u0644 \u0627\u0644\u062e\u062f\u0645\u0629<h3>\u0631\u0648\u0627\u0628\u0637<\/h3> <ul> <li><a href=\"https:\/\/www.wayf.dk\">\u0623\u0628\u062f\u0627>\/a><\/li><li><ahref=\"https:\/\/www.wayf.dk\/index.php\/en\/about-wayf\/faq-frequently-asked-questions<\/a> <\/a> <\/li> <\/ul> ",
+		"lv": "<h3>K\u0101 dz\u0113st noteikumus<\/h3> Iz\u0146emiet \u0137eks\u012bti pie atbilsto\u0161\u0101 servisa pieg\u0101d\u0101t\u0101ja <h3>Saites<\/h3> <ul> <li><a href=\"https:\/\/www.wayf.dk\">S\u0101kums<\/a> <\/li> <li><a href=\"https:\/\/www.wayf.dk\/index.php\/en\/about-wayf\/faq-frequently-asked-questions\">BUJ<\/a> <\/li> <\/ul> ",
+		"id": "<h3>Bagaimana cara menghapus consent anda<\/h3> Hapus centak pada kotak service provider yang anda maksud <h3>Link<\/h3> <ul> <li><a href=\"https:\/\/www.wayf.dk\">Mulai<\/a> <\/li> <li><a href=\"https:\/\/www.wayf.dk\/index.php\/en\/about-wayf\/faq-frequently-asked-questions\">FAQ<\/a> <\/li> <\/ul>",
+		"sr": "<h3>Kako obrisati dozvolu<\/h3> Uklonite kva\u010dicu iz polja koje se odnosi na davaoca servisa <h3>Linkovi<\/h3> <ul> <li><a href=\"https:\/\/www.wayf.dk\">Po\u010detna stranica<\/a> <\/li> <li><a href=\"https:\/\/www.wayf.dk\/index.php\/en\/about-wayf\/faq-frequently-asked-questions\">Pitanja i odgovori<\/a> <\/li> <\/ul> ",
+		"ro": "<h3>Cum poate fi anulat acordul dumneavoastr\u0103<\/h3>Debifa\u021bi c\u0103su\u021ba corespunz\u0103toare furnizorului de servicii <h3>Link-uri<\/h3><ul><li><a href=\"https:\/\/www.wayf.dk\">Start<\/a><\/li><li><a href=\"https:\/\/www.wayf.dk\/FAQ\">FAQ<\/a><\/li><\/ul>",
+		"ru": "<h3>\u041a\u0430\u043a \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u0432\u0430\u0448\u0435 \u0441\u043e\u0433\u043b\u0430\u0441\u0438\u0435<\/h3> \u0421\u043d\u0438\u043c\u0438\u0442\u0435 \u0432\u044b\u0434\u0435\u043b\u0435\u043d\u0438\u0435 \u0441 \u0441\u0435\u0440\u0432\u0438\u0441 \u043f\u0440\u043e\u0432\u0430\u0439\u0434\u0435\u0440\u0430 <h3>\u0421\u0441\u044b\u043b\u043a\u0438<\/h3> <ul> <li><a href=\"https:\/\/www.wayf.dk\">Start<\/a> <\/li> <li><a href=\"https:\/\/www.wayf.dk\/FAQ\">FAQ<\/a> <\/li> <\/ul>",
+		"cs": "<h3>Jak smazat va\u0161e povolen\u00ed<\/h3> Odzna\u010dte pol\u00ed\u010dko odpov\u00eddaj\u00edc\u00ed poskytovateli slu\u017eeb <h3>Odkazy<\/h3> <ul><li><a href=\"https:\/\/www.wayf.dk\">Start<\/a><\/li><li><a href=\"https:\/\/www.wayf.dk\/FAQ\">FAQ<\/a><\/li><\/ul>",
+		"eu": "<h3>Zure onespena nola ezabatu<\/h3> Zerbitzu hornitzaileari dagokion aukerari marka kendu ezaiozu <h3>Loturak<\/h3> <ul> <li><a href=\"https:\/\/www.wayf.dk\">Haisera<\/a> <\/li> <li><a href=\"https:\/\/www.wayf.dk\/index.php\/en\/about-wayf\/faq-frequently-asked-questions\">FAQ<\/a> <\/li> <\/ul>",
+		"el": "<h3>\u03a0\u03ce\u03c2 \u03bd\u03b1 \u03b1\u03bd\u03b1\u03b9\u03c1\u03ad\u03c3\u03b5\u03c4\u03b5 \u03c4\u03b7 \u03c3\u03c5\u03b3\u03ba\u03b1\u03c4\u03ac\u03b8\u03b5\u03c3\u03ae \u03c3\u03b1\u03c2<\/h3>\u0391\u03c0\u03bf\u03b5\u03c0\u03b9\u03bb\u03ad\u03be\u03c4\u03b5 \u03c4\u03bf \u03ba\u03bf\u03c5\u03c4\u03af \u03b5\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae\u03c2 \u03c0\u03bf\u03c5 \u03b1\u03bd\u03c4\u03b9\u03c3\u03c4\u03bf\u03b9\u03c7\u03b5\u03af \u03c3\u03c4\u03bf\u03bd \u03c0\u03ac\u03c1\u03bf\u03c7\u03bf \u03c5\u03c0\u03b7\u03c1\u03b5\u03c3\u03b9\u03ce\u03bd"
+	},
+	"login": {
+		"da": "login",
+		"no": "login",
+		"de": "Anmeldung",
+		"sl": "Prijava",
+		"pt": "Entrar",
+		"sv": "Logga in",
+		"fr": "Connexion",
+		"hr": "Prijavi se",
+		"hu": "Bel\u00e9p\u00e9s",
+		"it": "connessione",
+		"es": "entrar",
+		"ja": "\u30ed\u30b0\u30a4\u30f3",
+		"lt": "Prisijungti",
+		"zh-tw": "\u767b\u5165",
+		"nn": "logg inn",
+		"nl": "login",
+		"et": "logi sisse",
+		"he": "\u05d4\u05ea\u05d7\u05d1\u05e8",
+		"zh": "\u767b\u9646",
+		"ar": "\u062a\u0633\u062c\u064a\u0644 \u0627\u0644\u062f\u062e\u0648\u0644",
+		"lv": "piesl\u0113gties",
+		"id": "login",
+		"sr": "Prijavi se",
+		"ro": "autentificare",
+		"ru": "\u0412\u0445\u043e\u0434",
+		"cs": "p\u0159ihl\u00e1\u0161en\u00ed",
+		"eu": "sartu",
+		"el": "\u03b5\u03af\u03c3\u03bf\u03b4\u03bf\u03c2"
+	},
+	"service_providers_for": {
+		"da": "Service Providers for",
+		"no": "Tjenesteleverand\u00f8rer for",
+		"de": "Diensteanbieter f\u00fcr",
+		"sl": "Ponudniki storitev za",
+		"pt": "Fornecedores de Servi\u00e7os para",
+		"sv": "Tj\u00e4nsteleverant\u00f6rer f\u00f6r",
+		"fr": "Fournisseurs de service pour",
+		"hr": "Davatelji usluga za",
+		"hu": "Szolg\u00e1ltat\u00f3",
+		"it": "Service provider per",
+		"es": "Proveedores de servicio para",
+		"ja": "\u30b5\u30fc\u30d3\u30b9\u30d7\u30ed\u30d0\u30a4\u30c0 - ",
+		"lt": "Paslaugos tiek\u0117jai",
+		"zh-tw": "\u670d\u52d9\u63d0\u4f9b\u8005\u7684",
+		"nn": "Tenesteleverand\u00f8r for ",
+		"nl": "Service Providers voor",
+		"et": "Teenusepakkujad",
+		"he": "\u05e1\u05e4\u05e7\u05d9 \u05e9\u05d9\u05e8\u05d5\u05ea \u05e2\u05d1\u05d5\u05e8",
+		"zh": "\u670d\u52a1\u63d0\u4f9b\u5546\u670d\u52a1\u4e8e",
+		"ar": "\u0645\u0634\u063a\u0644\u064a \u0627\u0644\u062e\u062f\u0645\u0629 \u0644",
+		"lv": "Servisa pieg\u0101d\u0101t\u0101ji priek\u0161",
+		"id": "Service Provider untuk",
+		"sr": "Davaoci Servisa za",
+		"ro": "Furnizori de servicii pentru",
+		"ru": "\u0421\u0435\u0440\u0432\u0438\u0441 \u043f\u0440\u043e\u0432\u0430\u0439\u0434\u0435\u0440\u044b \u0434\u043b\u044f",
+		"cs": "Poskytovatel\u00e9 slu\u017eeb pro",
+		"eu": "Zerbitzu hornitzaileak hontarako: ",
+		"el": "\u03a0\u03ac\u03c1\u03bf\u03c7\u03bf\u03b9 \u03a5\u03c0\u03b7\u03c1\u03b5\u03c3\u03b9\u03ce\u03bd \u03b3\u03b9\u03b1"
+	},
+	"service_provider_header": {
+		"da": "Service Provider",
+		"no": "Tjenesteleverand\u00f8r",
+		"de": "Diensteanbieter",
+		"sl": "Ponudnik storitve",
+		"pt": "Fornecedor de Servi\u00e7o",
+		"sv": "Tj\u00e4nsteleverant\u00f6r",
+		"fr": "Fournisseurs de service",
+		"hr": "Davatelj usluge",
+		"hu": "Szolg\u00e1ltat\u00f3",
+		"it": "Service Provider",
+		"es": "Proveedor de servicio",
+		"ja": "\u30b5\u30fc\u30d3\u30b9\u30d7\u30ed\u30d0\u30a4\u30c0",
+		"lt": "Paslaugos tiek\u0117jas",
+		"zh-tw": "\u670d\u52d9\u63d0\u4f9b\u8005",
+		"nn": "Tenesteleverand\u00f8r",
+		"nl": "Service Provider",
+		"et": "Teenusepakkuja",
+		"he": "\u05e1\u05e4\u05e7 \u05e9\u05d9\u05e8\u05d5\u05ea",
+		"zh": "\u670d\u52a1\u63d0\u4f9b\u5546",
+		"ar": "\u0645\u0642\u062f\u0645 \u0627\u0644\u062e\u062f\u0645\u0629",
+		"lv": "Servisa pieg\u0101d\u0101t\u0101js",
+		"id": "Service Provider",
+		"sr": "Davalac Servisa",
+		"ro": "Furnizor de servicii",
+		"ru": "\u0421\u0435\u0440\u0432\u0438\u0441 \u043f\u0440\u043e\u0432\u0430\u0439\u0434\u0435\u0440",
+		"cs": "Poskytovatel slu\u017eeb",
+		"eu": "Zerbitzu hornitzailea",
+		"el": "\u03a0\u03ac\u03c1\u03bf\u03c7\u03bf\u03c2 \u03a5\u03c0\u03b7\u03c1\u03b5\u03c3\u03b9\u03ce\u03bd"
+	},
+	"status_header": {
+		"da": "Samtykke status",
+		"no": "Samtykke status",
+		"de": "Status der Einverst\u00e4ndniserkl\u00e4rung",
+		"sl": "Status privolitve",
+		"pt": "Consentimento",
+		"sv": "Samtyckesstatus",
+		"fr": "Statut du consentement",
+		"hr": "Stanje dozvola",
+		"hu": "Hozz\u00e1j\u00e1rul\u00e1s \u00e1llapota",
+		"it": "Stato del consenso",
+		"es": "Estado del consentimiento",
+		"ja": "\u627f\u8a8d\u30b9\u30c6\u30fc\u30bf\u30b9",
+		"lt": "Leidimo statusas",
+		"zh-tw": "\u8a31\u53ef\u72c0\u614b",
+		"nn": "Samtykkestatus",
+		"nl": "Toestemming Status",
+		"et": "N\u00f5usoleku olek",
+		"he": "\u05de\u05e6\u05d1 \u05d4\u05e1\u05db\u05de\u05d4",
+		"zh": "\u8bb8\u53ef\u72b6\u6001",
+		"ar": "\u062d\u0627\u0644\u0629 \u0627\u0644\u0645\u0648\u0627\u0641\u0642\u0629",
+		"lv": "Noteikumu statuss",
+		"id": "Status consent",
+		"sr": "Stanje dozvole",
+		"ro": "Stare acord (consim\u021b\u0103m\u00e2nt)",
+		"ru": "\u0421\u0442\u0430\u0442\u0443\u0441 \u0441\u043e\u0433\u043b\u0430\u0441\u0438\u044f",
+		"cs": "Stav povolen\u00ed",
+		"eu": "Onespenaren egoera",
+		"el": "\u039a\u03b1\u03c4\u03ac\u03c3\u03c4\u03b1\u03c3\u03b7 \u03c3\u03c5\u03b3\u03ba\u03b1\u03c4\u03ac\u03b8\u03b5\u03c3\u03b7\u03c2"
+	},
+	"show_hide_attributes": {
+		"da": "vis\/skjul attributter",
+		"no": "vis\/skjul persondata",
+		"de": "Attribute anzeigen\/verstecken",
+		"sl": "Prika\u017ei\/Skrij atribute",
+		"pt": "mostrar\/esconder atributos",
+		"sv": "visa\/g\u00f6m attribut",
+		"fr": "voir\/cacher les attributs",
+		"hr": "prika\u017ei\/sakrij atribute",
+		"hu": "Attrib\u00fatumok megjelen\u00edt\u00e9se\/rejt\u00e9se",
+		"it": "Mostra\/nascondi attributi",
+		"es": "Mostrar\/ocultar atributos",
+		"ja": "\u8868\u793a\/\u975e\u8868\u793a\u5c5e\u6027",
+		"lt": "Rodyti\/sl\u0117pti atributus",
+		"zh-tw": "\u986f\u793a\/\u96b1\u85cf\u5c6c\u6027",
+		"nn": "vis\/skjul personinformasjon",
+		"nl": "bekijk\/verberg attributen",
+		"et": "n\u00e4ita\/peida atribuudid",
+		"he": "\u05d4\u05e8\u05d0\u05d4\\\u05d4\u05e1\u05ea\u05e8 \u05de\u05d0\u05e4\u05d9\u05d9\u05e0\u05d9\u05dd",
+		"zh": "\u663e\u793a\/\u9690\u85cf\u5c5e\u6027",
+		"ar": "\u0627\u0638\u0647\u0631\/ \u0627\u062e\u0641\u064a \u0627\u0644\u0633\u0645\u0627\u062a",
+		"lv": "r\u0101d\u012b\u0161anas\/sl\u0113p\u0161anas atrib\u016bti",
+		"id": "Tunjukkan\/sembunyikan attribute",
+		"sr": "prika\u017ei\/sakrij atribute",
+		"ro": "arat\u0103\/ascunde atributele",
+		"ru": "\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u044c\/\u0441\u043a\u0440\u044b\u0442\u044c \u0430\u0442\u0440\u0438\u0431\u0443\u0442\u044b",
+		"cs": "zobrazit\/skr\u00fdt atributy",
+		"eu": "erakutsi\/ezkutatu atributuak",
+		"el": "\u03b5\u03bc\u03c6\u03ac\u03bd\u03b9\u03c3\u03b7\/\u03b1\u03c0\u03cc\u03ba\u03c1\u03c5\u03c8\u03b7 \u03c3\u03c4\u03bf\u03b9\u03c7\u03b5\u03af\u03c9\u03bd"
+	},
+	"consentadmin_purpose": {
+		"da": "Form\u00e5let med tjenesten er",
+		"no": "Hensikten med denne tjenesten er",
+		"de": "Der Zweck dieses Dienstes ist",
+		"sl": "Namen storitve: ",
+		"pt": "Este servi\u00e7o destina-se a",
+		"sv": "Systet med tj\u00e4nsten \u00e4r",
+		"fr": "L'objet de ce service est",
+		"hr": "Namjena ovog servisa je",
+		"hu": "A szolg\u00e1ltat\u00e1s le\u00edr\u00e1sa",
+		"it": "Lo scopo di questo servizio \u00e8",
+		"es": "El prop\u00f3sito del servicio es",
+		"ja": "\u30b5\u30fc\u30d3\u30b9\u306e\u76ee\u7684: ",
+		"lt": "Paslaugos paskirtis yra",
+		"zh-tw": "\u6b64\u9805\u670d\u52d9\u7684\u76ee\u7684\u70ba",
+		"nn": "Form\u00e5let med tenesta er",
+		"nl": "Het nut van de server is",
+		"et": "Selle teenuse eesm\u00e4rk on",
+		"he": "\u05de\u05d8\u05e8\u05ea \u05d4\u05e9\u05d9\u05e8\u05d5\u05ea \u05d4\u05d9\u05d0",
+		"zh": "\u8be5\u670d\u52a1\u7684\u7528\u9014",
+		"ar": "\u063a\u0631\u0636 \u0627\u0644\u062e\u062f\u0645\u0629 \u0647\u0648",
+		"lv": "\u0160\u012b servisa nol\u016bks ir",
+		"id": "Tujuan dari layanan ini adalah",
+		"sr": "Namena ovog servisa je",
+		"ro": "Scopul acestui serviciu este",
+		"ru": "\u0426\u0435\u043b\u044c\u044e \u0441\u0435\u0440\u0432\u0438\u0441\u0430 \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f",
+		"cs": "\u00da\u010del slu\u017eby je",
+		"eu": "Zerbitzuaren xedea hau da",
+		"el": "\u039f \u03c3\u03ba\u03bf\u03c0\u03cc\u03c2 \u03c4\u03b7\u03c2 \u03c5\u03c0\u03b7\u03c1\u03b5\u03c3\u03af\u03b1\u03c2 \u03b5\u03af\u03bd\u03b1\u03b9"
+	},
+	"link_consentAdmin": {
+		"es": "Administración del consentimiento",
+		"no": "Samtykke administrasjon",
+		"nn": "Samtykke administrasjon"
+	}
+}
diff --git a/docs/consentAdmin.md b/docs/consentAdmin.md
new file mode 100644
index 0000000..1dc342e
--- /dev/null
+++ b/docs/consentAdmin.md
@@ -0,0 +1,77 @@
+Installing and configuring the consentAdmin module
+==================================================
+
+The consentAdmin module is an addon to the consent module. This means that
+you can not use consentAdmin without the consent module. If you have not
+installed and configured the consent module, please do.
+
+  * [How to install and configure the consent module](./consent:consent)
+ 
+The consentAdmin module only works when the consent module is using a 
+database to store the consents.
+
+Setting up the consentAdmin module
+----------------------------------
+
+The first thing you need to do is to enable the consentAdmin module:
+
+    touch modules/consentAdmin/enable
+
+Next you need to copy the module config file to the config directory:
+
+    cp modules/consentAdmin/config-templates/module_config.php config
+
+Then you will need to set up the database. The consentAdmin uses the same
+table as the consent module, but you still need the set the correct
+credentials in the config file. Example:
+
+	'consentadmin'  => array(
+		'consent:Database',
+		'dsn'		=>	'mysql:host=sql.uninett.no;dbname=andreas_consent',
+		'username'	=>	'simplesaml', 
+		'password'	=>	'sdfsdf',
+	),
+
+Notice that credentials usualy is the same as for the consent module, but
+can be different.
+
+Go to the frontpage of your SimpleSAMLphp installation. A link to the
+consentAdmin module has been added to the frontpage.
+
+Setting optional parameters
+---------------------------
+
+In order to make the consentAdmin module work together with the consent
+module correctly, you need to set the configuration 'attributes.hash'
+according to the value of 'includeValues' configuration in the consent
+module. Likewise, if you've used the 'attributes.exclude' configuration
+option in the consent module, you should also set the 'attributes.exclude'
+configuration option here to match.
+
+You should also set the 'returnURL' configuration in order to pass on your
+users when the press the 'Logout' link.
+
+What does consentAdmin do
+-------------------------
+
+When logging into the consentAdmin module, you will be presented with a list
+of all services connected to the IdP together with at checkbox indicating
+whether the user has given consent to the given service. By clicking the
+'Show attributes', you will be presented with a list of attributes that are
+released to the service, when the user is accessing that service.
+consentAdmin are running the processing filters that have been defined for
+each service.
+ConsentAdmin will not show services that consent has been disabled for in
+the consent module.
+
+Processing filters
+------------------
+
+The call to these filters are made with an isPassive request, with means that
+no filter is allowed to make userinteraction. 
+
+It is up to the developers of the filters to respect the isPassive request.
+The prefered thing to do is to make your setup so that only filters that
+modify attributes is run. Othervise it is recommended that developers of
+filters to throw a 'NoPassive' exception, if the filter can not run without
+userinteraction.
diff --git a/hooks/hook_configpage.php b/hooks/hook_configpage.php
new file mode 100644
index 0000000..fc9384f
--- /dev/null
+++ b/hooks/hook_configpage.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Hook to add the consentAdmin module to the config page.
+ *
+ * @param \SimpleSAML\XHTML\Template $template The template that we should alter in this hook.
+ * @return void
+ */
+function consentAdmin_hook_configpage(\SimpleSAML\XHTML\Template &$template)
+{
+    $template->data['links']['consentAdmin'] = [
+        'href' => SimpleSAML\Module::getModuleURL('consentAdmin/consentAdmin.php'),
+        'text' => \SimpleSAML\Locale\Translate::noop('Consent administration'),
+    ];
+    $template->getLocalization()->addModuleDomain('consentAdmin');
+}
diff --git a/hooks/hook_frontpage.php b/hooks/hook_frontpage.php
new file mode 100644
index 0000000..5059384
--- /dev/null
+++ b/hooks/hook_frontpage.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * Hook to add the consentAdmin module to the frontpage.
+ *
+ * @param array &$links  The links on the frontpage, split into sections.
+ * @return void
+ */
+function consentAdmin_hook_frontpage(&$links)
+{
+    assert(is_array($links));
+    assert(array_key_exists('links', $links));
+
+    $links['config'][] = [
+        'href' => SimpleSAML\Module::getModuleURL('consentAdmin/consentAdmin.php'),
+        'text' => '{consentAdmin:consentadmin:link_consentAdmin}',
+    ];
+}
+
diff --git a/locales/ar/LC_MESSAGES/consentAdmin.po b/locales/ar/LC_MESSAGES/consentAdmin.po
new file mode 100644
index 0000000..d778277
--- /dev/null
+++ b/locales/ar/LC_MESSAGES/consentAdmin.po
@@ -0,0 +1,157 @@
+
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: SimpleSAMLphp 1.15\n"
+"Report-Msgid-Bugs-To: simplesamlphp-translation@googlegroups.com\n"
+"POT-Creation-Date: 2016-10-12 09:23+0200\n"
+"PO-Revision-Date: 2016-10-14 12:14+0200\n"
+"Last-Translator: \n"
+"Language: ar\n"
+"Language-Team: \n"
+"Plural-Forms: nplurals=6; plural=(n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n>=3 "
+"&& n<=10 ? 3 : n>=11 && n<=99 ? 4 : 5)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.3.4\n"
+
+msgid "{consentAdmin:consentadmin:status_header}"
+msgstr "حالة الموافقة"
+
+msgid "{consentAdmin:consentadmin:attributes_text}"
+msgstr "السمات"
+
+msgid "{consentAdmin:consentadmin:service_provider_header}"
+msgstr "مقدم الخدمة"
+
+msgid "{consentAdmin:consentadmin:removed}"
+msgstr "تم حذف الموافقة"
+
+msgid "{consentAdmin:consentadmin:consentadmin_header}"
+msgstr "ادارة الموافقة"
+
+msgid "{consentAdmin:consentadmin:show}"
+msgstr "اظهار"
+
+msgid "{consentAdmin:consentadmin:attribute_org}"
+msgstr "المنظمة"
+
+msgid "{consentAdmin:consentadmin:attribute_injected}"
+msgstr "السمات التي تم تقديمها"
+
+msgid "{consentAdmin:consentadmin:show_hide_attributes}"
+msgstr "اظهر/ اخفي السمات"
+
+msgid "{consentAdmin:consentadmin:consentadmin_purpose}"
+msgstr "غرض الخدمة هو"
+
+msgid "{consentAdmin:consentadmin:hide}"
+msgstr "اخفاء"
+
+msgid "{consentAdmin:consentadmin:sp_empty_description}"
+msgstr "لا يوجد وصف"
+
+msgid "{consentAdmin:consentadmin:service_providers_for}"
+msgstr "مشغلي الخدمة ل"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description2}"
+msgstr ""
+"لحذف موافقتك</h3>الغي  صندوق مشغل الخدمة<h3>روابط</h3> <ul> <li><a "
+"href=\"https://www.wayf.dk\">أبدا>/a></li><li><ahref=\"https://www.wayf.dk/index.php/en"
+"/about-wayf/faq-frequently-asked-questions</a> </a> </li> </ul> "
+
+msgid "{consentAdmin:consentadmin:login}"
+msgstr "تسجيل الدخول"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description1}"
+msgstr "يمكنك رؤية وتعديل موافقتك علي مشغلي الخدمات هنا "
+
+msgid "{consentAdmin:consentadmin:updated}"
+msgstr "تحديث الموافقة"
+
+msgid "{consentAdmin:consentadmin:unknown}"
+msgstr "غير معروف"
+
+msgid "{consentAdmin:consentadmin:added}"
+msgstr "تمت اضافة الموافقة"
+
+msgid "{consentAdmin:consentadmin:attribute_id}"
+msgstr "الهوية"
+
+msgid "Injected attribut"
+msgstr "السمات التي تم تقديمها"
+
+msgid "Show"
+msgstr "اظهار"
+
+msgid "Consent Added"
+msgstr "تمت اضافة الموافقة"
+
+msgid "Consent Administration"
+msgstr "ادارة الموافقة"
+
+msgid "Here you can view and edit your consent for the Service Providers."
+msgstr "يمكنك رؤية وتعديل موافقتك علي مشغلي الخدمات هنا "
+
+msgid "Unknown ..."
+msgstr "غير معروف"
+
+msgid "Identity"
+msgstr "الهوية"
+
+msgid "The purpose of the service is"
+msgstr "غرض الخدمة هو"
+
+msgid "Hide"
+msgstr "اخفاء"
+
+msgid "Service Provider"
+msgstr "مقدم الخدمة"
+
+msgid "Service Providers for"
+msgstr "مشغلي الخدمة ل"
+
+msgid "login"
+msgstr "تسجيل الدخول"
+
+msgid "(name not specified)"
+msgstr "الاسم غير محدد"
+
+msgid "Consent Updated"
+msgstr "تحديث الموافقة"
+
+msgid "Consent status"
+msgstr "حالة الموافقة"
+
+msgid "(no description)"
+msgstr "لا يوجد وصف"
+
+msgid "attributes"
+msgstr "السمات"
+
+msgid ""
+"\n"
+"<h3>How to delete your consent</h3>\n"
+"Uncheck the box corresponding to the service provider\n"
+"\n"
+"<h3>Links</h3>\n"
+"<ul>\n"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
+"\n"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
+"</ul>\n"
+msgstr ""
+"لحذف موافقتك</h3>الغي  صندوق مشغل الخدمة<h3>روابط</h3> <ul> <li><a "
+"href=\"https://www.wayf.dk\">أبدا>/a></li><li><ahref=\"https://www.wayf.dk/index.php/en"
+"/about-wayf/faq-frequently-asked-questions</a> </a> </li> </ul> "
+
+msgid "Consent Removed"
+msgstr "تم حذف الموافقة"
+
+msgid "show/hide attributes"
+msgstr "اظهر/ اخفي السمات"
+
+msgid "Organisation"
+msgstr "المنظمة"
+
diff --git a/locales/cs/LC_MESSAGES/consentAdmin.po b/locales/cs/LC_MESSAGES/consentAdmin.po
new file mode 100644
index 0000000..42b3f52
--- /dev/null
+++ b/locales/cs/LC_MESSAGES/consentAdmin.po
@@ -0,0 +1,159 @@
+
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: SimpleSAMLphp 1.15\n"
+"Report-Msgid-Bugs-To: simplesamlphp-translation@googlegroups.com\n"
+"POT-Creation-Date: 2016-10-12 09:23+0200\n"
+"PO-Revision-Date: 2016-10-14 12:14+0200\n"
+"Last-Translator: \n"
+"Language: cs\n"
+"Language-Team: \n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.3.4\n"
+
+msgid "{consentAdmin:consentadmin:status_header}"
+msgstr "Stav povolení"
+
+msgid "{consentAdmin:consentadmin:attributes_text}"
+msgstr "atributy"
+
+msgid "{consentAdmin:consentadmin:service_provider_header}"
+msgstr "Poskytovatel služeb"
+
+msgid "{consentAdmin:consentadmin:removed}"
+msgstr "Odebrané povolení"
+
+msgid "{consentAdmin:consentadmin:consentadmin_header}"
+msgstr "Administrace povolení"
+
+msgid "{consentAdmin:consentadmin:show}"
+msgstr "Zobrazit"
+
+msgid "{consentAdmin:consentadmin:attribute_org}"
+msgstr "Organizace"
+
+msgid "{consentAdmin:consentadmin:attribute_injected}"
+msgstr "Vložený atribut"
+
+msgid "{consentAdmin:consentadmin:show_hide_attributes}"
+msgstr "zobrazit/skrýt atributy"
+
+msgid "{consentAdmin:consentadmin:consentadmin_purpose}"
+msgstr "Účel služby je"
+
+msgid "{consentAdmin:consentadmin:hide}"
+msgstr "Skrýt"
+
+msgid "{consentAdmin:consentadmin:sp_empty_description}"
+msgstr "(žádný popis)"
+
+msgid "{consentAdmin:consentadmin:service_providers_for}"
+msgstr "Poskytovatelé služeb pro"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description2}"
+msgstr ""
+"<h3>Jak smazat vaše povolení</h3> Odznačte políčko odpovídající "
+"poskytovateli služeb <h3>Odkazy</h3> <ul><li><a "
+"href=\"https://www.wayf.dk\">Start</a></li><li><a "
+"href=\"https://www.wayf.dk/FAQ\">FAQ</a></li></ul>"
+
+msgid "{consentAdmin:consentadmin:login}"
+msgstr "přihlášení"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description1}"
+msgstr "Zde můžete zobrazit a upravit vaše povolení pro Poskytovatele služeb."
+
+msgid "{consentAdmin:consentadmin:updated}"
+msgstr "Aktualizované povolení"
+
+msgid "{consentAdmin:consentadmin:unknown}"
+msgstr "Neznámý ..."
+
+msgid "{consentAdmin:consentadmin:added}"
+msgstr "Udělené povolení"
+
+msgid "{consentAdmin:consentadmin:attribute_id}"
+msgstr "Identita"
+
+msgid "Injected attribut"
+msgstr "Vložený atribut"
+
+msgid "Show"
+msgstr "Zobrazit"
+
+msgid "Consent Added"
+msgstr "Udělené povolení"
+
+msgid "Consent Administration"
+msgstr "Administrace povolení"
+
+msgid "Here you can view and edit your consent for the Service Providers."
+msgstr "Zde můžete zobrazit a upravit vaše povolení pro Poskytovatele služeb."
+
+msgid "Unknown ..."
+msgstr "Neznámý ..."
+
+msgid "Identity"
+msgstr "Identita"
+
+msgid "The purpose of the service is"
+msgstr "Účel služby je"
+
+msgid "Hide"
+msgstr "Skrýt"
+
+msgid "Service Provider"
+msgstr "Poskytovatel služeb"
+
+msgid "Service Providers for"
+msgstr "Poskytovatelé služeb pro"
+
+msgid "login"
+msgstr "přihlášení"
+
+msgid "(name not specified)"
+msgstr "(jméno nespecifikováno)"
+
+msgid "Consent Updated"
+msgstr "Aktualizované povolení"
+
+msgid "Consent status"
+msgstr "Stav povolení"
+
+msgid "(no description)"
+msgstr "(žádný popis)"
+
+msgid "attributes"
+msgstr "atributy"
+
+msgid ""
+"\n"
+"<h3>How to delete your consent</h3>\n"
+"Uncheck the box corresponding to the service provider\n"
+"\n"
+"<h3>Links</h3>\n"
+"<ul>\n"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
+"\n"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
+"</ul>\n"
+msgstr ""
+"<h3>Jak smazat vaše povolení</h3> Odznačte políčko odpovídající "
+"poskytovateli služeb <h3>Odkazy</h3> <ul><li><a "
+"href=\"https://www.wayf.dk\">Start</a></li><li><a "
+"href=\"https://www.wayf.dk/FAQ\">FAQ</a></li></ul>"
+
+msgid "Consent Removed"
+msgstr "Odebrané povolení"
+
+msgid "show/hide attributes"
+msgstr "zobrazit/skrýt atributy"
+
+msgid "Organisation"
+msgstr "Organizace"
+
diff --git a/locales/da/LC_MESSAGES/consentAdmin.po b/locales/da/LC_MESSAGES/consentAdmin.po
new file mode 100644
index 0000000..bdd2573
--- /dev/null
+++ b/locales/da/LC_MESSAGES/consentAdmin.po
@@ -0,0 +1,204 @@
+
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: SimpleSAMLphp 1.15\n"
+"Report-Msgid-Bugs-To: simplesamlphp-translation@googlegroups.com\n"
+"POT-Creation-Date: 2016-10-12 09:23+0200\n"
+"PO-Revision-Date: 2016-10-14 12:14+0200\n"
+"Last-Translator: \n"
+"Language: da\n"
+"Language-Team: \n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.3.4\n"
+
+msgid "{consentAdmin:consentadmin:status_header}"
+msgstr "Samtykke status"
+
+msgid "{consentAdmin:consentadmin:attributes_text}"
+msgstr "attributter"
+
+msgid "{consentAdmin:consentadmin:service_provider_header}"
+msgstr "Service Provider"
+
+msgid "{consentAdmin:consentadmin:removed}"
+msgstr "Samtykke slettet"
+
+msgid "{consentAdmin:consentadmin:consentadmin_header}"
+msgstr "Administrer dine samtykker"
+
+msgid "{consentAdmin:consentadmin:show}"
+msgstr "Vis"
+
+msgid "{consentAdmin:consentadmin:attribute_org}"
+msgstr "Organisation"
+
+msgid "{consentAdmin:consentadmin:attribute_injected}"
+msgstr "Injiceret attribut"
+
+msgid "{consentAdmin:consentadmin:show_hide_attributes}"
+msgstr "vis/skjul attributter"
+
+msgid "{consentAdmin:consentadmin:consentadmin_purpose}"
+msgstr "Formålet med tjenesten er"
+
+msgid "{consentAdmin:consentadmin:hide}"
+msgstr "Skjul"
+
+msgid "{consentAdmin:consentadmin:sp_empty_description}"
+msgstr "(ingen beskrivelse)"
+
+msgid "{consentAdmin:consentadmin:service_providers_for}"
+msgstr "Service Providers for"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description2}"
+msgstr ""
+"<h3>Sådan sletter du et samtykke</h3>Fjern fluebenet ud for tjenesten, "
+"samtykket tilhører.<h3>Hvilke data gemmer WAYF om dig?</h3><ul><li>Når du"
+" giver dit samtykke, henter WAYF dine oplysninger fra din institution og "
+"sender de relevante videre til tjenesteudbyderen<li>Ingen af "
+"oplysningerne gemmes af WAYF<li>Hvis du har bedt WAYF huske dit samtykke,"
+" gemmes personhenførbare data heller ikke hos WAYF. Oplysningen om, at du"
+" har givet dit samtykke, gemmes på en ikke-personhenførbar "
+"måde</ul><h3>Hvilke rettigheder har du?</h3>Du har ret til at trække et "
+"samtykke tilbage.<h3>Hvor længe gemmes dine samtykker?</h3>Et samtykke "
+"slettes tre år efter, at du sidst har benyttet det.<h3>Hvordan beskyttes "
+"mine oplysninger?</h3>WAYF foretager behandlinger af personoplysninger i "
+"henhold til persondataloven (lov nr. 429 af 31. maj 2000 med senere "
+"ændringer). Du kan læse nærmere om registreredes rettigheder i "
+"persondatalovens afsnit III.<a "
+"href=\"http://www.datatilsynet.dk/lovgivning/persondataloven/\">Persondataloven</a><h3>Links</h3><ul><li><a"
+" href=\"https://www.wayf.dk\">Start</a> </li><li><a "
+"href=\"https://www.wayf.dk/index.php/da/om-wayf/faq-ofte-stillede-"
+"sporgsmal\">FAQ</a> </li></ul>"
+
+msgid "{consentAdmin:consentadmin:login}"
+msgstr "login"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description1}"
+msgstr ""
+"WAYF videregiver kun oplysninger til eksterne tjenester, hvis du giver "
+"dit samtykke til det. Hvilke oplysninger det drejer sig om, varierer alt "
+"efter hvad tjenesteudbyderen har behov for. Det kan for eksempel "
+"være:<ul><li>Dit navn<li>Din e-mail-adresse<li>Din "
+"institution<li>Etc.</ul>Hvis du sætter et flueben ud for <b>Husk dette "
+"samtykke</b>, vil du ikke blive spurgt, næste gang du besøger "
+"tjenesteudbyderen. Så husker WAYF, at du allerede har givet samtykke til "
+"at videregive oplysninger til tjenesteudbyderen. <p>Nedenfor er opført de"
+" tjenester, som du for øjeblikket har givet løbende samtykke til:</a>"
+
+msgid "{consentAdmin:consentadmin:updated}"
+msgstr "Samtykke Opdateret"
+
+msgid "{consentAdmin:consentadmin:unknown}"
+msgstr "Ukendt ..."
+
+msgid "{consentAdmin:consentadmin:added}"
+msgstr "Samtykke givet"
+
+msgid "{consentAdmin:consentadmin:attribute_id}"
+msgstr "Identitet"
+
+msgid "Injected attribut"
+msgstr "Injiceret attribut"
+
+msgid "Show"
+msgstr "Vis"
+
+msgid "Consent Added"
+msgstr "Samtykke givet"
+
+msgid "Consent Administration"
+msgstr "Administrer dine samtykker"
+
+msgid "Here you can view and edit your consent for the Service Providers."
+msgstr ""
+"WAYF videregiver kun oplysninger til eksterne tjenester, hvis du giver "
+"dit samtykke til det. Hvilke oplysninger det drejer sig om, varierer alt "
+"efter hvad tjenesteudbyderen har behov for. Det kan for eksempel "
+"være:<ul><li>Dit navn<li>Din e-mail-adresse<li>Din "
+"institution<li>Etc.</ul>Hvis du sætter et flueben ud for <b>Husk dette "
+"samtykke</b>, vil du ikke blive spurgt, næste gang du besøger "
+"tjenesteudbyderen. Så husker WAYF, at du allerede har givet samtykke til "
+"at videregive oplysninger til tjenesteudbyderen. <p>Nedenfor er opført de"
+" tjenester, som du for øjeblikket har givet løbende samtykke til:</a>"
+
+msgid "Unknown ..."
+msgstr "Ukendt ..."
+
+msgid "Identity"
+msgstr "Identitet"
+
+msgid "The purpose of the service is"
+msgstr "Formålet med tjenesten er"
+
+msgid "Hide"
+msgstr "Skjul"
+
+msgid "Service Provider"
+msgstr "Service Provider"
+
+msgid "Service Providers for"
+msgstr "Service Providers for"
+
+msgid "login"
+msgstr "login"
+
+msgid "(name not specified)"
+msgstr "(navn ikke angivet)"
+
+msgid "Consent Updated"
+msgstr "Samtykke Opdateret"
+
+msgid "Consent status"
+msgstr "Samtykke status"
+
+msgid "(no description)"
+msgstr "(ingen beskrivelse)"
+
+msgid "attributes"
+msgstr "attributter"
+
+msgid ""
+"\n"
+"<h3>How to delete your consent</h3>\n"
+"Uncheck the box corresponding to the service provider\n"
+"\n"
+"<h3>Links</h3>\n"
+"<ul>\n"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
+"\n"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
+"</ul>\n"
+msgstr ""
+"<h3>Sådan sletter du et samtykke</h3>Fjern fluebenet ud for tjenesten, "
+"samtykket tilhører.<h3>Hvilke data gemmer WAYF om dig?</h3><ul><li>Når du"
+" giver dit samtykke, henter WAYF dine oplysninger fra din institution og "
+"sender de relevante videre til tjenesteudbyderen<li>Ingen af "
+"oplysningerne gemmes af WAYF<li>Hvis du har bedt WAYF huske dit samtykke,"
+" gemmes personhenførbare data heller ikke hos WAYF. Oplysningen om, at du"
+" har givet dit samtykke, gemmes på en ikke-personhenførbar "
+"måde</ul><h3>Hvilke rettigheder har du?</h3>Du har ret til at trække et "
+"samtykke tilbage.<h3>Hvor længe gemmes dine samtykker?</h3>Et samtykke "
+"slettes tre år efter, at du sidst har benyttet det.<h3>Hvordan beskyttes "
+"mine oplysninger?</h3>WAYF foretager behandlinger af personoplysninger i "
+"henhold til persondataloven (lov nr. 429 af 31. maj 2000 med senere "
+"ændringer). Du kan læse nærmere om registreredes rettigheder i "
+"persondatalovens afsnit III.<a "
+"href=\"http://www.datatilsynet.dk/lovgivning/persondataloven/\">Persondataloven</a><h3>Links</h3><ul><li><a"
+" href=\"https://www.wayf.dk\">Start</a> </li><li><a "
+"href=\"https://www.wayf.dk/index.php/da/om-wayf/faq-ofte-stillede-"
+"sporgsmal\">FAQ</a> </li></ul>"
+
+msgid "Consent Removed"
+msgstr "Samtykke slettet"
+
+msgid "show/hide attributes"
+msgstr "vis/skjul attributter"
+
+msgid "Organisation"
+msgstr "Organisation"
+
diff --git a/locales/de/LC_MESSAGES/consentAdmin.po b/locales/de/LC_MESSAGES/consentAdmin.po
new file mode 100644
index 0000000..72b0ae0
--- /dev/null
+++ b/locales/de/LC_MESSAGES/consentAdmin.po
@@ -0,0 +1,166 @@
+
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: SimpleSAMLphp 1.15\n"
+"Report-Msgid-Bugs-To: simplesamlphp-translation@googlegroups.com\n"
+"POT-Creation-Date: 2016-10-12 09:23+0200\n"
+"PO-Revision-Date: 2016-10-14 12:14+0200\n"
+"Last-Translator: \n"
+"Language: de\n"
+"Language-Team: \n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.3.4\n"
+
+msgid "{consentAdmin:consentadmin:status_header}"
+msgstr "Status der Einverständniserklärung"
+
+msgid "{consentAdmin:consentadmin:attributes_text}"
+msgstr "Attribute"
+
+msgid "{consentAdmin:consentadmin:service_provider_header}"
+msgstr "Diensteanbieter"
+
+msgid "{consentAdmin:consentadmin:removed}"
+msgstr "Einverständnis entfernt"
+
+msgid "{consentAdmin:consentadmin:consentadmin_header}"
+msgstr "Verwaltung von Einverständniserklärungen"
+
+msgid "{consentAdmin:consentadmin:show}"
+msgstr "Zeige an"
+
+msgid "{consentAdmin:consentadmin:attribute_org}"
+msgstr "Organisation"
+
+msgid "{consentAdmin:consentadmin:attribute_injected}"
+msgstr "Eingekoppeltes Attribut"
+
+msgid "{consentAdmin:consentadmin:show_hide_attributes}"
+msgstr "Attribute anzeigen/verstecken"
+
+msgid "{consentAdmin:consentadmin:consentadmin_purpose}"
+msgstr "Der Zweck dieses Dienstes ist"
+
+msgid "{consentAdmin:consentadmin:hide}"
+msgstr "Verstecke"
+
+msgid "{consentAdmin:consentadmin:sp_empty_description}"
+msgstr "(keine Beschreibung)"
+
+msgid "{consentAdmin:consentadmin:service_providers_for}"
+msgstr "Diensteanbieter für"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description2}"
+msgstr ""
+"<h3>Wie Sie Ihre Einverständniserklärung löschen</h3> Entfernen Sie das "
+"Häkchen von der Box des jeweiligen "
+"Diensteanbieters<h3>Links</h3><ul><li><a "
+"href=\"https://www.wayf.dk\">Start</a> </li> <li><a "
+"href=\"https://www.wayf.dk/index.php/en/about-wayf/faq-frequently-asked-"
+"questions\">FAQ</a> </li> </ul> "
+
+msgid "{consentAdmin:consentadmin:login}"
+msgstr "Anmeldung"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description1}"
+msgstr ""
+"Hier können Sie Ihre Einverständniserklärungen für die Diensteanbieter "
+"anzeigen und bearbeiten."
+
+msgid "{consentAdmin:consentadmin:updated}"
+msgstr "Einverständnis aktualisiert"
+
+msgid "{consentAdmin:consentadmin:unknown}"
+msgstr "Unbekannt..."
+
+msgid "{consentAdmin:consentadmin:added}"
+msgstr "Einverständnis hinzugefügt"
+
+msgid "{consentAdmin:consentadmin:attribute_id}"
+msgstr "Identität"
+
+msgid "Injected attribut"
+msgstr "Eingekoppeltes Attribut"
+
+msgid "Show"
+msgstr "Zeige an"
+
+msgid "Consent Added"
+msgstr "Einverständnis hinzugefügt"
+
+msgid "Consent Administration"
+msgstr "Verwaltung von Einverständniserklärungen"
+
+msgid "Here you can view and edit your consent for the Service Providers."
+msgstr ""
+"Hier können Sie Ihre Einverständniserklärungen für die Diensteanbieter "
+"anzeigen und bearbeiten."
+
+msgid "Unknown ..."
+msgstr "Unbekannt..."
+
+msgid "Identity"
+msgstr "Identität"
+
+msgid "The purpose of the service is"
+msgstr "Der Zweck dieses Dienstes ist"
+
+msgid "Hide"
+msgstr "Verstecke"
+
+msgid "Service Provider"
+msgstr "Diensteanbieter"
+
+msgid "Service Providers for"
+msgstr "Diensteanbieter für"
+
+msgid "login"
+msgstr "Anmeldung"
+
+msgid "(name not specified)"
+msgstr "(Name nicht angegeben)"
+
+msgid "Consent Updated"
+msgstr "Einverständnis aktualisiert"
+
+msgid "Consent status"
+msgstr "Status der Einverständniserklärung"
+
+msgid "(no description)"
+msgstr "(keine Beschreibung)"
+
+msgid "attributes"
+msgstr "Attribute"
+
+msgid ""
+"\n"
+"<h3>How to delete your consent</h3>\n"
+"Uncheck the box corresponding to the service provider\n"
+"\n"
+"<h3>Links</h3>\n"
+"<ul>\n"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
+"\n"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
+"</ul>\n"
+msgstr ""
+"<h3>Wie Sie Ihre Einverständniserklärung löschen</h3> Entfernen Sie das "
+"Häkchen von der Box des jeweiligen "
+"Diensteanbieters<h3>Links</h3><ul><li><a "
+"href=\"https://www.wayf.dk\">Start</a> </li> <li><a "
+"href=\"https://www.wayf.dk/index.php/en/about-wayf/faq-frequently-asked-"
+"questions\">FAQ</a> </li> </ul> "
+
+msgid "Consent Removed"
+msgstr "Einverständnis entfernt"
+
+msgid "show/hide attributes"
+msgstr "Attribute anzeigen/verstecken"
+
+msgid "Organisation"
+msgstr "Organisation"
+
diff --git a/locales/el/LC_MESSAGES/consentAdmin.po b/locales/el/LC_MESSAGES/consentAdmin.po
new file mode 100644
index 0000000..15e128a
--- /dev/null
+++ b/locales/el/LC_MESSAGES/consentAdmin.po
@@ -0,0 +1,158 @@
+
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: SimpleSAMLphp 1.15\n"
+"Report-Msgid-Bugs-To: simplesamlphp-translation@googlegroups.com\n"
+"POT-Creation-Date: 2016-10-12 09:23+0200\n"
+"PO-Revision-Date: 2016-10-14 12:14+0200\n"
+"Last-Translator: \n"
+"Language: el\n"
+"Language-Team: \n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.3.4\n"
+
+msgid "{consentAdmin:consentadmin:status_header}"
+msgstr "Κατάσταση συγκατάθεσης"
+
+msgid "{consentAdmin:consentadmin:attributes_text}"
+msgstr "στοιχείων"
+
+msgid "{consentAdmin:consentadmin:service_provider_header}"
+msgstr "Πάροχος Υπηρεσιών"
+
+msgid "{consentAdmin:consentadmin:removed}"
+msgstr "Η συγκατάθεση αναιρέθηκε"
+
+msgid "{consentAdmin:consentadmin:consentadmin_header}"
+msgstr "Διαχείριση Δηλώσεων Συγκατάθεσης"
+
+msgid "{consentAdmin:consentadmin:show}"
+msgstr "Εμφάνιση"
+
+msgid "{consentAdmin:consentadmin:attribute_org}"
+msgstr "Οργανισμός"
+
+msgid "{consentAdmin:consentadmin:attribute_injected}"
+msgstr "Εισαχθέν στοιχείο"
+
+msgid "{consentAdmin:consentadmin:show_hide_attributes}"
+msgstr "εμφάνιση/απόκρυψη στοιχείων"
+
+msgid "{consentAdmin:consentadmin:consentadmin_purpose}"
+msgstr "Ο σκοπός της υπηρεσίας είναι"
+
+msgid "{consentAdmin:consentadmin:hide}"
+msgstr "Απόκρυψη"
+
+msgid "{consentAdmin:consentadmin:sp_empty_description}"
+msgstr "(χωρίς περιγραφή)"
+
+msgid "{consentAdmin:consentadmin:service_providers_for}"
+msgstr "Πάροχοι Υπηρεσιών για"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description2}"
+msgstr ""
+"<h3>Πώς να αναιρέσετε τη συγκατάθεσή σας</h3>Αποεπιλέξτε το κουτί "
+"επιλογής που αντιστοιχεί στον πάροχο υπηρεσιών"
+
+msgid "{consentAdmin:consentadmin:login}"
+msgstr "είσοδος"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description1}"
+msgstr ""
+"Εδώ μπορείτε να δείτε και να επεξεργαστείτε τις δηλώσεις συγκατάθεσής σας"
+" για τους παρόχους υπηρεσιών"
+
+msgid "{consentAdmin:consentadmin:updated}"
+msgstr "Η συγκατάθεση ενημερώθηκε"
+
+msgid "{consentAdmin:consentadmin:unknown}"
+msgstr "Άγνωστο..."
+
+msgid "{consentAdmin:consentadmin:added}"
+msgstr "Η συγκατάθεση προστέθηκε"
+
+msgid "{consentAdmin:consentadmin:attribute_id}"
+msgstr "Ταυτότητα"
+
+msgid "Injected attribut"
+msgstr "Εισαχθέν στοιχείο"
+
+msgid "Show"
+msgstr "Εμφάνιση"
+
+msgid "Consent Added"
+msgstr "Η συγκατάθεση προστέθηκε"
+
+msgid "Consent Administration"
+msgstr "Διαχείριση Δηλώσεων Συγκατάθεσης"
+
+msgid "Here you can view and edit your consent for the Service Providers."
+msgstr ""
+"Εδώ μπορείτε να δείτε και να επεξεργαστείτε τις δηλώσεις συγκατάθεσής σας"
+" για τους παρόχους υπηρεσιών"
+
+msgid "Unknown ..."
+msgstr "Άγνωστο..."
+
+msgid "Identity"
+msgstr "Ταυτότητα"
+
+msgid "The purpose of the service is"
+msgstr "Ο σκοπός της υπηρεσίας είναι"
+
+msgid "Hide"
+msgstr "Απόκρυψη"
+
+msgid "Service Provider"
+msgstr "Πάροχος Υπηρεσιών"
+
+msgid "Service Providers for"
+msgstr "Πάροχοι Υπηρεσιών για"
+
+msgid "login"
+msgstr "είσοδος"
+
+msgid "(name not specified)"
+msgstr "(χωρίς όνομα)"
+
+msgid "Consent Updated"
+msgstr "Η συγκατάθεση ενημερώθηκε"
+
+msgid "Consent status"
+msgstr "Κατάσταση συγκατάθεσης"
+
+msgid "(no description)"
+msgstr "(χωρίς περιγραφή)"
+
+msgid "attributes"
+msgstr "στοιχείων"
+
+msgid ""
+"\n"
+"<h3>How to delete your consent</h3>\n"
+"Uncheck the box corresponding to the service provider\n"
+"\n"
+"<h3>Links</h3>\n"
+"<ul>\n"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
+"\n"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
+"</ul>\n"
+msgstr ""
+"<h3>Πώς να αναιρέσετε τη συγκατάθεσή σας</h3>Αποεπιλέξτε το κουτί "
+"επιλογής που αντιστοιχεί στον πάροχο υπηρεσιών"
+
+msgid "Consent Removed"
+msgstr "Η συγκατάθεση αναιρέθηκε"
+
+msgid "show/hide attributes"
+msgstr "εμφάνιση/απόκρυψη στοιχείων"
+
+msgid "Organisation"
+msgstr "Οργανισμός"
+
diff --git a/locales/en/LC_MESSAGES/consentAdmin.po b/locales/en/LC_MESSAGES/consentAdmin.po
new file mode 100644
index 0000000..8d8ec9a
--- /dev/null
+++ b/locales/en/LC_MESSAGES/consentAdmin.po
@@ -0,0 +1,173 @@
+
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: SimpleSAMLphp 1.15\n"
+"Report-Msgid-Bugs-To: simplesamlphp-translation@googlegroups.com\n"
+"POT-Creation-Date: 2016-10-12 09:23+0200\n"
+"PO-Revision-Date: 2016-10-14 12:14+0200\n"
+"Last-Translator: \n"
+"Language: en\n"
+"Language-Team: \n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.3.4\n"
+
+msgid "{consentAdmin:consentadmin:status_header}"
+msgstr "Consent status"
+
+msgid "{consentAdmin:consentadmin:attributes_text}"
+msgstr "attributes"
+
+msgid "{consentAdmin:consentadmin:service_provider_header}"
+msgstr "Service Provider"
+
+msgid "{consentAdmin:consentadmin:removed}"
+msgstr "Consent Removed"
+
+msgid "{consentAdmin:consentadmin:consentadmin_header}"
+msgstr "Consent Administration"
+
+msgid "{consentAdmin:consentadmin:show}"
+msgstr "Show"
+
+msgid "{consentAdmin:consentadmin:attribute_org}"
+msgstr "Organisation"
+
+msgid "{consentAdmin:consentadmin:attribute_injected}"
+msgstr "Injected attribut"
+
+msgid "{consentAdmin:consentadmin:show_hide_attributes}"
+msgstr "show/hide attributes"
+
+msgid "{consentAdmin:consentadmin:consentadmin_purpose}"
+msgstr "The purpose of the service is"
+
+msgid "{consentAdmin:consentadmin:hide}"
+msgstr "Hide"
+
+msgid "{consentAdmin:consentadmin:sp_empty_description}"
+msgstr "(no description)"
+
+msgid "{consentAdmin:consentadmin:service_providers_for}"
+msgstr "Service Providers for"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description2}"
+msgstr ""
+"\n"
+"<h3>How to delete your consent</h3>\n"
+"Uncheck the box corresponding to the service provider\n"
+"\n"
+"<h3>Links</h3>\n"
+"<ul>\n"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
+"\n"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
+"</ul>\n"
+
+msgid "{consentAdmin:consentadmin:login}"
+msgstr "login"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description1}"
+msgstr "Here you can view and edit your consent for the Service Providers."
+
+msgid "{consentAdmin:consentadmin:updated}"
+msgstr "Consent Updated"
+
+msgid "{consentAdmin:consentadmin:unknown}"
+msgstr "Unknown ..."
+
+msgid "{consentAdmin:consentadmin:added}"
+msgstr "Consent Added"
+
+msgid "{consentAdmin:consentadmin:attribute_id}"
+msgstr "Identity"
+
+msgid "Injected attribut"
+msgstr "Injected attribut"
+
+msgid "Show"
+msgstr "Show"
+
+msgid "Consent Added"
+msgstr "Consent Added"
+
+msgid "Consent Administration"
+msgstr "Consent Administration"
+
+msgid "Here you can view and edit your consent for the Service Providers."
+msgstr "Here you can view and edit your consent for the Service Providers."
+
+msgid "Unknown ..."
+msgstr "Unknown ..."
+
+msgid "Identity"
+msgstr "Identity"
+
+msgid "The purpose of the service is"
+msgstr "The purpose of the service is"
+
+msgid "Hide"
+msgstr "Hide"
+
+msgid "Service Provider"
+msgstr "Service Provider"
+
+msgid "Service Providers for"
+msgstr "Service Providers for"
+
+msgid "login"
+msgstr "login"
+
+msgid "(name not specified)"
+msgstr "(name not specified)"
+
+msgid "Consent Updated"
+msgstr "Consent Updated"
+
+msgid "Consent status"
+msgstr "Consent status"
+
+msgid "(no description)"
+msgstr "(no description)"
+
+msgid "attributes"
+msgstr "attributes"
+
+msgid ""
+"\n"
+"<h3>How to delete your consent</h3>\n"
+"Uncheck the box corresponding to the service provider\n"
+"\n"
+"<h3>Links</h3>\n"
+"<ul>\n"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
+"\n"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
+"</ul>\n"
+msgstr ""
+"\n"
+"<h3>How to delete your consent</h3>\n"
+"Uncheck the box corresponding to the service provider\n"
+"\n"
+"<h3>Links</h3>\n"
+"<ul>\n"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
+"\n"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
+"</ul>\n"
+
+msgid "Consent Removed"
+msgstr "Consent Removed"
+
+msgid "show/hide attributes"
+msgstr "show/hide attributes"
+
+msgid "Organisation"
+msgstr "Organisation"
+
+msgid "Consent administration"
+msgstr "Consent administration"
+
diff --git a/locales/es/LC_MESSAGES/consentAdmin.po b/locales/es/LC_MESSAGES/consentAdmin.po
new file mode 100644
index 0000000..21b4047
--- /dev/null
+++ b/locales/es/LC_MESSAGES/consentAdmin.po
@@ -0,0 +1,166 @@
+
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: SimpleSAMLphp 1.15\n"
+"Report-Msgid-Bugs-To: simplesamlphp-translation@googlegroups.com\n"
+"POT-Creation-Date: 2016-10-12 09:23+0200\n"
+"PO-Revision-Date: 2016-10-14 12:14+0200\n"
+"Last-Translator: \n"
+"Language: es\n"
+"Language-Team: \n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.3.4\n"
+
+msgid "{consentAdmin:consentadmin:status_header}"
+msgstr "Estado del consentimiento"
+
+msgid "{consentAdmin:consentadmin:attributes_text}"
+msgstr "Atributos"
+
+msgid "{consentAdmin:consentadmin:service_provider_header}"
+msgstr "Proveedor de servicio"
+
+msgid "{consentAdmin:consentadmin:removed}"
+msgstr "Consentimiento eliminado"
+
+msgid "{consentAdmin:consentadmin:consentadmin_header}"
+msgstr "Administración de consentimiento"
+
+msgid "{consentAdmin:consentadmin:show}"
+msgstr "Mostrar"
+
+msgid "{consentAdmin:consentadmin:attribute_org}"
+msgstr "Organización"
+
+msgid "{consentAdmin:consentadmin:attribute_injected}"
+msgstr "Atributo inyectado"
+
+msgid "{consentAdmin:consentadmin:show_hide_attributes}"
+msgstr "Mostrar/ocultar atributos"
+
+msgid "{consentAdmin:consentadmin:consentadmin_purpose}"
+msgstr "El propósito del servicio es"
+
+msgid "{consentAdmin:consentadmin:hide}"
+msgstr "Ocultar"
+
+msgid "{consentAdmin:consentadmin:sp_empty_description}"
+msgstr "(sin descripción)"
+
+msgid "{consentAdmin:consentadmin:service_providers_for}"
+msgstr "Proveedores de servicio para"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description2}"
+msgstr ""
+"<h3>Como eliminar su consentimiento</h3> Desmarque la opción "
+"correspondiente al proveedor de servicios <h3>Vínculos</h3> <ul> <li><a "
+"href=\"https://www.wayf.dk\">Inicio</a> </li> <li><a "
+"href=\"https://www.wayf.dk/index.php/en/about-wayf/faq-frequently-asked-"
+"questions\">FAQ</a> </li> </ul>"
+
+msgid "{consentAdmin:consentadmin:login}"
+msgstr "entrar"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description1}"
+msgstr ""
+"Aquí puedes visualizar y editar tu consentimiento para los proveedores de"
+" servicio"
+
+msgid "{consentAdmin:consentadmin:updated}"
+msgstr "Consentimiento actualizado"
+
+msgid "{consentAdmin:consentadmin:unknown}"
+msgstr "Desconocido ..."
+
+msgid "{consentAdmin:consentadmin:added}"
+msgstr "Consentimiento añadido"
+
+msgid "{consentAdmin:consentadmin:attribute_id}"
+msgstr "Identidad"
+
+msgid "Injected attribut"
+msgstr "Atributo inyectado"
+
+msgid "Show"
+msgstr "Mostrar"
+
+msgid "Consent Added"
+msgstr "Consentimiento añadido"
+
+msgid "Consent Administration"
+msgstr "Administración de consentimiento"
+
+msgid "Here you can view and edit your consent for the Service Providers."
+msgstr ""
+"Aquí puedes visualizar y editar tu consentimiento para los proveedores de"
+" servicio"
+
+msgid "Unknown ..."
+msgstr "Desconocido ..."
+
+msgid "Identity"
+msgstr "Identidad"
+
+msgid "The purpose of the service is"
+msgstr "El propósito del servicio es"
+
+msgid "Hide"
+msgstr "Ocultar"
+
+msgid "Service Provider"
+msgstr "Proveedor de servicio"
+
+msgid "Service Providers for"
+msgstr "Proveedores de servicio para"
+
+msgid "login"
+msgstr "entrar"
+
+msgid "(name not specified)"
+msgstr "(nombre no especificado)"
+
+msgid "Consent Updated"
+msgstr "Consentimiento actualizado"
+
+msgid "Consent status"
+msgstr "Estado del consentimiento"
+
+msgid "(no description)"
+msgstr "(sin descripción)"
+
+msgid "attributes"
+msgstr "Atributos"
+
+msgid ""
+"\n"
+"<h3>How to delete your consent</h3>\n"
+"Uncheck the box corresponding to the service provider\n"
+"\n"
+"<h3>Links</h3>\n"
+"<ul>\n"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
+"\n"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
+"</ul>\n"
+msgstr ""
+"<h3>Como eliminar su consentimiento</h3> Desmarque la opción "
+"correspondiente al proveedor de servicios <h3>Vínculos</h3> <ul> <li><a "
+"href=\"https://www.wayf.dk\">Inicio</a> </li> <li><a "
+"href=\"https://www.wayf.dk/index.php/en/about-wayf/faq-frequently-asked-"
+"questions\">FAQ</a> </li> </ul>"
+
+msgid "Consent Removed"
+msgstr "Consentimiento eliminado"
+
+msgid "show/hide attributes"
+msgstr "Mostrar/ocultar atributos"
+
+msgid "Organisation"
+msgstr "Organización"
+
+msgid "Consent administration"
+msgstr "Administración del consentimiento"
diff --git a/locales/et/LC_MESSAGES/consentAdmin.po b/locales/et/LC_MESSAGES/consentAdmin.po
new file mode 100644
index 0000000..4a815ad
--- /dev/null
+++ b/locales/et/LC_MESSAGES/consentAdmin.po
@@ -0,0 +1,160 @@
+
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: SimpleSAMLphp 1.15\n"
+"Report-Msgid-Bugs-To: simplesamlphp-translation@googlegroups.com\n"
+"POT-Creation-Date: 2016-10-12 09:23+0200\n"
+"PO-Revision-Date: 2016-10-14 12:14+0200\n"
+"Last-Translator: \n"
+"Language: et\n"
+"Language-Team: \n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.3.4\n"
+
+msgid "{consentAdmin:consentadmin:status_header}"
+msgstr "Nõusoleku olek"
+
+msgid "{consentAdmin:consentadmin:attributes_text}"
+msgstr "atribuudid"
+
+msgid "{consentAdmin:consentadmin:service_provider_header}"
+msgstr "Teenusepakkuja"
+
+msgid "{consentAdmin:consentadmin:removed}"
+msgstr "Nõusolek eemaldatud"
+
+msgid "{consentAdmin:consentadmin:consentadmin_header}"
+msgstr "Nõusoleku administreerimine"
+
+msgid "{consentAdmin:consentadmin:show}"
+msgstr "Näita"
+
+msgid "{consentAdmin:consentadmin:attribute_org}"
+msgstr "Organisatsioon"
+
+msgid "{consentAdmin:consentadmin:attribute_injected}"
+msgstr "XXXSüstitud atribuut"
+
+msgid "{consentAdmin:consentadmin:show_hide_attributes}"
+msgstr "näita/peida atribuudid"
+
+msgid "{consentAdmin:consentadmin:consentadmin_purpose}"
+msgstr "Selle teenuse eesmärk on"
+
+msgid "{consentAdmin:consentadmin:hide}"
+msgstr "Peida"
+
+msgid "{consentAdmin:consentadmin:sp_empty_description}"
+msgstr "(kirjeldus puudub)"
+
+msgid "{consentAdmin:consentadmin:service_providers_for}"
+msgstr "Teenusepakkujad"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description2}"
+msgstr ""
+"<h3>Kuidas eemaldada nõusolekut</h3> Eemalda vastava teenusepakkuja "
+"juurest märge <h3>Viited</h3> <ul> <li><a "
+"href=\"https://www.wayf.dk\">Start</a> </li> <li><a "
+"href=\"https://www.wayf.dk/index.php/en/about-wayf/faq-frequently-asked-"
+"questions\">KKK</a> </li> </ul>"
+
+msgid "{consentAdmin:consentadmin:login}"
+msgstr "logi sisse"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description1}"
+msgstr "Siin saad näha ja muuta teenusepakkujatega nõusolekuid."
+
+msgid "{consentAdmin:consentadmin:updated}"
+msgstr "Nõusolek uuendatud"
+
+msgid "{consentAdmin:consentadmin:unknown}"
+msgstr "Tundmatu..."
+
+msgid "{consentAdmin:consentadmin:added}"
+msgstr "Nõusolek lisatud"
+
+msgid "{consentAdmin:consentadmin:attribute_id}"
+msgstr "Identiteet"
+
+msgid "Injected attribut"
+msgstr "XXXSüstitud atribuut"
+
+msgid "Show"
+msgstr "Näita"
+
+msgid "Consent Added"
+msgstr "Nõusolek lisatud"
+
+msgid "Consent Administration"
+msgstr "Nõusoleku administreerimine"
+
+msgid "Here you can view and edit your consent for the Service Providers."
+msgstr "Siin saad näha ja muuta teenusepakkujatega nõusolekuid."
+
+msgid "Unknown ..."
+msgstr "Tundmatu..."
+
+msgid "Identity"
+msgstr "Identiteet"
+
+msgid "The purpose of the service is"
+msgstr "Selle teenuse eesmärk on"
+
+msgid "Hide"
+msgstr "Peida"
+
+msgid "Service Provider"
+msgstr "Teenusepakkuja"
+
+msgid "Service Providers for"
+msgstr "Teenusepakkujad"
+
+msgid "login"
+msgstr "logi sisse"
+
+msgid "(name not specified)"
+msgstr "(nimi määramata)"
+
+msgid "Consent Updated"
+msgstr "Nõusolek uuendatud"
+
+msgid "Consent status"
+msgstr "Nõusoleku olek"
+
+msgid "(no description)"
+msgstr "(kirjeldus puudub)"
+
+msgid "attributes"
+msgstr "atribuudid"
+
+msgid ""
+"\n"
+"<h3>How to delete your consent</h3>\n"
+"Uncheck the box corresponding to the service provider\n"
+"\n"
+"<h3>Links</h3>\n"
+"<ul>\n"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
+"\n"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
+"</ul>\n"
+msgstr ""
+"<h3>Kuidas eemaldada nõusolekut</h3> Eemalda vastava teenusepakkuja "
+"juurest märge <h3>Viited</h3> <ul> <li><a "
+"href=\"https://www.wayf.dk\">Start</a> </li> <li><a "
+"href=\"https://www.wayf.dk/index.php/en/about-wayf/faq-frequently-asked-"
+"questions\">KKK</a> </li> </ul>"
+
+msgid "Consent Removed"
+msgstr "Nõusolek eemaldatud"
+
+msgid "show/hide attributes"
+msgstr "näita/peida atribuudid"
+
+msgid "Organisation"
+msgstr "Organisatsioon"
+
diff --git a/locales/eu/LC_MESSAGES/consentAdmin.po b/locales/eu/LC_MESSAGES/consentAdmin.po
new file mode 100644
index 0000000..adeb050
--- /dev/null
+++ b/locales/eu/LC_MESSAGES/consentAdmin.po
@@ -0,0 +1,160 @@
+
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: SimpleSAMLphp 1.15\n"
+"Report-Msgid-Bugs-To: simplesamlphp-translation@googlegroups.com\n"
+"POT-Creation-Date: 2016-10-12 09:23+0200\n"
+"PO-Revision-Date: 2016-10-14 12:14+0200\n"
+"Last-Translator: \n"
+"Language: eu\n"
+"Language-Team: \n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.3.4\n"
+
+msgid "{consentAdmin:consentadmin:status_header}"
+msgstr "Onespenaren egoera"
+
+msgid "{consentAdmin:consentadmin:attributes_text}"
+msgstr "Atributuak"
+
+msgid "{consentAdmin:consentadmin:service_provider_header}"
+msgstr "Zerbitzu hornitzailea"
+
+msgid "{consentAdmin:consentadmin:removed}"
+msgstr "Onespena ezabatua"
+
+msgid "{consentAdmin:consentadmin:consentadmin_header}"
+msgstr "Onespenaren kudeaketa"
+
+msgid "{consentAdmin:consentadmin:show}"
+msgstr "Erakutsi"
+
+msgid "{consentAdmin:consentadmin:attribute_org}"
+msgstr "Erakundea"
+
+msgid "{consentAdmin:consentadmin:attribute_injected}"
+msgstr "Atributua sartuta"
+
+msgid "{consentAdmin:consentadmin:show_hide_attributes}"
+msgstr "erakutsi/ezkutatu atributuak"
+
+msgid "{consentAdmin:consentadmin:consentadmin_purpose}"
+msgstr "Zerbitzuaren xedea hau da"
+
+msgid "{consentAdmin:consentadmin:hide}"
+msgstr "Ezkutatu"
+
+msgid "{consentAdmin:consentadmin:sp_empty_description}"
+msgstr "(deskribapenik gabe)"
+
+msgid "{consentAdmin:consentadmin:service_providers_for}"
+msgstr "Zerbitzu hornitzaileak hontarako: "
+
+msgid "{consentAdmin:consentadmin:consentadmin_description2}"
+msgstr ""
+"<h3>Zure onespena nola ezabatu</h3> Zerbitzu hornitzaileari dagokion "
+"aukerari marka kendu ezaiozu <h3>Loturak</h3> <ul> <li><a "
+"href=\"https://www.wayf.dk\">Haisera</a> </li> <li><a "
+"href=\"https://www.wayf.dk/index.php/en/about-wayf/faq-frequently-asked-"
+"questions\">FAQ</a> </li> </ul>"
+
+msgid "{consentAdmin:consentadmin:login}"
+msgstr "sartu"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description1}"
+msgstr "Hemen, zerbitzu hornitzaileentzat onespena bistara eta edita dezakezu"
+
+msgid "{consentAdmin:consentadmin:updated}"
+msgstr "Onespena eguneratua"
+
+msgid "{consentAdmin:consentadmin:unknown}"
+msgstr "Ezezaguna..."
+
+msgid "{consentAdmin:consentadmin:added}"
+msgstr "Onespena gehitua"
+
+msgid "{consentAdmin:consentadmin:attribute_id}"
+msgstr "Identitatea"
+
+msgid "Injected attribut"
+msgstr "Atributua sartuta"
+
+msgid "Show"
+msgstr "Erakutsi"
+
+msgid "Consent Added"
+msgstr "Onespena gehitua"
+
+msgid "Consent Administration"
+msgstr "Onespenaren kudeaketa"
+
+msgid "Here you can view and edit your consent for the Service Providers."
+msgstr "Hemen, zerbitzu hornitzaileentzat onespena bistara eta edita dezakezu"
+
+msgid "Unknown ..."
+msgstr "Ezezaguna..."
+
+msgid "Identity"
+msgstr "Identitatea"
+
+msgid "The purpose of the service is"
+msgstr "Zerbitzuaren xedea hau da"
+
+msgid "Hide"
+msgstr "Ezkutatu"
+
+msgid "Service Provider"
+msgstr "Zerbitzu hornitzailea"
+
+msgid "Service Providers for"
+msgstr "Zerbitzu hornitzaileak hontarako: "
+
+msgid "login"
+msgstr "sartu"
+
+msgid "(name not specified)"
+msgstr "(izena ez da zehaztu)"
+
+msgid "Consent Updated"
+msgstr "Onespena eguneratua"
+
+msgid "Consent status"
+msgstr "Onespenaren egoera"
+
+msgid "(no description)"
+msgstr "(deskribapenik gabe)"
+
+msgid "attributes"
+msgstr "Atributuak"
+
+msgid ""
+"\n"
+"<h3>How to delete your consent</h3>\n"
+"Uncheck the box corresponding to the service provider\n"
+"\n"
+"<h3>Links</h3>\n"
+"<ul>\n"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
+"\n"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
+"</ul>\n"
+msgstr ""
+"<h3>Zure onespena nola ezabatu</h3> Zerbitzu hornitzaileari dagokion "
+"aukerari marka kendu ezaiozu <h3>Loturak</h3> <ul> <li><a "
+"href=\"https://www.wayf.dk\">Haisera</a> </li> <li><a "
+"href=\"https://www.wayf.dk/index.php/en/about-wayf/faq-frequently-asked-"
+"questions\">FAQ</a> </li> </ul>"
+
+msgid "Consent Removed"
+msgstr "Onespena ezabatua"
+
+msgid "show/hide attributes"
+msgstr "erakutsi/ezkutatu atributuak"
+
+msgid "Organisation"
+msgstr "Erakundea"
+
diff --git a/locales/fr/LC_MESSAGES/consentAdmin.po b/locales/fr/LC_MESSAGES/consentAdmin.po
new file mode 100644
index 0000000..65abab4
--- /dev/null
+++ b/locales/fr/LC_MESSAGES/consentAdmin.po
@@ -0,0 +1,164 @@
+
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: SimpleSAMLphp 1.15\n"
+"Report-Msgid-Bugs-To: simplesamlphp-translation@googlegroups.com\n"
+"POT-Creation-Date: 2016-10-12 09:23+0200\n"
+"PO-Revision-Date: 2016-10-14 12:14+0200\n"
+"Last-Translator: \n"
+"Language: fr\n"
+"Language-Team: \n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.3.4\n"
+
+msgid "{consentAdmin:consentadmin:status_header}"
+msgstr "Statut du consentement"
+
+msgid "{consentAdmin:consentadmin:attributes_text}"
+msgstr "attributs"
+
+msgid "{consentAdmin:consentadmin:service_provider_header}"
+msgstr "Fournisseurs de service"
+
+msgid "{consentAdmin:consentadmin:removed}"
+msgstr "Consentement révoqué"
+
+msgid "{consentAdmin:consentadmin:consentadmin_header}"
+msgstr "Administration des consentements"
+
+msgid "{consentAdmin:consentadmin:show}"
+msgstr "Voir"
+
+msgid "{consentAdmin:consentadmin:attribute_org}"
+msgstr "Institution"
+
+msgid "{consentAdmin:consentadmin:attribute_injected}"
+msgstr "Attribut ajouté"
+
+msgid "{consentAdmin:consentadmin:show_hide_attributes}"
+msgstr "voir/cacher les attributs"
+
+msgid "{consentAdmin:consentadmin:consentadmin_purpose}"
+msgstr "L'objet de ce service est"
+
+msgid "{consentAdmin:consentadmin:hide}"
+msgstr "Cacher"
+
+msgid "{consentAdmin:consentadmin:sp_empty_description}"
+msgstr "(pas de description)"
+
+msgid "{consentAdmin:consentadmin:service_providers_for}"
+msgstr "Fournisseurs de service pour"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description2}"
+msgstr ""
+"<h3>Comment révoquer un consentement</h3>Décochez la case correspondante "
+"au fournisseur de service <h3>Liens</h3><ul><li><a "
+"href=\"https://www.wayf.dk\">Commencer</a><li><li><a "
+"href=\"https://www.wayf.dk/index.php/en/about-wayf/faq-frequently-asked-"
+"questions\">FAQ</a></li></ul> "
+
+msgid "{consentAdmin:consentadmin:login}"
+msgstr "Connexion"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description1}"
+msgstr ""
+"Vous pouvez ici voir et modifier les consentements donnés pour les "
+"fournisseurs de service."
+
+msgid "{consentAdmin:consentadmin:updated}"
+msgstr "Consentement mis ) jour"
+
+msgid "{consentAdmin:consentadmin:unknown}"
+msgstr "Inconnu ..."
+
+msgid "{consentAdmin:consentadmin:added}"
+msgstr "Consentement ajouté"
+
+msgid "{consentAdmin:consentadmin:attribute_id}"
+msgstr "Identité"
+
+msgid "Injected attribut"
+msgstr "Attribut ajouté"
+
+msgid "Show"
+msgstr "Voir"
+
+msgid "Consent Added"
+msgstr "Consentement ajouté"
+
+msgid "Consent Administration"
+msgstr "Administration des consentements"
+
+msgid "Here you can view and edit your consent for the Service Providers."
+msgstr ""
+"Vous pouvez ici voir et modifier les consentements donnés pour les "
+"fournisseurs de service."
+
+msgid "Unknown ..."
+msgstr "Inconnu ..."
+
+msgid "Identity"
+msgstr "Identité"
+
+msgid "The purpose of the service is"
+msgstr "L'objet de ce service est"
+
+msgid "Hide"
+msgstr "Cacher"
+
+msgid "Service Provider"
+msgstr "Fournisseurs de service"
+
+msgid "Service Providers for"
+msgstr "Fournisseurs de service pour"
+
+msgid "login"
+msgstr "Connexion"
+
+msgid "(name not specified)"
+msgstr "(nom non indiqué)"
+
+msgid "Consent Updated"
+msgstr "Consentement mis ) jour"
+
+msgid "Consent status"
+msgstr "Statut du consentement"
+
+msgid "(no description)"
+msgstr "(pas de description)"
+
+msgid "attributes"
+msgstr "attributs"
+
+msgid ""
+"\n"
+"<h3>How to delete your consent</h3>\n"
+"Uncheck the box corresponding to the service provider\n"
+"\n"
+"<h3>Links</h3>\n"
+"<ul>\n"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
+"\n"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
+"</ul>\n"
+msgstr ""
+"<h3>Comment révoquer un consentement</h3>Décochez la case correspondante "
+"au fournisseur de service <h3>Liens</h3><ul><li><a "
+"href=\"https://www.wayf.dk\">Commencer</a><li><li><a "
+"href=\"https://www.wayf.dk/index.php/en/about-wayf/faq-frequently-asked-"
+"questions\">FAQ</a></li></ul> "
+
+msgid "Consent Removed"
+msgstr "Consentement révoqué"
+
+msgid "show/hide attributes"
+msgstr "voir/cacher les attributs"
+
+msgid "Organisation"
+msgstr "Institution"
+
diff --git a/locales/he/LC_MESSAGES/consentAdmin.po b/locales/he/LC_MESSAGES/consentAdmin.po
new file mode 100644
index 0000000..4cb1b77
--- /dev/null
+++ b/locales/he/LC_MESSAGES/consentAdmin.po
@@ -0,0 +1,158 @@
+
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: SimpleSAMLphp 1.15\n"
+"Report-Msgid-Bugs-To: simplesamlphp-translation@googlegroups.com\n"
+"POT-Creation-Date: 2016-10-12 09:23+0200\n"
+"PO-Revision-Date: 2016-10-14 12:14+0200\n"
+"Last-Translator: \n"
+"Language: he\n"
+"Language-Team: \n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.3.4\n"
+
+msgid "{consentAdmin:consentadmin:status_header}"
+msgstr "מצב הסכמה"
+
+msgid "{consentAdmin:consentadmin:attributes_text}"
+msgstr "מאפיינים"
+
+msgid "{consentAdmin:consentadmin:service_provider_header}"
+msgstr "ספק שירות"
+
+msgid "{consentAdmin:consentadmin:removed}"
+msgstr "הסכמה הוסרה"
+
+msgid "{consentAdmin:consentadmin:consentadmin_header}"
+msgstr "מנהל הסכמותת"
+
+msgid "{consentAdmin:consentadmin:show}"
+msgstr "הצג"
+
+msgid "{consentAdmin:consentadmin:attribute_org}"
+msgstr "אירגון"
+
+msgid "{consentAdmin:consentadmin:attribute_injected}"
+msgstr "מאפיין מוזרק"
+
+msgid "{consentAdmin:consentadmin:show_hide_attributes}"
+msgstr "הראה\\הסתר מאפיינים"
+
+msgid "{consentAdmin:consentadmin:consentadmin_purpose}"
+msgstr "מטרת השירות היא"
+
+msgid "{consentAdmin:consentadmin:hide}"
+msgstr "הסתר"
+
+msgid "{consentAdmin:consentadmin:sp_empty_description}"
+msgstr "(אין תיאור)"
+
+msgid "{consentAdmin:consentadmin:service_providers_for}"
+msgstr "ספקי שירות עבור"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description2}"
+msgstr ""
+"<h3>איך להסיר את הסכמתך</h3> לחץ בתיבה המתאימה לספק השירות "
+"<h3>קישורים</h3>  <ul> <li><a href=\"https://www.wayf.dk\">התחלה</a> "
+"</li> <li><a href=\"https://www.wayf.dk/index.php/en/about-wayf/faq-"
+"frequently-asked-questions\">שאלות נפוצות</a> </li> </ul> "
+
+msgid "{consentAdmin:consentadmin:login}"
+msgstr "התחבר"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description1}"
+msgstr "כאן אתה יכול לראות ולערוך את הסכמותך לספקי השירות"
+
+msgid "{consentAdmin:consentadmin:updated}"
+msgstr "הסכמה עודכנה"
+
+msgid "{consentAdmin:consentadmin:unknown}"
+msgstr "לא ידוע..."
+
+msgid "{consentAdmin:consentadmin:added}"
+msgstr "הסכמה הוספה"
+
+msgid "{consentAdmin:consentadmin:attribute_id}"
+msgstr "זהות"
+
+msgid "Injected attribut"
+msgstr "מאפיין מוזרק"
+
+msgid "Show"
+msgstr "הצג"
+
+msgid "Consent Added"
+msgstr "הסכמה הוספה"
+
+msgid "Consent Administration"
+msgstr "מנהל הסכמותת"
+
+msgid "Here you can view and edit your consent for the Service Providers."
+msgstr "כאן אתה יכול לראות ולערוך את הסכמותך לספקי השירות"
+
+msgid "Unknown ..."
+msgstr "לא ידוע..."
+
+msgid "Identity"
+msgstr "זהות"
+
+msgid "The purpose of the service is"
+msgstr "מטרת השירות היא"
+
+msgid "Hide"
+msgstr "הסתר"
+
+msgid "Service Provider"
+msgstr "ספק שירות"
+
+msgid "Service Providers for"
+msgstr "ספקי שירות עבור"
+
+msgid "login"
+msgstr "התחבר"
+
+msgid "(name not specified)"
+msgstr "(לא ניתן שם)"
+
+msgid "Consent Updated"
+msgstr "הסכמה עודכנה"
+
+msgid "Consent status"
+msgstr "מצב הסכמה"
+
+msgid "(no description)"
+msgstr "(אין תיאור)"
+
+msgid "attributes"
+msgstr "מאפיינים"
+
+msgid ""
+"\n"
+"<h3>How to delete your consent</h3>\n"
+"Uncheck the box corresponding to the service provider\n"
+"\n"
+"<h3>Links</h3>\n"
+"<ul>\n"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
+"\n"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
+"</ul>\n"
+msgstr ""
+"<h3>איך להסיר את הסכמתך</h3> לחץ בתיבה המתאימה לספק השירות "
+"<h3>קישורים</h3>  <ul> <li><a href=\"https://www.wayf.dk\">התחלה</a> "
+"</li> <li><a href=\"https://www.wayf.dk/index.php/en/about-wayf/faq-"
+"frequently-asked-questions\">שאלות נפוצות</a> </li> </ul> "
+
+msgid "Consent Removed"
+msgstr "הסכמה הוסרה"
+
+msgid "show/hide attributes"
+msgstr "הראה\\הסתר מאפיינים"
+
+msgid "Organisation"
+msgstr "אירגון"
+
diff --git a/locales/hr/LC_MESSAGES/consentAdmin.po b/locales/hr/LC_MESSAGES/consentAdmin.po
new file mode 100644
index 0000000..b7be441
--- /dev/null
+++ b/locales/hr/LC_MESSAGES/consentAdmin.po
@@ -0,0 +1,161 @@
+
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: SimpleSAMLphp 1.15\n"
+"Report-Msgid-Bugs-To: simplesamlphp-translation@googlegroups.com\n"
+"POT-Creation-Date: 2016-10-12 09:23+0200\n"
+"PO-Revision-Date: 2016-10-14 12:14+0200\n"
+"Last-Translator: \n"
+"Language: hr\n"
+"Language-Team: \n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.3.4\n"
+
+msgid "{consentAdmin:consentadmin:status_header}"
+msgstr "Stanje dozvola"
+
+msgid "{consentAdmin:consentadmin:attributes_text}"
+msgstr "atributi"
+
+msgid "{consentAdmin:consentadmin:service_provider_header}"
+msgstr "Davatelj usluge"
+
+msgid "{consentAdmin:consentadmin:removed}"
+msgstr "Dozvola uklonjena"
+
+msgid "{consentAdmin:consentadmin:consentadmin_header}"
+msgstr "Administracija dozvola"
+
+msgid "{consentAdmin:consentadmin:show}"
+msgstr "Prikaži"
+
+msgid "{consentAdmin:consentadmin:attribute_org}"
+msgstr "Ustanova"
+
+msgid "{consentAdmin:consentadmin:attribute_injected}"
+msgstr "Ubačeni atribut"
+
+msgid "{consentAdmin:consentadmin:show_hide_attributes}"
+msgstr "prikaži/sakrij atribute"
+
+msgid "{consentAdmin:consentadmin:consentadmin_purpose}"
+msgstr "Namjena ovog servisa je"
+
+msgid "{consentAdmin:consentadmin:hide}"
+msgstr "Sakrij"
+
+msgid "{consentAdmin:consentadmin:sp_empty_description}"
+msgstr "(nema opisa)"
+
+msgid "{consentAdmin:consentadmin:service_providers_for}"
+msgstr "Davatelji usluga za"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description2}"
+msgstr ""
+"<h3>Kako obrisati dozvolu</h3> Maknite kvačicu iz polja koje se odnosi na"
+" davatelja usluge <h3>Poveznice</h3> <ul> <li><a "
+"href=\"https://www.wayf.dk\">Početna stranica</a> </li> <li><a "
+"href=\"https://www.wayf.dk/index.php/en/about-wayf/faq-frequently-asked-"
+"questions\">Pitanja i odgovori</a> </li> </ul> "
+
+msgid "{consentAdmin:consentadmin:login}"
+msgstr "Prijavi se"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description1}"
+msgstr "Ovdje možete pregledati i mijenjati vaše dozvole davateljima usluga."
+
+msgid "{consentAdmin:consentadmin:updated}"
+msgstr "Dozvola ažurirana"
+
+msgid "{consentAdmin:consentadmin:unknown}"
+msgstr "Nepoznato ..."
+
+msgid "{consentAdmin:consentadmin:added}"
+msgstr "Dozvola dodana"
+
+msgid "{consentAdmin:consentadmin:attribute_id}"
+msgstr "Identitet"
+
+msgid "Injected attribut"
+msgstr "Ubačeni atribut"
+
+msgid "Show"
+msgstr "Prikaži"
+
+msgid "Consent Added"
+msgstr "Dozvola dodana"
+
+msgid "Consent Administration"
+msgstr "Administracija dozvola"
+
+msgid "Here you can view and edit your consent for the Service Providers."
+msgstr "Ovdje možete pregledati i mijenjati vaše dozvole davateljima usluga."
+
+msgid "Unknown ..."
+msgstr "Nepoznato ..."
+
+msgid "Identity"
+msgstr "Identitet"
+
+msgid "The purpose of the service is"
+msgstr "Namjena ovog servisa je"
+
+msgid "Hide"
+msgstr "Sakrij"
+
+msgid "Service Provider"
+msgstr "Davatelj usluge"
+
+msgid "Service Providers for"
+msgstr "Davatelji usluga za"
+
+msgid "login"
+msgstr "Prijavi se"
+
+msgid "(name not specified)"
+msgstr "(naziv nije specificiran)"
+
+msgid "Consent Updated"
+msgstr "Dozvola ažurirana"
+
+msgid "Consent status"
+msgstr "Stanje dozvola"
+
+msgid "(no description)"
+msgstr "(nema opisa)"
+
+msgid "attributes"
+msgstr "atributi"
+
+msgid ""
+"\n"
+"<h3>How to delete your consent</h3>\n"
+"Uncheck the box corresponding to the service provider\n"
+"\n"
+"<h3>Links</h3>\n"
+"<ul>\n"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
+"\n"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
+"</ul>\n"
+msgstr ""
+"<h3>Kako obrisati dozvolu</h3> Maknite kvačicu iz polja koje se odnosi na"
+" davatelja usluge <h3>Poveznice</h3> <ul> <li><a "
+"href=\"https://www.wayf.dk\">Početna stranica</a> </li> <li><a "
+"href=\"https://www.wayf.dk/index.php/en/about-wayf/faq-frequently-asked-"
+"questions\">Pitanja i odgovori</a> </li> </ul> "
+
+msgid "Consent Removed"
+msgstr "Dozvola uklonjena"
+
+msgid "show/hide attributes"
+msgstr "prikaži/sakrij atribute"
+
+msgid "Organisation"
+msgstr "Ustanova"
+
diff --git a/locales/hu/LC_MESSAGES/consentAdmin.po b/locales/hu/LC_MESSAGES/consentAdmin.po
new file mode 100644
index 0000000..51f0166
--- /dev/null
+++ b/locales/hu/LC_MESSAGES/consentAdmin.po
@@ -0,0 +1,158 @@
+
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: SimpleSAMLphp 1.15\n"
+"Report-Msgid-Bugs-To: simplesamlphp-translation@googlegroups.com\n"
+"POT-Creation-Date: 2016-10-12 09:23+0200\n"
+"PO-Revision-Date: 2016-10-14 12:14+0200\n"
+"Last-Translator: \n"
+"Language: hu\n"
+"Language-Team: \n"
+"Plural-Forms: nplurals=1; plural=0\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.3.4\n"
+
+msgid "{consentAdmin:consentadmin:status_header}"
+msgstr "Hozzájárulás állapota"
+
+msgid "{consentAdmin:consentadmin:attributes_text}"
+msgstr "."
+
+msgid "{consentAdmin:consentadmin:service_provider_header}"
+msgstr "Szolgáltató"
+
+msgid "{consentAdmin:consentadmin:removed}"
+msgstr "Hozzájárulás visszavonva"
+
+msgid "{consentAdmin:consentadmin:consentadmin_header}"
+msgstr "Adatkezelési hozzájárulások kezelése"
+
+msgid "{consentAdmin:consentadmin:show}"
+msgstr "Attribútumok megjelenítése"
+
+msgid "{consentAdmin:consentadmin:attribute_org}"
+msgstr "Intézmény"
+
+msgid "{consentAdmin:consentadmin:attribute_injected}"
+msgstr "Attribútum beszúrása"
+
+msgid "{consentAdmin:consentadmin:show_hide_attributes}"
+msgstr "Attribútumok megjelenítése/rejtése"
+
+msgid "{consentAdmin:consentadmin:consentadmin_purpose}"
+msgstr "A szolgáltatás leírása"
+
+msgid "{consentAdmin:consentadmin:hide}"
+msgstr "Attribútumok rejtése"
+
+msgid "{consentAdmin:consentadmin:sp_empty_description}"
+msgstr "(nincs leírás)"
+
+msgid "{consentAdmin:consentadmin:service_providers_for}"
+msgstr "Szolgáltató"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description2}"
+msgstr ""
+"<h3>Hogyan kell visszavonni egy hozzájárulást?</h3> A szolgáltatóhoz "
+"tartozó jelölőnégyzetben szüntesse meg a kijelölést!"
+
+msgid "{consentAdmin:consentadmin:login}"
+msgstr "Belépés"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description1}"
+msgstr ""
+"Ezen az oldalon lehet szolgáltatónként (SP) az adakezelési "
+"hozzájárulásokat megtekinteni és módosítani."
+
+msgid "{consentAdmin:consentadmin:updated}"
+msgstr "Hozzájárulás frissítve"
+
+msgid "{consentAdmin:consentadmin:unknown}"
+msgstr "Ismeretlen ..."
+
+msgid "{consentAdmin:consentadmin:added}"
+msgstr "Hozzájárulás rögzítve"
+
+msgid "{consentAdmin:consentadmin:attribute_id}"
+msgstr "Azonosság"
+
+msgid "Injected attribut"
+msgstr "Attribútum beszúrása"
+
+msgid "Show"
+msgstr "Attribútumok megjelenítése"
+
+msgid "Consent Added"
+msgstr "Hozzájárulás rögzítve"
+
+msgid "Consent Administration"
+msgstr "Adatkezelési hozzájárulások kezelése"
+
+msgid "Here you can view and edit your consent for the Service Providers."
+msgstr ""
+"Ezen az oldalon lehet szolgáltatónként (SP) az adakezelési "
+"hozzájárulásokat megtekinteni és módosítani."
+
+msgid "Unknown ..."
+msgstr "Ismeretlen ..."
+
+msgid "Identity"
+msgstr "Azonosság"
+
+msgid "The purpose of the service is"
+msgstr "A szolgáltatás leírása"
+
+msgid "Hide"
+msgstr "Attribútumok rejtése"
+
+msgid "Service Provider"
+msgstr "Szolgáltató"
+
+msgid "Service Providers for"
+msgstr "Szolgáltató"
+
+msgid "login"
+msgstr "Belépés"
+
+msgid "(name not specified)"
+msgstr "(nincs név)"
+
+msgid "Consent Updated"
+msgstr "Hozzájárulás frissítve"
+
+msgid "Consent status"
+msgstr "Hozzájárulás állapota"
+
+msgid "(no description)"
+msgstr "(nincs leírás)"
+
+msgid "attributes"
+msgstr "."
+
+msgid ""
+"\n"
+"<h3>How to delete your consent</h3>\n"
+"Uncheck the box corresponding to the service provider\n"
+"\n"
+"<h3>Links</h3>\n"
+"<ul>\n"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
+"\n"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
+"</ul>\n"
+msgstr ""
+"<h3>Hogyan kell visszavonni egy hozzájárulást?</h3> A szolgáltatóhoz "
+"tartozó jelölőnégyzetben szüntesse meg a kijelölést!"
+
+msgid "Consent Removed"
+msgstr "Hozzájárulás visszavonva"
+
+msgid "show/hide attributes"
+msgstr "Attribútumok megjelenítése/rejtése"
+
+msgid "Organisation"
+msgstr "Intézmény"
+
diff --git a/locales/id/LC_MESSAGES/consentAdmin.po b/locales/id/LC_MESSAGES/consentAdmin.po
new file mode 100644
index 0000000..64e517d
--- /dev/null
+++ b/locales/id/LC_MESSAGES/consentAdmin.po
@@ -0,0 +1,164 @@
+
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: SimpleSAMLphp 1.15\n"
+"Report-Msgid-Bugs-To: simplesamlphp-translation@googlegroups.com\n"
+"POT-Creation-Date: 2016-10-12 09:23+0200\n"
+"PO-Revision-Date: 2016-10-14 12:14+0200\n"
+"Last-Translator: \n"
+"Language: id\n"
+"Language-Team: \n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.3.4\n"
+
+msgid "{consentAdmin:consentadmin:status_header}"
+msgstr "Status consent"
+
+msgid "{consentAdmin:consentadmin:attributes_text}"
+msgstr "Attribute"
+
+msgid "{consentAdmin:consentadmin:service_provider_header}"
+msgstr "Service Provider"
+
+msgid "{consentAdmin:consentadmin:removed}"
+msgstr "Consent telah dibuang"
+
+msgid "{consentAdmin:consentadmin:consentadmin_header}"
+msgstr "Administrasi Consent"
+
+msgid "{consentAdmin:consentadmin:show}"
+msgstr "Perlihatkan"
+
+msgid "{consentAdmin:consentadmin:attribute_org}"
+msgstr "Organisasi"
+
+msgid "{consentAdmin:consentadmin:attribute_injected}"
+msgstr "Attribut yang diinjeksi"
+
+msgid "{consentAdmin:consentadmin:show_hide_attributes}"
+msgstr "Tunjukkan/sembunyikan attribute"
+
+msgid "{consentAdmin:consentadmin:consentadmin_purpose}"
+msgstr "Tujuan dari layanan ini adalah"
+
+msgid "{consentAdmin:consentadmin:hide}"
+msgstr "Sembunyikan"
+
+msgid "{consentAdmin:consentadmin:sp_empty_description}"
+msgstr "(Tidak ada penjelasan)"
+
+msgid "{consentAdmin:consentadmin:service_providers_for}"
+msgstr "Service Provider untuk"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description2}"
+msgstr ""
+"<h3>Bagaimana cara menghapus consent anda</h3> Hapus centak pada kotak "
+"service provider yang anda maksud <h3>Link</h3> <ul> <li><a "
+"href=\"https://www.wayf.dk\">Mulai</a> </li> <li><a "
+"href=\"https://www.wayf.dk/index.php/en/about-wayf/faq-frequently-asked-"
+"questions\">FAQ</a> </li> </ul>"
+
+msgid "{consentAdmin:consentadmin:login}"
+msgstr "login"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description1}"
+msgstr ""
+"Disini anda dapat melihat dan mengedit consent anda untuk Service "
+"Provider."
+
+msgid "{consentAdmin:consentadmin:updated}"
+msgstr "Consent telah diupdate"
+
+msgid "{consentAdmin:consentadmin:unknown}"
+msgstr "Tidak diketahui..."
+
+msgid "{consentAdmin:consentadmin:added}"
+msgstr "Consent telah ditambahkan"
+
+msgid "{consentAdmin:consentadmin:attribute_id}"
+msgstr "Identitas"
+
+msgid "Injected attribut"
+msgstr "Attribut yang diinjeksi"
+
+msgid "Show"
+msgstr "Perlihatkan"
+
+msgid "Consent Added"
+msgstr "Consent telah ditambahkan"
+
+msgid "Consent Administration"
+msgstr "Administrasi Consent"
+
+msgid "Here you can view and edit your consent for the Service Providers."
+msgstr ""
+"Disini anda dapat melihat dan mengedit consent anda untuk Service "
+"Provider."
+
+msgid "Unknown ..."
+msgstr "Tidak diketahui..."
+
+msgid "Identity"
+msgstr "Identitas"
+
+msgid "The purpose of the service is"
+msgstr "Tujuan dari layanan ini adalah"
+
+msgid "Hide"
+msgstr "Sembunyikan"
+
+msgid "Service Provider"
+msgstr "Service Provider"
+
+msgid "Service Providers for"
+msgstr "Service Provider untuk"
+
+msgid "login"
+msgstr "login"
+
+msgid "(name not specified)"
+msgstr "(Nama tidak diisi)"
+
+msgid "Consent Updated"
+msgstr "Consent telah diupdate"
+
+msgid "Consent status"
+msgstr "Status consent"
+
+msgid "(no description)"
+msgstr "(Tidak ada penjelasan)"
+
+msgid "attributes"
+msgstr "Attribute"
+
+msgid ""
+"\n"
+"<h3>How to delete your consent</h3>\n"
+"Uncheck the box corresponding to the service provider\n"
+"\n"
+"<h3>Links</h3>\n"
+"<ul>\n"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
+"\n"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
+"</ul>\n"
+msgstr ""
+"<h3>Bagaimana cara menghapus consent anda</h3> Hapus centak pada kotak "
+"service provider yang anda maksud <h3>Link</h3> <ul> <li><a "
+"href=\"https://www.wayf.dk\">Mulai</a> </li> <li><a "
+"href=\"https://www.wayf.dk/index.php/en/about-wayf/faq-frequently-asked-"
+"questions\">FAQ</a> </li> </ul>"
+
+msgid "Consent Removed"
+msgstr "Consent telah dibuang"
+
+msgid "show/hide attributes"
+msgstr "Tunjukkan/sembunyikan attribute"
+
+msgid "Organisation"
+msgstr "Organisasi"
+
diff --git a/locales/it/LC_MESSAGES/consentAdmin.po b/locales/it/LC_MESSAGES/consentAdmin.po
new file mode 100644
index 0000000..10b213d
--- /dev/null
+++ b/locales/it/LC_MESSAGES/consentAdmin.po
@@ -0,0 +1,164 @@
+
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: SimpleSAMLphp 1.15\n"
+"Report-Msgid-Bugs-To: simplesamlphp-translation@googlegroups.com\n"
+"POT-Creation-Date: 2016-10-12 09:23+0200\n"
+"PO-Revision-Date: 2016-10-14 12:14+0200\n"
+"Last-Translator: \n"
+"Language: it\n"
+"Language-Team: \n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.3.4\n"
+
+msgid "{consentAdmin:consentadmin:status_header}"
+msgstr "Stato del consenso"
+
+msgid "{consentAdmin:consentadmin:attributes_text}"
+msgstr "attributi"
+
+msgid "{consentAdmin:consentadmin:service_provider_header}"
+msgstr "Service Provider"
+
+msgid "{consentAdmin:consentadmin:removed}"
+msgstr "Consenso Rimosso"
+
+msgid "{consentAdmin:consentadmin:consentadmin_header}"
+msgstr "Amministrazione del consenso"
+
+msgid "{consentAdmin:consentadmin:show}"
+msgstr "Mostra"
+
+msgid "{consentAdmin:consentadmin:attribute_org}"
+msgstr "Organizzazione"
+
+msgid "{consentAdmin:consentadmin:attribute_injected}"
+msgstr "Attributo inserito"
+
+msgid "{consentAdmin:consentadmin:show_hide_attributes}"
+msgstr "Mostra/nascondi attributi"
+
+msgid "{consentAdmin:consentadmin:consentadmin_purpose}"
+msgstr "Lo scopo di questo servizio è"
+
+msgid "{consentAdmin:consentadmin:hide}"
+msgstr "Nascondi"
+
+msgid "{consentAdmin:consentadmin:sp_empty_description}"
+msgstr "(nessuna descrizione)"
+
+msgid "{consentAdmin:consentadmin:service_providers_for}"
+msgstr "Service provider per"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description2}"
+msgstr ""
+"<h3>Come rimuovere il consenso></h3> Togliere il segno di spunta al "
+"corrispondente service provider<h3>Collegamenti</h3><ul><li><a "
+"href=\"https://www.wayf.dk\">Inizio</a></li><li><a "
+"href=\"https://www.wayf.dk/index.php/en/about-wayf/faq-frequently-asked-"
+"questions\">FAQ</a></li></ul>"
+
+msgid "{consentAdmin:consentadmin:login}"
+msgstr "connessione"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description1}"
+msgstr ""
+"Qui è possibile vedere e modificare i consensi per i vari Service "
+"Provider."
+
+msgid "{consentAdmin:consentadmin:updated}"
+msgstr "Consenso Aggiornato"
+
+msgid "{consentAdmin:consentadmin:unknown}"
+msgstr "Sconosciuto..."
+
+msgid "{consentAdmin:consentadmin:added}"
+msgstr "Consenso Aggiunto"
+
+msgid "{consentAdmin:consentadmin:attribute_id}"
+msgstr "Identità"
+
+msgid "Injected attribut"
+msgstr "Attributo inserito"
+
+msgid "Show"
+msgstr "Mostra"
+
+msgid "Consent Added"
+msgstr "Consenso Aggiunto"
+
+msgid "Consent Administration"
+msgstr "Amministrazione del consenso"
+
+msgid "Here you can view and edit your consent for the Service Providers."
+msgstr ""
+"Qui è possibile vedere e modificare i consensi per i vari Service "
+"Provider."
+
+msgid "Unknown ..."
+msgstr "Sconosciuto..."
+
+msgid "Identity"
+msgstr "Identità"
+
+msgid "The purpose of the service is"
+msgstr "Lo scopo di questo servizio è"
+
+msgid "Hide"
+msgstr "Nascondi"
+
+msgid "Service Provider"
+msgstr "Service Provider"
+
+msgid "Service Providers for"
+msgstr "Service provider per"
+
+msgid "login"
+msgstr "connessione"
+
+msgid "(name not specified)"
+msgstr "(nome non specificato)"
+
+msgid "Consent Updated"
+msgstr "Consenso Aggiornato"
+
+msgid "Consent status"
+msgstr "Stato del consenso"
+
+msgid "(no description)"
+msgstr "(nessuna descrizione)"
+
+msgid "attributes"
+msgstr "attributi"
+
+msgid ""
+"\n"
+"<h3>How to delete your consent</h3>\n"
+"Uncheck the box corresponding to the service provider\n"
+"\n"
+"<h3>Links</h3>\n"
+"<ul>\n"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
+"\n"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
+"</ul>\n"
+msgstr ""
+"<h3>Come rimuovere il consenso></h3> Togliere il segno di spunta al "
+"corrispondente service provider<h3>Collegamenti</h3><ul><li><a "
+"href=\"https://www.wayf.dk\">Inizio</a></li><li><a "
+"href=\"https://www.wayf.dk/index.php/en/about-wayf/faq-frequently-asked-"
+"questions\">FAQ</a></li></ul>"
+
+msgid "Consent Removed"
+msgstr "Consenso Rimosso"
+
+msgid "show/hide attributes"
+msgstr "Mostra/nascondi attributi"
+
+msgid "Organisation"
+msgstr "Organizzazione"
+
diff --git a/locales/ja/LC_MESSAGES/consentAdmin.po b/locales/ja/LC_MESSAGES/consentAdmin.po
new file mode 100644
index 0000000..5a26c6a
--- /dev/null
+++ b/locales/ja/LC_MESSAGES/consentAdmin.po
@@ -0,0 +1,158 @@
+
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: SimpleSAMLphp 1.15\n"
+"Report-Msgid-Bugs-To: simplesamlphp-translation@googlegroups.com\n"
+"POT-Creation-Date: 2016-10-12 09:23+0200\n"
+"PO-Revision-Date: 2016-10-14 12:14+0200\n"
+"Last-Translator: \n"
+"Language: ja\n"
+"Language-Team: \n"
+"Plural-Forms: nplurals=1; plural=0\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.3.4\n"
+
+msgid "{consentAdmin:consentadmin:status_header}"
+msgstr "承認ステータス"
+
+msgid "{consentAdmin:consentadmin:attributes_text}"
+msgstr "属性"
+
+msgid "{consentAdmin:consentadmin:service_provider_header}"
+msgstr "サービスプロバイダ"
+
+msgid "{consentAdmin:consentadmin:removed}"
+msgstr "承認が削除されました"
+
+msgid "{consentAdmin:consentadmin:consentadmin_header}"
+msgstr "承認管理"
+
+msgid "{consentAdmin:consentadmin:show}"
+msgstr "表示"
+
+msgid "{consentAdmin:consentadmin:attribute_org}"
+msgstr "組織"
+
+msgid "{consentAdmin:consentadmin:attribute_injected}"
+msgstr "挿入された属性"
+
+msgid "{consentAdmin:consentadmin:show_hide_attributes}"
+msgstr "表示/非表示属性"
+
+msgid "{consentAdmin:consentadmin:consentadmin_purpose}"
+msgstr "サービスの目的: "
+
+msgid "{consentAdmin:consentadmin:hide}"
+msgstr "非表示"
+
+msgid "{consentAdmin:consentadmin:sp_empty_description}"
+msgstr "(記述無し)"
+
+msgid "{consentAdmin:consentadmin:service_providers_for}"
+msgstr "サービスプロバイダ - "
+
+msgid "{consentAdmin:consentadmin:consentadmin_description2}"
+msgstr ""
+"<h3>承認の削除方法</h3> 該当するサービスプロバイダのチェックを外します。<h3>リンク</h3> <ul> <li><a "
+"href=\"https://www.wayf.dk\">Start</a> </li> <li><a "
+"href=\"https://www.wayf.dk/index.php/en/about-wayf/faq-frequently-asked-"
+"questions\">FAQ</a> </li> </ul> "
+
+msgid "{consentAdmin:consentadmin:login}"
+msgstr "ログイン"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description1}"
+msgstr "ここは、サービスプロバイダの承認を表示したり編集することが出来ます。"
+
+msgid "{consentAdmin:consentadmin:updated}"
+msgstr "承認が更新されました"
+
+msgid "{consentAdmin:consentadmin:unknown}"
+msgstr "不明…"
+
+msgid "{consentAdmin:consentadmin:added}"
+msgstr "承認が追加されました"
+
+msgid "{consentAdmin:consentadmin:attribute_id}"
+msgstr "識別子"
+
+msgid "Injected attribut"
+msgstr "挿入された属性"
+
+msgid "Show"
+msgstr "表示"
+
+msgid "Consent Added"
+msgstr "承認が追加されました"
+
+msgid "Consent Administration"
+msgstr "承認管理"
+
+msgid "Here you can view and edit your consent for the Service Providers."
+msgstr "ここは、サービスプロバイダの承認を表示したり編集することが出来ます。"
+
+msgid "Unknown ..."
+msgstr "不明…"
+
+msgid "Identity"
+msgstr "識別子"
+
+msgid "The purpose of the service is"
+msgstr "サービスの目的: "
+
+msgid "Hide"
+msgstr "非表示"
+
+msgid "Service Provider"
+msgstr "サービスプロバイダ"
+
+msgid "Service Providers for"
+msgstr "サービスプロバイダ - "
+
+msgid "login"
+msgstr "ログイン"
+
+msgid "(name not specified)"
+msgstr "(名前無し)"
+
+msgid "Consent Updated"
+msgstr "承認が更新されました"
+
+msgid "Consent status"
+msgstr "承認ステータス"
+
+msgid "(no description)"
+msgstr "(記述無し)"
+
+msgid "attributes"
+msgstr "属性"
+
+msgid ""
+"\n"
+"<h3>How to delete your consent</h3>\n"
+"Uncheck the box corresponding to the service provider\n"
+"\n"
+"<h3>Links</h3>\n"
+"<ul>\n"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
+"\n"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
+"</ul>\n"
+msgstr ""
+"<h3>承認の削除方法</h3> 該当するサービスプロバイダのチェックを外します。<h3>リンク</h3> <ul> <li><a "
+"href=\"https://www.wayf.dk\">Start</a> </li> <li><a "
+"href=\"https://www.wayf.dk/index.php/en/about-wayf/faq-frequently-asked-"
+"questions\">FAQ</a> </li> </ul> "
+
+msgid "Consent Removed"
+msgstr "承認が削除されました"
+
+msgid "show/hide attributes"
+msgstr "表示/非表示属性"
+
+msgid "Organisation"
+msgstr "組織"
+
diff --git a/locales/lt/LC_MESSAGES/consentAdmin.po b/locales/lt/LC_MESSAGES/consentAdmin.po
new file mode 100644
index 0000000..7596d5e
--- /dev/null
+++ b/locales/lt/LC_MESSAGES/consentAdmin.po
@@ -0,0 +1,159 @@
+
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: SimpleSAMLphp 1.15\n"
+"Report-Msgid-Bugs-To: simplesamlphp-translation@googlegroups.com\n"
+"POT-Creation-Date: 2016-10-12 09:23+0200\n"
+"PO-Revision-Date: 2016-10-14 12:14+0200\n"
+"Last-Translator: \n"
+"Language: lt\n"
+"Language-Team: \n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"(n%100<10 || n%100>=20) ? 1 : 2)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.3.4\n"
+
+msgid "{consentAdmin:consentadmin:status_header}"
+msgstr "Leidimo statusas"
+
+msgid "{consentAdmin:consentadmin:attributes_text}"
+msgstr "atributai"
+
+msgid "{consentAdmin:consentadmin:service_provider_header}"
+msgstr "Paslaugos tiekėjas"
+
+msgid "{consentAdmin:consentadmin:removed}"
+msgstr "Leidimas pašalintas"
+
+msgid "{consentAdmin:consentadmin:consentadmin_header}"
+msgstr "Leidimų administravimas"
+
+msgid "{consentAdmin:consentadmin:show}"
+msgstr "Parodyti"
+
+msgid "{consentAdmin:consentadmin:attribute_org}"
+msgstr "Organizacija"
+
+msgid "{consentAdmin:consentadmin:attribute_injected}"
+msgstr "Įterptas atributas"
+
+msgid "{consentAdmin:consentadmin:show_hide_attributes}"
+msgstr "Rodyti/slėpti atributus"
+
+msgid "{consentAdmin:consentadmin:consentadmin_purpose}"
+msgstr "Paslaugos paskirtis yra"
+
+msgid "{consentAdmin:consentadmin:hide}"
+msgstr "Paslėpti"
+
+msgid "{consentAdmin:consentadmin:sp_empty_description}"
+msgstr "(apibūdinimas nenurodytas)"
+
+msgid "{consentAdmin:consentadmin:service_providers_for}"
+msgstr "Paslaugos tiekėjai"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description2}"
+msgstr ""
+"<h3>Kaip pašalinti savo leidimą</h3> Panaikinkite pažymėjimą ties "
+"atitinkamu paslaugos teikėju <h3>Nuorodos</h3> <ul> <li><a "
+"href=\"https://www.wayf.dk\">Pradžia</a> </li> <li><a "
+"href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li> </ul> "
+
+msgid "{consentAdmin:consentadmin:login}"
+msgstr "Prisijungti"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description1}"
+msgstr "Čia jūs galite peržiūrėti ir keisti savo leidimus paslaugų teikėjams"
+
+msgid "{consentAdmin:consentadmin:updated}"
+msgstr "Leidimas atnaujintas"
+
+msgid "{consentAdmin:consentadmin:unknown}"
+msgstr "Nežinoma..."
+
+msgid "{consentAdmin:consentadmin:added}"
+msgstr "Leidimas pridėtas"
+
+msgid "{consentAdmin:consentadmin:attribute_id}"
+msgstr "Tapatybė"
+
+msgid "Injected attribut"
+msgstr "Įterptas atributas"
+
+msgid "Show"
+msgstr "Parodyti"
+
+msgid "Consent Added"
+msgstr "Leidimas pridėtas"
+
+msgid "Consent Administration"
+msgstr "Leidimų administravimas"
+
+msgid "Here you can view and edit your consent for the Service Providers."
+msgstr "Čia jūs galite peržiūrėti ir keisti savo leidimus paslaugų teikėjams"
+
+msgid "Unknown ..."
+msgstr "Nežinoma..."
+
+msgid "Identity"
+msgstr "Tapatybė"
+
+msgid "The purpose of the service is"
+msgstr "Paslaugos paskirtis yra"
+
+msgid "Hide"
+msgstr "Paslėpti"
+
+msgid "Service Provider"
+msgstr "Paslaugos tiekėjas"
+
+msgid "Service Providers for"
+msgstr "Paslaugos tiekėjai"
+
+msgid "login"
+msgstr "Prisijungti"
+
+msgid "(name not specified)"
+msgstr "(pavadinimas nenurodytas)"
+
+msgid "Consent Updated"
+msgstr "Leidimas atnaujintas"
+
+msgid "Consent status"
+msgstr "Leidimo statusas"
+
+msgid "(no description)"
+msgstr "(apibūdinimas nenurodytas)"
+
+msgid "attributes"
+msgstr "atributai"
+
+msgid ""
+"\n"
+"<h3>How to delete your consent</h3>\n"
+"Uncheck the box corresponding to the service provider\n"
+"\n"
+"<h3>Links</h3>\n"
+"<ul>\n"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
+"\n"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
+"</ul>\n"
+msgstr ""
+"<h3>Kaip pašalinti savo leidimą</h3> Panaikinkite pažymėjimą ties "
+"atitinkamu paslaugos teikėju <h3>Nuorodos</h3> <ul> <li><a "
+"href=\"https://www.wayf.dk\">Pradžia</a> </li> <li><a "
+"href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li> </ul> "
+
+msgid "Consent Removed"
+msgstr "Leidimas pašalintas"
+
+msgid "show/hide attributes"
+msgstr "Rodyti/slėpti atributus"
+
+msgid "Organisation"
+msgstr "Organizacija"
+
diff --git a/locales/lv/LC_MESSAGES/consentAdmin.po b/locales/lv/LC_MESSAGES/consentAdmin.po
new file mode 100644
index 0000000..6f5ff43
--- /dev/null
+++ b/locales/lv/LC_MESSAGES/consentAdmin.po
@@ -0,0 +1,161 @@
+
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: SimpleSAMLphp 1.15\n"
+"Report-Msgid-Bugs-To: simplesamlphp-translation@googlegroups.com\n"
+"POT-Creation-Date: 2016-10-12 09:23+0200\n"
+"PO-Revision-Date: 2016-10-14 12:14+0200\n"
+"Last-Translator: \n"
+"Language: lv\n"
+"Language-Team: \n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 :"
+" 2)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.3.4\n"
+
+msgid "{consentAdmin:consentadmin:status_header}"
+msgstr "Noteikumu statuss"
+
+msgid "{consentAdmin:consentadmin:attributes_text}"
+msgstr "atribūti"
+
+msgid "{consentAdmin:consentadmin:service_provider_header}"
+msgstr "Servisa piegādātājs"
+
+msgid "{consentAdmin:consentadmin:removed}"
+msgstr "Noņemtie noteikumi"
+
+msgid "{consentAdmin:consentadmin:consentadmin_header}"
+msgstr "Noteikumu administrators"
+
+msgid "{consentAdmin:consentadmin:show}"
+msgstr "Parādīt"
+
+msgid "{consentAdmin:consentadmin:attribute_org}"
+msgstr "Organizācija"
+
+msgid "{consentAdmin:consentadmin:attribute_injected}"
+msgstr "Ievietots atribūts"
+
+msgid "{consentAdmin:consentadmin:show_hide_attributes}"
+msgstr "rādīšanas/slēpšanas atribūti"
+
+msgid "{consentAdmin:consentadmin:consentadmin_purpose}"
+msgstr "Šī servisa nolūks ir"
+
+msgid "{consentAdmin:consentadmin:hide}"
+msgstr "Slēpt"
+
+msgid "{consentAdmin:consentadmin:sp_empty_description}"
+msgstr "(nav apraksta)"
+
+msgid "{consentAdmin:consentadmin:service_providers_for}"
+msgstr "Servisa piegādātāji priekš"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description2}"
+msgstr ""
+"<h3>Kā dzēst noteikumus</h3> Izņemiet ķeksīti pie atbilstošā servisa "
+"piegādātāja <h3>Saites</h3> <ul> <li><a "
+"href=\"https://www.wayf.dk\">Sākums</a> </li> <li><a "
+"href=\"https://www.wayf.dk/index.php/en/about-wayf/faq-frequently-asked-"
+"questions\">BUJ</a> </li> </ul> "
+
+msgid "{consentAdmin:consentadmin:login}"
+msgstr "pieslēgties"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description1}"
+msgstr "Šeit Jūs varat aplūkot un labot noteikumus priekš servisu piegādātājiem"
+
+msgid "{consentAdmin:consentadmin:updated}"
+msgstr "Uzlabotie noteikumi"
+
+msgid "{consentAdmin:consentadmin:unknown}"
+msgstr "Nezināms ..."
+
+msgid "{consentAdmin:consentadmin:added}"
+msgstr "Pievienotie noteikumi"
+
+msgid "{consentAdmin:consentadmin:attribute_id}"
+msgstr "Identitāte"
+
+msgid "Injected attribut"
+msgstr "Ievietots atribūts"
+
+msgid "Show"
+msgstr "Parādīt"
+
+msgid "Consent Added"
+msgstr "Pievienotie noteikumi"
+
+msgid "Consent Administration"
+msgstr "Noteikumu administrators"
+
+msgid "Here you can view and edit your consent for the Service Providers."
+msgstr "Šeit Jūs varat aplūkot un labot noteikumus priekš servisu piegādātājiem"
+
+msgid "Unknown ..."
+msgstr "Nezināms ..."
+
+msgid "Identity"
+msgstr "Identitāte"
+
+msgid "The purpose of the service is"
+msgstr "Šī servisa nolūks ir"
+
+msgid "Hide"
+msgstr "Slēpt"
+
+msgid "Service Provider"
+msgstr "Servisa piegādātājs"
+
+msgid "Service Providers for"
+msgstr "Servisa piegādātāji priekš"
+
+msgid "login"
+msgstr "pieslēgties"
+
+msgid "(name not specified)"
+msgstr "(vārds nav norādīts)"
+
+msgid "Consent Updated"
+msgstr "Uzlabotie noteikumi"
+
+msgid "Consent status"
+msgstr "Noteikumu statuss"
+
+msgid "(no description)"
+msgstr "(nav apraksta)"
+
+msgid "attributes"
+msgstr "atribūti"
+
+msgid ""
+"\n"
+"<h3>How to delete your consent</h3>\n"
+"Uncheck the box corresponding to the service provider\n"
+"\n"
+"<h3>Links</h3>\n"
+"<ul>\n"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
+"\n"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
+"</ul>\n"
+msgstr ""
+"<h3>Kā dzēst noteikumus</h3> Izņemiet ķeksīti pie atbilstošā servisa "
+"piegādātāja <h3>Saites</h3> <ul> <li><a "
+"href=\"https://www.wayf.dk\">Sākums</a> </li> <li><a "
+"href=\"https://www.wayf.dk/index.php/en/about-wayf/faq-frequently-asked-"
+"questions\">BUJ</a> </li> </ul> "
+
+msgid "Consent Removed"
+msgstr "Noņemtie noteikumi"
+
+msgid "show/hide attributes"
+msgstr "rādīšanas/slēpšanas atribūti"
+
+msgid "Organisation"
+msgstr "Organizācija"
+
diff --git a/locales/nb/LC_MESSAGES/consentAdmin.po b/locales/nb/LC_MESSAGES/consentAdmin.po
new file mode 100644
index 0000000..a820005
--- /dev/null
+++ b/locales/nb/LC_MESSAGES/consentAdmin.po
@@ -0,0 +1,162 @@
+
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: SimpleSAMLphp 1.15\n"
+"Report-Msgid-Bugs-To: simplesamlphp-translation@googlegroups.com\n"
+"POT-Creation-Date: 2016-10-12 09:23+0200\n"
+"PO-Revision-Date: 2016-10-14 12:14+0200\n"
+"Last-Translator: \n"
+"Language: nb_NO\n"
+"Language-Team: \n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.3.4\n"
+
+msgid "{consentAdmin:consentadmin:status_header}"
+msgstr "Samtykke status"
+
+msgid "{consentAdmin:consentadmin:attributes_text}"
+msgstr "persondata"
+
+msgid "{consentAdmin:consentadmin:service_provider_header}"
+msgstr "Tjenesteleverandør"
+
+msgid "{consentAdmin:consentadmin:removed}"
+msgstr "Samtykke trukket tilbake"
+
+msgid "{consentAdmin:consentadmin:consentadmin_header}"
+msgstr "Samtykkeadministrasjon"
+
+msgid "{consentAdmin:consentadmin:show}"
+msgstr "Vis"
+
+msgid "{consentAdmin:consentadmin:attribute_org}"
+msgstr "Organisasjon"
+
+msgid "{consentAdmin:consentadmin:attribute_injected}"
+msgstr "Persondata lagt til"
+
+msgid "{consentAdmin:consentadmin:show_hide_attributes}"
+msgstr "vis/skjul persondata"
+
+msgid "{consentAdmin:consentadmin:consentadmin_purpose}"
+msgstr "Hensikten med denne tjenesten er"
+
+msgid "{consentAdmin:consentadmin:hide}"
+msgstr "Skjul"
+
+msgid "{consentAdmin:consentadmin:sp_empty_description}"
+msgstr "(ingen beskrivelse)"
+
+msgid "{consentAdmin:consentadmin:service_providers_for}"
+msgstr "Tjenesteleverandører for"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description2}"
+msgstr ""
+"<h3>Hvordan trekke samtykke tilbake</h3> Fjern haken i boksen for gitte "
+"tjenestetilbyder <h3>Lenker</h3> <ul> <li><a "
+"href=\"https://www.wayf.dk\">Start</a> </li> <li><a "
+"href=\"https://www.wayf.dk/index.php/da/om-wayf/faq-ofte-stillede-"
+"sporgsmal\">Ofte stilte spørsmål</a> </li> </ul> "
+
+msgid "{consentAdmin:consentadmin:login}"
+msgstr "login"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description1}"
+msgstr "Her kan du se og endre dine samtykker for tjenester."
+
+msgid "{consentAdmin:consentadmin:updated}"
+msgstr "Samtykke oppdatert"
+
+msgid "{consentAdmin:consentadmin:unknown}"
+msgstr "Ukjent..."
+
+msgid "{consentAdmin:consentadmin:added}"
+msgstr "Samtykke gitt"
+
+msgid "{consentAdmin:consentadmin:attribute_id}"
+msgstr "Identitet"
+
+msgid "Injected attribut"
+msgstr "Persondata lagt til"
+
+msgid "Show"
+msgstr "Vis"
+
+msgid "Consent Added"
+msgstr "Samtykke gitt"
+
+msgid "Consent Administration"
+msgstr "Samtykkeadministrasjon"
+
+msgid "Here you can view and edit your consent for the Service Providers."
+msgstr "Her kan du se og endre dine samtykker for tjenester."
+
+msgid "Unknown ..."
+msgstr "Ukjent..."
+
+msgid "Identity"
+msgstr "Identitet"
+
+msgid "The purpose of the service is"
+msgstr "Hensikten med denne tjenesten er"
+
+msgid "Hide"
+msgstr "Skjul"
+
+msgid "Service Provider"
+msgstr "Tjenesteleverandør"
+
+msgid "Service Providers for"
+msgstr "Tjenesteleverandører for"
+
+msgid "login"
+msgstr "login"
+
+msgid "(name not specified)"
+msgstr "(navn ikke spesifisert)"
+
+msgid "Consent Updated"
+msgstr "Samtykke oppdatert"
+
+msgid "Consent status"
+msgstr "Samtykke status"
+
+msgid "(no description)"
+msgstr "(ingen beskrivelse)"
+
+msgid "attributes"
+msgstr "persondata"
+
+msgid ""
+"\n"
+"<h3>How to delete your consent</h3>\n"
+"Uncheck the box corresponding to the service provider\n"
+"\n"
+"<h3>Links</h3>\n"
+"<ul>\n"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
+"\n"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
+"</ul>\n"
+msgstr ""
+"<h3>Hvordan trekke samtykke tilbake</h3> Fjern haken i boksen for gitte "
+"tjenestetilbyder <h3>Lenker</h3> <ul> <li><a "
+"href=\"https://www.wayf.dk\">Start</a> </li> <li><a "
+"href=\"https://www.wayf.dk/index.php/da/om-wayf/faq-ofte-stillede-"
+"sporgsmal\">Ofte stilte spørsmål</a> </li> </ul> "
+
+msgid "Consent Removed"
+msgstr "Samtykke trukket tilbake"
+
+msgid "show/hide attributes"
+msgstr "vis/skjul persondata"
+
+msgid "Organisation"
+msgstr "Organisasjon"
+
+msgid "Consent administration"
+msgstr "Samtykke administrasjon"
diff --git a/locales/nl/LC_MESSAGES/consentAdmin.po b/locales/nl/LC_MESSAGES/consentAdmin.po
new file mode 100644
index 0000000..77c74ed
--- /dev/null
+++ b/locales/nl/LC_MESSAGES/consentAdmin.po
@@ -0,0 +1,164 @@
+
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: SimpleSAMLphp 1.15\n"
+"Report-Msgid-Bugs-To: simplesamlphp-translation@googlegroups.com\n"
+"POT-Creation-Date: 2016-10-12 09:23+0200\n"
+"PO-Revision-Date: 2016-10-14 12:14+0200\n"
+"Last-Translator: \n"
+"Language: nl\n"
+"Language-Team: \n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.3.4\n"
+
+msgid "{consentAdmin:consentadmin:status_header}"
+msgstr "Toestemming Status"
+
+msgid "{consentAdmin:consentadmin:attributes_text}"
+msgstr "attributen"
+
+msgid "{consentAdmin:consentadmin:service_provider_header}"
+msgstr "Service Provider"
+
+msgid "{consentAdmin:consentadmin:removed}"
+msgstr "Toestemming Verwijderd"
+
+msgid "{consentAdmin:consentadmin:consentadmin_header}"
+msgstr "Toestemming Beheer"
+
+msgid "{consentAdmin:consentadmin:show}"
+msgstr "Bekijk"
+
+msgid "{consentAdmin:consentadmin:attribute_org}"
+msgstr "Organisatie"
+
+msgid "{consentAdmin:consentadmin:attribute_injected}"
+msgstr "Geïnjecteerd attibuut"
+
+msgid "{consentAdmin:consentadmin:show_hide_attributes}"
+msgstr "bekijk/verberg attributen"
+
+msgid "{consentAdmin:consentadmin:consentadmin_purpose}"
+msgstr "Het nut van de server is"
+
+msgid "{consentAdmin:consentadmin:hide}"
+msgstr "Verberg"
+
+msgid "{consentAdmin:consentadmin:sp_empty_description}"
+msgstr "(geen omschrijving)"
+
+msgid "{consentAdmin:consentadmin:service_providers_for}"
+msgstr "Service Providers voor"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description2}"
+msgstr ""
+"<h3>Hoe verwijdert u toestemmingen</h3> Vinkt u het vakje af dat "
+"overeenkomt met de dienstverlener <h3>Links</h3> <ul> <li><a "
+"href=\"https://www.wayf.dk\">Start</a> </li> <li><a "
+"href=\"https://www.wayf.dk/index.php/en/about-wayf/faq-frequently-asked-"
+"questions\">FAQ</a> </li> </ul>"
+
+msgid "{consentAdmin:consentadmin:login}"
+msgstr "login"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description1}"
+msgstr ""
+"Hier kunt u uw verleende toestemmingen voor dienstverleners bekijken en "
+"bewerken."
+
+msgid "{consentAdmin:consentadmin:updated}"
+msgstr "Toestemming Bijgewerkt"
+
+msgid "{consentAdmin:consentadmin:unknown}"
+msgstr "Onbekend..."
+
+msgid "{consentAdmin:consentadmin:added}"
+msgstr "Toestemming Toegevoegd"
+
+msgid "{consentAdmin:consentadmin:attribute_id}"
+msgstr "Identiteit"
+
+msgid "Injected attribut"
+msgstr "Geïnjecteerd attibuut"
+
+msgid "Show"
+msgstr "Bekijk"
+
+msgid "Consent Added"
+msgstr "Toestemming Toegevoegd"
+
+msgid "Consent Administration"
+msgstr "Toestemming Beheer"
+
+msgid "Here you can view and edit your consent for the Service Providers."
+msgstr ""
+"Hier kunt u uw verleende toestemmingen voor dienstverleners bekijken en "
+"bewerken."
+
+msgid "Unknown ..."
+msgstr "Onbekend..."
+
+msgid "Identity"
+msgstr "Identiteit"
+
+msgid "The purpose of the service is"
+msgstr "Het nut van de server is"
+
+msgid "Hide"
+msgstr "Verberg"
+
+msgid "Service Provider"
+msgstr "Service Provider"
+
+msgid "Service Providers for"
+msgstr "Service Providers voor"
+
+msgid "login"
+msgstr "login"
+
+msgid "(name not specified)"
+msgstr "(naam niet opgegeven)"
+
+msgid "Consent Updated"
+msgstr "Toestemming Bijgewerkt"
+
+msgid "Consent status"
+msgstr "Toestemming Status"
+
+msgid "(no description)"
+msgstr "(geen omschrijving)"
+
+msgid "attributes"
+msgstr "attributen"
+
+msgid ""
+"\n"
+"<h3>How to delete your consent</h3>\n"
+"Uncheck the box corresponding to the service provider\n"
+"\n"
+"<h3>Links</h3>\n"
+"<ul>\n"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
+"\n"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
+"</ul>\n"
+msgstr ""
+"<h3>Hoe verwijderdt u toestemmingen</h3> Vinkt u het vakje af dat "
+"overeenkomt met de dienstverlener <h3>Links</h3> <ul> <li><a "
+"href=\"https://www.wayf.dk\">Start</a> </li> <li><a "
+"href=\"https://www.wayf.dk/index.php/en/about-wayf/faq-frequently-asked-"
+"questions\">FAQ</a> </li> </ul>"
+
+msgid "Consent Removed"
+msgstr "Toestemming Verwijderd"
+
+msgid "show/hide attributes"
+msgstr "bekijk/verberg attributen"
+
+msgid "Organisation"
+msgstr "Organisatie"
+
diff --git a/locales/nn/LC_MESSAGES/consentAdmin.po b/locales/nn/LC_MESSAGES/consentAdmin.po
new file mode 100644
index 0000000..e4a7127
--- /dev/null
+++ b/locales/nn/LC_MESSAGES/consentAdmin.po
@@ -0,0 +1,162 @@
+
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: SimpleSAMLphp 1.15\n"
+"Report-Msgid-Bugs-To: simplesamlphp-translation@googlegroups.com\n"
+"POT-Creation-Date: 2016-10-12 09:23+0200\n"
+"PO-Revision-Date: 2016-10-14 12:14+0200\n"
+"Last-Translator: \n"
+"Language: nn\n"
+"Language-Team: \n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.3.4\n"
+
+msgid "{consentAdmin:consentadmin:status_header}"
+msgstr "Samtykkestatus"
+
+msgid "{consentAdmin:consentadmin:attributes_text}"
+msgstr "persondata"
+
+msgid "{consentAdmin:consentadmin:service_provider_header}"
+msgstr "Tenesteleverandør"
+
+msgid "{consentAdmin:consentadmin:removed}"
+msgstr "Samtykke trukke tilbake"
+
+msgid "{consentAdmin:consentadmin:consentadmin_header}"
+msgstr "Samtykkeadministrasjon"
+
+msgid "{consentAdmin:consentadmin:show}"
+msgstr "Vis"
+
+msgid "{consentAdmin:consentadmin:attribute_org}"
+msgstr "Organisasjon"
+
+msgid "{consentAdmin:consentadmin:attribute_injected}"
+msgstr "Persondata lagt til"
+
+msgid "{consentAdmin:consentadmin:show_hide_attributes}"
+msgstr "vis/skjul personinformasjon"
+
+msgid "{consentAdmin:consentadmin:consentadmin_purpose}"
+msgstr "Formålet med tenesta er"
+
+msgid "{consentAdmin:consentadmin:hide}"
+msgstr "Skjul"
+
+msgid "{consentAdmin:consentadmin:sp_empty_description}"
+msgstr "(mangler informasjon)"
+
+msgid "{consentAdmin:consentadmin:service_providers_for}"
+msgstr "Tenesteleverandør for "
+
+msgid "{consentAdmin:consentadmin:consentadmin_description2}"
+msgstr ""
+"<h3>Korleis dra tilbake samtykke</h3> Fjern haka i boksen for enkelte "
+"tenester <h3>Lenker</h3> <ul> <li><a "
+"href=\"https://www.wayf.dk\">Start</a> </li> <li><a "
+"href=\"https://www.wayf.dk/index.php/da/om-wayf/faq-ofte-stillede-"
+"sporgsmal\">Ofte stilte spørsmål</a> </li> </ul> "
+
+msgid "{consentAdmin:consentadmin:login}"
+msgstr "logg inn"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description1}"
+msgstr "Her kan du sjå og endra dine samtykke til tenestene."
+
+msgid "{consentAdmin:consentadmin:updated}"
+msgstr "Samtykke oppdatert"
+
+msgid "{consentAdmin:consentadmin:unknown}"
+msgstr "Ukjent..."
+
+msgid "{consentAdmin:consentadmin:added}"
+msgstr "Samtykke lagt til"
+
+msgid "{consentAdmin:consentadmin:attribute_id}"
+msgstr "Identitet"
+
+msgid "Injected attribut"
+msgstr "Persondata lagt til"
+
+msgid "Show"
+msgstr "Vis"
+
+msgid "Consent Added"
+msgstr "Samtykke lagt til"
+
+msgid "Consent Administration"
+msgstr "Samtykkeadministrasjon"
+
+msgid "Here you can view and edit your consent for the Service Providers."
+msgstr "Her kan du sjå og endra dine samtykke til tenestene."
+
+msgid "Unknown ..."
+msgstr "Ukjent..."
+
+msgid "Identity"
+msgstr "Identitet"
+
+msgid "The purpose of the service is"
+msgstr "Formålet med tenesta er"
+
+msgid "Hide"
+msgstr "Skjul"
+
+msgid "Service Provider"
+msgstr "Tenesteleverandør"
+
+msgid "Service Providers for"
+msgstr "Tenesteleverandør for "
+
+msgid "login"
+msgstr "logg inn"
+
+msgid "(name not specified)"
+msgstr "(namn ikkje spesifisert)"
+
+msgid "Consent Updated"
+msgstr "Samtykke oppdatert"
+
+msgid "Consent status"
+msgstr "Samtykkestatus"
+
+msgid "(no description)"
+msgstr "(mangler informasjon)"
+
+msgid "attributes"
+msgstr "persondata"
+
+msgid ""
+"\n"
+"<h3>How to delete your consent</h3>\n"
+"Uncheck the box corresponding to the service provider\n"
+"\n"
+"<h3>Links</h3>\n"
+"<ul>\n"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
+"\n"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
+"</ul>\n"
+msgstr ""
+"<h3>Korleis dra tilbake samtykke</h3> Fjern haka i boksen for enkelte "
+"tenester <h3>Lenker</h3> <ul> <li><a "
+"href=\"https://www.wayf.dk\">Start</a> </li> <li><a "
+"href=\"https://www.wayf.dk/index.php/da/om-wayf/faq-ofte-stillede-"
+"sporgsmal\">Ofte stilte spørsmål</a> </li> </ul> "
+
+msgid "Consent Removed"
+msgstr "Samtykke trukke tilbake"
+
+msgid "show/hide attributes"
+msgstr "vis/skjul personinformasjon"
+
+msgid "Organisation"
+msgstr "Organisasjon"
+
+msgid "Consent administration"
+msgstr "Samtykke administrasjon"
diff --git a/locales/pt/LC_MESSAGES/consentAdmin.po b/locales/pt/LC_MESSAGES/consentAdmin.po
new file mode 100644
index 0000000..85983c3
--- /dev/null
+++ b/locales/pt/LC_MESSAGES/consentAdmin.po
@@ -0,0 +1,158 @@
+
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: SimpleSAMLphp 1.15\n"
+"Report-Msgid-Bugs-To: simplesamlphp-translation@googlegroups.com\n"
+"POT-Creation-Date: 2016-10-12 09:23+0200\n"
+"PO-Revision-Date: 2016-10-14 12:14+0200\n"
+"Last-Translator: \n"
+"Language: pt\n"
+"Language-Team: \n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.3.4\n"
+
+msgid "{consentAdmin:consentadmin:status_header}"
+msgstr "Consentimento"
+
+msgid "{consentAdmin:consentadmin:attributes_text}"
+msgstr "atributos"
+
+msgid "{consentAdmin:consentadmin:service_provider_header}"
+msgstr "Fornecedor de Serviço"
+
+msgid "{consentAdmin:consentadmin:removed}"
+msgstr "Consentimento removido"
+
+msgid "{consentAdmin:consentadmin:consentadmin_header}"
+msgstr "Administração de Consentimento"
+
+msgid "{consentAdmin:consentadmin:show}"
+msgstr "Mostrar"
+
+msgid "{consentAdmin:consentadmin:attribute_org}"
+msgstr "Organização"
+
+msgid "{consentAdmin:consentadmin:attribute_injected}"
+msgstr "Atributo injectado"
+
+msgid "{consentAdmin:consentadmin:show_hide_attributes}"
+msgstr "mostrar/esconder atributos"
+
+msgid "{consentAdmin:consentadmin:consentadmin_purpose}"
+msgstr "Este serviço destina-se a"
+
+msgid "{consentAdmin:consentadmin:hide}"
+msgstr "Esconder"
+
+msgid "{consentAdmin:consentadmin:sp_empty_description}"
+msgstr "(sem descrição)"
+
+msgid "{consentAdmin:consentadmin:service_providers_for}"
+msgstr "Fornecedores de Serviços para"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description2}"
+msgstr ""
+"<h3>Como remover o seu consentimento</h3> Retire a marca correspondente "
+"ao fornecedor de serviço que pretende remover."
+
+msgid "{consentAdmin:consentadmin:login}"
+msgstr "Entrar"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description1}"
+msgstr ""
+"Nesta página pode ver e editar o seu consentimento dado aos Fornecedores "
+"de Serviços."
+
+msgid "{consentAdmin:consentadmin:updated}"
+msgstr "Consentimento actualizado"
+
+msgid "{consentAdmin:consentadmin:unknown}"
+msgstr "Desconhecido ..."
+
+msgid "{consentAdmin:consentadmin:added}"
+msgstr "Consentimento adicionado"
+
+msgid "{consentAdmin:consentadmin:attribute_id}"
+msgstr "Identidade"
+
+msgid "Injected attribut"
+msgstr "Atributo injectado"
+
+msgid "Show"
+msgstr "Mostrar"
+
+msgid "Consent Added"
+msgstr "Consentimento adicionado"
+
+msgid "Consent Administration"
+msgstr "Administração de Consentimento"
+
+msgid "Here you can view and edit your consent for the Service Providers."
+msgstr ""
+"Nesta página pode ver e editar o seu consentimento dado aos Fornecedores "
+"de Serviços."
+
+msgid "Unknown ..."
+msgstr "Desconhecido ..."
+
+msgid "Identity"
+msgstr "Identidade"
+
+msgid "The purpose of the service is"
+msgstr "Este serviço destina-se a"
+
+msgid "Hide"
+msgstr "Esconder"
+
+msgid "Service Provider"
+msgstr "Fornecedor de Serviço"
+
+msgid "Service Providers for"
+msgstr "Fornecedores de Serviços para"
+
+msgid "login"
+msgstr "Entrar"
+
+msgid "(name not specified)"
+msgstr "(nome não especificado)"
+
+msgid "Consent Updated"
+msgstr "Consentimento actualizado"
+
+msgid "Consent status"
+msgstr "Consentimento"
+
+msgid "(no description)"
+msgstr "(sem descrição)"
+
+msgid "attributes"
+msgstr "atributos"
+
+msgid ""
+"\n"
+"<h3>How to delete your consent</h3>\n"
+"Uncheck the box corresponding to the service provider\n"
+"\n"
+"<h3>Links</h3>\n"
+"<ul>\n"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
+"\n"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
+"</ul>\n"
+msgstr ""
+"<h3>Como remover o seu consentimento</h3> Retire a marca correspondente "
+"ao fornecedor de serviço que pretende remover."
+
+msgid "Consent Removed"
+msgstr "Consentimento removido"
+
+msgid "show/hide attributes"
+msgstr "mostrar/esconder atributos"
+
+msgid "Organisation"
+msgstr "Organização"
+
diff --git a/locales/ro/LC_MESSAGES/consentAdmin.po b/locales/ro/LC_MESSAGES/consentAdmin.po
new file mode 100644
index 0000000..6c1943b
--- /dev/null
+++ b/locales/ro/LC_MESSAGES/consentAdmin.po
@@ -0,0 +1,163 @@
+
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: SimpleSAMLphp 1.15\n"
+"Report-Msgid-Bugs-To: simplesamlphp-translation@googlegroups.com\n"
+"POT-Creation-Date: 2016-10-12 09:23+0200\n"
+"PO-Revision-Date: 2016-10-14 12:14+0200\n"
+"Last-Translator: \n"
+"Language: ro\n"
+"Language-Team: \n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100"
+" < 20)) ? 1 : 2)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.3.4\n"
+
+msgid "{consentAdmin:consentadmin:status_header}"
+msgstr "Stare acord (consimțământ)"
+
+msgid "{consentAdmin:consentadmin:attributes_text}"
+msgstr "atribute"
+
+msgid "{consentAdmin:consentadmin:service_provider_header}"
+msgstr "Furnizor de servicii"
+
+msgid "{consentAdmin:consentadmin:removed}"
+msgstr "Acordul a fost înlăturat"
+
+msgid "{consentAdmin:consentadmin:consentadmin_header}"
+msgstr "Administrarea acordurilor (consimțămintelor)"
+
+msgid "{consentAdmin:consentadmin:show}"
+msgstr "Arată"
+
+msgid "{consentAdmin:consentadmin:attribute_org}"
+msgstr "Instituție"
+
+msgid "{consentAdmin:consentadmin:attribute_injected}"
+msgstr "Atribut introdus"
+
+msgid "{consentAdmin:consentadmin:show_hide_attributes}"
+msgstr "arată/ascunde atributele"
+
+msgid "{consentAdmin:consentadmin:consentadmin_purpose}"
+msgstr "Scopul acestui serviciu este"
+
+msgid "{consentAdmin:consentadmin:hide}"
+msgstr "Ascunde"
+
+msgid "{consentAdmin:consentadmin:sp_empty_description}"
+msgstr "(fără descriere)"
+
+msgid "{consentAdmin:consentadmin:service_providers_for}"
+msgstr "Furnizori de servicii pentru"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description2}"
+msgstr ""
+"<h3>Cum poate fi anulat acordul dumneavoastră</h3>Debifați căsuța "
+"corespunzătoare furnizorului de servicii <h3>Link-uri</h3><ul><li><a "
+"href=\"https://www.wayf.dk\">Start</a></li><li><a "
+"href=\"https://www.wayf.dk/FAQ\">FAQ</a></li></ul>"
+
+msgid "{consentAdmin:consentadmin:login}"
+msgstr "autentificare"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description1}"
+msgstr ""
+"Aici puteți edita acordul/consimțământul dumneavoastră pentru Furnizorii "
+"de servicii."
+
+msgid "{consentAdmin:consentadmin:updated}"
+msgstr "Acordul a fost actualizat"
+
+msgid "{consentAdmin:consentadmin:unknown}"
+msgstr "Necunoscut ..."
+
+msgid "{consentAdmin:consentadmin:added}"
+msgstr "Acordul a fost adăugat"
+
+msgid "{consentAdmin:consentadmin:attribute_id}"
+msgstr "Identitate"
+
+msgid "Injected attribut"
+msgstr "Atribut introdus"
+
+msgid "Show"
+msgstr "Arată"
+
+msgid "Consent Added"
+msgstr "Acordul a fost adăugat"
+
+msgid "Consent Administration"
+msgstr "Administrarea acordurilor (consimțămintelor)"
+
+msgid "Here you can view and edit your consent for the Service Providers."
+msgstr ""
+"Aici puteți edita acordul/consimțământul dumneavoastră pentru Furnizorii "
+"de servicii."
+
+msgid "Unknown ..."
+msgstr "Necunoscut ..."
+
+msgid "Identity"
+msgstr "Identitate"
+
+msgid "The purpose of the service is"
+msgstr "Scopul acestui serviciu este"
+
+msgid "Hide"
+msgstr "Ascunde"
+
+msgid "Service Provider"
+msgstr "Furnizor de servicii"
+
+msgid "Service Providers for"
+msgstr "Furnizori de servicii pentru"
+
+msgid "login"
+msgstr "autentificare"
+
+msgid "(name not specified)"
+msgstr "(nu a fost specificat numele)"
+
+msgid "Consent Updated"
+msgstr "Acordul a fost actualizat"
+
+msgid "Consent status"
+msgstr "Stare acord (consimțământ)"
+
+msgid "(no description)"
+msgstr "(fără descriere)"
+
+msgid "attributes"
+msgstr "atribute"
+
+msgid ""
+"\n"
+"<h3>How to delete your consent</h3>\n"
+"Uncheck the box corresponding to the service provider\n"
+"\n"
+"<h3>Links</h3>\n"
+"<ul>\n"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
+"\n"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
+"</ul>\n"
+msgstr ""
+"<h3>Cum poate fi anulat acordul dumneavoastră</h3>Debifați căsuța "
+"corespunzătoare furnizorului de servicii <h3>Link-uri</h3><ul><li><a "
+"href=\"https://www.wayf.dk\">Start</a></li><li><a "
+"href=\"https://www.wayf.dk/FAQ\">FAQ</a></li></ul>"
+
+msgid "Consent Removed"
+msgstr "Acordul a fost înlăturat"
+
+msgid "show/hide attributes"
+msgstr "arată/ascunde atributele"
+
+msgid "Organisation"
+msgstr "Instituție"
+
diff --git a/locales/ru/LC_MESSAGES/consentAdmin.po b/locales/ru/LC_MESSAGES/consentAdmin.po
new file mode 100644
index 0000000..a641ee0
--- /dev/null
+++ b/locales/ru/LC_MESSAGES/consentAdmin.po
@@ -0,0 +1,161 @@
+
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: SimpleSAMLphp 1.15\n"
+"Report-Msgid-Bugs-To: simplesamlphp-translation@googlegroups.com\n"
+"POT-Creation-Date: 2016-10-12 09:23+0200\n"
+"PO-Revision-Date: 2016-10-14 12:14+0200\n"
+"Last-Translator: \n"
+"Language: ru\n"
+"Language-Team: \n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.3.4\n"
+
+msgid "{consentAdmin:consentadmin:status_header}"
+msgstr "Статус согласия"
+
+msgid "{consentAdmin:consentadmin:attributes_text}"
+msgstr "атрибуты"
+
+msgid "{consentAdmin:consentadmin:service_provider_header}"
+msgstr "Сервис провайдер"
+
+msgid "{consentAdmin:consentadmin:removed}"
+msgstr "Согласие отозвано"
+
+msgid "{consentAdmin:consentadmin:consentadmin_header}"
+msgstr "Управление согласием"
+
+msgid "{consentAdmin:consentadmin:show}"
+msgstr "Показать"
+
+msgid "{consentAdmin:consentadmin:attribute_org}"
+msgstr "Организация"
+
+msgid "{consentAdmin:consentadmin:attribute_injected}"
+msgstr "Введенный атрибут"
+
+msgid "{consentAdmin:consentadmin:show_hide_attributes}"
+msgstr "Показать/скрыть атрибуты"
+
+msgid "{consentAdmin:consentadmin:consentadmin_purpose}"
+msgstr "Целью сервиса является"
+
+msgid "{consentAdmin:consentadmin:hide}"
+msgstr "Скрыть"
+
+msgid "{consentAdmin:consentadmin:sp_empty_description}"
+msgstr "(описание отсутствует)"
+
+msgid "{consentAdmin:consentadmin:service_providers_for}"
+msgstr "Сервис провайдеры для"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description2}"
+msgstr ""
+"<h3>Как удалить ваше согласие</h3> Снимите выделение с сервис провайдера "
+"<h3>Ссылки</h3> <ul> <li><a href=\"https://www.wayf.dk\">Start</a> </li> "
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li> </ul>"
+
+msgid "{consentAdmin:consentadmin:login}"
+msgstr "Вход"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description1}"
+msgstr ""
+"В этом поле можно просмотреть и отредактировать текст вашего согласия для"
+" сервис провайдеров."
+
+msgid "{consentAdmin:consentadmin:updated}"
+msgstr "Согласие обновлено"
+
+msgid "{consentAdmin:consentadmin:unknown}"
+msgstr "Неизвестно.."
+
+msgid "{consentAdmin:consentadmin:added}"
+msgstr "Согласие добавлено"
+
+msgid "{consentAdmin:consentadmin:attribute_id}"
+msgstr "Идентификационная информация"
+
+msgid "Injected attribut"
+msgstr "Введенный атрибут"
+
+msgid "Show"
+msgstr "Показать"
+
+msgid "Consent Added"
+msgstr "Согласие добавлено"
+
+msgid "Consent Administration"
+msgstr "Управление согласием"
+
+msgid "Here you can view and edit your consent for the Service Providers."
+msgstr ""
+"В этом поле можно просмотреть и отредактировать текст вашего согласия для"
+" сервис провайдеров."
+
+msgid "Unknown ..."
+msgstr "Неизвестно.."
+
+msgid "Identity"
+msgstr "Идентификационная информация"
+
+msgid "The purpose of the service is"
+msgstr "Целью сервиса является"
+
+msgid "Hide"
+msgstr "Скрыть"
+
+msgid "Service Provider"
+msgstr "Сервис провайдер"
+
+msgid "Service Providers for"
+msgstr "Сервис провайдеры для"
+
+msgid "login"
+msgstr "Вход"
+
+msgid "(name not specified)"
+msgstr "(имя не указано)"
+
+msgid "Consent Updated"
+msgstr "Согласие обновлено"
+
+msgid "Consent status"
+msgstr "Статус согласия"
+
+msgid "(no description)"
+msgstr "(описание отсутствует)"
+
+msgid "attributes"
+msgstr "атрибуты"
+
+msgid ""
+"\n"
+"<h3>How to delete your consent</h3>\n"
+"Uncheck the box corresponding to the service provider\n"
+"\n"
+"<h3>Links</h3>\n"
+"<ul>\n"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
+"\n"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
+"</ul>\n"
+msgstr ""
+"<h3>Как удалить ваше согласие</h3> Снимите выделение с сервис провайдера "
+"<h3>Ссылки</h3> <ul> <li><a href=\"https://www.wayf.dk\">Start</a> </li> "
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li> </ul>"
+
+msgid "Consent Removed"
+msgstr "Согласие отозвано"
+
+msgid "show/hide attributes"
+msgstr "Показать/скрыть атрибуты"
+
+msgid "Organisation"
+msgstr "Организация"
+
diff --git a/locales/sl/LC_MESSAGES/consentAdmin.po b/locales/sl/LC_MESSAGES/consentAdmin.po
new file mode 100644
index 0000000..915d166
--- /dev/null
+++ b/locales/sl/LC_MESSAGES/consentAdmin.po
@@ -0,0 +1,159 @@
+
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: SimpleSAMLphp 1.15\n"
+"Report-Msgid-Bugs-To: simplesamlphp-translation@googlegroups.com\n"
+"POT-Creation-Date: 2016-10-12 09:23+0200\n"
+"PO-Revision-Date: 2016-10-14 12:14+0200\n"
+"Last-Translator: \n"
+"Language: sl\n"
+"Language-Team: \n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 "
+"|| n%100==4 ? 2 : 3)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.3.4\n"
+
+msgid "{consentAdmin:consentadmin:status_header}"
+msgstr "Status privolitve"
+
+msgid "{consentAdmin:consentadmin:attributes_text}"
+msgstr "atributi"
+
+msgid "{consentAdmin:consentadmin:service_provider_header}"
+msgstr "Ponudnik storitve"
+
+msgid "{consentAdmin:consentadmin:removed}"
+msgstr "Privolitev razveljavljena"
+
+msgid "{consentAdmin:consentadmin:consentadmin_header}"
+msgstr "Upravljanje s privolitvami"
+
+msgid "{consentAdmin:consentadmin:show}"
+msgstr "Prikaži"
+
+msgid "{consentAdmin:consentadmin:attribute_org}"
+msgstr "Organizacija"
+
+msgid "{consentAdmin:consentadmin:attribute_injected}"
+msgstr "Vrinjen atribut"
+
+msgid "{consentAdmin:consentadmin:show_hide_attributes}"
+msgstr "Prikaži/Skrij atribute"
+
+msgid "{consentAdmin:consentadmin:consentadmin_purpose}"
+msgstr "Namen storitve: "
+
+msgid "{consentAdmin:consentadmin:hide}"
+msgstr "Skrij"
+
+msgid "{consentAdmin:consentadmin:sp_empty_description}"
+msgstr "(brez opisa)"
+
+msgid "{consentAdmin:consentadmin:service_providers_for}"
+msgstr "Ponudniki storitev za"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description2}"
+msgstr ""
+"<h3>Kako razveljavim dano privolitev?</h3> Odstranite kljukico pred "
+"SPjem, za katerega želite razveljaviti dano privolitev<h3>Povezave</h3> "
+"<ul> <li><a href=\"https://aai.arnes.si\">Start</a> </li> <li><a "
+"href=\"https://aai.arnes.si\">FAQ</a> </li> </ul>"
+
+msgid "{consentAdmin:consentadmin:login}"
+msgstr "Prijava"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description1}"
+msgstr "Pregled in urejanje privolitev za posamezen SP."
+
+msgid "{consentAdmin:consentadmin:updated}"
+msgstr "Privolitev posodobljena"
+
+msgid "{consentAdmin:consentadmin:unknown}"
+msgstr "Neznan..."
+
+msgid "{consentAdmin:consentadmin:added}"
+msgstr "Privolitev dodana"
+
+msgid "{consentAdmin:consentadmin:attribute_id}"
+msgstr "Identiteta"
+
+msgid "Injected attribut"
+msgstr "Vrinjen atribut"
+
+msgid "Show"
+msgstr "Prikaži"
+
+msgid "Consent Added"
+msgstr "Privolitev dodana"
+
+msgid "Consent Administration"
+msgstr "Upravljanje s privolitvami"
+
+msgid "Here you can view and edit your consent for the Service Providers."
+msgstr "Pregled in urejanje privolitev za posamezen SP."
+
+msgid "Unknown ..."
+msgstr "Neznan..."
+
+msgid "Identity"
+msgstr "Identiteta"
+
+msgid "The purpose of the service is"
+msgstr "Namen storitve: "
+
+msgid "Hide"
+msgstr "Skrij"
+
+msgid "Service Provider"
+msgstr "Ponudnik storitve"
+
+msgid "Service Providers for"
+msgstr "Ponudniki storitev za"
+
+msgid "login"
+msgstr "Prijava"
+
+msgid "(name not specified)"
+msgstr "(brez naziva)"
+
+msgid "Consent Updated"
+msgstr "Privolitev posodobljena"
+
+msgid "Consent status"
+msgstr "Status privolitve"
+
+msgid "(no description)"
+msgstr "(brez opisa)"
+
+msgid "attributes"
+msgstr "atributi"
+
+msgid ""
+"\n"
+"<h3>How to delete your consent</h3>\n"
+"Uncheck the box corresponding to the service provider\n"
+"\n"
+"<h3>Links</h3>\n"
+"<ul>\n"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
+"\n"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
+"</ul>\n"
+msgstr ""
+"<h3>Kako razveljavim dano privolitev?</h3> Odstranite kljukico pred "
+"SPjem, za katerega želite razveljaviti dano privolitev<h3>Povezave</h3> "
+"<ul> <li><a href=\"https://aai.arnes.si\">Start</a> </li> <li><a "
+"href=\"https://aai.arnes.si\">FAQ</a> </li> </ul>"
+
+msgid "Consent Removed"
+msgstr "Privolitev razveljavljena"
+
+msgid "show/hide attributes"
+msgstr "Prikaži/Skrij atribute"
+
+msgid "Organisation"
+msgstr "Organizacija"
+
diff --git a/locales/sr/LC_MESSAGES/consentAdmin.po b/locales/sr/LC_MESSAGES/consentAdmin.po
new file mode 100644
index 0000000..6099ce8
--- /dev/null
+++ b/locales/sr/LC_MESSAGES/consentAdmin.po
@@ -0,0 +1,161 @@
+
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: SimpleSAMLphp 1.15\n"
+"Report-Msgid-Bugs-To: simplesamlphp-translation@googlegroups.com\n"
+"POT-Creation-Date: 2016-10-12 09:23+0200\n"
+"PO-Revision-Date: 2016-10-14 12:14+0200\n"
+"Last-Translator: \n"
+"Language: sr\n"
+"Language-Team: \n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.3.4\n"
+
+msgid "{consentAdmin:consentadmin:status_header}"
+msgstr "Stanje dozvole"
+
+msgid "{consentAdmin:consentadmin:attributes_text}"
+msgstr "atributi"
+
+msgid "{consentAdmin:consentadmin:service_provider_header}"
+msgstr "Davalac Servisa"
+
+msgid "{consentAdmin:consentadmin:removed}"
+msgstr "Dozvola uklonjena"
+
+msgid "{consentAdmin:consentadmin:consentadmin_header}"
+msgstr "Administracija dozvola"
+
+msgid "{consentAdmin:consentadmin:show}"
+msgstr "Prikaži"
+
+msgid "{consentAdmin:consentadmin:attribute_org}"
+msgstr "Institucija"
+
+msgid "{consentAdmin:consentadmin:attribute_injected}"
+msgstr "Ubačeni atribut"
+
+msgid "{consentAdmin:consentadmin:show_hide_attributes}"
+msgstr "prikaži/sakrij atribute"
+
+msgid "{consentAdmin:consentadmin:consentadmin_purpose}"
+msgstr "Namena ovog servisa je"
+
+msgid "{consentAdmin:consentadmin:hide}"
+msgstr "Sakrij"
+
+msgid "{consentAdmin:consentadmin:sp_empty_description}"
+msgstr "(nema opisa)"
+
+msgid "{consentAdmin:consentadmin:service_providers_for}"
+msgstr "Davaoci Servisa za"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description2}"
+msgstr ""
+"<h3>Kako obrisati dozvolu</h3> Uklonite kvačicu iz polja koje se odnosi "
+"na davaoca servisa <h3>Linkovi</h3> <ul> <li><a "
+"href=\"https://www.wayf.dk\">Početna stranica</a> </li> <li><a "
+"href=\"https://www.wayf.dk/index.php/en/about-wayf/faq-frequently-asked-"
+"questions\">Pitanja i odgovori</a> </li> </ul> "
+
+msgid "{consentAdmin:consentadmin:login}"
+msgstr "Prijavi se"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description1}"
+msgstr "Ovde možete pregledati i menjati vaše dozvole davaocima servisa."
+
+msgid "{consentAdmin:consentadmin:updated}"
+msgstr "Dozvola ažurirana"
+
+msgid "{consentAdmin:consentadmin:unknown}"
+msgstr "Nepoznato ..."
+
+msgid "{consentAdmin:consentadmin:added}"
+msgstr "Dozvola dodata"
+
+msgid "{consentAdmin:consentadmin:attribute_id}"
+msgstr "Identitet"
+
+msgid "Injected attribut"
+msgstr "Ubačeni atribut"
+
+msgid "Show"
+msgstr "Prikaži"
+
+msgid "Consent Added"
+msgstr "Dozvola dodata"
+
+msgid "Consent Administration"
+msgstr "Administracija dozvola"
+
+msgid "Here you can view and edit your consent for the Service Providers."
+msgstr "Ovde možete pregledati i menjati vaše dozvole davaocima servisa."
+
+msgid "Unknown ..."
+msgstr "Nepoznato ..."
+
+msgid "Identity"
+msgstr "Identitet"
+
+msgid "The purpose of the service is"
+msgstr "Namena ovog servisa je"
+
+msgid "Hide"
+msgstr "Sakrij"
+
+msgid "Service Provider"
+msgstr "Davalac Servisa"
+
+msgid "Service Providers for"
+msgstr "Davaoci Servisa za"
+
+msgid "login"
+msgstr "Prijavi se"
+
+msgid "(name not specified)"
+msgstr "(ime nije specificirano)"
+
+msgid "Consent Updated"
+msgstr "Dozvola ažurirana"
+
+msgid "Consent status"
+msgstr "Stanje dozvole"
+
+msgid "(no description)"
+msgstr "(nema opisa)"
+
+msgid "attributes"
+msgstr "atributi"
+
+msgid ""
+"\n"
+"<h3>How to delete your consent</h3>\n"
+"Uncheck the box corresponding to the service provider\n"
+"\n"
+"<h3>Links</h3>\n"
+"<ul>\n"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
+"\n"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
+"</ul>\n"
+msgstr ""
+"<h3>Kako obrisati dozvolu</h3> Uklonite kvačicu iz polja koje se odnosi "
+"na davaoca servisa <h3>Linkovi</h3> <ul> <li><a "
+"href=\"https://www.wayf.dk\">Početna stranica</a> </li> <li><a "
+"href=\"https://www.wayf.dk/index.php/en/about-wayf/faq-frequently-asked-"
+"questions\">Pitanja i odgovori</a> </li> </ul> "
+
+msgid "Consent Removed"
+msgstr "Dozvola uklonjena"
+
+msgid "show/hide attributes"
+msgstr "prikaži/sakrij atribute"
+
+msgid "Organisation"
+msgstr "Institucija"
+
diff --git a/locales/sv/LC_MESSAGES/consentAdmin.po b/locales/sv/LC_MESSAGES/consentAdmin.po
new file mode 100644
index 0000000..6777d22
--- /dev/null
+++ b/locales/sv/LC_MESSAGES/consentAdmin.po
@@ -0,0 +1,160 @@
+
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: SimpleSAMLphp 1.15\n"
+"Report-Msgid-Bugs-To: simplesamlphp-translation@googlegroups.com\n"
+"POT-Creation-Date: 2016-10-12 09:23+0200\n"
+"PO-Revision-Date: 2016-10-14 12:14+0200\n"
+"Last-Translator: \n"
+"Language: sv\n"
+"Language-Team: \n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.3.4\n"
+
+msgid "{consentAdmin:consentadmin:status_header}"
+msgstr "Samtyckesstatus"
+
+msgid "{consentAdmin:consentadmin:attributes_text}"
+msgstr "attribut"
+
+msgid "{consentAdmin:consentadmin:service_provider_header}"
+msgstr "Tjänsteleverantör"
+
+msgid "{consentAdmin:consentadmin:removed}"
+msgstr "Samtycke borttaget"
+
+msgid "{consentAdmin:consentadmin:consentadmin_header}"
+msgstr "Samtyckesadministration"
+
+msgid "{consentAdmin:consentadmin:show}"
+msgstr "Visa"
+
+msgid "{consentAdmin:consentadmin:attribute_org}"
+msgstr "Organisation"
+
+msgid "{consentAdmin:consentadmin:attribute_injected}"
+msgstr "Tillfört attribut"
+
+msgid "{consentAdmin:consentadmin:show_hide_attributes}"
+msgstr "visa/göm attribut"
+
+msgid "{consentAdmin:consentadmin:consentadmin_purpose}"
+msgstr "Systet med tjänsten är"
+
+msgid "{consentAdmin:consentadmin:hide}"
+msgstr "Göm"
+
+msgid "{consentAdmin:consentadmin:sp_empty_description}"
+msgstr "(ingen beskrivning)"
+
+msgid "{consentAdmin:consentadmin:service_providers_for}"
+msgstr "Tjänsteleverantörer för"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description2}"
+msgstr ""
+"<h3>Hur du tar bort ditt samtycke</h3> Ta bort markeringen i rutan "
+"kopplad till tjänsteleverantören <h3>Länkar</h3> <ul> <li><a "
+"href=\"https://www.wayf.dk\">Start</a> </li> <li><a "
+"href=\"https://www.wayf.dk/index.php/en/about-wayf/faq-frequently-asked-"
+"questions\">FAQ</a> </li> </ul> "
+
+msgid "{consentAdmin:consentadmin:login}"
+msgstr "Logga in"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description1}"
+msgstr "Här kan du se och ändra dina samtycken för olika tjänsteleverantörer."
+
+msgid "{consentAdmin:consentadmin:updated}"
+msgstr "Samtycke uppdaterat"
+
+msgid "{consentAdmin:consentadmin:unknown}"
+msgstr "Okänd..."
+
+msgid "{consentAdmin:consentadmin:added}"
+msgstr "Samtycke tillagt"
+
+msgid "{consentAdmin:consentadmin:attribute_id}"
+msgstr "Identitet"
+
+msgid "Injected attribut"
+msgstr "Tillfört attribut"
+
+msgid "Show"
+msgstr "Visa"
+
+msgid "Consent Added"
+msgstr "Samtycke tillagt"
+
+msgid "Consent Administration"
+msgstr "Samtyckesadministration"
+
+msgid "Here you can view and edit your consent for the Service Providers."
+msgstr "Här kan du se och ändra dina samtycken för olika tjänsteleverantörer."
+
+msgid "Unknown ..."
+msgstr "Okänd..."
+
+msgid "Identity"
+msgstr "Identitet"
+
+msgid "The purpose of the service is"
+msgstr "Systet med tjänsten är"
+
+msgid "Hide"
+msgstr "Göm"
+
+msgid "Service Provider"
+msgstr "Tjänsteleverantör"
+
+msgid "Service Providers for"
+msgstr "Tjänsteleverantörer för"
+
+msgid "login"
+msgstr "Logga in"
+
+msgid "(name not specified)"
+msgstr "(namn ej angivet)"
+
+msgid "Consent Updated"
+msgstr "Samtycke uppdaterat"
+
+msgid "Consent status"
+msgstr "Samtyckesstatus"
+
+msgid "(no description)"
+msgstr "(ingen beskrivning)"
+
+msgid "attributes"
+msgstr "attribut"
+
+msgid ""
+"\n"
+"<h3>How to delete your consent</h3>\n"
+"Uncheck the box corresponding to the service provider\n"
+"\n"
+"<h3>Links</h3>\n"
+"<ul>\n"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
+"\n"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
+"</ul>\n"
+msgstr ""
+"<h3>Hur du tar bort ditt samtycke</h3> Ta bort markeringen i rutan "
+"kopplad till tjänsteleverantören <h3>Länkar</h3> <ul> <li><a "
+"href=\"https://www.wayf.dk\">Start</a> </li> <li><a "
+"href=\"https://www.wayf.dk/index.php/en/about-wayf/faq-frequently-asked-"
+"questions\">FAQ</a> </li> </ul> "
+
+msgid "Consent Removed"
+msgstr "Samtycke borttaget"
+
+msgid "show/hide attributes"
+msgstr "visa/göm attribut"
+
+msgid "Organisation"
+msgstr "Organisation"
+
diff --git a/locales/zh-tw/LC_MESSAGES/consentAdmin.po b/locales/zh-tw/LC_MESSAGES/consentAdmin.po
new file mode 100644
index 0000000..7976654
--- /dev/null
+++ b/locales/zh-tw/LC_MESSAGES/consentAdmin.po
@@ -0,0 +1,158 @@
+
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: SimpleSAMLphp 1.15\n"
+"Report-Msgid-Bugs-To: simplesamlphp-translation@googlegroups.com\n"
+"POT-Creation-Date: 2016-10-12 09:23+0200\n"
+"PO-Revision-Date: 2016-10-14 12:14+0200\n"
+"Last-Translator: \n"
+"Language: zh_Hant_TW\n"
+"Language-Team: \n"
+"Plural-Forms: nplurals=1; plural=0\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.3.4\n"
+
+msgid "{consentAdmin:consentadmin:status_header}"
+msgstr "許可狀態"
+
+msgid "{consentAdmin:consentadmin:attributes_text}"
+msgstr "屬性"
+
+msgid "{consentAdmin:consentadmin:service_provider_header}"
+msgstr "服務提供者"
+
+msgid "{consentAdmin:consentadmin:removed}"
+msgstr "同意移除"
+
+msgid "{consentAdmin:consentadmin:consentadmin_header}"
+msgstr "管轄許可"
+
+msgid "{consentAdmin:consentadmin:show}"
+msgstr "顯示"
+
+msgid "{consentAdmin:consentadmin:attribute_org}"
+msgstr "組織"
+
+msgid "{consentAdmin:consentadmin:attribute_injected}"
+msgstr "加入屬性"
+
+msgid "{consentAdmin:consentadmin:show_hide_attributes}"
+msgstr "顯示/隱藏屬性"
+
+msgid "{consentAdmin:consentadmin:consentadmin_purpose}"
+msgstr "此項服務的目的為"
+
+msgid "{consentAdmin:consentadmin:hide}"
+msgstr "隱藏"
+
+msgid "{consentAdmin:consentadmin:sp_empty_description}"
+msgstr "(無描述)"
+
+msgid "{consentAdmin:consentadmin:service_providers_for}"
+msgstr "服務提供者的"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description2}"
+msgstr ""
+"<h3>在這刪除您的授權</h3> 取消勾選服務提供者對應的核取方塊 <h3>連結</h3> <ul> <li><a "
+"href=\"https://www.wayf.dk\">開始</a> </li> <li><a "
+"href=\"https://www.wayf.dk/index.php/en/about-wayf/faq-frequently-asked-"
+"questions\">說明</a> </li> </ul> "
+
+msgid "{consentAdmin:consentadmin:login}"
+msgstr "登入"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description1}"
+msgstr "這邊可以檢視及修改您同意的服務提供者。"
+
+msgid "{consentAdmin:consentadmin:updated}"
+msgstr "同意更新"
+
+msgid "{consentAdmin:consentadmin:unknown}"
+msgstr "未知..."
+
+msgid "{consentAdmin:consentadmin:added}"
+msgstr "同意新增"
+
+msgid "{consentAdmin:consentadmin:attribute_id}"
+msgstr "身分"
+
+msgid "Injected attribut"
+msgstr "加入屬性"
+
+msgid "Show"
+msgstr "顯示"
+
+msgid "Consent Added"
+msgstr "同意新增"
+
+msgid "Consent Administration"
+msgstr "管轄許可"
+
+msgid "Here you can view and edit your consent for the Service Providers."
+msgstr "這邊可以檢視及修改您同意的服務提供者。"
+
+msgid "Unknown ..."
+msgstr "未知..."
+
+msgid "Identity"
+msgstr "身分"
+
+msgid "The purpose of the service is"
+msgstr "此項服務的目的為"
+
+msgid "Hide"
+msgstr "隱藏"
+
+msgid "Service Provider"
+msgstr "服務提供者"
+
+msgid "Service Providers for"
+msgstr "服務提供者的"
+
+msgid "login"
+msgstr "登入"
+
+msgid "(name not specified)"
+msgstr "(未定義名稱)"
+
+msgid "Consent Updated"
+msgstr "同意更新"
+
+msgid "Consent status"
+msgstr "許可狀態"
+
+msgid "(no description)"
+msgstr "(無描述)"
+
+msgid "attributes"
+msgstr "屬性"
+
+msgid ""
+"\n"
+"<h3>How to delete your consent</h3>\n"
+"Uncheck the box corresponding to the service provider\n"
+"\n"
+"<h3>Links</h3>\n"
+"<ul>\n"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
+"\n"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
+"</ul>\n"
+msgstr ""
+"<h3>在這刪除您的授權</h3> 取消勾選服務提供者對應的核取方塊 <h3>連結</h3> <ul> <li><a "
+"href=\"https://www.wayf.dk\">開始</a> </li> <li><a "
+"href=\"https://www.wayf.dk/index.php/en/about-wayf/faq-frequently-asked-"
+"questions\">說明</a> </li> </ul> "
+
+msgid "Consent Removed"
+msgstr "同意移除"
+
+msgid "show/hide attributes"
+msgstr "顯示/隱藏屬性"
+
+msgid "Organisation"
+msgstr "組織"
+
diff --git a/locales/zh/LC_MESSAGES/consentAdmin.po b/locales/zh/LC_MESSAGES/consentAdmin.po
new file mode 100644
index 0000000..ab6ab8d
--- /dev/null
+++ b/locales/zh/LC_MESSAGES/consentAdmin.po
@@ -0,0 +1,158 @@
+
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: SimpleSAMLphp 1.15\n"
+"Report-Msgid-Bugs-To: simplesamlphp-translation@googlegroups.com\n"
+"POT-Creation-Date: 2016-10-12 09:23+0200\n"
+"PO-Revision-Date: 2016-10-14 12:14+0200\n"
+"Last-Translator: \n"
+"Language: zh\n"
+"Language-Team: \n"
+"Plural-Forms: nplurals=1; plural=0\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.3.4\n"
+
+msgid "{consentAdmin:consentadmin:status_header}"
+msgstr "许可状态"
+
+msgid "{consentAdmin:consentadmin:attributes_text}"
+msgstr "属性"
+
+msgid "{consentAdmin:consentadmin:service_provider_header}"
+msgstr "服务提供商"
+
+msgid "{consentAdmin:consentadmin:removed}"
+msgstr "已经移除的许可"
+
+msgid "{consentAdmin:consentadmin:consentadmin_header}"
+msgstr "管理员许可"
+
+msgid "{consentAdmin:consentadmin:show}"
+msgstr "显示"
+
+msgid "{consentAdmin:consentadmin:attribute_org}"
+msgstr "组织"
+
+msgid "{consentAdmin:consentadmin:attribute_injected}"
+msgstr "注入的属性"
+
+msgid "{consentAdmin:consentadmin:show_hide_attributes}"
+msgstr "显示/隐藏属性"
+
+msgid "{consentAdmin:consentadmin:consentadmin_purpose}"
+msgstr "该服务的用途"
+
+msgid "{consentAdmin:consentadmin:hide}"
+msgstr "隐藏"
+
+msgid "{consentAdmin:consentadmin:sp_empty_description}"
+msgstr "（没有描述）"
+
+msgid "{consentAdmin:consentadmin:service_providers_for}"
+msgstr "服务提供商服务于"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description2}"
+msgstr ""
+"<h3>如何删除你的许可</h3>反选相应的SP选择框<h3>Links</h3> <ul> <li><a "
+"href=\"https://www.wayf.dk\">开始</a> </li> <li><a "
+"href=\"https://www.wayf.dk/index.php/en/about-wayf/faq-frequently-asked-"
+"questions\">FAQ</a> </li> </ul>"
+
+msgid "{consentAdmin:consentadmin:login}"
+msgstr "登陆"
+
+msgid "{consentAdmin:consentadmin:consentadmin_description1}"
+msgstr "在这里你可以查看和编辑你的SP许可"
+
+msgid "{consentAdmin:consentadmin:updated}"
+msgstr "已经更新的许可"
+
+msgid "{consentAdmin:consentadmin:unknown}"
+msgstr "未知..."
+
+msgid "{consentAdmin:consentadmin:added}"
+msgstr "已经添加的许可"
+
+msgid "{consentAdmin:consentadmin:attribute_id}"
+msgstr "身份"
+
+msgid "Injected attribut"
+msgstr "注入的属性"
+
+msgid "Show"
+msgstr "显示"
+
+msgid "Consent Added"
+msgstr "已经添加的许可"
+
+msgid "Consent Administration"
+msgstr "管理员许可"
+
+msgid "Here you can view and edit your consent for the Service Providers."
+msgstr "在这里你可以查看和编辑你的SP许可"
+
+msgid "Unknown ..."
+msgstr "未知..."
+
+msgid "Identity"
+msgstr "身份"
+
+msgid "The purpose of the service is"
+msgstr "该服务的用途"
+
+msgid "Hide"
+msgstr "隐藏"
+
+msgid "Service Provider"
+msgstr "服务提供商"
+
+msgid "Service Providers for"
+msgstr "服务提供商服务于"
+
+msgid "login"
+msgstr "登陆"
+
+msgid "(name not specified)"
+msgstr "（没有指定名字）"
+
+msgid "Consent Updated"
+msgstr "已经更新的许可"
+
+msgid "Consent status"
+msgstr "许可状态"
+
+msgid "(no description)"
+msgstr "（没有描述）"
+
+msgid "attributes"
+msgstr "属性"
+
+msgid ""
+"\n"
+"<h3>How to delete your consent</h3>\n"
+"Uncheck the box corresponding to the service provider\n"
+"\n"
+"<h3>Links</h3>\n"
+"<ul>\n"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
+"\n"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
+"</ul>\n"
+msgstr ""
+"<h3>如何删除你的许可</h3>反选相应的SP选择框<h3>Links</h3> <ul> <li><a "
+"href=\"https://www.wayf.dk\">开始</a> </li> <li><a "
+"href=\"https://www.wayf.dk/index.php/en/about-wayf/faq-frequently-asked-"
+"questions\">FAQ</a> </li> </ul>"
+
+msgid "Consent Removed"
+msgstr "已经移除的许可"
+
+msgid "show/hide attributes"
+msgstr "显示/隐藏属性"
+
+msgid "Organisation"
+msgstr "组织"
+
diff --git a/phpunit.xml b/phpunit.xml
new file mode 100644
index 0000000..c0985fd
--- /dev/null
+++ b/phpunit.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<phpunit bootstrap="tests/bootstrap.php">
+    <testsuites>
+        <testsuite name="The project's test suite">
+            <directory>tests/</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">./lib</directory>
+        </whitelist>
+    </filter>
+    <logging>
+        <log type="coverage-text" target="php://stdout" showUncoveredFiles="true" />
+        <log type="coverage-html" target="build/coverage" title="PHP Coveralls" charset="UTF-8" yui="true" highlight="true" lowUpperBound="35" highLowerBound="70" />
+        <log type="coverage-clover" target="build/logs/clover.xml" />
+    </logging>
+</phpunit>
+
diff --git a/psalm.xml b/psalm.xml
new file mode 100644
index 0000000..8f1adc5
--- /dev/null
+++ b/psalm.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<psalm
+    name="SimpleSAMLphp consent admin module"
+    useDocblockTypes="true"
+    totallyTyped="false"
+>
+    <projectFiles>
+        <directory name="www" />
+    </projectFiles>
+
+    <issueHandlers>
+        <LessSpecificReturnType errorLevel="info" />
+
+        <!-- level 3 issues - slightly lazy code writing, but probably low false-negatives -->
+        <DeprecatedMethod errorLevel="info" />
+
+        <MissingClosureReturnType errorLevel="info" />
+        <MissingReturnType errorLevel="info" />
+        <MissingPropertyType errorLevel="info" />
+        <InvalidDocblock errorLevel="info" />
+        <MisplacedRequiredParam errorLevel="info" />
+
+        <PropertyNotSetInConstructor errorLevel="info" />
+        <MissingConstructor errorLevel="info" />
+        <MissingClosureParamType errorLevel="info" />
+        <MissingParamType errorLevel="info" />
+        <UnusedClass errorLevel="info" />
+        <PossiblyUnusedMethod errorLevel="info" />
+    </issueHandlers>
+</psalm>
diff --git a/templates/consentadmin.php b/templates/consentadmin.php
new file mode 100644
index 0000000..e8c3bcc
--- /dev/null
+++ b/templates/consentadmin.php
@@ -0,0 +1,90 @@
+<?php
+    $this->data['head'] = '<link rel="stylesheet" type="text/css" href="'.
+        SimpleSAML\Module::getModuleURL("consentAdmin/assets/css/consentAdmin.css").'" />'."\n";
+    $this->data['head'] .= '<script type="text/javascript" src="'.
+        SimpleSAML\Module::getModuleURL("consentAdmin/assets/js/consentAdmin.js").'"></script>';
+    // default theme
+    $this->includeAtTemplateBase('includes/header.php');
+?>
+        <h2><?php echo $this->t('{consentAdmin:consentadmin:consentadmin_header}') ?></h2>
+        <p>
+        <?php echo $this->t('{consentAdmin:consentadmin:consentadmin_description1}') ?> </p>
+
+
+            <table>
+            <tr>
+                <th width="80%"><?php echo $this->t('{consentAdmin:consentadmin:service_provider_header}') ?></th>
+                <th><?php echo $this->t('{consentAdmin:consentadmin:status_header}') ?></th>
+            </tr>
+            <?php
+            $spList = $this->data['spList'];
+            $show_spid = 0;
+            $show_text = $this->t('{consentAdmin:consentadmin:show}');
+            $hide_text = $this->t('{consentAdmin:consentadmin:hide}');
+            $attributes_text = $this->t('{consentAdmin:consentadmin:attributes_text}');
+            foreach ($spList as $spName => $spValues) {
+                if (!is_null($spValues['serviceurl'])) {
+                    $htmlSpName = '<a class="serviceUrl" href="'.$spValues['serviceurl'].'">'.
+                        htmlspecialchars($spValues['name']).'</a>';
+                } else {
+                    $htmlSpName = htmlspecialchars($spValues['name']);
+                }
+                $spDescription = htmlspecialchars($spValues['description']);
+                $checkedAttr = $spValues['consentStatus'] == 'ok' ? 'checked="checked"' : '';
+                $consentValue = $spValues['consentValue'];
+                $consentText = $spValues['consentStatus'] == 'changed' ? "attributes has changed" : "";
+                $row_class = ($show_spid % 2) ? "row0" : "row1";
+                echo <<<TRSTART
+<tr class="$row_class">
+<td>
+    <table>
+      <tr class="$row_class">
+          <td><span class='caSPName'><span title='$spDescription'>$htmlSpName</span>&emsp;
+          <span class="show_hide" id="show_hide_$show_spid"><span id='showing_$show_spid'>$show_text</span>
+          <span id='hiding_$show_spid'>$hide_text</span> $attributes_text</span></span></td></tr>
+      <tr><td colspan="2" class="caAttributes"><div id="attributes_$show_spid">
+TRSTART;
+                $attributes = $spValues['attributes_by_sp'];
+                if ($this->data['showDescription']) {
+                    echo '<p>'.$this->t('{consentAdmin:consentadmin:consentadmin_purpose}').' '.$spDescription.'</p>';
+                }
+                echo "\n<ul>\n";
+                foreach ($attributes as $name => $value) {
+                    if (sizeof($value) > 1) {
+                        echo "<li>".htmlspecialchars($name).":\n<ul>\n";
+                        foreach ($value as $v) {
+                            echo '<li>'.htmlspecialchars($v)."</li>\n";
+                        }
+                        echo "</ul>\n</li>\n";
+                    } else {
+                        echo "<li>".htmlspecialchars($name).": ".htmlspecialchars($value[0])."</li>\n";
+                    }
+                }
+                echo "</ul>";
+                echo <<<TRSTART
+      </div></td></tr>
+  </table>
+</td>
+
+<td class='caAllowed'>
+    <input id="checkbox_$show_spid" class="checkbox" value='$consentValue' type='checkbox' $checkedAttr />
+    <span id="consentText_$show_spid">$consentText</span></td>
+TRSTART;
+                echo "</tr>\n";
+                $show_spid++;
+            }
+            ?>
+            </table>
+
+            <p>
+        <?php echo $this->t('{consentAdmin:consentadmin:consentadmin_description2}') ?> </p>
+
+        <h2>Logout</h2>
+        <p>
+            <a href="
+            <?php
+                echo \SimpleSAML\Module::getModuleURL('consentAdmin/consentAdmin.php', ['logout' => 1]);
+            ?>">Logout</a>
+        </p>
+
+<?php $this->includeAtTemplateBase('includes/footer.php');
diff --git a/templates/consentadmin.twig b/templates/consentadmin.twig
new file mode 100644
index 0000000..aa1e81f
--- /dev/null
+++ b/templates/consentadmin.twig
@@ -0,0 +1,82 @@
+{% set pagetitle = '{consentAdmin:consentadmin:consentadmin_header}'|trans %}
+{% extends "base.twig" %}
+
+{% block preload %}
+<link rel="stylesheet" href="/{{ baseurlpath }}module.php/consentAdmin/assets/css/consentAdmin.css">
+{% endblock %}
+
+{% block postload %}
+<script src="/{{ baseurlpath }}module.php/consentAdmin/assets/js/consentAdmin.js"></script>
+{% endblock %}
+
+{% block content %}
+
+<h2>{{ '{consentAdmin:consentadmin:consentadmin_header}'|trans }}</h2>
+<p>{{ '{consentAdmin:consentadmin:consentadmin_description1}'|trans }}</p>
+
+<table>
+    <tr>
+        <th colspan="2" width="80%">{{ '{consentAdmin:consentadmin:service_provider_header}'|trans }}</th>
+        <th width="140">{{ '{consentAdmin:consentadmin:status_header}'|trans }}</th>
+    </tr>
+
+{% for spName, spValues in spList %}
+
+    {% if loop.index0 % 2 == 0 %}
+        {% set rowClass = 'row0' %}
+    {% else %}
+        {% set rowClass = 'row1' %}
+    {% endif %}
+
+    <tr class="{{ rowClass }}">
+        <td>
+            <span class='caSPName'>
+                <span title='{{ spValues.description|escape('html') }}'>
+                {% if spValues.serviceurl is defined %}
+                    {{ spValues.name|escape('html') }}
+                {% else %}
+                    <a class="serviceUrl" href="{{ spValues.serviceurl }}">{{ spValues.name|escape('html') }}</a>
+                {% endif %}
+                </span>
+                <span class="show_hide" id="show_hide_{{ loop.index0 }}">
+                    <span id="showing_{{ loop.index0 }}">{{ '{consentAdmin:consentadmin:show}'|trans }}</span>
+                    <span id="hiding_{{ loop.index0 }}">{{ '{consentAdmin:consentadmin:hide}'|trans }}</span>
+                    {{ '{consentAdmin:consentadmin:attributes_text}'|trans }}
+                </span>
+            </span>
+        </td>
+        <td class="caAttributes">
+            <div id="attributes_{{ loop.index0 }}">
+            {% if showDescription %}
+                <p>{{ '{consentAdmin:consentadmin:consentadmin_purpose}'|trans }}{{ spValues.description|escape('html') }}</p>
+            {% endif %}
+                <ul>
+                {% for attrName, attrValue in spValues.attributes_by_sp %}
+                {% if attrValue|length > 1 %}
+                    <li>{{ attrName|escape('html') }}:
+                        <ul>
+                        {% for valKey, value in attrValue %}
+                            <li>{{ value|escape('html') }}</li>
+                        {% endfor %}
+                        </ul>
+                    </li>
+                {% else %}
+                    <li>{{ attrName|escape('html') }}: {{ attrValue|first|escape('html') }}</li>
+                {% endif %}
+                {% endfor %}
+                </ul>
+            </div>
+        </td>
+        <td class="caAllowed">
+            <input class="checkbox" id="checkbox_{{ loop.index0 }}" value='{{ spValues.consentValue }}' type='checkbox'{% if spValues.consentStatus == 'ok'%} checked="checked"{% endif %} /><span id="consentText_{{ loop.index0 }}">{% if spValues.consentStatus == 'changed' %}attributes has changed{% endif %}</span>
+        </td>
+    </tr>
+{% endfor %}
+</table>
+
+<p>{{ '{consentAdmin:consentadmin:consentadmin_description2}'|trans|raw }}</p>
+
+<h2>Logout</h2>
+<p><a href="/{{ baseurlpath }}module.php/consentAdmin/consentAdmin.php?logout=1">Logout</a></p>
+
+{% endblock %}
diff --git a/templates/consentadminajax.php b/templates/consentadminajax.php
new file mode 100644
index 0000000..c8520b0
--- /dev/null
+++ b/templates/consentadminajax.php
@@ -0,0 +1,2 @@
+<?php
+echo $res;
diff --git a/templates/consentadminajax.twig b/templates/consentadminajax.twig
new file mode 100644
index 0000000..2b82118
--- /dev/null
+++ b/templates/consentadminajax.twig
@@ -0,0 +1,3 @@
+{% block content %}
+{{ res }}
+{% endblock %}
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
new file mode 100644
index 0000000..1c94a49
--- /dev/null
+++ b/tests/bootstrap.php
@@ -0,0 +1,11 @@
+<?php
+
+$projectRoot = dirname(__DIR__);
+require_once($projectRoot.'/vendor/autoload.php');
+
+// Symlink module into ssp vendor lib so that templates and urls can resolve correctly
+$linkPath = $projectRoot.'/vendor/simplesamlphp/simplesamlphp/modules/consentadmin';
+if (file_exists($linkPath) === false) {
+    echo "Linking '$linkPath' to '$projectRoot'\n";
+    symlink($projectRoot, $linkPath);
+}
diff --git a/www/assets/css/consentAdmin.css b/www/assets/css/consentAdmin.css
new file mode 100644
index 0000000..94c4a19
--- /dev/null
+++ b/www/assets/css/consentAdmin.css
@@ -0,0 +1,39 @@
+.caSPName {
+    font-weight: bold;
+}
+td.caSPName {
+    vertical-align: top;
+}
+td.caAllowed {
+    vertical-align: top;
+}
+td.caAttributes {
+}
+tr.row0 td {
+    background-color: #888888;
+    color: black;
+}
+tr.row1 td {
+    background-color: #aaaaaa;
+    color: black;
+}
+a.orange {
+    color: #ffd633;
+}
+
+span.show_hide {
+    font-size: 80%;
+}
+
+a.serviceUrl {
+    color: black;
+    font-weight: bold;
+}
+
+span[id^='hiding_'], span[id*='hiding_'] {
+    display: none;
+}
+
+div[id^='attributes_'], div[id*='attributes_'] {
+    display: none;
+}
diff --git a/www/assets/js/consentAdmin.js b/www/assets/js/consentAdmin.js
new file mode 100644
index 0000000..59cf4e1
--- /dev/null
+++ b/www/assets/js/consentAdmin.js
@@ -0,0 +1,79 @@
+var xmlHttp;
+
+function checkConsent()
+{
+    var show_spid = this.id.charAt(this.id.length-1);
+    var checkbox = document.getElementById("checkbox_"+show_spid);
+
+    xmlHttp = GetXmlHttpObject()
+    if (xmlHttp == null) {
+        alert("Browser does not support HTTP Request")
+        return
+    }
+
+    var url = "consentAdmin.php"
+    url = url+"?cv="+checkbox.value
+    url = url+"&action="+checkbox.checked
+    url = url+"&sid="+Math.random()
+
+    xmlHttp.onreadystatechange = function () {
+        if (xmlHttp.readyState == 4 || xmlHttp.readyState == "complete") {
+            document.getElementById("consentText_" + show_spid).innerHTML = xmlHttp.responseText;
+        }
+    }
+
+    xmlHttp.open("GET", url, true)
+    xmlHttp.send(null)
+}
+
+// This function creates an XMLHttpRequest
+function GetXmlHttpObject()
+{
+    var xmlHttp = null;
+    try {
+        // Firefox, Opera 8.0+, Safari
+        xmlHttp = new XMLHttpRequest();
+    } catch (e) {
+        //Internet Explorer
+        try {
+            xmlHttp = new ActiveXObject("Msxml2.XMLHTTP");
+        } catch (e) {
+            xmlHttp = new ActiveXObject("Microsoft.XMLHTTP");
+        }
+    }
+    return xmlHttp;
+}
+
+function toggleShowAttributes()
+{
+    var show_spid = this.id.charAt(this.id.length-1);
+
+    var disp = document.getElementById('attributes_' + show_spid);
+    var showing = document.getElementById('showing_' + show_spid);
+    var hiding = document.getElementById('hiding_' + show_spid);
+
+    disp.style.display = (disp.style.display == 'none' ? 'block' : 'none');
+    showing.style.display = (disp.style.display == 'none' ? 'inline' : 'none');
+    hiding.style.display = (disp.style.display == 'none' ? 'none' : 'inline');
+}
+
+document.addEventListener(
+    'DOMContentLoaded',
+    function () {
+        var show_hide = document.getElementsByClassName("show_hide");
+        for (var i = 0; i < show_hide.length; i++) {
+            show_hide[i].addEventListener(
+                'click',
+                toggleShowAttributes
+            );
+        }
+
+        var checkbox = document.getElementsByClassName("checkbox");
+        for (var i = 0; i < checkbox.length; i++) {
+            checkbox[i].addEventListener(
+                'click',
+                checkConsent
+            );
+        }
+    }
+);
diff --git a/www/consentAdmin.php b/www/consentAdmin.php
new file mode 100644
index 0000000..5a00ce4
--- /dev/null
+++ b/www/consentAdmin.php
@@ -0,0 +1,338 @@
+<?php
+/*
+ * consentAdmin - Consent administration module
+ *
+ * This module enables the user to add and remove consents given for a given
+ * Service Provider.
+ *
+ * The module relies on methods and functions from the Consent module and can
+ * not be user without it.
+ *
+ * Author: Mads Freek <freek@ruc.dk>, Jacob Christiansen <jach@wayf.dk>
+ */
+
+/**
+ * Runs the processing chain and ignores all filter which have user
+ * interaction.
+ *
+ * @param array $idp_metadata
+ * @param string $source
+ * @param array $sp_metadata
+ * @param string $sp_entityid
+ * @param array $attributes
+ * @param string $userid
+ * @param bool $hashAttributes
+ * @param array $excludeAttributes
+ * @return array
+ */
+function driveProcessingChain(
+    $idp_metadata,
+    $source,
+    $sp_metadata,
+    $sp_entityid,
+    $attributes,
+    $userid,
+    $hashAttributes = false,
+    $excludeAttributes = []
+) {
+    /*
+     * Create a new processing chain
+     */
+    $pc = new \SimpleSAML\Auth\ProcessingChain($idp_metadata, $sp_metadata, 'idp');
+
+    /*
+     * Construct the state.
+     * REMEMBER: Do not set Return URL if you are calling processStatePassive
+     */
+    $authProcState = [
+        'Attributes'  => $attributes,
+        'Destination' => $sp_metadata,
+        'SPMetadata'  => $sp_metadata,
+        'Source'      => $idp_metadata,
+        'IdPMetadata' => $idp_metadata,
+        'isPassive'   => true,
+    ];
+    /* we're being bridged, so add that info to the state */
+    if (strpos($source, '-idp-remote|') !== false) {
+        $authProcState['saml:sp:IdP'] = substr($source, strpos($source, '|') + 1);
+    }
+
+    /*
+     * Call processStatePAssive.
+     * We are not interested in any user interaction, only modifications to the attributes
+     */
+    $pc->processStatePassive($authProcState);
+
+    $attributes = $authProcState['Attributes'];
+    // Remove attributes that do not require consent/should be excluded
+    foreach ($attributes as $attrkey => $attrval) {
+        if (in_array($attrkey, $excludeAttributes)) {
+            unset($attributes[$attrkey]);
+        }
+    }
+
+    /*
+     * Generate identifiers and hashes
+     */
+    $destination = $sp_metadata['metadata-set'].'|'.$sp_entityid;
+
+    $targeted_id = \SimpleSAML\Module\consent\Auth\Process\Consent::getTargetedID($userid, $source, $destination);
+    $attribute_hash = \SimpleSAML\Module\consent\Auth\Process\Consent::getAttributeHash($attributes, $hashAttributes);
+
+    \SimpleSAML\Logger::info('consentAdmin: user: '.$userid);
+    \SimpleSAML\Logger::info('consentAdmin: target: '.$targeted_id);
+    \SimpleSAML\Logger::info('consentAdmin: attribute: '.$attribute_hash);
+
+    // Return values
+    return [$targeted_id, $attribute_hash, $attributes];
+}
+
+// Get config object
+$config = \SimpleSAML\Configuration::getInstance();
+$cA_config = \SimpleSAML\Configuration::getConfig('module_consentAdmin.php');
+$authority = $cA_config->getValue('authority');
+
+$as = new \SimpleSAML\Auth\Simple($authority);
+
+// If request is a logout request
+if (array_key_exists('logout', $_REQUEST)) {
+    $returnURL = $cA_config->getValue('returnURL');
+    $as->logout($returnURL);
+}
+
+$hashAttributes = $cA_config->getValue('attributes.hash');
+
+$excludeAttributes = $cA_config->getValue('attributes.exclude', []);
+
+// Check if valid local session exists
+$as->requireAuth();
+
+// Get released attributes
+$attributes = $as->getAttributes();
+
+// Get metadata storage handler
+$metadata = \SimpleSAML\Metadata\MetaDataStorageHandler::getMetadataHandler();
+
+/*
+ * Get IdP id and metadata
+ */
+
+$idp_entityid = $metadata->getMetaDataCurrentEntityID('saml20-idp-hosted');
+$idp_metadata = $metadata->getMetaData($idp_entityid, 'saml20-idp-hosted');
+
+// Calc correct source
+if ($as->getAuthData('saml:sp:IdP') !== null) {
+    // from a remote idp (as bridge)
+    $source = 'saml20-idp-remote|'.$as->getAuthData('saml:sp:IdP');
+} else {
+    // from the local idp
+    $source = $idp_metadata['metadata-set'].'|'.$idp_entityid;
+}
+
+// Get user ID
+if (isset($idp_metadata['userid.attribute']) && is_string($idp_metadata['userid.attribute'])) {
+    $userid_attributename = $idp_metadata['userid.attribute'];
+} else {
+    $userid_attributename = 'eduPersonPrincipalName';
+}
+
+$userids = $attributes[$userid_attributename];
+
+if (empty($userids)) {
+    throw new \Exception('Could not generate useridentifier for storing consent. Attribute ['.
+        $userid_attributename.'] was not available.');
+}
+
+$userid = $userids[0];
+
+// Get all SP metadata
+$all_sp_metadata = $metadata->getList('saml20-sp-remote');
+
+// Parse action, if any
+$action = null;
+$sp_entityid = null;
+if (!empty($_GET['cv'])) {
+    $sp_entityid = $_GET['cv'];
+}
+if (!empty($_GET['action'])) {
+    $action = $_GET["action"];
+}
+
+\SimpleSAML\Logger::critical('consentAdmin: sp: '.$sp_entityid.' action: '.$action);
+
+// Remove services, whitch have consent disabled
+if (isset($idp_metadata['consent.disable'])) {
+    foreach ($idp_metadata['consent.disable'] as $disable) {
+        if (array_key_exists($disable, $all_sp_metadata)) {
+            unset($all_sp_metadata[$disable]);
+        }
+    }
+}
+
+\SimpleSAML\Logger::info('consentAdmin: '.$idp_entityid);
+
+// Parse consent config
+$consent_storage = \SimpleSAML\Module\consent\Store::parseStoreConfig($cA_config->getValue('consentadmin'));
+
+// Calc correct user ID hash
+$hashed_user_id = \SimpleSAML\Module\consent\Auth\Process\Consent::getHashedUserID($userid, $source);
+
+// If a checkbox have been clicked
+if ($action !== null && $sp_entityid !== null) {
+    // init template to enable translation of status messages
+    $template = new \SimpleSAML\XHTML\Template(
+        $config,
+        'consentAdmin:consentadminajax.php',
+        'consentAdmin:consentadmin'
+    );
+    $translator = $template->getTranslator();
+
+    // Get SP metadata
+    $sp_metadata = $metadata->getMetaData($sp_entityid, 'saml20-sp-remote');
+
+    // Run AuthProc filters
+    list($targeted_id, $attribute_hash, $attributes_new) = driveProcessingChain(
+        $idp_metadata,
+        $source,
+        $sp_metadata,
+        $sp_entityid,
+        $attributes,
+        $userid,
+        $hashAttributes,
+        $excludeAttributes
+    );
+
+    // Add a consent (or update if attributes have changed and old consent for SP and IdP exists)
+    if ($action == 'true') {
+        $isStored = $consent_storage->saveConsent($hashed_user_id, $targeted_id, $attribute_hash);
+        if ($isStored) {
+            $res = $translator->t("added");
+        } else {
+            $res = $translator->t("updated");
+        }
+        // Remove consent
+    } else {
+        if ($action == 'false') {
+            // Got consent, so this is a request to remove it
+            $rowcount = $consent_storage->deleteConsent($hashed_user_id, $targeted_id);
+            if ($rowcount > 0) {
+                $res = $translator->t("removed");
+            }
+            // Unknown action (should not happen)
+        } else {
+            \SimpleSAML\Logger::info('consentAdmin: unknown action');
+            $res = $translator->t("unknown");
+        }
+    }
+    $template->data['res'] = $res;
+    $template->show();
+    exit;
+}
+
+// Get all consents for user
+$user_consent_list = $consent_storage->getConsents($hashed_user_id);
+
+// Parse list of consents
+$user_consent = [];
+foreach ($user_consent_list as $c) {
+    $user_consent[$c[0]] = $c[1];
+}
+
+$template_sp_content = [];
+
+// Init template
+$template = new \SimpleSAML\XHTML\Template($config, 'consentAdmin:consentadmin.php', 'consentAdmin:consentadmin');
+$translator = $template->getTranslator();
+$translator->includeLanguageFile('attributes'); // attribute listings translated by this dictionary
+
+$sp_empty_description = $translator->getTag('sp_empty_description');
+
+// Process consents for all SP
+foreach ($all_sp_metadata as $sp_entityid => $sp_values) {
+    // Get metadata for SP
+    $sp_metadata = $metadata->getMetaData($sp_entityid, 'saml20-sp-remote');
+
+    // Run attribute filters
+    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";
+        \SimpleSAML\Logger::info('consentAdmin: changed');
+        // Check if consent is valid. (Possible that attributes has changed)
+        if ($user_consent[$targeted_id] == $attribute_hash) {
+            \SimpleSAML\Logger::info('consentAdmin: ok');
+            $sp_status = "ok";
+        }
+        // Consent does not exist
+    } else {
+        SimpleSAML\Logger::info('consentAdmin: none');
+        $sp_status = "none";
+    }
+
+    // Set name of SP
+    if (isset($sp_values['name']) && is_array($sp_values['name'])) {
+        $sp_name = $sp_metadata['name'];
+    } else {
+        if (isset($sp_values['name']) && is_string($sp_values['name'])) {
+            $sp_name = $sp_metadata['name'];
+        } elseif (isset($sp_values['OrganizationDisplayName']) && is_array($sp_values['OrganizationDisplayName'])) {
+            $sp_name = $sp_metadata['OrganizationDisplayName'];
+        } else {
+            $sp_name = $sp_entityid;
+        }
+    }
+
+    // Set description of SP
+    if (empty($sp_metadata['description']) || !is_array($sp_metadata['description'])) {
+        $sp_description = $sp_empty_description;
+    } else {
+        $sp_description = $sp_metadata['description'];
+    }
+
+    // Add a URL to the service if present in metadata
+    $sp_service_url = isset($sp_metadata['ServiceURL']) ? $sp_metadata['ServiceURL'] : null;
+
+    // Translate SP name and description
+    $translator->includeInlineTranslation('spname', $sp_name);
+    $translator->includeInlineTranslation('spdescription', $sp_description);
+
+    $sp_name = $translator->getPreferredTranslation($translator->getTag('spname'));
+    $sp_description = $translator->getPreferredTranslation($translator->getTag('spdescription'));
+
+    // Fill out array for the template
+    $sp_list[$sp_entityid] = [
+        'spentityid'       => $sp_entityid,
+        'name'             => $sp_name,
+        'description'      => $sp_description,
+        'consentStatus'    => $sp_status,
+        'consentValue'     => $sp_entityid,
+        'attributes_by_sp' => $attributes_new,
+        'serviceurl'       => $sp_service_url,
+    ];
+}
+
+$template->data['header'] = 'Consent Administration';
+$template->data['spList'] = $sp_list;
+$template->data['showDescription'] = $cA_config->getValue('showDescription');
+$template->show();

From fd5495300bedb94fb9a0a420cc79c64e84ae0512 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Wed, 13 Mar 2019 23:49:04 +0100
Subject: [PATCH 002/135] Migrate assertions to Webmozart

---
 hooks/hook_frontpage.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/hooks/hook_frontpage.php b/hooks/hook_frontpage.php
index 5059384..e9f9bce 100644
--- a/hooks/hook_frontpage.php
+++ b/hooks/hook_frontpage.php
@@ -1,5 +1,7 @@
 <?php
 
+use Webmozart\Assert\Assert;
+
 /**
  * Hook to add the consentAdmin module to the frontpage.
  *
@@ -8,8 +10,8 @@
  */
 function consentAdmin_hook_frontpage(&$links)
 {
-    assert(is_array($links));
-    assert(array_key_exists('links', $links));
+    Assert::isArray($links);
+    Assert::keyExists($links, 'links');
 
     $links['config'][] = [
         'href' => SimpleSAML\Module::getModuleURL('consentAdmin/consentAdmin.php'),

From 07e25eac628892a0f72b9452ec097dc4cdc7f333 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Thu, 14 Mar 2019 12:15:23 +0100
Subject: [PATCH 003/135] Fix Psalm issues

---
 www/consentAdmin.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/www/consentAdmin.php b/www/consentAdmin.php
index 5a00ce4..7029afa 100644
--- a/www/consentAdmin.php
+++ b/www/consentAdmin.php
@@ -54,7 +54,9 @@ function driveProcessingChain(
     ];
     /* we're being bridged, so add that info to the state */
     if (strpos($source, '-idp-remote|') !== false) {
-        $authProcState['saml:sp:IdP'] = substr($source, strpos($source, '|') + 1);
+        /** @var int $i */
+        $i = strpos($source, '|');
+        $authProcState['saml:sp:IdP'] = substr($source, $i + 1);
     }
 
     /*
@@ -217,8 +219,9 @@ function driveProcessingChain(
             $rowcount = $consent_storage->deleteConsent($hashed_user_id, $targeted_id);
             if ($rowcount > 0) {
                 $res = $translator->t("removed");
+            } else {
+                throw new \Exception("Unknown action (should not happen)");
             }
-            // Unknown action (should not happen)
         } else {
             \SimpleSAML\Logger::info('consentAdmin: unknown action');
             $res = $translator->t("unknown");
@@ -246,6 +249,7 @@ function driveProcessingChain(
 $translator->includeLanguageFile('attributes'); // attribute listings translated by this dictionary
 
 $sp_empty_description = $translator->getTag('sp_empty_description');
+$sp_list = [];
 
 // Process consents for all SP
 foreach ($all_sp_metadata as $sp_entityid => $sp_values) {

From 100c48e73d5571f0a6fd61c3388da36437cca1fd Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Fri, 22 Mar 2019 17:24:02 +0100
Subject: [PATCH 004/135] Upgrade dependencies / PHP >= 5.6

---
 .travis.yml   | 1 -
 composer.json | 6 +++---
 psalm.xml     | 1 +
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c47ac23..fec43ab 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,6 @@ sudo: required
 language: php
 
 php:
-  - 5.5
   - 5.6
   - 7.0
   - 7.1
diff --git a/composer.json b/composer.json
index d4062d1..9152b1c 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,7 @@
         },
         {
             "name": "Olav Morken",
-            "email": "lavmrk@gmail.com"
+            "email": "olav.morken@uninett.no"
         }
     ],
     "config": {
@@ -26,14 +26,14 @@
         }
     },
     "require": {
-        "php": ">=5.5",
+        "php": ">=5.6",
         "simplesamlphp/composer-module-installer": "~1.1",
         "simplesamlphp/simplesamlphp-module-consent": "^1.0",
         "webmozart/assert": "~1.4"
     },
     "require-dev": {
         "simplesamlphp/simplesamlphp": "^1.17",
-        "phpunit/phpunit": "~4.8.36"
+        "phpunit/phpunit": "~5.7"
     },
     "extra": {
         "ssp-mixedcase-module-name": "consentAdmin"
diff --git a/psalm.xml b/psalm.xml
index 8f1adc5..0727451 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -5,6 +5,7 @@
     totallyTyped="false"
 >
     <projectFiles>
+        <directory name="hooks" />
         <directory name="www" />
     </projectFiles>
 

From b2de55d5b95a58494c372d25f74317ba712e9288 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Mon, 20 May 2019 17:53:58 +0200
Subject: [PATCH 005/135] Fix comparsion + reuse of var

---
 www/assets/js/consentAdmin.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/www/assets/js/consentAdmin.js b/www/assets/js/consentAdmin.js
index 59cf4e1..83248d3 100644
--- a/www/assets/js/consentAdmin.js
+++ b/www/assets/js/consentAdmin.js
@@ -6,7 +6,7 @@ function checkConsent()
     var checkbox = document.getElementById("checkbox_"+show_spid);
 
     xmlHttp = GetXmlHttpObject()
-    if (xmlHttp == null) {
+    if (xmlHttp === null) {
         alert("Browser does not support HTTP Request")
         return
     }
@@ -69,8 +69,8 @@ document.addEventListener(
         }
 
         var checkbox = document.getElementsByClassName("checkbox");
-        for (var i = 0; i < checkbox.length; i++) {
-            checkbox[i].addEventListener(
+        for (var j = 0; j < checkbox.length; j++) {
+            checkbox[j].addEventListener(
                 'click',
                 checkConsent
             );

From c216f7c0de2c72491f1772852f824d64478f14db Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Tue, 4 Jun 2019 11:30:03 +0200
Subject: [PATCH 006/135] Update composer.json

---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 9152b1c..254a989 100644
--- a/composer.json
+++ b/composer.json
@@ -39,7 +39,7 @@
         "ssp-mixedcase-module-name": "consentAdmin"
     },
     "support": {
-        "issues": "https://github.com/tvdijen/simplesamlphp-module-consentadmin/issues",
-        "source": "https://github.com/tvdijen/simplesamlphp-module-consentadmin"
+        "issues": "https://github.com/simplesamlphp/simplesamlphp-module-consentadmin/issues",
+        "source": "https://github.com/simplesamlphp/simplesamlphp-module-consentadmin"
     }
 }

From 9cce5c89cf35efbb244579e8a46954e1ec7f3d7f Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tim.dijen@minbzk.nl>
Date: Sun, 14 Jul 2019 16:02:50 +0200
Subject: [PATCH 007/135] Create TemplateTest.php

---
 tests/www/TemplateTest.php | 45 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 tests/www/TemplateTest.php

diff --git a/tests/www/TemplateTest.php b/tests/www/TemplateTest.php
new file mode 100644
index 0000000..affa613
--- /dev/null
+++ b/tests/www/TemplateTest.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Simple test for syntax-checking Twig-templates.
+ *
+ * @author Tim van Dijen <tvdijen@gmail.com>
+ * @package SimpleSAMLphp
+ */
+ 
+namespace SimpleSAML\Test\Web;
+
+use PHPUnit\Framework\TestCase;
+use SimpleSAML\Configuration;
+use SimpleSAML\XHTML\Template;
+use SimpleSAML\Module;
+use Twig\Error\SyntaxError;
+
+class TemplateTest extends TestCase
+{
+    public function testSyntax()
+    {
+        $config = Configuration::loadFromArray([
+            'language.i18n.backend' => 'gettext/gettext',
+            'module.enable' => array_fill_keys(Module::getModules(), true),
+        ]);
+
+        Configuration::setPreLoadedConfig($config);
+        $basedir = dirname(dirname(dirname(__FILE__))).DIRECTORY_SEPARATOR.'templates';
+
+        // Base templates
+        $files = array_diff(scandir($basedir), ['.', '..']);
+        foreach ($files as $file) {
+            if (preg_match('/.twig$/', $file)) {
+                $t = new Template($config, 'consentAdmin:'.basename($file));
+                ob_start();
+                try {
+                    $t->show();
+                    $this->addToAssertionCount(1);
+                } catch (SyntaxError $e) {
+                    $this->fail($e->getMessage().' in '.$e->getFile().':'.$e->getLine());
+                }
+                ob_end_clean();
+            }
+        }
+    }
+}

From fce9ce9eebb194f5fc839835333a6106dc37b440 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Sat, 10 Aug 2019 23:17:03 +0200
Subject: [PATCH 008/135] Use more of the test-framework

---
 .travis.yml                |  3 +--
 bin/check-syntax.sh        | 15 -------------
 composer.json              |  2 +-
 phpunit.xml                |  1 +
 tests/www/TemplateTest.php | 45 --------------------------------------
 5 files changed, 3 insertions(+), 63 deletions(-)
 delete mode 100755 bin/check-syntax.sh
 delete mode 100644 tests/www/TemplateTest.php

diff --git a/.travis.yml b/.travis.yml
index fec43ab..208a6d6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,10 +15,9 @@ env:
 before_script:
   - composer require "simplesamlphp/simplesamlphp:${SIMPLESAMLPHP_VERSION}" --no-update
   - composer update --no-interaction
-  - if [[ "$TRAVIS_PHP_VERSION" == "7.3" ]]; then composer require --dev vimeo/psalm:1.1.9; fi
 
 script:
-  - bin/check-syntax.sh
+  - vendor/simplesamlphp/simplesamlphp-test-framework/bin/check-syntax-php.sh
   - if [[ "$TRAVIS_PHP_VERSION" == "5.6" ]]; then php vendor/phpunit/phpunit/phpunit; else php vendor/phpunit/phpunit/phpunit --no-coverage; fi
   - if [[ "$TRAVIS_PHP_VERSION" == "7.3" ]]; then vendor/bin/psalm; fi
 
diff --git a/bin/check-syntax.sh b/bin/check-syntax.sh
deleted file mode 100755
index 718d5d5..0000000
--- a/bin/check-syntax.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-
-PHP='/usr/bin/env php'
-RETURN=0
-
-# check PHP files
-for FILE in `find config-templates hooks tests templates www -name "*.php"`; do
-    $PHP -l $FILE > /dev/null 2>&1
-    if [ $? -ne 0 ]; then
-        echo "Syntax check failed for ${FILE}"
-        RETURN=`expr ${RETURN} + 1`
-    fi
-done
-
-exit $RETURN
diff --git a/composer.json b/composer.json
index 254a989..4217c77 100644
--- a/composer.json
+++ b/composer.json
@@ -33,7 +33,7 @@
     },
     "require-dev": {
         "simplesamlphp/simplesamlphp": "^1.17",
-        "phpunit/phpunit": "~5.7"
+        "simplesamlphp/simplesamlphp-test-framework": "^0.0.10"
     },
     "extra": {
         "ssp-mixedcase-module-name": "consentAdmin"
diff --git a/phpunit.xml b/phpunit.xml
index c0985fd..0540658 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -2,6 +2,7 @@
 <phpunit bootstrap="tests/bootstrap.php">
     <testsuites>
         <testsuite name="The project's test suite">
+            <directory>./vendor/simplesamlphp/simplesamlphp-test-framework/tests/</directory>
             <directory>tests/</directory>
         </testsuite>
     </testsuites>
diff --git a/tests/www/TemplateTest.php b/tests/www/TemplateTest.php
deleted file mode 100644
index affa613..0000000
--- a/tests/www/TemplateTest.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Simple test for syntax-checking Twig-templates.
- *
- * @author Tim van Dijen <tvdijen@gmail.com>
- * @package SimpleSAMLphp
- */
- 
-namespace SimpleSAML\Test\Web;
-
-use PHPUnit\Framework\TestCase;
-use SimpleSAML\Configuration;
-use SimpleSAML\XHTML\Template;
-use SimpleSAML\Module;
-use Twig\Error\SyntaxError;
-
-class TemplateTest extends TestCase
-{
-    public function testSyntax()
-    {
-        $config = Configuration::loadFromArray([
-            'language.i18n.backend' => 'gettext/gettext',
-            'module.enable' => array_fill_keys(Module::getModules(), true),
-        ]);
-
-        Configuration::setPreLoadedConfig($config);
-        $basedir = dirname(dirname(dirname(__FILE__))).DIRECTORY_SEPARATOR.'templates';
-
-        // Base templates
-        $files = array_diff(scandir($basedir), ['.', '..']);
-        foreach ($files as $file) {
-            if (preg_match('/.twig$/', $file)) {
-                $t = new Template($config, 'consentAdmin:'.basename($file));
-                ob_start();
-                try {
-                    $t->show();
-                    $this->addToAssertionCount(1);
-                } catch (SyntaxError $e) {
-                    $this->fail($e->getMessage().' in '.$e->getFile().':'.$e->getLine());
-                }
-                ob_end_clean();
-            }
-        }
-    }
-}

From 2816848c56cde4c9344ef1cf0dc18fe969f887ec Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Tue, 19 Nov 2019 23:25:21 +0100
Subject: [PATCH 009/135] Modernize testsuite

---
 .travis.yml   | 131 ++++++++++++++++++++++++++++++++++++++++++--------
 composer.json |   4 +-
 phpcs.xml     |  14 ++++++
 3 files changed, 128 insertions(+), 21 deletions(-)
 create mode 100644 phpcs.xml

diff --git a/.travis.yml b/.travis.yml
index 208a6d6..9027edc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,30 +1,123 @@
-sudo: required
-
 language: php
 
+stages:
+  - pre-conditions
+  - test
+  - quality
+
+################
+#  Test stage  #
+################
+
 php:
-  - 5.6
-  - 7.0
-  - 7.1
   - 7.2
   - 7.3
+  - 7.4snapshot
 
 env:
-  - SIMPLESAMLPHP_VERSION=1.17.*
+  - COMMAND="composer install"
+  - COMMAND="composer update"
 
 before_script:
-  - composer require "simplesamlphp/simplesamlphp:${SIMPLESAMLPHP_VERSION}" --no-update
-  - composer update --no-interaction
+  - ${COMMAND}
 
 script:
-  - vendor/simplesamlphp/simplesamlphp-test-framework/bin/check-syntax-php.sh
-  - if [[ "$TRAVIS_PHP_VERSION" == "5.6" ]]; then php vendor/phpunit/phpunit/phpunit; else php vendor/phpunit/phpunit/phpunit --no-coverage; fi
-  - if [[ "$TRAVIS_PHP_VERSION" == "7.3" ]]; then vendor/bin/psalm; fi
-
-after_success:
-  # Codecov, need to edit bash uploader for incorrect TRAVIS_PYTHON_VERSION environment variable matching, at least until codecov/codecov-bash#133 is resolved
-  - curl -s https://codecov.io/bash > .codecov
-  - sed -i -e 's/TRAVIS_.*_VERSION/^TRAVIS_.*_VERSION=/' .codecov
-  - chmod +x .codecov
-  - if [[ $TRAVIS_PHP_VERSION == "5.6" ]]; then ./.codecov -X gcov; fi
-# - if [[ "$TRAVIS_PHP_VERSION" == "5.6" ]]; then bash <(curl -s https://codecov.io/bash); fi
+  - php vendor/bin/phpunit --no-coverage
+
+jobs:
+  fast_finish: true
+
+  allow_failures:
+    - php: 7.3
+      env: Security check (composer install)
+    - php: 7.3
+      env: Security check (composer update)
+    - php: 7.3
+      env: Psalm
+    - php: 7.3
+      env: PHP Codesniffer
+
+  include:
+
+    ##########################
+    #  Pre-conditions stage  #
+    ##########################
+
+    - stage: pre-conditions
+      env: Syntax check PHP
+      php: 7.2
+      before_script:
+        - composer install
+      script:
+        - vendor/bin/check-syntax-php.sh
+
+    - stage: pre-conditions
+      env: Syntax check PHP
+      php: 7.3
+      before_script:
+        - composer install
+      script:
+        - vendor/bin/check-syntax-php.sh
+
+    - stage: pre-conditions
+      env: Syntax check PHP
+      php: 7.4snapshot
+      before_script:
+        - composer install
+      script:
+        - vendor/bin/check-syntax-php.sh
+
+    - stage: pre-conditions
+      env: Syntax check YAML / XML / JSON
+      before_script:
+        - composer require simplesamlphp/simplesamlphp-test-framework --dev
+      script:
+        - vendor/simplesamlphp/simplesamlphp-test-framework/bin/check-syntax-json.sh
+        - vendor/simplesamlphp/simplesamlphp-test-framework/bin/check-syntax-xml.sh
+        - vendor/simplesamlphp/simplesamlphp-test-framework/bin/check-syntax-yaml.sh
+
+    ###################
+    #  Quality stage  #
+    ###################
+
+    - stage: quality
+      php: 7.3
+      env: Security check (composer install)
+      before_script:
+        - composer install
+      script:
+        - vendor/bin/security-checker security:check
+
+    - stage: quality
+      php: 7.3
+      env: Security check (composer update)
+      before_script:
+        - composer update
+      script:
+        - vendor/bin/security-checker security:check
+
+    - stage: quality
+      php: 7.3
+      env: Codecov
+      before_script:
+        - composer update
+        - php vendor/bin/phpunit
+      script:
+        - bash <(curl -s https://codecov.io/bash)
+
+    - stage: quality
+      php: 7.3
+      env: Psalm
+      before_script:
+        - composer update
+      script:
+        - vendor/bin/psalm
+        - vendor/bin/psalter --issues=UnnecessaryVarAnnotation --dry-run
+
+    - stage: quality
+      php: 7.3
+      env: PHP Codesniffer
+      before_script:
+        - composer update
+      script:
+        - vendor/bin/phpcs src/
diff --git a/composer.json b/composer.json
index 4217c77..ed73f82 100644
--- a/composer.json
+++ b/composer.json
@@ -26,14 +26,14 @@
         }
     },
     "require": {
-        "php": ">=5.6",
+        "php": ">=7.0",
         "simplesamlphp/composer-module-installer": "~1.1",
         "simplesamlphp/simplesamlphp-module-consent": "^1.0",
         "webmozart/assert": "~1.4"
     },
     "require-dev": {
         "simplesamlphp/simplesamlphp": "^1.17",
-        "simplesamlphp/simplesamlphp-test-framework": "^0.0.10"
+        "simplesamlphp/simplesamlphp-test-framework": "^0.1.0"
     },
     "extra": {
         "ssp-mixedcase-module-name": "consentAdmin"
diff --git a/phpcs.xml b/phpcs.xml
new file mode 100644
index 0000000..142599c
--- /dev/null
+++ b/phpcs.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<ruleset name="SimpleSAMLphp SAML2 ruleset">
+    <description>
+        By default it is less stringent about long lines than other coding standards
+    </description>
+
+    <!-- Use this to exclude paths. You can have multiple patterns -->
+    <!--<exclude-pattern>*/tests/*</exclude-pattern>-->
+    <!--<exclude-pattern>*/other/*</exclude-pattern>-->
+
+    <!-- This is the rule we inherit from. If you want to exlude some specific rules, see the docs on how to do that -->
+    <rule ref="PSR12"/>
+</ruleset>
+

From 830da1cf1057a400653b84539562a878e6cc879f Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tim.dijen@minbzk.nl>
Date: Fri, 22 Nov 2019 12:11:56 +0100
Subject: [PATCH 010/135] Use asset-function

---
 templates/consentadmin.twig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/consentadmin.twig b/templates/consentadmin.twig
index aa1e81f..dbfb8ed 100644
--- a/templates/consentadmin.twig
+++ b/templates/consentadmin.twig
@@ -2,11 +2,11 @@
 {% extends "base.twig" %}
 
 {% block preload %}
-<link rel="stylesheet" href="/{{ baseurlpath }}module.php/consentAdmin/assets/css/consentAdmin.css">
+<link rel="stylesheet" href="{{ asset('css/consentAdmin.css, 'consentAdmin') }}">
 {% endblock %}
 
 {% block postload %}
-<script src="/{{ baseurlpath }}module.php/consentAdmin/assets/js/consentAdmin.js"></script>
+<script src="{{ asset('js/consentAdmin.js', 'consentAdmin') }}"></script>
 {% endblock %}
 
 {% block content %}

From d9a3eca22c645b4daebfdf5dcf8bda9868f829bd Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tim.dijen@minbzk.nl>
Date: Fri, 22 Nov 2019 12:12:31 +0100
Subject: [PATCH 011/135] Update composer.json

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index ed73f82..e4addf4 100644
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,7 @@
         "webmozart/assert": "~1.4"
     },
     "require-dev": {
-        "simplesamlphp/simplesamlphp": "^1.17",
+        "simplesamlphp/simplesamlphp": "^1.18",
         "simplesamlphp/simplesamlphp-test-framework": "^0.1.0"
     },
     "extra": {

From fd0c83b911faebc5a8f4ffa59c52bc35d7e21c57 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tim.dijen@minbzk.nl>
Date: Sat, 14 Dec 2019 15:31:35 +0100
Subject: [PATCH 012/135] PHP 7.4 was released

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9027edc..593ba17 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ stages:
 php:
   - 7.2
   - 7.3
-  - 7.4snapshot
+  - 7.4
 
 env:
   - COMMAND="composer install"
@@ -61,7 +61,7 @@ jobs:
 
     - stage: pre-conditions
       env: Syntax check PHP
-      php: 7.4snapshot
+      php: 7.4
       before_script:
         - composer install
       script:

From 2b00fb16121dceaac0b3d90a3d0f0cd378bd64c0 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Sat, 14 Dec 2019 20:01:11 +0100
Subject: [PATCH 013/135] Remove deprecated settings

---
 phpunit.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpunit.xml b/phpunit.xml
index 0540658..43ee896 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -13,7 +13,7 @@
     </filter>
     <logging>
         <log type="coverage-text" target="php://stdout" showUncoveredFiles="true" />
-        <log type="coverage-html" target="build/coverage" title="PHP Coveralls" charset="UTF-8" yui="true" highlight="true" lowUpperBound="35" highLowerBound="70" />
+        <log type="coverage-html" target="build/coverage" lowUpperBound="35" highLowerBound="70" />
         <log type="coverage-clover" target="build/logs/clover.xml" />
     </logging>
 </phpunit>

From 63ed0b1b22d9b6b98e083bfa4aa165345839d4bb Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tim.dijen@minbzk.nl>
Date: Mon, 17 Feb 2020 15:27:04 +0100
Subject: [PATCH 014/135] Prepare for SSP 2.0

---
 composer.json                              |   4 +-
 default-enable                             |   3 -
 dictionaries/consentadmin.definition.json  |  65 ---
 dictionaries/consentadmin.translation.json | 607 ---------------------
 hooks/hook_configpage.php                  |   2 +-
 hooks/hook_frontpage.php                   |   3 +-
 templates/consentadmin.php                 |  90 ---
 templates/consentadminajax.php             |   2 -
 tests/bootstrap.php                        |   4 +-
 www/consentAdmin.php                       |  24 +-
 10 files changed, 18 insertions(+), 786 deletions(-)
 delete mode 100644 default-enable
 delete mode 100644 dictionaries/consentadmin.definition.json
 delete mode 100644 dictionaries/consentadmin.translation.json
 delete mode 100644 templates/consentadmin.php
 delete mode 100644 templates/consentadminajax.php

diff --git a/composer.json b/composer.json
index e4addf4..af0ef98 100644
--- a/composer.json
+++ b/composer.json
@@ -26,13 +26,13 @@
         }
     },
     "require": {
-        "php": ">=7.0",
+        "php": ">=7.2",
         "simplesamlphp/composer-module-installer": "~1.1",
+        "simplesamlphp/simplesamlphp": "dev-master",
         "simplesamlphp/simplesamlphp-module-consent": "^1.0",
         "webmozart/assert": "~1.4"
     },
     "require-dev": {
-        "simplesamlphp/simplesamlphp": "^1.18",
         "simplesamlphp/simplesamlphp-test-framework": "^0.1.0"
     },
     "extra": {
diff --git a/default-enable b/default-enable
deleted file mode 100644
index 25615cb..0000000
--- a/default-enable
+++ /dev/null
@@ -1,3 +0,0 @@
-This file indicates that the default state of this module
-is enabled. To disable, create a file named disable in the
-same directory as this file.
diff --git a/dictionaries/consentadmin.definition.json b/dictionaries/consentadmin.definition.json
deleted file mode 100644
index 7864ff1..0000000
--- a/dictionaries/consentadmin.definition.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-	"sp_empty_description": {
-		"en": "(no description)"
-	},
-	"attribute_org": {
-		"en": "Organisation"
-	},
-	"added": {
-		"en": "Consent Added"
-	},
-	"removed": {
-		"en": "Consent Removed"
-	},
-	"updated": {
-		"en": "Consent Updated"
-	},
-	"unknown": {
-		"en": "Unknown ..."
-	},
-	"attribute_id": {
-		"en": "Identity"
-	},
-	"attribute_injected": {
-		"en": "Injected attribut"
-	},
-	"show": {
-		"en": "Show"
-	},
-	"hide": {
-		"en": "Hide"
-	},
-	"attributes_text": {
-		"en": "attributes"
-	},
-	"consentadmin_header": {
-		"en": "Consent Administration"
-	},
-	"consentadmin_description1": {
-		"en": "Here you can view and edit your consent for the Service Providers."
-	},
-	"consentadmin_description2": {
-		"en": "\n<h3>How to delete your consent<\/h3>\nUncheck the box corresponding to the service provider\n\n<h3>Links<\/h3>\n<ul>\n<li><a href=\"https:\/\/www.wayf.dk\">Start<\/a> <\/li>\n\n<li><a href=\"https:\/\/www.wayf.dk\/FAQ\">FAQ<\/a> <\/li>\n<\/ul>\n"
-	},
-	"login": {
-		"en": "login"
-	},
-	"service_providers_for": {
-		"en": "Service Providers for"
-	},
-	"service_provider_header": {
-		"en": "Service Provider"
-	},
-	"status_header": {
-		"en": "Consent status"
-	},
-	"show_hide_attributes": {
-		"en": "show\/hide attributes"
-	},
-	"consentadmin_purpose": {
-		"en": "The purpose of the service is"
-	},
-	"link_consentAdmin": {
-		"en": "Consent administration"
-	}
-}
diff --git a/dictionaries/consentadmin.translation.json b/dictionaries/consentadmin.translation.json
deleted file mode 100644
index fcc1ef5..0000000
--- a/dictionaries/consentadmin.translation.json
+++ /dev/null
@@ -1,607 +0,0 @@
-{
-	"sp_empty_description": {
-		"da": "(ingen beskrivelse)",
-		"no": "(ingen beskrivelse)",
-		"de": "(keine Beschreibung)",
-		"sl": "(brez opisa)",
-		"pt": "(sem descri\u00e7\u00e3o)",
-		"sv": "(ingen beskrivning)",
-		"fr": "(pas de description)",
-		"hr": "(nema opisa)",
-		"hu": "(nincs le\u00edr\u00e1s)",
-		"it": "(nessuna descrizione)",
-		"es": "(sin descripci\u00f3n)",
-		"lt": "(apib\u016bdinimas nenurodytas)",
-		"nl": "(geen omschrijving)",
-		"ja": "(\u8a18\u8ff0\u7121\u3057)",
-		"zh-tw": "(\u7121\u63cf\u8ff0)",
-		"nn": "(mangler informasjon)",
-		"et": "(kirjeldus puudub)",
-		"he": "(\u05d0\u05d9\u05df \u05ea\u05d9\u05d0\u05d5\u05e8)",
-		"zh": "\uff08\u6ca1\u6709\u63cf\u8ff0\uff09",
-		"ar": "\u0644\u0627 \u064a\u0648\u062c\u062f \u0648\u0635\u0641",
-		"lv": "(nav apraksta)",
-		"id": "(Tidak ada penjelasan)",
-		"sr": "(nema opisa)",
-		"ro": "(f\u0103r\u0103 descriere)",
-		"ru": "(\u043e\u043f\u0438\u0441\u0430\u043d\u0438\u0435 \u043e\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u0435\u0442)",
-		"cs": "(\u017e\u00e1dn\u00fd popis)",
-		"eu": "(deskribapenik gabe)",
-		"el": "(\u03c7\u03c9\u03c1\u03af\u03c2 \u03c0\u03b5\u03c1\u03b9\u03b3\u03c1\u03b1\u03c6\u03ae)"
-	},
-	"attribute_org": {
-		"da": "Organisation",
-		"no": "Organisasjon",
-		"de": "Organisation",
-		"sl": "Organizacija",
-		"pt": "Organiza\u00e7\u00e3o",
-		"sv": "Organisation",
-		"fr": "Institution",
-		"hr": "Ustanova",
-		"hu": "Int\u00e9zm\u00e9ny",
-		"it": "Organizzazione",
-		"es": "Organizaci\u00f3n",
-		"lt": "Organizacija",
-		"nl": "Organisatie",
-		"ja": "\u7d44\u7e54",
-		"zh-tw": "\u7d44\u7e54",
-		"nn": "Organisasjon",
-		"et": "Organisatsioon",
-		"he": "\u05d0\u05d9\u05e8\u05d2\u05d5\u05df",
-		"zh": "\u7ec4\u7ec7",
-		"ar": "\u0627\u0644\u0645\u0646\u0638\u0645\u0629",
-		"lv": "Organiz\u0101cija",
-		"id": "Organisasi",
-		"sr": "Institucija",
-		"ro": "Institu\u021bie",
-		"ru": "\u041e\u0440\u0433\u0430\u043d\u0438\u0437\u0430\u0446\u0438\u044f",
-		"cs": "Organizace",
-		"eu": "Erakundea",
-		"el": "\u039f\u03c1\u03b3\u03b1\u03bd\u03b9\u03c3\u03bc\u03cc\u03c2"
-	},
-	"added": {
-		"da": "Samtykke givet",
-		"no": "Samtykke gitt",
-		"de": "Einverst\u00e4ndnis hinzugef\u00fcgt",
-		"sl": "Privolitev dodana",
-		"pt": "Consentimento adicionado",
-		"sv": "Samtycke tillagt",
-		"fr": "Consentement ajout\u00e9",
-		"hr": "Dozvola dodana",
-		"hu": "Hozz\u00e1j\u00e1rul\u00e1s r\u00f6gz\u00edtve",
-		"it": "Consenso Aggiunto",
-		"es": "Consentimiento a\u00f1adido",
-		"lt": "Leidimas prid\u0117tas",
-		"ja": "\u627f\u8a8d\u304c\u8ffd\u52a0\u3055\u308c\u307e\u3057\u305f",
-		"zh-tw": "\u540c\u610f\u65b0\u589e",
-		"nn": "Samtykke lagt til",
-		"nl": "Toestemming Toegevoegd",
-		"et": "N\u00f5usolek lisatud",
-		"he": "\u05d4\u05e1\u05db\u05de\u05d4 \u05d4\u05d5\u05e1\u05e4\u05d4",
-		"zh": "\u5df2\u7ecf\u6dfb\u52a0\u7684\u8bb8\u53ef",
-		"ar": "\u062a\u0645\u062a \u0627\u0636\u0627\u0641\u0629 \u0627\u0644\u0645\u0648\u0627\u0641\u0642\u0629",
-		"lv": "Pievienotie noteikumi",
-		"id": "Consent telah ditambahkan",
-		"sr": "Dozvola dodata",
-		"ro": "Acordul a fost ad\u0103ugat",
-		"ru": "\u0421\u043e\u0433\u043b\u0430\u0441\u0438\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e",
-		"cs": "Ud\u011blen\u00e9 povolen\u00ed",
-		"eu": "Onespena gehitua",
-		"el": "\u0397 \u03c3\u03c5\u03b3\u03ba\u03b1\u03c4\u03ac\u03b8\u03b5\u03c3\u03b7 \u03c0\u03c1\u03bf\u03c3\u03c4\u03ad\u03b8\u03b7\u03ba\u03b5"
-	},
-	"removed": {
-		"da": "Samtykke slettet",
-		"no": "Samtykke trukket tilbake",
-		"de": "Einverst\u00e4ndnis entfernt",
-		"sl": "Privolitev razveljavljena",
-		"pt": "Consentimento removido",
-		"sv": "Samtycke borttaget",
-		"fr": "Consentement r\u00e9voqu\u00e9",
-		"hr": "Dozvola uklonjena",
-		"hu": "Hozz\u00e1j\u00e1rul\u00e1s visszavonva",
-		"it": "Consenso Rimosso",
-		"es": "Consentimiento eliminado",
-		"lt": "Leidimas pa\u0161alintas",
-		"ja": "\u627f\u8a8d\u304c\u524a\u9664\u3055\u308c\u307e\u3057\u305f",
-		"zh-tw": "\u540c\u610f\u79fb\u9664",
-		"nn": "Samtykke trukke tilbake",
-		"nl": "Toestemming Verwijderd",
-		"et": "N\u00f5usolek eemaldatud",
-		"he": "\u05d4\u05e1\u05db\u05de\u05d4 \u05d4\u05d5\u05e1\u05e8\u05d4",
-		"zh": "\u5df2\u7ecf\u79fb\u9664\u7684\u8bb8\u53ef",
-		"ar": "\u062a\u0645 \u062d\u0630\u0641 \u0627\u0644\u0645\u0648\u0627\u0641\u0642\u0629",
-		"lv": "No\u0146emtie noteikumi",
-		"id": "Consent telah dibuang",
-		"sr": "Dozvola uklonjena",
-		"ro": "Acordul a fost \u00eenl\u0103turat",
-		"ru": "\u0421\u043e\u0433\u043b\u0430\u0441\u0438\u0435 \u043e\u0442\u043e\u0437\u0432\u0430\u043d\u043e",
-		"cs": "Odebran\u00e9 povolen\u00ed",
-		"eu": "Onespena ezabatua",
-		"el": "\u0397 \u03c3\u03c5\u03b3\u03ba\u03b1\u03c4\u03ac\u03b8\u03b5\u03c3\u03b7 \u03b1\u03bd\u03b1\u03b9\u03c1\u03ad\u03b8\u03b7\u03ba\u03b5"
-	},
-	"updated": {
-		"da": "Samtykke Opdateret",
-		"no": "Samtykke oppdatert",
-		"de": "Einverst\u00e4ndnis aktualisiert",
-		"sl": "Privolitev posodobljena",
-		"pt": "Consentimento actualizado",
-		"sv": "Samtycke uppdaterat",
-		"fr": "Consentement mis ) jour",
-		"hr": "Dozvola a\u017eurirana",
-		"hu": "Hozz\u00e1j\u00e1rul\u00e1s friss\u00edtve",
-		"it": "Consenso Aggiornato",
-		"es": "Consentimiento actualizado",
-		"lt": "Leidimas atnaujintas",
-		"ja": "\u627f\u8a8d\u304c\u66f4\u65b0\u3055\u308c\u307e\u3057\u305f",
-		"zh-tw": "\u540c\u610f\u66f4\u65b0",
-		"nn": "Samtykke oppdatert",
-		"nl": "Toestemming Bijgewerkt",
-		"et": "N\u00f5usolek uuendatud",
-		"he": "\u05d4\u05e1\u05db\u05de\u05d4 \u05e2\u05d5\u05d3\u05db\u05e0\u05d4",
-		"zh": "\u5df2\u7ecf\u66f4\u65b0\u7684\u8bb8\u53ef",
-		"ar": "\u062a\u062d\u062f\u064a\u062b \u0627\u0644\u0645\u0648\u0627\u0641\u0642\u0629",
-		"lv": "Uzlabotie noteikumi",
-		"id": "Consent telah diupdate",
-		"sr": "Dozvola a\u017eurirana",
-		"ro": "Acordul a fost actualizat",
-		"ru": "\u0421\u043e\u0433\u043b\u0430\u0441\u0438\u0435 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u043e",
-		"cs": "Aktualizovan\u00e9 povolen\u00ed",
-		"eu": "Onespena eguneratua",
-		"el": "\u0397 \u03c3\u03c5\u03b3\u03ba\u03b1\u03c4\u03ac\u03b8\u03b5\u03c3\u03b7 \u03b5\u03bd\u03b7\u03bc\u03b5\u03c1\u03ce\u03b8\u03b7\u03ba\u03b5"
-	},
-	"unknown": {
-		"da": "Ukendt ...",
-		"no": "Ukjent...",
-		"de": "Unbekannt...",
-		"sl": "Neznan...",
-		"pt": "Desconhecido ...",
-		"sv": "Ok\u00e4nd...",
-		"fr": "Inconnu ...",
-		"hr": "Nepoznato ...",
-		"hu": "Ismeretlen ...",
-		"it": "Sconosciuto...",
-		"es": "Desconocido ...",
-		"lt": "Ne\u017einoma...",
-		"ja": "\u4e0d\u660e\u2026",
-		"zh-tw": "\u672a\u77e5...",
-		"nn": "Ukjent...",
-		"nl": "Onbekend...",
-		"et": "Tundmatu...",
-		"he": "\u05dc\u05d0 \u05d9\u05d3\u05d5\u05e2...",
-		"zh": "\u672a\u77e5...",
-		"ar": "\u063a\u064a\u0631 \u0645\u0639\u0631\u0648\u0641",
-		"lv": "Nezin\u0101ms ...",
-		"id": "Tidak diketahui...",
-		"sr": "Nepoznato ...",
-		"ro": "Necunoscut ...",
-		"ru": "\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u043e..",
-		"cs": "Nezn\u00e1m\u00fd ...",
-		"eu": "Ezezaguna...",
-		"el": "\u0386\u03b3\u03bd\u03c9\u03c3\u03c4\u03bf..."
-	},
-	"attribute_id": {
-		"da": "Identitet",
-		"no": "Identitet",
-		"de": "Identit\u00e4t",
-		"sl": "Identiteta",
-		"pt": "Identidade",
-		"sv": "Identitet",
-		"fr": "Identit\u00e9",
-		"hr": "Identitet",
-		"hu": "Azonoss\u00e1g",
-		"it": "Identit\u00e0",
-		"es": "Identidad",
-		"lt": "Tapatyb\u0117",
-		"ja": "\u8b58\u5225\u5b50",
-		"zh-tw": "\u8eab\u5206",
-		"nn": "Identitet",
-		"nl": "Identiteit",
-		"et": "Identiteet",
-		"he": "\u05d6\u05d4\u05d5\u05ea",
-		"zh": "\u8eab\u4efd",
-		"ar": "\u0627\u0644\u0647\u0648\u064a\u0629",
-		"lv": "Identit\u0101te",
-		"id": "Identitas",
-		"sr": "Identitet",
-		"ro": "Identitate",
-		"ru": "\u0418\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u043e\u043d\u043d\u0430\u044f \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f",
-		"cs": "Identita",
-		"eu": "Identitatea",
-		"el": "\u03a4\u03b1\u03c5\u03c4\u03cc\u03c4\u03b7\u03c4\u03b1"
-	},
-	"attribute_injected": {
-		"da": "Injiceret attribut",
-		"no": "Persondata lagt til",
-		"de": "Eingekoppeltes Attribut",
-		"sl": "Vrinjen atribut",
-		"pt": "Atributo injectado",
-		"sv": "Tillf\u00f6rt attribut",
-		"fr": "Attribut ajout\u00e9",
-		"hr": "Uba\u010deni atribut",
-		"hu": "Attrib\u00fatum besz\u00far\u00e1sa",
-		"it": "Attributo inserito",
-		"es": "Atributo inyectado",
-		"lt": "\u012eterptas atributas",
-		"ja": "\u633f\u5165\u3055\u308c\u305f\u5c5e\u6027",
-		"zh-tw": "\u52a0\u5165\u5c6c\u6027",
-		"nn": "Persondata lagt til",
-		"nl": "Ge\u00efnjecteerd attibuut",
-		"et": "XXXS\u00fcstitud atribuut",
-		"he": "\u05de\u05d0\u05e4\u05d9\u05d9\u05df \u05de\u05d5\u05d6\u05e8\u05e7",
-		"zh": "\u6ce8\u5165\u7684\u5c5e\u6027",
-		"ar": "\u0627\u0644\u0633\u0645\u0627\u062a \u0627\u0644\u062a\u064a \u062a\u0645 \u062a\u0642\u062f\u064a\u0645\u0647\u0627",
-		"lv": "Ievietots atrib\u016bts",
-		"id": "Attribut yang diinjeksi",
-		"sr": "Uba\u010deni atribut",
-		"ro": "Atribut introdus",
-		"ru": "\u0412\u0432\u0435\u0434\u0435\u043d\u043d\u044b\u0439 \u0430\u0442\u0440\u0438\u0431\u0443\u0442",
-		"cs": "Vlo\u017een\u00fd atribut",
-		"eu": "Atributua sartuta",
-		"el": "\u0395\u03b9\u03c3\u03b1\u03c7\u03b8\u03ad\u03bd \u03c3\u03c4\u03bf\u03b9\u03c7\u03b5\u03af\u03bf"
-	},
-	"show": {
-		"da": "Vis",
-		"no": "Vis",
-		"de": "Zeige an",
-		"sl": "Prika\u017ei",
-		"pt": "Mostrar",
-		"sv": "Visa",
-		"fr": "Voir",
-		"hr": "Prika\u017ei",
-		"hu": "Attrib\u00fatumok megjelen\u00edt\u00e9se",
-		"it": "Mostra",
-		"es": "Mostrar",
-		"lt": "Parodyti",
-		"ja": "\u8868\u793a",
-		"zh-tw": "\u986f\u793a",
-		"nn": "Vis",
-		"nl": "Bekijk",
-		"et": "N\u00e4ita",
-		"he": "\u05d4\u05e6\u05d2",
-		"zh": "\u663e\u793a",
-		"ar": "\u0627\u0638\u0647\u0627\u0631",
-		"lv": "Par\u0101d\u012bt",
-		"id": "Perlihatkan",
-		"sr": "Prika\u017ei",
-		"ro": "Arat\u0103",
-		"ru": "\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u044c",
-		"cs": "Zobrazit",
-		"eu": "Erakutsi",
-		"el": "\u0395\u03bc\u03c6\u03ac\u03bd\u03b9\u03c3\u03b7"
-	},
-	"hide": {
-		"da": "Skjul",
-		"no": "Skjul",
-		"de": "Verstecke",
-		"sl": "Skrij",
-		"pt": "Esconder",
-		"sv": "G\u00f6m",
-		"fr": "Cacher",
-		"hr": "Sakrij",
-		"hu": "Attrib\u00fatumok rejt\u00e9se",
-		"it": "Nascondi",
-		"es": "Ocultar",
-		"lt": "Pasl\u0117pti",
-		"ja": "\u975e\u8868\u793a",
-		"zh-tw": "\u96b1\u85cf",
-		"nn": "Skjul",
-		"nl": "Verberg",
-		"et": "Peida",
-		"he": "\u05d4\u05e1\u05ea\u05e8",
-		"zh": "\u9690\u85cf",
-		"ar": "\u0627\u062e\u0641\u0627\u0621",
-		"lv": "Sl\u0113pt",
-		"id": "Sembunyikan",
-		"sr": "Sakrij",
-		"ro": "Ascunde",
-		"ru": "\u0421\u043a\u0440\u044b\u0442\u044c",
-		"cs": "Skr\u00fdt",
-		"eu": "Ezkutatu",
-		"el": "\u0391\u03c0\u03cc\u03ba\u03c1\u03c5\u03c8\u03b7"
-	},
-	"attributes_text": {
-		"da": "attributter",
-		"no": "persondata",
-		"de": "Attribute",
-		"sl": "atributi",
-		"pt": "atributos",
-		"sv": "attribut",
-		"fr": "attributs",
-		"hr": "atributi",
-		"hu": ".",
-		"it": "attributi",
-		"es": "Atributos",
-		"lt": "atributai",
-		"ja": "\u5c5e\u6027",
-		"zh-tw": "\u5c6c\u6027",
-		"nn": "persondata",
-		"nl": "attributen",
-		"et": "atribuudid",
-		"he": "\u05de\u05d0\u05e4\u05d9\u05d9\u05e0\u05d9\u05dd",
-		"zh": "\u5c5e\u6027",
-		"ar": "\u0627\u0644\u0633\u0645\u0627\u062a",
-		"lv": "atrib\u016bti",
-		"id": "Attribute",
-		"sr": "atributi",
-		"ro": "atribute",
-		"ru": "\u0430\u0442\u0440\u0438\u0431\u0443\u0442\u044b",
-		"cs": "atributy",
-		"eu": "Atributuak",
-		"el": "\u03c3\u03c4\u03bf\u03b9\u03c7\u03b5\u03af\u03c9\u03bd"
-	},
-	"consentadmin_header": {
-		"da": "Administrer dine samtykker",
-		"no": "Samtykkeadministrasjon",
-		"de": "Verwaltung von Einverst\u00e4ndniserkl\u00e4rungen",
-		"sl": "Upravljanje s privolitvami",
-		"pt": "Administra\u00e7\u00e3o de Consentimento",
-		"sv": "Samtyckesadministration",
-		"fr": "Administration des consentements",
-		"hr": "Administracija dozvola",
-		"hu": "Adatkezel\u00e9si hozz\u00e1j\u00e1rul\u00e1sok kezel\u00e9se",
-		"it": "Amministrazione del consenso",
-		"es": "Administraci\u00f3n de consentimiento",
-		"lt": "Leidim\u0173 administravimas",
-		"ja": "\u627f\u8a8d\u7ba1\u7406",
-		"zh-tw": "\u7ba1\u8f44\u8a31\u53ef",
-		"nn": "Samtykkeadministrasjon",
-		"nl": "Toestemming Beheer",
-		"et": "N\u00f5usoleku administreerimine",
-		"he": "\u05de\u05e0\u05d4\u05dc \u05d4\u05e1\u05db\u05de\u05d5\u05ea\u05ea",
-		"zh": "\u7ba1\u7406\u5458\u8bb8\u53ef",
-		"ar": "\u0627\u062f\u0627\u0631\u0629 \u0627\u0644\u0645\u0648\u0627\u0641\u0642\u0629",
-		"lv": "Noteikumu administrators",
-		"id": "Administrasi Consent",
-		"sr": "Administracija dozvola",
-		"ro": "Administrarea acordurilor (consim\u021b\u0103mintelor)",
-		"ru": "\u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0441\u043e\u0433\u043b\u0430\u0441\u0438\u0435\u043c",
-		"cs": "Administrace povolen\u00ed",
-		"eu": "Onespenaren kudeaketa",
-		"el": "\u0394\u03b9\u03b1\u03c7\u03b5\u03af\u03c1\u03b9\u03c3\u03b7 \u0394\u03b7\u03bb\u03ce\u03c3\u03b5\u03c9\u03bd \u03a3\u03c5\u03b3\u03ba\u03b1\u03c4\u03ac\u03b8\u03b5\u03c3\u03b7\u03c2"
-	},
-	"consentadmin_description1": {
-		"da": "WAYF videregiver kun oplysninger til eksterne tjenester, hvis du giver dit samtykke til det. Hvilke oplysninger det drejer sig om, varierer alt efter hvad tjenesteudbyderen har behov for. Det kan for eksempel v\u00e6re:<ul><li>Dit navn<li>Din e-mail-adresse<li>Din institution<li>Etc.<\/ul>Hvis du s\u00e6tter et flueben ud for <b>Husk dette samtykke<\/b>, vil du ikke blive spurgt, n\u00e6ste gang du bes\u00f8ger tjenesteudbyderen. S\u00e5 husker WAYF, at du allerede har givet samtykke til at videregive oplysninger til tjenesteudbyderen. <p>Nedenfor er opf\u00f8rt de tjenester, som du for \u00f8jeblikket har givet l\u00f8bende samtykke til:<\/a>",
-		"no": "Her kan du se og endre dine samtykker for tjenester.",
-		"de": "Hier k\u00f6nnen Sie Ihre Einverst\u00e4ndniserkl\u00e4rungen f\u00fcr die Diensteanbieter anzeigen und bearbeiten.",
-		"sl": "Pregled in urejanje privolitev za posamezen SP.",
-		"pt": "Nesta p\u00e1gina pode ver e editar o seu consentimento dado aos Fornecedores de Servi\u00e7os.",
-		"sv": "H\u00e4r kan du se och \u00e4ndra dina samtycken f\u00f6r olika tj\u00e4nsteleverant\u00f6rer.",
-		"fr": "Vous pouvez ici voir et modifier les consentements donn\u00e9s pour les fournisseurs de service.",
-		"hr": "Ovdje mo\u017eete pregledati i mijenjati va\u0161e dozvole davateljima usluga.",
-		"hu": "Ezen az oldalon lehet szolg\u00e1ltat\u00f3nk\u00e9nt (SP) az adakezel\u00e9si hozz\u00e1j\u00e1rul\u00e1sokat megtekinteni \u00e9s m\u00f3dos\u00edtani.",
-		"it": "Qui \u00e8 possibile vedere e modificare i consensi per i vari Service Provider.",
-		"es": "Aqu\u00ed puedes visualizar y editar tu consentimiento para los proveedores de servicio",
-		"lt": "\u010cia j\u016bs galite per\u017ei\u016br\u0117ti ir keisti savo leidimus paslaug\u0173 teik\u0117jams",
-		"ja": "\u3053\u3053\u306f\u3001\u30b5\u30fc\u30d3\u30b9\u30d7\u30ed\u30d0\u30a4\u30c0\u306e\u627f\u8a8d\u3092\u8868\u793a\u3057\u305f\u308a\u7de8\u96c6\u3059\u308b\u3053\u3068\u304c\u51fa\u6765\u307e\u3059\u3002",
-		"zh-tw": "\u9019\u908a\u53ef\u4ee5\u6aa2\u8996\u53ca\u4fee\u6539\u60a8\u540c\u610f\u7684\u670d\u52d9\u63d0\u4f9b\u8005\u3002",
-		"nn": "Her kan du sj\u00e5 og endra dine samtykke til tenestene.",
-		"et": "Siin saad n\u00e4ha ja muuta teenusepakkujatega n\u00f5usolekuid.",
-		"he": "\u05db\u05d0\u05df \u05d0\u05ea\u05d4 \u05d9\u05db\u05d5\u05dc \u05dc\u05e8\u05d0\u05d5\u05ea \u05d5\u05dc\u05e2\u05e8\u05d5\u05da \u05d0\u05ea \u05d4\u05e1\u05db\u05de\u05d5\u05ea\u05da \u05dc\u05e1\u05e4\u05e7\u05d9 \u05d4\u05e9\u05d9\u05e8\u05d5\u05ea",
-		"zh": "\u5728\u8fd9\u91cc\u4f60\u53ef\u4ee5\u67e5\u770b\u548c\u7f16\u8f91\u4f60\u7684SP\u8bb8\u53ef",
-		"ar": "\u064a\u0645\u0643\u0646\u0643 \u0631\u0624\u064a\u0629 \u0648\u062a\u0639\u062f\u064a\u0644 \u0645\u0648\u0627\u0641\u0642\u062a\u0643 \u0639\u0644\u064a \u0645\u0634\u063a\u0644\u064a \u0627\u0644\u062e\u062f\u0645\u0627\u062a \u0647\u0646\u0627 ",
-		"lv": "\u0160eit J\u016bs varat apl\u016bkot un labot noteikumus priek\u0161 servisu pieg\u0101d\u0101t\u0101jiem",
-		"id": "Disini anda dapat melihat dan mengedit consent anda untuk Service Provider.",
-		"sr": "Ovde mo\u017eete pregledati i menjati va\u0161e dozvole davaocima servisa.",
-		"nl": "Hier kunt u uw verleende toestemmingen voor dienstverleners bekijken en bewerken.",
-		"ro": "Aici pute\u021bi edita acordul\/consim\u021b\u0103m\u00e2ntul dumneavoastr\u0103 pentru Furnizorii de servicii.",
-		"ru": "\u0412 \u044d\u0442\u043e\u043c \u043f\u043e\u043b\u0435 \u043c\u043e\u0436\u043d\u043e \u043f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0435\u0442\u044c \u0438 \u043e\u0442\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0442\u0435\u043a\u0441\u0442 \u0432\u0430\u0448\u0435\u0433\u043e \u0441\u043e\u0433\u043b\u0430\u0441\u0438\u044f \u0434\u043b\u044f \u0441\u0435\u0440\u0432\u0438\u0441 \u043f\u0440\u043e\u0432\u0430\u0439\u0434\u0435\u0440\u043e\u0432.",
-		"cs": "Zde m\u016f\u017eete zobrazit a upravit va\u0161e povolen\u00ed pro Poskytovatele slu\u017eeb.",
-		"eu": "Hemen, zerbitzu hornitzaileentzat onespena bistara eta edita dezakezu",
-		"el": "\u0395\u03b4\u03ce \u03bc\u03c0\u03bf\u03c1\u03b5\u03af\u03c4\u03b5 \u03bd\u03b1 \u03b4\u03b5\u03af\u03c4\u03b5 \u03ba\u03b1\u03b9 \u03bd\u03b1 \u03b5\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03c4\u03b5\u03af\u03c4\u03b5 \u03c4\u03b9\u03c2 \u03b4\u03b7\u03bb\u03ce\u03c3\u03b5\u03b9\u03c2 \u03c3\u03c5\u03b3\u03ba\u03b1\u03c4\u03ac\u03b8\u03b5\u03c3\u03ae\u03c2 \u03c3\u03b1\u03c2 \u03b3\u03b9\u03b1 \u03c4\u03bf\u03c5\u03c2 \u03c0\u03b1\u03c1\u03cc\u03c7\u03bf\u03c5\u03c2 \u03c5\u03c0\u03b7\u03c1\u03b5\u03c3\u03b9\u03ce\u03bd"
-	},
-	"consentadmin_description2": {
-		"da": "<h3>S\u00e5dan sletter du et samtykke<\/h3>Fjern fluebenet ud for tjenesten, samtykket tilh\u00f8rer.<h3>Hvilke data gemmer WAYF om dig?<\/h3><ul><li>N\u00e5r du giver dit samtykke, henter WAYF dine oplysninger fra din institution og sender de relevante videre til tjenesteudbyderen<li>Ingen af oplysningerne gemmes af WAYF<li>Hvis du har bedt WAYF huske dit samtykke, gemmes personhenf\u00f8rbare data heller ikke hos WAYF. Oplysningen om, at du har givet dit samtykke, gemmes p\u00e5 en ikke-personhenf\u00f8rbar m\u00e5de<\/ul><h3>Hvilke rettigheder har du?<\/h3>Du har ret til at tr\u00e6kke et samtykke tilbage.<h3>Hvor l\u00e6nge gemmes dine samtykker?<\/h3>Et samtykke slettes tre \u00e5r efter, at du sidst har benyttet det.<h3>Hvordan beskyttes mine oplysninger?<\/h3>WAYF foretager behandlinger af personoplysninger i henhold til persondataloven (lov nr. 429 af 31. maj 2000 med senere \u00e6ndringer). Du kan l\u00e6se n\u00e6rmere om registreredes rettigheder i persondatalovens afsnit III.<a href=\"http:\/\/www.datatilsynet.dk\/lovgivning\/persondataloven\/\">Persondataloven<\/a><h3>Links<\/h3><ul><li><a href=\"https:\/\/www.wayf.dk\">Start<\/a> <\/li><li><a href=\"https:\/\/www.wayf.dk\/index.php\/da\/om-wayf\/faq-ofte-stillede-sporgsmal\">FAQ<\/a> <\/li><\/ul>",
-		"no": "<h3>Hvordan trekke samtykke tilbake<\/h3> Fjern haken i boksen for gitte tjenestetilbyder <h3>Lenker<\/h3> <ul> <li><a href=\"https:\/\/www.wayf.dk\">Start<\/a> <\/li> <li><a href=\"https:\/\/www.wayf.dk\/index.php\/da\/om-wayf\/faq-ofte-stillede-sporgsmal\">Ofte stilte sp\u00f8rsm\u00e5l<\/a> <\/li> <\/ul> ",
-		"de": "<h3>Wie Sie Ihre Einverst\u00e4ndniserkl\u00e4rung l\u00f6schen<\/h3> Entfernen Sie das H\u00e4kchen von der Box des jeweiligen Diensteanbieters<h3>Links<\/h3><ul><li><a href=\"https:\/\/www.wayf.dk\">Start<\/a> <\/li> <li><a href=\"https:\/\/www.wayf.dk\/index.php\/en\/about-wayf\/faq-frequently-asked-questions\">FAQ<\/a> <\/li> <\/ul> ",
-		"sl": "<h3>Kako razveljavim dano privolitev?<\/h3> Odstranite kljukico pred SPjem, za katerega \u017eelite razveljaviti dano privolitev<h3>Povezave<\/h3> <ul> <li><a href=\"https:\/\/aai.arnes.si\">Start<\/a> <\/li> <li><a href=\"https:\/\/aai.arnes.si\">FAQ<\/a> <\/li> <\/ul>",
-		"pt": "<h3>Como remover o seu consentimento<\/h3> Retire a marca correspondente ao fornecedor de servi\u00e7o que pretende remover.",
-		"sv": "<h3>Hur du tar bort ditt samtycke<\/h3> Ta bort markeringen i rutan kopplad till tj\u00e4nsteleverant\u00f6ren <h3>L\u00e4nkar<\/h3> <ul> <li><a href=\"https:\/\/www.wayf.dk\">Start<\/a> <\/li> <li><a href=\"https:\/\/www.wayf.dk\/index.php\/en\/about-wayf\/faq-frequently-asked-questions\">FAQ<\/a> <\/li> <\/ul> ",
-		"fr": "<h3>Comment r\u00e9voquer un consentement<\/h3>D\u00e9cochez la case correspondante au fournisseur de service <h3>Liens<\/h3><ul><li><a href=\"https:\/\/www.wayf.dk\">Commencer<\/a><li><li><a href=\"https:\/\/www.wayf.dk\/index.php\/en\/about-wayf\/faq-frequently-asked-questions\">FAQ<\/a><\/li><\/ul> ",
-		"hr": "<h3>Kako obrisati dozvolu<\/h3> Maknite kva\u010dicu iz polja koje se odnosi na davatelja usluge <h3>Poveznice<\/h3> <ul> <li><a href=\"https:\/\/www.wayf.dk\">Po\u010detna stranica<\/a> <\/li> <li><a href=\"https:\/\/www.wayf.dk\/index.php\/en\/about-wayf\/faq-frequently-asked-questions\">Pitanja i odgovori<\/a> <\/li> <\/ul> ",
-		"hu": "<h3>Hogyan kell visszavonni egy hozz\u00e1j\u00e1rul\u00e1st?<\/h3> A szolg\u00e1ltat\u00f3hoz tartoz\u00f3 jel\u00f6l\u0151n\u00e9gyzetben sz\u00fcntesse meg a kijel\u00f6l\u00e9st!",
-		"it": "<h3>Come rimuovere il consenso><\/h3> Togliere il segno di spunta al corrispondente service provider<h3>Collegamenti<\/h3><ul><li><a href=\"https:\/\/www.wayf.dk\">Inizio<\/a><\/li><li><a href=\"https:\/\/www.wayf.dk\/index.php\/en\/about-wayf\/faq-frequently-asked-questions\">FAQ<\/a><\/li><\/ul>",
-		"es": "<h3>Como eliminar su consentimiento<\/h3> Desmarque la opci\u00f3n correspondiente al proveedor de servicios <h3>V\u00ednculos<\/h3> <ul> <li><a href=\"https:\/\/www.wayf.dk\">Inicio<\/a> <\/li> <li><a href=\"https:\/\/www.wayf.dk\/index.php\/en\/about-wayf\/faq-frequently-asked-questions\">FAQ<\/a> <\/li> <\/ul>",
-		"lt": "<h3>Kaip pa\u0161alinti savo leidim\u0105<\/h3> Panaikinkite pa\u017eym\u0117jim\u0105 ties atitinkamu paslaugos teik\u0117ju <h3>Nuorodos<\/h3> <ul> <li><a href=\"https:\/\/www.wayf.dk\">Prad\u017eia<\/a> <\/li> <li><a href=\"https:\/\/www.wayf.dk\/FAQ\">FAQ<\/a> <\/li> <\/ul> ",
-		"ja": "<h3>\u627f\u8a8d\u306e\u524a\u9664\u65b9\u6cd5<\/h3> \u8a72\u5f53\u3059\u308b\u30b5\u30fc\u30d3\u30b9\u30d7\u30ed\u30d0\u30a4\u30c0\u306e\u30c1\u30a7\u30c3\u30af\u3092\u5916\u3057\u307e\u3059\u3002<h3>\u30ea\u30f3\u30af<\/h3> <ul> <li><a href=\"https:\/\/www.wayf.dk\">Start<\/a> <\/li> <li><a href=\"https:\/\/www.wayf.dk\/index.php\/en\/about-wayf\/faq-frequently-asked-questions\">FAQ<\/a> <\/li> <\/ul> ",
-		"zh-tw": "<h3>\u5728\u9019\u522a\u9664\u60a8\u7684\u6388\u6b0a<\/h3> \u53d6\u6d88\u52fe\u9078\u670d\u52d9\u63d0\u4f9b\u8005\u5c0d\u61c9\u7684\u6838\u53d6\u65b9\u584a <h3>\u9023\u7d50<\/h3> <ul> <li><a href=\"https:\/\/www.wayf.dk\">\u958b\u59cb<\/a> <\/li> <li><a href=\"https:\/\/www.wayf.dk\/index.php\/en\/about-wayf\/faq-frequently-asked-questions\">\u8aaa\u660e<\/a> <\/li> <\/ul> ",
-		"nn": "<h3>Korleis dra tilbake samtykke<\/h3> Fjern haka i boksen for enkelte tenester <h3>Lenker<\/h3> <ul> <li><a href=\"https:\/\/www.wayf.dk\">Start<\/a> <\/li> <li><a href=\"https:\/\/www.wayf.dk\/index.php\/da\/om-wayf\/faq-ofte-stillede-sporgsmal\">Ofte stilte sp\u00f8rsm\u00e5l<\/a> <\/li> <\/ul> ",
-		"nl": "<h3>Hoe verwijdert u toestemmingen<\/h3> Vinkt u het vakje af dat overeenkomt met de dienstverlener <h3>Links<\/h3> <ul> <li><a href=\"https:\/\/www.wayf.dk\">Start<\/a> <\/li> <li><a href=\"https:\/\/www.wayf.dk\/index.php\/en\/about-wayf\/faq-frequently-asked-questions\">FAQ<\/a> <\/li> <\/ul>",
-		"et": "<h3>Kuidas eemaldada n\u00f5usolekut<\/h3> Eemalda vastava teenusepakkuja juurest m\u00e4rge <h3>Viited<\/h3> <ul> <li><a href=\"https:\/\/www.wayf.dk\">Start<\/a> <\/li> <li><a href=\"https:\/\/www.wayf.dk\/index.php\/en\/about-wayf\/faq-frequently-asked-questions\">KKK<\/a> <\/li> <\/ul>",
-		"he": "<h3>\u05d0\u05d9\u05da \u05dc\u05d4\u05e1\u05d9\u05e8 \u05d0\u05ea \u05d4\u05e1\u05db\u05de\u05ea\u05da<\/h3> \u05dc\u05d7\u05e5 \u05d1\u05ea\u05d9\u05d1\u05d4 \u05d4\u05de\u05ea\u05d0\u05d9\u05de\u05d4 \u05dc\u05e1\u05e4\u05e7 \u05d4\u05e9\u05d9\u05e8\u05d5\u05ea <h3>\u05e7\u05d9\u05e9\u05d5\u05e8\u05d9\u05dd<\/h3>  <ul> <li><a href=\"https:\/\/www.wayf.dk\">\u05d4\u05ea\u05d7\u05dc\u05d4<\/a> <\/li> <li><a href=\"https:\/\/www.wayf.dk\/index.php\/en\/about-wayf\/faq-frequently-asked-questions\">\u05e9\u05d0\u05dc\u05d5\u05ea \u05e0\u05e4\u05d5\u05e6\u05d5\u05ea<\/a> <\/li> <\/ul> ",
-		"zh": "<h3>\u5982\u4f55\u5220\u9664\u4f60\u7684\u8bb8\u53ef<\/h3>\u53cd\u9009\u76f8\u5e94\u7684SP\u9009\u62e9\u6846<h3>Links<\/h3> <ul> <li><a href=\"https:\/\/www.wayf.dk\">\u5f00\u59cb<\/a> <\/li> <li><a href=\"https:\/\/www.wayf.dk\/index.php\/en\/about-wayf\/faq-frequently-asked-questions\">FAQ<\/a> <\/li> <\/ul>",
-		"ar": "\u0644\u062d\u0630\u0641 \u0645\u0648\u0627\u0641\u0642\u062a\u0643<\/h3>\u0627\u0644\u063a\u064a  \u0635\u0646\u062f\u0648\u0642 \u0645\u0634\u063a\u0644 \u0627\u0644\u062e\u062f\u0645\u0629<h3>\u0631\u0648\u0627\u0628\u0637<\/h3> <ul> <li><a href=\"https:\/\/www.wayf.dk\">\u0623\u0628\u062f\u0627>\/a><\/li><li><ahref=\"https:\/\/www.wayf.dk\/index.php\/en\/about-wayf\/faq-frequently-asked-questions<\/a> <\/a> <\/li> <\/ul> ",
-		"lv": "<h3>K\u0101 dz\u0113st noteikumus<\/h3> Iz\u0146emiet \u0137eks\u012bti pie atbilsto\u0161\u0101 servisa pieg\u0101d\u0101t\u0101ja <h3>Saites<\/h3> <ul> <li><a href=\"https:\/\/www.wayf.dk\">S\u0101kums<\/a> <\/li> <li><a href=\"https:\/\/www.wayf.dk\/index.php\/en\/about-wayf\/faq-frequently-asked-questions\">BUJ<\/a> <\/li> <\/ul> ",
-		"id": "<h3>Bagaimana cara menghapus consent anda<\/h3> Hapus centak pada kotak service provider yang anda maksud <h3>Link<\/h3> <ul> <li><a href=\"https:\/\/www.wayf.dk\">Mulai<\/a> <\/li> <li><a href=\"https:\/\/www.wayf.dk\/index.php\/en\/about-wayf\/faq-frequently-asked-questions\">FAQ<\/a> <\/li> <\/ul>",
-		"sr": "<h3>Kako obrisati dozvolu<\/h3> Uklonite kva\u010dicu iz polja koje se odnosi na davaoca servisa <h3>Linkovi<\/h3> <ul> <li><a href=\"https:\/\/www.wayf.dk\">Po\u010detna stranica<\/a> <\/li> <li><a href=\"https:\/\/www.wayf.dk\/index.php\/en\/about-wayf\/faq-frequently-asked-questions\">Pitanja i odgovori<\/a> <\/li> <\/ul> ",
-		"ro": "<h3>Cum poate fi anulat acordul dumneavoastr\u0103<\/h3>Debifa\u021bi c\u0103su\u021ba corespunz\u0103toare furnizorului de servicii <h3>Link-uri<\/h3><ul><li><a href=\"https:\/\/www.wayf.dk\">Start<\/a><\/li><li><a href=\"https:\/\/www.wayf.dk\/FAQ\">FAQ<\/a><\/li><\/ul>",
-		"ru": "<h3>\u041a\u0430\u043a \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u0432\u0430\u0448\u0435 \u0441\u043e\u0433\u043b\u0430\u0441\u0438\u0435<\/h3> \u0421\u043d\u0438\u043c\u0438\u0442\u0435 \u0432\u044b\u0434\u0435\u043b\u0435\u043d\u0438\u0435 \u0441 \u0441\u0435\u0440\u0432\u0438\u0441 \u043f\u0440\u043e\u0432\u0430\u0439\u0434\u0435\u0440\u0430 <h3>\u0421\u0441\u044b\u043b\u043a\u0438<\/h3> <ul> <li><a href=\"https:\/\/www.wayf.dk\">Start<\/a> <\/li> <li><a href=\"https:\/\/www.wayf.dk\/FAQ\">FAQ<\/a> <\/li> <\/ul>",
-		"cs": "<h3>Jak smazat va\u0161e povolen\u00ed<\/h3> Odzna\u010dte pol\u00ed\u010dko odpov\u00eddaj\u00edc\u00ed poskytovateli slu\u017eeb <h3>Odkazy<\/h3> <ul><li><a href=\"https:\/\/www.wayf.dk\">Start<\/a><\/li><li><a href=\"https:\/\/www.wayf.dk\/FAQ\">FAQ<\/a><\/li><\/ul>",
-		"eu": "<h3>Zure onespena nola ezabatu<\/h3> Zerbitzu hornitzaileari dagokion aukerari marka kendu ezaiozu <h3>Loturak<\/h3> <ul> <li><a href=\"https:\/\/www.wayf.dk\">Haisera<\/a> <\/li> <li><a href=\"https:\/\/www.wayf.dk\/index.php\/en\/about-wayf\/faq-frequently-asked-questions\">FAQ<\/a> <\/li> <\/ul>",
-		"el": "<h3>\u03a0\u03ce\u03c2 \u03bd\u03b1 \u03b1\u03bd\u03b1\u03b9\u03c1\u03ad\u03c3\u03b5\u03c4\u03b5 \u03c4\u03b7 \u03c3\u03c5\u03b3\u03ba\u03b1\u03c4\u03ac\u03b8\u03b5\u03c3\u03ae \u03c3\u03b1\u03c2<\/h3>\u0391\u03c0\u03bf\u03b5\u03c0\u03b9\u03bb\u03ad\u03be\u03c4\u03b5 \u03c4\u03bf \u03ba\u03bf\u03c5\u03c4\u03af \u03b5\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae\u03c2 \u03c0\u03bf\u03c5 \u03b1\u03bd\u03c4\u03b9\u03c3\u03c4\u03bf\u03b9\u03c7\u03b5\u03af \u03c3\u03c4\u03bf\u03bd \u03c0\u03ac\u03c1\u03bf\u03c7\u03bf \u03c5\u03c0\u03b7\u03c1\u03b5\u03c3\u03b9\u03ce\u03bd"
-	},
-	"login": {
-		"da": "login",
-		"no": "login",
-		"de": "Anmeldung",
-		"sl": "Prijava",
-		"pt": "Entrar",
-		"sv": "Logga in",
-		"fr": "Connexion",
-		"hr": "Prijavi se",
-		"hu": "Bel\u00e9p\u00e9s",
-		"it": "connessione",
-		"es": "entrar",
-		"ja": "\u30ed\u30b0\u30a4\u30f3",
-		"lt": "Prisijungti",
-		"zh-tw": "\u767b\u5165",
-		"nn": "logg inn",
-		"nl": "login",
-		"et": "logi sisse",
-		"he": "\u05d4\u05ea\u05d7\u05d1\u05e8",
-		"zh": "\u767b\u9646",
-		"ar": "\u062a\u0633\u062c\u064a\u0644 \u0627\u0644\u062f\u062e\u0648\u0644",
-		"lv": "piesl\u0113gties",
-		"id": "login",
-		"sr": "Prijavi se",
-		"ro": "autentificare",
-		"ru": "\u0412\u0445\u043e\u0434",
-		"cs": "p\u0159ihl\u00e1\u0161en\u00ed",
-		"eu": "sartu",
-		"el": "\u03b5\u03af\u03c3\u03bf\u03b4\u03bf\u03c2"
-	},
-	"service_providers_for": {
-		"da": "Service Providers for",
-		"no": "Tjenesteleverand\u00f8rer for",
-		"de": "Diensteanbieter f\u00fcr",
-		"sl": "Ponudniki storitev za",
-		"pt": "Fornecedores de Servi\u00e7os para",
-		"sv": "Tj\u00e4nsteleverant\u00f6rer f\u00f6r",
-		"fr": "Fournisseurs de service pour",
-		"hr": "Davatelji usluga za",
-		"hu": "Szolg\u00e1ltat\u00f3",
-		"it": "Service provider per",
-		"es": "Proveedores de servicio para",
-		"ja": "\u30b5\u30fc\u30d3\u30b9\u30d7\u30ed\u30d0\u30a4\u30c0 - ",
-		"lt": "Paslaugos tiek\u0117jai",
-		"zh-tw": "\u670d\u52d9\u63d0\u4f9b\u8005\u7684",
-		"nn": "Tenesteleverand\u00f8r for ",
-		"nl": "Service Providers voor",
-		"et": "Teenusepakkujad",
-		"he": "\u05e1\u05e4\u05e7\u05d9 \u05e9\u05d9\u05e8\u05d5\u05ea \u05e2\u05d1\u05d5\u05e8",
-		"zh": "\u670d\u52a1\u63d0\u4f9b\u5546\u670d\u52a1\u4e8e",
-		"ar": "\u0645\u0634\u063a\u0644\u064a \u0627\u0644\u062e\u062f\u0645\u0629 \u0644",
-		"lv": "Servisa pieg\u0101d\u0101t\u0101ji priek\u0161",
-		"id": "Service Provider untuk",
-		"sr": "Davaoci Servisa za",
-		"ro": "Furnizori de servicii pentru",
-		"ru": "\u0421\u0435\u0440\u0432\u0438\u0441 \u043f\u0440\u043e\u0432\u0430\u0439\u0434\u0435\u0440\u044b \u0434\u043b\u044f",
-		"cs": "Poskytovatel\u00e9 slu\u017eeb pro",
-		"eu": "Zerbitzu hornitzaileak hontarako: ",
-		"el": "\u03a0\u03ac\u03c1\u03bf\u03c7\u03bf\u03b9 \u03a5\u03c0\u03b7\u03c1\u03b5\u03c3\u03b9\u03ce\u03bd \u03b3\u03b9\u03b1"
-	},
-	"service_provider_header": {
-		"da": "Service Provider",
-		"no": "Tjenesteleverand\u00f8r",
-		"de": "Diensteanbieter",
-		"sl": "Ponudnik storitve",
-		"pt": "Fornecedor de Servi\u00e7o",
-		"sv": "Tj\u00e4nsteleverant\u00f6r",
-		"fr": "Fournisseurs de service",
-		"hr": "Davatelj usluge",
-		"hu": "Szolg\u00e1ltat\u00f3",
-		"it": "Service Provider",
-		"es": "Proveedor de servicio",
-		"ja": "\u30b5\u30fc\u30d3\u30b9\u30d7\u30ed\u30d0\u30a4\u30c0",
-		"lt": "Paslaugos tiek\u0117jas",
-		"zh-tw": "\u670d\u52d9\u63d0\u4f9b\u8005",
-		"nn": "Tenesteleverand\u00f8r",
-		"nl": "Service Provider",
-		"et": "Teenusepakkuja",
-		"he": "\u05e1\u05e4\u05e7 \u05e9\u05d9\u05e8\u05d5\u05ea",
-		"zh": "\u670d\u52a1\u63d0\u4f9b\u5546",
-		"ar": "\u0645\u0642\u062f\u0645 \u0627\u0644\u062e\u062f\u0645\u0629",
-		"lv": "Servisa pieg\u0101d\u0101t\u0101js",
-		"id": "Service Provider",
-		"sr": "Davalac Servisa",
-		"ro": "Furnizor de servicii",
-		"ru": "\u0421\u0435\u0440\u0432\u0438\u0441 \u043f\u0440\u043e\u0432\u0430\u0439\u0434\u0435\u0440",
-		"cs": "Poskytovatel slu\u017eeb",
-		"eu": "Zerbitzu hornitzailea",
-		"el": "\u03a0\u03ac\u03c1\u03bf\u03c7\u03bf\u03c2 \u03a5\u03c0\u03b7\u03c1\u03b5\u03c3\u03b9\u03ce\u03bd"
-	},
-	"status_header": {
-		"da": "Samtykke status",
-		"no": "Samtykke status",
-		"de": "Status der Einverst\u00e4ndniserkl\u00e4rung",
-		"sl": "Status privolitve",
-		"pt": "Consentimento",
-		"sv": "Samtyckesstatus",
-		"fr": "Statut du consentement",
-		"hr": "Stanje dozvola",
-		"hu": "Hozz\u00e1j\u00e1rul\u00e1s \u00e1llapota",
-		"it": "Stato del consenso",
-		"es": "Estado del consentimiento",
-		"ja": "\u627f\u8a8d\u30b9\u30c6\u30fc\u30bf\u30b9",
-		"lt": "Leidimo statusas",
-		"zh-tw": "\u8a31\u53ef\u72c0\u614b",
-		"nn": "Samtykkestatus",
-		"nl": "Toestemming Status",
-		"et": "N\u00f5usoleku olek",
-		"he": "\u05de\u05e6\u05d1 \u05d4\u05e1\u05db\u05de\u05d4",
-		"zh": "\u8bb8\u53ef\u72b6\u6001",
-		"ar": "\u062d\u0627\u0644\u0629 \u0627\u0644\u0645\u0648\u0627\u0641\u0642\u0629",
-		"lv": "Noteikumu statuss",
-		"id": "Status consent",
-		"sr": "Stanje dozvole",
-		"ro": "Stare acord (consim\u021b\u0103m\u00e2nt)",
-		"ru": "\u0421\u0442\u0430\u0442\u0443\u0441 \u0441\u043e\u0433\u043b\u0430\u0441\u0438\u044f",
-		"cs": "Stav povolen\u00ed",
-		"eu": "Onespenaren egoera",
-		"el": "\u039a\u03b1\u03c4\u03ac\u03c3\u03c4\u03b1\u03c3\u03b7 \u03c3\u03c5\u03b3\u03ba\u03b1\u03c4\u03ac\u03b8\u03b5\u03c3\u03b7\u03c2"
-	},
-	"show_hide_attributes": {
-		"da": "vis\/skjul attributter",
-		"no": "vis\/skjul persondata",
-		"de": "Attribute anzeigen\/verstecken",
-		"sl": "Prika\u017ei\/Skrij atribute",
-		"pt": "mostrar\/esconder atributos",
-		"sv": "visa\/g\u00f6m attribut",
-		"fr": "voir\/cacher les attributs",
-		"hr": "prika\u017ei\/sakrij atribute",
-		"hu": "Attrib\u00fatumok megjelen\u00edt\u00e9se\/rejt\u00e9se",
-		"it": "Mostra\/nascondi attributi",
-		"es": "Mostrar\/ocultar atributos",
-		"ja": "\u8868\u793a\/\u975e\u8868\u793a\u5c5e\u6027",
-		"lt": "Rodyti\/sl\u0117pti atributus",
-		"zh-tw": "\u986f\u793a\/\u96b1\u85cf\u5c6c\u6027",
-		"nn": "vis\/skjul personinformasjon",
-		"nl": "bekijk\/verberg attributen",
-		"et": "n\u00e4ita\/peida atribuudid",
-		"he": "\u05d4\u05e8\u05d0\u05d4\\\u05d4\u05e1\u05ea\u05e8 \u05de\u05d0\u05e4\u05d9\u05d9\u05e0\u05d9\u05dd",
-		"zh": "\u663e\u793a\/\u9690\u85cf\u5c5e\u6027",
-		"ar": "\u0627\u0638\u0647\u0631\/ \u0627\u062e\u0641\u064a \u0627\u0644\u0633\u0645\u0627\u062a",
-		"lv": "r\u0101d\u012b\u0161anas\/sl\u0113p\u0161anas atrib\u016bti",
-		"id": "Tunjukkan\/sembunyikan attribute",
-		"sr": "prika\u017ei\/sakrij atribute",
-		"ro": "arat\u0103\/ascunde atributele",
-		"ru": "\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u044c\/\u0441\u043a\u0440\u044b\u0442\u044c \u0430\u0442\u0440\u0438\u0431\u0443\u0442\u044b",
-		"cs": "zobrazit\/skr\u00fdt atributy",
-		"eu": "erakutsi\/ezkutatu atributuak",
-		"el": "\u03b5\u03bc\u03c6\u03ac\u03bd\u03b9\u03c3\u03b7\/\u03b1\u03c0\u03cc\u03ba\u03c1\u03c5\u03c8\u03b7 \u03c3\u03c4\u03bf\u03b9\u03c7\u03b5\u03af\u03c9\u03bd"
-	},
-	"consentadmin_purpose": {
-		"da": "Form\u00e5let med tjenesten er",
-		"no": "Hensikten med denne tjenesten er",
-		"de": "Der Zweck dieses Dienstes ist",
-		"sl": "Namen storitve: ",
-		"pt": "Este servi\u00e7o destina-se a",
-		"sv": "Systet med tj\u00e4nsten \u00e4r",
-		"fr": "L'objet de ce service est",
-		"hr": "Namjena ovog servisa je",
-		"hu": "A szolg\u00e1ltat\u00e1s le\u00edr\u00e1sa",
-		"it": "Lo scopo di questo servizio \u00e8",
-		"es": "El prop\u00f3sito del servicio es",
-		"ja": "\u30b5\u30fc\u30d3\u30b9\u306e\u76ee\u7684: ",
-		"lt": "Paslaugos paskirtis yra",
-		"zh-tw": "\u6b64\u9805\u670d\u52d9\u7684\u76ee\u7684\u70ba",
-		"nn": "Form\u00e5let med tenesta er",
-		"nl": "Het nut van de server is",
-		"et": "Selle teenuse eesm\u00e4rk on",
-		"he": "\u05de\u05d8\u05e8\u05ea \u05d4\u05e9\u05d9\u05e8\u05d5\u05ea \u05d4\u05d9\u05d0",
-		"zh": "\u8be5\u670d\u52a1\u7684\u7528\u9014",
-		"ar": "\u063a\u0631\u0636 \u0627\u0644\u062e\u062f\u0645\u0629 \u0647\u0648",
-		"lv": "\u0160\u012b servisa nol\u016bks ir",
-		"id": "Tujuan dari layanan ini adalah",
-		"sr": "Namena ovog servisa je",
-		"ro": "Scopul acestui serviciu este",
-		"ru": "\u0426\u0435\u043b\u044c\u044e \u0441\u0435\u0440\u0432\u0438\u0441\u0430 \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f",
-		"cs": "\u00da\u010del slu\u017eby je",
-		"eu": "Zerbitzuaren xedea hau da",
-		"el": "\u039f \u03c3\u03ba\u03bf\u03c0\u03cc\u03c2 \u03c4\u03b7\u03c2 \u03c5\u03c0\u03b7\u03c1\u03b5\u03c3\u03af\u03b1\u03c2 \u03b5\u03af\u03bd\u03b1\u03b9"
-	},
-	"link_consentAdmin": {
-		"es": "Administración del consentimiento",
-		"no": "Samtykke administrasjon",
-		"nn": "Samtykke administrasjon"
-	}
-}
diff --git a/hooks/hook_configpage.php b/hooks/hook_configpage.php
index fc9384f..bda07ea 100644
--- a/hooks/hook_configpage.php
+++ b/hooks/hook_configpage.php
@@ -5,7 +5,7 @@
  * @param \SimpleSAML\XHTML\Template $template The template that we should alter in this hook.
  * @return void
  */
-function consentAdmin_hook_configpage(\SimpleSAML\XHTML\Template &$template)
+function consentAdmin_hook_configpage(\SimpleSAML\XHTML\Template &$template): void
 {
     $template->data['links']['consentAdmin'] = [
         'href' => SimpleSAML\Module::getModuleURL('consentAdmin/consentAdmin.php'),
diff --git a/hooks/hook_frontpage.php b/hooks/hook_frontpage.php
index e9f9bce..69a7ce1 100644
--- a/hooks/hook_frontpage.php
+++ b/hooks/hook_frontpage.php
@@ -8,9 +8,8 @@
  * @param array &$links  The links on the frontpage, split into sections.
  * @return void
  */
-function consentAdmin_hook_frontpage(&$links)
+function consentAdmin_hook_frontpage(array &$links): void
 {
-    Assert::isArray($links);
     Assert::keyExists($links, 'links');
 
     $links['config'][] = [
diff --git a/templates/consentadmin.php b/templates/consentadmin.php
deleted file mode 100644
index e8c3bcc..0000000
--- a/templates/consentadmin.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-    $this->data['head'] = '<link rel="stylesheet" type="text/css" href="'.
-        SimpleSAML\Module::getModuleURL("consentAdmin/assets/css/consentAdmin.css").'" />'."\n";
-    $this->data['head'] .= '<script type="text/javascript" src="'.
-        SimpleSAML\Module::getModuleURL("consentAdmin/assets/js/consentAdmin.js").'"></script>';
-    // default theme
-    $this->includeAtTemplateBase('includes/header.php');
-?>
-        <h2><?php echo $this->t('{consentAdmin:consentadmin:consentadmin_header}') ?></h2>
-        <p>
-        <?php echo $this->t('{consentAdmin:consentadmin:consentadmin_description1}') ?> </p>
-
-
-            <table>
-            <tr>
-                <th width="80%"><?php echo $this->t('{consentAdmin:consentadmin:service_provider_header}') ?></th>
-                <th><?php echo $this->t('{consentAdmin:consentadmin:status_header}') ?></th>
-            </tr>
-            <?php
-            $spList = $this->data['spList'];
-            $show_spid = 0;
-            $show_text = $this->t('{consentAdmin:consentadmin:show}');
-            $hide_text = $this->t('{consentAdmin:consentadmin:hide}');
-            $attributes_text = $this->t('{consentAdmin:consentadmin:attributes_text}');
-            foreach ($spList as $spName => $spValues) {
-                if (!is_null($spValues['serviceurl'])) {
-                    $htmlSpName = '<a class="serviceUrl" href="'.$spValues['serviceurl'].'">'.
-                        htmlspecialchars($spValues['name']).'</a>';
-                } else {
-                    $htmlSpName = htmlspecialchars($spValues['name']);
-                }
-                $spDescription = htmlspecialchars($spValues['description']);
-                $checkedAttr = $spValues['consentStatus'] == 'ok' ? 'checked="checked"' : '';
-                $consentValue = $spValues['consentValue'];
-                $consentText = $spValues['consentStatus'] == 'changed' ? "attributes has changed" : "";
-                $row_class = ($show_spid % 2) ? "row0" : "row1";
-                echo <<<TRSTART
-<tr class="$row_class">
-<td>
-    <table>
-      <tr class="$row_class">
-          <td><span class='caSPName'><span title='$spDescription'>$htmlSpName</span>&emsp;
-          <span class="show_hide" id="show_hide_$show_spid"><span id='showing_$show_spid'>$show_text</span>
-          <span id='hiding_$show_spid'>$hide_text</span> $attributes_text</span></span></td></tr>
-      <tr><td colspan="2" class="caAttributes"><div id="attributes_$show_spid">
-TRSTART;
-                $attributes = $spValues['attributes_by_sp'];
-                if ($this->data['showDescription']) {
-                    echo '<p>'.$this->t('{consentAdmin:consentadmin:consentadmin_purpose}').' '.$spDescription.'</p>';
-                }
-                echo "\n<ul>\n";
-                foreach ($attributes as $name => $value) {
-                    if (sizeof($value) > 1) {
-                        echo "<li>".htmlspecialchars($name).":\n<ul>\n";
-                        foreach ($value as $v) {
-                            echo '<li>'.htmlspecialchars($v)."</li>\n";
-                        }
-                        echo "</ul>\n</li>\n";
-                    } else {
-                        echo "<li>".htmlspecialchars($name).": ".htmlspecialchars($value[0])."</li>\n";
-                    }
-                }
-                echo "</ul>";
-                echo <<<TRSTART
-      </div></td></tr>
-  </table>
-</td>
-
-<td class='caAllowed'>
-    <input id="checkbox_$show_spid" class="checkbox" value='$consentValue' type='checkbox' $checkedAttr />
-    <span id="consentText_$show_spid">$consentText</span></td>
-TRSTART;
-                echo "</tr>\n";
-                $show_spid++;
-            }
-            ?>
-            </table>
-
-            <p>
-        <?php echo $this->t('{consentAdmin:consentadmin:consentadmin_description2}') ?> </p>
-
-        <h2>Logout</h2>
-        <p>
-            <a href="
-            <?php
-                echo \SimpleSAML\Module::getModuleURL('consentAdmin/consentAdmin.php', ['logout' => 1]);
-            ?>">Logout</a>
-        </p>
-
-<?php $this->includeAtTemplateBase('includes/footer.php');
diff --git a/templates/consentadminajax.php b/templates/consentadminajax.php
deleted file mode 100644
index c8520b0..0000000
--- a/templates/consentadminajax.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-echo $res;
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 1c94a49..2efdf78 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,10 +1,10 @@
 <?php
 
 $projectRoot = dirname(__DIR__);
-require_once($projectRoot.'/vendor/autoload.php');
+require_once($projectRoot . '/vendor/autoload.php');
 
 // Symlink module into ssp vendor lib so that templates and urls can resolve correctly
-$linkPath = $projectRoot.'/vendor/simplesamlphp/simplesamlphp/modules/consentadmin';
+$linkPath = $projectRoot . '/vendor/simplesamlphp/simplesamlphp/modules/consentadmin';
 if (file_exists($linkPath) === false) {
     echo "Linking '$linkPath' to '$projectRoot'\n";
     symlink($projectRoot, $linkPath);
diff --git a/www/consentAdmin.php b/www/consentAdmin.php
index 7029afa..95777b8 100644
--- a/www/consentAdmin.php
+++ b/www/consentAdmin.php
@@ -26,15 +26,15 @@
  * @return array
  */
 function driveProcessingChain(
-    $idp_metadata,
-    $source,
-    $sp_metadata,
-    $sp_entityid,
-    $attributes,
-    $userid,
-    $hashAttributes = false,
-    $excludeAttributes = []
-) {
+    array $idp_metadata,
+    string $source,
+    array $sp_metadata,
+    string $sp_entityid,
+    array $attributes,
+    string $userid,
+    bool $hashAttributes = false,
+    array $excludeAttributes = []
+): array {
     /*
      * Create a new processing chain
      */
@@ -184,7 +184,7 @@ function driveProcessingChain(
     // init template to enable translation of status messages
     $template = new \SimpleSAML\XHTML\Template(
         $config,
-        'consentAdmin:consentadminajax.php',
+        'consentAdmin:consentadminajax.twig',
         'consentAdmin:consentadmin'
     );
     $translator = $template->getTranslator();
@@ -244,7 +244,7 @@ function driveProcessingChain(
 $template_sp_content = [];
 
 // Init template
-$template = new \SimpleSAML\XHTML\Template($config, 'consentAdmin:consentadmin.php', 'consentAdmin:consentadmin');
+$template = new \SimpleSAML\XHTML\Template($config, 'consentAdmin:consentadmin.twig', 'consentAdmin:consentadmin');
 $translator = $template->getTranslator();
 $translator->includeLanguageFile('attributes'); // attribute listings translated by this dictionary
 
@@ -339,4 +339,4 @@ function driveProcessingChain(
 $template->data['header'] = 'Consent Administration';
 $template->data['spList'] = $sp_list;
 $template->data['showDescription'] = $cA_config->getValue('showDescription');
-$template->show();
+$template->send();

From 66740bbc95afa5791e07def34106dd6006d57c61 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tim.dijen@minbzk.nl>
Date: Mon, 17 Feb 2020 15:47:06 +0100
Subject: [PATCH 015/135] Prepare for SSP 2.0

---
 .travis.yml                     |  2 +-
 phpcs.xml                       |  2 ++
 templates/consentadminajax.twig |  8 +++++-
 www/assets/js/consentAdmin.js   | 12 ++++-----
 www/consentAdmin.php            | 43 +++++++++++++++------------------
 5 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 593ba17..74de322 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -120,4 +120,4 @@ jobs:
       before_script:
         - composer update
       script:
-        - vendor/bin/phpcs src/
+        - vendor/bin/phpcs www/
diff --git a/phpcs.xml b/phpcs.xml
index 142599c..b4d15e5 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0"?>
 <ruleset name="SimpleSAMLphp SAML2 ruleset">
+    <config name="ignore_warnings_on_exit" value="1"/>
+
     <description>
         By default it is less stringent about long lines than other coding standards
     </description>
diff --git a/templates/consentadminajax.twig b/templates/consentadminajax.twig
index 2b82118..7e4b570 100644
--- a/templates/consentadminajax.twig
+++ b/templates/consentadminajax.twig
@@ -1,3 +1,9 @@
 {% block content %}
-{{ res }}
+{% if isStored == true %}
+{{ 'added'|trans }}
+{% elseif isStored == false %}
+{{ 'updated'|trans }}
+{% else %}
+{{ 'unknown'|trans }}
+{% endif %}
 {% endblock %}
diff --git a/www/assets/js/consentAdmin.js b/www/assets/js/consentAdmin.js
index 83248d3..44402d0 100644
--- a/www/assets/js/consentAdmin.js
+++ b/www/assets/js/consentAdmin.js
@@ -2,8 +2,8 @@ var xmlHttp;
 
 function checkConsent()
 {
-    var show_spid = this.id.charAt(this.id.length-1);
-    var checkbox = document.getElementById("checkbox_"+show_spid);
+    var show_spid = this.id.charAt(this.id.length - 1);
+    var checkbox = document.getElementById("checkbox_" + show_spid);
 
     xmlHttp = GetXmlHttpObject()
     if (xmlHttp === null) {
@@ -12,9 +12,9 @@ function checkConsent()
     }
 
     var url = "consentAdmin.php"
-    url = url+"?cv="+checkbox.value
-    url = url+"&action="+checkbox.checked
-    url = url+"&sid="+Math.random()
+    url = url + "?cv=" + checkbox.value
+    url = url + "&action=" + checkbox.checked
+    url = url + "&sid=" + Math.random()
 
     xmlHttp.onreadystatechange = function () {
         if (xmlHttp.readyState == 4 || xmlHttp.readyState == "complete") {
@@ -46,7 +46,7 @@ function GetXmlHttpObject()
 
 function toggleShowAttributes()
 {
-    var show_spid = this.id.charAt(this.id.length-1);
+    var show_spid = this.id.charAt(this.id.length - 1);
 
     var disp = document.getElementById('attributes_' + show_spid);
     var showing = document.getElementById('showing_' + show_spid);
diff --git a/www/consentAdmin.php b/www/consentAdmin.php
index 95777b8..59dad0d 100644
--- a/www/consentAdmin.php
+++ b/www/consentAdmin.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  * consentAdmin - Consent administration module
  *
@@ -76,14 +77,14 @@ function driveProcessingChain(
     /*
      * Generate identifiers and hashes
      */
-    $destination = $sp_metadata['metadata-set'].'|'.$sp_entityid;
+    $destination = $sp_metadata['metadata-set'] . '|' . $sp_entityid;
 
     $targeted_id = \SimpleSAML\Module\consent\Auth\Process\Consent::getTargetedID($userid, $source, $destination);
     $attribute_hash = \SimpleSAML\Module\consent\Auth\Process\Consent::getAttributeHash($attributes, $hashAttributes);
 
-    \SimpleSAML\Logger::info('consentAdmin: user: '.$userid);
-    \SimpleSAML\Logger::info('consentAdmin: target: '.$targeted_id);
-    \SimpleSAML\Logger::info('consentAdmin: attribute: '.$attribute_hash);
+    \SimpleSAML\Logger::info('consentAdmin: user: ' . $userid);
+    \SimpleSAML\Logger::info('consentAdmin: target: ' . $targeted_id);
+    \SimpleSAML\Logger::info('consentAdmin: attribute: ' . $attribute_hash);
 
     // Return values
     return [$targeted_id, $attribute_hash, $attributes];
@@ -125,10 +126,10 @@ function driveProcessingChain(
 // Calc correct source
 if ($as->getAuthData('saml:sp:IdP') !== null) {
     // from a remote idp (as bridge)
-    $source = 'saml20-idp-remote|'.$as->getAuthData('saml:sp:IdP');
+    $source = 'saml20-idp-remote|' . $as->getAuthData('saml:sp:IdP');
 } else {
     // from the local idp
-    $source = $idp_metadata['metadata-set'].'|'.$idp_entityid;
+    $source = $idp_metadata['metadata-set'] . '|' . $idp_entityid;
 }
 
 // Get user ID
@@ -141,8 +142,8 @@ function driveProcessingChain(
 $userids = $attributes[$userid_attributename];
 
 if (empty($userids)) {
-    throw new \Exception('Could not generate useridentifier for storing consent. Attribute ['.
-        $userid_attributename.'] was not available.');
+    throw new \Exception('Could not generate useridentifier for storing consent. Attribute [' .
+        $userid_attributename . '] was not available.');
 }
 
 $userid = $userids[0];
@@ -160,7 +161,7 @@ function driveProcessingChain(
     $action = $_GET["action"];
 }
 
-\SimpleSAML\Logger::critical('consentAdmin: sp: '.$sp_entityid.' action: '.$action);
+\SimpleSAML\Logger::critical('consentAdmin: sp: ' . $sp_entityid . ' action: ' . $action);
 
 // Remove services, whitch have consent disabled
 if (isset($idp_metadata['consent.disable'])) {
@@ -171,7 +172,7 @@ function driveProcessingChain(
     }
 }
 
-\SimpleSAML\Logger::info('consentAdmin: '.$idp_entityid);
+\SimpleSAML\Logger::info('consentAdmin: ' . $idp_entityid);
 
 // Parse consent config
 $consent_storage = \SimpleSAML\Module\consent\Store::parseStoreConfig($cA_config->getValue('consentadmin'));
@@ -207,28 +208,22 @@ function driveProcessingChain(
     // Add a consent (or update if attributes have changed and old consent for SP and IdP exists)
     if ($action == 'true') {
         $isStored = $consent_storage->saveConsent($hashed_user_id, $targeted_id, $attribute_hash);
-        if ($isStored) {
-            $res = $translator->t("added");
-        } else {
-            $res = $translator->t("updated");
-        }
-        // Remove consent
     } else {
         if ($action == 'false') {
             // Got consent, so this is a request to remove it
             $rowcount = $consent_storage->deleteConsent($hashed_user_id, $targeted_id);
             if ($rowcount > 0) {
-                $res = $translator->t("removed");
+                $isStored = false;
             } else {
                 throw new \Exception("Unknown action (should not happen)");
             }
         } else {
             \SimpleSAML\Logger::info('consentAdmin: unknown action');
-            $res = $translator->t("unknown");
+            $isStored = null;
         }
     }
-    $template->data['res'] = $res;
-    $template->show();
+    $template->data['isStored'] = $isStored;
+    $template->send();
     exit;
 }
 
@@ -270,8 +265,8 @@ function driveProcessingChain(
 
     // 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))];
+        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
 
@@ -321,8 +316,8 @@ function driveProcessingChain(
     $translator->includeInlineTranslation('spname', $sp_name);
     $translator->includeInlineTranslation('spdescription', $sp_description);
 
-    $sp_name = $translator->getPreferredTranslation($translator->getTag('spname'));
-    $sp_description = $translator->getPreferredTranslation($translator->getTag('spdescription'));
+    $sp_name = $translator->getPreferredTranslation($translator->getTag('spname') ?? []);
+    $sp_description = $translator->getPreferredTranslation($translator->getTag('spdescription') ?? []);
 
     // Fill out array for the template
     $sp_list[$sp_entityid] = [

From a73e29edc8326f3692e5513222db3efbd495e725 Mon Sep 17 00:00:00 2001
From: Philipp Kolmann <philipp@kolmann.at>
Date: Mon, 24 Feb 2020 13:57:53 +0100
Subject: [PATCH 016/135] Fix cp command for consentAdmin module

The cp command in consentAdmin had a non-existing config-templates file.
---
 docs/consentAdmin.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/consentAdmin.md b/docs/consentAdmin.md
index 1dc342e..630ce8b 100644
--- a/docs/consentAdmin.md
+++ b/docs/consentAdmin.md
@@ -19,7 +19,7 @@ The first thing you need to do is to enable the consentAdmin module:
 
 Next you need to copy the module config file to the config directory:
 
-    cp modules/consentAdmin/config-templates/module_config.php config
+    cp modules/consentAdmin/config-templates/module_consentAdmin.php config/
 
 Then you will need to set up the database. The consentAdmin uses the same
 table as the consent module, but you still need the set the correct

From 38ffc048b0a73d77c9339ab7b0174d3e712095e8 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tim.dijen@minbzk.nl>
Date: Tue, 25 Feb 2020 16:33:45 +0100
Subject: [PATCH 017/135] Rename .codecov.yml to codecov.yml

---
 .codecov.yml => codecov.yml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename .codecov.yml => codecov.yml (100%)

diff --git a/.codecov.yml b/codecov.yml
similarity index 100%
rename from .codecov.yml
rename to codecov.yml

From 365f57df9c1878697ca0343c2bcc857e2ed32a1a Mon Sep 17 00:00:00 2001
From: Thijs Kinkhorst <thijs@kinkhorst.com>
Date: Fri, 20 Mar 2020 10:55:55 +0100
Subject: [PATCH 018/135] Fix msgfmt syntax error

---
 locales/ar/LC_MESSAGES/consentAdmin.po    | 15 +++-----
 locales/cs/LC_MESSAGES/consentAdmin.po    | 15 +++-----
 locales/da/LC_MESSAGES/consentAdmin.po    | 15 +++-----
 locales/de/LC_MESSAGES/consentAdmin.po    | 15 +++-----
 locales/el/LC_MESSAGES/consentAdmin.po    | 15 +++-----
 locales/en/LC_MESSAGES/consentAdmin.po    | 45 +++++++++--------------
 locales/es/LC_MESSAGES/consentAdmin.po    | 15 +++-----
 locales/et/LC_MESSAGES/consentAdmin.po    | 15 +++-----
 locales/eu/LC_MESSAGES/consentAdmin.po    | 15 +++-----
 locales/fr/LC_MESSAGES/consentAdmin.po    | 15 +++-----
 locales/he/LC_MESSAGES/consentAdmin.po    | 15 +++-----
 locales/hr/LC_MESSAGES/consentAdmin.po    | 15 +++-----
 locales/hu/LC_MESSAGES/consentAdmin.po    | 15 +++-----
 locales/id/LC_MESSAGES/consentAdmin.po    | 15 +++-----
 locales/it/LC_MESSAGES/consentAdmin.po    | 15 +++-----
 locales/ja/LC_MESSAGES/consentAdmin.po    | 15 +++-----
 locales/lt/LC_MESSAGES/consentAdmin.po    | 15 +++-----
 locales/lv/LC_MESSAGES/consentAdmin.po    | 15 +++-----
 locales/nb/LC_MESSAGES/consentAdmin.po    | 15 +++-----
 locales/nl/LC_MESSAGES/consentAdmin.po    | 15 +++-----
 locales/nn/LC_MESSAGES/consentAdmin.po    | 15 +++-----
 locales/pt/LC_MESSAGES/consentAdmin.po    | 15 +++-----
 locales/ro/LC_MESSAGES/consentAdmin.po    | 15 +++-----
 locales/ru/LC_MESSAGES/consentAdmin.po    | 15 +++-----
 locales/sl/LC_MESSAGES/consentAdmin.po    | 15 +++-----
 locales/sr/LC_MESSAGES/consentAdmin.po    | 15 +++-----
 locales/sv/LC_MESSAGES/consentAdmin.po    | 15 +++-----
 locales/zh-tw/LC_MESSAGES/consentAdmin.po | 15 +++-----
 locales/zh/LC_MESSAGES/consentAdmin.po    | 15 +++-----
 29 files changed, 186 insertions(+), 279 deletions(-)

diff --git a/locales/ar/LC_MESSAGES/consentAdmin.po b/locales/ar/LC_MESSAGES/consentAdmin.po
index d778277..8d2c7db 100644
--- a/locales/ar/LC_MESSAGES/consentAdmin.po
+++ b/locales/ar/LC_MESSAGES/consentAdmin.po
@@ -131,16 +131,13 @@ msgid "attributes"
 msgstr "السمات"
 
 msgid ""
-"\n"
-"<h3>How to delete your consent</h3>\n"
+"<h3>How to delete your consent</h3>"
 "Uncheck the box corresponding to the service provider\n"
-"\n"
-"<h3>Links</h3>\n"
-"<ul>\n"
-"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
-"\n"
-"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
-"</ul>\n"
+"<h3>Links</h3>"
+"<ul>"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>"
+"</ul>"
 msgstr ""
 "لحذف موافقتك</h3>الغي  صندوق مشغل الخدمة<h3>روابط</h3> <ul> <li><a "
 "href=\"https://www.wayf.dk\">أبدا>/a></li><li><ahref=\"https://www.wayf.dk/index.php/en"
diff --git a/locales/cs/LC_MESSAGES/consentAdmin.po b/locales/cs/LC_MESSAGES/consentAdmin.po
index 42b3f52..faad4eb 100644
--- a/locales/cs/LC_MESSAGES/consentAdmin.po
+++ b/locales/cs/LC_MESSAGES/consentAdmin.po
@@ -132,16 +132,13 @@ msgid "attributes"
 msgstr "atributy"
 
 msgid ""
-"\n"
-"<h3>How to delete your consent</h3>\n"
+"<h3>How to delete your consent</h3>"
 "Uncheck the box corresponding to the service provider\n"
-"\n"
-"<h3>Links</h3>\n"
-"<ul>\n"
-"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
-"\n"
-"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
-"</ul>\n"
+"<h3>Links</h3>"
+"<ul>"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>"
+"</ul>"
 msgstr ""
 "<h3>Jak smazat vaše povolení</h3> Odznačte políčko odpovídající "
 "poskytovateli služeb <h3>Odkazy</h3> <ul><li><a "
diff --git a/locales/da/LC_MESSAGES/consentAdmin.po b/locales/da/LC_MESSAGES/consentAdmin.po
index bdd2573..a3a46f3 100644
--- a/locales/da/LC_MESSAGES/consentAdmin.po
+++ b/locales/da/LC_MESSAGES/consentAdmin.po
@@ -163,16 +163,13 @@ msgid "attributes"
 msgstr "attributter"
 
 msgid ""
-"\n"
-"<h3>How to delete your consent</h3>\n"
+"<h3>How to delete your consent</h3>"
 "Uncheck the box corresponding to the service provider\n"
-"\n"
-"<h3>Links</h3>\n"
-"<ul>\n"
-"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
-"\n"
-"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
-"</ul>\n"
+"<h3>Links</h3>"
+"<ul>"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>"
+"</ul>"
 msgstr ""
 "<h3>Sådan sletter du et samtykke</h3>Fjern fluebenet ud for tjenesten, "
 "samtykket tilhører.<h3>Hvilke data gemmer WAYF om dig?</h3><ul><li>Når du"
diff --git a/locales/de/LC_MESSAGES/consentAdmin.po b/locales/de/LC_MESSAGES/consentAdmin.po
index 72b0ae0..5b83d9f 100644
--- a/locales/de/LC_MESSAGES/consentAdmin.po
+++ b/locales/de/LC_MESSAGES/consentAdmin.po
@@ -137,16 +137,13 @@ msgid "attributes"
 msgstr "Attribute"
 
 msgid ""
-"\n"
-"<h3>How to delete your consent</h3>\n"
+"<h3>How to delete your consent</h3>"
 "Uncheck the box corresponding to the service provider\n"
-"\n"
-"<h3>Links</h3>\n"
-"<ul>\n"
-"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
-"\n"
-"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
-"</ul>\n"
+"<h3>Links</h3>"
+"<ul>"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>"
+"</ul>"
 msgstr ""
 "<h3>Wie Sie Ihre Einverständniserklärung löschen</h3> Entfernen Sie das "
 "Häkchen von der Box des jeweiligen "
diff --git a/locales/el/LC_MESSAGES/consentAdmin.po b/locales/el/LC_MESSAGES/consentAdmin.po
index 15e128a..6fdd9c3 100644
--- a/locales/el/LC_MESSAGES/consentAdmin.po
+++ b/locales/el/LC_MESSAGES/consentAdmin.po
@@ -133,16 +133,13 @@ msgid "attributes"
 msgstr "στοιχείων"
 
 msgid ""
-"\n"
-"<h3>How to delete your consent</h3>\n"
+"<h3>How to delete your consent</h3>"
 "Uncheck the box corresponding to the service provider\n"
-"\n"
-"<h3>Links</h3>\n"
-"<ul>\n"
-"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
-"\n"
-"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
-"</ul>\n"
+"<h3>Links</h3>"
+"<ul>"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>"
+"</ul>"
 msgstr ""
 "<h3>Πώς να αναιρέσετε τη συγκατάθεσή σας</h3>Αποεπιλέξτε το κουτί "
 "επιλογής που αντιστοιχεί στον πάροχο υπηρεσιών"
diff --git a/locales/en/LC_MESSAGES/consentAdmin.po b/locales/en/LC_MESSAGES/consentAdmin.po
index 8d8ec9a..06a32f2 100644
--- a/locales/en/LC_MESSAGES/consentAdmin.po
+++ b/locales/en/LC_MESSAGES/consentAdmin.po
@@ -56,16 +56,13 @@ msgstr "Service Providers for"
 
 msgid "{consentAdmin:consentadmin:consentadmin_description2}"
 msgstr ""
-"\n"
-"<h3>How to delete your consent</h3>\n"
+"<h3>How to delete your consent</h3>"
 "Uncheck the box corresponding to the service provider\n"
-"\n"
-"<h3>Links</h3>\n"
-"<ul>\n"
-"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
-"\n"
-"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
-"</ul>\n"
+"<h3>Links</h3>"
+"<ul>"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>"
+"</ul>"
 
 msgid "{consentAdmin:consentadmin:login}"
 msgstr "login"
@@ -137,27 +134,21 @@ msgid "attributes"
 msgstr "attributes"
 
 msgid ""
-"\n"
-"<h3>How to delete your consent</h3>\n"
+"<h3>How to delete your consent</h3>"
 "Uncheck the box corresponding to the service provider\n"
-"\n"
-"<h3>Links</h3>\n"
-"<ul>\n"
-"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
-"\n"
-"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
-"</ul>\n"
+"<h3>Links</h3>"
+"<ul>"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>"
+"</ul>"
 msgstr ""
-"\n"
-"<h3>How to delete your consent</h3>\n"
+"<h3>How to delete your consent</h3>"
 "Uncheck the box corresponding to the service provider\n"
-"\n"
-"<h3>Links</h3>\n"
-"<ul>\n"
-"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
-"\n"
-"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
-"</ul>\n"
+"<h3>Links</h3>"
+"<ul>"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>"
+"</ul>"
 
 msgid "Consent Removed"
 msgstr "Consent Removed"
diff --git a/locales/es/LC_MESSAGES/consentAdmin.po b/locales/es/LC_MESSAGES/consentAdmin.po
index 21b4047..9114c07 100644
--- a/locales/es/LC_MESSAGES/consentAdmin.po
+++ b/locales/es/LC_MESSAGES/consentAdmin.po
@@ -136,16 +136,13 @@ msgid "attributes"
 msgstr "Atributos"
 
 msgid ""
-"\n"
-"<h3>How to delete your consent</h3>\n"
+"<h3>How to delete your consent</h3>"
 "Uncheck the box corresponding to the service provider\n"
-"\n"
-"<h3>Links</h3>\n"
-"<ul>\n"
-"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
-"\n"
-"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
-"</ul>\n"
+"<h3>Links</h3>"
+"<ul>"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>"
+"</ul>"
 msgstr ""
 "<h3>Como eliminar su consentimiento</h3> Desmarque la opción "
 "correspondiente al proveedor de servicios <h3>Vínculos</h3> <ul> <li><a "
diff --git a/locales/et/LC_MESSAGES/consentAdmin.po b/locales/et/LC_MESSAGES/consentAdmin.po
index 4a815ad..00b57da 100644
--- a/locales/et/LC_MESSAGES/consentAdmin.po
+++ b/locales/et/LC_MESSAGES/consentAdmin.po
@@ -132,16 +132,13 @@ msgid "attributes"
 msgstr "atribuudid"
 
 msgid ""
-"\n"
-"<h3>How to delete your consent</h3>\n"
+"<h3>How to delete your consent</h3>"
 "Uncheck the box corresponding to the service provider\n"
-"\n"
-"<h3>Links</h3>\n"
-"<ul>\n"
-"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
-"\n"
-"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
-"</ul>\n"
+"<h3>Links</h3>"
+"<ul>"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>"
+"</ul>"
 msgstr ""
 "<h3>Kuidas eemaldada nõusolekut</h3> Eemalda vastava teenusepakkuja "
 "juurest märge <h3>Viited</h3> <ul> <li><a "
diff --git a/locales/eu/LC_MESSAGES/consentAdmin.po b/locales/eu/LC_MESSAGES/consentAdmin.po
index adeb050..2539d91 100644
--- a/locales/eu/LC_MESSAGES/consentAdmin.po
+++ b/locales/eu/LC_MESSAGES/consentAdmin.po
@@ -132,16 +132,13 @@ msgid "attributes"
 msgstr "Atributuak"
 
 msgid ""
-"\n"
-"<h3>How to delete your consent</h3>\n"
+"<h3>How to delete your consent</h3>"
 "Uncheck the box corresponding to the service provider\n"
-"\n"
-"<h3>Links</h3>\n"
-"<ul>\n"
-"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
-"\n"
-"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
-"</ul>\n"
+"<h3>Links</h3>"
+"<ul>"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>"
+"</ul>"
 msgstr ""
 "<h3>Zure onespena nola ezabatu</h3> Zerbitzu hornitzaileari dagokion "
 "aukerari marka kendu ezaiozu <h3>Loturak</h3> <ul> <li><a "
diff --git a/locales/fr/LC_MESSAGES/consentAdmin.po b/locales/fr/LC_MESSAGES/consentAdmin.po
index 65abab4..5a48651 100644
--- a/locales/fr/LC_MESSAGES/consentAdmin.po
+++ b/locales/fr/LC_MESSAGES/consentAdmin.po
@@ -136,16 +136,13 @@ msgid "attributes"
 msgstr "attributs"
 
 msgid ""
-"\n"
-"<h3>How to delete your consent</h3>\n"
+"<h3>How to delete your consent</h3>"
 "Uncheck the box corresponding to the service provider\n"
-"\n"
-"<h3>Links</h3>\n"
-"<ul>\n"
-"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
-"\n"
-"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
-"</ul>\n"
+"<h3>Links</h3>"
+"<ul>"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>"
+"</ul>"
 msgstr ""
 "<h3>Comment révoquer un consentement</h3>Décochez la case correspondante "
 "au fournisseur de service <h3>Liens</h3><ul><li><a "
diff --git a/locales/he/LC_MESSAGES/consentAdmin.po b/locales/he/LC_MESSAGES/consentAdmin.po
index 4cb1b77..db2b074 100644
--- a/locales/he/LC_MESSAGES/consentAdmin.po
+++ b/locales/he/LC_MESSAGES/consentAdmin.po
@@ -131,16 +131,13 @@ msgid "attributes"
 msgstr "מאפיינים"
 
 msgid ""
-"\n"
-"<h3>How to delete your consent</h3>\n"
+"<h3>How to delete your consent</h3>"
 "Uncheck the box corresponding to the service provider\n"
-"\n"
-"<h3>Links</h3>\n"
-"<ul>\n"
-"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
-"\n"
-"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
-"</ul>\n"
+"<h3>Links</h3>"
+"<ul>"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>"
+"</ul>"
 msgstr ""
 "<h3>איך להסיר את הסכמתך</h3> לחץ בתיבה המתאימה לספק השירות "
 "<h3>קישורים</h3>  <ul> <li><a href=\"https://www.wayf.dk\">התחלה</a> "
diff --git a/locales/hr/LC_MESSAGES/consentAdmin.po b/locales/hr/LC_MESSAGES/consentAdmin.po
index b7be441..82ef53c 100644
--- a/locales/hr/LC_MESSAGES/consentAdmin.po
+++ b/locales/hr/LC_MESSAGES/consentAdmin.po
@@ -133,16 +133,13 @@ msgid "attributes"
 msgstr "atributi"
 
 msgid ""
-"\n"
-"<h3>How to delete your consent</h3>\n"
+"<h3>How to delete your consent</h3>"
 "Uncheck the box corresponding to the service provider\n"
-"\n"
-"<h3>Links</h3>\n"
-"<ul>\n"
-"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
-"\n"
-"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
-"</ul>\n"
+"<h3>Links</h3>"
+"<ul>"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>"
+"</ul>"
 msgstr ""
 "<h3>Kako obrisati dozvolu</h3> Maknite kvačicu iz polja koje se odnosi na"
 " davatelja usluge <h3>Poveznice</h3> <ul> <li><a "
diff --git a/locales/hu/LC_MESSAGES/consentAdmin.po b/locales/hu/LC_MESSAGES/consentAdmin.po
index 51f0166..22bd5e4 100644
--- a/locales/hu/LC_MESSAGES/consentAdmin.po
+++ b/locales/hu/LC_MESSAGES/consentAdmin.po
@@ -133,16 +133,13 @@ msgid "attributes"
 msgstr "."
 
 msgid ""
-"\n"
-"<h3>How to delete your consent</h3>\n"
+"<h3>How to delete your consent</h3>"
 "Uncheck the box corresponding to the service provider\n"
-"\n"
-"<h3>Links</h3>\n"
-"<ul>\n"
-"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
-"\n"
-"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
-"</ul>\n"
+"<h3>Links</h3>"
+"<ul>"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>"
+"</ul>"
 msgstr ""
 "<h3>Hogyan kell visszavonni egy hozzájárulást?</h3> A szolgáltatóhoz "
 "tartozó jelölőnégyzetben szüntesse meg a kijelölést!"
diff --git a/locales/id/LC_MESSAGES/consentAdmin.po b/locales/id/LC_MESSAGES/consentAdmin.po
index 64e517d..069aa9e 100644
--- a/locales/id/LC_MESSAGES/consentAdmin.po
+++ b/locales/id/LC_MESSAGES/consentAdmin.po
@@ -136,16 +136,13 @@ msgid "attributes"
 msgstr "Attribute"
 
 msgid ""
-"\n"
-"<h3>How to delete your consent</h3>\n"
+"<h3>How to delete your consent</h3>"
 "Uncheck the box corresponding to the service provider\n"
-"\n"
-"<h3>Links</h3>\n"
-"<ul>\n"
-"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
-"\n"
-"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
-"</ul>\n"
+"<h3>Links</h3>"
+"<ul>"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>"
+"</ul>"
 msgstr ""
 "<h3>Bagaimana cara menghapus consent anda</h3> Hapus centak pada kotak "
 "service provider yang anda maksud <h3>Link</h3> <ul> <li><a "
diff --git a/locales/it/LC_MESSAGES/consentAdmin.po b/locales/it/LC_MESSAGES/consentAdmin.po
index 10b213d..2dce4a0 100644
--- a/locales/it/LC_MESSAGES/consentAdmin.po
+++ b/locales/it/LC_MESSAGES/consentAdmin.po
@@ -136,16 +136,13 @@ msgid "attributes"
 msgstr "attributi"
 
 msgid ""
-"\n"
-"<h3>How to delete your consent</h3>\n"
+"<h3>How to delete your consent</h3>"
 "Uncheck the box corresponding to the service provider\n"
-"\n"
-"<h3>Links</h3>\n"
-"<ul>\n"
-"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
-"\n"
-"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
-"</ul>\n"
+"<h3>Links</h3>"
+"<ul>"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>"
+"</ul>"
 msgstr ""
 "<h3>Come rimuovere il consenso></h3> Togliere il segno di spunta al "
 "corrispondente service provider<h3>Collegamenti</h3><ul><li><a "
diff --git a/locales/ja/LC_MESSAGES/consentAdmin.po b/locales/ja/LC_MESSAGES/consentAdmin.po
index 5a26c6a..b0cfbd2 100644
--- a/locales/ja/LC_MESSAGES/consentAdmin.po
+++ b/locales/ja/LC_MESSAGES/consentAdmin.po
@@ -131,16 +131,13 @@ msgid "attributes"
 msgstr "属性"
 
 msgid ""
-"\n"
-"<h3>How to delete your consent</h3>\n"
+"<h3>How to delete your consent</h3>"
 "Uncheck the box corresponding to the service provider\n"
-"\n"
-"<h3>Links</h3>\n"
-"<ul>\n"
-"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
-"\n"
-"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
-"</ul>\n"
+"<h3>Links</h3>"
+"<ul>"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>"
+"</ul>"
 msgstr ""
 "<h3>承認の削除方法</h3> 該当するサービスプロバイダのチェックを外します。<h3>リンク</h3> <ul> <li><a "
 "href=\"https://www.wayf.dk\">Start</a> </li> <li><a "
diff --git a/locales/lt/LC_MESSAGES/consentAdmin.po b/locales/lt/LC_MESSAGES/consentAdmin.po
index 7596d5e..d2d1c60 100644
--- a/locales/lt/LC_MESSAGES/consentAdmin.po
+++ b/locales/lt/LC_MESSAGES/consentAdmin.po
@@ -132,16 +132,13 @@ msgid "attributes"
 msgstr "atributai"
 
 msgid ""
-"\n"
-"<h3>How to delete your consent</h3>\n"
+"<h3>How to delete your consent</h3>"
 "Uncheck the box corresponding to the service provider\n"
-"\n"
-"<h3>Links</h3>\n"
-"<ul>\n"
-"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
-"\n"
-"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
-"</ul>\n"
+"<h3>Links</h3>"
+"<ul>"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>"
+"</ul>"
 msgstr ""
 "<h3>Kaip pašalinti savo leidimą</h3> Panaikinkite pažymėjimą ties "
 "atitinkamu paslaugos teikėju <h3>Nuorodos</h3> <ul> <li><a "
diff --git a/locales/lv/LC_MESSAGES/consentAdmin.po b/locales/lv/LC_MESSAGES/consentAdmin.po
index 6f5ff43..9a3fdd1 100644
--- a/locales/lv/LC_MESSAGES/consentAdmin.po
+++ b/locales/lv/LC_MESSAGES/consentAdmin.po
@@ -133,16 +133,13 @@ msgid "attributes"
 msgstr "atribūti"
 
 msgid ""
-"\n"
-"<h3>How to delete your consent</h3>\n"
+"<h3>How to delete your consent</h3>"
 "Uncheck the box corresponding to the service provider\n"
-"\n"
-"<h3>Links</h3>\n"
-"<ul>\n"
-"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
-"\n"
-"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
-"</ul>\n"
+"<h3>Links</h3>"
+"<ul>"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>"
+"</ul>"
 msgstr ""
 "<h3>Kā dzēst noteikumus</h3> Izņemiet ķeksīti pie atbilstošā servisa "
 "piegādātāja <h3>Saites</h3> <ul> <li><a "
diff --git a/locales/nb/LC_MESSAGES/consentAdmin.po b/locales/nb/LC_MESSAGES/consentAdmin.po
index a820005..4a42db0 100644
--- a/locales/nb/LC_MESSAGES/consentAdmin.po
+++ b/locales/nb/LC_MESSAGES/consentAdmin.po
@@ -132,16 +132,13 @@ msgid "attributes"
 msgstr "persondata"
 
 msgid ""
-"\n"
-"<h3>How to delete your consent</h3>\n"
+"<h3>How to delete your consent</h3>"
 "Uncheck the box corresponding to the service provider\n"
-"\n"
-"<h3>Links</h3>\n"
-"<ul>\n"
-"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
-"\n"
-"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
-"</ul>\n"
+"<h3>Links</h3>"
+"<ul>"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>"
+"</ul>"
 msgstr ""
 "<h3>Hvordan trekke samtykke tilbake</h3> Fjern haken i boksen for gitte "
 "tjenestetilbyder <h3>Lenker</h3> <ul> <li><a "
diff --git a/locales/nl/LC_MESSAGES/consentAdmin.po b/locales/nl/LC_MESSAGES/consentAdmin.po
index 77c74ed..ad9a98d 100644
--- a/locales/nl/LC_MESSAGES/consentAdmin.po
+++ b/locales/nl/LC_MESSAGES/consentAdmin.po
@@ -136,16 +136,13 @@ msgid "attributes"
 msgstr "attributen"
 
 msgid ""
-"\n"
-"<h3>How to delete your consent</h3>\n"
+"<h3>How to delete your consent</h3>"
 "Uncheck the box corresponding to the service provider\n"
-"\n"
-"<h3>Links</h3>\n"
-"<ul>\n"
-"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
-"\n"
-"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
-"</ul>\n"
+"<h3>Links</h3>"
+"<ul>"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>"
+"</ul>"
 msgstr ""
 "<h3>Hoe verwijderdt u toestemmingen</h3> Vinkt u het vakje af dat "
 "overeenkomt met de dienstverlener <h3>Links</h3> <ul> <li><a "
diff --git a/locales/nn/LC_MESSAGES/consentAdmin.po b/locales/nn/LC_MESSAGES/consentAdmin.po
index e4a7127..4afdee7 100644
--- a/locales/nn/LC_MESSAGES/consentAdmin.po
+++ b/locales/nn/LC_MESSAGES/consentAdmin.po
@@ -132,16 +132,13 @@ msgid "attributes"
 msgstr "persondata"
 
 msgid ""
-"\n"
-"<h3>How to delete your consent</h3>\n"
+"<h3>How to delete your consent</h3>"
 "Uncheck the box corresponding to the service provider\n"
-"\n"
-"<h3>Links</h3>\n"
-"<ul>\n"
-"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
-"\n"
-"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
-"</ul>\n"
+"<h3>Links</h3>"
+"<ul>"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>"
+"</ul>"
 msgstr ""
 "<h3>Korleis dra tilbake samtykke</h3> Fjern haka i boksen for enkelte "
 "tenester <h3>Lenker</h3> <ul> <li><a "
diff --git a/locales/pt/LC_MESSAGES/consentAdmin.po b/locales/pt/LC_MESSAGES/consentAdmin.po
index 85983c3..3678f9e 100644
--- a/locales/pt/LC_MESSAGES/consentAdmin.po
+++ b/locales/pt/LC_MESSAGES/consentAdmin.po
@@ -133,16 +133,13 @@ msgid "attributes"
 msgstr "atributos"
 
 msgid ""
-"\n"
-"<h3>How to delete your consent</h3>\n"
+"<h3>How to delete your consent</h3>"
 "Uncheck the box corresponding to the service provider\n"
-"\n"
-"<h3>Links</h3>\n"
-"<ul>\n"
-"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
-"\n"
-"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
-"</ul>\n"
+"<h3>Links</h3>"
+"<ul>"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>"
+"</ul>"
 msgstr ""
 "<h3>Como remover o seu consentimento</h3> Retire a marca correspondente "
 "ao fornecedor de serviço que pretende remover."
diff --git a/locales/ro/LC_MESSAGES/consentAdmin.po b/locales/ro/LC_MESSAGES/consentAdmin.po
index 6c1943b..736cbaf 100644
--- a/locales/ro/LC_MESSAGES/consentAdmin.po
+++ b/locales/ro/LC_MESSAGES/consentAdmin.po
@@ -136,16 +136,13 @@ msgid "attributes"
 msgstr "atribute"
 
 msgid ""
-"\n"
-"<h3>How to delete your consent</h3>\n"
+"<h3>How to delete your consent</h3>"
 "Uncheck the box corresponding to the service provider\n"
-"\n"
-"<h3>Links</h3>\n"
-"<ul>\n"
-"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
-"\n"
-"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
-"</ul>\n"
+"<h3>Links</h3>"
+"<ul>"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>"
+"</ul>"
 msgstr ""
 "<h3>Cum poate fi anulat acordul dumneavoastră</h3>Debifați căsuța "
 "corespunzătoare furnizorului de servicii <h3>Link-uri</h3><ul><li><a "
diff --git a/locales/ru/LC_MESSAGES/consentAdmin.po b/locales/ru/LC_MESSAGES/consentAdmin.po
index a641ee0..06a312d 100644
--- a/locales/ru/LC_MESSAGES/consentAdmin.po
+++ b/locales/ru/LC_MESSAGES/consentAdmin.po
@@ -135,16 +135,13 @@ msgid "attributes"
 msgstr "атрибуты"
 
 msgid ""
-"\n"
-"<h3>How to delete your consent</h3>\n"
+"<h3>How to delete your consent</h3>"
 "Uncheck the box corresponding to the service provider\n"
-"\n"
-"<h3>Links</h3>\n"
-"<ul>\n"
-"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
-"\n"
-"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
-"</ul>\n"
+"<h3>Links</h3>"
+"<ul>"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>"
+"</ul>"
 msgstr ""
 "<h3>Как удалить ваше согласие</h3> Снимите выделение с сервис провайдера "
 "<h3>Ссылки</h3> <ul> <li><a href=\"https://www.wayf.dk\">Start</a> </li> "
diff --git a/locales/sl/LC_MESSAGES/consentAdmin.po b/locales/sl/LC_MESSAGES/consentAdmin.po
index 915d166..d3901f9 100644
--- a/locales/sl/LC_MESSAGES/consentAdmin.po
+++ b/locales/sl/LC_MESSAGES/consentAdmin.po
@@ -132,16 +132,13 @@ msgid "attributes"
 msgstr "atributi"
 
 msgid ""
-"\n"
-"<h3>How to delete your consent</h3>\n"
+"<h3>How to delete your consent</h3>"
 "Uncheck the box corresponding to the service provider\n"
-"\n"
-"<h3>Links</h3>\n"
-"<ul>\n"
-"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
-"\n"
-"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
-"</ul>\n"
+"<h3>Links</h3>"
+"<ul>"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>"
+"</ul>"
 msgstr ""
 "<h3>Kako razveljavim dano privolitev?</h3> Odstranite kljukico pred "
 "SPjem, za katerega želite razveljaviti dano privolitev<h3>Povezave</h3> "
diff --git a/locales/sr/LC_MESSAGES/consentAdmin.po b/locales/sr/LC_MESSAGES/consentAdmin.po
index 6099ce8..dfe5e3b 100644
--- a/locales/sr/LC_MESSAGES/consentAdmin.po
+++ b/locales/sr/LC_MESSAGES/consentAdmin.po
@@ -133,16 +133,13 @@ msgid "attributes"
 msgstr "atributi"
 
 msgid ""
-"\n"
-"<h3>How to delete your consent</h3>\n"
+"<h3>How to delete your consent</h3>"
 "Uncheck the box corresponding to the service provider\n"
-"\n"
-"<h3>Links</h3>\n"
-"<ul>\n"
-"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
-"\n"
-"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
-"</ul>\n"
+"<h3>Links</h3>"
+"<ul>"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>"
+"</ul>"
 msgstr ""
 "<h3>Kako obrisati dozvolu</h3> Uklonite kvačicu iz polja koje se odnosi "
 "na davaoca servisa <h3>Linkovi</h3> <ul> <li><a "
diff --git a/locales/sv/LC_MESSAGES/consentAdmin.po b/locales/sv/LC_MESSAGES/consentAdmin.po
index 6777d22..2935a2c 100644
--- a/locales/sv/LC_MESSAGES/consentAdmin.po
+++ b/locales/sv/LC_MESSAGES/consentAdmin.po
@@ -132,16 +132,13 @@ msgid "attributes"
 msgstr "attribut"
 
 msgid ""
-"\n"
-"<h3>How to delete your consent</h3>\n"
+"<h3>How to delete your consent</h3>"
 "Uncheck the box corresponding to the service provider\n"
-"\n"
-"<h3>Links</h3>\n"
-"<ul>\n"
-"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
-"\n"
-"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
-"</ul>\n"
+"<h3>Links</h3>"
+"<ul>"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>"
+"</ul>"
 msgstr ""
 "<h3>Hur du tar bort ditt samtycke</h3> Ta bort markeringen i rutan "
 "kopplad till tjänsteleverantören <h3>Länkar</h3> <ul> <li><a "
diff --git a/locales/zh-tw/LC_MESSAGES/consentAdmin.po b/locales/zh-tw/LC_MESSAGES/consentAdmin.po
index 7976654..0179f90 100644
--- a/locales/zh-tw/LC_MESSAGES/consentAdmin.po
+++ b/locales/zh-tw/LC_MESSAGES/consentAdmin.po
@@ -131,16 +131,13 @@ msgid "attributes"
 msgstr "屬性"
 
 msgid ""
-"\n"
-"<h3>How to delete your consent</h3>\n"
+"<h3>How to delete your consent</h3>"
 "Uncheck the box corresponding to the service provider\n"
-"\n"
-"<h3>Links</h3>\n"
-"<ul>\n"
-"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
-"\n"
-"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
-"</ul>\n"
+"<h3>Links</h3>"
+"<ul>"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>"
+"</ul>"
 msgstr ""
 "<h3>在這刪除您的授權</h3> 取消勾選服務提供者對應的核取方塊 <h3>連結</h3> <ul> <li><a "
 "href=\"https://www.wayf.dk\">開始</a> </li> <li><a "
diff --git a/locales/zh/LC_MESSAGES/consentAdmin.po b/locales/zh/LC_MESSAGES/consentAdmin.po
index ab6ab8d..a6f3051 100644
--- a/locales/zh/LC_MESSAGES/consentAdmin.po
+++ b/locales/zh/LC_MESSAGES/consentAdmin.po
@@ -131,16 +131,13 @@ msgid "attributes"
 msgstr "属性"
 
 msgid ""
-"\n"
-"<h3>How to delete your consent</h3>\n"
+"<h3>How to delete your consent</h3>"
 "Uncheck the box corresponding to the service provider\n"
-"\n"
-"<h3>Links</h3>\n"
-"<ul>\n"
-"<li><a href=\"https://www.wayf.dk\">Start</a> </li>\n"
-"\n"
-"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>\n"
-"</ul>\n"
+"<h3>Links</h3>"
+"<ul>"
+"<li><a href=\"https://www.wayf.dk\">Start</a> </li>"
+"<li><a href=\"https://www.wayf.dk/FAQ\">FAQ</a> </li>"
+"</ul>"
 msgstr ""
 "<h3>如何删除你的许可</h3>反选相应的SP选择框<h3>Links</h3> <ul> <li><a "
 "href=\"https://www.wayf.dk\">开始</a> </li> <li><a "

From 50f332f1a5c98c1ddf064d96ed7d920325f37b00 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Sat, 21 Mar 2020 11:42:44 +0100
Subject: [PATCH 019/135] Add LICENSE

---
 LICENSE | 459 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 459 insertions(+)
 create mode 100644 LICENSE

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..a345e48
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,459 @@
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
\ No newline at end of file

From 0e19f5965096a0395e37c60ce646159791988548 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tim.dijen@minbzk.nl>
Date: Sun, 22 Mar 2020 16:07:59 +0100
Subject: [PATCH 020/135] Fix license

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index af0ef98..fb3e6d9 100644
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,7 @@
     "description": "A module that allows users to manage their consent",
     "type": "simplesamlphp-module",
     "keywords": ["simplesamlphp", "consentadmin"],
-    "license": "LGPL-3.0-or-later",
+    "license": "LGPL-2.1-or-later",
     "authors": [
         {
             "name": "Jacob Christiansen",

From 096d77ed63932cc13b73b4ecb6ded74cd3f0e9f5 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tim.dijen@minbzk.nl>
Date: Wed, 25 Mar 2020 15:40:15 +0100
Subject: [PATCH 021/135] Update phpunit.xml

---
 phpunit.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpunit.xml b/phpunit.xml
index 43ee896..a00c67f 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -2,8 +2,8 @@
 <phpunit bootstrap="tests/bootstrap.php">
     <testsuites>
         <testsuite name="The project's test suite">
-            <directory>./vendor/simplesamlphp/simplesamlphp-test-framework/tests/</directory>
-            <directory>tests/</directory>
+            <directory>./vendor/simplesamlphp/simplesamlphp-test-framework/src</directory>
+            <directory>./tests</directory>
         </testsuite>
     </testsuites>
     <filter>

From 16a872d0d706a151ad9b0761e328c63500dd216f Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Sun, 9 Aug 2020 17:35:04 +0200
Subject: [PATCH 022/135] Fix Twig template bug

---
 templates/consentadmin.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/consentadmin.twig b/templates/consentadmin.twig
index dbfb8ed..b11eeeb 100644
--- a/templates/consentadmin.twig
+++ b/templates/consentadmin.twig
@@ -2,7 +2,7 @@
 {% extends "base.twig" %}
 
 {% block preload %}
-<link rel="stylesheet" href="{{ asset('css/consentAdmin.css, 'consentAdmin') }}">
+<link rel="stylesheet" href="{{ asset('css/consentAdmin.css', 'consentAdmin') }}">
 {% endblock %}
 
 {% block postload %}

From 9402a7c65fb5d3285ca3ba7439b4f24ba9648983 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Thu, 10 Sep 2020 20:26:32 +0200
Subject: [PATCH 023/135] Remove all @author tags; we have Git history

---
 config-templates/module_consentAdmin.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config-templates/module_consentAdmin.php b/config-templates/module_consentAdmin.php
index 9c54203..9f68648 100644
--- a/config-templates/module_consentAdmin.php
+++ b/config-templates/module_consentAdmin.php
@@ -2,7 +2,6 @@
 /**
  * Config file for consentAdmin
  *
- * @author Jacob Christiansen, <jach@wayf.dk>
  * @package SimpleSAMLphp
  */
 $config = [

From f431891b012303addafe1680e630fc0e27baf343 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Sat, 19 Sep 2020 16:11:46 +0200
Subject: [PATCH 024/135] Raise PHP-version to 7.4 & use Actions

---
 .github/workflows/php.yml | 209 ++++++++++++++++++++++++++++++++++++++
 .gitignore                |  10 ++
 .travis.yml               | 123 ----------------------
 composer.json             |   8 +-
 phpunit.xml               |  38 +++----
 5 files changed, 242 insertions(+), 146 deletions(-)
 create mode 100644 .github/workflows/php.yml
 create mode 100644 .gitignore
 delete mode 100644 .travis.yml

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
new file mode 100644
index 0000000..872986c
--- /dev/null
+++ b/.github/workflows/php.yml
@@ -0,0 +1,209 @@
+name: CI
+
+on:
+  push:
+    branches: [ '**' ]
+  pull_request:
+    branches: [ master, release-* ]
+
+jobs:
+  basic-tests:
+    name: Syntax and unit tests, PHP ${{ matrix.php-versions }}, ${{ matrix.operating-system }}
+    runs-on: ${{ matrix.operating-system }}
+    strategy:
+      fail-fast: false
+      matrix:
+        operating-system: [ubuntu-latest, windows-latest]
+        php-versions: ['7.4']
+
+    steps:
+      - name: Setup PHP, with composer and extensions
+        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        with:
+          php-version: ${{ matrix.php-versions }}
+          extensions: mbstring, xml
+          coverage: pcov
+
+      - name: Setup problem matchers for PHP
+        run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
+
+      - name: Setup problem matchers for PHPUnit
+        run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
+
+      - name: Set git to use LF
+        run: |
+          git config --global core.autocrlf false
+          git config --global core.eol lf
+
+      - uses: actions/checkout@v2
+
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - name: Cache composer dependencies
+        uses: actions/cache@v1
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Validate composer.json and composer.lock
+        run: composer validate
+
+      - name: Install Composer dependencies
+        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+
+      - name: Install test framework
+        run: composer require simplesamlphp/simplesamlphp-test-framework --dev
+
+      - name: Syntax check PHP
+        run: bash vendor/bin/check-syntax-php.sh
+
+      - name: Decide whether to run code coverage or not
+        uses: allenevans/set-env@v1.0.0
+        if: ${{ matrix.php-versions != '7.4' || matrix.operating-system != 'ubuntu-latest' }}
+        with:
+          NO_COVERAGE: "--no-coverage"
+
+      - name: Run unit tests
+        run: |
+          echo $NO_COVERAGE
+          ./vendor/bin/phpunit $NO_COVERAGE
+
+      - name: Save coverage data
+        if: ${{ matrix.php-versions == '7.4' && matrix.operating-system == 'ubuntu-latest' }}
+        uses: actions/upload-artifact@v1
+        with:
+            name: build-data
+            path: ${{ github.workspace }}/build
+
+  security:
+    name: Security checks
+    runs-on: [ubuntu-latest]
+    steps:
+      - name: Setup PHP, with composer and extensions
+        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        with:
+            php-version: '7.4'
+            extensions: mbstring, xml
+            coverage: none
+
+      - name: Setup problem matchers for PHP
+        run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
+
+      - uses: actions/checkout@v2
+
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - name: Cache composer dependencies
+        uses: actions/cache@v1
+        with:
+            path: ${{ steps.composer-cache.outputs.dir }}
+            key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+            restore-keys: ${{ runner.os }}-composer-
+
+      - name: Install Composer dependencies
+        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+
+      - name: Security check for locked dependencies
+        run: ./vendor/bin/security-checker security:check
+
+      - name: Update Composer dependencies
+        run: composer update --no-progress --no-suggest --prefer-dist --optimize-autoloader
+
+      - name: Security check for updated dependencies
+        run: ./vendor/bin/security-checker security:check
+
+  sanity-check:
+    name: Sanity checks
+    runs-on: [ubuntu-latest]
+
+    steps:
+      - name: Setup PHP, with composer and extensions
+        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        with:
+          php-version: '7.4'
+          extensions: mbstring, xml
+          coverage: none
+
+      - name: Setup problem matchers for PHP
+        run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
+
+      - uses: actions/checkout@v2
+
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - name: Cache composer dependencies
+        uses: actions/cache@v1
+        with:
+            path: ${{ steps.composer-cache.outputs.dir }}
+            key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+            restore-keys: ${{ runner.os }}-composer-
+
+      - name: Install Composer dependencies
+        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+
+      - name: Install test framework
+        run: composer require simplesamlphp/simplesamlphp-test-framework --dev
+
+      - name: Syntax check YAML / XML / JSON
+        run: |
+          bash vendor/bin/check-syntax-yaml.sh
+          bash vendor/bin/check-syntax-xml.sh
+          bash vendor/bin/check-syntax-json.sh
+
+  quality:
+    name: Quality control
+    runs-on: [ubuntu-latest]
+    needs: [basic-tests]
+
+    steps:
+      - name: Setup PHP, with composer and extensions
+        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        with:
+          php-version: '7.4'
+          extensions: mbstring, xml
+
+      - name: Setup problem matchers for PHP
+        run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
+
+      - uses: actions/checkout@v2
+
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - name: Cache composer dependencies
+        uses: actions/cache@v1
+        with:
+            path: ${{ steps.composer-cache.outputs.dir }}
+            key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+            restore-keys: ${{ runner.os }}-composer-
+
+      - name: Install Composer dependencies
+        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+
+      - uses: actions/download-artifact@v1
+        with:
+          name: build-data
+          path: ${{ github.workspace }}/build
+
+      - name: Codecov
+        uses: codecov/codecov-action@v1
+
+      - name: PHP Code Sniffer
+        continue-on-error: true
+        run: php vendor/bin/phpcs src/
+
+      - name: Psalm
+        continue-on-error: true
+        uses: docker://vimeo/psalm-github-actions
+
+      - name: Psalter
+        continue-on-error: true
+        run: php vendor/bin/psalter --issues=UnnecessaryVarAnnotation --dry-run
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5eac572
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,10 @@
+### php-cs-fixer ###
+.php_cs.cache
+composer.lock
+cs_fixer_tmp*
+bin/*
+tools/*
+vendor/*
+build/*
+.phpunit.result.cache
+
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 74de322..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,123 +0,0 @@
-language: php
-
-stages:
-  - pre-conditions
-  - test
-  - quality
-
-################
-#  Test stage  #
-################
-
-php:
-  - 7.2
-  - 7.3
-  - 7.4
-
-env:
-  - COMMAND="composer install"
-  - COMMAND="composer update"
-
-before_script:
-  - ${COMMAND}
-
-script:
-  - php vendor/bin/phpunit --no-coverage
-
-jobs:
-  fast_finish: true
-
-  allow_failures:
-    - php: 7.3
-      env: Security check (composer install)
-    - php: 7.3
-      env: Security check (composer update)
-    - php: 7.3
-      env: Psalm
-    - php: 7.3
-      env: PHP Codesniffer
-
-  include:
-
-    ##########################
-    #  Pre-conditions stage  #
-    ##########################
-
-    - stage: pre-conditions
-      env: Syntax check PHP
-      php: 7.2
-      before_script:
-        - composer install
-      script:
-        - vendor/bin/check-syntax-php.sh
-
-    - stage: pre-conditions
-      env: Syntax check PHP
-      php: 7.3
-      before_script:
-        - composer install
-      script:
-        - vendor/bin/check-syntax-php.sh
-
-    - stage: pre-conditions
-      env: Syntax check PHP
-      php: 7.4
-      before_script:
-        - composer install
-      script:
-        - vendor/bin/check-syntax-php.sh
-
-    - stage: pre-conditions
-      env: Syntax check YAML / XML / JSON
-      before_script:
-        - composer require simplesamlphp/simplesamlphp-test-framework --dev
-      script:
-        - vendor/simplesamlphp/simplesamlphp-test-framework/bin/check-syntax-json.sh
-        - vendor/simplesamlphp/simplesamlphp-test-framework/bin/check-syntax-xml.sh
-        - vendor/simplesamlphp/simplesamlphp-test-framework/bin/check-syntax-yaml.sh
-
-    ###################
-    #  Quality stage  #
-    ###################
-
-    - stage: quality
-      php: 7.3
-      env: Security check (composer install)
-      before_script:
-        - composer install
-      script:
-        - vendor/bin/security-checker security:check
-
-    - stage: quality
-      php: 7.3
-      env: Security check (composer update)
-      before_script:
-        - composer update
-      script:
-        - vendor/bin/security-checker security:check
-
-    - stage: quality
-      php: 7.3
-      env: Codecov
-      before_script:
-        - composer update
-        - php vendor/bin/phpunit
-      script:
-        - bash <(curl -s https://codecov.io/bash)
-
-    - stage: quality
-      php: 7.3
-      env: Psalm
-      before_script:
-        - composer update
-      script:
-        - vendor/bin/psalm
-        - vendor/bin/psalter --issues=UnnecessaryVarAnnotation --dry-run
-
-    - stage: quality
-      php: 7.3
-      env: PHP Codesniffer
-      before_script:
-        - composer update
-      script:
-        - vendor/bin/phpcs www/
diff --git a/composer.json b/composer.json
index fb3e6d9..d155e34 100644
--- a/composer.json
+++ b/composer.json
@@ -26,14 +26,14 @@
         }
     },
     "require": {
-        "php": ">=7.2",
+        "php": ">=7.4",
+        "simplesamlphp/assert": "~0.1.0",
         "simplesamlphp/composer-module-installer": "~1.1",
         "simplesamlphp/simplesamlphp": "dev-master",
-        "simplesamlphp/simplesamlphp-module-consent": "^1.0",
-        "webmozart/assert": "~1.4"
+        "simplesamlphp/simplesamlphp-module-consent": "^1.0"
     },
     "require-dev": {
-        "simplesamlphp/simplesamlphp-test-framework": "^0.1.0"
+        "simplesamlphp/simplesamlphp-test-framework": "^1.0.3"
     },
     "extra": {
         "ssp-mixedcase-module-name": "consentAdmin"
diff --git a/phpunit.xml b/phpunit.xml
index a00c67f..af9cf95 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<phpunit bootstrap="tests/bootstrap.php">
-    <testsuites>
-        <testsuite name="The project's test suite">
-            <directory>./vendor/simplesamlphp/simplesamlphp-test-framework/src</directory>
-            <directory>./tests</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./lib</directory>
-        </whitelist>
-    </filter>
-    <logging>
-        <log type="coverage-text" target="php://stdout" showUncoveredFiles="true" />
-        <log type="coverage-html" target="build/coverage" lowUpperBound="35" highLowerBound="70" />
-        <log type="coverage-clover" target="build/logs/clover.xml" />
-    </logging>
+<?xml version="1.0" encoding="utf-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="tests/bootstrap.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage processUncoveredFiles="true">
+    <include>
+      <directory suffix=".php">./lib</directory>
+    </include>
+    <report>
+      <clover outputFile="build/logs/clover.xml"/>
+      <html outputDirectory="build/coverage" lowUpperBound="35" highLowerBound="70"/>
+      <text outputFile="php://stdout" showUncoveredFiles="true"/>
+    </report>
+  </coverage>
+  <testsuites>
+    <testsuite name="The project's test suite">
+      <directory>./vendor/simplesamlphp/simplesamlphp-test-framework/src</directory>
+      <directory>./tests</directory>
+    </testsuite>
+  </testsuites>
+  <logging/>
 </phpunit>
-

From 28e14c26e8ee462faa99432c3b4b6040aadca270 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tim.dijen@minbzk.nl>
Date: Fri, 18 Dec 2020 13:01:07 +0100
Subject: [PATCH 025/135] Improve workflow

---
 .github/workflows/php.yml | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 872986c..2f06358 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -54,17 +54,13 @@ jobs:
       - name: Install Composer dependencies
         run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
 
-      - name: Install test framework
-        run: composer require simplesamlphp/simplesamlphp-test-framework --dev
-
       - name: Syntax check PHP
         run: bash vendor/bin/check-syntax-php.sh
 
       - name: Decide whether to run code coverage or not
-        uses: allenevans/set-env@v1.0.0
         if: ${{ matrix.php-versions != '7.4' || matrix.operating-system != 'ubuntu-latest' }}
-        with:
-          NO_COVERAGE: "--no-coverage"
+        run: |
+          echo "NO_COVERAGE=--no-coverage" >> $GITHUB_ENV
 
       - name: Run unit tests
         run: |
@@ -148,9 +144,6 @@ jobs:
       - name: Install Composer dependencies
         run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
 
-      - name: Install test framework
-        run: composer require simplesamlphp/simplesamlphp-test-framework --dev
-
       - name: Syntax check YAML / XML / JSON
         run: |
           bash vendor/bin/check-syntax-yaml.sh
@@ -198,11 +191,11 @@ jobs:
 
       - name: PHP Code Sniffer
         continue-on-error: true
-        run: php vendor/bin/phpcs src/
+        run: php vendor/bin/phpcs
 
       - name: Psalm
         continue-on-error: true
-        uses: docker://vimeo/psalm-github-actions
+        run: php vendor/bin/psalm --show-info=true
 
       - name: Psalter
         continue-on-error: true

From 27cdf7defc703abd2bc1b8c5f280866adfb7407e Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tim.dijen@minbzk.nl>
Date: Fri, 18 Dec 2020 13:01:23 +0100
Subject: [PATCH 026/135] Remove deprecated MisplacedRequiredParam

---
 psalm.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/psalm.xml b/psalm.xml
index 0727451..513d813 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -19,7 +19,6 @@
         <MissingReturnType errorLevel="info" />
         <MissingPropertyType errorLevel="info" />
         <InvalidDocblock errorLevel="info" />
-        <MisplacedRequiredParam errorLevel="info" />
 
         <PropertyNotSetInConstructor errorLevel="info" />
         <MissingConstructor errorLevel="info" />

From 22a64bb38a77c591404b390011a977100b0a55aa Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Sun, 20 Dec 2020 22:06:04 +0100
Subject: [PATCH 027/135] Bump PHP version + add Actions workflow

---
 .github/workflows/php.yml | 8 ++++----
 composer.json             | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 2f06358..5c6fc8d 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -21,7 +21,7 @@ jobs:
         uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
         with:
           php-version: ${{ matrix.php-versions }}
-          extensions: mbstring, xml
+          extensions: ldap, mbstring, xml
           coverage: pcov
 
       - name: Setup problem matchers for PHP
@@ -82,7 +82,7 @@ jobs:
         uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
         with:
             php-version: '7.4'
-            extensions: mbstring, xml
+            extensions: ldap, mbstring, xml
             coverage: none
 
       - name: Setup problem matchers for PHP
@@ -122,7 +122,7 @@ jobs:
         uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
         with:
           php-version: '7.4'
-          extensions: mbstring, xml
+          extensions: ldap, mbstring, xml
           coverage: none
 
       - name: Setup problem matchers for PHP
@@ -160,7 +160,7 @@ jobs:
         uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
         with:
           php-version: '7.4'
-          extensions: mbstring, xml
+          extensions: ldap, mbstring, xml
 
       - name: Setup problem matchers for PHP
         run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
diff --git a/composer.json b/composer.json
index d155e34..3f85f75 100644
--- a/composer.json
+++ b/composer.json
@@ -33,7 +33,7 @@
         "simplesamlphp/simplesamlphp-module-consent": "^1.0"
     },
     "require-dev": {
-        "simplesamlphp/simplesamlphp-test-framework": "^1.0.3"
+        "simplesamlphp/simplesamlphp-test-framework": "^1.0.4"
     },
     "extra": {
         "ssp-mixedcase-module-name": "consentAdmin"

From 197ecfee6c76abdbfee9c40547d7f0b6d58bd1e9 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Sat, 16 Jan 2021 12:00:58 +0100
Subject: [PATCH 028/135] Replace abandoned security-checker

---
 .github/workflows/php.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 5c6fc8d..225010d 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -105,13 +105,13 @@ jobs:
         run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
 
       - name: Security check for locked dependencies
-        run: ./vendor/bin/security-checker security:check
+        uses: symfonycorp/security-checker-action@v2
 
       - name: Update Composer dependencies
         run: composer update --no-progress --no-suggest --prefer-dist --optimize-autoloader
 
       - name: Security check for updated dependencies
-        run: ./vendor/bin/security-checker security:check
+        uses: symfonycorp/security-checker-action@v2
 
   sanity-check:
     name: Sanity checks

From 746a31b7534bd7937102966c0d11bf59d631b81a Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tim.dijen@minbzk.nl>
Date: Thu, 21 Jan 2021 19:04:35 +0100
Subject: [PATCH 029/135] Add badges

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..1e43509
--- /dev/null
+++ b/README.md
@@ -0,0 +1,3 @@
+![Build Status](https://github.com/simplesamlphp/simplesamlphp-module-consentadmin/workflows/CI/badge.svg?branch=master)
+[![Coverage Status](https://codecov.io/gh/simplesamlphp/simplesamlphp-module-consentadmin/branch/master/graph/badge.svg)](https://codecov.io/gh/simplesamlphp/simplesamlphp-module-consentadmin)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/simplesamlphp/simplesamlphp-module-consentadmin/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/simplesamlphp/simplesamlphp-module-consentadmin/?branch=master)

From 7d6c903f6b392ba2ca475b68c0ae41eb0d21bed8 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Thu, 21 Jan 2021 22:20:25 +0100
Subject: [PATCH 030/135] Start testing for PHP 8.0

---
 .github/workflows/php.yml | 2 +-
 composer.json             | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 225010d..3f6f363 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         operating-system: [ubuntu-latest, windows-latest]
-        php-versions: ['7.4']
+        php-versions: ['7.4', '8.0']
 
     steps:
       - name: Setup PHP, with composer and extensions
diff --git a/composer.json b/composer.json
index 3f85f75..5aa34b2 100644
--- a/composer.json
+++ b/composer.json
@@ -26,14 +26,15 @@
         }
     },
     "require": {
-        "php": ">=7.4",
+        "php": ">=7.4 || ^8.0",
+
         "simplesamlphp/assert": "~0.1.0",
         "simplesamlphp/composer-module-installer": "~1.1",
         "simplesamlphp/simplesamlphp": "dev-master",
         "simplesamlphp/simplesamlphp-module-consent": "^1.0"
     },
     "require-dev": {
-        "simplesamlphp/simplesamlphp-test-framework": "^1.0.4"
+        "simplesamlphp/simplesamlphp-test-framework": "^1.0.5"
     },
     "extra": {
         "ssp-mixedcase-module-name": "consentAdmin"

From b8a2c90e2bcf40ee680c956f2f34e3fe28eeec03 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Sat, 23 Jan 2021 17:28:53 +0100
Subject: [PATCH 031/135] Use composer v2

---
 .github/workflows/php.yml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 3f6f363..b87d773 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -21,6 +21,7 @@ jobs:
         uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
         with:
           php-version: ${{ matrix.php-versions }}
+          tools: composer:v2
           extensions: ldap, mbstring, xml
           coverage: pcov
 
@@ -52,7 +53,7 @@ jobs:
         run: composer validate
 
       - name: Install Composer dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
 
       - name: Syntax check PHP
         run: bash vendor/bin/check-syntax-php.sh
@@ -82,6 +83,7 @@ jobs:
         uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
         with:
             php-version: '7.4'
+            tools: composer:v2
             extensions: ldap, mbstring, xml
             coverage: none
 
@@ -102,13 +104,13 @@ jobs:
             restore-keys: ${{ runner.os }}-composer-
 
       - name: Install Composer dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
 
       - name: Security check for locked dependencies
         uses: symfonycorp/security-checker-action@v2
 
       - name: Update Composer dependencies
-        run: composer update --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer update --no-progress --prefer-dist --optimize-autoloader
 
       - name: Security check for updated dependencies
         uses: symfonycorp/security-checker-action@v2
@@ -122,6 +124,7 @@ jobs:
         uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
         with:
           php-version: '7.4'
+          tools: composer:v2
           extensions: ldap, mbstring, xml
           coverage: none
 
@@ -142,7 +145,7 @@ jobs:
             restore-keys: ${{ runner.os }}-composer-
 
       - name: Install Composer dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
 
       - name: Syntax check YAML / XML / JSON
         run: |
@@ -160,6 +163,7 @@ jobs:
         uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
         with:
           php-version: '7.4'
+          tools: composer:v2
           extensions: ldap, mbstring, xml
 
       - name: Setup problem matchers for PHP
@@ -179,7 +183,7 @@ jobs:
             restore-keys: ${{ runner.os }}-composer-
 
       - name: Install Composer dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
 
       - uses: actions/download-artifact@v1
         with:

From 097c24d7aff532fbd723f50702aab1356655b6cb Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tim.dijen@minbzk.nl>
Date: Fri, 26 Mar 2021 21:29:08 +0100
Subject: [PATCH 032/135] Bump test-framework

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 5aa34b2..6f4112f 100644
--- a/composer.json
+++ b/composer.json
@@ -34,7 +34,7 @@
         "simplesamlphp/simplesamlphp-module-consent": "^1.0"
     },
     "require-dev": {
-        "simplesamlphp/simplesamlphp-test-framework": "^1.0.5"
+        "simplesamlphp/simplesamlphp-test-framework": "^1.1.0"
     },
     "extra": {
         "ssp-mixedcase-module-name": "consentAdmin"

From 29b3317af1ffc07cd56bd28dd8b00a2e60b6c58e Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Sat, 28 Aug 2021 14:52:54 +0200
Subject: [PATCH 033/135] Remove calls to getPrefferedTranslation

---
 templates/consentadmin.twig | 8 ++++----
 www/consentAdmin.php        | 9 ---------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/templates/consentadmin.twig b/templates/consentadmin.twig
index b11eeeb..1d20eba 100644
--- a/templates/consentadmin.twig
+++ b/templates/consentadmin.twig
@@ -31,11 +31,11 @@
     <tr class="{{ rowClass }}">
         <td>
             <span class='caSPName'>
-                <span title='{{ spValues.description|escape('html') }}'>
+                <span title='{{ spValues.description|translateFromArray|escape('html') }}'>
                 {% if spValues.serviceurl is defined %}
-                    {{ spValues.name|escape('html') }}
+                    {{ spValues.name|translateFromArray|default(spName)|escape('html') }}
                 {% else %}
-                    <a class="serviceUrl" href="{{ spValues.serviceurl }}">{{ spValues.name|escape('html') }}</a>
+                    <a class="serviceUrl" href="{{ spValues.serviceurl }}">{{ spValues.name|translateFromArray|default(spName)|escape('html') }}</a>
                 {% endif %}
                 </span>
                 <span class="show_hide" id="show_hide_{{ loop.index0 }}">
@@ -48,7 +48,7 @@
         <td class="caAttributes">
             <div id="attributes_{{ loop.index0 }}">
             {% if showDescription %}
-                <p>{{ '{consentAdmin:consentadmin:consentadmin_purpose}'|trans }}{{ spValues.description|escape('html') }}</p>
+                <p>{{ '{consentAdmin:consentadmin:consentadmin_purpose}'|trans }}{{ spValues.description|translateFromArray|escape('html') }}</p>
             {% endif %}
                 <ul>
                 {% for attrName, attrValue in spValues.attributes_by_sp %}
diff --git a/www/consentAdmin.php b/www/consentAdmin.php
index 59dad0d..354d375 100644
--- a/www/consentAdmin.php
+++ b/www/consentAdmin.php
@@ -297,8 +297,6 @@ function driveProcessingChain(
             $sp_name = $sp_metadata['name'];
         } elseif (isset($sp_values['OrganizationDisplayName']) && is_array($sp_values['OrganizationDisplayName'])) {
             $sp_name = $sp_metadata['OrganizationDisplayName'];
-        } else {
-            $sp_name = $sp_entityid;
         }
     }
 
@@ -312,13 +310,6 @@ function driveProcessingChain(
     // Add a URL to the service if present in metadata
     $sp_service_url = isset($sp_metadata['ServiceURL']) ? $sp_metadata['ServiceURL'] : null;
 
-    // Translate SP name and description
-    $translator->includeInlineTranslation('spname', $sp_name);
-    $translator->includeInlineTranslation('spdescription', $sp_description);
-
-    $sp_name = $translator->getPreferredTranslation($translator->getTag('spname') ?? []);
-    $sp_description = $translator->getPreferredTranslation($translator->getTag('spdescription') ?? []);
-
     // Fill out array for the template
     $sp_list[$sp_entityid] = [
         'spentityid'       => $sp_entityid,

From e8eb4fcc35c375e7bfda08a5f36d930b901fdbf9 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tim.dijen@minbzk.nl>
Date: Sat, 28 Aug 2021 15:21:10 +0200
Subject: [PATCH 034/135] Bump assert + test-framework

---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 6f4112f..1e67496 100644
--- a/composer.json
+++ b/composer.json
@@ -28,13 +28,13 @@
     "require": {
         "php": ">=7.4 || ^8.0",
 
-        "simplesamlphp/assert": "~0.1.0",
+        "simplesamlphp/assert": "~0.2.6",
         "simplesamlphp/composer-module-installer": "~1.1",
         "simplesamlphp/simplesamlphp": "dev-master",
         "simplesamlphp/simplesamlphp-module-consent": "^1.0"
     },
     "require-dev": {
-        "simplesamlphp/simplesamlphp-test-framework": "^1.1.0"
+        "simplesamlphp/simplesamlphp-test-framework": "^1.1.5"
     },
     "extra": {
         "ssp-mixedcase-module-name": "consentAdmin"

From c60e419dc8128ff976cf6761c78aeade7ddced35 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tim.dijen@minbzk.nl>
Date: Sat, 28 Aug 2021 17:43:36 +0200
Subject: [PATCH 035/135] Test-framework: use proper version

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 1e67496..0a10c20 100644
--- a/composer.json
+++ b/composer.json
@@ -34,7 +34,7 @@
         "simplesamlphp/simplesamlphp-module-consent": "^1.0"
     },
     "require-dev": {
-        "simplesamlphp/simplesamlphp-test-framework": "^1.1.5"
+        "simplesamlphp/simplesamlphp-test-framework": "^1.1.0"
     },
     "extra": {
         "ssp-mixedcase-module-name": "consentAdmin"

From 577129924c148efb865a2680a52d6b8a557db6b8 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tim.dijen@minbzk.nl>
Date: Fri, 3 Sep 2021 19:57:41 +0200
Subject: [PATCH 036/135] Suppress annotations

---
 codecov.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/codecov.yml b/codecov.yml
index f7f39e1..d194c1c 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -9,3 +9,6 @@ comment:
   require_base: no
   require_head: yes
   branches: null
+
+github_checks:
+  annotations: false

From 55523178bdd2784bdb4a890004afc1316abc9048 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tim.dijen@minbzk.nl>
Date: Tue, 7 Dec 2021 18:31:38 +0100
Subject: [PATCH 037/135] Bump dependencies

---
 composer.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index 0a10c20..7044e40 100644
--- a/composer.json
+++ b/composer.json
@@ -28,13 +28,13 @@
     "require": {
         "php": ">=7.4 || ^8.0",
 
-        "simplesamlphp/assert": "~0.2.6",
+        "simplesamlphp/assert": "~0.2.7",
         "simplesamlphp/composer-module-installer": "~1.1",
-        "simplesamlphp/simplesamlphp": "dev-master",
+        "simplesamlphp/simplesamlphp": "^2.0.0-beta.2",
         "simplesamlphp/simplesamlphp-module-consent": "^1.0"
     },
     "require-dev": {
-        "simplesamlphp/simplesamlphp-test-framework": "^1.1.0"
+        "simplesamlphp/simplesamlphp-test-framework": "^1.1.4"
     },
     "extra": {
         "ssp-mixedcase-module-name": "consentAdmin"

From 6eb2c2abe7edc0276e94d8b4ed68df9ea82aecc9 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tim.dijen@minbzk.nl>
Date: Thu, 9 Dec 2021 13:34:36 +0100
Subject: [PATCH 038/135] Start testing PHP 8.1

---
 .github/workflows/php.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index b87d773..6976449 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         operating-system: [ubuntu-latest, windows-latest]
-        php-versions: ['7.4', '8.0']
+        php-versions: ['7.4', '8.0', '8.1']
 
     steps:
       - name: Setup PHP, with composer and extensions

From ba531577054e104b79ca32c512db41dbff827b20 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Thu, 6 Jan 2022 12:01:31 +0100
Subject: [PATCH 039/135] Allow minor coverage decrease

---
 codecov.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/codecov.yml b/codecov.yml
index d194c1c..2599879 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -1,6 +1,10 @@
 coverage:
   status:
     project: yes
+      default:
+        target: 0%
+        threshold: 2%
+    patch: off
 
 comment:
   layout: "diff"

From ebbb666121878c676fedc61263932fb5eea2c4c5 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Thu, 6 Jan 2022 20:17:52 +0100
Subject: [PATCH 040/135] Set allow-plugins tag

---
 composer.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/composer.json b/composer.json
index 7044e40..762f4dd 100644
--- a/composer.json
+++ b/composer.json
@@ -18,6 +18,10 @@
         "preferred-install": {
             "simplesamlphp/simplesamlphp": "source",
             "*": "dist"
+        },
+        "allow-plugins": {
+            "composer/package-versions-deprecated": true,
+            "simplesamlphp/composer-module-installer": true
         }
     },
     "autoload-dev": {

From 18a46f5883cc0db5cb968867e4cb9d572c7ac79b Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Sat, 8 Jan 2022 18:38:50 +0100
Subject: [PATCH 041/135] Add some use-statements

---
 hooks/hook_configpage.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/hooks/hook_configpage.php b/hooks/hook_configpage.php
index bda07ea..c737ed9 100644
--- a/hooks/hook_configpage.php
+++ b/hooks/hook_configpage.php
@@ -1,15 +1,20 @@
 <?php
+
+use SimpleSAML\Locale\Translate;
+use SimpleSAML\Module;
+use SimpleSAML\XHTML\Template;
+
 /**
  * Hook to add the consentAdmin module to the config page.
  *
  * @param \SimpleSAML\XHTML\Template $template The template that we should alter in this hook.
  * @return void
  */
-function consentAdmin_hook_configpage(\SimpleSAML\XHTML\Template &$template): void
+function consentAdmin_hook_configpage(Template &$template): void
 {
     $template->data['links']['consentAdmin'] = [
-        'href' => SimpleSAML\Module::getModuleURL('consentAdmin/consentAdmin.php'),
-        'text' => \SimpleSAML\Locale\Translate::noop('Consent administration'),
+        'href' => Module::getModuleURL('consentAdmin/consentAdmin.php'),
+        'text' => Translate::noop('Consent administration'),
     ];
     $template->getLocalization()->addModuleDomain('consentAdmin');
 }

From ca77f470da40db09e59baad6c186d61aaa7e94d3 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Sat, 8 Jan 2022 18:58:08 +0100
Subject: [PATCH 042/135] Fix hook

---
 hooks/hook_configpage.php |  5 ++++-
 hooks/hook_frontpage.php  | 20 --------------------
 2 files changed, 4 insertions(+), 21 deletions(-)
 delete mode 100644 hooks/hook_frontpage.php

diff --git a/hooks/hook_configpage.php b/hooks/hook_configpage.php
index c737ed9..b5f3a3e 100644
--- a/hooks/hook_configpage.php
+++ b/hooks/hook_configpage.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use SimpleSAML\Locale\Translate;
 use SimpleSAML\Module;
 use SimpleSAML\XHTML\Template;
@@ -12,9 +14,10 @@
  */
 function consentAdmin_hook_configpage(Template &$template): void
 {
-    $template->data['links']['consentAdmin'] = [
+    $template->data['links'][] = [
         'href' => Module::getModuleURL('consentAdmin/consentAdmin.php'),
         'text' => Translate::noop('Consent administration'),
     ];
+
     $template->getLocalization()->addModuleDomain('consentAdmin');
 }
diff --git a/hooks/hook_frontpage.php b/hooks/hook_frontpage.php
deleted file mode 100644
index 69a7ce1..0000000
--- a/hooks/hook_frontpage.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-use Webmozart\Assert\Assert;
-
-/**
- * Hook to add the consentAdmin module to the frontpage.
- *
- * @param array &$links  The links on the frontpage, split into sections.
- * @return void
- */
-function consentAdmin_hook_frontpage(array &$links): void
-{
-    Assert::keyExists($links, 'links');
-
-    $links['config'][] = [
-        'href' => SimpleSAML\Module::getModuleURL('consentAdmin/consentAdmin.php'),
-        'text' => '{consentAdmin:consentadmin:link_consentAdmin}',
-    ];
-}
-

From 5f97a165319ab2823390b503e9f6af6bfc83c4c7 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Sat, 8 Jan 2022 23:47:48 +0100
Subject: [PATCH 043/135] Fix TooManyArguments

---
 www/consentAdmin.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/www/consentAdmin.php b/www/consentAdmin.php
index 354d375..96b7bb6 100644
--- a/www/consentAdmin.php
+++ b/www/consentAdmin.php
@@ -185,8 +185,7 @@ function driveProcessingChain(
     // init template to enable translation of status messages
     $template = new \SimpleSAML\XHTML\Template(
         $config,
-        'consentAdmin:consentadminajax.twig',
-        'consentAdmin:consentadmin'
+        'consentAdmin:consentadminajax.twig'
     );
     $translator = $template->getTranslator();
 
@@ -239,7 +238,7 @@ function driveProcessingChain(
 $template_sp_content = [];
 
 // Init template
-$template = new \SimpleSAML\XHTML\Template($config, 'consentAdmin:consentadmin.twig', 'consentAdmin:consentadmin');
+$template = new \SimpleSAML\XHTML\Template($config, 'consentAdmin:consentadmin.twig');
 $translator = $template->getTranslator();
 $translator->includeLanguageFile('attributes'); // attribute listings translated by this dictionary
 

From f7efb7e6ccf1a17a5d10324d911f44b49940d1fa Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Wed, 12 Jan 2022 23:34:01 +0100
Subject: [PATCH 044/135] Remove consentAdmin:consentadmin:consentadmin_header
 tag

---
 locales/ar/LC_MESSAGES/consentAdmin.po    | 3 ---
 locales/cs/LC_MESSAGES/consentAdmin.po    | 3 ---
 locales/da/LC_MESSAGES/consentAdmin.po    | 3 ---
 locales/de/LC_MESSAGES/consentAdmin.po    | 3 ---
 locales/el/LC_MESSAGES/consentAdmin.po    | 3 ---
 locales/en/LC_MESSAGES/consentAdmin.po    | 3 ---
 locales/es/LC_MESSAGES/consentAdmin.po    | 3 ---
 locales/et/LC_MESSAGES/consentAdmin.po    | 3 ---
 locales/eu/LC_MESSAGES/consentAdmin.po    | 3 ---
 locales/fr/LC_MESSAGES/consentAdmin.po    | 3 ---
 locales/he/LC_MESSAGES/consentAdmin.po    | 3 ---
 locales/hr/LC_MESSAGES/consentAdmin.po    | 3 ---
 locales/hu/LC_MESSAGES/consentAdmin.po    | 3 ---
 locales/id/LC_MESSAGES/consentAdmin.po    | 3 ---
 locales/it/LC_MESSAGES/consentAdmin.po    | 3 ---
 locales/ja/LC_MESSAGES/consentAdmin.po    | 3 ---
 locales/lt/LC_MESSAGES/consentAdmin.po    | 3 ---
 locales/lv/LC_MESSAGES/consentAdmin.po    | 3 ---
 locales/nb/LC_MESSAGES/consentAdmin.po    | 3 ---
 locales/nl/LC_MESSAGES/consentAdmin.po    | 3 ---
 locales/nn/LC_MESSAGES/consentAdmin.po    | 3 ---
 locales/pt/LC_MESSAGES/consentAdmin.po    | 3 ---
 locales/ro/LC_MESSAGES/consentAdmin.po    | 3 ---
 locales/ru/LC_MESSAGES/consentAdmin.po    | 3 ---
 locales/sl/LC_MESSAGES/consentAdmin.po    | 3 ---
 locales/sr/LC_MESSAGES/consentAdmin.po    | 3 ---
 locales/sv/LC_MESSAGES/consentAdmin.po    | 3 ---
 locales/zh-tw/LC_MESSAGES/consentAdmin.po | 3 ---
 locales/zh/LC_MESSAGES/consentAdmin.po    | 3 ---
 templates/consentadmin.twig               | 2 +-
 www/consentAdmin.php                      | 1 -
 31 files changed, 1 insertion(+), 89 deletions(-)

diff --git a/locales/ar/LC_MESSAGES/consentAdmin.po b/locales/ar/LC_MESSAGES/consentAdmin.po
index 8d2c7db..1dfc9af 100644
--- a/locales/ar/LC_MESSAGES/consentAdmin.po
+++ b/locales/ar/LC_MESSAGES/consentAdmin.po
@@ -28,9 +28,6 @@ msgstr "مقدم الخدمة"
 msgid "{consentAdmin:consentadmin:removed}"
 msgstr "تم حذف الموافقة"
 
-msgid "{consentAdmin:consentadmin:consentadmin_header}"
-msgstr "ادارة الموافقة"
-
 msgid "{consentAdmin:consentadmin:show}"
 msgstr "اظهار"
 
diff --git a/locales/cs/LC_MESSAGES/consentAdmin.po b/locales/cs/LC_MESSAGES/consentAdmin.po
index faad4eb..1addfba 100644
--- a/locales/cs/LC_MESSAGES/consentAdmin.po
+++ b/locales/cs/LC_MESSAGES/consentAdmin.po
@@ -28,9 +28,6 @@ msgstr "Poskytovatel služeb"
 msgid "{consentAdmin:consentadmin:removed}"
 msgstr "Odebrané povolení"
 
-msgid "{consentAdmin:consentadmin:consentadmin_header}"
-msgstr "Administrace povolení"
-
 msgid "{consentAdmin:consentadmin:show}"
 msgstr "Zobrazit"
 
diff --git a/locales/da/LC_MESSAGES/consentAdmin.po b/locales/da/LC_MESSAGES/consentAdmin.po
index a3a46f3..125c5e0 100644
--- a/locales/da/LC_MESSAGES/consentAdmin.po
+++ b/locales/da/LC_MESSAGES/consentAdmin.po
@@ -27,9 +27,6 @@ msgstr "Service Provider"
 msgid "{consentAdmin:consentadmin:removed}"
 msgstr "Samtykke slettet"
 
-msgid "{consentAdmin:consentadmin:consentadmin_header}"
-msgstr "Administrer dine samtykker"
-
 msgid "{consentAdmin:consentadmin:show}"
 msgstr "Vis"
 
diff --git a/locales/de/LC_MESSAGES/consentAdmin.po b/locales/de/LC_MESSAGES/consentAdmin.po
index 5b83d9f..f2bdc9d 100644
--- a/locales/de/LC_MESSAGES/consentAdmin.po
+++ b/locales/de/LC_MESSAGES/consentAdmin.po
@@ -27,9 +27,6 @@ msgstr "Diensteanbieter"
 msgid "{consentAdmin:consentadmin:removed}"
 msgstr "Einverständnis entfernt"
 
-msgid "{consentAdmin:consentadmin:consentadmin_header}"
-msgstr "Verwaltung von Einverständniserklärungen"
-
 msgid "{consentAdmin:consentadmin:show}"
 msgstr "Zeige an"
 
diff --git a/locales/el/LC_MESSAGES/consentAdmin.po b/locales/el/LC_MESSAGES/consentAdmin.po
index 6fdd9c3..9d1ac8e 100644
--- a/locales/el/LC_MESSAGES/consentAdmin.po
+++ b/locales/el/LC_MESSAGES/consentAdmin.po
@@ -27,9 +27,6 @@ msgstr "Πάροχος Υπηρεσιών"
 msgid "{consentAdmin:consentadmin:removed}"
 msgstr "Η συγκατάθεση αναιρέθηκε"
 
-msgid "{consentAdmin:consentadmin:consentadmin_header}"
-msgstr "Διαχείριση Δηλώσεων Συγκατάθεσης"
-
 msgid "{consentAdmin:consentadmin:show}"
 msgstr "Εμφάνιση"
 
diff --git a/locales/en/LC_MESSAGES/consentAdmin.po b/locales/en/LC_MESSAGES/consentAdmin.po
index 06a32f2..221ba32 100644
--- a/locales/en/LC_MESSAGES/consentAdmin.po
+++ b/locales/en/LC_MESSAGES/consentAdmin.po
@@ -27,9 +27,6 @@ msgstr "Service Provider"
 msgid "{consentAdmin:consentadmin:removed}"
 msgstr "Consent Removed"
 
-msgid "{consentAdmin:consentadmin:consentadmin_header}"
-msgstr "Consent Administration"
-
 msgid "{consentAdmin:consentadmin:show}"
 msgstr "Show"
 
diff --git a/locales/es/LC_MESSAGES/consentAdmin.po b/locales/es/LC_MESSAGES/consentAdmin.po
index 9114c07..40c07b9 100644
--- a/locales/es/LC_MESSAGES/consentAdmin.po
+++ b/locales/es/LC_MESSAGES/consentAdmin.po
@@ -27,9 +27,6 @@ msgstr "Proveedor de servicio"
 msgid "{consentAdmin:consentadmin:removed}"
 msgstr "Consentimiento eliminado"
 
-msgid "{consentAdmin:consentadmin:consentadmin_header}"
-msgstr "Administración de consentimiento"
-
 msgid "{consentAdmin:consentadmin:show}"
 msgstr "Mostrar"
 
diff --git a/locales/et/LC_MESSAGES/consentAdmin.po b/locales/et/LC_MESSAGES/consentAdmin.po
index 00b57da..583605f 100644
--- a/locales/et/LC_MESSAGES/consentAdmin.po
+++ b/locales/et/LC_MESSAGES/consentAdmin.po
@@ -27,9 +27,6 @@ msgstr "Teenusepakkuja"
 msgid "{consentAdmin:consentadmin:removed}"
 msgstr "Nõusolek eemaldatud"
 
-msgid "{consentAdmin:consentadmin:consentadmin_header}"
-msgstr "Nõusoleku administreerimine"
-
 msgid "{consentAdmin:consentadmin:show}"
 msgstr "Näita"
 
diff --git a/locales/eu/LC_MESSAGES/consentAdmin.po b/locales/eu/LC_MESSAGES/consentAdmin.po
index 2539d91..3dd3abe 100644
--- a/locales/eu/LC_MESSAGES/consentAdmin.po
+++ b/locales/eu/LC_MESSAGES/consentAdmin.po
@@ -27,9 +27,6 @@ msgstr "Zerbitzu hornitzailea"
 msgid "{consentAdmin:consentadmin:removed}"
 msgstr "Onespena ezabatua"
 
-msgid "{consentAdmin:consentadmin:consentadmin_header}"
-msgstr "Onespenaren kudeaketa"
-
 msgid "{consentAdmin:consentadmin:show}"
 msgstr "Erakutsi"
 
diff --git a/locales/fr/LC_MESSAGES/consentAdmin.po b/locales/fr/LC_MESSAGES/consentAdmin.po
index 5a48651..bfed4bc 100644
--- a/locales/fr/LC_MESSAGES/consentAdmin.po
+++ b/locales/fr/LC_MESSAGES/consentAdmin.po
@@ -27,9 +27,6 @@ msgstr "Fournisseurs de service"
 msgid "{consentAdmin:consentadmin:removed}"
 msgstr "Consentement révoqué"
 
-msgid "{consentAdmin:consentadmin:consentadmin_header}"
-msgstr "Administration des consentements"
-
 msgid "{consentAdmin:consentadmin:show}"
 msgstr "Voir"
 
diff --git a/locales/he/LC_MESSAGES/consentAdmin.po b/locales/he/LC_MESSAGES/consentAdmin.po
index db2b074..c786b5c 100644
--- a/locales/he/LC_MESSAGES/consentAdmin.po
+++ b/locales/he/LC_MESSAGES/consentAdmin.po
@@ -27,9 +27,6 @@ msgstr "ספק שירות"
 msgid "{consentAdmin:consentadmin:removed}"
 msgstr "הסכמה הוסרה"
 
-msgid "{consentAdmin:consentadmin:consentadmin_header}"
-msgstr "מנהל הסכמותת"
-
 msgid "{consentAdmin:consentadmin:show}"
 msgstr "הצג"
 
diff --git a/locales/hr/LC_MESSAGES/consentAdmin.po b/locales/hr/LC_MESSAGES/consentAdmin.po
index 82ef53c..a30d695 100644
--- a/locales/hr/LC_MESSAGES/consentAdmin.po
+++ b/locales/hr/LC_MESSAGES/consentAdmin.po
@@ -28,9 +28,6 @@ msgstr "Davatelj usluge"
 msgid "{consentAdmin:consentadmin:removed}"
 msgstr "Dozvola uklonjena"
 
-msgid "{consentAdmin:consentadmin:consentadmin_header}"
-msgstr "Administracija dozvola"
-
 msgid "{consentAdmin:consentadmin:show}"
 msgstr "Prikaži"
 
diff --git a/locales/hu/LC_MESSAGES/consentAdmin.po b/locales/hu/LC_MESSAGES/consentAdmin.po
index 22bd5e4..a2c8bac 100644
--- a/locales/hu/LC_MESSAGES/consentAdmin.po
+++ b/locales/hu/LC_MESSAGES/consentAdmin.po
@@ -27,9 +27,6 @@ msgstr "Szolgáltató"
 msgid "{consentAdmin:consentadmin:removed}"
 msgstr "Hozzájárulás visszavonva"
 
-msgid "{consentAdmin:consentadmin:consentadmin_header}"
-msgstr "Adatkezelési hozzájárulások kezelése"
-
 msgid "{consentAdmin:consentadmin:show}"
 msgstr "Attribútumok megjelenítése"
 
diff --git a/locales/id/LC_MESSAGES/consentAdmin.po b/locales/id/LC_MESSAGES/consentAdmin.po
index 069aa9e..02756c3 100644
--- a/locales/id/LC_MESSAGES/consentAdmin.po
+++ b/locales/id/LC_MESSAGES/consentAdmin.po
@@ -27,9 +27,6 @@ msgstr "Service Provider"
 msgid "{consentAdmin:consentadmin:removed}"
 msgstr "Consent telah dibuang"
 
-msgid "{consentAdmin:consentadmin:consentadmin_header}"
-msgstr "Administrasi Consent"
-
 msgid "{consentAdmin:consentadmin:show}"
 msgstr "Perlihatkan"
 
diff --git a/locales/it/LC_MESSAGES/consentAdmin.po b/locales/it/LC_MESSAGES/consentAdmin.po
index 2dce4a0..b67ec3d 100644
--- a/locales/it/LC_MESSAGES/consentAdmin.po
+++ b/locales/it/LC_MESSAGES/consentAdmin.po
@@ -27,9 +27,6 @@ msgstr "Service Provider"
 msgid "{consentAdmin:consentadmin:removed}"
 msgstr "Consenso Rimosso"
 
-msgid "{consentAdmin:consentadmin:consentadmin_header}"
-msgstr "Amministrazione del consenso"
-
 msgid "{consentAdmin:consentadmin:show}"
 msgstr "Mostra"
 
diff --git a/locales/ja/LC_MESSAGES/consentAdmin.po b/locales/ja/LC_MESSAGES/consentAdmin.po
index b0cfbd2..2151747 100644
--- a/locales/ja/LC_MESSAGES/consentAdmin.po
+++ b/locales/ja/LC_MESSAGES/consentAdmin.po
@@ -27,9 +27,6 @@ msgstr "サービスプロバイダ"
 msgid "{consentAdmin:consentadmin:removed}"
 msgstr "承認が削除されました"
 
-msgid "{consentAdmin:consentadmin:consentadmin_header}"
-msgstr "承認管理"
-
 msgid "{consentAdmin:consentadmin:show}"
 msgstr "表示"
 
diff --git a/locales/lt/LC_MESSAGES/consentAdmin.po b/locales/lt/LC_MESSAGES/consentAdmin.po
index d2d1c60..6832378 100644
--- a/locales/lt/LC_MESSAGES/consentAdmin.po
+++ b/locales/lt/LC_MESSAGES/consentAdmin.po
@@ -28,9 +28,6 @@ msgstr "Paslaugos tiekėjas"
 msgid "{consentAdmin:consentadmin:removed}"
 msgstr "Leidimas pašalintas"
 
-msgid "{consentAdmin:consentadmin:consentadmin_header}"
-msgstr "Leidimų administravimas"
-
 msgid "{consentAdmin:consentadmin:show}"
 msgstr "Parodyti"
 
diff --git a/locales/lv/LC_MESSAGES/consentAdmin.po b/locales/lv/LC_MESSAGES/consentAdmin.po
index 9a3fdd1..2dbec48 100644
--- a/locales/lv/LC_MESSAGES/consentAdmin.po
+++ b/locales/lv/LC_MESSAGES/consentAdmin.po
@@ -28,9 +28,6 @@ msgstr "Servisa piegādātājs"
 msgid "{consentAdmin:consentadmin:removed}"
 msgstr "Noņemtie noteikumi"
 
-msgid "{consentAdmin:consentadmin:consentadmin_header}"
-msgstr "Noteikumu administrators"
-
 msgid "{consentAdmin:consentadmin:show}"
 msgstr "Parādīt"
 
diff --git a/locales/nb/LC_MESSAGES/consentAdmin.po b/locales/nb/LC_MESSAGES/consentAdmin.po
index 4a42db0..740e0fb 100644
--- a/locales/nb/LC_MESSAGES/consentAdmin.po
+++ b/locales/nb/LC_MESSAGES/consentAdmin.po
@@ -27,9 +27,6 @@ msgstr "Tjenesteleverandør"
 msgid "{consentAdmin:consentadmin:removed}"
 msgstr "Samtykke trukket tilbake"
 
-msgid "{consentAdmin:consentadmin:consentadmin_header}"
-msgstr "Samtykkeadministrasjon"
-
 msgid "{consentAdmin:consentadmin:show}"
 msgstr "Vis"
 
diff --git a/locales/nl/LC_MESSAGES/consentAdmin.po b/locales/nl/LC_MESSAGES/consentAdmin.po
index ad9a98d..d2b1772 100644
--- a/locales/nl/LC_MESSAGES/consentAdmin.po
+++ b/locales/nl/LC_MESSAGES/consentAdmin.po
@@ -27,9 +27,6 @@ msgstr "Service Provider"
 msgid "{consentAdmin:consentadmin:removed}"
 msgstr "Toestemming Verwijderd"
 
-msgid "{consentAdmin:consentadmin:consentadmin_header}"
-msgstr "Toestemming Beheer"
-
 msgid "{consentAdmin:consentadmin:show}"
 msgstr "Bekijk"
 
diff --git a/locales/nn/LC_MESSAGES/consentAdmin.po b/locales/nn/LC_MESSAGES/consentAdmin.po
index 4afdee7..8f9bf5b 100644
--- a/locales/nn/LC_MESSAGES/consentAdmin.po
+++ b/locales/nn/LC_MESSAGES/consentAdmin.po
@@ -27,9 +27,6 @@ msgstr "Tenesteleverandør"
 msgid "{consentAdmin:consentadmin:removed}"
 msgstr "Samtykke trukke tilbake"
 
-msgid "{consentAdmin:consentadmin:consentadmin_header}"
-msgstr "Samtykkeadministrasjon"
-
 msgid "{consentAdmin:consentadmin:show}"
 msgstr "Vis"
 
diff --git a/locales/pt/LC_MESSAGES/consentAdmin.po b/locales/pt/LC_MESSAGES/consentAdmin.po
index 3678f9e..d744d2c 100644
--- a/locales/pt/LC_MESSAGES/consentAdmin.po
+++ b/locales/pt/LC_MESSAGES/consentAdmin.po
@@ -27,9 +27,6 @@ msgstr "Fornecedor de Serviço"
 msgid "{consentAdmin:consentadmin:removed}"
 msgstr "Consentimento removido"
 
-msgid "{consentAdmin:consentadmin:consentadmin_header}"
-msgstr "Administração de Consentimento"
-
 msgid "{consentAdmin:consentadmin:show}"
 msgstr "Mostrar"
 
diff --git a/locales/ro/LC_MESSAGES/consentAdmin.po b/locales/ro/LC_MESSAGES/consentAdmin.po
index 736cbaf..9ae48af 100644
--- a/locales/ro/LC_MESSAGES/consentAdmin.po
+++ b/locales/ro/LC_MESSAGES/consentAdmin.po
@@ -28,9 +28,6 @@ msgstr "Furnizor de servicii"
 msgid "{consentAdmin:consentadmin:removed}"
 msgstr "Acordul a fost înlăturat"
 
-msgid "{consentAdmin:consentadmin:consentadmin_header}"
-msgstr "Administrarea acordurilor (consimțămintelor)"
-
 msgid "{consentAdmin:consentadmin:show}"
 msgstr "Arată"
 
diff --git a/locales/ru/LC_MESSAGES/consentAdmin.po b/locales/ru/LC_MESSAGES/consentAdmin.po
index 06a312d..13190f6 100644
--- a/locales/ru/LC_MESSAGES/consentAdmin.po
+++ b/locales/ru/LC_MESSAGES/consentAdmin.po
@@ -28,9 +28,6 @@ msgstr "Сервис провайдер"
 msgid "{consentAdmin:consentadmin:removed}"
 msgstr "Согласие отозвано"
 
-msgid "{consentAdmin:consentadmin:consentadmin_header}"
-msgstr "Управление согласием"
-
 msgid "{consentAdmin:consentadmin:show}"
 msgstr "Показать"
 
diff --git a/locales/sl/LC_MESSAGES/consentAdmin.po b/locales/sl/LC_MESSAGES/consentAdmin.po
index d3901f9..6bfdc8f 100644
--- a/locales/sl/LC_MESSAGES/consentAdmin.po
+++ b/locales/sl/LC_MESSAGES/consentAdmin.po
@@ -28,9 +28,6 @@ msgstr "Ponudnik storitve"
 msgid "{consentAdmin:consentadmin:removed}"
 msgstr "Privolitev razveljavljena"
 
-msgid "{consentAdmin:consentadmin:consentadmin_header}"
-msgstr "Upravljanje s privolitvami"
-
 msgid "{consentAdmin:consentadmin:show}"
 msgstr "Prikaži"
 
diff --git a/locales/sr/LC_MESSAGES/consentAdmin.po b/locales/sr/LC_MESSAGES/consentAdmin.po
index dfe5e3b..6287da6 100644
--- a/locales/sr/LC_MESSAGES/consentAdmin.po
+++ b/locales/sr/LC_MESSAGES/consentAdmin.po
@@ -28,9 +28,6 @@ msgstr "Davalac Servisa"
 msgid "{consentAdmin:consentadmin:removed}"
 msgstr "Dozvola uklonjena"
 
-msgid "{consentAdmin:consentadmin:consentadmin_header}"
-msgstr "Administracija dozvola"
-
 msgid "{consentAdmin:consentadmin:show}"
 msgstr "Prikaži"
 
diff --git a/locales/sv/LC_MESSAGES/consentAdmin.po b/locales/sv/LC_MESSAGES/consentAdmin.po
index 2935a2c..485f865 100644
--- a/locales/sv/LC_MESSAGES/consentAdmin.po
+++ b/locales/sv/LC_MESSAGES/consentAdmin.po
@@ -27,9 +27,6 @@ msgstr "Tjänsteleverantör"
 msgid "{consentAdmin:consentadmin:removed}"
 msgstr "Samtycke borttaget"
 
-msgid "{consentAdmin:consentadmin:consentadmin_header}"
-msgstr "Samtyckesadministration"
-
 msgid "{consentAdmin:consentadmin:show}"
 msgstr "Visa"
 
diff --git a/locales/zh-tw/LC_MESSAGES/consentAdmin.po b/locales/zh-tw/LC_MESSAGES/consentAdmin.po
index 0179f90..01f25f1 100644
--- a/locales/zh-tw/LC_MESSAGES/consentAdmin.po
+++ b/locales/zh-tw/LC_MESSAGES/consentAdmin.po
@@ -27,9 +27,6 @@ msgstr "服務提供者"
 msgid "{consentAdmin:consentadmin:removed}"
 msgstr "同意移除"
 
-msgid "{consentAdmin:consentadmin:consentadmin_header}"
-msgstr "管轄許可"
-
 msgid "{consentAdmin:consentadmin:show}"
 msgstr "顯示"
 
diff --git a/locales/zh/LC_MESSAGES/consentAdmin.po b/locales/zh/LC_MESSAGES/consentAdmin.po
index a6f3051..de46c3c 100644
--- a/locales/zh/LC_MESSAGES/consentAdmin.po
+++ b/locales/zh/LC_MESSAGES/consentAdmin.po
@@ -27,9 +27,6 @@ msgstr "服务提供商"
 msgid "{consentAdmin:consentadmin:removed}"
 msgstr "已经移除的许可"
 
-msgid "{consentAdmin:consentadmin:consentadmin_header}"
-msgstr "管理员许可"
-
 msgid "{consentAdmin:consentadmin:show}"
 msgstr "显示"
 
diff --git a/templates/consentadmin.twig b/templates/consentadmin.twig
index 1d20eba..a5bbbce 100644
--- a/templates/consentadmin.twig
+++ b/templates/consentadmin.twig
@@ -1,4 +1,4 @@
-{% set pagetitle = '{consentAdmin:consentadmin:consentadmin_header}'|trans %}
+{% set pagetitle = 'Consent Administration'|trans %}
 {% extends "base.twig" %}
 
 {% block preload %}
diff --git a/www/consentAdmin.php b/www/consentAdmin.php
index 96b7bb6..8d21a9a 100644
--- a/www/consentAdmin.php
+++ b/www/consentAdmin.php
@@ -321,7 +321,6 @@ function driveProcessingChain(
     ];
 }
 
-$template->data['header'] = 'Consent Administration';
 $template->data['spList'] = $sp_list;
 $template->data['showDescription'] = $cA_config->getValue('showDescription');
 $template->send();

From bc1d0331eb34a311d6738d83c56e154b4b561db5 Mon Sep 17 00:00:00 2001
From: Thijs Kinkhorst <thijs@kinkhorst.com>
Date: Mon, 17 Jan 2022 14:50:32 +0000
Subject: [PATCH 045/135] Document how to enable module with SSP2

---
 docs/consentAdmin.md | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/docs/consentAdmin.md b/docs/consentAdmin.md
index 630ce8b..418c403 100644
--- a/docs/consentAdmin.md
+++ b/docs/consentAdmin.md
@@ -13,9 +13,16 @@ database to store the consents.
 Setting up the consentAdmin module
 ----------------------------------
 
-The first thing you need to do is to enable the consentAdmin module:
+The first thing you need to do is to enable the consentAdmin module: in
+`config.php`, search for the `module.enable` key and set `consentAdmin` to true:
+
+```
+    'module.enable' => [
+         'consentAdmin' => true,
+         …
+    ],
+```
 
-    touch modules/consentAdmin/enable
 
 Next you need to copy the module config file to the config directory:
 

From ac5e7e7b07f241eeeb40d7199f47347f23637bbc Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Tue, 15 Mar 2022 21:22:40 +0100
Subject: [PATCH 046/135] Add badge for type-coverage

---
 .github/workflows/php.yml | 2 +-
 README.md                 | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 6976449..c6379b4 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -199,7 +199,7 @@ jobs:
 
       - name: Psalm
         continue-on-error: true
-        run: php vendor/bin/psalm --show-info=true
+        run: php vendor/bin/psalm --show-info=true --shepherd
 
       - name: Psalter
         continue-on-error: true
diff --git a/README.md b/README.md
index 1e43509..49d98d2 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
 ![Build Status](https://github.com/simplesamlphp/simplesamlphp-module-consentadmin/workflows/CI/badge.svg?branch=master)
 [![Coverage Status](https://codecov.io/gh/simplesamlphp/simplesamlphp-module-consentadmin/branch/master/graph/badge.svg)](https://codecov.io/gh/simplesamlphp/simplesamlphp-module-consentadmin)
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/simplesamlphp/simplesamlphp-module-consentadmin/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/simplesamlphp/simplesamlphp-module-consentadmin/?branch=master)
+[![Type Coverage](https://shepherd.dev/github/simplesamlphp/simplesamlphp-module-consentadmin/coverage.svg)](https://shepherd.dev/github/simplesamlphp/simplesamlphp-module-consentadmin)
+[![Psalm Level](https://shepherd.dev/github/simplesamlphp/simplesamlphp-module-consentadmin/level.svg)](https://shepherd.dev/github/simplesamlphp/simplesamlphp-module-consentadmin)

From 1b8e76e7a995b2e49942cbc18752c15ab08a34b5 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Wed, 16 Mar 2022 21:55:07 +0100
Subject: [PATCH 047/135] Fix Psalm configuration

---
 psalm.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/psalm.xml b/psalm.xml
index 513d813..8a7e4cd 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -2,7 +2,8 @@
 <psalm
     name="SimpleSAMLphp consent admin module"
     useDocblockTypes="true"
-    totallyTyped="false"
+    errorLevel="2"
+    reportMixedIssues="false"
 >
     <projectFiles>
         <directory name="hooks" />

From 34eb8c7d02bc7896b15c0cf84278ea302bcd7404 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Thu, 17 Mar 2022 00:02:24 +0100
Subject: [PATCH 048/135] Fix Configuration-getters

---
 www/consentAdmin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/consentAdmin.php b/www/consentAdmin.php
index 8d21a9a..d3aaa76 100644
--- a/www/consentAdmin.php
+++ b/www/consentAdmin.php
@@ -105,7 +105,7 @@ function driveProcessingChain(
 
 $hashAttributes = $cA_config->getValue('attributes.hash');
 
-$excludeAttributes = $cA_config->getValue('attributes.exclude', []);
+$excludeAttributes = $cA_config->getOptionalValue('attributes.exclude', []);
 
 // Check if valid local session exists
 $as->requireAuth();

From 80fae245a6c8b725042a97483098952353ec23c8 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Thu, 17 Mar 2022 00:02:39 +0100
Subject: [PATCH 049/135] Add missing intl dependency

---
 .github/workflows/php.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index c6379b4..696c514 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -22,7 +22,7 @@ jobs:
         with:
           php-version: ${{ matrix.php-versions }}
           tools: composer:v2
-          extensions: ldap, mbstring, xml
+          extensions: intl, mbstring, xml
           coverage: pcov
 
       - name: Setup problem matchers for PHP

From f82f34cd4e30554c7f6a024015d528d309086e4d Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Tue, 5 Apr 2022 21:32:20 +0200
Subject: [PATCH 050/135] Suppress deprecation errors

---
 .github/workflows/php.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 696c514..336af6f 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -20,10 +20,11 @@ jobs:
       - name: Setup PHP, with composer and extensions
         uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
         with:
+          coverage: pcov
+          extensions: intl, mbstring, xml
+          ini-values: error_reporting=E_ALL
           php-version: ${{ matrix.php-versions }}
           tools: composer:v2
-          extensions: intl, mbstring, xml
-          coverage: pcov
 
       - name: Setup problem matchers for PHP
         run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"

From d18eed38e37bbe18e80b9e988c544425b3d831ce Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Tue, 5 Apr 2022 21:59:38 +0200
Subject: [PATCH 051/135] Use Xdebug for coverage reports

---
 .github/workflows/php.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 336af6f..8012e99 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Setup PHP, with composer and extensions
         uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
         with:
-          coverage: pcov
+          coverage: debug
           extensions: intl, mbstring, xml
           ini-values: error_reporting=E_ALL
           php-version: ${{ matrix.php-versions }}

From 38a0f5f66fe4f7193d13270c8befb6cd09738b44 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Tue, 5 Apr 2022 22:15:26 +0200
Subject: [PATCH 052/135] Add markdown-linter to QC

---
 .github/workflows/php.yml | 6 ++++++
 .markdownlintignore       | 1 +
 2 files changed, 7 insertions(+)
 create mode 100644 .markdownlintignore

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 8012e99..600ed4d 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -205,3 +205,9 @@ jobs:
       - name: Psalter
         continue-on-error: true
         run: php vendor/bin/psalter --issues=UnnecessaryVarAnnotation --dry-run
+
+      - name: Lint markdown files
+        uses: nosborn/github-action-markdown-cli@v3.0.1
+        with:
+          files: .
+          ignore_path: .markdownlintignore
diff --git a/.markdownlintignore b/.markdownlintignore
new file mode 100644
index 0000000..140fada
--- /dev/null
+++ b/.markdownlintignore
@@ -0,0 +1 @@
+vendor/*

From 2909016b415144836de7e260cb49d5121785bc4e Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Sun, 12 Jun 2022 23:30:02 +0200
Subject: [PATCH 053/135] Suppress markdown long lines

---
 .markdownlintrc | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 .markdownlintrc

diff --git a/.markdownlintrc b/.markdownlintrc
new file mode 100644
index 0000000..b077f0e
--- /dev/null
+++ b/.markdownlintrc
@@ -0,0 +1,4 @@
+{
+  "default": true,
+  "MD013": false
+}

From 5c8701ed8f4685e7e3627576c3516372c8d061d6 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Mon, 13 Jun 2022 23:22:48 +0200
Subject: [PATCH 054/135] Fix codecov configuration syntax error

---
 codecov.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/codecov.yml b/codecov.yml
index 2599879..f9d26c6 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -1,6 +1,6 @@
 coverage:
   status:
-    project: yes
+    project:
       default:
         target: 0%
         threshold: 2%

From 8844389e5878e150b1d7cb0f7be6eae41c4a19da Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Tue, 14 Jun 2022 01:06:16 +0200
Subject: [PATCH 055/135] Update upload/download artifacts

---
 .github/workflows/php.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 600ed4d..9aa2edf 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -71,7 +71,7 @@ jobs:
 
       - name: Save coverage data
         if: ${{ matrix.php-versions == '7.4' && matrix.operating-system == 'ubuntu-latest' }}
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v3
         with:
             name: build-data
             path: ${{ github.workspace }}/build
@@ -186,7 +186,7 @@ jobs:
       - name: Install Composer dependencies
         run: composer install --no-progress --prefer-dist --optimize-autoloader
 
-      - uses: actions/download-artifact@v1
+      - uses: actions/download-artifact@v3
         with:
           name: build-data
           path: ${{ github.workspace }}/build

From b125d36f38c02b685121596ebb1d764da17c1bb7 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Sun, 10 Jul 2022 22:28:21 +0200
Subject: [PATCH 056/135] Fix typos

---
 docs/consentAdmin.md                      | 4 ++--
 locales/ar/LC_MESSAGES/consentAdmin.po    | 2 +-
 locales/cs/LC_MESSAGES/consentAdmin.po    | 2 +-
 locales/da/LC_MESSAGES/consentAdmin.po    | 2 +-
 locales/de/LC_MESSAGES/consentAdmin.po    | 2 +-
 locales/el/LC_MESSAGES/consentAdmin.po    | 2 +-
 locales/en/LC_MESSAGES/consentAdmin.po    | 6 +++---
 locales/es/LC_MESSAGES/consentAdmin.po    | 2 +-
 locales/et/LC_MESSAGES/consentAdmin.po    | 2 +-
 locales/eu/LC_MESSAGES/consentAdmin.po    | 2 +-
 locales/fr/LC_MESSAGES/consentAdmin.po    | 2 +-
 locales/he/LC_MESSAGES/consentAdmin.po    | 2 +-
 locales/hr/LC_MESSAGES/consentAdmin.po    | 2 +-
 locales/hu/LC_MESSAGES/consentAdmin.po    | 2 +-
 locales/id/LC_MESSAGES/consentAdmin.po    | 2 +-
 locales/it/LC_MESSAGES/consentAdmin.po    | 2 +-
 locales/ja/LC_MESSAGES/consentAdmin.po    | 2 +-
 locales/lt/LC_MESSAGES/consentAdmin.po    | 2 +-
 locales/lv/LC_MESSAGES/consentAdmin.po    | 2 +-
 locales/nb/LC_MESSAGES/consentAdmin.po    | 2 +-
 locales/nl/LC_MESSAGES/consentAdmin.po    | 2 +-
 locales/nn/LC_MESSAGES/consentAdmin.po    | 2 +-
 locales/pt/LC_MESSAGES/consentAdmin.po    | 2 +-
 locales/ro/LC_MESSAGES/consentAdmin.po    | 2 +-
 locales/ru/LC_MESSAGES/consentAdmin.po    | 2 +-
 locales/sl/LC_MESSAGES/consentAdmin.po    | 2 +-
 locales/sr/LC_MESSAGES/consentAdmin.po    | 2 +-
 locales/sv/LC_MESSAGES/consentAdmin.po    | 2 +-
 locales/zh-tw/LC_MESSAGES/consentAdmin.po | 2 +-
 locales/zh/LC_MESSAGES/consentAdmin.po    | 2 +-
 phpcs.xml                                 | 2 +-
 www/consentAdmin.php                      | 2 +-
 32 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/docs/consentAdmin.md b/docs/consentAdmin.md
index 418c403..d5597c1 100644
--- a/docs/consentAdmin.md
+++ b/docs/consentAdmin.md
@@ -39,7 +39,7 @@ credentials in the config file. Example:
 		'password'	=>	'sdfsdf',
 	),
 
-Notice that credentials usualy is the same as for the consent module, but
+Notice that credentials usually is the same as for the consent module, but
 can be different.
 
 Go to the frontpage of your SimpleSAMLphp installation. A link to the
@@ -78,7 +78,7 @@ The call to these filters are made with an isPassive request, with means that
 no filter is allowed to make userinteraction. 
 
 It is up to the developers of the filters to respect the isPassive request.
-The prefered thing to do is to make your setup so that only filters that
+The preferred thing to do is to make your setup so that only filters that
 modify attributes is run. Othervise it is recommended that developers of
 filters to throw a 'NoPassive' exception, if the filter can not run without
 userinteraction.
diff --git a/locales/ar/LC_MESSAGES/consentAdmin.po b/locales/ar/LC_MESSAGES/consentAdmin.po
index 1dfc9af..beaaeff 100644
--- a/locales/ar/LC_MESSAGES/consentAdmin.po
+++ b/locales/ar/LC_MESSAGES/consentAdmin.po
@@ -76,7 +76,7 @@ msgstr "تمت اضافة الموافقة"
 msgid "{consentAdmin:consentadmin:attribute_id}"
 msgstr "الهوية"
 
-msgid "Injected attribut"
+msgid "Injected attribute"
 msgstr "السمات التي تم تقديمها"
 
 msgid "Show"
diff --git a/locales/cs/LC_MESSAGES/consentAdmin.po b/locales/cs/LC_MESSAGES/consentAdmin.po
index 1addfba..0f8f5c4 100644
--- a/locales/cs/LC_MESSAGES/consentAdmin.po
+++ b/locales/cs/LC_MESSAGES/consentAdmin.po
@@ -77,7 +77,7 @@ msgstr "Udělené povolení"
 msgid "{consentAdmin:consentadmin:attribute_id}"
 msgstr "Identita"
 
-msgid "Injected attribut"
+msgid "Injected attribute"
 msgstr "Vložený atribut"
 
 msgid "Show"
diff --git a/locales/da/LC_MESSAGES/consentAdmin.po b/locales/da/LC_MESSAGES/consentAdmin.po
index 125c5e0..0ccc73a 100644
--- a/locales/da/LC_MESSAGES/consentAdmin.po
+++ b/locales/da/LC_MESSAGES/consentAdmin.po
@@ -99,7 +99,7 @@ msgstr "Samtykke givet"
 msgid "{consentAdmin:consentadmin:attribute_id}"
 msgstr "Identitet"
 
-msgid "Injected attribut"
+msgid "Injected attribute"
 msgstr "Injiceret attribut"
 
 msgid "Show"
diff --git a/locales/de/LC_MESSAGES/consentAdmin.po b/locales/de/LC_MESSAGES/consentAdmin.po
index f2bdc9d..44c7efe 100644
--- a/locales/de/LC_MESSAGES/consentAdmin.po
+++ b/locales/de/LC_MESSAGES/consentAdmin.po
@@ -80,7 +80,7 @@ msgstr "Einverständnis hinzugefügt"
 msgid "{consentAdmin:consentadmin:attribute_id}"
 msgstr "Identität"
 
-msgid "Injected attribut"
+msgid "Injected attribute"
 msgstr "Eingekoppeltes Attribut"
 
 msgid "Show"
diff --git a/locales/el/LC_MESSAGES/consentAdmin.po b/locales/el/LC_MESSAGES/consentAdmin.po
index 9d1ac8e..de949f4 100644
--- a/locales/el/LC_MESSAGES/consentAdmin.po
+++ b/locales/el/LC_MESSAGES/consentAdmin.po
@@ -76,7 +76,7 @@ msgstr "Η συγκατάθεση προστέθηκε"
 msgid "{consentAdmin:consentadmin:attribute_id}"
 msgstr "Ταυτότητα"
 
-msgid "Injected attribut"
+msgid "Injected attribute"
 msgstr "Εισαχθέν στοιχείο"
 
 msgid "Show"
diff --git a/locales/en/LC_MESSAGES/consentAdmin.po b/locales/en/LC_MESSAGES/consentAdmin.po
index 221ba32..f907695 100644
--- a/locales/en/LC_MESSAGES/consentAdmin.po
+++ b/locales/en/LC_MESSAGES/consentAdmin.po
@@ -34,7 +34,7 @@ msgid "{consentAdmin:consentadmin:attribute_org}"
 msgstr "Organisation"
 
 msgid "{consentAdmin:consentadmin:attribute_injected}"
-msgstr "Injected attribut"
+msgstr "Injected attribute"
 
 msgid "{consentAdmin:consentadmin:show_hide_attributes}"
 msgstr "show/hide attributes"
@@ -79,8 +79,8 @@ msgstr "Consent Added"
 msgid "{consentAdmin:consentadmin:attribute_id}"
 msgstr "Identity"
 
-msgid "Injected attribut"
-msgstr "Injected attribut"
+msgid "Injected attribute"
+msgstr "Injected attribute"
 
 msgid "Show"
 msgstr "Show"
diff --git a/locales/es/LC_MESSAGES/consentAdmin.po b/locales/es/LC_MESSAGES/consentAdmin.po
index 40c07b9..419daa3 100644
--- a/locales/es/LC_MESSAGES/consentAdmin.po
+++ b/locales/es/LC_MESSAGES/consentAdmin.po
@@ -79,7 +79,7 @@ msgstr "Consentimiento añadido"
 msgid "{consentAdmin:consentadmin:attribute_id}"
 msgstr "Identidad"
 
-msgid "Injected attribut"
+msgid "Injected attribute"
 msgstr "Atributo inyectado"
 
 msgid "Show"
diff --git a/locales/et/LC_MESSAGES/consentAdmin.po b/locales/et/LC_MESSAGES/consentAdmin.po
index 583605f..196f8ed 100644
--- a/locales/et/LC_MESSAGES/consentAdmin.po
+++ b/locales/et/LC_MESSAGES/consentAdmin.po
@@ -77,7 +77,7 @@ msgstr "Nõusolek lisatud"
 msgid "{consentAdmin:consentadmin:attribute_id}"
 msgstr "Identiteet"
 
-msgid "Injected attribut"
+msgid "Injected attribute"
 msgstr "XXXSüstitud atribuut"
 
 msgid "Show"
diff --git a/locales/eu/LC_MESSAGES/consentAdmin.po b/locales/eu/LC_MESSAGES/consentAdmin.po
index 3dd3abe..822008b 100644
--- a/locales/eu/LC_MESSAGES/consentAdmin.po
+++ b/locales/eu/LC_MESSAGES/consentAdmin.po
@@ -77,7 +77,7 @@ msgstr "Onespena gehitua"
 msgid "{consentAdmin:consentadmin:attribute_id}"
 msgstr "Identitatea"
 
-msgid "Injected attribut"
+msgid "Injected attribute"
 msgstr "Atributua sartuta"
 
 msgid "Show"
diff --git a/locales/fr/LC_MESSAGES/consentAdmin.po b/locales/fr/LC_MESSAGES/consentAdmin.po
index bfed4bc..0596453 100644
--- a/locales/fr/LC_MESSAGES/consentAdmin.po
+++ b/locales/fr/LC_MESSAGES/consentAdmin.po
@@ -79,7 +79,7 @@ msgstr "Consentement ajouté"
 msgid "{consentAdmin:consentadmin:attribute_id}"
 msgstr "Identité"
 
-msgid "Injected attribut"
+msgid "Injected attribute"
 msgstr "Attribut ajouté"
 
 msgid "Show"
diff --git a/locales/he/LC_MESSAGES/consentAdmin.po b/locales/he/LC_MESSAGES/consentAdmin.po
index c786b5c..d48af2c 100644
--- a/locales/he/LC_MESSAGES/consentAdmin.po
+++ b/locales/he/LC_MESSAGES/consentAdmin.po
@@ -76,7 +76,7 @@ msgstr "הסכמה הוספה"
 msgid "{consentAdmin:consentadmin:attribute_id}"
 msgstr "זהות"
 
-msgid "Injected attribut"
+msgid "Injected attribute"
 msgstr "מאפיין מוזרק"
 
 msgid "Show"
diff --git a/locales/hr/LC_MESSAGES/consentAdmin.po b/locales/hr/LC_MESSAGES/consentAdmin.po
index a30d695..46db9f9 100644
--- a/locales/hr/LC_MESSAGES/consentAdmin.po
+++ b/locales/hr/LC_MESSAGES/consentAdmin.po
@@ -78,7 +78,7 @@ msgstr "Dozvola dodana"
 msgid "{consentAdmin:consentadmin:attribute_id}"
 msgstr "Identitet"
 
-msgid "Injected attribut"
+msgid "Injected attribute"
 msgstr "Ubačeni atribut"
 
 msgid "Show"
diff --git a/locales/hu/LC_MESSAGES/consentAdmin.po b/locales/hu/LC_MESSAGES/consentAdmin.po
index a2c8bac..a79632a 100644
--- a/locales/hu/LC_MESSAGES/consentAdmin.po
+++ b/locales/hu/LC_MESSAGES/consentAdmin.po
@@ -76,7 +76,7 @@ msgstr "Hozzájárulás rögzítve"
 msgid "{consentAdmin:consentadmin:attribute_id}"
 msgstr "Azonosság"
 
-msgid "Injected attribut"
+msgid "Injected attribute"
 msgstr "Attribútum beszúrása"
 
 msgid "Show"
diff --git a/locales/id/LC_MESSAGES/consentAdmin.po b/locales/id/LC_MESSAGES/consentAdmin.po
index 02756c3..dc90e2d 100644
--- a/locales/id/LC_MESSAGES/consentAdmin.po
+++ b/locales/id/LC_MESSAGES/consentAdmin.po
@@ -79,7 +79,7 @@ msgstr "Consent telah ditambahkan"
 msgid "{consentAdmin:consentadmin:attribute_id}"
 msgstr "Identitas"
 
-msgid "Injected attribut"
+msgid "Injected attribute"
 msgstr "Attribut yang diinjeksi"
 
 msgid "Show"
diff --git a/locales/it/LC_MESSAGES/consentAdmin.po b/locales/it/LC_MESSAGES/consentAdmin.po
index b67ec3d..fe5ec46 100644
--- a/locales/it/LC_MESSAGES/consentAdmin.po
+++ b/locales/it/LC_MESSAGES/consentAdmin.po
@@ -79,7 +79,7 @@ msgstr "Consenso Aggiunto"
 msgid "{consentAdmin:consentadmin:attribute_id}"
 msgstr "Identità"
 
-msgid "Injected attribut"
+msgid "Injected attribute"
 msgstr "Attributo inserito"
 
 msgid "Show"
diff --git a/locales/ja/LC_MESSAGES/consentAdmin.po b/locales/ja/LC_MESSAGES/consentAdmin.po
index 2151747..9b7aeb2 100644
--- a/locales/ja/LC_MESSAGES/consentAdmin.po
+++ b/locales/ja/LC_MESSAGES/consentAdmin.po
@@ -76,7 +76,7 @@ msgstr "承認が追加されました"
 msgid "{consentAdmin:consentadmin:attribute_id}"
 msgstr "識別子"
 
-msgid "Injected attribut"
+msgid "Injected attribute"
 msgstr "挿入された属性"
 
 msgid "Show"
diff --git a/locales/lt/LC_MESSAGES/consentAdmin.po b/locales/lt/LC_MESSAGES/consentAdmin.po
index 6832378..6aa25d1 100644
--- a/locales/lt/LC_MESSAGES/consentAdmin.po
+++ b/locales/lt/LC_MESSAGES/consentAdmin.po
@@ -77,7 +77,7 @@ msgstr "Leidimas pridėtas"
 msgid "{consentAdmin:consentadmin:attribute_id}"
 msgstr "Tapatybė"
 
-msgid "Injected attribut"
+msgid "Injected attribute"
 msgstr "Įterptas atributas"
 
 msgid "Show"
diff --git a/locales/lv/LC_MESSAGES/consentAdmin.po b/locales/lv/LC_MESSAGES/consentAdmin.po
index 2dbec48..79b915a 100644
--- a/locales/lv/LC_MESSAGES/consentAdmin.po
+++ b/locales/lv/LC_MESSAGES/consentAdmin.po
@@ -78,7 +78,7 @@ msgstr "Pievienotie noteikumi"
 msgid "{consentAdmin:consentadmin:attribute_id}"
 msgstr "Identitāte"
 
-msgid "Injected attribut"
+msgid "Injected attribute"
 msgstr "Ievietots atribūts"
 
 msgid "Show"
diff --git a/locales/nb/LC_MESSAGES/consentAdmin.po b/locales/nb/LC_MESSAGES/consentAdmin.po
index 740e0fb..af2c8a3 100644
--- a/locales/nb/LC_MESSAGES/consentAdmin.po
+++ b/locales/nb/LC_MESSAGES/consentAdmin.po
@@ -77,7 +77,7 @@ msgstr "Samtykke gitt"
 msgid "{consentAdmin:consentadmin:attribute_id}"
 msgstr "Identitet"
 
-msgid "Injected attribut"
+msgid "Injected attribute"
 msgstr "Persondata lagt til"
 
 msgid "Show"
diff --git a/locales/nl/LC_MESSAGES/consentAdmin.po b/locales/nl/LC_MESSAGES/consentAdmin.po
index d2b1772..adb624a 100644
--- a/locales/nl/LC_MESSAGES/consentAdmin.po
+++ b/locales/nl/LC_MESSAGES/consentAdmin.po
@@ -79,7 +79,7 @@ msgstr "Toestemming Toegevoegd"
 msgid "{consentAdmin:consentadmin:attribute_id}"
 msgstr "Identiteit"
 
-msgid "Injected attribut"
+msgid "Injected attribute"
 msgstr "Geïnjecteerd attibuut"
 
 msgid "Show"
diff --git a/locales/nn/LC_MESSAGES/consentAdmin.po b/locales/nn/LC_MESSAGES/consentAdmin.po
index 8f9bf5b..c3453d3 100644
--- a/locales/nn/LC_MESSAGES/consentAdmin.po
+++ b/locales/nn/LC_MESSAGES/consentAdmin.po
@@ -77,7 +77,7 @@ msgstr "Samtykke lagt til"
 msgid "{consentAdmin:consentadmin:attribute_id}"
 msgstr "Identitet"
 
-msgid "Injected attribut"
+msgid "Injected attribute"
 msgstr "Persondata lagt til"
 
 msgid "Show"
diff --git a/locales/pt/LC_MESSAGES/consentAdmin.po b/locales/pt/LC_MESSAGES/consentAdmin.po
index d744d2c..ed983bf 100644
--- a/locales/pt/LC_MESSAGES/consentAdmin.po
+++ b/locales/pt/LC_MESSAGES/consentAdmin.po
@@ -76,7 +76,7 @@ msgstr "Consentimento adicionado"
 msgid "{consentAdmin:consentadmin:attribute_id}"
 msgstr "Identidade"
 
-msgid "Injected attribut"
+msgid "Injected attribute"
 msgstr "Atributo injectado"
 
 msgid "Show"
diff --git a/locales/ro/LC_MESSAGES/consentAdmin.po b/locales/ro/LC_MESSAGES/consentAdmin.po
index 9ae48af..b651cb2 100644
--- a/locales/ro/LC_MESSAGES/consentAdmin.po
+++ b/locales/ro/LC_MESSAGES/consentAdmin.po
@@ -79,7 +79,7 @@ msgstr "Acordul a fost adăugat"
 msgid "{consentAdmin:consentadmin:attribute_id}"
 msgstr "Identitate"
 
-msgid "Injected attribut"
+msgid "Injected attribute"
 msgstr "Atribut introdus"
 
 msgid "Show"
diff --git a/locales/ru/LC_MESSAGES/consentAdmin.po b/locales/ru/LC_MESSAGES/consentAdmin.po
index 13190f6..176299e 100644
--- a/locales/ru/LC_MESSAGES/consentAdmin.po
+++ b/locales/ru/LC_MESSAGES/consentAdmin.po
@@ -78,7 +78,7 @@ msgstr "Согласие добавлено"
 msgid "{consentAdmin:consentadmin:attribute_id}"
 msgstr "Идентификационная информация"
 
-msgid "Injected attribut"
+msgid "Injected attribute"
 msgstr "Введенный атрибут"
 
 msgid "Show"
diff --git a/locales/sl/LC_MESSAGES/consentAdmin.po b/locales/sl/LC_MESSAGES/consentAdmin.po
index 6bfdc8f..a4f99cd 100644
--- a/locales/sl/LC_MESSAGES/consentAdmin.po
+++ b/locales/sl/LC_MESSAGES/consentAdmin.po
@@ -77,7 +77,7 @@ msgstr "Privolitev dodana"
 msgid "{consentAdmin:consentadmin:attribute_id}"
 msgstr "Identiteta"
 
-msgid "Injected attribut"
+msgid "Injected attribute"
 msgstr "Vrinjen atribut"
 
 msgid "Show"
diff --git a/locales/sr/LC_MESSAGES/consentAdmin.po b/locales/sr/LC_MESSAGES/consentAdmin.po
index 6287da6..0ce9332 100644
--- a/locales/sr/LC_MESSAGES/consentAdmin.po
+++ b/locales/sr/LC_MESSAGES/consentAdmin.po
@@ -78,7 +78,7 @@ msgstr "Dozvola dodata"
 msgid "{consentAdmin:consentadmin:attribute_id}"
 msgstr "Identitet"
 
-msgid "Injected attribut"
+msgid "Injected attribute"
 msgstr "Ubačeni atribut"
 
 msgid "Show"
diff --git a/locales/sv/LC_MESSAGES/consentAdmin.po b/locales/sv/LC_MESSAGES/consentAdmin.po
index 485f865..1418df6 100644
--- a/locales/sv/LC_MESSAGES/consentAdmin.po
+++ b/locales/sv/LC_MESSAGES/consentAdmin.po
@@ -77,7 +77,7 @@ msgstr "Samtycke tillagt"
 msgid "{consentAdmin:consentadmin:attribute_id}"
 msgstr "Identitet"
 
-msgid "Injected attribut"
+msgid "Injected attribute"
 msgstr "Tillfört attribut"
 
 msgid "Show"
diff --git a/locales/zh-tw/LC_MESSAGES/consentAdmin.po b/locales/zh-tw/LC_MESSAGES/consentAdmin.po
index 01f25f1..ddbef9e 100644
--- a/locales/zh-tw/LC_MESSAGES/consentAdmin.po
+++ b/locales/zh-tw/LC_MESSAGES/consentAdmin.po
@@ -76,7 +76,7 @@ msgstr "同意新增"
 msgid "{consentAdmin:consentadmin:attribute_id}"
 msgstr "身分"
 
-msgid "Injected attribut"
+msgid "Injected attribute"
 msgstr "加入屬性"
 
 msgid "Show"
diff --git a/locales/zh/LC_MESSAGES/consentAdmin.po b/locales/zh/LC_MESSAGES/consentAdmin.po
index de46c3c..70e3225 100644
--- a/locales/zh/LC_MESSAGES/consentAdmin.po
+++ b/locales/zh/LC_MESSAGES/consentAdmin.po
@@ -76,7 +76,7 @@ msgstr "已经添加的许可"
 msgid "{consentAdmin:consentadmin:attribute_id}"
 msgstr "身份"
 
-msgid "Injected attribut"
+msgid "Injected attribute"
 msgstr "注入的属性"
 
 msgid "Show"
diff --git a/phpcs.xml b/phpcs.xml
index b4d15e5..38ab203 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -10,7 +10,7 @@
     <!--<exclude-pattern>*/tests/*</exclude-pattern>-->
     <!--<exclude-pattern>*/other/*</exclude-pattern>-->
 
-    <!-- This is the rule we inherit from. If you want to exlude some specific rules, see the docs on how to do that -->
+    <!-- This is the rule we inherit from. If you want to exclude some specific rules, see the docs on how to do that -->
     <rule ref="PSR12"/>
 </ruleset>
 
diff --git a/www/consentAdmin.php b/www/consentAdmin.php
index d3aaa76..64078e0 100644
--- a/www/consentAdmin.php
+++ b/www/consentAdmin.php
@@ -163,7 +163,7 @@ function driveProcessingChain(
 
 \SimpleSAML\Logger::critical('consentAdmin: sp: ' . $sp_entityid . ' action: ' . $action);
 
-// Remove services, whitch have consent disabled
+// Remove services, which have consent disabled
 if (isset($idp_metadata['consent.disable'])) {
     foreach ($idp_metadata['consent.disable'] as $disable) {
         if (array_key_exists($disable, $all_sp_metadata)) {

From 9c315c5d14d03c5e4a3dabe70ca7dcd8d8ed4c99 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Sun, 4 Sep 2022 17:22:10 +0200
Subject: [PATCH 057/135] Update security-checker

---
 .github/workflows/php.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 9aa2edf..06a2128 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -108,13 +108,13 @@ jobs:
         run: composer install --no-progress --prefer-dist --optimize-autoloader
 
       - name: Security check for locked dependencies
-        uses: symfonycorp/security-checker-action@v2
+        uses: symfonycorp/security-checker-action@v3
 
       - name: Update Composer dependencies
         run: composer update --no-progress --prefer-dist --optimize-autoloader
 
       - name: Security check for updated dependencies
-        uses: symfonycorp/security-checker-action@v2
+        uses: symfonycorp/security-checker-action@v3
 
   sanity-check:
     name: Sanity checks

From 1c54922cd57a455e2b8f6f99da210e50b461f60b Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Wed, 21 Sep 2022 22:40:35 +0200
Subject: [PATCH 058/135] Bump actions

---
 .github/workflows/documentation.yml | 53 +++++++++++++++++++++++++++++
 .github/workflows/php.yml           | 33 +++++++++---------
 2 files changed, 69 insertions(+), 17 deletions(-)
 create mode 100644 .github/workflows/documentation.yml

diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
new file mode 100644
index 0000000..16bfce3
--- /dev/null
+++ b/.github/workflows/documentation.yml
@@ -0,0 +1,53 @@
+name: Documentation
+
+on:
+  push:
+    branches: [ master, simplesamlphp-* ]
+    paths:
+      - '**.md'
+  pull_request:
+    branches: [ master, simplesamlphp-* ]
+    paths:
+      - '**.md'
+
+jobs:
+  quality:
+    name: Quality checks
+    runs-on: [ubuntu-latest]
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Lint markdown files
+        uses: nosborn/github-action-markdown-cli@v3.1.0
+        with:
+          files: .
+          ignore_path: .markdownlintignore
+
+      - name: Perform spell check
+        uses: codespell-project/actions-codespell@master
+        with:
+          path: '**/*.md'
+          check_filenames: true
+          ignore_words_list: tekst
+
+  build:
+    name: Build documentation
+    needs: quality
+    runs-on: [ubuntu-latest]
+
+    steps:
+      - name: Run docs build
+        if: github.event_name != 'pull_request'
+        uses: actions/github-script@v6
+        with:
+          # Token has to be generated on a user account that controls the docs-repository.
+          # The _only_ scope to select is "Access public repositories", nothing more.
+          github-token: ${{ secrets.PAT_TOKEN }}
+          script: |
+            await github.rest.actions.createWorkflowDispatch({
+              owner: 'simplesamlphp',
+              repo: 'docs',
+              workflow_id: 'mk_docs.yml',
+              ref: 'main'
+            })
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 06a2128..f61ff9d 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -3,8 +3,12 @@ name: CI
 on:
   push:
     branches: [ '**' ]
+    paths-ignore:
+      - '**.md'
   pull_request:
     branches: [ master, release-* ]
+    paths-ignore:
+      - '**.md'
 
 jobs:
   basic-tests:
@@ -37,14 +41,14 @@ jobs:
           git config --global core.autocrlf false
           git config --global core.eol lf
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Get composer cache directory
         id: composer-cache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: Cache composer dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -91,14 +95,14 @@ jobs:
       - name: Setup problem matchers for PHP
         run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Get composer cache directory
         id: composer-cache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: Cache composer dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
             path: ${{ steps.composer-cache.outputs.dir }}
             key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -132,14 +136,14 @@ jobs:
       - name: Setup problem matchers for PHP
         run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Get composer cache directory
         id: composer-cache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: Cache composer dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
             path: ${{ steps.composer-cache.outputs.dir }}
             key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -161,6 +165,7 @@ jobs:
 
     steps:
       - name: Setup PHP, with composer and extensions
+        id: setup-php
         uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
         with:
           php-version: '7.4'
@@ -170,14 +175,14 @@ jobs:
       - name: Setup problem matchers for PHP
         run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Get composer cache directory
         id: composer-cache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: Cache composer dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
             path: ${{ steps.composer-cache.outputs.dir }}
             key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -192,7 +197,7 @@ jobs:
           path: ${{ github.workspace }}/build
 
       - name: Codecov
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v3
 
       - name: PHP Code Sniffer
         continue-on-error: true
@@ -200,14 +205,8 @@ jobs:
 
       - name: Psalm
         continue-on-error: true
-        run: php vendor/bin/psalm --show-info=true --shepherd
+        run: php vendor/bin/psalm --show-info=true --shepherd --php-version=${{ steps.setup-php.outputs.php-version }}
 
       - name: Psalter
         continue-on-error: true
-        run: php vendor/bin/psalter --issues=UnnecessaryVarAnnotation --dry-run
-
-      - name: Lint markdown files
-        uses: nosborn/github-action-markdown-cli@v3.0.1
-        with:
-          files: .
-          ignore_path: .markdownlintignore
+        run: php vendor/bin/psalter --issues=UnnecessaryVarAnnotation --dry-run --php-version=${{ steps.setup-php.outputs.php-version }}

From 54a4ef17b8da70c19beff157751acab7ef59a135 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Tue, 4 Oct 2022 21:50:29 +0200
Subject: [PATCH 059/135] Use faster pcov instead of xdebug

---
 .github/workflows/php.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index f61ff9d..d9450ee 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Setup PHP, with composer and extensions
         uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
         with:
-          coverage: debug
+          coverage: pcov
           extensions: intl, mbstring, xml
           ini-values: error_reporting=E_ALL
           php-version: ${{ matrix.php-versions }}

From a733e490336f069261094a4099883b036f8b04bd Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Sat, 29 Oct 2022 22:02:49 +0200
Subject: [PATCH 060/135] Bump dependencies

---
 composer.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/composer.json b/composer.json
index 762f4dd..36f86d4 100644
--- a/composer.json
+++ b/composer.json
@@ -32,13 +32,13 @@
     "require": {
         "php": ">=7.4 || ^8.0",
 
-        "simplesamlphp/assert": "~0.2.7",
-        "simplesamlphp/composer-module-installer": "~1.1",
-        "simplesamlphp/simplesamlphp": "^2.0.0-beta.2",
-        "simplesamlphp/simplesamlphp-module-consent": "^1.0"
+        "simplesamlphp/assert": "^0.8.0",
+        "simplesamlphp/composer-module-installer": "^1.2.0",
+        "simplesamlphp/simplesamlphp": "^2.0.0-rc2",
+        "simplesamlphp/simplesamlphp-module-consent": "^1.1"
     },
     "require-dev": {
-        "simplesamlphp/simplesamlphp-test-framework": "^1.1.4"
+        "simplesamlphp/simplesamlphp-test-framework": "^1.2.1"
     },
     "extra": {
         "ssp-mixedcase-module-name": "consentAdmin"

From 0de7c3ef47697ee1196e0e29bce129126780d04a Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Tue, 22 Nov 2022 22:28:09 +0100
Subject: [PATCH 061/135] Fix deprecated set-output

---
 .github/workflows/php.yml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index d9450ee..1261657 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -43,9 +43,13 @@ jobs:
 
       - uses: actions/checkout@v3
 
-      - name: Get composer cache directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+      - name: Get composer cache directory (linux)
+        if: ${{ matrix.operating-system == 'ubuntu-latest' }}
+        run: echo "COMPOSER_CACHE=$(composer config cache-files-dir)" >> $GITHUB_ENV
+
+      - name: Get composer cache directory (windows)
+        if: ${{ matrix.operating-system == 'windows-latest' }}
+        run: echo "COMPOSER_CACHE=$(composer config cache-files-dir)" >> $env:GITHUB_ENV
 
       - name: Cache composer dependencies
         uses: actions/cache@v3

From da13f8d64ae2e410ebcee46f81779c6b428bf441 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Mon, 12 Dec 2022 21:47:51 +0100
Subject: [PATCH 062/135] Fix build

---
 .github/workflows/php.yml | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 1261657..24db379 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -18,7 +18,7 @@ jobs:
       fail-fast: false
       matrix:
         operating-system: [ubuntu-latest, windows-latest]
-        php-versions: ['7.4', '8.0', '8.1']
+        php-versions: ['7.4', '8.0', '8.1', '8.2']
 
     steps:
       - name: Setup PHP, with composer and extensions
@@ -54,7 +54,7 @@ jobs:
       - name: Cache composer dependencies
         uses: actions/cache@v3
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: $COMPOSER_CACHE
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
 
@@ -101,14 +101,10 @@ jobs:
 
       - uses: actions/checkout@v3
 
-      - name: Get composer cache directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-
       - name: Cache composer dependencies
         uses: actions/cache@v3
         with:
-            path: ${{ steps.composer-cache.outputs.dir }}
+            path: $COMPOSER_CACHE
             key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
             restore-keys: ${{ runner.os }}-composer-
 
@@ -142,14 +138,10 @@ jobs:
 
       - uses: actions/checkout@v3
 
-      - name: Get composer cache directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-
       - name: Cache composer dependencies
         uses: actions/cache@v3
         with:
-            path: ${{ steps.composer-cache.outputs.dir }}
+            path: $COMPOSER_CACHE
             key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
             restore-keys: ${{ runner.os }}-composer-
 
@@ -181,14 +173,10 @@ jobs:
 
       - uses: actions/checkout@v3
 
-      - name: Get composer cache directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-
       - name: Cache composer dependencies
         uses: actions/cache@v3
         with:
-            path: ${{ steps.composer-cache.outputs.dir }}
+            path: $COMPOSER_CACHE
             key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
             restore-keys: ${{ runner.os }}-composer-
 

From fa1fe538b53b6959f8cfb19b6356e4551b2edaee Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Wed, 4 Jan 2023 18:05:22 +0100
Subject: [PATCH 063/135] Use composer audit instead of third party security
 checker

---
 .github/workflows/php.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 24db379..2cfb0f5 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -112,13 +112,13 @@ jobs:
         run: composer install --no-progress --prefer-dist --optimize-autoloader
 
       - name: Security check for locked dependencies
-        uses: symfonycorp/security-checker-action@v3
+        run: composer audit
 
       - name: Update Composer dependencies
         run: composer update --no-progress --prefer-dist --optimize-autoloader
 
       - name: Security check for updated dependencies
-        uses: symfonycorp/security-checker-action@v3
+        run: composer audit
 
   sanity-check:
     name: Sanity checks

From fe27598b55a12ce43c5a05427cbe5f5c505ee18b Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Mon, 23 Jan 2023 20:12:04 +0100
Subject: [PATCH 064/135] Move www > public

---
 {www => public}/assets/css/consentAdmin.css | 0
 {www => public}/assets/js/consentAdmin.js   | 0
 {www => public}/consentAdmin.php            | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename {www => public}/assets/css/consentAdmin.css (100%)
 rename {www => public}/assets/js/consentAdmin.js (100%)
 rename {www => public}/consentAdmin.php (100%)

diff --git a/www/assets/css/consentAdmin.css b/public/assets/css/consentAdmin.css
similarity index 100%
rename from www/assets/css/consentAdmin.css
rename to public/assets/css/consentAdmin.css
diff --git a/www/assets/js/consentAdmin.js b/public/assets/js/consentAdmin.js
similarity index 100%
rename from www/assets/js/consentAdmin.js
rename to public/assets/js/consentAdmin.js
diff --git a/www/consentAdmin.php b/public/consentAdmin.php
similarity index 100%
rename from www/consentAdmin.php
rename to public/consentAdmin.php

From e0e7326ace7277ea1a5451ef3947241aaa17797a Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Mon, 23 Jan 2023 20:12:36 +0100
Subject: [PATCH 065/135] Update module-installer

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 36f86d4..2b154a6 100644
--- a/composer.json
+++ b/composer.json
@@ -33,7 +33,7 @@
         "php": ">=7.4 || ^8.0",
 
         "simplesamlphp/assert": "^0.8.0",
-        "simplesamlphp/composer-module-installer": "^1.2.0",
+        "simplesamlphp/composer-module-installer": "^1.3.2",
         "simplesamlphp/simplesamlphp": "^2.0.0-rc2",
         "simplesamlphp/simplesamlphp-module-consent": "^1.1"
     },

From 5b7876a4ee351f65052b4cd33faf1fcd710e4be7 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Thu, 16 Mar 2023 23:50:58 +0100
Subject: [PATCH 066/135] Bump nosborn

---
 .github/workflows/documentation.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index 16bfce3..bc44f1e 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -1,12 +1,14 @@
+---
+
 name: Documentation
 
-on:
+on:  # yamllint disable-line rule:truthy
   push:
-    branches: [ master, simplesamlphp-* ]
+    branches: [master, simplesamlphp-*]
     paths:
       - '**.md'
   pull_request:
-    branches: [ master, simplesamlphp-* ]
+    branches: [master, simplesamlphp-*]
     paths:
       - '**.md'
 
@@ -19,7 +21,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Lint markdown files
-        uses: nosborn/github-action-markdown-cli@v3.1.0
+        uses: nosborn/github-action-markdown-cli@v3.2.0
         with:
           files: .
           ignore_path: .markdownlintignore

From 2f3067a2f05754cc898a0a747b1c19116fbe3dda Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Sat, 18 Mar 2023 12:45:01 +0100
Subject: [PATCH 067/135] Lock conversations of closed issues/prs after 90 days
 of inactivity

---
 .github/workflows/autolock-conversations.yml | 25 ++++++++++++++++++++
 .github/workflows/documentation.yml          |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/autolock-conversations.yml

diff --git a/.github/workflows/autolock-conversations.yml b/.github/workflows/autolock-conversations.yml
new file mode 100644
index 0000000..5d66869
--- /dev/null
+++ b/.github/workflows/autolock-conversations.yml
@@ -0,0 +1,25 @@
+---
+
+name: 'Lock Threads'
+
+on:  # yamllint disable-line rule:truthy
+  schedule:
+    - cron: '0 0 * * *'
+  workflow_dispatch:
+
+permissions:
+  issues: write
+  pull-requests: write
+
+concurrency:
+  group: lock
+
+jobs:
+  action:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dessant/lock-threads@v4
+        with:
+          issue-inactive-days: '90'
+          pr-inactive-days: '90'
+          log-output: true
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index bc44f1e..71477d4 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -21,7 +21,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Lint markdown files
-        uses: nosborn/github-action-markdown-cli@v3.2.0
+        uses: nosborn/github-action-markdown-cli@v3
         with:
           files: .
           ignore_path: .markdownlintignore

From 34df32b55914bd8609fc6c66d36bb7f9ff62fd42 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Sun, 2 Apr 2023 12:39:38 +0200
Subject: [PATCH 068/135] Add .gitattributes file

---
 .gitattributes | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..3b911a4
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,14 @@
+/.github/ export-ignore
+/tools/ export-ignore
+/tests/ export-ignore
+codecov.yml export-ignore
+.editorconfig export-ignore
+.gitattributes export-ignore
+.gitignore export-ignore
+psalm.xml export-ignore
+psalm-dev.xml export-ignore
+phpcs.xml export-ignore
+phpunit.xml export-ignore
+.php_cs.dist export-ignore
+.markdownlintignore export-ignore
+.markdownlintrc export-ignore

From 9e4dff8f95fe89b159138f25f83ca35ab415a629 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Thu, 27 Jul 2023 12:59:03 +0200
Subject: [PATCH 069/135] Bump dependencies

---
 composer.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/composer.json b/composer.json
index 2b154a6..c033858 100644
--- a/composer.json
+++ b/composer.json
@@ -30,15 +30,15 @@
         }
     },
     "require": {
-        "php": ">=7.4 || ^8.0",
+        "php": "^8.0",
 
-        "simplesamlphp/assert": "^0.8.0",
+        "simplesamlphp/assert": "^1.0.0",
         "simplesamlphp/composer-module-installer": "^1.3.2",
-        "simplesamlphp/simplesamlphp": "^2.0.0-rc2",
-        "simplesamlphp/simplesamlphp-module-consent": "^1.1"
+        "simplesamlphp/simplesamlphp": "*",
+        "simplesamlphp/simplesamlphp-module-consent": "*"
     },
     "require-dev": {
-        "simplesamlphp/simplesamlphp-test-framework": "^1.2.1"
+        "simplesamlphp/simplesamlphp-test-framework": "^1.5.4"
     },
     "extra": {
         "ssp-mixedcase-module-name": "consentAdmin"

From a66bda9353c2a00c34db30ce7be53fbb5a643d12 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Fri, 10 Sep 2021 22:40:32 +0200
Subject: [PATCH 070/135] Add controller

---
 lib/Controller/ConsentAdmin.php | 371 ++++++++++++++++++++++++++++++++
 public/consentAdmin.php         | 326 ----------------------------
 routing/routes/routes.yml       |   3 +
 3 files changed, 374 insertions(+), 326 deletions(-)
 create mode 100644 lib/Controller/ConsentAdmin.php
 delete mode 100644 public/consentAdmin.php
 create mode 100644 routing/routes/routes.yml

diff --git a/lib/Controller/ConsentAdmin.php b/lib/Controller/ConsentAdmin.php
new file mode 100644
index 0000000..ee4234f
--- /dev/null
+++ b/lib/Controller/ConsentAdmin.php
@@ -0,0 +1,371 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\Module\consentadmin\Controller;
+
+use Exception;
+use SimpleSAML\Auth;
+use SimpleSAML\Configuration;
+use SimpleSAML\Logger;
+use SimpleSAML\Metadata\MetaDataStorageHandler;
+use SimpleSAML\Module\consent\Auth\Process\Consent;
+use SimpleSAML\Module\consent\Store;
+use SimpleSAML\Session;
+use SimpleSAML\XHTML\Template;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * Controller class for the consentadmin module.
+ *
+ * This class serves the different views available in the module.
+ *
+ * @package simplesamlphp/simplesamlphp-module-consentadmin
+ */
+class ConsentAdmin
+{
+    /** @var \SimpleSAML\Configuration */
+    protected Configuration $config;
+
+    /** @var \SimpleSAML\Session */
+    protected Session $session;
+
+
+    /**
+     * Controller constructor.
+     *
+     * It initializes the global configuration and session for the controllers implemented here.
+     *
+     * @param \SimpleSAML\Configuration $config The configuration to use by the controllers.
+     * @param \SimpleSAML\Session $session The session to use by the controllers.
+     *
+     * @throws \Exception
+     */
+    public function __construct(
+        Configuration $config,
+        Session $session
+    ) {
+        $this->config = $config;
+        $this->moduleConfig = Configuration::getConfig('module_consentAdmin.php');
+        $this->session = $session;
+    }
+
+
+
+    /**
+     * @param \Symfony\Component\HttpFoundation\Request $request The current request.
+     *
+     * @return \SimpleSAML\XHTML\Template
+     */
+    public function main(Request $request): Template
+    {
+        $authority = $this->moduleConfig->getValue('authority');
+
+        $as = new Auth\Simple($authority);
+
+        // If request is a logout request
+        $logout = $request->get('logout');
+        if ($logout !== null) {
+            $returnURL = $this->moduleConfig->getValue('returnURL');
+            $as->logout($returnURL);
+        }
+
+        $hashAttributes = $this->moduleConfig->getValue('attributes.hash');
+
+        $excludeAttributes = $this->moduleConfig->getValue('attributes.exclude', []);
+
+        // Check if valid local session exists
+        $as->requireAuth();
+
+        // Get released attributes
+        $attributes = $as->getAttributes();
+
+        // Get metadata storage handler
+        $metadata = MetaDataStorageHandler::getMetadataHandler();
+
+        /*
+         * Get IdP id and metadata
+         */
+        $idp_entityid = $metadata->getMetaDataCurrentEntityID('saml20-idp-hosted');
+        $idp_metadata = $metadata->getMetaData($idp_entityid, 'saml20-idp-hosted');
+
+        // Calc correct source
+        if ($as->getAuthData('saml:sp:IdP') !== null) {
+            // from a remote idp (as bridge)
+            $source = 'saml20-idp-remote|' . $as->getAuthData('saml:sp:IdP');
+        } else {
+            // from the local idp
+            $source = $idp_metadata['metadata-set'] . '|' . $idp_entityid;
+        }
+
+        // Get user ID
+        if (isset($idp_metadata['userid.attribute']) && is_string($idp_metadata['userid.attribute'])) {
+            $userid_attributename = $idp_metadata['userid.attribute'];
+        } else {
+            $userid_attributename = 'eduPersonPrincipalName';
+        }
+
+        $userids = $attributes[$userid_attributename];
+
+        if (empty($userids)) {
+            throw new Exception(sprintf(
+                'Could not generate useridentifier for storing consent. Attribute [%s] was not available.',
+                $userid_attributename
+            ));
+        }
+
+        $userid = $userids[0];
+
+        // Get all SP metadata
+        $all_sp_metadata = $metadata->getList('saml20-sp-remote');
+
+        $sp_entityid = $request->get('cv');;
+        $action = $request->get('action');
+
+        Logger::critical('consentAdmin: sp: ' . $sp_entityid . ' action: ' . $action);
+
+        // Remove services, whitch have consent disabled
+        if (isset($idp_metadata['consent.disable'])) {
+            foreach ($idp_metadata['consent.disable'] as $disable) {
+                if (array_key_exists($disable, $all_sp_metadata)) {
+                    unset($all_sp_metadata[$disable]);
+                }
+            }
+        }
+
+        Logger::info('consentAdmin: ' . $idp_entityid);
+
+        // Parse consent config
+        $consent_storage = Store::parseStoreConfig($this->moduleConfig->getValue('consentadmin'));
+
+        // Calc correct user ID hash
+        $hashed_user_id = Consent::getHashedUserID($userid, $source);
+
+        // If a checkbox have been clicked
+        if ($action !== null && $sp_entityid !== null) {
+            // init template to enable translation of status messages
+            $template = new Template(
+                $config,
+                'consentAdmin:consentadminajax.twig',
+                'consentAdmin:consentadmin'
+            );
+            $translator = $template->getTranslator();
+
+            // Get SP metadata
+            $sp_metadata = $metadata->getMetaData($sp_entityid, 'saml20-sp-remote');
+
+            // Run AuthProc filters
+            list($targeted_id, $attribute_hash, $attributes_new) = $this->driveProcessingChain(
+                $idp_metadata,
+                $source,
+                $sp_metadata,
+                $sp_entityid,
+                $attributes,
+                $userid,
+                $hashAttributes,
+                $excludeAttributes
+            );
+
+            // Add a consent (or update if attributes have changed and old consent for SP and IdP exists)
+            if ($action == 'true') {
+                $isStored = $consent_storage->saveConsent($hashed_user_id, $targeted_id, $attribute_hash);
+            } else {
+                if ($action == 'false') {
+                    // Got consent, so this is a request to remove it
+                    $rowcount = $consent_storage->deleteConsent($hashed_user_id, $targeted_id);
+                    if ($rowcount > 0) {
+                        $isStored = false;
+                    } else {
+                        throw new Exception("Unknown action (should not happen)");
+                    }
+                } else {
+                    Logger::info('consentAdmin: unknown action');
+                    $isStored = null;
+                }
+            }
+            $template->data['isStored'] = $isStored;
+            return $template;
+        }
+
+        // Get all consents for user
+        $user_consent_list = $consent_storage->getConsents($hashed_user_id);
+
+        // Parse list of consents
+        $user_consent = [];
+        foreach ($user_consent_list as $c) {
+           $user_consent[$c[0]] = $c[1];
+        }
+
+        $template_sp_content = [];
+
+        // Init template
+        $template = new Template($config, 'consentAdmin:consentadmin.twig', 'consentAdmin:consentadmin');
+        $translator = $template->getTranslator();
+        $translator->includeLanguageFile('attributes'); // attribute listings translated by this dictionary
+
+        $sp_empty_description = $translator->getTag('sp_empty_description');
+        $sp_list = [];
+
+        // Process consents for all SP
+        foreach ($all_sp_metadata as $sp_entityid => $sp_values) {
+            // Get metadata for SP
+            $sp_metadata = $metadata->getMetaData($sp_entityid, 'saml20-sp-remote');
+
+            // Run attribute filters
+            list($targeted_id, $attribute_hash, $attributes_new) = $this->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";
+                Logger::info('consentAdmin: changed');
+                // Check if consent is valid. (Possible that attributes has changed)
+                if ($user_consent[$targeted_id] == $attribute_hash) {
+                    Logger::info('consentAdmin: ok');
+                    $sp_status = "ok";
+                }
+                // Consent does not exist
+            } else {
+                Logger::info('consentAdmin: none');
+                $sp_status = "none";
+            }
+
+            // Set name of SP
+            if (isset($sp_values['name']) && is_array($sp_values['name'])) {
+                $sp_name = $sp_metadata['name'];
+            } else {
+                if (isset($sp_values['name']) && is_string($sp_values['name'])) {
+                    $sp_name = $sp_metadata['name'];
+                } elseif (isset($sp_values['OrganizationDisplayName']) && is_array($sp_values['OrganizationDisplayName'])) {
+                    $sp_name = $sp_metadata['OrganizationDisplayName'];
+                }
+            }
+
+            // Set description of SP
+            if (empty($sp_metadata['description']) || !is_array($sp_metadata['description'])) {
+                $sp_description = $sp_empty_description;
+            } else {
+                $sp_description = $sp_metadata['description'];
+            }
+
+            // Add a URL to the service if present in metadata
+            $sp_service_url = isset($sp_metadata['ServiceURL']) ? $sp_metadata['ServiceURL'] : null;
+
+            // Fill out array for the template
+            $sp_list[$sp_entityid] = [
+                'spentityid'       => $sp_entityid,
+                'name'             => $sp_name,
+                'description'      => $sp_description,
+                'consentStatus'    => $sp_status,
+                'consentValue'     => $sp_entityid,
+                'attributes_by_sp' => $attributes_new,
+                'serviceurl'       => $sp_service_url,
+            ];
+        }
+
+        $template->data['header'] = 'Consent Administration';
+        $template->data['spList'] = $sp_list;
+        $template->data['showDescription'] = $cA_config->getValue('showDescription');
+
+        return $template;
+    }
+
+
+    /**
+     * Runs the processing chain and ignores all filter which have user
+     * interaction.
+     *
+     * @param array $idp_metadata
+     * @param string $source
+     * @param array $sp_metadata
+     * @param string $sp_entityid
+     * @param array $attributes
+     * @param string $userid
+     * @param bool $hashAttributes
+     * @param array $excludeAttributes
+     * @return array
+     */
+    private function driveProcessingChain(
+        array $idp_metadata,
+        string $source,
+        array $sp_metadata,
+        string $sp_entityid,
+        array $attributes,
+        string $userid,
+        bool $hashAttributes = false,
+        array $excludeAttributes = []
+    ): array {
+        /*
+         * Create a new processing chain
+         */
+        $pc = new Auth\ProcessingChain($idp_metadata, $sp_metadata, 'idp');
+
+        /*
+         * Construct the state.
+         * REMEMBER: Do not set Return URL if you are calling processStatePassive
+         */
+        $authProcState = [
+            'Attributes'  => $attributes,
+            'Destination' => $sp_metadata,
+            'SPMetadata'  => $sp_metadata,
+            'Source'      => $idp_metadata,
+            'IdPMetadata' => $idp_metadata,
+            'isPassive'   => true,
+        ];
+
+        /* we're being bridged, so add that info to the state */
+        if (strpos($source, '-idp-remote|') !== false) {
+            /** @var int $i */
+            $i = strpos($source, '|');
+            $authProcState['saml:sp:IdP'] = substr($source, $i + 1);
+        }
+
+        /*
+         * Call processStatePAssive.
+         * We are not interested in any user interaction, only modifications to the attributes
+         */
+        $pc->processStatePassive($authProcState);
+
+        $attributes = $authProcState['Attributes'];
+        // Remove attributes that do not require consent/should be excluded
+        foreach ($attributes as $attrkey => $attrval) {
+            if (in_array($attrkey, $excludeAttributes)) {
+                unset($attributes[$attrkey]);
+            }
+        }
+
+        /*
+         * Generate identifiers and hashes
+         */
+        $destination = $sp_metadata['metadata-set'] . '|' . $sp_entityid;
+
+        $targeted_id = Consent::getTargetedID($userid, $source, $destination);
+        $attribute_hash = Consent::getAttributeHash($attributes, $hashAttributes);
+
+        Logger::info('consentAdmin: user: ' . $userid);
+        Logger::info('consentAdmin: target: ' . $targeted_id);
+        Logger::info('consentAdmin: attribute: ' . $attribute_hash);
+
+        // Return values
+        return [$targeted_id, $attribute_hash, $attributes];
+    }
+}
diff --git a/public/consentAdmin.php b/public/consentAdmin.php
deleted file mode 100644
index 64078e0..0000000
--- a/public/consentAdmin.php
+++ /dev/null
@@ -1,326 +0,0 @@
-<?php
-
-/*
- * consentAdmin - Consent administration module
- *
- * This module enables the user to add and remove consents given for a given
- * Service Provider.
- *
- * The module relies on methods and functions from the Consent module and can
- * not be user without it.
- *
- * Author: Mads Freek <freek@ruc.dk>, Jacob Christiansen <jach@wayf.dk>
- */
-
-/**
- * Runs the processing chain and ignores all filter which have user
- * interaction.
- *
- * @param array $idp_metadata
- * @param string $source
- * @param array $sp_metadata
- * @param string $sp_entityid
- * @param array $attributes
- * @param string $userid
- * @param bool $hashAttributes
- * @param array $excludeAttributes
- * @return array
- */
-function driveProcessingChain(
-    array $idp_metadata,
-    string $source,
-    array $sp_metadata,
-    string $sp_entityid,
-    array $attributes,
-    string $userid,
-    bool $hashAttributes = false,
-    array $excludeAttributes = []
-): array {
-    /*
-     * Create a new processing chain
-     */
-    $pc = new \SimpleSAML\Auth\ProcessingChain($idp_metadata, $sp_metadata, 'idp');
-
-    /*
-     * Construct the state.
-     * REMEMBER: Do not set Return URL if you are calling processStatePassive
-     */
-    $authProcState = [
-        'Attributes'  => $attributes,
-        'Destination' => $sp_metadata,
-        'SPMetadata'  => $sp_metadata,
-        'Source'      => $idp_metadata,
-        'IdPMetadata' => $idp_metadata,
-        'isPassive'   => true,
-    ];
-    /* we're being bridged, so add that info to the state */
-    if (strpos($source, '-idp-remote|') !== false) {
-        /** @var int $i */
-        $i = strpos($source, '|');
-        $authProcState['saml:sp:IdP'] = substr($source, $i + 1);
-    }
-
-    /*
-     * Call processStatePAssive.
-     * We are not interested in any user interaction, only modifications to the attributes
-     */
-    $pc->processStatePassive($authProcState);
-
-    $attributes = $authProcState['Attributes'];
-    // Remove attributes that do not require consent/should be excluded
-    foreach ($attributes as $attrkey => $attrval) {
-        if (in_array($attrkey, $excludeAttributes)) {
-            unset($attributes[$attrkey]);
-        }
-    }
-
-    /*
-     * Generate identifiers and hashes
-     */
-    $destination = $sp_metadata['metadata-set'] . '|' . $sp_entityid;
-
-    $targeted_id = \SimpleSAML\Module\consent\Auth\Process\Consent::getTargetedID($userid, $source, $destination);
-    $attribute_hash = \SimpleSAML\Module\consent\Auth\Process\Consent::getAttributeHash($attributes, $hashAttributes);
-
-    \SimpleSAML\Logger::info('consentAdmin: user: ' . $userid);
-    \SimpleSAML\Logger::info('consentAdmin: target: ' . $targeted_id);
-    \SimpleSAML\Logger::info('consentAdmin: attribute: ' . $attribute_hash);
-
-    // Return values
-    return [$targeted_id, $attribute_hash, $attributes];
-}
-
-// Get config object
-$config = \SimpleSAML\Configuration::getInstance();
-$cA_config = \SimpleSAML\Configuration::getConfig('module_consentAdmin.php');
-$authority = $cA_config->getValue('authority');
-
-$as = new \SimpleSAML\Auth\Simple($authority);
-
-// If request is a logout request
-if (array_key_exists('logout', $_REQUEST)) {
-    $returnURL = $cA_config->getValue('returnURL');
-    $as->logout($returnURL);
-}
-
-$hashAttributes = $cA_config->getValue('attributes.hash');
-
-$excludeAttributes = $cA_config->getOptionalValue('attributes.exclude', []);
-
-// Check if valid local session exists
-$as->requireAuth();
-
-// Get released attributes
-$attributes = $as->getAttributes();
-
-// Get metadata storage handler
-$metadata = \SimpleSAML\Metadata\MetaDataStorageHandler::getMetadataHandler();
-
-/*
- * Get IdP id and metadata
- */
-
-$idp_entityid = $metadata->getMetaDataCurrentEntityID('saml20-idp-hosted');
-$idp_metadata = $metadata->getMetaData($idp_entityid, 'saml20-idp-hosted');
-
-// Calc correct source
-if ($as->getAuthData('saml:sp:IdP') !== null) {
-    // from a remote idp (as bridge)
-    $source = 'saml20-idp-remote|' . $as->getAuthData('saml:sp:IdP');
-} else {
-    // from the local idp
-    $source = $idp_metadata['metadata-set'] . '|' . $idp_entityid;
-}
-
-// Get user ID
-if (isset($idp_metadata['userid.attribute']) && is_string($idp_metadata['userid.attribute'])) {
-    $userid_attributename = $idp_metadata['userid.attribute'];
-} else {
-    $userid_attributename = 'eduPersonPrincipalName';
-}
-
-$userids = $attributes[$userid_attributename];
-
-if (empty($userids)) {
-    throw new \Exception('Could not generate useridentifier for storing consent. Attribute [' .
-        $userid_attributename . '] was not available.');
-}
-
-$userid = $userids[0];
-
-// Get all SP metadata
-$all_sp_metadata = $metadata->getList('saml20-sp-remote');
-
-// Parse action, if any
-$action = null;
-$sp_entityid = null;
-if (!empty($_GET['cv'])) {
-    $sp_entityid = $_GET['cv'];
-}
-if (!empty($_GET['action'])) {
-    $action = $_GET["action"];
-}
-
-\SimpleSAML\Logger::critical('consentAdmin: sp: ' . $sp_entityid . ' action: ' . $action);
-
-// Remove services, which have consent disabled
-if (isset($idp_metadata['consent.disable'])) {
-    foreach ($idp_metadata['consent.disable'] as $disable) {
-        if (array_key_exists($disable, $all_sp_metadata)) {
-            unset($all_sp_metadata[$disable]);
-        }
-    }
-}
-
-\SimpleSAML\Logger::info('consentAdmin: ' . $idp_entityid);
-
-// Parse consent config
-$consent_storage = \SimpleSAML\Module\consent\Store::parseStoreConfig($cA_config->getValue('consentadmin'));
-
-// Calc correct user ID hash
-$hashed_user_id = \SimpleSAML\Module\consent\Auth\Process\Consent::getHashedUserID($userid, $source);
-
-// If a checkbox have been clicked
-if ($action !== null && $sp_entityid !== null) {
-    // init template to enable translation of status messages
-    $template = new \SimpleSAML\XHTML\Template(
-        $config,
-        'consentAdmin:consentadminajax.twig'
-    );
-    $translator = $template->getTranslator();
-
-    // Get SP metadata
-    $sp_metadata = $metadata->getMetaData($sp_entityid, 'saml20-sp-remote');
-
-    // Run AuthProc filters
-    list($targeted_id, $attribute_hash, $attributes_new) = driveProcessingChain(
-        $idp_metadata,
-        $source,
-        $sp_metadata,
-        $sp_entityid,
-        $attributes,
-        $userid,
-        $hashAttributes,
-        $excludeAttributes
-    );
-
-    // Add a consent (or update if attributes have changed and old consent for SP and IdP exists)
-    if ($action == 'true') {
-        $isStored = $consent_storage->saveConsent($hashed_user_id, $targeted_id, $attribute_hash);
-    } else {
-        if ($action == 'false') {
-            // Got consent, so this is a request to remove it
-            $rowcount = $consent_storage->deleteConsent($hashed_user_id, $targeted_id);
-            if ($rowcount > 0) {
-                $isStored = false;
-            } else {
-                throw new \Exception("Unknown action (should not happen)");
-            }
-        } else {
-            \SimpleSAML\Logger::info('consentAdmin: unknown action');
-            $isStored = null;
-        }
-    }
-    $template->data['isStored'] = $isStored;
-    $template->send();
-    exit;
-}
-
-// Get all consents for user
-$user_consent_list = $consent_storage->getConsents($hashed_user_id);
-
-// Parse list of consents
-$user_consent = [];
-foreach ($user_consent_list as $c) {
-    $user_consent[$c[0]] = $c[1];
-}
-
-$template_sp_content = [];
-
-// Init template
-$template = new \SimpleSAML\XHTML\Template($config, 'consentAdmin:consentadmin.twig');
-$translator = $template->getTranslator();
-$translator->includeLanguageFile('attributes'); // attribute listings translated by this dictionary
-
-$sp_empty_description = $translator->getTag('sp_empty_description');
-$sp_list = [];
-
-// Process consents for all SP
-foreach ($all_sp_metadata as $sp_entityid => $sp_values) {
-    // Get metadata for SP
-    $sp_metadata = $metadata->getMetaData($sp_entityid, 'saml20-sp-remote');
-
-    // Run attribute filters
-    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";
-        \SimpleSAML\Logger::info('consentAdmin: changed');
-        // Check if consent is valid. (Possible that attributes has changed)
-        if ($user_consent[$targeted_id] == $attribute_hash) {
-            \SimpleSAML\Logger::info('consentAdmin: ok');
-            $sp_status = "ok";
-        }
-        // Consent does not exist
-    } else {
-        SimpleSAML\Logger::info('consentAdmin: none');
-        $sp_status = "none";
-    }
-
-    // Set name of SP
-    if (isset($sp_values['name']) && is_array($sp_values['name'])) {
-        $sp_name = $sp_metadata['name'];
-    } else {
-        if (isset($sp_values['name']) && is_string($sp_values['name'])) {
-            $sp_name = $sp_metadata['name'];
-        } elseif (isset($sp_values['OrganizationDisplayName']) && is_array($sp_values['OrganizationDisplayName'])) {
-            $sp_name = $sp_metadata['OrganizationDisplayName'];
-        }
-    }
-
-    // Set description of SP
-    if (empty($sp_metadata['description']) || !is_array($sp_metadata['description'])) {
-        $sp_description = $sp_empty_description;
-    } else {
-        $sp_description = $sp_metadata['description'];
-    }
-
-    // Add a URL to the service if present in metadata
-    $sp_service_url = isset($sp_metadata['ServiceURL']) ? $sp_metadata['ServiceURL'] : null;
-
-    // Fill out array for the template
-    $sp_list[$sp_entityid] = [
-        'spentityid'       => $sp_entityid,
-        'name'             => $sp_name,
-        'description'      => $sp_description,
-        'consentStatus'    => $sp_status,
-        'consentValue'     => $sp_entityid,
-        'attributes_by_sp' => $attributes_new,
-        'serviceurl'       => $sp_service_url,
-    ];
-}
-
-$template->data['spList'] = $sp_list;
-$template->data['showDescription'] = $cA_config->getValue('showDescription');
-$template->send();
diff --git a/routing/routes/routes.yml b/routing/routes/routes.yml
new file mode 100644
index 0000000..2678f05
--- /dev/null
+++ b/routing/routes/routes.yml
@@ -0,0 +1,3 @@
+consentadmin-main:
+    path:       /
+    defaults:   { _controller: 'SimpleSAML\Module\consentadmin\Controller\ConsentAdmin::main' }

From 1a18edb85d61dc4405290e4e63c76a3fec84ba4d Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Fri, 10 Sep 2021 22:45:27 +0200
Subject: [PATCH 071/135] Fix autoloader

---
 composer.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/composer.json b/composer.json
index c033858..7d53e77 100644
--- a/composer.json
+++ b/composer.json
@@ -24,6 +24,11 @@
             "simplesamlphp/composer-module-installer": true
         }
     },
+    "autoload": {
+        "psr-4": {
+            "SimpleSAML\\Module\\consentadmin\\": "lib/"
+        }
+    },
     "autoload-dev": {
         "psr-4": {
             "SimpleSAML\\Test\\Utils\\": "vendor/simplesamlphp/simplesamlphp/tests/Utils"

From 548d4c3b5eef8b2cf463a885200885dce7f04cfc Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Sat, 11 Sep 2021 00:45:50 +0200
Subject: [PATCH 072/135] Add tests

---
 composer.json                             |   6 +-
 lib/Controller/ConsentAdmin.php           |  54 ++++-
 tests/lib/Controller/ConsentAdminTest.php | 250 ++++++++++++++++++++++
 3 files changed, 304 insertions(+), 6 deletions(-)
 create mode 100644 tests/lib/Controller/ConsentAdminTest.php

diff --git a/composer.json b/composer.json
index 7d53e77..4e5c3a3 100644
--- a/composer.json
+++ b/composer.json
@@ -37,13 +37,13 @@
     "require": {
         "php": "^8.0",
 
-        "simplesamlphp/assert": "^1.0.0",
-        "simplesamlphp/composer-module-installer": "^1.3.2",
+        "simplesamlphp/assert": "^1.0",
+        "simplesamlphp/composer-module-installer": "^1.3.4",
         "simplesamlphp/simplesamlphp": "*",
         "simplesamlphp/simplesamlphp-module-consent": "*"
     },
     "require-dev": {
-        "simplesamlphp/simplesamlphp-test-framework": "^1.5.4"
+        "simplesamlphp/simplesamlphp-test-framework": "^1.5.5"
     },
     "extra": {
         "ssp-mixedcase-module-name": "consentAdmin"
diff --git a/lib/Controller/ConsentAdmin.php b/lib/Controller/ConsentAdmin.php
index ee4234f..91370fb 100644
--- a/lib/Controller/ConsentAdmin.php
+++ b/lib/Controller/ConsentAdmin.php
@@ -30,6 +30,21 @@ class ConsentAdmin
     /** @var \SimpleSAML\Session */
     protected Session $session;
 
+    /** @var \SimpleSAML\Metadata\MetaDataStorageHandler */
+    protected MetaDataStorageHandler $metadataStorageHandler;
+
+    /**
+     * @var \SimpleSAML\Auth\Simple|string
+     * @psalm-var \SimpleSAML\Auth\Simple|class-string
+     */
+    protected $authSimple = Auth\Simple::class;
+
+    /**
+     * @var \SimpleSAML\Module\consent\Auth\Process\Consent|string
+     * @psalm-var \SimpleSAML\Module\consent\Auth\Process\Consent|class-string
+     */
+    protected $consent = Consent::class;
+
 
     /**
      * Controller constructor.
@@ -47,10 +62,43 @@ public function __construct(
     ) {
         $this->config = $config;
         $this->moduleConfig = Configuration::getConfig('module_consentAdmin.php');
+        $this->metadataStorageHandler = MetaDataStorageHandler::getMetadataHandler();
         $this->session = $session;
     }
 
 
+    /**
+     * Inject the \SimpleSAML\Auth\Simple dependency.
+     *
+     * @param \SimpleSAML\Auth\Simple $authSimple
+     */
+    public function setAuthSimple(Auth\Simple $authSimple): void
+    {
+        $this->authSimple = $authSimple;
+    }
+
+
+    /**
+     * Inject the \SimpleSAML\Metadata\MetaDataStorageHandler dependency.
+     *
+     * @param \SimpleSAML\Metadata\MetaDataStorageHandler $handler
+     */
+    public function setMetadataStorageHandler(MetadataStorageHandler $handler): void
+    {
+        $this->metadataStorageHandler = $handler;
+    }
+
+
+    /**
+     * Inject the \SimpleSAML\Module\consent\Auth\Process\Consent dependency.
+     *
+     * @param \SimpleSAML\Module\consent\Auth\Process\Consent $consent
+     */
+    public function setConsent(Consent $consent): void
+    {
+        $this->consent = $consent;
+    }
+
 
     /**
      * @param \Symfony\Component\HttpFoundation\Request $request The current request.
@@ -61,7 +109,7 @@ public function main(Request $request): Template
     {
         $authority = $this->moduleConfig->getValue('authority');
 
-        $as = new Auth\Simple($authority);
+        $as = new $this->authSimple($authority);
 
         // If request is a logout request
         $logout = $request->get('logout');
@@ -81,7 +129,7 @@ public function main(Request $request): Template
         $attributes = $as->getAttributes();
 
         // Get metadata storage handler
-        $metadata = MetaDataStorageHandler::getMetadataHandler();
+        $metadata = $this->metadataStorageHandler;
 
         /*
          * Get IdP id and metadata
@@ -139,7 +187,7 @@ public function main(Request $request): Template
         $consent_storage = Store::parseStoreConfig($this->moduleConfig->getValue('consentadmin'));
 
         // Calc correct user ID hash
-        $hashed_user_id = Consent::getHashedUserID($userid, $source);
+        $hashed_user_id = $this->consent::getHashedUserID($userid, $source);
 
         // If a checkbox have been clicked
         if ($action !== null && $sp_entityid !== null) {
diff --git a/tests/lib/Controller/ConsentAdminTest.php b/tests/lib/Controller/ConsentAdminTest.php
new file mode 100644
index 0000000..1a89c20
--- /dev/null
+++ b/tests/lib/Controller/ConsentAdminTest.php
@@ -0,0 +1,250 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\Test\Module\consentadmin\Controller;
+
+use Exception;
+use PHPUnit\Framework\TestCase;
+use SimpleSAML\Auth;
+use SimpleSAML\Configuration;
+use SimpleSAML\Metadata\MetaDataStorageHandler;
+use SimpleSAML\Module\consent\Auth\Process\Consent;
+use SimpleSAML\Module\consentadmin\Controller;
+use SimpleSAML\Session;
+use SimpleSAML\XHTML\Template;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * Set of tests for the controllers in the "consentadmin" module.
+ *
+ * @covers \SimpleSAML\Module\consentadmin\Controller\ConsentAdmin
+ */
+class ConsentAdminTest extends TestCase
+{
+    /** @var \SimpleSAML\Configuration */
+    protected Configuration $config;
+
+    /** @var \SimpleSAML\Session */
+    protected Session $session;
+
+    /** @var \SimpleSAML\Auth\Simple */
+    protected Auth\Simple $authSimple;
+
+    /** @var \SimpleSAML\Module\consent\Auth\Process\Consent */
+    protected Consent $consent;
+
+    /** @var \SimpleSAML\Metadata\MetaDataStorageHandler */
+    protected MetaDataStorageHandler $metadataStorageHandler;
+
+
+    /**
+     * Set up for each test.
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->config = Configuration::loadFromArray(
+            [
+                'secretsalt' => 'abc123',
+                'module.enable' => [
+                    'consent' => true,
+                    'consentadmin' => true,
+                    'exampleauth' => true,
+                ],
+            ],
+            '[ARRAY]',
+            'simplesaml'
+        );
+        Configuration::setPreLoadedConfig($this->config, 'config.php');
+
+        Configuration::setPreLoadedConfig(
+            Configuration::loadFromArray(
+                [
+                    'authority' => 'exampleauth',
+                    'consentadmin'  => [
+                        'consent:Database',
+                        'dsn'       =>  'mysql:host=DBHOST;dbname=DBNAME',
+                        'username'  =>  'USERNAME',
+                        'password'  =>  'PASSWORD',
+                    ],
+                ],
+                '[ARRAY]',
+                'simplesaml'
+            ),
+            'module_consentAdmin.php'
+        );
+
+        Configuration::setPreLoadedConfig(
+            Configuration::loadFromArray(
+                [
+                    'exampleauth' => [
+                        'exampleauth:StaticSource',
+                        'eduPersonPrincipalName' => ['testuser@simplesamlphp.org'],
+                    ],
+                ]
+            ),
+            'authsources.php'
+        );
+
+        $this->session = Session::getSessionFromRequest();
+
+        $this->authSimple = new class ('exampleauth') extends Auth\Simple {
+            public function logout($params = null): void
+            {
+                // stub
+            }
+            public function requireAuth(array $params = []): void
+            {
+                // stub
+            }
+            public function getAttributes(): array
+            {
+                return ['eduPersonPrincipalName' => 'tester'];
+            }
+            public function getAuthData(string $name = '')
+            {
+                if ($name === 'saml:sp:IdP') {
+                    return 'localhost';
+                }
+                return [];
+            }
+        };
+
+        $this->metadataStorageHandler = new class () extends MetaDataStorageHandler {
+            public function __construct()
+            {
+                // stub
+            }
+            public function getMetaDataCurrentEntityID(string $set, string $type = 'entityid'): string
+            {
+                return 'localhost/simplesaml';
+            }
+            public function getMetaData(?string $entityId, string $set): array
+            {
+                return ['userid.attribute'];
+            }
+            public function getList(string $set = 'saml20-idp-hosted', bool $showExpired = false): array
+            {
+                return [];
+            }
+        };
+
+        $this->consent = new class () extends Consent {
+            public static function getHashedUserID(): string
+            {
+                return 'abc123@simplesamlphp.org';
+            }
+        };
+    }
+
+
+    /**
+     * Test that accessing the main endpoint with action=true results in a Template
+     *
+     * @return void
+     */
+    public function testMainActionTrue(): void
+    {
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+        $_SERVER['REQUEST_URI'] = '/';
+
+        $request = Request::create(
+            '/',
+            'GET',
+            ['action' => 'true', 'cv' => 'urn:some:entity']
+        );
+
+        $c = new Controller\ConsentAdmin($this->config, $this->session);
+        $c->setAuthSimple($this->authSimple);
+        $c->setMetadataStorageHandler($this->metadataStorageHandler);
+        $c->setConsent($this->consent);
+        $result = $c->main($request);
+
+        $this->assertTrue($result->isSuccessful());
+        $this->assertInstanceOf(Template::class, $result);
+    }
+
+
+    /**
+     * Test that accessing the main endpoint with action=false results in a Template
+     *
+     * @return void
+     */
+    public function testMainActionFalse(): void
+    {
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+        $_SERVER['REQUEST_URI'] = '/';
+
+        $request = Request::create(
+            '/',
+            'GET',
+            ['action' => 'false', 'cv' => 'urn:some:entity']
+        );
+
+        $c = new Controller\ConsentAdmin($this->config, $this->session);
+        $c->setAuthSimple($this->authSimple);
+        $c->setMetadataStorageHandler($this->metadataStorageHandler);
+        $c->setConsent($this->consent);
+        $result = $c->main($request);
+
+        $this->assertTrue($result->isSuccessful());
+        $this->assertInstanceOf(Template::class, $result);
+    }
+
+
+    /**
+     * Test that accessing the main endpoint with unkown action throws an exception
+     *
+     * @return void
+     */
+    public function testMainActionUnknown(): void
+    {
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+        $_SERVER['REQUEST_URI'] = '/';
+
+        $request = Request::create(
+            '/',
+            'GET',
+            ['action' => 'unknown', 'cv' => 'urn:some:entity']
+        );
+
+        $c = new Controller\ConsentAdmin($this->config, $this->session);
+        $c->setAuthSimple($this->authSimple);
+        $c->setMetadataStorageHandler($this->metadataStorageHandler);
+        $c->setConsent($this->consent);
+
+        $this->expectException(Exception::class);
+        $this->expectExceptionMessage('Unknown action (should not happen)');
+
+        $c->main($request);
+    }
+
+
+    /**
+     * Test that accessing the main endpoint without action results in a Template
+     *
+     * @return void
+     */
+    public function testMainNoAction(): void
+    {
+        $request = Request::create(
+            '/',
+            'GET',
+            []
+        );
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+        $_SERVER['REQUEST_URI'] = '/';
+
+        $c = new Controller\ConsentAdmin($this->config, $this->session);
+        $c->setAuthSimple($this->authSimple);
+        $c->setMetadataStorageHandler($this->metadataStorageHandler);
+        $c->setConsent($this->consent);
+        $result = $c->main($request);
+
+        $this->assertTrue($result->isSuccessful());
+        $this->assertInstanceOf(Template::class, $result);
+    }
+
+}

From ad2455de4cb0dd05626f30fcb7b133827a418bbe Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Sat, 11 Sep 2021 00:47:07 +0200
Subject: [PATCH 073/135] Add tests

---
 tests/lib/Controller/ConsentAdminTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/lib/Controller/ConsentAdminTest.php b/tests/lib/Controller/ConsentAdminTest.php
index 1a89c20..1679e5e 100644
--- a/tests/lib/Controller/ConsentAdminTest.php
+++ b/tests/lib/Controller/ConsentAdminTest.php
@@ -132,7 +132,7 @@ public function getList(string $set = 'saml20-idp-hosted', bool $showExpired = f
         };
 
         $this->consent = new class () extends Consent {
-            public static function getHashedUserID(): string
+            public static function getHashedUserID(string $userid, string $source): string
             {
                 return 'abc123@simplesamlphp.org';
             }

From 2dacde08a969ca229cc1f197c7ef7b96af0d3614 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Sat, 11 Sep 2021 00:50:11 +0200
Subject: [PATCH 074/135] Fix signature

---
 tests/lib/Controller/ConsentAdminTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/lib/Controller/ConsentAdminTest.php b/tests/lib/Controller/ConsentAdminTest.php
index 1679e5e..dabe0cd 100644
--- a/tests/lib/Controller/ConsentAdminTest.php
+++ b/tests/lib/Controller/ConsentAdminTest.php
@@ -131,7 +131,7 @@ public function getList(string $set = 'saml20-idp-hosted', bool $showExpired = f
             }
         };
 
-        $this->consent = new class () extends Consent {
+        $this->consent = new class (array $config, $reserved) extends Consent {
             public static function getHashedUserID(string $userid, string $source): string
             {
                 return 'abc123@simplesamlphp.org';

From 87a2c09020ea333fec70bf3db56b773ef8592e19 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Sat, 11 Sep 2021 01:00:42 +0200
Subject: [PATCH 075/135] Fixes

---
 lib/Controller/ConsentAdmin.php           | 4 ++--
 tests/lib/Controller/ConsentAdminTest.php | 8 +++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/lib/Controller/ConsentAdmin.php b/lib/Controller/ConsentAdmin.php
index 91370fb..5987944 100644
--- a/lib/Controller/ConsentAdmin.php
+++ b/lib/Controller/ConsentAdmin.php
@@ -193,7 +193,7 @@ public function main(Request $request): Template
         if ($action !== null && $sp_entityid !== null) {
             // init template to enable translation of status messages
             $template = new Template(
-                $config,
+                $this->config,
                 'consentAdmin:consentadminajax.twig',
                 'consentAdmin:consentadmin'
             );
@@ -247,7 +247,7 @@ public function main(Request $request): Template
         $template_sp_content = [];
 
         // Init template
-        $template = new Template($config, 'consentAdmin:consentadmin.twig', 'consentAdmin:consentadmin');
+        $template = new Template($this->config, 'consentAdmin:consentadmin.twig', 'consentAdmin:consentadmin');
         $translator = $template->getTranslator();
         $translator->includeLanguageFile('attributes'); // attribute listings translated by this dictionary
 
diff --git a/tests/lib/Controller/ConsentAdminTest.php b/tests/lib/Controller/ConsentAdminTest.php
index dabe0cd..9ce847f 100644
--- a/tests/lib/Controller/ConsentAdminTest.php
+++ b/tests/lib/Controller/ConsentAdminTest.php
@@ -50,7 +50,7 @@ protected function setUp(): void
                 'secretsalt' => 'abc123',
                 'module.enable' => [
                     'consent' => true,
-                    'consentadmin' => true,
+                    'consentAdmin' => true,
                     'exampleauth' => true,
                 ],
             ],
@@ -65,9 +65,7 @@ protected function setUp(): void
                     'authority' => 'exampleauth',
                     'consentadmin'  => [
                         'consent:Database',
-                        'dsn'       =>  'mysql:host=DBHOST;dbname=DBNAME',
-                        'username'  =>  'USERNAME',
-                        'password'  =>  'PASSWORD',
+                        'dsn'       =>  'sqlite::memory:',
                     ],
                 ],
                 '[ARRAY]',
@@ -131,7 +129,7 @@ public function getList(string $set = 'saml20-idp-hosted', bool $showExpired = f
             }
         };
 
-        $this->consent = new class (array $config, $reserved) extends Consent {
+        $this->consent = new class (['identifyingAttribute' => 'eduPersonPrincipal'], null) extends Consent {
             public static function getHashedUserID(string $userid, string $source): string
             {
                 return 'abc123@simplesamlphp.org';

From d5a7eee480ff95324c0a158fe1560c1bb0ed025e Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Sat, 11 Sep 2021 16:17:44 +0200
Subject: [PATCH 076/135] Fix mixed case module name for unit tests

---
 tests/bootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 2efdf78..be77a88 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -4,7 +4,7 @@
 require_once($projectRoot . '/vendor/autoload.php');
 
 // Symlink module into ssp vendor lib so that templates and urls can resolve correctly
-$linkPath = $projectRoot . '/vendor/simplesamlphp/simplesamlphp/modules/consentadmin';
+$linkPath = $projectRoot . '/vendor/simplesamlphp/simplesamlphp/modules/consentAdmin';
 if (file_exists($linkPath) === false) {
     echo "Linking '$linkPath' to '$projectRoot'\n";
     symlink($projectRoot, $linkPath);

From 52b251741b9241df15495dc8aed7aaa2ef14725f Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Sat, 11 Sep 2021 16:46:28 +0200
Subject: [PATCH 077/135] Remove rowCount-check.. It won't work on all database
 backends (like sqlite)

---
 lib/Controller/ConsentAdmin.php           | 20 ++++++++------------
 tests/lib/Controller/ConsentAdminTest.php | 19 +++++++++++--------
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/lib/Controller/ConsentAdmin.php b/lib/Controller/ConsentAdmin.php
index 5987944..1e8ab4b 100644
--- a/lib/Controller/ConsentAdmin.php
+++ b/lib/Controller/ConsentAdmin.php
@@ -118,7 +118,7 @@ public function main(Request $request): Template
             $as->logout($returnURL);
         }
 
-        $hashAttributes = $this->moduleConfig->getValue('attributes.hash');
+        $hashAttributes = $this->moduleConfig->getValue('attributes.hash', false);
 
         $excludeAttributes = $this->moduleConfig->getValue('attributes.exclude', []);
 
@@ -220,12 +220,8 @@ public function main(Request $request): Template
             } else {
                 if ($action == 'false') {
                     // Got consent, so this is a request to remove it
-                    $rowcount = $consent_storage->deleteConsent($hashed_user_id, $targeted_id);
-                    if ($rowcount > 0) {
-                        $isStored = false;
-                    } else {
-                        throw new Exception("Unknown action (should not happen)");
-                    }
+                    $consent_storage->deleteConsent($hashed_user_id, $targeted_id);
+                    $isStored = false;
                 } else {
                     Logger::info('consentAdmin: unknown action');
                     $isStored = null;
@@ -332,7 +328,7 @@ public function main(Request $request): Template
 
         $template->data['header'] = 'Consent Administration';
         $template->data['spList'] = $sp_list;
-        $template->data['showDescription'] = $cA_config->getValue('showDescription');
+        $template->data['showDescription'] = $this->moduleConfig->getValue('showDescription');
 
         return $template;
     }
@@ -359,8 +355,8 @@ private function driveProcessingChain(
         string $sp_entityid,
         array $attributes,
         string $userid,
-        bool $hashAttributes = false,
-        array $excludeAttributes = []
+        bool $hashAttributes,
+        array $excludeAttributes
     ): array {
         /*
          * Create a new processing chain
@@ -406,8 +402,8 @@ private function driveProcessingChain(
          */
         $destination = $sp_metadata['metadata-set'] . '|' . $sp_entityid;
 
-        $targeted_id = Consent::getTargetedID($userid, $source, $destination);
-        $attribute_hash = Consent::getAttributeHash($attributes, $hashAttributes);
+        $targeted_id = $this->consent::getTargetedID($userid, $source, $destination);
+        $attribute_hash = $this->consent::getAttributeHash($attributes, $hashAttributes);
 
         Logger::info('consentAdmin: user: ' . $userid);
         Logger::info('consentAdmin: target: ' . $targeted_id);
diff --git a/tests/lib/Controller/ConsentAdminTest.php b/tests/lib/Controller/ConsentAdminTest.php
index 9ce847f..fb3e0ba 100644
--- a/tests/lib/Controller/ConsentAdminTest.php
+++ b/tests/lib/Controller/ConsentAdminTest.php
@@ -63,9 +63,9 @@ protected function setUp(): void
             Configuration::loadFromArray(
                 [
                     'authority' => 'exampleauth',
-                    'consentadmin'  => [
+                    'consentadmin' => [
                         'consent:Database',
-                        'dsn'       =>  'sqlite::memory:',
+                        'dsn' =>  'sqlite::memory:',
                     ],
                 ],
                 '[ARRAY]',
@@ -121,7 +121,7 @@ public function getMetaDataCurrentEntityID(string $set, string $type = 'entityid
             }
             public function getMetaData(?string $entityId, string $set): array
             {
-                return ['userid.attribute'];
+                return ['entityid' => 'localhost/simplesaml', 'metadata-set' => 'saml20-idp-hosted'];
             }
             public function getList(string $set = 'saml20-idp-hosted', bool $showExpired = false): array
             {
@@ -134,6 +134,10 @@ public static function getHashedUserID(string $userid, string $source): string
             {
                 return 'abc123@simplesamlphp.org';
             }
+            public static function getTargetedID(string $userid, string $source, string $destination): string
+            {
+                return hash('sha1', 'abc123@simplesamlphp.org');
+            }
         };
     }
 
@@ -193,7 +197,7 @@ public function testMainActionFalse(): void
 
 
     /**
-     * Test that accessing the main endpoint with unkown action throws an exception
+     * Test that accessing the main endpoint with unkown action results in a Template
      *
      * @return void
      */
@@ -212,11 +216,10 @@ public function testMainActionUnknown(): void
         $c->setAuthSimple($this->authSimple);
         $c->setMetadataStorageHandler($this->metadataStorageHandler);
         $c->setConsent($this->consent);
+        $result = $c->main($request);
 
-        $this->expectException(Exception::class);
-        $this->expectExceptionMessage('Unknown action (should not happen)');
-
-        $c->main($request);
+        $this->assertTrue($result->isSuccessful());
+        $this->assertInstanceOf(Template::class, $result);
     }
 
 

From 0e93e4f60b4f15ddccc2892d418b5d97f74ba72c Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Sat, 11 Sep 2021 17:12:26 +0200
Subject: [PATCH 078/135] Disable tests

---
 tests/lib/Controller/ConsentAdminTest.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/tests/lib/Controller/ConsentAdminTest.php b/tests/lib/Controller/ConsentAdminTest.php
index fb3e0ba..904519f 100644
--- a/tests/lib/Controller/ConsentAdminTest.php
+++ b/tests/lib/Controller/ConsentAdminTest.php
@@ -5,6 +5,7 @@
 namespace SimpleSAML\Test\Module\consentadmin\Controller;
 
 use Exception;
+use PDO;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Auth;
 use SimpleSAML\Configuration;
@@ -149,6 +150,8 @@ public static function getTargetedID(string $userid, string $source, string $des
      */
     public function testMainActionTrue(): void
     {
+        $this->markTestSkipped();
+
         $_SERVER['REQUEST_METHOD'] = 'GET';
         $_SERVER['REQUEST_URI'] = '/';
 
@@ -176,6 +179,8 @@ public function testMainActionTrue(): void
      */
     public function testMainActionFalse(): void
     {
+        $this->markTestSkipped();
+
         $_SERVER['REQUEST_METHOD'] = 'GET';
         $_SERVER['REQUEST_URI'] = '/';
 
@@ -230,13 +235,16 @@ public function testMainActionUnknown(): void
      */
     public function testMainNoAction(): void
     {
+        $this->markTestSkipped();
+
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+        $_SERVER['REQUEST_URI'] = '/';
+
         $request = Request::create(
             '/',
             'GET',
             []
         );
-        $_SERVER['REQUEST_METHOD'] = 'GET';
-        $_SERVER['REQUEST_URI'] = '/';
 
         $c = new Controller\ConsentAdmin($this->config, $this->session);
         $c->setAuthSimple($this->authSimple);

From a0ddf910a8b564ecb010d0bb8ed6868451485461 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Sun, 12 Sep 2021 23:40:51 +0200
Subject: [PATCH 079/135] Remove use of getTag

---
 lib/Controller/ConsentAdmin.php           | 27 +++++++++---
 templates/consentadmin.twig               |  4 +-
 tests/lib/Controller/ConsentAdminTest.php | 52 +++++++++++++++++++----
 3 files changed, 67 insertions(+), 16 deletions(-)

diff --git a/lib/Controller/ConsentAdmin.php b/lib/Controller/ConsentAdmin.php
index 1e8ab4b..80aa7c3 100644
--- a/lib/Controller/ConsentAdmin.php
+++ b/lib/Controller/ConsentAdmin.php
@@ -45,6 +45,12 @@ class ConsentAdmin
      */
     protected $consent = Consent::class;
 
+    /**
+     * @var \SimpleSAML\Module\consent\Store|string
+     * @psalm-var \SimpleSAML\Module\consent\Store|class-string
+     */
+    protected $store = Store::class;
+
 
     /**
      * Controller constructor.
@@ -67,6 +73,17 @@ public function __construct(
     }
 
 
+    /**
+     * Inject the \SimpleSAML\Module\consent\Store dependency.
+     *
+     * @param \SimpleSAML\Module\consent\Store $store
+     */
+    public function setStore(Store $store): void
+    {
+        $this->store = $store;
+    }
+
+
     /**
      * Inject the \SimpleSAML\Auth\Simple dependency.
      *
@@ -184,7 +201,7 @@ public function main(Request $request): Template
         Logger::info('consentAdmin: ' . $idp_entityid);
 
         // Parse consent config
-        $consent_storage = Store::parseStoreConfig($this->moduleConfig->getValue('consentadmin'));
+        $consent_storage = $this->store::parseStoreConfig($this->moduleConfig->getValue('consentadmin'));
 
         // Calc correct user ID hash
         $hashed_user_id = $this->consent::getHashedUserID($userid, $source);
@@ -244,10 +261,9 @@ public function main(Request $request): Template
 
         // Init template
         $template = new Template($this->config, 'consentAdmin:consentadmin.twig', 'consentAdmin:consentadmin');
+        $template->getLocalization()->addAttributeDomains();
         $translator = $template->getTranslator();
-        $translator->includeLanguageFile('attributes'); // attribute listings translated by this dictionary
 
-        $sp_empty_description = $translator->getTag('sp_empty_description');
         $sp_list = [];
 
         // Process consents for all SP
@@ -305,9 +321,8 @@ public function main(Request $request): Template
             }
 
             // Set description of SP
-            if (empty($sp_metadata['description']) || !is_array($sp_metadata['description'])) {
-                $sp_description = $sp_empty_description;
-            } else {
+            $sp_description = null;
+            if (!empty($sp_metadata['description']) && is_array($sp_metadata['description'])) {
                 $sp_description = $sp_metadata['description'];
             }
 
diff --git a/templates/consentadmin.twig b/templates/consentadmin.twig
index a5bbbce..ab14c68 100644
--- a/templates/consentadmin.twig
+++ b/templates/consentadmin.twig
@@ -31,7 +31,7 @@
     <tr class="{{ rowClass }}">
         <td>
             <span class='caSPName'>
-                <span title='{{ spValues.description|translateFromArray|escape('html') }}'>
+                <span title='{{ spValues.description|translateFromArray|default('(no description)')|escape('html') }}'>
                 {% if spValues.serviceurl is defined %}
                     {{ spValues.name|translateFromArray|default(spName)|escape('html') }}
                 {% else %}
@@ -48,7 +48,7 @@
         <td class="caAttributes">
             <div id="attributes_{{ loop.index0 }}">
             {% if showDescription %}
-                <p>{{ '{consentAdmin:consentadmin:consentadmin_purpose}'|trans }}{{ spValues.description|translateFromArray|escape('html') }}</p>
+                <p>{{ '{consentAdmin:consentadmin:consentadmin_purpose}'|trans }}{{ spValues.description|translateFromArray|default('(no description)')|escape('html') }}</p>
             {% endif %}
                 <ul>
                 {% for attrName, attrValue in spValues.attributes_by_sp %}
diff --git a/tests/lib/Controller/ConsentAdminTest.php b/tests/lib/Controller/ConsentAdminTest.php
index 904519f..dd48973 100644
--- a/tests/lib/Controller/ConsentAdminTest.php
+++ b/tests/lib/Controller/ConsentAdminTest.php
@@ -11,6 +11,8 @@
 use SimpleSAML\Configuration;
 use SimpleSAML\Metadata\MetaDataStorageHandler;
 use SimpleSAML\Module\consent\Auth\Process\Consent;
+use SimpleSAML\Module\consent\Consent\Store\Database;
+use SimpleSAML\Module\consent\Store;
 use SimpleSAML\Module\consentadmin\Controller;
 use SimpleSAML\Session;
 use SimpleSAML\XHTML\Template;
@@ -35,6 +37,9 @@ class ConsentAdminTest extends TestCase
     /** @var \SimpleSAML\Module\consent\Auth\Process\Consent */
     protected Consent $consent;
 
+    /** @var \SimpleSAML\Module\consent\Store */
+    protected Store $store;
+
     /** @var \SimpleSAML\Metadata\MetaDataStorageHandler */
     protected MetaDataStorageHandler $metadataStorageHandler;
 
@@ -66,7 +71,7 @@ protected function setUp(): void
                     'authority' => 'exampleauth',
                     'consentadmin' => [
                         'consent:Database',
-                        'dsn' =>  'sqlite::memory:',
+                        'dsn' => 'sqlite::memory:',
                     ],
                 ],
                 '[ARRAY]',
@@ -140,6 +145,41 @@ public static function getTargetedID(string $userid, string $source, string $des
                 return hash('sha1', 'abc123@simplesamlphp.org');
             }
         };
+
+        $this->store = new class([]) extends Store {
+            public function __construct()
+            {
+                // stub
+            }
+            public function saveConsent(string $userId, string $destinationId, string $attributeSet): bool {
+                 return true;
+            }
+            public function deleteConsent(string $hashed_user_id, string $targeted_id): int {
+                return 1;
+            }
+            public function getConsents(string $userId): array {
+                return [];
+            }
+            public function hasConsent(string $userId, string $destinationId, string $attributeSet): bool {
+                return true;
+            }
+            public static function parseStoreConfig($config): Store {
+                return new class($config) extends Database {
+                    public function saveConsent(string $userId, string $destinationId, string $attributeSet): bool {
+                        return true;
+                    }
+                    public function deleteConsent(string $hashed_user_id, string $targeted_id): int {
+                        return 1;
+                    }
+                    public function getConsents(string $userId): array {
+                        return [];
+                    }
+                    public function hasConsent(string $userId, string $destinationId, string $attributeSet): bool {
+                        return true;
+                    }
+                };
+            }
+        };
     }
 
 
@@ -150,8 +190,6 @@ public static function getTargetedID(string $userid, string $source, string $des
      */
     public function testMainActionTrue(): void
     {
-        $this->markTestSkipped();
-
         $_SERVER['REQUEST_METHOD'] = 'GET';
         $_SERVER['REQUEST_URI'] = '/';
 
@@ -165,6 +203,7 @@ public function testMainActionTrue(): void
         $c->setAuthSimple($this->authSimple);
         $c->setMetadataStorageHandler($this->metadataStorageHandler);
         $c->setConsent($this->consent);
+        $c->setStore($this->store);
         $result = $c->main($request);
 
         $this->assertTrue($result->isSuccessful());
@@ -179,8 +218,6 @@ public function testMainActionTrue(): void
      */
     public function testMainActionFalse(): void
     {
-        $this->markTestSkipped();
-
         $_SERVER['REQUEST_METHOD'] = 'GET';
         $_SERVER['REQUEST_URI'] = '/';
 
@@ -194,6 +231,7 @@ public function testMainActionFalse(): void
         $c->setAuthSimple($this->authSimple);
         $c->setMetadataStorageHandler($this->metadataStorageHandler);
         $c->setConsent($this->consent);
+        $c->setStore($this->store);
         $result = $c->main($request);
 
         $this->assertTrue($result->isSuccessful());
@@ -235,8 +273,6 @@ public function testMainActionUnknown(): void
      */
     public function testMainNoAction(): void
     {
-        $this->markTestSkipped();
-
         $_SERVER['REQUEST_METHOD'] = 'GET';
         $_SERVER['REQUEST_URI'] = '/';
 
@@ -250,10 +286,10 @@ public function testMainNoAction(): void
         $c->setAuthSimple($this->authSimple);
         $c->setMetadataStorageHandler($this->metadataStorageHandler);
         $c->setConsent($this->consent);
+        $c->setStore($this->store);
         $result = $c->main($request);
 
         $this->assertTrue($result->isSuccessful());
         $this->assertInstanceOf(Template::class, $result);
     }
-
 }

From ef486ac364a50c3e2a4a0a7a39901a9bb5dbbc0d Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Mon, 13 Sep 2021 00:08:05 +0200
Subject: [PATCH 080/135] Remove call to getAttributeTranslation + few fixes

---
 lib/Controller/ConsentAdmin.php | 31 +++++++++++--------------------
 templates/consentadmin.twig     |  2 +-
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/lib/Controller/ConsentAdmin.php b/lib/Controller/ConsentAdmin.php
index 80aa7c3..1fa52bf 100644
--- a/lib/Controller/ConsentAdmin.php
+++ b/lib/Controller/ConsentAdmin.php
@@ -27,6 +27,9 @@ class ConsentAdmin
     /** @var \SimpleSAML\Configuration */
     protected Configuration $config;
 
+    /** @var \SimpleSAML\Configuration */
+    protected Configuration $moduleConfig;
+
     /** @var \SimpleSAML\Session */
     protected Session $session;
 
@@ -214,13 +217,12 @@ public function main(Request $request): Template
                 'consentAdmin:consentadminajax.twig',
                 'consentAdmin:consentadmin'
             );
-            $translator = $template->getTranslator();
 
             // Get SP metadata
             $sp_metadata = $metadata->getMetaData($sp_entityid, 'saml20-sp-remote');
 
             // Run AuthProc filters
-            list($targeted_id, $attribute_hash, $attributes_new) = $this->driveProcessingChain(
+            list($targeted_id, $attribute_hash, $attributes) = $this->driveProcessingChain(
                 $idp_metadata,
                 $source,
                 $sp_metadata,
@@ -272,7 +274,7 @@ public function main(Request $request): Template
             $sp_metadata = $metadata->getMetaData($sp_entityid, 'saml20-sp-remote');
 
             // Run attribute filters
-            list($targeted_id, $attribute_hash, $attributes_new) = $this->driveProcessingChain(
+            list($targeted_id, $attribute_hash, $attributes) = $this->driveProcessingChain(
                 $idp_metadata,
                 $source,
                 $sp_metadata,
@@ -283,17 +285,6 @@ public function main(Request $request): Template
                 $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";
@@ -312,12 +303,12 @@ public function main(Request $request): Template
             // Set name of SP
             if (isset($sp_values['name']) && is_array($sp_values['name'])) {
                 $sp_name = $sp_metadata['name'];
+            } elseif (isset($sp_values['name']) && is_string($sp_values['name'])) {
+                $sp_name = $sp_metadata['name'];
+            } elseif (isset($sp_values['OrganizationDisplayName']) && is_array($sp_values['OrganizationDisplayName'])) {
+                $sp_name = $sp_metadata['OrganizationDisplayName'];
             } else {
-                if (isset($sp_values['name']) && is_string($sp_values['name'])) {
-                    $sp_name = $sp_metadata['name'];
-                } elseif (isset($sp_values['OrganizationDisplayName']) && is_array($sp_values['OrganizationDisplayName'])) {
-                    $sp_name = $sp_metadata['OrganizationDisplayName'];
-                }
+                $sp_name = $sp_entityid;
             }
 
             // Set description of SP
@@ -336,7 +327,7 @@ public function main(Request $request): Template
                 'description'      => $sp_description,
                 'consentStatus'    => $sp_status,
                 'consentValue'     => $sp_entityid,
-                'attributes_by_sp' => $attributes_new,
+                'attributes_by_sp' => $attributes,
                 'serviceurl'       => $sp_service_url,
             ];
         }
diff --git a/templates/consentadmin.twig b/templates/consentadmin.twig
index ab14c68..d88feb7 100644
--- a/templates/consentadmin.twig
+++ b/templates/consentadmin.twig
@@ -53,7 +53,7 @@
                 <ul>
                 {% for attrName, attrValue in spValues.attributes_by_sp %}
                 {% if attrValue|length > 1 %}
-                    <li>{{ attrName|escape('html') }}:
+                    <li>{{ attrName|trans|escape('html') }}:
                         <ul>
                         {% for valKey, value in attrValue %}
                             <li>{{ value|escape('html') }}</li>

From a05c97fe8eae083dc0bd090dbb24eeb9f17b9a59 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Mon, 13 Sep 2021 00:16:18 +0200
Subject: [PATCH 081/135] Remove dead code

---
 lib/Controller/ConsentAdmin.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/Controller/ConsentAdmin.php b/lib/Controller/ConsentAdmin.php
index 1fa52bf..164b20f 100644
--- a/lib/Controller/ConsentAdmin.php
+++ b/lib/Controller/ConsentAdmin.php
@@ -259,12 +259,9 @@ public function main(Request $request): Template
            $user_consent[$c[0]] = $c[1];
         }
 
-        $template_sp_content = [];
-
         // Init template
         $template = new Template($this->config, 'consentAdmin:consentadmin.twig', 'consentAdmin:consentadmin');
         $template->getLocalization()->addAttributeDomains();
-        $translator = $template->getTranslator();
 
         $sp_list = [];
 

From a25afbc6e8415195dc429f2ee061ef292527d6ef Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Mon, 13 Sep 2021 00:17:59 +0200
Subject: [PATCH 082/135] Spacing

---
 lib/Controller/ConsentAdmin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Controller/ConsentAdmin.php b/lib/Controller/ConsentAdmin.php
index 164b20f..9d69a9b 100644
--- a/lib/Controller/ConsentAdmin.php
+++ b/lib/Controller/ConsentAdmin.php
@@ -256,7 +256,7 @@ public function main(Request $request): Template
         // Parse list of consents
         $user_consent = [];
         foreach ($user_consent_list as $c) {
-           $user_consent[$c[0]] = $c[1];
+            $user_consent[$c[0]] = $c[1];
         }
 
         // Init template

From f03924af0d8351e73eab8943b3ed7d937eb595e8 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Tue, 14 Sep 2021 21:07:15 +0200
Subject: [PATCH 083/135] Reduce log level on simple notification

---
 lib/Controller/ConsentAdmin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Controller/ConsentAdmin.php b/lib/Controller/ConsentAdmin.php
index 9d69a9b..1c48468 100644
--- a/lib/Controller/ConsentAdmin.php
+++ b/lib/Controller/ConsentAdmin.php
@@ -190,7 +190,7 @@ public function main(Request $request): Template
         $sp_entityid = $request->get('cv');;
         $action = $request->get('action');
 
-        Logger::critical('consentAdmin: sp: ' . $sp_entityid . ' action: ' . $action);
+        Logger::notice('consentAdmin: sp: ' . $sp_entityid . ' action: ' . $action);
 
         // Remove services, whitch have consent disabled
         if (isset($idp_metadata['consent.disable'])) {

From 058ddd2afd4d34d01f725f9bde6f2da5bb2d640f Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Tue, 17 Oct 2023 21:37:53 +0200
Subject: [PATCH 084/135] Address comments

---
 config-templates/module_consentAdmin.php |  3 ++
 {lib => src}/Controller/ConsentAdmin.php | 36 +++++++++---------------
 2 files changed, 17 insertions(+), 22 deletions(-)
 rename {lib => src}/Controller/ConsentAdmin.php (92%)

diff --git a/config-templates/module_consentAdmin.php b/config-templates/module_consentAdmin.php
index 9f68648..976b4e5 100644
--- a/config-templates/module_consentAdmin.php
+++ b/config-templates/module_consentAdmin.php
@@ -31,4 +31,7 @@
 
     // Set authority
     'authority' => 'saml2',
+
+    // The attribute to use as user identifier (defaults to eduPersonPrincipalName
+    'identifyingAttribute' => 'eduPersonPrincipalName',
 ];
diff --git a/lib/Controller/ConsentAdmin.php b/src/Controller/ConsentAdmin.php
similarity index 92%
rename from lib/Controller/ConsentAdmin.php
rename to src/Controller/ConsentAdmin.php
index 1c48468..bc5dcb2 100644
--- a/lib/Controller/ConsentAdmin.php
+++ b/src/Controller/ConsentAdmin.php
@@ -15,6 +15,14 @@
 use SimpleSAML\XHTML\Template;
 use Symfony\Component\HttpFoundation\Request;
 
+use function array_key_exists;
+use function in_array;
+use function is_array;
+use function is_string;
+use function sprintf;
+use function strpos;
+use function substr;
+
 /**
  * Controller class for the consentadmin module.
  *
@@ -138,9 +146,9 @@ public function main(Request $request): Template
             $as->logout($returnURL);
         }
 
-        $hashAttributes = $this->moduleConfig->getValue('attributes.hash', false);
+        $hashAttributes = $this->moduleConfig->getOptionalValue('attributes.hash', false);
 
-        $excludeAttributes = $this->moduleConfig->getValue('attributes.exclude', []);
+        $excludeAttributes = $this->moduleConfig->getOptionalValue('attributes.exclude', []);
 
         // Check if valid local session exists
         $as->requireAuth();
@@ -167,12 +175,7 @@ public function main(Request $request): Template
         }
 
         // Get user ID
-        if (isset($idp_metadata['userid.attribute']) && is_string($idp_metadata['userid.attribute'])) {
-            $userid_attributename = $idp_metadata['userid.attribute'];
-        } else {
-            $userid_attributename = 'eduPersonPrincipalName';
-        }
-
+        $userid_attributename = $cA_config->getOptionalString('identifyingAttribute', 'eduPersonPrincipalName');
         $userids = $attributes[$userid_attributename];
 
         if (empty($userids)) {
@@ -187,8 +190,8 @@ public function main(Request $request): Template
         // Get all SP metadata
         $all_sp_metadata = $metadata->getList('saml20-sp-remote');
 
-        $sp_entityid = $request->get('cv');;
-        $action = $request->get('action');
+        $sp_entityid = $request->query->get('cv');;
+        $action = $request->query->get('action');
 
         Logger::notice('consentAdmin: sp: ' . $sp_entityid . ' action: ' . $action);
 
@@ -297,17 +300,6 @@ public function main(Request $request): Template
                 $sp_status = "none";
             }
 
-            // Set name of SP
-            if (isset($sp_values['name']) && is_array($sp_values['name'])) {
-                $sp_name = $sp_metadata['name'];
-            } elseif (isset($sp_values['name']) && is_string($sp_values['name'])) {
-                $sp_name = $sp_metadata['name'];
-            } elseif (isset($sp_values['OrganizationDisplayName']) && is_array($sp_values['OrganizationDisplayName'])) {
-                $sp_name = $sp_metadata['OrganizationDisplayName'];
-            } else {
-                $sp_name = $sp_entityid;
-            }
-
             // Set description of SP
             $sp_description = null;
             if (!empty($sp_metadata['description']) && is_array($sp_metadata['description'])) {
@@ -320,7 +312,7 @@ public function main(Request $request): Template
             // Fill out array for the template
             $sp_list[$sp_entityid] = [
                 'spentityid'       => $sp_entityid,
-                'name'             => $sp_name,
+                'name'             => $template->getEntityDisplayName($sp_metadata),
                 'description'      => $sp_description,
                 'consentStatus'    => $sp_status,
                 'consentValue'     => $sp_entityid,

From 9c42f9749e48dac060d61444232ed72fda407be8 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Tue, 17 Oct 2023 22:12:44 +0200
Subject: [PATCH 085/135] Refactor logout-code

---
 routing/routes/routes.yml       |  6 ++++++
 src/Controller/ConsentAdmin.php | 25 +++++++++++++++----------
 templates/consentadmin.twig     |  2 +-
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/routing/routes/routes.yml b/routing/routes/routes.yml
index 2678f05..35d20c5 100644
--- a/routing/routes/routes.yml
+++ b/routing/routes/routes.yml
@@ -1,3 +1,9 @@
 consentadmin-main:
     path:       /
     defaults:   { _controller: 'SimpleSAML\Module\consentadmin\Controller\ConsentAdmin::main' }
+    methods: [GET]
+
+consentadmin-logout:
+    path:       /logout
+    defaults:   { _controller: 'SimpleSAML\Module\consentadmin\Controller\ConsentAdmin::logout' }
+    methods: [GET]
diff --git a/src/Controller/ConsentAdmin.php b/src/Controller/ConsentAdmin.php
index bc5dcb2..cacb25c 100644
--- a/src/Controller/ConsentAdmin.php
+++ b/src/Controller/ConsentAdmin.php
@@ -131,26 +131,31 @@ public function setConsent(Consent $consent): void
     /**
      * @param \Symfony\Component\HttpFoundation\Request $request The current request.
      *
-     * @return \SimpleSAML\XHTML\Template
+     * @return void
      */
-    public function main(Request $request): Template
+    public function logout(Request $request): void
     {
         $authority = $this->moduleConfig->getValue('authority');
-
         $as = new $this->authSimple($authority);
 
-        // If request is a logout request
-        $logout = $request->get('logout');
-        if ($logout !== null) {
-            $returnURL = $this->moduleConfig->getValue('returnURL');
-            $as->logout($returnURL);
-        }
+        $returnURL = $this->moduleConfig->getValue('returnURL');
+        $as->logout($returnURL);
+    }
 
-        $hashAttributes = $this->moduleConfig->getOptionalValue('attributes.hash', false);
 
+    /**
+     * @param \Symfony\Component\HttpFoundation\Request $request The current request.
+     *
+     * @return \SimpleSAML\XHTML\Template
+     */
+    public function main(Request $request): Template
+    {
+        $hashAttributes = $this->moduleConfig->getOptionalValue('attributes.hash', false);
         $excludeAttributes = $this->moduleConfig->getOptionalValue('attributes.exclude', []);
 
         // Check if valid local session exists
+        $authority = $this->moduleConfig->getValue('authority');
+        $as = new $this->authSimple($authority);
         $as->requireAuth();
 
         // Get released attributes
diff --git a/templates/consentadmin.twig b/templates/consentadmin.twig
index d88feb7..a44824a 100644
--- a/templates/consentadmin.twig
+++ b/templates/consentadmin.twig
@@ -77,6 +77,6 @@
 <p>{{ '{consentAdmin:consentadmin:consentadmin_description2}'|trans|raw }}</p>
 
 <h2>Logout</h2>
-<p><a href="/{{ baseurlpath }}module.php/consentAdmin/consentAdmin.php?logout=1">Logout</a></p>
+<p><a href="{{ moduleURL('consentAdmin/consentAdmin/logout'}}">Logout</a></p>
 
 {% endblock %}

From dc4d033a6ca9837cc467c43c3250dbf9347c3267 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Tue, 17 Oct 2023 22:20:55 +0200
Subject: [PATCH 086/135] Update test-framework

---
 .github/workflows/php.yml                     | 276 ++++++++++++------
 .gitignore                                    |   1 -
 composer.json                                 |   5 +-
 phpcs.xml                                     |   1 +
 psalm-dev.xml                                 |  27 ++
 public/assets/css/consentAdmin.css            |  49 ++--
 templates/consentadmin.twig                   |  10 +-
 tests/bootstrap.php                           |   2 +
 .../Controller/ConsentAdminTest.php           |   0
 tools/composer-require-checker.json           |   2 +
 10 files changed, 249 insertions(+), 124 deletions(-)
 create mode 100644 psalm-dev.xml
 rename tests/{lib => src}/Controller/ConsentAdminTest.php (100%)
 create mode 100644 tools/composer-require-checker.json

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 2cfb0f5..111b41c 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -1,55 +1,65 @@
+---
+
 name: CI
 
-on:
+on:  # yamllint disable-line rule:truthy
   push:
-    branches: [ '**' ]
+    branches: ['**']
     paths-ignore:
       - '**.md'
   pull_request:
-    branches: [ master, release-* ]
+    branches: [master, release-*]
     paths-ignore:
       - '**.md'
+  workflow_dispatch:
 
 jobs:
-  basic-tests:
-    name: Syntax and unit tests, PHP ${{ matrix.php-versions }}, ${{ matrix.operating-system }}
-    runs-on: ${{ matrix.operating-system }}
-    strategy:
-      fail-fast: false
-      matrix:
-        operating-system: [ubuntu-latest, windows-latest]
-        php-versions: ['7.4', '8.0', '8.1', '8.2']
+  linter:
+    name: Linter
+    runs-on: ['ubuntu-latest']
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Lint Code Base
+        uses: github/super-linter/slim@v4
+        env:
+          LOG_LEVEL: NOTICE
+          VALIDATE_ALL_CODEBASE: true
+          LINTER_RULES_PATH: 'tools/linters'
+          VALIDATE_CSS: true
+          VALIDATE_JAVASCRIPT_ES: true
+          VALIDATE_JSON: true
+          VALIDATE_PHP_BUILTIN: true
+          VALIDATE_YAML: true
+          VALIDATE_XML: true
+          VALIDATE_GITHUB_ACTIONS: true
+
+  quality:
+    name: Quality control
+    runs-on: [ubuntu-latest]
 
     steps:
       - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        id: setup-php
+        # https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@v2
         with:
-          coverage: pcov
-          extensions: intl, mbstring, xml
-          ini-values: error_reporting=E_ALL
-          php-version: ${{ matrix.php-versions }}
-          tools: composer:v2
+          # Should be the higest supported version, so we can use the newest tools
+          php-version: '8.2'
+          tools: composer, composer-require-checker, composer-unused, phpcs, psalm
+          # optional performance gain for psalm: opcache
+          extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, opcache, openssl, pcre, posix, spl, xml
 
       - name: Setup problem matchers for PHP
         run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
 
-      - name: Setup problem matchers for PHPUnit
-        run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
-
-      - name: Set git to use LF
-        run: |
-          git config --global core.autocrlf false
-          git config --global core.eol lf
-
       - uses: actions/checkout@v3
 
-      - name: Get composer cache directory (linux)
-        if: ${{ matrix.operating-system == 'ubuntu-latest' }}
-        run: echo "COMPOSER_CACHE=$(composer config cache-files-dir)" >> $GITHUB_ENV
-
-      - name: Get composer cache directory (windows)
-        if: ${{ matrix.operating-system == 'windows-latest' }}
-        run: echo "COMPOSER_CACHE=$(composer config cache-files-dir)" >> $env:GITHUB_ENV
+      - name: Get composer cache directory
+        run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$GITHUB_ENV"
 
       - name: Cache composer dependencies
         uses: actions/cache@v3
@@ -64,49 +74,65 @@ jobs:
       - name: Install Composer dependencies
         run: composer install --no-progress --prefer-dist --optimize-autoloader
 
-      - name: Syntax check PHP
-        run: bash vendor/bin/check-syntax-php.sh
+      - name: Check code for hard dependencies missing in composer.json
+        run: composer-require-checker check --config-file=tools/composer-require-checker.json composer.json
+
+      - name: Check code for unused dependencies in composer.json
+        run: composer-unused
 
-      - name: Decide whether to run code coverage or not
-        if: ${{ matrix.php-versions != '7.4' || matrix.operating-system != 'ubuntu-latest' }}
+      - name: PHP Code Sniffer
+        run: phpcs
+
+      - name: Psalm
+        continue-on-error: true
         run: |
-          echo "NO_COVERAGE=--no-coverage" >> $GITHUB_ENV
+          psalm -c psalm.xml \
+          --show-info=true \
+          --shepherd \
+          --php-version=${{ steps.setup-php.outputs.php-version }}
 
-      - name: Run unit tests
+      - name: Psalm (testsuite)
         run: |
-          echo $NO_COVERAGE
-          ./vendor/bin/phpunit $NO_COVERAGE
+          psalm -c psalm-dev.xml \
+          --show-info=true \
+          --shepherd \
+          --php-version=${{ steps.setup-php.outputs.php-version }}
 
-      - name: Save coverage data
-        if: ${{ matrix.php-versions == '7.4' && matrix.operating-system == 'ubuntu-latest' }}
-        uses: actions/upload-artifact@v3
-        with:
-            name: build-data
-            path: ${{ github.workspace }}/build
+      - name: Psalter
+        run: |
+          psalm --alter \
+          --issues=UnnecessaryVarAnnotation \
+          --dry-run \
+          --php-version=${{ steps.setup-php.outputs.php-version }}
 
   security:
     name: Security checks
     runs-on: [ubuntu-latest]
     steps:
       - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        # https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@v2
         with:
-            php-version: '7.4'
-            tools: composer:v2
-            extensions: ldap, mbstring, xml
-            coverage: none
+          # Should be the lowest supported version
+          php-version: '8.0'
+          extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, openssl, pcre, posix, spl, xml
+          tools: composer
+          coverage: none
 
       - name: Setup problem matchers for PHP
         run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
 
       - uses: actions/checkout@v3
 
+      - name: Get composer cache directory
+        run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$GITHUB_ENV"
+
       - name: Cache composer dependencies
         uses: actions/cache@v3
         with:
-            path: $COMPOSER_CACHE
-            key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-            restore-keys: ${{ runner.os }}-composer-
+          path: $COMPOSER_CACHE
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
 
       - name: Install Composer dependencies
         run: composer install --no-progress --prefer-dist --optimize-autoloader
@@ -120,85 +146,147 @@ jobs:
       - name: Security check for updated dependencies
         run: composer audit
 
-  sanity-check:
-    name: Sanity checks
-    runs-on: [ubuntu-latest]
+  unit-tests-linux:
+    name: "Unit tests, PHP ${{ matrix.php-versions }}, ${{ matrix.operating-system }}"
+    runs-on: ${{ matrix.operating-system }}
+    needs: [linter, quality, security]
+    strategy:
+      fail-fast: false
+      matrix:
+        operating-system: [ubuntu-latest]
+        php-versions: ['8.0', '8.1', '8.2']
 
     steps:
       - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        # https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.4'
-          tools: composer:v2
-          extensions: ldap, mbstring, xml
-          coverage: none
+          php-version: ${{ matrix.php-versions }}
+          extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, openssl, pcre, posix, spl, xml
+          tools: composer
+          ini-values: error_reporting=E_ALL
+          coverage: pcov
 
       - name: Setup problem matchers for PHP
         run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
 
+      - name: Setup problem matchers for PHPUnit
+        run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
+
+      - name: Set git to use LF
+        run: |
+          git config --global core.autocrlf false
+          git config --global core.eol lf
+
       - uses: actions/checkout@v3
 
+      - name: Get composer cache directory
+        run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$GITHUB_ENV"
+
       - name: Cache composer dependencies
         uses: actions/cache@v3
         with:
-            path: $COMPOSER_CACHE
-            key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-            restore-keys: ${{ runner.os }}-composer-
+          path: $COMPOSER_CACHE
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
 
       - name: Install Composer dependencies
         run: composer install --no-progress --prefer-dist --optimize-autoloader
 
-      - name: Syntax check YAML / XML / JSON
-        run: |
-          bash vendor/bin/check-syntax-yaml.sh
-          bash vendor/bin/check-syntax-xml.sh
-          bash vendor/bin/check-syntax-json.sh
+      - name: Run unit tests with coverage
+        if: ${{ matrix.php-versions == '8.2' }}
+        run: vendor/bin/phpunit
 
-  quality:
-    name: Quality control
-    runs-on: [ubuntu-latest]
-    needs: [basic-tests]
+      - name: Run unit tests (no coverage)
+        if: ${{ matrix.php-versions != '8.2' }}
+        run: vendor/bin/phpunit --no-coverage
+
+      - name: Save coverage data
+        if: ${{ matrix.php-versions == '8.2' }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: coverage-data
+          path: ${{ github.workspace }}/build
+
+  unit-tests-windows:
+    name: "Unit tests, PHP ${{ matrix.php-versions }}, ${{ matrix.operating-system }}"
+    runs-on: ${{ matrix.operating-system }}
+    needs: [linter, quality, security]
+    strategy:
+      fail-fast: true
+      matrix:
+        operating-system: [windows-latest]
+        php-versions: ['8.0', '8.1', '8.2']
 
     steps:
       - name: Setup PHP, with composer and extensions
-        id: setup-php
-        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        # https://github.com/shivammathur/setup-php
+        uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.4'
-          tools: composer:v2
-          extensions: ldap, mbstring, xml
+          php-version: ${{ matrix.php-versions }}
+          extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, openssl, pcre, posix, spl, xml
+          tools: composer
+          ini-values: error_reporting=E_ALL
+          coverage: none
 
       - name: Setup problem matchers for PHP
         run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
 
+      - name: Setup problem matchers for PHPUnit
+        run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
+
+      - name: Set git to use LF
+        run: |
+          git config --global core.autocrlf false
+          git config --global core.eol lf
+
       - uses: actions/checkout@v3
 
+      - name: Get composer cache directory
+        run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$env:GITHUB_ENV"
+
       - name: Cache composer dependencies
         uses: actions/cache@v3
         with:
-            path: $COMPOSER_CACHE
-            key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-            restore-keys: ${{ runner.os }}-composer-
+          path: $COMPOSER_CACHE
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
 
       - name: Install Composer dependencies
-        run: composer install --no-progress --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader --ignore-platform-req=ext-posix
+
+      - name: Run unit tests
+        run: vendor/bin/phpunit --no-coverage
+
+  coverage:
+    name: Code coverage
+    runs-on: [ubuntu-latest]
+    needs: [unit-tests-linux]
+    steps:
+      - uses: actions/checkout@v3
 
       - uses: actions/download-artifact@v3
         with:
-          name: build-data
+          name: coverage-data
           path: ${{ github.workspace }}/build
 
       - name: Codecov
         uses: codecov/codecov-action@v3
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          fail_ci_if_error: true
+          verbose: true
 
-      - name: PHP Code Sniffer
-        continue-on-error: true
-        run: php vendor/bin/phpcs
-
-      - name: Psalm
-        continue-on-error: true
-        run: php vendor/bin/psalm --show-info=true --shepherd --php-version=${{ steps.setup-php.outputs.php-version }}
+  cleanup:
+    name: Cleanup artifacts
+    needs: [unit-tests-linux, coverage]
+    runs-on: [ubuntu-latest]
+    if: |
+      always() &&
+      needs.coverage.result == 'success' &&
+      (needs.unit-tests-linux == 'success' || needs.coverage == 'skipped')
 
-      - name: Psalter
-        continue-on-error: true
-        run: php vendor/bin/psalter --issues=UnnecessaryVarAnnotation --dry-run --php-version=${{ steps.setup-php.outputs.php-version }}
+    steps:
+      - uses: geekyeggo/delete-artifact@v2
+        with:
+          name: coverage-data
diff --git a/.gitignore b/.gitignore
index 5eac572..762b383 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,6 @@
 composer.lock
 cs_fixer_tmp*
 bin/*
-tools/*
 vendor/*
 build/*
 .phpunit.result.cache
diff --git a/composer.json b/composer.json
index 4e5c3a3..f2eae35 100644
--- a/composer.json
+++ b/composer.json
@@ -39,8 +39,9 @@
 
         "simplesamlphp/assert": "^1.0",
         "simplesamlphp/composer-module-installer": "^1.3.4",
-        "simplesamlphp/simplesamlphp": "*",
-        "simplesamlphp/simplesamlphp-module-consent": "*"
+        "simplesamlphp/simplesamlphp": "dev-master",
+        "simplesamlphp/simplesamlphp-module-consent": "^1.3",
+        "symfony/http-foundation": "^6.0"
     },
     "require-dev": {
         "simplesamlphp/simplesamlphp-test-framework": "^1.5.5"
diff --git a/phpcs.xml b/phpcs.xml
index 38ab203..b5dae10 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -12,5 +12,6 @@
 
     <!-- This is the rule we inherit from. If you want to exclude some specific rules, see the docs on how to do that -->
     <rule ref="PSR12"/>
+    <rule ref="vendor/simplesamlphp/simplesamlphp-test-framework/phpcs-simplesamlphp.xml"/>
 </ruleset>
 
diff --git a/psalm-dev.xml b/psalm-dev.xml
new file mode 100644
index 0000000..6116331
--- /dev/null
+++ b/psalm-dev.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<psalm
+    name="SimpleSAMLphp testsuite"
+    useDocblockTypes="true"
+    errorLevel="4"
+    reportMixedIssues="false"
+    hideExternalErrors="true"
+    allowStringToStandInForClass="true"
+>
+    <projectFiles>
+        <directory name="tests" />
+
+        <!-- Ignore certain directories -->
+        <ignoreFiles>
+            <directory name="vendor" />
+        </ignoreFiles>
+    </projectFiles>
+
+    <issueHandlers>
+        <!-- Ignore UnresolvableInclude on CLI-scripts -->
+        <UnresolvableInclude>
+            <errorLevel type="suppress">
+                <file name="tests/bootstrap.php" />
+            </errorLevel>
+        </UnresolvableInclude>
+    </issueHandlers>
+</psalm>
diff --git a/public/assets/css/consentAdmin.css b/public/assets/css/consentAdmin.css
index 94c4a19..219306b 100644
--- a/public/assets/css/consentAdmin.css
+++ b/public/assets/css/consentAdmin.css
@@ -1,39 +1,44 @@
-.caSPName {
-    font-weight: bold;
+.ca-sp-name {
+  font-weight: bold;
 }
-td.caSPName {
-    vertical-align: top;
-}
-td.caAllowed {
-    vertical-align: top;
+
+td.ca-sp-name {
+  vertical-align: top;
 }
-td.caAttributes {
+
+td.ca-allowed {
+  vertical-align: top;
 }
+
 tr.row0 td {
-    background-color: #888888;
-    color: black;
+  background-color: #888;
+  color: black;
 }
+
 tr.row1 td {
-    background-color: #aaaaaa;
-    color: black;
+  background-color: #aaa;
+  color: black;
 }
+
 a.orange {
-    color: #ffd633;
+  color: #ffd633;
 }
 
-span.show_hide {
-    font-size: 80%;
+span.show-hide {
+  font-size: 80%;
 }
 
-a.serviceUrl {
-    color: black;
-    font-weight: bold;
+a.service-url {
+  color: black;
+  font-weight: bold;
 }
 
-span[id^='hiding_'], span[id*='hiding_'] {
-    display: none;
+span[id^="hiding_"],
+span[id*="hiding_"] {
+  display: none;
 }
 
-div[id^='attributes_'], div[id*='attributes_'] {
-    display: none;
+div[id^="attributes_"],
+div[id*="attributes_"] {
+  display: none;
 }
diff --git a/templates/consentadmin.twig b/templates/consentadmin.twig
index a44824a..dc05381 100644
--- a/templates/consentadmin.twig
+++ b/templates/consentadmin.twig
@@ -30,22 +30,22 @@
 
     <tr class="{{ rowClass }}">
         <td>
-            <span class='caSPName'>
+            <span class='ca-sp-name'>
                 <span title='{{ spValues.description|translateFromArray|default('(no description)')|escape('html') }}'>
                 {% if spValues.serviceurl is defined %}
                     {{ spValues.name|translateFromArray|default(spName)|escape('html') }}
                 {% else %}
-                    <a class="serviceUrl" href="{{ spValues.serviceurl }}">{{ spValues.name|translateFromArray|default(spName)|escape('html') }}</a>
+                    <a class="service-url" href="{{ spValues.serviceurl }}">{{ spValues.name|translateFromArray|default(spName)|escape('html') }}</a>
                 {% endif %}
                 </span>
-                <span class="show_hide" id="show_hide_{{ loop.index0 }}">
+                <span class="show-hide" id="show_hide_{{ loop.index0 }}">
                     <span id="showing_{{ loop.index0 }}">{{ '{consentAdmin:consentadmin:show}'|trans }}</span>
                     <span id="hiding_{{ loop.index0 }}">{{ '{consentAdmin:consentadmin:hide}'|trans }}</span>
                     {{ '{consentAdmin:consentadmin:attributes_text}'|trans }}
                 </span>
             </span>
         </td>
-        <td class="caAttributes">
+        <td>
             <div id="attributes_{{ loop.index0 }}">
             {% if showDescription %}
                 <p>{{ '{consentAdmin:consentadmin:consentadmin_purpose}'|trans }}{{ spValues.description|translateFromArray|default('(no description)')|escape('html') }}</p>
@@ -67,7 +67,7 @@
                 </ul>
             </div>
         </td>
-        <td class="caAllowed">
+        <td class="ca-allowed">
             <input class="checkbox" id="checkbox_{{ loop.index0 }}" value='{{ spValues.consentValue }}' type='checkbox'{% if spValues.consentStatus == 'ok'%} checked="checked"{% endif %} /><span id="consentText_{{ loop.index0 }}">{% if spValues.consentStatus == 'changed' %}attributes has changed{% endif %}</span>
         </td>
     </tr>
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index be77a88..04f270b 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 $projectRoot = dirname(__DIR__);
 require_once($projectRoot . '/vendor/autoload.php');
 
diff --git a/tests/lib/Controller/ConsentAdminTest.php b/tests/src/Controller/ConsentAdminTest.php
similarity index 100%
rename from tests/lib/Controller/ConsentAdminTest.php
rename to tests/src/Controller/ConsentAdminTest.php
diff --git a/tools/composer-require-checker.json b/tools/composer-require-checker.json
new file mode 100644
index 0000000..2c63c08
--- /dev/null
+++ b/tools/composer-require-checker.json
@@ -0,0 +1,2 @@
+{
+}

From c271d38bc12e675c24adee4e5e675b4858fe6b22 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Sat, 21 Oct 2023 19:37:11 +0200
Subject: [PATCH 087/135] Fix variable name

---
 src/Controller/ConsentAdmin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Controller/ConsentAdmin.php b/src/Controller/ConsentAdmin.php
index cacb25c..3a090c9 100644
--- a/src/Controller/ConsentAdmin.php
+++ b/src/Controller/ConsentAdmin.php
@@ -180,7 +180,7 @@ public function main(Request $request): Template
         }
 
         // Get user ID
-        $userid_attributename = $cA_config->getOptionalString('identifyingAttribute', 'eduPersonPrincipalName');
+        $userid_attributename = $this->moduleConfig->getOptionalString('identifyingAttribute', 'eduPersonPrincipalName');
         $userids = $attributes[$userid_attributename];
 
         if (empty($userids)) {

From f70b9faec003670a3d6bf7851cb387486a3c7045 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Sat, 21 Oct 2023 19:39:55 +0200
Subject: [PATCH 088/135] Fix routes

---
 routing/routes/routes.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/routing/routes/routes.yml b/routing/routes/routes.yml
index 35d20c5..5c39acb 100644
--- a/routing/routes/routes.yml
+++ b/routing/routes/routes.yml
@@ -1,9 +1,9 @@
 consentadmin-main:
     path:       /
-    defaults:   { _controller: 'SimpleSAML\Module\consentadmin\Controller\ConsentAdmin::main' }
+    defaults:   { _controller: 'SimpleSAML\Module\consentAdmin\Controller\ConsentAdmin::main' }
     methods: [GET]
 
 consentadmin-logout:
     path:       /logout
-    defaults:   { _controller: 'SimpleSAML\Module\consentadmin\Controller\ConsentAdmin::logout' }
+    defaults:   { _controller: 'SimpleSAML\Module\consentAdmin\Controller\ConsentAdmin::logout' }
     methods: [GET]

From 083b76a3a28ba1c9b364f56190a1cdbd095841d5 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Sat, 21 Oct 2023 22:41:14 +0200
Subject: [PATCH 089/135] Fix link for hook

---
 hooks/hook_configpage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hooks/hook_configpage.php b/hooks/hook_configpage.php
index b5f3a3e..d6f72af 100644
--- a/hooks/hook_configpage.php
+++ b/hooks/hook_configpage.php
@@ -15,7 +15,7 @@
 function consentAdmin_hook_configpage(Template &$template): void
 {
     $template->data['links'][] = [
-        'href' => Module::getModuleURL('consentAdmin/consentAdmin.php'),
+        'href' => Module::getModuleURL('consentAdmin/'),
         'text' => Translate::noop('Consent administration'),
     ];
 

From 799cc2096c379a29fc90d1cd711e29718955a224 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Mon, 30 Oct 2023 23:12:31 +0100
Subject: [PATCH 090/135] Bump actions/checkout & super-linter

---
 .github/workflows/documentation.yml |  2 +-
 .github/workflows/php.yml           | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index 71477d4..507ccff 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: [ubuntu-latest]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Lint markdown files
         uses: nosborn/github-action-markdown-cli@v3
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 111b41c..5e7c4b0 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -19,12 +19,12 @@ jobs:
     runs-on: ['ubuntu-latest']
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Lint Code Base
-        uses: github/super-linter/slim@v4
+        uses: github/super-linter/slim@v5
         env:
           LOG_LEVEL: NOTICE
           VALIDATE_ALL_CODEBASE: true
@@ -56,7 +56,7 @@ jobs:
       - name: Setup problem matchers for PHP
         run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Get composer cache directory
         run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$GITHUB_ENV"
@@ -122,7 +122,7 @@ jobs:
       - name: Setup problem matchers for PHP
         run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Get composer cache directory
         run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$GITHUB_ENV"
@@ -178,7 +178,7 @@ jobs:
           git config --global core.autocrlf false
           git config --global core.eol lf
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Get composer cache directory
         run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$GITHUB_ENV"
@@ -240,7 +240,7 @@ jobs:
           git config --global core.autocrlf false
           git config --global core.eol lf
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Get composer cache directory
         run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$env:GITHUB_ENV"
@@ -263,7 +263,7 @@ jobs:
     runs-on: [ubuntu-latest]
     needs: [unit-tests-linux]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: actions/download-artifact@v3
         with:

From 97b4a4940fc6c802dfa79e341c1f1f2d4b3015c1 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Mon, 15 Jan 2024 23:20:20 +0100
Subject: [PATCH 091/135] Update .gitignore file

---
 .gitignore | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 762b383..eaddd94 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,10 @@
 ### php-cs-fixer ###
 .php_cs.cache
+.phpunit.cache/
+.phpunit.result.cache
+bin/*
+build/*
 composer.lock
 cs_fixer_tmp*
-bin/*
+phpunit.xml.bak
 vendor/*
-build/*
-.phpunit.result.cache
-

From 2bb97fffc50278c13a204fe37869057d485988bb Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Mon, 15 Jan 2024 23:25:51 +0100
Subject: [PATCH 092/135] Migrate phpunit config

---
 phpunit.xml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/phpunit.xml b/phpunit.xml
index af9cf95..f053937 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="tests/bootstrap.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage processUncoveredFiles="true">
-    <include>
-      <directory suffix=".php">./lib</directory>
-    </include>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="tests/bootstrap.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache">
+  <coverage>
     <report>
       <clover outputFile="build/logs/clover.xml"/>
       <html outputDirectory="build/coverage" lowUpperBound="35" highLowerBound="70"/>
@@ -17,4 +14,9 @@
     </testsuite>
   </testsuites>
   <logging/>
+  <source>
+    <include>
+      <directory suffix=".php">./lib</directory>
+    </include>
+  </source>
 </phpunit>

From 1e2af13cb00918df6f64a1d75333514faff53a56 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Mon, 15 Jan 2024 23:33:38 +0100
Subject: [PATCH 093/135] Remove unused use-statements and order them
 alphabetically

---
 composer.json                                 |  7 +--
 .../module_consentAdmin.php.dist              |  0
 phpcs.xml                                     |  6 +++
 psalm.xml                                     |  3 +-
 src/Controller/ConsentAdmin.php               | 14 +++---
 tests/src/Controller/ConsentAdminTest.php     | 44 +++++++++++--------
 tools/composer-require-checker.json           |  4 ++
 7 files changed, 50 insertions(+), 28 deletions(-)
 rename config-templates/module_consentAdmin.php => config/module_consentAdmin.php.dist (100%)

diff --git a/composer.json b/composer.json
index f2eae35..00c9fb7 100644
--- a/composer.json
+++ b/composer.json
@@ -21,12 +21,13 @@
         },
         "allow-plugins": {
             "composer/package-versions-deprecated": true,
-            "simplesamlphp/composer-module-installer": true
+            "simplesamlphp/composer-module-installer": true,
+            "dealerdirect/phpcodesniffer-composer-installer": true
         }
     },
     "autoload": {
         "psr-4": {
-            "SimpleSAML\\Module\\consentadmin\\": "lib/"
+            "SimpleSAML\\Module\\consentAdmin\\": "src/"
         }
     },
     "autoload-dev": {
@@ -39,7 +40,7 @@
 
         "simplesamlphp/assert": "^1.0",
         "simplesamlphp/composer-module-installer": "^1.3.4",
-        "simplesamlphp/simplesamlphp": "dev-master",
+        "simplesamlphp/simplesamlphp": "^2.1",
         "simplesamlphp/simplesamlphp-module-consent": "^1.3",
         "symfony/http-foundation": "^6.0"
     },
diff --git a/config-templates/module_consentAdmin.php b/config/module_consentAdmin.php.dist
similarity index 100%
rename from config-templates/module_consentAdmin.php
rename to config/module_consentAdmin.php.dist
diff --git a/phpcs.xml b/phpcs.xml
index b5dae10..bae7c2f 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -6,6 +6,12 @@
         By default it is less stringent about long lines than other coding standards
     </description>
 
+    <file>config</file>
+    <file>public</file>
+    <file>src</file>
+    <file>templates</file>
+    <file>tests</file>
+
     <!-- Use this to exclude paths. You can have multiple patterns -->
     <!--<exclude-pattern>*/tests/*</exclude-pattern>-->
     <!--<exclude-pattern>*/other/*</exclude-pattern>-->
diff --git a/psalm.xml b/psalm.xml
index 8a7e4cd..fdfd064 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -7,7 +7,8 @@
 >
     <projectFiles>
         <directory name="hooks" />
-        <directory name="www" />
+        <directory name="public" />
+        <directory name="src" />
     </projectFiles>
 
     <issueHandlers>
diff --git a/src/Controller/ConsentAdmin.php b/src/Controller/ConsentAdmin.php
index 3a090c9..04853ab 100644
--- a/src/Controller/ConsentAdmin.php
+++ b/src/Controller/ConsentAdmin.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace SimpleSAML\Module\consentadmin\Controller;
+namespace SimpleSAML\Module\consentAdmin\Controller;
 
 use Exception;
 use SimpleSAML\Auth;
@@ -18,7 +18,6 @@
 use function array_key_exists;
 use function in_array;
 use function is_array;
-use function is_string;
 use function sprintf;
 use function strpos;
 use function substr;
@@ -28,7 +27,7 @@
  *
  * This class serves the different views available in the module.
  *
- * @package simplesamlphp/simplesamlphp-module-consentadmin
+ * @package simplesamlphp/simplesamlphp-module-consentAdmin
  */
 class ConsentAdmin
 {
@@ -180,7 +179,10 @@ public function main(Request $request): Template
         }
 
         // Get user ID
-        $userid_attributename = $this->moduleConfig->getOptionalString('identifyingAttribute', 'eduPersonPrincipalName');
+        $userid_attributename = $this->moduleConfig->getOptionalString(
+            'identifyingAttribute',
+            'eduPersonPrincipalName',
+        );
         $userids = $attributes[$userid_attributename];
 
         if (empty($userids)) {
@@ -195,7 +197,7 @@ public function main(Request $request): Template
         // Get all SP metadata
         $all_sp_metadata = $metadata->getList('saml20-sp-remote');
 
-        $sp_entityid = $request->query->get('cv');;
+        $sp_entityid = $request->query->get('cv');
         $action = $request->query->get('action');
 
         Logger::notice('consentAdmin: sp: ' . $sp_entityid . ' action: ' . $action);
@@ -328,7 +330,7 @@ public function main(Request $request): Template
 
         $template->data['header'] = 'Consent Administration';
         $template->data['spList'] = $sp_list;
-        $template->data['showDescription'] = $this->moduleConfig->getValue('showDescription');
+        $template->data['showDescription'] = $this->moduleConfig->getBoolean('showDescription');
 
         return $template;
     }
diff --git a/tests/src/Controller/ConsentAdminTest.php b/tests/src/Controller/ConsentAdminTest.php
index dd48973..37f4cf7 100644
--- a/tests/src/Controller/ConsentAdminTest.php
+++ b/tests/src/Controller/ConsentAdminTest.php
@@ -2,10 +2,8 @@
 
 declare(strict_types=1);
 
-namespace SimpleSAML\Test\Module\consentadmin\Controller;
+namespace SimpleSAML\Test\Module\consentAdmin\Controller;
 
-use Exception;
-use PDO;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Auth;
 use SimpleSAML\Configuration;
@@ -13,7 +11,7 @@
 use SimpleSAML\Module\consent\Auth\Process\Consent;
 use SimpleSAML\Module\consent\Consent\Store\Database;
 use SimpleSAML\Module\consent\Store;
-use SimpleSAML\Module\consentadmin\Controller;
+use SimpleSAML\Module\consentAdmin\Controller;
 use SimpleSAML\Session;
 use SimpleSAML\XHTML\Template;
 use Symfony\Component\HttpFoundation\Request;
@@ -21,7 +19,7 @@
 /**
  * Set of tests for the controllers in the "consentadmin" module.
  *
- * @covers \SimpleSAML\Module\consentadmin\Controller\ConsentAdmin
+ * @covers \SimpleSAML\Module\consentAdmin\Controller\ConsentAdmin
  */
 class ConsentAdminTest extends TestCase
 {
@@ -73,6 +71,7 @@ protected function setUp(): void
                         'consent:Database',
                         'dsn' => 'sqlite::memory:',
                     ],
+                    'showDescription' => true,
                 ],
                 '[ARRAY]',
                 'simplesaml'
@@ -107,7 +106,7 @@ public function getAttributes(): array
             {
                 return ['eduPersonPrincipalName' => 'tester'];
             }
-            public function getAuthData(string $name = '')
+            public function getAuthData(string $name = ''): mixed
             {
                 if ($name === 'saml:sp:IdP') {
                     return 'localhost';
@@ -146,35 +145,44 @@ public static function getTargetedID(string $userid, string $source, string $des
             }
         };
 
-        $this->store = new class([]) extends Store {
-            public function __construct()
+        $this->store = new class ([]) extends Store {
+            public function __construct(array $config)
             {
                 // stub
             }
-            public function saveConsent(string $userId, string $destinationId, string $attributeSet): bool {
+            public function saveConsent(string $userId, string $destinationId, string $attributeSet): bool
+            {
                  return true;
             }
-            public function deleteConsent(string $hashed_user_id, string $targeted_id): int {
+            public function deleteConsent(string $userId, string $destinationId): int
+            {
                 return 1;
             }
-            public function getConsents(string $userId): array {
+            public function getConsents(string $userId): array
+            {
                 return [];
             }
-            public function hasConsent(string $userId, string $destinationId, string $attributeSet): bool {
+            public function hasConsent(string $userId, string $destinationId, string $attributeSet): bool
+            {
                 return true;
             }
-            public static function parseStoreConfig($config): Store {
-                return new class($config) extends Database {
-                    public function saveConsent(string $userId, string $destinationId, string $attributeSet): bool {
+            public static function parseStoreConfig($config): Store
+            {
+                return new class ($config) extends Database {
+                    public function saveConsent(string $userId, string $destinationId, string $attributeSet): bool
+                    {
                         return true;
                     }
-                    public function deleteConsent(string $hashed_user_id, string $targeted_id): int {
+                    public function deleteConsent(string $userId, string $destinationId): int
+                    {
                         return 1;
                     }
-                    public function getConsents(string $userId): array {
+                    public function getConsents(string $userId): array
+                    {
                         return [];
                     }
-                    public function hasConsent(string $userId, string $destinationId, string $attributeSet): bool {
+                    public function hasConsent(string $userId, string $destinationId, string $attributeSet): bool
+                    {
                         return true;
                     }
                 };
diff --git a/tools/composer-require-checker.json b/tools/composer-require-checker.json
index 2c63c08..c582e58 100644
--- a/tools/composer-require-checker.json
+++ b/tools/composer-require-checker.json
@@ -1,2 +1,6 @@
 {
+  "symbol-whitelist": [
+    "SimpleSAML\\Module\\consent\\Auth\\Process\\Consent",
+    "SimpleSAML\\Module\\consent\\Store"
+  ]
 }

From 0d1054950da143ac871f27c6c3c5d1a278ffab5e Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Wed, 17 Jan 2024 00:04:12 +0100
Subject: [PATCH 094/135] Bump download-artifact action

---
 .github/workflows/php.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 5e7c4b0..3827e19 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -287,6 +287,6 @@ jobs:
       (needs.unit-tests-linux == 'success' || needs.coverage == 'skipped')
 
     steps:
-      - uses: geekyeggo/delete-artifact@v2
+      - uses: geekyeggo/delete-artifact@v4
         with:
           name: coverage-data

From 6be4ccc44d20834c96d14863f019ee9646103538 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Wed, 17 Jan 2024 18:19:32 +0100
Subject: [PATCH 095/135] Bump upload-artifact action

---
 .github/workflows/php.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 3827e19..94a71d1 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -203,7 +203,7 @@ jobs:
 
       - name: Save coverage data
         if: ${{ matrix.php-versions == '8.2' }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: coverage-data
           path: ${{ github.workspace }}/build

From 41fd82c96704831041dfc4ea2da7cb4f6ec882f6 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Wed, 17 Jan 2024 19:54:47 +0100
Subject: [PATCH 096/135] Bump codespell action

---
 .github/workflows/documentation.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index 507ccff..c46ffcc 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -27,7 +27,7 @@ jobs:
           ignore_path: .markdownlintignore
 
       - name: Perform spell check
-        uses: codespell-project/actions-codespell@master
+        uses: codespell-project/actions-codespell@v2
         with:
           path: '**/*.md'
           check_filenames: true

From 80d87ef7c1edea1c78f1232c3836dd584cf3be95 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Wed, 17 Jan 2024 20:25:38 +0100
Subject: [PATCH 097/135] Bump lock-threads action

---
 .github/workflows/autolock-conversations.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/autolock-conversations.yml b/.github/workflows/autolock-conversations.yml
index 5d66869..3c7be52 100644
--- a/.github/workflows/autolock-conversations.yml
+++ b/.github/workflows/autolock-conversations.yml
@@ -18,7 +18,7 @@ jobs:
   action:
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v4
+      - uses: dessant/lock-threads@v5
         with:
           issue-inactive-days: '90'
           pr-inactive-days: '90'

From 9f16c4882c26449558c0a251c85629f089ff0bf5 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Fri, 19 Jan 2024 23:26:12 +0100
Subject: [PATCH 098/135] Create dependabot.yml

---
 .github/dependabot.yml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..c293f08
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,27 @@
+---
+
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions"  # See documentation for possible values
+    directory: "/"  # Location of package manifests
+    schedule:
+      interval: "weekly"
+    groups:
+      all-actions:
+        patterns: ["*"]
+
+  - package-ecosystem: "compposer"  # See documentation for possible values
+    directory: "/"  # Location of package manifests
+    schedule:
+      interval: "daily"
+    groups:
+      dev-dependencies:
+        dependency-type: "development"
+        update-types:
+          - "minor"
+          - "patch"

From 201b9c7e9c45846d078ed9746e5427952c3e28b2 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Tue, 13 Feb 2024 23:33:11 +0100
Subject: [PATCH 099/135] Fix typo

---
 .github/dependabot.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index c293f08..0013236 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -15,7 +15,7 @@ updates:
       all-actions:
         patterns: ["*"]
 
-  - package-ecosystem: "compposer"  # See documentation for possible values
+  - package-ecosystem: "composer"  # See documentation for possible values
     directory: "/"  # Location of package manifests
     schedule:
       interval: "daily"

From 6c9c5871beefd4456377eeb7b672691ef97f18f8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Feb 2024 22:33:55 +0000
Subject: [PATCH 100/135] Bump the all-actions group with 4 updates

Bumps the all-actions group with 4 updates: [actions/github-script](https://github.com/actions/github-script), [actions/cache](https://github.com/actions/cache), [actions/download-artifact](https://github.com/actions/download-artifact) and [codecov/codecov-action](https://github.com/codecov/codecov-action).


Updates `actions/github-script` from 6 to 7
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](https://github.com/actions/github-script/compare/v6...v7)

Updates `actions/cache` from 3 to 4
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v3...v4)

Updates `actions/download-artifact` from 3 to 4
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/v3...v4)

Updates `codecov/codecov-action` from 3 to 4
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/github-script
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: all-actions
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: all-actions
- dependency-name: actions/download-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: all-actions
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: all-actions
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/documentation.yml |  2 +-
 .github/workflows/php.yml           | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index c46ffcc..cfc066d 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -41,7 +41,7 @@ jobs:
     steps:
       - name: Run docs build
         if: github.event_name != 'pull_request'
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           # Token has to be generated on a user account that controls the docs-repository.
           # The _only_ scope to select is "Access public repositories", nothing more.
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 94a71d1..bf6c74b 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -62,7 +62,7 @@ jobs:
         run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$GITHUB_ENV"
 
       - name: Cache composer dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: $COMPOSER_CACHE
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -128,7 +128,7 @@ jobs:
         run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$GITHUB_ENV"
 
       - name: Cache composer dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: $COMPOSER_CACHE
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -184,7 +184,7 @@ jobs:
         run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$GITHUB_ENV"
 
       - name: Cache composer dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: $COMPOSER_CACHE
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -246,7 +246,7 @@ jobs:
         run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$env:GITHUB_ENV"
 
       - name: Cache composer dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: $COMPOSER_CACHE
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -265,13 +265,13 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: coverage-data
           path: ${{ github.workspace }}/build
 
       - name: Codecov
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           fail_ci_if_error: true

From eaba51b3c49c26734f088661afcb832f245a9e97 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2024 20:05:27 +0000
Subject: [PATCH 101/135] Bump the all-actions group with 1 update

Bumps the all-actions group with 1 update: [geekyeggo/delete-artifact](https://github.com/geekyeggo/delete-artifact).


Updates `geekyeggo/delete-artifact` from 4 to 5
- [Release notes](https://github.com/geekyeggo/delete-artifact/releases)
- [Changelog](https://github.com/GeekyEggo/delete-artifact/blob/main/CHANGELOG.md)
- [Commits](https://github.com/geekyeggo/delete-artifact/compare/v4...v5)

---
updated-dependencies:
- dependency-name: geekyeggo/delete-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: all-actions
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/php.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index bf6c74b..740e477 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -287,6 +287,6 @@ jobs:
       (needs.unit-tests-linux == 'success' || needs.coverage == 'skipped')
 
     steps:
-      - uses: geekyeggo/delete-artifact@v4
+      - uses: geekyeggo/delete-artifact@v5
         with:
           name: coverage-data

From 103f228d750d48f8b4d60bc0e33fc202263c1134 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Mon, 25 Mar 2024 21:49:04 +0100
Subject: [PATCH 102/135] Upgrade superlinter

---
 .github/workflows/php.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 740e477..fff94ae 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -24,11 +24,12 @@ jobs:
           fetch-depth: 0
 
       - name: Lint Code Base
-        uses: github/super-linter/slim@v5
+        uses: super-linter/super-linter/slim@v6
         env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          LINTER_RULES_PATH: 'tools/linters'
           LOG_LEVEL: NOTICE
           VALIDATE_ALL_CODEBASE: true
-          LINTER_RULES_PATH: 'tools/linters'
           VALIDATE_CSS: true
           VALIDATE_JAVASCRIPT_ES: true
           VALIDATE_JSON: true

From ea973a64b5f40eb4bce033508ddf1e409de7b3a6 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Wed, 1 May 2024 00:11:08 +0200
Subject: [PATCH 103/135] Migrate phpunit metadata to attributes

---
 tests/src/Controller/ConsentAdminTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/src/Controller/ConsentAdminTest.php b/tests/src/Controller/ConsentAdminTest.php
index 37f4cf7..0363307 100644
--- a/tests/src/Controller/ConsentAdminTest.php
+++ b/tests/src/Controller/ConsentAdminTest.php
@@ -4,6 +4,7 @@
 
 namespace SimpleSAML\Test\Module\consentAdmin\Controller;
 
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Auth;
 use SimpleSAML\Configuration;
@@ -18,9 +19,8 @@
 
 /**
  * Set of tests for the controllers in the "consentadmin" module.
- *
- * @covers \SimpleSAML\Module\consentAdmin\Controller\ConsentAdmin
  */
+#[CoversClass(Controller\ConsentAdmin::class)]
 class ConsentAdminTest extends TestCase
 {
     /** @var \SimpleSAML\Configuration */

From 3dac24b012ebd56acfd1e034f04445358772fc9b Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Fri, 14 Jun 2024 21:11:56 +0200
Subject: [PATCH 104/135] Fix cleanup-job

---
 .github/workflows/php.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index fff94ae..64d5fd0 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -285,7 +285,7 @@ jobs:
     if: |
       always() &&
       needs.coverage.result == 'success' &&
-      (needs.unit-tests-linux == 'success' || needs.coverage == 'skipped')
+      (needs.unit-tests-linux.result == 'success' || needs.coverage.result == 'skipped')
 
     steps:
       - uses: geekyeggo/delete-artifact@v5

From 4628f9bff2edb0292cc4bc680c35f767047be62e Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Tue, 9 Jul 2024 21:29:10 +0200
Subject: [PATCH 105/135] Fix composer dependencies

---
 composer.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index 00c9fb7..0b47d66 100644
--- a/composer.json
+++ b/composer.json
@@ -36,16 +36,16 @@
         }
     },
     "require": {
-        "php": "^8.0",
+        "php": "^8.1",
 
-        "simplesamlphp/assert": "^1.0",
+        "simplesamlphp/assert": "^1.1.0",
         "simplesamlphp/composer-module-installer": "^1.3.4",
-        "simplesamlphp/simplesamlphp": "^2.1",
-        "simplesamlphp/simplesamlphp-module-consent": "^1.3",
-        "symfony/http-foundation": "^6.0"
+        "simplesamlphp/simplesamlphp": "^2.2",
+        "simplesamlphp/simplesamlphp-module-consent": "^1.3.0",
+        "symfony/http-foundation": "^6.4.0"
     },
     "require-dev": {
-        "simplesamlphp/simplesamlphp-test-framework": "^1.5.5"
+        "simplesamlphp/simplesamlphp-test-framework": "^1.7.0"
     },
     "extra": {
         "ssp-mixedcase-module-name": "consentAdmin"

From ce02057062b37519cd1979b1ad36c0aeea2f38eb Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Mon, 15 Jul 2024 23:31:51 +0200
Subject: [PATCH 106/135] dependabot: second attempt to exclude major updates

---
 .github/dependabot.yml | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 0013236..ee89027 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -18,10 +18,20 @@ updates:
   - package-ecosystem: "composer"  # See documentation for possible values
     directory: "/"  # Location of package manifests
     schedule:
-      interval: "daily"
+      interval: "weekly"
+    allow:
+      # Allow both direct and indirect updates for all packages
+      - dependency-type: "all"
+    ignore:
+      - dependency-name: "*"
+        update-types: ["version-update:semver-major"]
     groups:
-      dev-dependencies:
+      production-dependencies:
+        dependency-type: "production"
+        exclude-patterns:
+          - "symfony/*"
+      development-dependencies:
         dependency-type: "development"
-        update-types:
-          - "minor"
-          - "patch"
+      symfony:
+        patterns:
+          - "symfony/*"

From 82516f0a8502fea2d4f990c021e0677b0fdd10c9 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Sun, 4 Aug 2024 13:48:46 +0200
Subject: [PATCH 107/135] Allow phpstan/extension-installer plugin

---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 0b47d66..7daa93a 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,8 @@
         "allow-plugins": {
             "composer/package-versions-deprecated": true,
             "simplesamlphp/composer-module-installer": true,
-            "dealerdirect/phpcodesniffer-composer-installer": true
+            "dealerdirect/phpcodesniffer-composer-installer": true,
+            "phpstan/extension-installer": true
         }
     },
     "autoload": {

From 0a3609249d2a96d6e7f3ed948bc21f5072314f94 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Sun, 4 Aug 2024 13:54:11 +0200
Subject: [PATCH 108/135] Start testing on PHP 8.3

---
 .github/workflows/php.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 64d5fd0..7b89620 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -49,7 +49,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           # Should be the higest supported version, so we can use the newest tools
-          php-version: '8.2'
+          php-version: '8.3'
           tools: composer, composer-require-checker, composer-unused, phpcs, psalm
           # optional performance gain for psalm: opcache
           extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, opcache, openssl, pcre, posix, spl, xml
@@ -115,7 +115,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           # Should be the lowest supported version
-          php-version: '8.0'
+          php-version: '8.1'
           extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, openssl, pcre, posix, spl, xml
           tools: composer
           coverage: none
@@ -155,7 +155,7 @@ jobs:
       fail-fast: false
       matrix:
         operating-system: [ubuntu-latest]
-        php-versions: ['8.0', '8.1', '8.2']
+        php-versions: ['8.1', '8.2', '8.3']
 
     steps:
       - name: Setup PHP, with composer and extensions
@@ -195,15 +195,15 @@ jobs:
         run: composer install --no-progress --prefer-dist --optimize-autoloader
 
       - name: Run unit tests with coverage
-        if: ${{ matrix.php-versions == '8.2' }}
+        if: ${{ matrix.php-versions == '8.3' }}
         run: vendor/bin/phpunit
 
       - name: Run unit tests (no coverage)
-        if: ${{ matrix.php-versions != '8.2' }}
+        if: ${{ matrix.php-versions != '8.3' }}
         run: vendor/bin/phpunit --no-coverage
 
       - name: Save coverage data
-        if: ${{ matrix.php-versions == '8.2' }}
+        if: ${{ matrix.php-versions == '8.3' }}
         uses: actions/upload-artifact@v4
         with:
           name: coverage-data
@@ -217,7 +217,7 @@ jobs:
       fail-fast: true
       matrix:
         operating-system: [windows-latest]
-        php-versions: ['8.0', '8.1', '8.2']
+        php-versions: ['8.1', '8.2', '8.3']
 
     steps:
       - name: Setup PHP, with composer and extensions
@@ -284,8 +284,8 @@ jobs:
     runs-on: [ubuntu-latest]
     if: |
       always() &&
-      needs.coverage.result == 'success' &&
-      (needs.unit-tests-linux.result == 'success' || needs.coverage.result == 'skipped')
+      needs.coverage.result == 'success' ||
+      (needs.unit-tests-linux.result == 'success' && needs.coverage.result == 'skipped')
 
     steps:
       - uses: geekyeggo/delete-artifact@v5

From a2b6a39e94164d9de2f5471c0acd58bb07697385 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Sun, 4 Aug 2024 13:58:41 +0200
Subject: [PATCH 109/135] Add trailing commas

---
 src/Controller/ConsentAdmin.php           | 12 ++++++------
 tests/src/Controller/ConsentAdminTest.php | 18 +++++++++---------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/Controller/ConsentAdmin.php b/src/Controller/ConsentAdmin.php
index 04853ab..fd19d75 100644
--- a/src/Controller/ConsentAdmin.php
+++ b/src/Controller/ConsentAdmin.php
@@ -74,7 +74,7 @@ class ConsentAdmin
      */
     public function __construct(
         Configuration $config,
-        Session $session
+        Session $session,
     ) {
         $this->config = $config;
         $this->moduleConfig = Configuration::getConfig('module_consentAdmin.php');
@@ -188,7 +188,7 @@ public function main(Request $request): Template
         if (empty($userids)) {
             throw new Exception(sprintf(
                 'Could not generate useridentifier for storing consent. Attribute [%s] was not available.',
-                $userid_attributename
+                $userid_attributename,
             ));
         }
 
@@ -225,7 +225,7 @@ public function main(Request $request): Template
             $template = new Template(
                 $this->config,
                 'consentAdmin:consentadminajax.twig',
-                'consentAdmin:consentadmin'
+                'consentAdmin:consentadmin',
             );
 
             // Get SP metadata
@@ -240,7 +240,7 @@ public function main(Request $request): Template
                 $attributes,
                 $userid,
                 $hashAttributes,
-                $excludeAttributes
+                $excludeAttributes,
             );
 
             // Add a consent (or update if attributes have changed and old consent for SP and IdP exists)
@@ -289,7 +289,7 @@ public function main(Request $request): Template
                 $attributes,
                 $userid,
                 $hashAttributes,
-                $excludeAttributes
+                $excludeAttributes,
             );
 
             // Check if consent exists
@@ -358,7 +358,7 @@ private function driveProcessingChain(
         array $attributes,
         string $userid,
         bool $hashAttributes,
-        array $excludeAttributes
+        array $excludeAttributes,
     ): array {
         /*
          * Create a new processing chain
diff --git a/tests/src/Controller/ConsentAdminTest.php b/tests/src/Controller/ConsentAdminTest.php
index 0363307..88ff712 100644
--- a/tests/src/Controller/ConsentAdminTest.php
+++ b/tests/src/Controller/ConsentAdminTest.php
@@ -59,7 +59,7 @@ protected function setUp(): void
                 ],
             ],
             '[ARRAY]',
-            'simplesaml'
+            'simplesaml',
         );
         Configuration::setPreLoadedConfig($this->config, 'config.php');
 
@@ -74,9 +74,9 @@ protected function setUp(): void
                     'showDescription' => true,
                 ],
                 '[ARRAY]',
-                'simplesaml'
+                'simplesaml',
             ),
-            'module_consentAdmin.php'
+            'module_consentAdmin.php',
         );
 
         Configuration::setPreLoadedConfig(
@@ -86,9 +86,9 @@ protected function setUp(): void
                         'exampleauth:StaticSource',
                         'eduPersonPrincipalName' => ['testuser@simplesamlphp.org'],
                     ],
-                ]
+                ],
             ),
-            'authsources.php'
+            'authsources.php',
         );
 
         $this->session = Session::getSessionFromRequest();
@@ -204,7 +204,7 @@ public function testMainActionTrue(): void
         $request = Request::create(
             '/',
             'GET',
-            ['action' => 'true', 'cv' => 'urn:some:entity']
+            ['action' => 'true', 'cv' => 'urn:some:entity'],
         );
 
         $c = new Controller\ConsentAdmin($this->config, $this->session);
@@ -232,7 +232,7 @@ public function testMainActionFalse(): void
         $request = Request::create(
             '/',
             'GET',
-            ['action' => 'false', 'cv' => 'urn:some:entity']
+            ['action' => 'false', 'cv' => 'urn:some:entity'],
         );
 
         $c = new Controller\ConsentAdmin($this->config, $this->session);
@@ -260,7 +260,7 @@ public function testMainActionUnknown(): void
         $request = Request::create(
             '/',
             'GET',
-            ['action' => 'unknown', 'cv' => 'urn:some:entity']
+            ['action' => 'unknown', 'cv' => 'urn:some:entity'],
         );
 
         $c = new Controller\ConsentAdmin($this->config, $this->session);
@@ -287,7 +287,7 @@ public function testMainNoAction(): void
         $request = Request::create(
             '/',
             'GET',
-            []
+            [],
         );
 
         $c = new Controller\ConsentAdmin($this->config, $this->session);

From e121412491f525e262f836dc1ea87d286d220f89 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Sun, 4 Aug 2024 14:10:35 +0200
Subject: [PATCH 110/135] Fix phpunit config

---
 phpunit.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpunit.xml b/phpunit.xml
index f053937..a285b98 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -16,7 +16,7 @@
   <logging/>
   <source>
     <include>
-      <directory suffix=".php">./lib</directory>
+      <directory suffix=".php">./src</directory>
     </include>
   </source>
 </phpunit>

From 7ec964e6bf3ed33d91abd20006deb88bc948cd5c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Aug 2024 19:34:09 +0000
Subject: [PATCH 111/135] Bump super-linter/super-linter from 6 to 7 in the
 all-actions group

Bumps the all-actions group with 1 update: [super-linter/super-linter](https://github.com/super-linter/super-linter).


Updates `super-linter/super-linter` from 6 to 7
- [Release notes](https://github.com/super-linter/super-linter/releases)
- [Changelog](https://github.com/super-linter/super-linter/blob/main/CHANGELOG.md)
- [Commits](https://github.com/super-linter/super-linter/compare/v6...v7)

---
updated-dependencies:
- dependency-name: super-linter/super-linter
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: all-actions
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/php.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 7b89620..23fc00f 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -24,7 +24,7 @@ jobs:
           fetch-depth: 0
 
       - name: Lint Code Base
-        uses: super-linter/super-linter/slim@v6
+        uses: super-linter/super-linter/slim@v7
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           LINTER_RULES_PATH: 'tools/linters'

From 80ad3564e6a4b8bbb99f85fa95d46ebb8983da4d Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Mon, 19 Aug 2024 22:51:11 +0200
Subject: [PATCH 112/135] Stop super-linter from writing logfiles

---
 .github/workflows/php.yml | 1 +
 .gitignore                | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 23fc00f..16cad63 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -26,6 +26,7 @@ jobs:
       - name: Lint Code Base
         uses: super-linter/super-linter/slim@v7
         env:
+          SAVE_SUPER_LINTER_OUTPUT: false
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           LINTER_RULES_PATH: 'tools/linters'
           LOG_LEVEL: NOTICE
diff --git a/.gitignore b/.gitignore
index eaddd94..e9c0f7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,5 @@ build/*
 composer.lock
 cs_fixer_tmp*
 phpunit.xml.bak
+/super-linter-output/
 vendor/*

From 602357b8bbb8334636db76e39a726348289b187d Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Wed, 21 Aug 2024 21:18:54 +0200
Subject: [PATCH 113/135] Fix badge

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 49d98d2..7840770 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-![Build Status](https://github.com/simplesamlphp/simplesamlphp-module-consentadmin/workflows/CI/badge.svg?branch=master)
+![Build Status](https://github.com/simplesamlphp/simplesamlphp-module-consentadmin/actions/workflows/php.yml/badge.svg)
 [![Coverage Status](https://codecov.io/gh/simplesamlphp/simplesamlphp-module-consentadmin/branch/master/graph/badge.svg)](https://codecov.io/gh/simplesamlphp/simplesamlphp-module-consentadmin)
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/simplesamlphp/simplesamlphp-module-consentadmin/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/simplesamlphp/simplesamlphp-module-consentadmin/?branch=master)
 [![Type Coverage](https://shepherd.dev/github/simplesamlphp/simplesamlphp-module-consentadmin/coverage.svg)](https://shepherd.dev/github/simplesamlphp/simplesamlphp-module-consentadmin)

From 6a9cef8cd51f7f297b48dd12af1edbfda03fd438 Mon Sep 17 00:00:00 2001
From: Ben Martin <monkeyiq@users.sourceforge.net>
Date: Mon, 4 Nov 2024 12:00:00 +1000
Subject: [PATCH 114/135] locale: rename three locale directories inline with
 simplesamlphp/issues/2277

---
 locales/{zh-tw => zh_TW}/LC_MESSAGES/consentAdmin.po | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename locales/{zh-tw => zh_TW}/LC_MESSAGES/consentAdmin.po (100%)

diff --git a/locales/zh-tw/LC_MESSAGES/consentAdmin.po b/locales/zh_TW/LC_MESSAGES/consentAdmin.po
similarity index 100%
rename from locales/zh-tw/LC_MESSAGES/consentAdmin.po
rename to locales/zh_TW/LC_MESSAGES/consentAdmin.po

From a5afc8707cf2f3032a6422c0803c779056364e4b Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Sat, 16 Nov 2024 10:11:39 +0100
Subject: [PATCH 115/135] Allow xmlprovider plugin

---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 7daa93a..bf4f491 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,8 @@
             "composer/package-versions-deprecated": true,
             "simplesamlphp/composer-module-installer": true,
             "dealerdirect/phpcodesniffer-composer-installer": true,
-            "phpstan/extension-installer": true
+            "phpstan/extension-installer": true,
+            "simplesamlphp/composer-xmlprovider-installer": true
         }
     },
     "autoload": {

From 1b5d966ecace536ad46b3d13c31a4bc862e4c88d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Nov 2024 20:06:10 +0000
Subject: [PATCH 116/135] Bump codecov/codecov-action from 4 to 5 in the
 all-actions group

Bumps the all-actions group with 1 update: [codecov/codecov-action](https://github.com/codecov/codecov-action).


Updates `codecov/codecov-action` from 4 to 5
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/v4...v5)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: all-actions
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/php.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 16cad63..08715b1 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -273,7 +273,7 @@ jobs:
           path: ${{ github.workspace }}/build
 
       - name: Codecov
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           fail_ci_if_error: true

From 06f1997bac1c9d5aae7d836e5ddc9d12ae60adbc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Jul 2025 21:50:47 +0000
Subject: [PATCH 117/135] Bump super-linter/super-linter from 7 to 8 in the
 all-actions group

Bumps the all-actions group with 1 update: [super-linter/super-linter](https://github.com/super-linter/super-linter).


Updates `super-linter/super-linter` from 7 to 8
- [Release notes](https://github.com/super-linter/super-linter/releases)
- [Changelog](https://github.com/super-linter/super-linter/blob/main/CHANGELOG.md)
- [Commits](https://github.com/super-linter/super-linter/compare/v7...v8)

---
updated-dependencies:
- dependency-name: super-linter/super-linter
  dependency-version: '8'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: all-actions
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/php.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 08715b1..211f36e 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -24,7 +24,7 @@ jobs:
           fetch-depth: 0
 
       - name: Lint Code Base
-        uses: super-linter/super-linter/slim@v7
+        uses: super-linter/super-linter/slim@v8
         env:
           SAVE_SUPER_LINTER_OUTPUT: false
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 358714dbac22ca68b810eacd5a34f6f468ebc5de Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Aug 2025 04:18:35 +0000
Subject: [PATCH 118/135] Bump the all-actions group with 2 updates

Bumps the all-actions group with 2 updates: [actions/checkout](https://github.com/actions/checkout) and [actions/download-artifact](https://github.com/actions/download-artifact).


Updates `actions/checkout` from 4 to 5
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4...v5)

Updates `actions/download-artifact` from 4 to 5
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: all-actions
- dependency-name: actions/download-artifact
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: all-actions
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/documentation.yml |  2 +-
 .github/workflows/php.yml           | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index cfc066d..3ff53ea 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: [ubuntu-latest]
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Lint markdown files
         uses: nosborn/github-action-markdown-cli@v3
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 211f36e..e310c5d 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ['ubuntu-latest']
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0
 
@@ -58,7 +58,7 @@ jobs:
       - name: Setup problem matchers for PHP
         run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
 
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Get composer cache directory
         run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$GITHUB_ENV"
@@ -124,7 +124,7 @@ jobs:
       - name: Setup problem matchers for PHP
         run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
 
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Get composer cache directory
         run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$GITHUB_ENV"
@@ -180,7 +180,7 @@ jobs:
           git config --global core.autocrlf false
           git config --global core.eol lf
 
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Get composer cache directory
         run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$GITHUB_ENV"
@@ -242,7 +242,7 @@ jobs:
           git config --global core.autocrlf false
           git config --global core.eol lf
 
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Get composer cache directory
         run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$env:GITHUB_ENV"
@@ -265,9 +265,9 @@ jobs:
     runs-on: [ubuntu-latest]
     needs: [unit-tests-linux]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v5
         with:
           name: coverage-data
           path: ${{ github.workspace }}/build

From 48e6231c75f41458c431057caca0a147247cea66 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Sep 2025 19:28:24 +0000
Subject: [PATCH 119/135] Bump actions/github-script from 7 to 8 in the
 all-actions group

Bumps the all-actions group with 1 update: [actions/github-script](https://github.com/actions/github-script).


Updates `actions/github-script` from 7 to 8
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](https://github.com/actions/github-script/compare/v7...v8)

---
updated-dependencies:
- dependency-name: actions/github-script
  dependency-version: '8'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: all-actions
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/documentation.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index 3ff53ea..8fbac93 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -41,7 +41,7 @@ jobs:
     steps:
       - name: Run docs build
         if: github.event_name != 'pull_request'
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           # Token has to be generated on a user account that controls the docs-repository.
           # The _only_ scope to select is "Access public repositories", nothing more.

From 0137a60d1100f12e6d32e4c4cbe04d87fa208dd2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Oct 2025 20:55:59 +0000
Subject: [PATCH 120/135] Bump the all-actions group with 2 updates

Bumps the all-actions group with 2 updates: [actions/upload-artifact](https://github.com/actions/upload-artifact) and [actions/download-artifact](https://github.com/actions/download-artifact).


Updates `actions/upload-artifact` from 4 to 5
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v4...v5)

Updates `actions/download-artifact` from 5 to 6
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/v5...v6)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: all-actions
- dependency-name: actions/download-artifact
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: all-actions
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/php.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index e310c5d..78b36d1 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -205,7 +205,7 @@ jobs:
 
       - name: Save coverage data
         if: ${{ matrix.php-versions == '8.3' }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: coverage-data
           path: ${{ github.workspace }}/build
@@ -267,7 +267,7 @@ jobs:
     steps:
       - uses: actions/checkout@v5
 
-      - uses: actions/download-artifact@v5
+      - uses: actions/download-artifact@v6
         with:
           name: coverage-data
           path: ${{ github.workspace }}/build

From bc905680e26338dc429a3a0f9fefe8a45040040c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Nov 2025 19:31:11 +0000
Subject: [PATCH 121/135] Bump actions/checkout from 5 to 6 in the all-actions
 group

Bumps the all-actions group with 1 update: [actions/checkout](https://github.com/actions/checkout).


Updates `actions/checkout` from 5 to 6
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v5...v6)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: all-actions
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/documentation.yml |  2 +-
 .github/workflows/php.yml           | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index 8fbac93..8479227 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: [ubuntu-latest]
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Lint markdown files
         uses: nosborn/github-action-markdown-cli@v3
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 78b36d1..f40a75a 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ['ubuntu-latest']
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
@@ -58,7 +58,7 @@ jobs:
       - name: Setup problem matchers for PHP
         run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
 
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Get composer cache directory
         run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$GITHUB_ENV"
@@ -124,7 +124,7 @@ jobs:
       - name: Setup problem matchers for PHP
         run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
 
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Get composer cache directory
         run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$GITHUB_ENV"
@@ -180,7 +180,7 @@ jobs:
           git config --global core.autocrlf false
           git config --global core.eol lf
 
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Get composer cache directory
         run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$GITHUB_ENV"
@@ -242,7 +242,7 @@ jobs:
           git config --global core.autocrlf false
           git config --global core.eol lf
 
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Get composer cache directory
         run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$env:GITHUB_ENV"
@@ -265,7 +265,7 @@ jobs:
     runs-on: [ubuntu-latest]
     needs: [unit-tests-linux]
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - uses: actions/download-artifact@v6
         with:

From 880490af1c3048d3fdee3862296dd6c4730f9e5f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Dec 2025 19:08:56 +0000
Subject: [PATCH 122/135] Bump the all-actions group with 4 updates

Bumps the all-actions group with 4 updates: [dessant/lock-threads](https://github.com/dessant/lock-threads), [actions/cache](https://github.com/actions/cache), [actions/upload-artifact](https://github.com/actions/upload-artifact) and [actions/download-artifact](https://github.com/actions/download-artifact).


Updates `dessant/lock-threads` from 5 to 6
- [Release notes](https://github.com/dessant/lock-threads/releases)
- [Changelog](https://github.com/dessant/lock-threads/blob/main/CHANGELOG.md)
- [Commits](https://github.com/dessant/lock-threads/compare/v5...v6)

Updates `actions/cache` from 4 to 5
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v4...v5)

Updates `actions/upload-artifact` from 5 to 6
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v5...v6)

Updates `actions/download-artifact` from 6 to 7
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/v6...v7)

---
updated-dependencies:
- dependency-name: dessant/lock-threads
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: all-actions
- dependency-name: actions/cache
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: all-actions
- dependency-name: actions/upload-artifact
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: all-actions
- dependency-name: actions/download-artifact
  dependency-version: '7'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: all-actions
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/autolock-conversations.yml |  2 +-
 .github/workflows/php.yml                    | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/autolock-conversations.yml b/.github/workflows/autolock-conversations.yml
index 3c7be52..66797ba 100644
--- a/.github/workflows/autolock-conversations.yml
+++ b/.github/workflows/autolock-conversations.yml
@@ -18,7 +18,7 @@ jobs:
   action:
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v5
+      - uses: dessant/lock-threads@v6
         with:
           issue-inactive-days: '90'
           pr-inactive-days: '90'
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index f40a75a..046ea3d 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -64,7 +64,7 @@ jobs:
         run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$GITHUB_ENV"
 
       - name: Cache composer dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: $COMPOSER_CACHE
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -130,7 +130,7 @@ jobs:
         run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$GITHUB_ENV"
 
       - name: Cache composer dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: $COMPOSER_CACHE
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -186,7 +186,7 @@ jobs:
         run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$GITHUB_ENV"
 
       - name: Cache composer dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: $COMPOSER_CACHE
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -205,7 +205,7 @@ jobs:
 
       - name: Save coverage data
         if: ${{ matrix.php-versions == '8.3' }}
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: coverage-data
           path: ${{ github.workspace }}/build
@@ -248,7 +248,7 @@ jobs:
         run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$env:GITHUB_ENV"
 
       - name: Cache composer dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: $COMPOSER_CACHE
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -267,7 +267,7 @@ jobs:
     steps:
       - uses: actions/checkout@v6
 
-      - uses: actions/download-artifact@v6
+      - uses: actions/download-artifact@v7
         with:
           name: coverage-data
           path: ${{ github.workspace }}/build

From 2c90f65fab5884acd47faaa333efae4c08cd2836 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Wed, 17 Dec 2025 23:00:35 +0100
Subject: [PATCH 123/135] Fix: truthy codecov

---
 codecov.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/codecov.yml b/codecov.yml
index f9d26c6..42f0116 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -10,8 +10,8 @@ comment:
   layout: "diff"
   behavior: once
   require_changes: true
-  require_base: no
-  require_head: yes
+  require_base: false
+  require_head: true
   branches: null
 
 github_checks:

From fc7f94df715f363d45cc9e15f5f33ffd15d03465 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Mon, 5 Jan 2026 22:14:47 +0100
Subject: [PATCH 124/135] Bump minimum PHP version, replace super-linter

---
 .github/workflows/php.yml                 | 267 +++++++++++-----------
 codecov.yml                               |   4 +-
 composer.json                             |  14 +-
 phpstan-dev.neon                          |   4 +
 phpstan.neon                              |   4 +
 psalm-dev.xml                             |  27 ---
 psalm.xml                                 |  32 ---
 public/assets/js/consentAdmin.js          |  20 +-
 routing/routes/routes.yml                 |  18 +-
 src/Controller/ConsentAdmin.php           |  15 +-
 tests/src/Controller/ConsentAdminTest.php |  39 +++-
 tools/linters/.stylelintrc.json           |  14 ++
 tools/linters/.yaml-lint.yml              |   7 +
 tools/linters/eslint.config.js            |  19 ++
 14 files changed, 248 insertions(+), 236 deletions(-)
 create mode 100644 phpstan-dev.neon
 create mode 100644 phpstan.neon
 delete mode 100644 psalm-dev.xml
 delete mode 100644 psalm.xml
 create mode 100644 tools/linters/.stylelintrc.json
 create mode 100644 tools/linters/.yaml-lint.yml
 create mode 100644 tools/linters/eslint.config.js

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 046ea3d..e16b8c7 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -14,50 +14,62 @@ on:  # yamllint disable-line rule:truthy
   workflow_dispatch:
 
 jobs:
+  phplinter:
+    name: 'PHP-Linter'
+    strategy:
+      fail-fast: false
+      matrix:
+        php-version: ['8.3', '8.4', '8.5']
+
+    uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_phplinter.yml@v1.11.0
+    with:
+      php-version: ${{ matrix.php-version }}
+
   linter:
-    name: Linter
-    runs-on: ['ubuntu-latest']
+    name: 'Linter'
+    strategy:
+      fail-fast: false
 
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-
-      - name: Lint Code Base
-        uses: super-linter/super-linter/slim@v8
-        env:
-          SAVE_SUPER_LINTER_OUTPUT: false
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          LINTER_RULES_PATH: 'tools/linters'
-          LOG_LEVEL: NOTICE
-          VALIDATE_ALL_CODEBASE: true
-          VALIDATE_CSS: true
-          VALIDATE_JAVASCRIPT_ES: true
-          VALIDATE_JSON: true
-          VALIDATE_PHP_BUILTIN: true
-          VALIDATE_YAML: true
-          VALIDATE_XML: true
-          VALIDATE_GITHUB_ACTIONS: true
+    uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_linter.yml@v1.11.0
+    with:
+      enable_eslinter: true
+      enable_jsonlinter: true
+      enable_stylelinter: true
+      enable_yamllinter: true
 
-  quality:
-    name: Quality control
-    runs-on: [ubuntu-latest]
+  unit-tests-linux:
+    name: "Unit tests, PHP ${{ matrix.php-versions }}, ${{ matrix.operating-system }}"
+    runs-on: ${{ matrix.operating-system }}
+    needs: [phplinter, linter]
+
+    strategy:
+      fail-fast: false
+      matrix:
+        operating-system: [ubuntu-latest]
+        php-versions: ['8.3', '8.4', '8.5']
 
     steps:
       - name: Setup PHP, with composer and extensions
-        id: setup-php
         # https://github.com/shivammathur/setup-php
         uses: shivammathur/setup-php@v2
         with:
-          # Should be the higest supported version, so we can use the newest tools
-          php-version: '8.3'
-          tools: composer, composer-require-checker, composer-unused, phpcs, psalm
-          # optional performance gain for psalm: opcache
-          extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, opcache, openssl, pcre, posix, spl, xml
+          php-version: ${{ matrix.php-versions }}
+          extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, openssl, pcre, posix, sodium, spl, xml
+          tools: composer
+          ini-values: error_reporting=E_ALL
+          coverage: pcov
 
       - name: Setup problem matchers for PHP
         run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
 
+      - name: Setup problem matchers for PHPUnit
+        run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
+
+      - name: Set git to use LF
+        run: |
+          git config --global core.autocrlf false
+          git config --global core.eol lf
+
       - uses: actions/checkout@v6
 
       - name: Get composer cache directory
@@ -66,120 +78,101 @@ jobs:
       - name: Cache composer dependencies
         uses: actions/cache@v5
         with:
-          path: $COMPOSER_CACHE
+          path: ${{ env.COMPOSER_CACHE }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
 
-      - name: Validate composer.json and composer.lock
-        run: composer validate
-
       - name: Install Composer dependencies
         run: composer install --no-progress --prefer-dist --optimize-autoloader
 
-      - name: Check code for hard dependencies missing in composer.json
-        run: composer-require-checker check --config-file=tools/composer-require-checker.json composer.json
-
-      - name: Check code for unused dependencies in composer.json
-        run: composer-unused
+      - name: Run unit tests with coverage
+        if: ${{ matrix.php-versions == '8.5' }}
+        run: vendor/bin/phpunit
 
-      - name: PHP Code Sniffer
-        run: phpcs
+      - name: Run unit tests (no coverage)
+        if: ${{ matrix.php-versions != '8.5' }}
+        run: vendor/bin/phpunit --no-coverage
 
-      - name: Psalm
-        continue-on-error: true
-        run: |
-          psalm -c psalm.xml \
-          --show-info=true \
-          --shepherd \
-          --php-version=${{ steps.setup-php.outputs.php-version }}
+      - name: Save coverage data
+        if: ${{ matrix.php-versions == '8.5' }}
+        uses: actions/upload-artifact@v6
+        with:
+          name: coverage-data
+          path: ${{ github.workspace }}/build
 
-      - name: Psalm (testsuite)
-        run: |
-          psalm -c psalm-dev.xml \
-          --show-info=true \
-          --shepherd \
-          --php-version=${{ steps.setup-php.outputs.php-version }}
+  unit-tests-windows:
+    name: "Unit tests, PHP ${{ matrix.php-versions }}, ${{ matrix.operating-system }}"
+    runs-on: ${{ matrix.operating-system }}
+    needs: [phplinter, linter]
 
-      - name: Psalter
-        run: |
-          psalm --alter \
-          --issues=UnnecessaryVarAnnotation \
-          --dry-run \
-          --php-version=${{ steps.setup-php.outputs.php-version }}
+    strategy:
+      fail-fast: true
+      matrix:
+        operating-system: [windows-latest]
+        php-versions: ['8.3', '8.4', '8.5']
 
-  security:
-    name: Security checks
-    runs-on: [ubuntu-latest]
     steps:
       - name: Setup PHP, with composer and extensions
         # https://github.com/shivammathur/setup-php
         uses: shivammathur/setup-php@v2
         with:
-          # Should be the lowest supported version
-          php-version: '8.1'
-          extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, openssl, pcre, posix, spl, xml
+          php-version: ${{ matrix.php-versions }}
+          extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, openssl,\
+            pcre, posix, sodium, spl, xml, zip
           tools: composer
+          ini-values: error_reporting=E_ALL
           coverage: none
 
       - name: Setup problem matchers for PHP
         run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
 
+      - name: Setup problem matchers for PHPUnit
+        run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
+
+      - name: Set git to use LF
+        run: |
+          git config --global core.autocrlf false
+          git config --global core.eol lf
+
       - uses: actions/checkout@v6
 
       - name: Get composer cache directory
-        run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$GITHUB_ENV"
+        run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$env:GITHUB_ENV"
 
       - name: Cache composer dependencies
         uses: actions/cache@v5
         with:
-          path: $COMPOSER_CACHE
+          path: ${{ env.COMPOSER_CACHE }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
 
       - name: Install Composer dependencies
-        run: composer install --no-progress --prefer-dist --optimize-autoloader
-
-      - name: Security check for locked dependencies
-        run: composer audit
-
-      - name: Update Composer dependencies
-        run: composer update --no-progress --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader --ignore-platform-req=ext-posix
 
-      - name: Security check for updated dependencies
-        run: composer audit
+      - name: Run unit tests
+        run: vendor/bin/phpunit --no-coverage
 
-  unit-tests-linux:
-    name: "Unit tests, PHP ${{ matrix.php-versions }}, ${{ matrix.operating-system }}"
-    runs-on: ${{ matrix.operating-system }}
-    needs: [linter, quality, security]
-    strategy:
-      fail-fast: false
-      matrix:
-        operating-system: [ubuntu-latest]
-        php-versions: ['8.1', '8.2', '8.3']
+  quality:
+    name: Quality control
+    needs: [unit-tests-linux]
+    runs-on: [ubuntu-latest]
 
     steps:
       - name: Setup PHP, with composer and extensions
+        id: setup-php
         # https://github.com/shivammathur/setup-php
         uses: shivammathur/setup-php@v2
         with:
-          php-version: ${{ matrix.php-versions }}
-          extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, openssl, pcre, posix, spl, xml
-          tools: composer
-          ini-values: error_reporting=E_ALL
-          coverage: pcov
+          # Should be the higest supported version, so we can use the newest tools
+          php-version: '8.5'
+          tools: composer, composer-require-checker, composer-unused
+          # optional performance gain for psalm: opcache
+          extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, opcache, openssl,\
+            pcre, posix, sodium, spl, xml
 
       - name: Setup problem matchers for PHP
         run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
 
-      - name: Setup problem matchers for PHPUnit
-        run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
-
-      - name: Set git to use LF
-        run: |
-          git config --global core.autocrlf false
-          git config --global core.eol lf
-
       - uses: actions/checkout@v6
 
       - name: Get composer cache directory
@@ -188,77 +181,75 @@ jobs:
       - name: Cache composer dependencies
         uses: actions/cache@v5
         with:
-          path: $COMPOSER_CACHE
+          path: ${{ env.COMPOSER_CACHE }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
 
+      - name: Validate composer.json and composer.lock
+        run: composer validate
+
       - name: Install Composer dependencies
         run: composer install --no-progress --prefer-dist --optimize-autoloader
 
-      - name: Run unit tests with coverage
-        if: ${{ matrix.php-versions == '8.3' }}
-        run: vendor/bin/phpunit
+      - name: Check code for hard dependencies missing in composer.json
+        run: composer-require-checker check --config-file=tools/composer-require-checker.json composer.json
 
-      - name: Run unit tests (no coverage)
-        if: ${{ matrix.php-versions != '8.3' }}
-        run: vendor/bin/phpunit --no-coverage
+      - name: Check code for unused dependencies in composer.json
+        run: composer-unused
 
-      - name: Save coverage data
-        if: ${{ matrix.php-versions == '8.3' }}
-        uses: actions/upload-artifact@v6
-        with:
-          name: coverage-data
-          path: ${{ github.workspace }}/build
+      - name: PHP Code Sniffer
+        run: vendor/bin/phpcs
 
-  unit-tests-windows:
-    name: "Unit tests, PHP ${{ matrix.php-versions }}, ${{ matrix.operating-system }}"
-    runs-on: ${{ matrix.operating-system }}
-    needs: [linter, quality, security]
-    strategy:
-      fail-fast: true
-      matrix:
-        operating-system: [windows-latest]
-        php-versions: ['8.1', '8.2', '8.3']
+      - name: PHPStan
+        run: |
+          vendor/bin/phpstan analyze -c phpstan.neon
+
+      - name: PHPStan (testsuite)
+        run: |
+          vendor/bin/phpstan analyze -c phpstan-dev.neon
+
+  security:
+    name: Security checks
+    needs: [unit-tests-linux]
+    runs-on: [ubuntu-latest]
 
     steps:
       - name: Setup PHP, with composer and extensions
         # https://github.com/shivammathur/setup-php
         uses: shivammathur/setup-php@v2
         with:
-          php-version: ${{ matrix.php-versions }}
-          extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, openssl, pcre, posix, spl, xml
+          # Should be the lowest supported version
+          php-version: '8.3'
+          extensions: ctype, date, dom, fileinfo, filter, hash, intl, mbstring, openssl, pcre, posix, sodium, spl, xml
           tools: composer
-          ini-values: error_reporting=E_ALL
           coverage: none
 
       - name: Setup problem matchers for PHP
         run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
 
-      - name: Setup problem matchers for PHPUnit
-        run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
-
-      - name: Set git to use LF
-        run: |
-          git config --global core.autocrlf false
-          git config --global core.eol lf
-
       - uses: actions/checkout@v6
 
       - name: Get composer cache directory
-        run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$env:GITHUB_ENV"
+        run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$GITHUB_ENV"
 
       - name: Cache composer dependencies
         uses: actions/cache@v5
         with:
-          path: $COMPOSER_CACHE
+          path: ${{ env.COMPOSER_CACHE }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
 
       - name: Install Composer dependencies
-        run: composer install --no-progress --prefer-dist --optimize-autoloader --ignore-platform-req=ext-posix
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
 
-      - name: Run unit tests
-        run: vendor/bin/phpunit --no-coverage
+      - name: Security check for locked dependencies
+        run: composer audit
+
+      - name: Update Composer dependencies
+        run: composer update --no-progress --prefer-dist --optimize-autoloader
+
+      - name: Security check for updated dependencies
+        run: composer audit
 
   coverage:
     name: Code coverage
diff --git a/codecov.yml b/codecov.yml
index 42f0116..dac692c 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -1,10 +1,12 @@
+---
+
 coverage:
   status:
     project:
       default:
         target: 0%
         threshold: 2%
-    patch: off
+    patch: false
 
 comment:
   layout: "diff"
diff --git a/composer.json b/composer.json
index bf4f491..c5504bf 100644
--- a/composer.json
+++ b/composer.json
@@ -38,16 +38,16 @@
         }
     },
     "require": {
-        "php": "^8.1",
+        "php": "^8.3",
 
-        "simplesamlphp/assert": "^1.1.0",
-        "simplesamlphp/composer-module-installer": "^1.3.4",
-        "simplesamlphp/simplesamlphp": "^2.2",
-        "simplesamlphp/simplesamlphp-module-consent": "^1.3.0",
-        "symfony/http-foundation": "^6.4.0"
+        "simplesamlphp/assert": "^1.9",
+        "simplesamlphp/composer-module-installer": "^1.5",
+        "simplesamlphp/simplesamlphp": "^2.5@dev",
+        "simplesamlphp/simplesamlphp-module-consent": "^1.5",
+        "symfony/http-foundation": "^7.4"
     },
     "require-dev": {
-        "simplesamlphp/simplesamlphp-test-framework": "^1.7.0"
+        "simplesamlphp/simplesamlphp-test-framework": "^1.11"
     },
     "extra": {
         "ssp-mixedcase-module-name": "consentAdmin"
diff --git a/phpstan-dev.neon b/phpstan-dev.neon
new file mode 100644
index 0000000..09d9773
--- /dev/null
+++ b/phpstan-dev.neon
@@ -0,0 +1,4 @@
+parameters:
+  level: 5
+  paths:
+    - tests
diff --git a/phpstan.neon b/phpstan.neon
new file mode 100644
index 0000000..db37782
--- /dev/null
+++ b/phpstan.neon
@@ -0,0 +1,4 @@
+parameters:
+  level: 6
+  paths:
+    - src
diff --git a/psalm-dev.xml b/psalm-dev.xml
deleted file mode 100644
index 6116331..0000000
--- a/psalm-dev.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<psalm
-    name="SimpleSAMLphp testsuite"
-    useDocblockTypes="true"
-    errorLevel="4"
-    reportMixedIssues="false"
-    hideExternalErrors="true"
-    allowStringToStandInForClass="true"
->
-    <projectFiles>
-        <directory name="tests" />
-
-        <!-- Ignore certain directories -->
-        <ignoreFiles>
-            <directory name="vendor" />
-        </ignoreFiles>
-    </projectFiles>
-
-    <issueHandlers>
-        <!-- Ignore UnresolvableInclude on CLI-scripts -->
-        <UnresolvableInclude>
-            <errorLevel type="suppress">
-                <file name="tests/bootstrap.php" />
-            </errorLevel>
-        </UnresolvableInclude>
-    </issueHandlers>
-</psalm>
diff --git a/psalm.xml b/psalm.xml
deleted file mode 100644
index fdfd064..0000000
--- a/psalm.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<psalm
-    name="SimpleSAMLphp consent admin module"
-    useDocblockTypes="true"
-    errorLevel="2"
-    reportMixedIssues="false"
->
-    <projectFiles>
-        <directory name="hooks" />
-        <directory name="public" />
-        <directory name="src" />
-    </projectFiles>
-
-    <issueHandlers>
-        <LessSpecificReturnType errorLevel="info" />
-
-        <!-- level 3 issues - slightly lazy code writing, but probably low false-negatives -->
-        <DeprecatedMethod errorLevel="info" />
-
-        <MissingClosureReturnType errorLevel="info" />
-        <MissingReturnType errorLevel="info" />
-        <MissingPropertyType errorLevel="info" />
-        <InvalidDocblock errorLevel="info" />
-
-        <PropertyNotSetInConstructor errorLevel="info" />
-        <MissingConstructor errorLevel="info" />
-        <MissingClosureParamType errorLevel="info" />
-        <MissingParamType errorLevel="info" />
-        <UnusedClass errorLevel="info" />
-        <PossiblyUnusedMethod errorLevel="info" />
-    </issueHandlers>
-</psalm>
diff --git a/public/assets/js/consentAdmin.js b/public/assets/js/consentAdmin.js
index 44402d0..b9deb52 100644
--- a/public/assets/js/consentAdmin.js
+++ b/public/assets/js/consentAdmin.js
@@ -5,25 +5,25 @@ function checkConsent()
     var show_spid = this.id.charAt(this.id.length - 1);
     var checkbox = document.getElementById("checkbox_" + show_spid);
 
-    xmlHttp = GetXmlHttpObject()
+    xmlHttp = GetXmlHttpObject();
     if (xmlHttp === null) {
-        alert("Browser does not support HTTP Request")
-        return
+        alert("Browser does not support HTTP Request");
+        return;
     }
 
-    var url = "consentAdmin.php"
-    url = url + "?cv=" + checkbox.value
-    url = url + "&action=" + checkbox.checked
-    url = url + "&sid=" + Math.random()
+    var url = "consentAdmin.php";
+    url = url + "?cv=" + checkbox.value;
+    url = url + "&action=" + checkbox.checked;
+    url = url + "&sid=" + Math.random();
 
     xmlHttp.onreadystatechange = function () {
         if (xmlHttp.readyState == 4 || xmlHttp.readyState == "complete") {
             document.getElementById("consentText_" + show_spid).innerHTML = xmlHttp.responseText;
         }
-    }
+    };
 
-    xmlHttp.open("GET", url, true)
-    xmlHttp.send(null)
+    xmlHttp.open("GET", url, true);
+    xmlHttp.send(null);
 }
 
 // This function creates an XMLHttpRequest
diff --git a/routing/routes/routes.yml b/routing/routes/routes.yml
index 5c39acb..dda2147 100644
--- a/routing/routes/routes.yml
+++ b/routing/routes/routes.yml
@@ -1,9 +1,15 @@
+---
+
 consentadmin-main:
-    path:       /
-    defaults:   { _controller: 'SimpleSAML\Module\consentAdmin\Controller\ConsentAdmin::main' }
-    methods: [GET]
+  path: /
+  defaults: {
+    _controller: 'SimpleSAML\Module\consentAdmin\Controller\ConsentAdmin::main'
+  }
+  methods: [GET]
 
 consentadmin-logout:
-    path:       /logout
-    defaults:   { _controller: 'SimpleSAML\Module\consentAdmin\Controller\ConsentAdmin::logout' }
-    methods: [GET]
+  path: /logout
+  defaults: {
+    _controller: 'SimpleSAML\Module\consentAdmin\Controller\ConsentAdmin::logout'
+  }
+  methods: [GET]
diff --git a/src/Controller/ConsentAdmin.php b/src/Controller/ConsentAdmin.php
index fd19d75..9869adf 100644
--- a/src/Controller/ConsentAdmin.php
+++ b/src/Controller/ConsentAdmin.php
@@ -225,7 +225,6 @@ public function main(Request $request): Template
             $template = new Template(
                 $this->config,
                 'consentAdmin:consentadminajax.twig',
-                'consentAdmin:consentadmin',
             );
 
             // Get SP metadata
@@ -270,7 +269,7 @@ public function main(Request $request): Template
         }
 
         // Init template
-        $template = new Template($this->config, 'consentAdmin:consentadmin.twig', 'consentAdmin:consentadmin');
+        $template = new Template($this->config, 'consentAdmin:consentadmin.twig');
         $template->getLocalization()->addAttributeDomains();
 
         $sp_list = [];
@@ -340,15 +339,15 @@ public function main(Request $request): Template
      * Runs the processing chain and ignores all filter which have user
      * interaction.
      *
-     * @param array $idp_metadata
+     * @param array<mixed> $idp_metadata
      * @param string $source
-     * @param array $sp_metadata
+     * @param array<mixed> $sp_metadata
      * @param string $sp_entityid
-     * @param array $attributes
+     * @param array<mixed> $attributes
      * @param string $userid
      * @param bool $hashAttributes
-     * @param array $excludeAttributes
-     * @return array
+     * @param string[] $excludeAttributes
+     * @return array<mixed>
      */
     private function driveProcessingChain(
         array $idp_metadata,
@@ -380,7 +379,7 @@ private function driveProcessingChain(
 
         /* we're being bridged, so add that info to the state */
         if (strpos($source, '-idp-remote|') !== false) {
-            /** @var int $i */
+            /** @var int<0, max> $i */
             $i = strpos($source, '|');
             $authProcState['saml:sp:IdP'] = substr($source, $i + 1);
         }
diff --git a/tests/src/Controller/ConsentAdminTest.php b/tests/src/Controller/ConsentAdminTest.php
index 88ff712..312aafb 100644
--- a/tests/src/Controller/ConsentAdminTest.php
+++ b/tests/src/Controller/ConsentAdminTest.php
@@ -14,7 +14,6 @@
 use SimpleSAML\Module\consent\Store;
 use SimpleSAML\Module\consentAdmin\Controller;
 use SimpleSAML\Session;
-use SimpleSAML\XHTML\Template;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
@@ -98,14 +97,20 @@ public function logout($params = null): void
             {
                 // stub
             }
+
+
             public function requireAuth(array $params = []): void
             {
                 // stub
             }
+
+
             public function getAttributes(): array
             {
                 return ['eduPersonPrincipalName' => 'tester'];
             }
+
+
             public function getAuthData(string $name = ''): mixed
             {
                 if ($name === 'saml:sp:IdP') {
@@ -120,14 +125,20 @@ public function __construct()
             {
                 // stub
             }
+
+
             public function getMetaDataCurrentEntityID(string $set, string $type = 'entityid'): string
             {
                 return 'localhost/simplesaml';
             }
+
+
             public function getMetaData(?string $entityId, string $set): array
             {
                 return ['entityid' => 'localhost/simplesaml', 'metadata-set' => 'saml20-idp-hosted'];
             }
+
+
             public function getList(string $set = 'saml20-idp-hosted', bool $showExpired = false): array
             {
                 return [];
@@ -139,33 +150,45 @@ public static function getHashedUserID(string $userid, string $source): string
             {
                 return 'abc123@simplesamlphp.org';
             }
+
+
             public static function getTargetedID(string $userid, string $source, string $destination): string
             {
                 return hash('sha1', 'abc123@simplesamlphp.org');
             }
         };
 
-        $this->store = new class ([]) extends Store {
-            public function __construct(array $config)
+        $this->store = new class () extends Store {
+            public function __construct()
             {
                 // stub
             }
+
+
             public function saveConsent(string $userId, string $destinationId, string $attributeSet): bool
             {
                  return true;
             }
+
+
             public function deleteConsent(string $userId, string $destinationId): int
             {
                 return 1;
             }
+
+
             public function getConsents(string $userId): array
             {
                 return [];
             }
+
+
             public function hasConsent(string $userId, string $destinationId, string $attributeSet): bool
             {
                 return true;
             }
+
+
             public static function parseStoreConfig($config): Store
             {
                 return new class ($config) extends Database {
@@ -173,14 +196,20 @@ public function saveConsent(string $userId, string $destinationId, string $attri
                     {
                         return true;
                     }
+
+
                     public function deleteConsent(string $userId, string $destinationId): int
                     {
                         return 1;
                     }
+
+
                     public function getConsents(string $userId): array
                     {
                         return [];
                     }
+
+
                     public function hasConsent(string $userId, string $destinationId, string $attributeSet): bool
                     {
                         return true;
@@ -215,7 +244,6 @@ public function testMainActionTrue(): void
         $result = $c->main($request);
 
         $this->assertTrue($result->isSuccessful());
-        $this->assertInstanceOf(Template::class, $result);
     }
 
 
@@ -243,7 +271,6 @@ public function testMainActionFalse(): void
         $result = $c->main($request);
 
         $this->assertTrue($result->isSuccessful());
-        $this->assertInstanceOf(Template::class, $result);
     }
 
 
@@ -270,7 +297,6 @@ public function testMainActionUnknown(): void
         $result = $c->main($request);
 
         $this->assertTrue($result->isSuccessful());
-        $this->assertInstanceOf(Template::class, $result);
     }
 
 
@@ -298,6 +324,5 @@ public function testMainNoAction(): void
         $result = $c->main($request);
 
         $this->assertTrue($result->isSuccessful());
-        $this->assertInstanceOf(Template::class, $result);
     }
 }
diff --git a/tools/linters/.stylelintrc.json b/tools/linters/.stylelintrc.json
new file mode 100644
index 0000000..a278b06
--- /dev/null
+++ b/tools/linters/.stylelintrc.json
@@ -0,0 +1,14 @@
+{
+  "overrides": [
+    {
+      "files": ["*.scss", "**/*.scss"],
+      "customSyntax": "postcss-scss"
+    }
+  ],
+  "rules": {
+    "no-descending-specificity": null,
+    "property-no-vendor-prefix": null,
+    "selector-class-pattern": null,
+    "selector-id-pattern": null
+  }
+}
diff --git a/tools/linters/.yaml-lint.yml b/tools/linters/.yaml-lint.yml
new file mode 100644
index 0000000..630095a
--- /dev/null
+++ b/tools/linters/.yaml-lint.yml
@@ -0,0 +1,7 @@
+---
+
+extends: default
+
+rules:
+  line-length:
+    max: 120
diff --git a/tools/linters/eslint.config.js b/tools/linters/eslint.config.js
new file mode 100644
index 0000000..c1e1c39
--- /dev/null
+++ b/tools/linters/eslint.config.js
@@ -0,0 +1,19 @@
+// eslint.config.js
+const { defineConfig } = require("eslint/config");
+
+module.exports = defineConfig([
+    {
+        ignores: ["!/tools/linters/.eslint.config.js", "!/tools/linters/.stylelintrc.json"],
+        languageOptions: {
+            ecmaVersion: 2015,
+            sourceType: "module"
+        },
+        files: [
+            "**/*.js",
+        ],
+        rules: {
+            semi: "error",
+            "prefer-const": "error"
+        }
+    }
+]);

From 2b79936a9a31ebd4aa3bb784c17a367439001884 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Sat, 21 Feb 2026 00:17:32 +0100
Subject: [PATCH 125/135] Bump minimum PHP-version to 8.3, start testing on PHP
 8.5 and bump dependencies

---
 composer.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/composer.json b/composer.json
index c5504bf..3855cde 100644
--- a/composer.json
+++ b/composer.json
@@ -40,14 +40,14 @@
     "require": {
         "php": "^8.3",
 
-        "simplesamlphp/assert": "^1.9",
-        "simplesamlphp/composer-module-installer": "^1.5",
-        "simplesamlphp/simplesamlphp": "^2.5@dev",
-        "simplesamlphp/simplesamlphp-module-consent": "^1.5",
+        "simplesamlphp/assert": "~2.0",
+        "simplesamlphp/composer-module-installer": "~1.7",
+        "simplesamlphp/simplesamlphp": "~2.5@dev",
+        "simplesamlphp/simplesamlphp-module-consent": "~1.5",
         "symfony/http-foundation": "^7.4"
     },
     "require-dev": {
-        "simplesamlphp/simplesamlphp-test-framework": "^1.11"
+        "simplesamlphp/simplesamlphp-test-framework": "~1.11"
     },
     "extra": {
         "ssp-mixedcase-module-name": "consentAdmin"

From 41472751fef58db20d691314707d835a0d58827c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Mar 2026 21:04:15 +0000
Subject: [PATCH 126/135] Bump the all-actions group with 2 updates

Bumps the all-actions group with 2 updates: [actions/upload-artifact](https://github.com/actions/upload-artifact) and [actions/download-artifact](https://github.com/actions/download-artifact).


Updates `actions/upload-artifact` from 6 to 7
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v6...v7)

Updates `actions/download-artifact` from 7 to 8
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/v7...v8)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-version: '7'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: all-actions
- dependency-name: actions/download-artifact
  dependency-version: '8'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: all-actions
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/php.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index e16b8c7..703a16e 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -95,7 +95,7 @@ jobs:
 
       - name: Save coverage data
         if: ${{ matrix.php-versions == '8.5' }}
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: coverage-data
           path: ${{ github.workspace }}/build
@@ -258,7 +258,7 @@ jobs:
     steps:
       - uses: actions/checkout@v6
 
-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v8
         with:
           name: coverage-data
           path: ${{ github.workspace }}/build

From c1170b72bacbe27790d28df578eb4d0b79d8b9e7 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Mon, 9 Mar 2026 20:24:15 +0100
Subject: [PATCH 127/135] Bump artifact-actions

---
 .github/workflows/php.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 703a16e..7d8628e 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -21,7 +21,7 @@ jobs:
       matrix:
         php-version: ['8.3', '8.4', '8.5']
 
-    uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_phplinter.yml@v1.11.0
+    uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_phplinter.yml@v1.11.1
     with:
       php-version: ${{ matrix.php-version }}
 
@@ -30,7 +30,7 @@ jobs:
     strategy:
       fail-fast: false
 
-    uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_linter.yml@v1.11.0
+    uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_linter.yml@v1.11.1
     with:
       enable_eslinter: true
       enable_jsonlinter: true

From 2bf1b2910bc6322ed11cc3ada710040278414cba Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Mon, 9 Mar 2026 20:32:50 +0100
Subject: [PATCH 128/135] Fix incorrect case

---
 src/Controller/ConsentAdmin.php           | 10 +++++-----
 tests/src/Controller/ConsentAdminTest.php | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/Controller/ConsentAdmin.php b/src/Controller/ConsentAdmin.php
index 9869adf..28de626 100644
--- a/src/Controller/ConsentAdmin.php
+++ b/src/Controller/ConsentAdmin.php
@@ -41,7 +41,7 @@ class ConsentAdmin
     protected Session $session;
 
     /** @var \SimpleSAML\Metadata\MetaDataStorageHandler */
-    protected MetaDataStorageHandler $metadataStorageHandler;
+    protected MetaDataStorageHandler $metaDataStorageHandler;
 
     /**
      * @var \SimpleSAML\Auth\Simple|string
@@ -78,7 +78,7 @@ public function __construct(
     ) {
         $this->config = $config;
         $this->moduleConfig = Configuration::getConfig('module_consentAdmin.php');
-        $this->metadataStorageHandler = MetaDataStorageHandler::getMetadataHandler();
+        $this->metaDataStorageHandler = MetaDataStorageHandler::getMetadataHandler();
         $this->session = $session;
     }
 
@@ -110,9 +110,9 @@ public function setAuthSimple(Auth\Simple $authSimple): void
      *
      * @param \SimpleSAML\Metadata\MetaDataStorageHandler $handler
      */
-    public function setMetadataStorageHandler(MetadataStorageHandler $handler): void
+    public function setMetaDataStorageHandler(MetaDataStorageHandler $handler): void
     {
-        $this->metadataStorageHandler = $handler;
+        $this->metaDataStorageHandler = $handler;
     }
 
 
@@ -161,7 +161,7 @@ public function main(Request $request): Template
         $attributes = $as->getAttributes();
 
         // Get metadata storage handler
-        $metadata = $this->metadataStorageHandler;
+        $metadata = $this->metaDataStorageHandler;
 
         /*
          * Get IdP id and metadata
diff --git a/tests/src/Controller/ConsentAdminTest.php b/tests/src/Controller/ConsentAdminTest.php
index 312aafb..b08360d 100644
--- a/tests/src/Controller/ConsentAdminTest.php
+++ b/tests/src/Controller/ConsentAdminTest.php
@@ -38,7 +38,7 @@ class ConsentAdminTest extends TestCase
     protected Store $store;
 
     /** @var \SimpleSAML\Metadata\MetaDataStorageHandler */
-    protected MetaDataStorageHandler $metadataStorageHandler;
+    protected MetaDataStorageHandler $metaDataStorageHandler;
 
 
     /**
@@ -120,7 +120,7 @@ public function getAuthData(string $name = ''): mixed
             }
         };
 
-        $this->metadataStorageHandler = new class () extends MetaDataStorageHandler {
+        $this->metaDataStorageHandler = new class () extends MetaDataStorageHandler {
             public function __construct()
             {
                 // stub
@@ -238,7 +238,7 @@ public function testMainActionTrue(): void
 
         $c = new Controller\ConsentAdmin($this->config, $this->session);
         $c->setAuthSimple($this->authSimple);
-        $c->setMetadataStorageHandler($this->metadataStorageHandler);
+        $c->setMetaDataStorageHandler($this->metaDataStorageHandler);
         $c->setConsent($this->consent);
         $c->setStore($this->store);
         $result = $c->main($request);
@@ -265,7 +265,7 @@ public function testMainActionFalse(): void
 
         $c = new Controller\ConsentAdmin($this->config, $this->session);
         $c->setAuthSimple($this->authSimple);
-        $c->setMetadataStorageHandler($this->metadataStorageHandler);
+        $c->setMetaDataStorageHandler($this->metaDataStorageHandler);
         $c->setConsent($this->consent);
         $c->setStore($this->store);
         $result = $c->main($request);
@@ -292,7 +292,7 @@ public function testMainActionUnknown(): void
 
         $c = new Controller\ConsentAdmin($this->config, $this->session);
         $c->setAuthSimple($this->authSimple);
-        $c->setMetadataStorageHandler($this->metadataStorageHandler);
+        $c->setMetaDataStorageHandler($this->metaDataStorageHandler);
         $c->setConsent($this->consent);
         $result = $c->main($request);
 
@@ -318,7 +318,7 @@ public function testMainNoAction(): void
 
         $c = new Controller\ConsentAdmin($this->config, $this->session);
         $c->setAuthSimple($this->authSimple);
-        $c->setMetadataStorageHandler($this->metadataStorageHandler);
+        $c->setMetaDataStorageHandler($this->metaDataStorageHandler);
         $c->setConsent($this->consent);
         $c->setStore($this->store);
         $result = $c->main($request);

From e4f9927bd6fc741811b5f5cb1f80014d6caab98e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Mar 2026 19:38:40 +0000
Subject: [PATCH 129/135] Bump the all-actions group with 3 updates

Bumps the all-actions group with 3 updates: [simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_phplinter.yml](https://github.com/simplesamlphp/simplesamlphp-test-framework), [simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_linter.yml](https://github.com/simplesamlphp/simplesamlphp-test-framework) and [geekyeggo/delete-artifact](https://github.com/geekyeggo/delete-artifact).


Updates `simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_phplinter.yml` from 1.11.1 to 1.11.4
- [Commits](https://github.com/simplesamlphp/simplesamlphp-test-framework/compare/v1.11.1...v1.11.4)

Updates `simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_linter.yml` from 1.11.1 to 1.11.4
- [Commits](https://github.com/simplesamlphp/simplesamlphp-test-framework/compare/v1.11.1...v1.11.4)

Updates `geekyeggo/delete-artifact` from 5 to 6
- [Release notes](https://github.com/geekyeggo/delete-artifact/releases)
- [Changelog](https://github.com/GeekyEggo/delete-artifact/blob/main/CHANGELOG.md)
- [Commits](https://github.com/geekyeggo/delete-artifact/compare/v5...v6)

---
updated-dependencies:
- dependency-name: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_phplinter.yml
  dependency-version: 1.11.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-actions
- dependency-name: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_linter.yml
  dependency-version: 1.11.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-actions
- dependency-name: geekyeggo/delete-artifact
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: all-actions
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/php.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 7d8628e..ec52e07 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -21,7 +21,7 @@ jobs:
       matrix:
         php-version: ['8.3', '8.4', '8.5']
 
-    uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_phplinter.yml@v1.11.1
+    uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_phplinter.yml@v1.11.4
     with:
       php-version: ${{ matrix.php-version }}
 
@@ -30,7 +30,7 @@ jobs:
     strategy:
       fail-fast: false
 
-    uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_linter.yml@v1.11.1
+    uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_linter.yml@v1.11.4
     with:
       enable_eslinter: true
       enable_jsonlinter: true
@@ -280,6 +280,6 @@ jobs:
       (needs.unit-tests-linux.result == 'success' && needs.coverage.result == 'skipped')
 
     steps:
-      - uses: geekyeggo/delete-artifact@v5
+      - uses: geekyeggo/delete-artifact@v6
         with:
           name: coverage-data

From 179464473fdd57b4aee7127c75e73731b10ce933 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Mar 2026 19:19:32 +0000
Subject: [PATCH 130/135] Bump the all-actions group with 2 updates

Bumps the all-actions group with 2 updates: [simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_phplinter.yml](https://github.com/simplesamlphp/simplesamlphp-test-framework) and [simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_linter.yml](https://github.com/simplesamlphp/simplesamlphp-test-framework).


Updates `simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_phplinter.yml` from 1.11.4 to 1.11.5
- [Commits](https://github.com/simplesamlphp/simplesamlphp-test-framework/compare/v1.11.4...v1.11.5)

Updates `simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_linter.yml` from 1.11.4 to 1.11.5
- [Commits](https://github.com/simplesamlphp/simplesamlphp-test-framework/compare/v1.11.4...v1.11.5)

---
updated-dependencies:
- dependency-name: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_phplinter.yml
  dependency-version: 1.11.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-actions
- dependency-name: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_linter.yml
  dependency-version: 1.11.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-actions
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/php.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index ec52e07..9a4c7c3 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -21,7 +21,7 @@ jobs:
       matrix:
         php-version: ['8.3', '8.4', '8.5']
 
-    uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_phplinter.yml@v1.11.4
+    uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_phplinter.yml@v1.11.5
     with:
       php-version: ${{ matrix.php-version }}
 
@@ -30,7 +30,7 @@ jobs:
     strategy:
       fail-fast: false
 
-    uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_linter.yml@v1.11.4
+    uses: simplesamlphp/simplesamlphp-test-framework/.github/workflows/reusable_linter.yml@v1.11.5
     with:
       enable_eslinter: true
       enable_jsonlinter: true

From 556ddf1314a16d0e23a8fa29c825a6992d90a983 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Mar 2026 20:26:51 +0000
Subject: [PATCH 131/135] Bump codecov/codecov-action from 5 to 6 in the
 all-actions group

Bumps the all-actions group with 1 update: [codecov/codecov-action](https://github.com/codecov/codecov-action).


Updates `codecov/codecov-action` from 5 to 6
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/v5...v6)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: all-actions
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/php.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 9a4c7c3..1e05ea8 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -264,7 +264,7 @@ jobs:
           path: ${{ github.workspace }}/build
 
       - name: Codecov
-        uses: codecov/codecov-action@v5
+        uses: codecov/codecov-action@v6
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           fail_ci_if_error: true

From 3baa27ac0b809f539f893db56df3209627f240cb Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Tue, 31 Mar 2026 21:22:08 +0200
Subject: [PATCH 132/135] Use composer.json for cache key

---
 .github/workflows/php.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 1e05ea8..67a4b25 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -79,7 +79,7 @@ jobs:
         uses: actions/cache@v5
         with:
           path: ${{ env.COMPOSER_CACHE }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           restore-keys: ${{ runner.os }}-composer-
 
       - name: Install Composer dependencies
@@ -143,7 +143,7 @@ jobs:
         uses: actions/cache@v5
         with:
           path: ${{ env.COMPOSER_CACHE }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           restore-keys: ${{ runner.os }}-composer-
 
       - name: Install Composer dependencies
@@ -182,7 +182,7 @@ jobs:
         uses: actions/cache@v5
         with:
           path: ${{ env.COMPOSER_CACHE }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           restore-keys: ${{ runner.os }}-composer-
 
       - name: Validate composer.json and composer.lock
@@ -236,7 +236,7 @@ jobs:
         uses: actions/cache@v5
         with:
           path: ${{ env.COMPOSER_CACHE }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
           restore-keys: ${{ runner.os }}-composer-
 
       - name: Install Composer dependencies

From c4606c56cd08960adb87e41ced1bcf4f2cb0ca20 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Sat, 4 Apr 2026 17:27:34 +0200
Subject: [PATCH 133/135] Fix Windows-cache

---
 .github/workflows/php.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 67a4b25..e77f978 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -143,7 +143,7 @@ jobs:
         uses: actions/cache@v5
         with:
           path: ${{ env.COMPOSER_CACHE }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**\composer.json') }}
           restore-keys: ${{ runner.os }}-composer-
 
       - name: Install Composer dependencies

From 563bfedca2e2a38f6adeb98e19b1402ae1406d80 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Sat, 4 Apr 2026 17:27:49 +0200
Subject: [PATCH 134/135] Add 1-3 merge-files to .gitignore

---
 .gitignore | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index e9c0f7c..35f7d65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,7 @@
-### php-cs-fixer ###
+1
+2
+3
+.phplint.cache/
 .php_cs.cache
 .phpunit.cache/
 .phpunit.result.cache

From 8148e09e33e7b94afd5b511b5df25b42efb57388 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Apr 2026 20:16:31 +0000
Subject: [PATCH 135/135] Bump actions/github-script from 8 to 9 in the
 all-actions group

Bumps the all-actions group with 1 update: [actions/github-script](https://github.com/actions/github-script).


Updates `actions/github-script` from 8 to 9
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](https://github.com/actions/github-script/compare/v8...v9)

---
updated-dependencies:
- dependency-name: actions/github-script
  dependency-version: '9'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: all-actions
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/documentation.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index 8479227..9fa884a 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -41,7 +41,7 @@ jobs:
     steps:
       - name: Run docs build
         if: github.event_name != 'pull_request'
-        uses: actions/github-script@v8
+        uses: actions/github-script@v9
         with:
           # Token has to be generated on a user account that controls the docs-repository.
           # The _only_ scope to select is "Access public repositories", nothing more.