mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-21 14:02:59 +02:00
Code Issues Releases Wiki Activity

Fix issue processwire/processwire-issues#1215

Browse Source
This commit is contained in:
Ryan Cramer
2020-07-23 12:51:53 -04:00
parent 7e3f10b2ff
commit d6b9ee8db8
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
wire/modules/Process/ProcessPageView.module
View File

@@ -8,7 +8,7 @@
* For more details about how Process modules work, please see: * For more details about how Process modules work, please see:
* /wire/core/Process.php * /wire/core/Process.php
* *
* ProcessWire 3.x, Copyright 2019 by Ryan Cramer * ProcessWire 3.x, Copyright 2020 by Ryan Cramer
* https://processwire.com * https://processwire.com
* *
* @method string execute($internal = true) * @method string execute($internal = true)
@@ -698,14 +698,26 @@ class ProcessPageView extends Process {
*/ */
protected function checkAccess($page) { protected function checkAccess($page) {
$user = $this->wire()->user;
if($this->requestFile) { if($this->requestFile) {
// if a file was requested, we still allow view even if page doesn't have template file // if a file was requested, we still allow view even if page doesn't have template file
if($page->viewable(false)) return $page; if($page->viewable(false)) return $page;
// if($page->editable()) return $page; // if($page->editable()) return $page;
if($this->checkAccessDelegated($page)) return $page; if($this->checkAccessDelegated($page)) return $page;
if($page->status < Page::statusUnpublished && $this->wire('user')->hasPermission('page-view', $page)) return $page; if($page->status < Page::statusUnpublished && $user->hasPermission('page-view', $page)) return $page;
} else if($page->viewable()) { } else if($page->viewable()) {
return $page; return $page;
} else if($page->parent_id && $page->parent->template->name === 'admin' && $page->parent->viewable()) {
// check for special case in admin when Process::executeSegment() collides with page name underneath
// example: a role named "edit" is created and collides with ProcessPageType::executeEdit()
$input = $this->wire()->input;
if($user->isLoggedin() && $page->editable() && !strlen($input->urlSegmentStr())) {
$input->setUrlSegment(1, $page->name);
return $page->parent;
}
} }
$accessTemplate = $page->getAccessTemplate(); $accessTemplate = $page->getAccessTemplate();
@@ -713,7 +725,7 @@ class ProcessPageView extends Process {
$requestPage = $page; $requestPage = $page;
if($redirectLogin) { if($redirectLogin) {
$config = $this->wire('config'); $config = $this->wire()->config;
$disallowIDs = array($config->trashPageID); // don't allow login redirect for these pages $disallowIDs = array($config->trashPageID); // don't allow login redirect for these pages
if($page->id && in_array($page->id, $disallowIDs)) { if($page->id && in_array($page->id, $disallowIDs)) {
$page = null; $page = null;
@@ -729,7 +741,7 @@ class ProcessPageView extends Process {
} }
// in case anything needs to know the originally requested login page // in case anything needs to know the originally requested login page
$this->wire('session')->setFor('ProcessPageView', 'loginRequestPageID', $requestPage->id); $this->wire()->session->setFor('ProcessPageView', 'loginRequestPageID', $requestPage->id);
} else { } else {
$page = null; $page = null;