From 04d6d5ca99ebfd1cebb8ce06618fb3811fc1a8aa Mon Sep 17 00:00:00 2001 From: Charles Date: Thu, 9 Jan 2020 10:55:03 +0100 Subject: phpmyadmin working --- srcs/phpmyadmin/templates/login/footer.twig | 4 ++++ srcs/phpmyadmin/templates/login/header.twig | 16 ++++++++++++++++ srcs/phpmyadmin/templates/login/twofactor.twig | 7 +++++++ .../templates/login/twofactor/application.twig | 4 ++++ .../login/twofactor/application_configure.twig | 17 +++++++++++++++++ srcs/phpmyadmin/templates/login/twofactor/invalid.twig | 3 +++ .../templates/login/twofactor/key-https-warning.twig | 5 +++++ srcs/phpmyadmin/templates/login/twofactor/key.twig | 5 +++++ .../templates/login/twofactor/key_configure.twig | 5 +++++ srcs/phpmyadmin/templates/login/twofactor/simple.twig | 1 + 10 files changed, 67 insertions(+) create mode 100644 srcs/phpmyadmin/templates/login/footer.twig create mode 100644 srcs/phpmyadmin/templates/login/header.twig create mode 100644 srcs/phpmyadmin/templates/login/twofactor.twig create mode 100644 srcs/phpmyadmin/templates/login/twofactor/application.twig create mode 100644 srcs/phpmyadmin/templates/login/twofactor/application_configure.twig create mode 100644 srcs/phpmyadmin/templates/login/twofactor/invalid.twig create mode 100644 srcs/phpmyadmin/templates/login/twofactor/key-https-warning.twig create mode 100644 srcs/phpmyadmin/templates/login/twofactor/key.twig create mode 100644 srcs/phpmyadmin/templates/login/twofactor/key_configure.twig create mode 100644 srcs/phpmyadmin/templates/login/twofactor/simple.twig (limited to 'srcs/phpmyadmin/templates/login') diff --git a/srcs/phpmyadmin/templates/login/footer.twig b/srcs/phpmyadmin/templates/login/footer.twig new file mode 100644 index 0000000..d9e9659 --- /dev/null +++ b/srcs/phpmyadmin/templates/login/footer.twig @@ -0,0 +1,4 @@ + +{% if check_timeout == true %} + +{% endif %} diff --git a/srcs/phpmyadmin/templates/login/header.twig b/srcs/phpmyadmin/templates/login/header.twig new file mode 100644 index 0000000..a21dee5 --- /dev/null +++ b/srcs/phpmyadmin/templates/login/header.twig @@ -0,0 +1,16 @@ +{% if session_expired == true %} +
+{% endif %} +
+ +

{{ 'Welcome to %s'|trans|format('phpMyAdmin')|raw }}

+ + + +
+{{ "There is a mismatch between HTTPS indicated on the server and client. This can lead to a non working phpMyAdmin or a security risk. Please fix your server configuration to indicate HTTPS properly."|trans|error }} +
diff --git a/srcs/phpmyadmin/templates/login/twofactor.twig b/srcs/phpmyadmin/templates/login/twofactor.twig new file mode 100644 index 0000000..af2bae3 --- /dev/null +++ b/srcs/phpmyadmin/templates/login/twofactor.twig @@ -0,0 +1,7 @@ +
+ {{ get_hidden_inputs() }} + {{ form|raw }} + {% if show_submit %} + + {% endif %} +
diff --git a/srcs/phpmyadmin/templates/login/twofactor/application.twig b/srcs/phpmyadmin/templates/login/twofactor/application.twig new file mode 100644 index 0000000..3077e03 --- /dev/null +++ b/srcs/phpmyadmin/templates/login/twofactor/application.twig @@ -0,0 +1,4 @@ +

+ +

+

{% trans "Open the two-factor authentication app on your device to view your authentication code and verify your identity." %}

diff --git a/srcs/phpmyadmin/templates/login/twofactor/application_configure.twig b/srcs/phpmyadmin/templates/login/twofactor/application_configure.twig new file mode 100644 index 0000000..e823bb3 --- /dev/null +++ b/srcs/phpmyadmin/templates/login/twofactor/application_configure.twig @@ -0,0 +1,17 @@ +{{ get_hidden_inputs() }} +

+ {% trans "Please scan following QR code into the two-factor authentication app on your device and enter authentication code it generates." %} +

+

+ {% if has_imagick %} + + {% else %} + {{ image|raw }} + {% endif %} +

+

+ {% trans "Secret/key:" %} {{ secret }} +

+

+ +

diff --git a/srcs/phpmyadmin/templates/login/twofactor/invalid.twig b/srcs/phpmyadmin/templates/login/twofactor/invalid.twig new file mode 100644 index 0000000..568dd94 --- /dev/null +++ b/srcs/phpmyadmin/templates/login/twofactor/invalid.twig @@ -0,0 +1,3 @@ +
+{% trans "The configured two factor authentication is not available, please install missing dependencies." %} +
diff --git a/srcs/phpmyadmin/templates/login/twofactor/key-https-warning.twig b/srcs/phpmyadmin/templates/login/twofactor/key-https-warning.twig new file mode 100644 index 0000000..d3f9c04 --- /dev/null +++ b/srcs/phpmyadmin/templates/login/twofactor/key-https-warning.twig @@ -0,0 +1,5 @@ +{% if not is_https %} +
+{% trans "You are not using https to access phpMyAdmin, therefore FIDO U2F device will most likely refuse to authenticate you." %} +
+{% endif %} diff --git a/srcs/phpmyadmin/templates/login/twofactor/key.twig b/srcs/phpmyadmin/templates/login/twofactor/key.twig new file mode 100644 index 0000000..79ade47 --- /dev/null +++ b/srcs/phpmyadmin/templates/login/twofactor/key.twig @@ -0,0 +1,5 @@ +{% include 'login/twofactor/key-https-warning.twig' %} +

+{% trans "Please connect your FIDO U2F device into your computer's USB port. Then confirm login on the device." %} +

+ diff --git a/srcs/phpmyadmin/templates/login/twofactor/key_configure.twig b/srcs/phpmyadmin/templates/login/twofactor/key_configure.twig new file mode 100644 index 0000000..8b502dc --- /dev/null +++ b/srcs/phpmyadmin/templates/login/twofactor/key_configure.twig @@ -0,0 +1,5 @@ +{% include 'login/twofactor/key-https-warning.twig' %} +

+{% trans "Please connect your FIDO U2F device into your computer's USB port. Then confirm registration on the device." %} +

+ diff --git a/srcs/phpmyadmin/templates/login/twofactor/simple.twig b/srcs/phpmyadmin/templates/login/twofactor/simple.twig new file mode 100644 index 0000000..eeae140 --- /dev/null +++ b/srcs/phpmyadmin/templates/login/twofactor/simple.twig @@ -0,0 +1 @@ + -- cgit