diff options
| author | Greg Roach <fisharebest@webtrees.net> | 2020-01-23 09:39:38 +0000 |
|---|---|---|
| committer | Greg Roach <fisharebest@webtrees.net> | 2020-01-23 09:39:38 +0000 |
| commit | f6924bc8aa0cd5eec0d5ec301d59ae0fb3c66217 (patch) | |
| tree | d8bb4d57a55c8ba11183639e65232e4952eb98e4 /app/Http/RequestHandlers/TreePage.php | |
| parent | 027478c23a63b5681d8d4ac05fec614b75acb7ba (diff) | |
| download | webtrees-f6924bc8aa0cd5eec0d5ec301d59ae0fb3c66217.tar.gz webtrees-f6924bc8aa0cd5eec0d5ec301d59ae0fb3c66217.tar.bz2 webtrees-f6924bc8aa0cd5eec0d5ec301d59ae0fb3c66217.zip | |
Enforce access level for blocks
Diffstat (limited to 'app/Http/RequestHandlers/TreePage.php')
| -rw-r--r-- | app/Http/RequestHandlers/TreePage.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/Http/RequestHandlers/TreePage.php b/app/Http/RequestHandlers/TreePage.php index b0e02b034e..0466bc8213 100644 --- a/app/Http/RequestHandlers/TreePage.php +++ b/app/Http/RequestHandlers/TreePage.php @@ -19,6 +19,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Http\RequestHandlers; +use Fisharebest\Webtrees\Contracts\UserInterface; use Fisharebest\Webtrees\Http\ViewResponseTrait; use Fisharebest\Webtrees\Module\ModuleBlockInterface; use Fisharebest\Webtrees\Services\HomePageService; @@ -61,6 +62,9 @@ class TreePage implements RequestHandlerInterface $tree = $request->getAttribute('tree'); assert($tree instanceof Tree); + $user = $request->getAttribute('user'); + assert($user instanceof UserInterface); + $has_blocks = DB::table('block') ->where('gedcom_id', '=', $tree->id()) ->exists(); @@ -81,8 +85,8 @@ class TreePage implements RequestHandlerInterface } return $this->viewResponse('tree-page', [ - 'main_blocks' => $this->home_page_service->treeBlocks($tree->id(), ModuleBlockInterface::MAIN_BLOCKS), - 'side_blocks' => $this->home_page_service->treeBlocks($tree->id(), ModuleBlockInterface::SIDE_BLOCKS), + 'main_blocks' => $this->home_page_service->treeBlocks($tree, $user, ModuleBlockInterface::MAIN_BLOCKS), + 'side_blocks' => $this->home_page_service->treeBlocks($tree, $user, ModuleBlockInterface::SIDE_BLOCKS), 'title' => e($tree->title()), 'tree' => $tree, 'meta_robots' => 'index,follow', |