Merge pull request #20 from silinternational/develop

Error handling bug

Author: longrunningprocess

themes/material/common-announcement.php

@@ -1,5 +1,5 @@
 <?php
-$announcement = htmlentities($this->data['announcement']);
+$announcement = htmlentities($this->data['announcement'] ?? null);
 
 if (! empty($announcement)) {
 ?>

themes/material/core/loginuserpass.php

@@ -6,7 +6,7 @@
     <?php include __DIR__ . '/../common-head-elements.php' ?>
 
     <?php
-    $siteKey = htmlentities($this->data['recaptcha.siteKey']);
+    $siteKey = htmlentities($this->data['recaptcha.siteKey'] ?? null);
     if (! empty($siteKey)) {
     ?>
     <script src='https://www.google.com/recaptcha/api.js?onload=onRecaptchaLoad&render=explicit'
@@ -67,7 +67,7 @@ function onRecaptchaLoad() {
                             <?= $this->t('{material:login:label_username}') ?>
                         </label>
                         <?php
-                        $username = htmlentities($this->data['username']);
+                        $username = htmlentities($this->data['username'] ?? null);
                         ?>
                         <input type="text" name="username" class="mdl-textfield__input"
                                value="<?= $username ?>"
@@ -84,10 +84,10 @@ function onRecaptchaLoad() {
                 </div>
 
                 <?php
-                $errorCode = htmlentities($this->data['errorcode']);
+                $errorCode = htmlentities($this->data['errorcode'] ?? null);
                 if ($errorCode == 'WRONGUSERPASS') {
                     $errorMessageKey = $this->data['errorparams'][1] ?? '{material:login:error_wronguserpass}';
-                    $errorMessageTokens = $this->data['errorparams'][2];
+                    $errorMessageTokens = $this->data['errorparams'][2] ?? null;
 
                     $message = htmlentities($this->t($errorMessageKey, $errorMessageTokens));
                 ?>
@@ -108,7 +108,7 @@ function onRecaptchaLoad() {
 
                 <div class="mdl-card__actions" layout-children="row">
                     <?php
-                    $forgotPasswordUrl = htmlentities($this->data['forgotPasswordUrl']);
+                    $forgotPasswordUrl = htmlentities($this->data['forgotPasswordUrl'] ?? null);
                     if (! empty($forgotPasswordUrl)) {
                     ?>
                     <a href="<?= $forgotPasswordUrl ?>" target="_blank"

themes/material/default/selectidp-links.php

@@ -10,7 +10,7 @@ function setSelectedIdp(id) {
             var idpInput = document.createElement('input');
 
             idpInput.type = 'hidden';
-            idpInput.name = '<?= htmlspecialchars($this->data['returnIDParam']) ?>';
+            idpInput.name = <?= json_encode($this->data['returnIDParam'], JSON_HEX_TAG) ?>;
             idpInput.value = id;
 
             document.querySelector('form').appendChild(idpInput);
@@ -36,6 +36,7 @@ function clickedAnyway(idpName) {
 
     <main class="mdl-layout__content">
         <?php include __DIR__ . '/../common-announcement.php' ?>
+
         <form layout-children="row" child-spacing="space-around">
             <input type="hidden" name="entityID"
                    value="<?= htmlentities($this->data['entityID']) ?>" />