From 33e363affa5c331aaf11740f2d983c31d2a5414a Mon Sep 17 00:00:00 2001
From: Flavio Copes <copesc@gmail.com>
Date: Wed, 27 Apr 2016 19:48:16 +0200
Subject: [PATCH] Merge pull request #524 from
 getgrav/feature/show-account-page-for-login-acl

Show account page for users with admin.login ACL
---
 classes/admin.php                                         | 5 +++++
 classes/controller.php                                    | 7 ++++---
 pages/admin/{users.md => user.md}                         | 3 ++-
 themes/grav/templates/partials/nav.html.twig              | 2 +-
 themes/grav/templates/{users.html.twig => user.html.twig} | 2 --
 5 files changed, 12 insertions(+), 7 deletions(-)
 rename pages/admin/{users.md => user.md} (64%)
 rename themes/grav/templates/{users.html.twig => user.html.twig} (99%)

diff --git a/classes/admin.php b/classes/admin.php
index bf423305..1447fcdc 100644
--- a/classes/admin.php
+++ b/classes/admin.php
@@ -336,6 +336,11 @@ class Admin
                     $obj = User::load(preg_replace('|users/|', '', $type));
                     $obj->merge($post);
 
+                    $data[$type] = $obj;
+                } elseif (preg_match('|user/|', $type)) {
+                    $obj = User::load(preg_replace('|user/|', '', $type));
+                    $obj->merge($post);
+
                     $data[$type] = $obj;
                 } elseif (preg_match('|config/|', $type)) {
                     $type = preg_replace('|config/|', '', $type);
diff --git a/classes/controller.php b/classes/controller.php
index 06dcccdb..15b1968c 100644
--- a/classes/controller.php
+++ b/classes/controller.php
@@ -1580,14 +1580,16 @@ class AdminController
      */
     public function taskContinue()
     {
+        $data = (array) $this->data;
+
         if ($this->view == 'users') {
-            $this->setRedirect("{$this->view}/{$this->post['username']}");
+            $this->setRedirect("{$this->view}/{$data['username']}");
 
             return true;
         }
 
         if ($this->view == 'groups') {
-            $this->setRedirect("{$this->view}/{$this->post['groupname']}");
+            $this->setRedirect("{$this->view}/{$data['groupname']}");
 
             return true;
         }
@@ -1596,7 +1598,6 @@ class AdminController
             return false;
         }
 
-        $data = (array) $this->data;
         $route = $data['route'] != '/' ? $data['route'] : '';
         $folder = ltrim($data['folder'], '_');
         if (!empty($data['modular'])) {
diff --git a/pages/admin/users.md b/pages/admin/user.md
similarity index 64%
rename from pages/admin/users.md
rename to pages/admin/user.md
index 91a6a69b..eb7561e9 100644
--- a/pages/admin/users.md
+++ b/pages/admin/user.md
@@ -1,7 +1,8 @@
 ---
-title: Users
+title: User
 
 access:
     admin.users: true
+    admin.login: true
     admin.super: true
 ---
diff --git a/themes/grav/templates/partials/nav.html.twig b/themes/grav/templates/partials/nav.html.twig
index 8f8738d4..9b1f88f3 100644
--- a/themes/grav/templates/partials/nav.html.twig
+++ b/themes/grav/templates/partials/nav.html.twig
@@ -7,7 +7,7 @@
 
         {#{% if admin.authorize %}#}
         <div id="admin-user-details">
-            <a href="{{ base_url_relative }}/users/{{ admin.user.username|e }}">
+            <a href="{{ base_url_relative }}/user/{{ admin.user.username|e }}">
                 <img src="https://www.gravatar.com/avatar/{{ admin.user.email|md5 }}?s=48" />
 
                 <div class="admin-user-names">
diff --git a/themes/grav/templates/users.html.twig b/themes/grav/templates/user.html.twig
similarity index 99%
rename from themes/grav/templates/users.html.twig
rename to themes/grav/templates/user.html.twig
index 6d08aaa4..0e52bfde 100644
--- a/themes/grav/templates/users.html.twig
+++ b/themes/grav/templates/user.html.twig
@@ -3,12 +3,10 @@
 {% if admin.route %}
     {% set user = admin.data('users/' ~ admin.route) %}
     {% set title = "PLUGIN_ADMIN.USER"|tu ~ ": " ~ admin.route|e %}
-
 {% else %}
     {% set title = "PLUGIN_ADMIN.USERS"|tu %}
 {% endif %}
 
-
 {% block titlebar %}
     {% if not admin.route %}
         <div class="button-bar">