Merge pull request #3 from hallowelt/Make_Realname_And_Email_Optional

Make 'realname' and 'email' optional
NIIF · Feb 28, 2019 · 41bcfd2 · 41bcfd2
2 parents 5e69dd9 + 6f0e24c
commit 41bcfd2
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 1,106 deletions.
diff --git a/Shibboleth.class.php b/Shibboleth.class.php
@@ -102,7 +102,7 @@ private function getDisplayName() {
 
         // Real name Shibboleth attribute check
         if (empty(filter_input(INPUT_SERVER, $displayName))) {
-            throw new Exception(wfMessage('shib-attr-empty-realname')->plain());
+            return '';
         } else {
             return filter_input(INPUT_SERVER, $displayName);
         }
@@ -125,7 +125,7 @@ private function getEmail() {
 
         // E-mail shibboleth attribute check
         if (empty(filter_input(INPUT_SERVER, $mail))) {
-            throw new Exception(wfMessage('shib-attr-empty-email')->plain());
+            return '';
         } else {
             return filter_input(INPUT_SERVER, $mail);
         }

diff --git a/i18n/en.json b/i18n/en.json
@@ -9,8 +9,6 @@
     "wg-empty-email": "The wgShibboleth_Email config is empty in LocalSettings.php",
     "wg-empty-username": "The wgShibboleth_Username config is empty in LocalSettings.php",
     "wg-empty-groupmap-attr": "A wgShibboleth_GroupMap config is empty in LocalSettings.php",
-    "shib-attr-empty-realname": "Shibboleth: real name attribute is not set",
-    "shib-attr-empty-mail": "Shibboleth: e-mail attribute is not set",
     "shib-attr-empty-username": "Shibboleth: username attribute is not set",
     "shib-attr-empty-groupmap-attr": "Shibboleth: cannot find GroupMap attribute"
 }
diff --git a/i18n/hu.json b/i18n/hu.json
@@ -9,8 +9,6 @@
     "wg-empty-email": "A wgShibboleth_Email paraméter üres a LocalSettings.php-ban",
     "wg-empty-username": "A wgShibboleth_Username paraméter üres a LocalSettings.php-ban",
     "wg-empty-groupmap-attr": "A wgShibboleth_GroupMap hibás vagy nem található a LocalSettings.php-ban",
-    "shib-attr-empty-realname": "Shibboleth: a valódi név attribútum nem található",
-    "shib-attr-empty-mail": "Shibboleth: e-mail attribútum nem található",
     "shib-attr-empty-username": "Shibboleth: felhasználónév attribútum nem található",
     "shib-attr-empty-groupmap-attr": "Shibboleth: a GroupMap-hez szükséges attribútum nem található vagy hibás"
 }