Merge pull request #101 from silinternational/develop

Release 7.4.3

Author: forevermatt

README.md

@@ -238,7 +238,8 @@ language. If that's not done, the translation function will not utilize the tran
 Xdebug can be enabled by doing the following:
 
 1. Define `REMOTE_DEBUG_IP` in `local.env`. This should be the IP address of your development machine, i.e. the one that
-   is running your IDE. If you're using Linux as your Docker host, you can use 172.17.0.1 here.
+   is running your IDE. If you're using Linux as your Docker host, you can use 172.17.0.1 here. Note that the IP address
+   shown in your containers' logs may not be your machines actual IP address (it could be for a VM, for example).
 2. Map run-debug.sh into the container you wish to debug. For example:
 ```yaml
     volumes:
@@ -253,7 +254,8 @@ In PhpStorm go to: Preferences > PHP > Debug > DBGp Proxy and set the following
 - Port: 9000
   
 Set path mappings in: Preferences > PHP > Servers
-- Add a server and map the project folder to '/data/vendor/simplesamlphp/simplesamlphp/modules/material'
+- Add a server, giving it your IP address and a port of 9000, and map the project folder to
+  '/data/vendor/simplesamlphp/simplesamlphp/modules/material'
 - Map other directories as needed. PhpStorm should prompt when an unrecognized path is encountered.
 
 Then start listening by clicking the "listen" button on the PhpStorm toolbar.

themes/material/core/loginuserpass.php

@@ -54,9 +54,13 @@ function onRecaptchaLoad() {
             <input type="hidden" name="AuthState" value="<?= htmlentities($this->data['stateparams']['AuthState']) ?>" />
 
             <?php
-            $csrfToken = htmlentities($this->data['csrfToken']);
+            if (key_exists('csrfToken', $this->data)) {
+                $csrfToken = htmlentities($this->data['csrfToken']);
+                ?>
+                <input type="hidden" name="csrf-token" value="<?= $csrfToken ?>" />
+                <?php
+            }
             ?>
-            <input type="hidden" name="csrf-token" value="<?= $csrfToken ?>" />
 
             <div class="mdl-card mdl-shadow--8dp fill-phone-viewport">
                 <div class="mdl-card__media white-bg margin" layout-children="column">