Merge branch...

Merge branch '6220-webauthn-create-one-file-named-variables_webauthn-allowing-the-load-all-requirements-helping' into '1.4-dev'

Resolve "[Webauthn] - Create one file named variables_webauthn allowing the load all requirements - helping patching for supported distributions"

Closes #6220

See merge request fusiondirectory/fd-plugins!977

webauthn/html/qrcode.php

@@ -19,8 +19,13 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
+// We have to setup the proper path to the required file.
+$root_path = dirname($_SERVER['DOCUMENT_ROOT']); //FD root folder
+$subdirectory = "/include";
+$required_path = $root_path . $subdirectory; // FD/include/
+
 /* Require PHPQRCODE */
-require_once('/usr/share/phpqrcode/qrlib.php');
+require_once($required_path.'/variables_webauthn.inc');
 
 $data = urldecode($_GET['data']);
 

webauthn/include/login/class_SecondFactorTotp.inc

@@ -18,16 +18,7 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-require_once('otphp/OTPInterface.php');
-require_once('otphp/TOTPInterface.php');
-require_once('otphp/ParameterTrait.php');
-require_once('otphp/OTP.php');
-require_once('otphp/TOTP.php');
-require_once('otphp/Factory.php');
-require_once('beberlei/assert/lib/Assert/Assertion.php');
-require_once('paragonie/constant_time_encoding/src/Binary.php');
-require_once('paragonie/constant_time_encoding/src/EncoderInterface.php');
-require_once('paragonie/constant_time_encoding/src/Base32.php');
+require_once('variables_webauthn.inc');
 
 class SecondFactorTotp
 {

webauthn/include/variables_webauthn.inc

+<?php
+
+require_once('/usr/share/phpqrcode/qrlib.php');
+require_once('otphp/OTPInterface.php');
+require_once('otphp/TOTPInterface.php');
+require_once('otphp/ParameterTrait.php');
+require_once('otphp/OTP.php');
+require_once('otphp/TOTP.php');
+require_once('otphp/Factory.php');
+require_once('beberlei/assert/lib/Assert/Assertion.php');
+require_once('paragonie/constant_time_encoding/src/Binary.php');
+require_once('paragonie/constant_time_encoding/src/EncoderInterface.php');
+require_once('paragonie/constant_time_encoding/src/Base32.php');
+require_once('beberlei/assert/lib/Assert/AssertionFailedException.php');
+require_once('beberlei/assert/lib/Assert/InvalidArgumentException.php');

webauthn/personal/webauthn/class_TOTPAddDialog.inc

@@ -21,17 +21,7 @@
 */
 
 /* Require TOTP and dependencies */
-require_once('otphp/OTPInterface.php');
-require_once('otphp/TOTPInterface.php');
-require_once('otphp/ParameterTrait.php');
-require_once('otphp/OTP.php');
-require_once('otphp/TOTP.php');
-require_once('beberlei/assert/lib/Assert/AssertionFailedException.php');
-require_once('beberlei/assert/lib/Assert/InvalidArgumentException.php');
-require_once('beberlei/assert/lib/Assert/Assertion.php');
-require_once('paragonie/constant_time_encoding/src/Binary.php');
-require_once('paragonie/constant_time_encoding/src/EncoderInterface.php');
-require_once('paragonie/constant_time_encoding/src/Base32.php');
+require_once('variables_webauthn.inc');
 
 class TOTPAddDialog extends GenericDialog
 {