Merge branch 'release/1.8.1'

CHANGELOG.md

@@ -1,3 +1,12 @@
+# v1.8.1
+## 05/15/2018
+
+1. [](#improved)
+    * use SHA1 hashing of IP addressed to support GDPR rules [#1436](https://github.com/getgrav/grav-plugin-admin/pull/1436)
+1. [](#bugfix)
+    * Fixed 2FA form showing up even if user has not turned on the feature [#1442](https://github.com/getgrav/grav-plugin-admin/issues/1442)
+    * Fixed previews of images in Pagemedia field not properly URI encoded [#1438](https://github.com/getgrav/grav-plugin-admin/issues/1438)
+
 # v1.8.0
 ## 05/11/2018
 

blueprints.yaml

@@ -1,5 +1,5 @@
 name: Admin Panel
-version: 1.8.0
+version: 1.8.1
 description: Adds an advanced administration panel to manage your site
 icon: empire
 author:
@@ -13,7 +13,7 @@ docs: https://github.com/getgrav/grav-plugin-admin/blob/develop/README.md
 license: MIT
 
 dependencies:
-    - { name: grav, version: '>=1.4.4' }
+    - { name: grav, version: '>=1.4.5' }
     - { name: form, version: '>=2.14.0' }
     - { name: login, version: '>=2.7.0' }
     - { name: email, version: '>=2.7.0' }

classes/popularity.php

@@ -260,7 +260,7 @@ class Popularity
         }
 
         // update with current timestamp
-        $this->visitors_data[$ip] = time();
+        $this->visitors_data[hash('sha1', $ip)] = time();
         $visitors                 = $this->visitors_data;
         arsort($visitors);
 

themes/grav/app/pages/page/media.js

@@ -138,7 +138,7 @@ export default class PageMedia extends FilesField {
             let file = target.parent('.dz-preview').find('.dz-filename');
             let filename = encodeURI(file.text());
             let URL = target.closest('[data-media-path]').data('media-path');
-            let original = this.dropzone.files.filter((file) => file.name === filename).shift().extras.original;
+            let original = this.dropzone.files.filter((file) => encodeURIComponent(file.name) === filename).shift().extras.original;
 
             target.attr('href', `${URL}/${original}`);
         });

themes/grav/templates/login.html.twig

@@ -1,10 +1,10 @@
 {% set user = grav.user %}
 
 {% if user.username and user.authenticated %}
-    {% if user.authorized %}
-        {% include 'partials/login-logout.html.twig' %}
-    {% else %}
+    {% if not user.authorized and user.twofa_enabled %}
         {% include 'partials/login-twofa.html.twig' %}
+    {% else %}
+        {% include 'partials/login-logout.html.twig' %}
     {% endif %}
 {% else %}
     {% include 'partials/login-form.html.twig' %}

themes/grav/templates/partials/nav-quick-tray.html.twig

@@ -29,7 +29,7 @@
     {% endfor %}
     {% else %}
         {% if authorize(['admin.maintenance', 'admin.super']) %}
-        <li class="hint--bottom" data-hint="Add the 'quick-tray' plugin for more...">
+        <li class="hint--bottom" data-hint="Add the 'quick-tray-links' plugin for more...">
             <a href="{{ base_url_relative ~ '/plugins/install' }}">
                 <i class="fa fa-plus"></i>
             </a>