Merge branch 'master' into master

dist-docs/change_log.txt

@@ -21,6 +21,11 @@ Ver.13 (In Development)
 - Field values from SAML attributes can merge from multiple entries.
 - Variables $limitEnrollSecond and $limitPwChangeSecond in the params.php file can specify the limit seconds for
   the enrollment mail and password reset mail.
+- INTERMediatorOnPage.authPanelExp and INTERMediatorOnPage.authPanelExp2FA can display any explanation
+  on authentication panels.
+- In the params.php file, variables $authPanelTitle, $authPanelTitle2FA, $authPanelExp and $authPanelExp2FA can
+  describe and set any strings including html. These are elements of auth panels as the same name properties of
+  INTERMediatorOnPage object.
 - [BUG FIX] On the Ver.12, SAML authentication didn't work in spite of Ver.11 can do. It didn't check with SAML manual
   test on Ver.12 after added types to php codes. Ver.13 works SAML.
 

params.php

@@ -144,7 +144,6 @@
 
 /* Authorization
  * =================== */
-
 $authStoring = 'credential'; // 'session-storage' or 'credential'
 $authExpired = 3600;
 //$authRealm = '';
@@ -159,6 +158,12 @@
 //$expiringSeconds2FA = 1000; // 2FA effective seconds from code input.
 $fixed2FACode = "5555"; // Fixed 2FA code for the testing purpose. On the real system, this has to comment out.
 
+/* Authentication panels customizing */
+//$authPanelTitle= "そうだ";  // Auth Panel's title
+//$authPanelTitle2FA= null;   // 2FA Auth Panel's title
+//$authPanelExp= "温泉に行こう";  // Auth Panel's explanations
+//$authPanelExp2FA= null;   // 2FA Auth Panel's explanations
+
 // The 'issuedhash' table for storing challenges of authentication can be use another database.
 //$issuedHashDSN = 'sqlite:/var/db/im/sample.sq3';
 

samples/Sample_Auth/MySQL_form_auth.html

@@ -19,6 +19,8 @@
     <script>
       INTERMediatorOnPage.doBeforeConstruct = function () {
         INTERMediatorLog.suppressDebugMessageOnPage = true
+        // INTERMediatorOnPage.authPanelExp = "説明です。"
+        INTERMediatorOnPage.authPanelExp2FA = "説明です。"
       }
     </script>
 </head>

src/js/INTER-Mediator-Page.js

@@ -50,6 +50,8 @@ let INTERMediatorOnPage = {
   isSetDefaultStyle: false,
   authPanelTitle: null,
   authPanelTitle2FA: null,
+  authPanelExp: null,
+  authPanelExp2FA: null,
   isOAuthAvailable: false, // @Private
   oAuthClientID: null, // @Private
   oAuthClientSecret: null, // @Private
@@ -674,6 +676,14 @@ let INTERMediatorOnPage = {
           INTERMediatorLib.getInsertedStringFromErrorNumber(2024)))
         frontPanel.appendChild(resetMessage)
       }
+      if(INTERMediatorOnPage.authPanelExp){
+        breakLine = document.createElement('HR')
+        frontPanel.appendChild(breakLine)
+        const addingNode = document.createElement('DIV')
+        addingNode.className = '_im_auth_exp'
+        addingNode.innerHTML = INTERMediatorOnPage.authPanelExp
+        frontPanel.appendChild(addingNode)
+      }
     }
     passwordBox.onkeydown = function (event) {
       if (event.code === 'Enter') {
@@ -895,6 +905,15 @@ let INTERMediatorOnPage = {
     explain.appendChild(document.createTextNode(INTERMediatorLib.getInsertedStringFromErrorNumber(2030)))
     frontPanel.appendChild(explain)
 
+    if(INTERMediatorOnPage.authPanelExp2FA){
+      breakLine = document.createElement('HR')
+      frontPanel.appendChild(breakLine)
+      const addingNode = document.createElement('DIV')
+      addingNode.className = '_im_auth_exp_2fa'
+      addingNode.innerHTML = INTERMediatorOnPage.authPanelExp2FA
+      frontPanel.appendChild(addingNode)
+    }
+
     window.scrollTo(0, 0)
     codeBox.focus()
     INTERMediatorOnPage.authCount++

src/php/GenerateJSCode.php

@@ -349,7 +349,7 @@ public function generateInitialJSCode(?array $dataSource, ?array $options, ?arra
         $this->generateAssignJS("INTERMediatorOnPage.realm", $q, $realmValue, $q);
         $req2FAValue = $options['authentication']['is-required-2FA']
             ?? Params::getParameterValue("isRequired2FA", '');
-        $this->generateAssignJS("INTERMediatorOnPage.isRequired2FA", $req2FAValue? "true" : "false");
+        $this->generateAssignJS("INTERMediatorOnPage.isRequired2FA", $req2FAValue ? "true" : "false");
         $digitsOf2FACodeValue = $options['authentication']['digits-of-2FA-Code']
             ?? Params::getParameterValue("digitsOf2FACode", 4);
         $this->generateAssignJS("INTERMediatorOnPage.digitsOf2FACode", intval($digitsOf2FACodeValue));
@@ -401,6 +401,15 @@ public function generateInitialJSCode(?array $dataSource, ?array $options, ?arra
         if ($activateGenerator) {
             $this->generateAssignJS("INTERMediatorOnPage.activateMaintenanceCall", "true");
         }
+
+        $this->generateAssignJS("INTERMediatorOnPage.authPanelTitle",
+            $q, Params::getParameterValue('authPanelTitle', ""), $q);
+        $this->generateAssignJS("INTERMediatorOnPage.authPanelTitle2FA", $q,
+            Params::getParameterValue('authPanelTitle2FA', ""), $q);
+        $this->generateAssignJS("INTERMediatorOnPage.authPanelExp",
+            $q, Params::getParameterValue('authPanelExp', ""), $q);
+        $this->generateAssignJS("INTERMediatorOnPage.authPanelExp2FA",
+            $q, Params::getParameterValue('authPanelExp2FA', ""), $q);
     }
 
     /**

themes/default/css/style.css

@@ -323,7 +323,7 @@ span.IM_POSTMESSAGE {
     color: #50506c;
 }
 
-#_im_authpback,#_im_authpback_2FA {
+#_im_authpback, #_im_authpback_2FA {
     position: absolute;
     height: 100%;
     width: 100%;
@@ -357,7 +357,7 @@ span.IM_POSTMESSAGE {
     text-align: center;
 }
 
-._im_authlabel,._im_authlabel_2FA {
+._im_authlabel, ._im_authlabel_2FA {
     text-align: right;
     float: left;
     color: #bdbdee;
@@ -433,6 +433,11 @@ span.IM_POSTMESSAGE {
     color: red;
 }
 
+._im_auth_exp_2fa, ._im_auth_exp {
+    font-size: 85%;
+}
+
+
 /* Widget Pop-up Panel */
 ._im_widget_popup_panelback {
     position: absolute;