Logout rework (#3008)

* Logout rework * Uncomment * Output logout complete message via die() Co-authored-by: Tadhg Boyle <tadhgsmboyle@gmail.com> * Add indentation back Co-authored-by: Tadhg Boyle <tadhgsmboyle@gmail.com>
NamelessMC · Aug 13, 2022 · be5c947 · be5c947
1 parent 52e9559
commit be5c947
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 9 deletions.
diff --git a/core/templates/navbar.php b/core/templates/navbar.php
@@ -134,6 +134,7 @@
                 'title' => $language->get('general', 'log_out'),
                 'link' => URL::build('/logout'),
                 'target' => '',
+                'action' => 'logout',
             ],
         ],
     ];

diff --git a/custom/languages/en_UK.json b/custom/languages/en_UK.json
@@ -772,6 +772,8 @@
     "general/links": "Links",
     "general/loading": "Loading...",
     "general/log_out": "Log Out",
+    "general/log_out_click": "Click here to log out",
+    "general/log_out_complete": "Logout successful. Click {{linkStart}}here{{linkEnd}} to continue.",
     "general/more": "More",
     "general/next": "Next",
     "general/no": "No",

diff --git a/custom/templates/DefaultRevamp/js/core/core.js b/custom/templates/DefaultRevamp/js/core/core.js
@@ -25,6 +25,17 @@ function copy(element) {
     });
 }
 
+$(document).ready(function () {
+    $('[data-action="logout"]').click(function () {
+        const url = $(this).data('link');
+        $.post(url, {
+            token: csrfToken
+        }).done(function () {
+            window.location.reload();
+        });
+    });
+});
+
 $(function () {
     $('.ui.sidebar').sidebar('attach events', '.toc.item');
 

diff --git a/custom/templates/DefaultRevamp/navbar.tpl b/custom/templates/DefaultRevamp/navbar.tpl
@@ -66,8 +66,15 @@
                             {if isset($dropdown.separator)}
                             <div class="ui divider"></div>
                             {else}
-                            <a class="item" href="{$dropdown.link}" target="{$dropdown.target}">{$dropdown.icon}
-                                {$dropdown.title}</a>
+                                {if isset($dropdown.action)}
+                                    <a class="item" href="#" data-link="{$dropdown.link}" data-action="{$dropdown.action}">
+                                        {$dropdown.icon} {$dropdown.title}
+                                    </a>
+                                {else}
+                                    <a class="item" href="{$dropdown.link}" target="{$dropdown.target}">
+                                        {$dropdown.icon} {$dropdown.title}
+                                    </a>
+                                {/if}
                             {/if}
                             {/foreach}
                         </div>

diff --git a/custom/templates/DefaultRevamp/template.php b/custom/templates/DefaultRevamp/template.php
@@ -117,7 +117,8 @@ public function onPageLoad() {
             'loggedIn' => $this->_user->isLoggedIn() ? '1' : '0',
             'cookie' => defined('COOKIE_NOTICE') ? '1' : '0',
             'loadingTime' => Util::getSetting('page_loading') === '1' ? PAGE_LOAD_TIME : '',
-            'route' => $route
+            'route' => $route,
+            'csrfToken' => Token::get(),
         ];
 
         if (strpos($route, '/forum/topic/') !== false || PAGE == 'profile') {
@@ -136,7 +137,7 @@ public function onPageLoad() {
         $this->addJSScript($JSVars);
 
         $this->addJSFiles([
-            $this->_template['path'] . 'js/core/core.js' => [],
+            $this->_template['path'] . 'js/core/core.js?v=202' => [],
             $this->_template['path'] . 'js/core/user.js' => [],
             $this->_template['path'] . 'js/core/pages.js' => [],
             $this->_template['path'] . 'js/scripts.js' => [],

diff --git a/modules/Core/pages/logout.php b/modules/Core/pages/logout.php
@@ -2,18 +2,35 @@
 /*
  *  Made by Samerton
  *  https://github.com/NamelessMC/Nameless/
- *  NamelessMC version 2.0.0-dev
+ *  NamelessMC version 2.0.2
  *
  *  License: MIT
  *
  *  Log user out
  */
 
 if ($user->isLoggedIn()) {
-    Log::getInstance()->log(Log::Action('user/logout'));
-    $user->admLogout();
-    $user->logout();
+    if (Input::exists()) {
+        if (Token::check()) {
+            Log::getInstance()->log(Log::Action('user/logout'));
+            $user->admLogout();
+            $user->logout();
 
-    Session::flash('home', $language->get('user', 'successfully_logged_out'));
+            Session::flash('home', $language->get('user', 'successfully_logged_out'));
+            die($language->get('general', 'log_out_complete', ['linkStart' => '<a href="' . URL::build('/') . '">', 'linkEnd' => '</a>']));
+        }
+
+        echo $language->get('general', 'invalid_token') . '<hr />';
+    }
+
+    echo '
+    <form method="post" action="" id="logout">
+      <input type="hidden" name="token" value="' . Token::get() . '">
+    </form>
+    <a href="javascript:void(0)" onclick="document.getElementById(\'logout\').submit();">' . $language->get('general', 'log_out_click') . '</a>
+    ';
+
+    return;
 }
+
 Redirect::to(URL::build('/'));