Merge branch 'master' into Xnew-ui-fixes

modules/consent/docs/consent.md

@@ -103,27 +103,27 @@ and defaults to `consent`.
 
 Example config using PostgreSQL database:
 
-	90 => array(
-		'class'	=> 'consent:Consent', 
-		'store'	=> array(
-			'consent:Database', 
-			'dsn' => 'pgsql:host=sql.example.org;dbname=consent',
-			'username' => 'simplesaml',
-			'password' => 'sdfsdf',
-		),
-	),
+    90 => array(
+        'class'	=> 'consent:Consent', 
+        'store'	=> array(
+            'consent:Database', 
+            'dsn' => 'pgsql:host=sql.example.org;dbname=consent',
+            'username' => 'simplesaml',
+            'password' => 'sdfsdf',
+        ),
+    ),
 
 Example config using MySQL database:
 
-	90 => array(
-		'class'	=> 'consent:Consent', 
-		'store'	=> array(
-			'consent:Database', 
+    90 => array(
+        'class'	=> 'consent:Consent', 
+        'store'	=> array(
+            'consent:Database', 
             'dsn' => 'mysql:host=db.example.org;dbname=simplesaml',
-			'username' => 'simplesaml',
-			'password' => 'sdfsdf',
-		),
-	),
+            'username' => 'simplesaml',
+            'password' => 'sdfsdf',
+        ),
+    ),
 
 
 Options

modules/consent/lib/Auth/Process/Consent.php

@@ -318,7 +318,7 @@ class Consent extends \SimpleSAML\Auth\ProcessingFilter
                 $state['consent:store.attributeSet'] = $attributeSet;
             } catch (\Exception $e) {
                 Logger::error('Consent: Error reading from storage: '.$e->getMessage());
-                Logger::stats('Ccnsent failed');
+                Logger::stats('Consent failed');
                 Stats::log('consent:failed', $statsData);
             }
         } else {

modules/consentAdmin/www/consentAdmin.php

@@ -218,6 +218,7 @@ $template_sp_content = array();
 $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