From 2514e7b94710538498d3578b7ec9b9e58fbccebb Mon Sep 17 00:00:00 2001
From: Awilum <awilum@msn.com>
Date: Sat, 1 Jun 2019 19:18:13 +0300
Subject: [PATCH] Flextype Box Plugin: Admin #125 #117 - Users Controller/Views
 implementation

---
 .../app/Controllers/UsersConstroller.php      |  8 ++++-
 .../admin/views/templates/users/profile.html  |  7 ++++-
 .../admin/views/templates/users/profile.php   | 29 -------------------
 3 files changed, 13 insertions(+), 31 deletions(-)
 delete mode 100644 site/plugins/admin/views/templates/users/profile.php

diff --git a/site/plugins/admin/app/Controllers/UsersConstroller.php b/site/plugins/admin/app/Controllers/UsersConstroller.php
index 7c8c8ded..9293b63d 100644
--- a/site/plugins/admin/app/Controllers/UsersConstroller.php
+++ b/site/plugins/admin/app/Controllers/UsersConstroller.php
@@ -47,7 +47,7 @@ class UsersController extends Controller
             if (password_verify(trim($data['password']), $user_file['hashed_password'])) {
                 Session::set('username', $user_file['username']);
                 Session::set('role', $user_file['role']);
-                return $response->withRedirect('admin/entries');
+                return $response->withRedirect($this->container->get('router')->pathFor('admin.entries.index'));
             } else {
                 //Notification::set('error', __('admin_message_wrong_username_password'));
             }
@@ -89,6 +89,12 @@ class UsersController extends Controller
             //return false;
         }
     }
+
+    public function logoutProcess($request, $response, $args)
+    {
+        Session::destroy();
+        return $response->withRedirect($this->container->get('router')->pathFor('admin.users.login'));
+    }
 }
 
 
diff --git a/site/plugins/admin/views/templates/users/profile.html b/site/plugins/admin/views/templates/users/profile.html
index ec3725e6..dca93ecd 100644
--- a/site/plugins/admin/views/templates/users/profile.html
+++ b/site/plugins/admin/views/templates/users/profile.html
@@ -6,6 +6,11 @@
     {{ tr('admin_username') }}: {{ username }} <br>
     {{ tr('admin_role') }}: {{ rolename }}<br>
     <br>
-    <a class="btn btn-default" href="{{ base_url() }}/admin/logout">{{ tr('admin_logout') }}</a>
+    <form id="logoutProcess" action="{{ path_for('admin.users.logoutProcess') }}" method="POST" style="display: none;">
+        {{ csrf() }}
+    </form>
+    <a class="btn btn-default" href="javascript:;"
+       onclick="event.preventDefault();
+                document.getElementById('logoutProcess').submit();">{{ tr('admin_logout') }}</a>
 </div>
 {% endblock %}
diff --git a/site/plugins/admin/views/templates/users/profile.php b/site/plugins/admin/views/templates/users/profile.php
deleted file mode 100644
index 9d58da45..00000000
--- a/site/plugins/admin/views/templates/users/profile.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-namespace Flextype;
-use Flextype\Component\{Http\Http, Registry\Registry, Filesystem\Filesystem, Token\Token, Number\Number};
-use Flextype\Component\Session\Session;
-use function Flextype\Component\I18n\__;
-
-Themes::view('admin/views/partials/head')->display();
-Themes::view('admin/views/partials/navbar')
-    ->assign('links', [
-                        'information' => [
-                                            'link' => Http::getBaseUrl() . '/admin/profile',
-                                            'title' => __('admin_profile'),
-                                            'attributes' => ['class' => 'navbar-item active']
-                                            ],
-                        ])
-    ->display();
-Themes::view('admin/views/partials/content-start')->display();
-?>
-
-<div class="profile">
-    <i class="fas fa-user-circle"></i>
-    <?= __('admin_username') ?>: <?= Session::get('username') ?> <br>
-    <?= __('admin_role') ?>: <?= Session::get('role') ?> <br>
-    <br>
-    <a class="btn btn-default" href="<?= Http::getBaseUrl() ?>/admin/logout?token=<?= Token::generate() ?>"><?= __('admin_logout') ?></a>
-</div>
-
-<?php Themes::view('admin/views/partials/content-end')->display() ?>
-<?php Themes::view('admin/views/partials/footer')->display() ?>