From 9ded8817d91ac262bcc11292977f2d513d7467dd Mon Sep 17 00:00:00 2001
From: fatchan <tom@69420.me>
Date: Sun, 26 Apr 2020 14:17:17 +1000
Subject: [PATCH] logout change

---
 configs/nginx.example             | 2 +-
 configs/nginx_no_https.example    | 2 +-
 controllers/forms.js              | 2 ++
 controllers/pages.js              | 3 +--
 models/{pages => forms}/logout.js | 0
 views/pages/account.pug           | 3 ++-
 6 files changed, 7 insertions(+), 5 deletions(-)
 rename models/{pages => forms}/logout.js (100%)

diff --git a/configs/nginx.example b/configs/nginx.example
index 9f17e2ed..2177491a 100644
--- a/configs/nginx.example
+++ b/configs/nginx.example
@@ -16,7 +16,7 @@ server {
 	add_header X-Content-Type-Options "nosniff" always;
 	add_header X-XSS-Protection "1; mode=block" always;
 
-	if ($request_uri ~ ^/(?!captcha|randombanner|forms|logout|socket\.io)) {
+	if ($request_uri ~ ^/(?!captcha|randombanner|forms|socket\.io)) {
 		rewrite ^([^.\?]*[^/])$ $1/ redirect;
 		rewrite ^(.+)/$ $1/index.html redirect;
 	}
diff --git a/configs/nginx_no_https.example b/configs/nginx_no_https.example
index 4fae9a09..c17c2bf3 100644
--- a/configs/nginx_no_https.example
+++ b/configs/nginx_no_https.example
@@ -16,7 +16,7 @@ server {
 	add_header X-Content-Type-Options "nosniff" always;
 	add_header X-XSS-Protection "1; mode=block" always;
 
-	if ($request_uri ~ ^/(?!captcha|randombanner|forms|logout|socket\.io)) {
+	if ($request_uri ~ ^/(?!captcha|randombanner|forms|socket\.io)) {
 		rewrite ^([^.\?]*[^/])$ $1/ redirect;
 		rewrite ^(.+)/$ $1/index.html redirect;
 	}
diff --git a/controllers/forms.js b/controllers/forms.js
index ae04b4ea..b47fcb5a 100644
--- a/controllers/forms.js
+++ b/controllers/forms.js
@@ -77,6 +77,7 @@ const express  = require('express')
 	, editPostController = require(__dirname+'/forms/editpost.js')
 	, newCaptcha = require(__dirname+'/../models/forms/newcaptcha.js')
 	, blockBypass = require(__dirname+'/../models/forms/blockbypass.js')
+	, logout = require(__dirname+'/../models/forms/logout.js');
 
 //make new post
 router.post('/board/:board/post', sessionRefresh, Boards.exists, calcPerms, banCheck, postFiles,
@@ -112,6 +113,7 @@ router.post('/global/settings', sessionRefresh, csrf, calcPerms, isLoggedIn, has
 router.post('/create', sessionRefresh, isLoggedIn, verifyCaptcha, calcPerms, hasPerms(4), createBoardController);
 //accounts
 router.post('/login', loginController);
+router.post('/logout', logout);
 router.post('/register', verifyCaptcha, calcPerms, registerController);
 router.post('/changepassword', verifyCaptcha, changePasswordController);
 
diff --git a/controllers/pages.js b/controllers/pages.js
index fbf545d1..bc726153 100644
--- a/controllers/pages.js
+++ b/controllers/pages.js
@@ -17,7 +17,7 @@ const express  = require('express')
 		manageBoard, manageThread, manageLogs, manageCatalog } = require(__dirname+'/../models/pages/manage/')
 	, { globalManageSettings, globalManageReports, globalManageBans,
 		globalManageRecent, globalManageAccounts, globalManageNews, globalManageLogs } = require(__dirname+'/../models/pages/globalmanage/')
-	, { changePassword, blockBypass, home, register, login, logout, create,
+	, { changePassword, blockBypass, home, register, login, create,
 		board, catalog, banners, randombanner, news, captchaPage,
 		captcha, thread, modlog, modloglist, account, boardlist } = require(__dirname+'/../models/pages/');
 
@@ -72,7 +72,6 @@ router.get('/account.html', sessionRefresh, isLoggedIn, account); //page showing
 router.get('/login.html', login);
 router.get('/register.html', register);
 router.get('/changepassword.html', changePassword);
-router.get('/logout', logout);
 
 module.exports = router;
 
diff --git a/models/pages/logout.js b/models/forms/logout.js
similarity index 100%
rename from models/pages/logout.js
rename to models/forms/logout.js
diff --git a/views/pages/account.pug b/views/pages/account.pug
index c8defd7a..803a23b5 100644
--- a/views/pages/account.pug
+++ b/views/pages/account.pug
@@ -15,7 +15,8 @@ block content
 			li: a(href='/globalmanage/recent.html') Global management
 		li: a(href='/create.html') Create a board
 		li: a(href='/changepassword.html') Change password
-		li: a(href='/logout') Log out
+	form(action='/forms/logout' method='post')
+		input(type='submit' value='Log out')
 	hr(size=1)
 	h4.no-m-p Boards you own:
 	if user.ownedBoards && user.ownedBoards.length > 0