Merge pull request #29 from silinternational/develop

Release 3.1.0

Author: forevermatt

README.md

@@ -56,7 +56,7 @@ If configured, an alert will be shown to the user filled with the content of tha
 
 ### Setup 
 
-1. Setup `localhost` aliases for `ssp-hub.local`, `ssp-hub2.local`, `ssp-hub-idp1.local`, and `ssp-hub-idp2.local`.  This is typically done in `/etc/hosts`.
+1. Setup `localhost` (or `192.168.62.54`, if using Vagrant) aliases for `ssp-hub.local`, `ssp-hub2.local`, `ssp-hub-idp1.local`, and `ssp-hub-idp2.local`.  This is typically done in `/etc/hosts`.
 2. Start test environment, e.g., `make` from the command line.
 
 ### Hub page

docker-compose.yml

@@ -6,6 +6,8 @@ services:
       - ./development/hub/authsources.php:/data/vendor/simplesamlphp/simplesamlphp/config/authsources.php
       - ./development/hub/saml20-idp-remote.php:/data/vendor/simplesamlphp/simplesamlphp/metadata/saml20-idp-remote.php
       - ./development/hub/saml20-idp-hosted.php:/data/vendor/simplesamlphp/simplesamlphp/metadata/saml20-idp-hosted.php
+      - ./www/default-favicon.ico:/data/vendor/simplesamlphp/simplesamlphp/www/favicon.ico
+      - ./www/default-favicon.png:/data/vendor/simplesamlphp/simplesamlphp/www/favicon.png
       - ./www/default-logo.png:/data/vendor/simplesamlphp/simplesamlphp/www/logo.png
       - ./:/data/vendor/simplesamlphp/simplesamlphp/modules/material
     ports:
@@ -18,7 +20,8 @@ services:
       HUB_MODE: "true"
       ADMIN_EMAIL: "[email protected]"
       SECRET_SALT: "FcJwl0zCDc4nuzOuQL9/7WPIj3hdfusGm2ny0dcRQm0="
-      IDP_NAME: "The Hub"
+      IDP_NAME: hub
+      IDP_DISPLAY_NAME: "The Hub"
       ANALYTICS_ID: "UA-XXXX-Y"
   idp1:
     image: silintl/ssp-base:develop
@@ -37,7 +40,8 @@ services:
       THEME_USE: "default:default"
       ADMIN_EMAIL: "[email protected]"
       SECRET_SALT: "8yC5mb4wqANaU+Rxrl4DHkfKzikeieXkltfFd+YDzx8="
-      IDP_NAME: "Idp 1"
+      IDP_NAME: "idp-1"
+      IDP_DISPLAY_NAME: "Idp 1"
   idp2:
     image: silintl/ssp-base:develop
     volumes:
@@ -58,7 +62,8 @@ services:
       THEME_USE: "material:material"
       ADMIN_EMAIL: "[email protected]"
       SECRET_SALT: "edI4GGkYfkzD6/OXFvHBHb9Meu9hdKXQpNFg4q/GGfY="
-      IDP_NAME: "Idp 2"
+      IDP_NAME: "idp-2"
+      IDP_DISPLAY_NAME: "Idp 2"
       ANALYTICS_ID: "UA-XXXX-Y"
       PASSWORD_CHANGE_URL:  "http://example.org"
       PASSWORD_FORGOT_URL:  "http://example.org"
@@ -82,7 +87,8 @@ services:
       HUB_MODE: "true"
       ADMIN_EMAIL: "[email protected]"
       SECRET_SALT: "QthhmKnsmC7X/+2bv3CgzBWaFR68J3fP6QgmZhM1L7M="
-      IDP_NAME: "The Hub2"
+      IDP_NAME: "hub-2"
+      IDP_DISPLAY_NAME: "The Hub2"
   idp3:
     image: silintl/ssp-base:develop
     volumes:
@@ -103,4 +109,5 @@ services:
       THEME_USE: "material:material"
       ADMIN_EMAIL: "[email protected]"
       SECRET_SALT: "xbcCMIHHzsgE8yYC6OIBjsp+ruZYghHn1k5Bv/IGbrg="
-      IDP_NAME: "Idp 3"
+      IDP_NAME: "idp-3"
+      IDP_DISPLAY_NAME: "Idp 3"

themes/material/common-head-elements.php

@@ -34,4 +34,4 @@
 
 <script async src="/module.php/material/material.1.2.1.min.js"></script>
 
-<link rel="shortcut icon" href="/logo.png" />
+<link rel="icon" href="/favicon.png">

themes/material/core/loginuserpass.php

@@ -49,7 +49,10 @@ function onRecaptchaLoad() {
 
             <div class="mdl-card mdl-shadow--8dp fill-phone-viewport">
                 <?php
-                $idpName = htmlentities($this->configuration->getValue('idp_name', '—'));
+                $idpName = htmlentities($this->configuration->getValue(
+                    'idp_display_name',
+                    $this->configuration->getValue('idp_name', '—')
+                ));
                 ?>
                 <div class="mdl-card__media white-bg margin" layout-children="column">
                     <img src="/logo.png"