diff --git a/security/acme-client/pkg-descr b/security/acme-client/pkg-descr index d80dac31f..b172474e3 100644 --- a/security/acme-client/pkg-descr +++ b/security/acme-client/pkg-descr @@ -12,6 +12,7 @@ Plugin Changelog Added: * add support for new ACME CA's: buypass, buypass_test, sslcom, zerossl (#2361) +* add introduction pages and an option to hide them Changed: * rename plugin from "Let's Encrypt client" to "ACME Client" (#2361) diff --git a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/AccountsController.php b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/AccountsController.php index 374112c23..202b578fd 100644 --- a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/AccountsController.php +++ b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/AccountsController.php @@ -1,7 +1,7 @@ view->formDialogAccount = $this->getForm("dialogAccount"); + // set additional view parameters + $mdlAcme = new \OPNsense\AcmeClient\AcmeClient(); + $this->view->showIntro = (string)$mdlAcme ->settings->showIntro; // choose template $this->view->pick('OPNsense/AcmeClient/accounts'); } diff --git a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/ActionsController.php b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/ActionsController.php index 002446342..fb438bff6 100644 --- a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/ActionsController.php +++ b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/ActionsController.php @@ -1,7 +1,7 @@ view->formDialogAction = $this->getForm("dialogAction"); + // set additional view parameters + $mdlAcme = new \OPNsense\AcmeClient\AcmeClient(); + $this->view->showIntro = (string)$mdlAcme ->settings->showIntro; // choose template $this->view->pick('OPNsense/AcmeClient/actions'); } diff --git a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/CertificatesController.php b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/CertificatesController.php index 8e58c37ef..df9b8fd53 100644 --- a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/CertificatesController.php +++ b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/CertificatesController.php @@ -1,7 +1,7 @@ view->formDialogCertificate = $this->getForm("dialogCertificate"); + // set additional view parameters + $mdlAcme = new \OPNsense\AcmeClient\AcmeClient(); + $this->view->showIntro = (string)$mdlAcme ->settings->showIntro; // choose template $this->view->pick('OPNsense/AcmeClient/certificates'); } diff --git a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/IndexController.php b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/IndexController.php index f13b7e9c1..59a0f966c 100644 --- a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/IndexController.php +++ b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/IndexController.php @@ -1,7 +1,7 @@ view->settingsForm = $this->getForm("settings"); + // set additional view parameters + $mdlAcme = new \OPNsense\AcmeClient\AcmeClient(); + $this->view->showIntro = (string)$mdlAcme ->settings->showIntro; // pick the template to serve $this->view->pick('OPNsense/AcmeClient/settings'); } diff --git a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/ValidationsController.php b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/ValidationsController.php index 8c2f2a365..32a8e613b 100644 --- a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/ValidationsController.php +++ b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/ValidationsController.php @@ -1,7 +1,7 @@ view->formDialogValidation = $this->getForm("dialogValidation"); + // set additional view parameters + $mdlAcme = new \OPNsense\AcmeClient\AcmeClient(); + $this->view->showIntro = (string)$mdlAcme ->settings->showIntro; // choose template $this->view->pick('OPNsense/AcmeClient/validations'); } diff --git a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/settings.xml b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/settings.xml index e5cea7414..770341a2c 100644 --- a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/settings.xml +++ b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/settings.xml @@ -29,6 +29,12 @@ dropdown + + acmeclient.settings.showIntro + + checkbox + + acmeclient.settings.challengePort diff --git a/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/AcmeClient.xml b/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/AcmeClient.xml index 99247de8f..91183a3ea 100644 --- a/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/AcmeClient.xml +++ b/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/AcmeClient.xml @@ -121,6 +121,10 @@ debug 3 + + Y + 1 + diff --git a/security/acme-client/src/opnsense/mvc/app/views/OPNsense/AcmeClient/accounts.volt b/security/acme-client/src/opnsense/mvc/app/views/OPNsense/AcmeClient/accounts.volt index 0f03c4b1d..dfa7eb6cf 100644 --- a/security/acme-client/src/opnsense/mvc/app/views/OPNsense/AcmeClient/accounts.volt +++ b/security/acme-client/src/opnsense/mvc/app/views/OPNsense/AcmeClient/accounts.volt @@ -321,12 +321,28 @@ POSSIBILITY OF SUCH DAMAGE. -