diff --git a/controllers/forms.js b/controllers/forms.js index 5c9f3bb4..8125aa9c 100644 --- a/controllers/forms.js +++ b/controllers/forms.js @@ -281,8 +281,7 @@ router.post('/board/:board/deletebanners', Boards.exists, banCheck, checkPermsMi }); -//report/delete/spoiler/ban -router.post('/board/:board/actions', Boards.exists, banCheck, paramConverter, verifyCaptcha, async (req, res, next) => { +async function actions(req, res, next) { const errors = []; @@ -515,7 +514,11 @@ router.post('/board/:board/actions', Boards.exists, banCheck, paramConverter, ve 'redirect': `/${req.params.board}` }); -}); +} + +//report/delete/spoiler/ban +router.post('/board/:board/actions', Boards.exists, banCheck, paramConverter, verifyCaptcha, actions); +router.post('/board/:board/modactions', Boards.exists, checkPermsMiddleware, paramConverter, actions); //unban router.post('/board/:board/unban', Boards.exists, banCheck, checkPermsMiddleware, paramConverter, async (req, res, next) => { diff --git a/views/includes/actionfooter_globalmanage.pug b/views/includes/actionfooter_globalmanage.pug index ef99d875..d91014e8 100644 --- a/views/includes/actionfooter_globalmanage.pug +++ b/views/includes/actionfooter_globalmanage.pug @@ -14,8 +14,6 @@ label.toggle-label Toggle Post Actions | Spoiler Images label input#report(type='text', name='report_reason', placeholder='report reason' autocomplete='off') - .actions - h4.no-m-p Mod Actions: label input.post-check(type='checkbox', name='delete_ip_global' value=1) | Delete from IP globally @@ -29,6 +27,6 @@ label.toggle-label Toggle Post Actions input.post-check(type='checkbox', name='preserve_post' value=1) | Show Post In Ban label - input#report(type='text', name='ban_reason', placeholder='ban reason' autocomplete='off') + input#ban_reason(type='text', name='ban_reason', placeholder='ban reason' autocomplete='off') input(type='submit', value='submit') diff --git a/views/includes/actionfooter_manage.pug b/views/includes/actionfooter_manage.pug index 478d605a..79b61474 100644 --- a/views/includes/actionfooter_manage.pug +++ b/views/includes/actionfooter_manage.pug @@ -12,15 +12,11 @@ label.toggle-label Toggle Post Actions label input.post-check(type='checkbox', name='spoiler' value=1) | Spoiler Images - label - input#password(type='text', name='password', placeholder='post password' autocomplete='off') label input.post-check(type='checkbox', name='global_report' value=1) | Global Report label input#report(type='text', name='report_reason', placeholder='report reason' autocomplete='off') - .actions - h4.no-m-p Mod Actions: label input.post-check(type='checkbox', name='delete_ip_board' value=1) | Delete from IP on board @@ -37,6 +33,6 @@ label.toggle-label Toggle Post Actions input.post-check(type='checkbox', name='preserve_post' value=1) | Show Post In Ban label - input#report(type='text', name='ban_reason', placeholder='ban reason' autocomplete='off') + input#ban_reason(type='text', name='ban_reason', placeholder='ban reason' autocomplete='off') input(type='submit', value='submit') diff --git a/views/pages/manage.pug b/views/pages/manage.pug index 942e3176..c4547009 100644 --- a/views/pages/manage.pug +++ b/views/pages/manage.pug @@ -10,7 +10,7 @@ block content include ../includes/bannerform.pug p: a(href='/changepassword') Change password h4 Reports: - form(action=`/forms/board/${board._id}/actions` method='POST' enctype='application/x-www-form-urlencoded') + form(action=`/forms/board/${board._id}/modactions` method='POST' enctype='application/x-www-form-urlencoded') input(type='hidden' name='_csrf' value=csrf) if reports.length === 0 p No reports.