From 536ce53e3df695558d1abd667bd272391b3136d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20Pe=C3=B1a?= Date: Tue, 11 Apr 2017 12:31:10 +0200 Subject: [PATCH 1/4] Make some ortographic corrections on spanish language (#19) --- languages.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/languages.yaml b/languages.yaml index 45401d3..900bbdd 100644 --- a/languages.yaml +++ b/languages.yaml @@ -15,7 +15,7 @@ en: es: PLUGIN_MAINTENANCE: - OFFLINE_MARKDOWN: "# Sitio offline\n## Por favor inténtalo mas tarde..." + OFFLINE_MARKDOWN: "# Sitio offline\n## Por favor, inténtalo más tarde..." AUTHORIZED_ACCESS: "**Se requiere acceso autorizado**" BLUEPRINTS: STATUS: Estado del plugin @@ -23,7 +23,7 @@ es: MODE_HELP: Activa o desactiva el modo mantenimiento, en todo el sitio ALLOW_LOGIN: Permitir acceso ALLOW_LOGIN_HELP: Si deseas proporcionar un formulario de inicio de sesión para que los usuarios autorizados puedan acceder al sitio - ACCESS: Accesso + ACCESS: Acceso ACCESS_HELP: La cadena de autorización ACL que debe ser verdadera para que un usuario acceda al sitio PAGE_ROUTE: Ruta de la página de mantenimiento PAGE_ROUTE_HELP: La ruta de acceso a la página Grav personalizada que deseas utilizar para el mantenimiento From bea549f23fced70ca7e39ea19ffdab905b33e2a7 Mon Sep 17 00:00:00 2001 From: Hugh Barnes Date: Mon, 10 Jul 2017 05:13:08 +1200 Subject: [PATCH 2/4] Allow custom content in maintenance.md to be rendered, defaulting back to OFFLINE_MARKDOWN (#21) Thanks good! --- templates/maintenance.html.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/maintenance.html.twig b/templates/maintenance.html.twig index f1d298b..4c06054 100644 --- a/templates/maintenance.html.twig +++ b/templates/maintenance.html.twig @@ -2,11 +2,11 @@ {% block content %} - {{ 'PLUGIN_MAINTENANCE.OFFLINE_MARKDOWN'|t|markdown|raw }} + {{ page.content|default('PLUGIN_MAINTENANCE.OFFLINE_MARKDOWN'|t|markdown|raw) }} {% if maintenance.allow_login and not grav.user.authenticated %}
{% include 'partials/login-form.html.twig' with {content: 'PLUGIN_MAINTENANCE.AUTHORIZED_ACCESS'|t|markdown, show_login_form: true }%}
{% endif %} -{% endblock %} \ No newline at end of file +{% endblock %} From 87708a0762330ca8e3aa179b525f81a0da52f4c5 Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Mon, 10 Dec 2018 14:06:57 -0700 Subject: [PATCH 3/4] =?UTF-8?q?check=20allow=5Flogin=20to=20ensure=20logge?= =?UTF-8?q?d=20in=20users=20don=E2=80=99t=20skip=20maintenance=20page?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 6 ++++++ maintenance.php | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 59df171..88cfd78 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# v1.3.2 +## 12/10/2018 + +1. [](#bugfix) + * if `allow_login` is `false` don't allow a logged in user to skip maintenance page + # v1.3.1 ## 02/17/2017 diff --git a/maintenance.php b/maintenance.php index 9cb828c..4164d08 100644 --- a/maintenance.php +++ b/maintenance.php @@ -50,7 +50,7 @@ public function onPagesInitialized(Event $event) /** @var User $user */ $user = $this->grav['user']; - if ($user->authenticated && $user->authorize($config['login_access'] ?: 'site.login')) { + if ($config['allow_login'] && $user->authenticated && $user->authorize($config['login_access'] ?: 'site.login')) { // User has been logged in and has permission to access the site when it is in maintenance mode. return; } From 6c3827428b944ea3b6f88cc02177489c66c25643 Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Mon, 10 Dec 2018 14:08:14 -0700 Subject: [PATCH 4/4] prepare for release --- blueprints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blueprints.yaml b/blueprints.yaml index abeb6e6..72330ea 100644 --- a/blueprints.yaml +++ b/blueprints.yaml @@ -1,5 +1,5 @@ name: Maintenance -version: 1.3.1 +version: 1.3.2 description: Puts your grav site into a maintenance mode icon: exclamation-triangle author: