Updated shelf-list view to enforce view permissions for child books

[bookstack] / app / Http / Controllers / SearchController.php

diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php
index 4bcf7b40eff4db0c207f7741438a4da9b52bd113..a5d57741d5295d9a315ba190c3dec2e9a57a3cc6 100644 (file)
--- a/app/Http/Controllers/SearchController.php
+++ b/app/Http/Controllers/SearchController.php
@@ -1,35 +1,27 @@
 <?php namespace BookStack\Http\Controllers;
 
 use BookStack\Actions\ViewService;
 <?php namespace BookStack\Http\Controllers;
 
 use BookStack\Actions\ViewService;

-use BookStack\Entities\EntityContextManager;
-use BookStack\Entities\Repos\EntityRepo;
+use BookStack\Entities\Book;
+use BookStack\Entities\Bookshelf;
+use BookStack\Entities\Entity;
+use BookStack\Entities\Managers\EntityContext;

 use BookStack\Entities\SearchService;
 use BookStack\Entities\SearchService;

-use BookStack\Exceptions\NotFoundException;
-use Illuminate\Contracts\View\Factory;

 use Illuminate\Http\Request;
 use Illuminate\Http\Request;

-use Illuminate\View\View;

 
 class SearchController extends Controller
 {
 
 class SearchController extends Controller
 {

-    protected $entityRepo;

     protected $viewService;
     protected $searchService;
     protected $entityContextManager;
 
     /**
      * SearchController constructor.
     protected $viewService;
     protected $searchService;
     protected $entityContextManager;
 
     /**
      * SearchController constructor.

-     * @param EntityRepo $entityRepo
-     * @param ViewService $viewService
-     * @param SearchService $searchService
-     * @param EntityContextManager $entityContextManager

      */
     public function __construct(
      */
     public function __construct(

-        EntityRepo $entityRepo,

         ViewService $viewService,
         SearchService $searchService,
         ViewService $viewService,
         SearchService $searchService,

-        EntityContextManager $entityContextManager
+        EntityContext $entityContextManager

     ) {
     ) {

-        $this->entityRepo = $entityRepo;

         $this->viewService = $viewService;
         $this->searchService = $searchService;
         $this->entityContextManager = $entityContextManager;
         $this->viewService = $viewService;
         $this->searchService = $searchService;
         $this->entityContextManager = $entityContextManager;


@@ -38,9 +30,6 @@ class SearchController extends Controller
 
     /**
      * Searches all entities.
 
     /**
      * Searches all entities.

-     * @param Request $request
-     * @return View
-     * @internal param string $searchTerm

      */
     public function search(Request $request)
     {
      */
     public function search(Request $request)
     {


@@ -48,7 +37,7 @@ class SearchController extends Controller
         $this->setPageTitle(trans('entities.search_for_term', ['term' => $searchTerm]));
 
         $page = intval($request->get('page', '0')) ?: 1;
         $this->setPageTitle(trans('entities.search_for_term', ['term' => $searchTerm]));
 
         $page = intval($request->get('page', '0')) ?: 1;

-        $nextPageLink = baseUrl('/search?term=' . urlencode($searchTerm) . '&page=' . ($page+1));
+        $nextPageLink = url('/search?term=' . urlencode($searchTerm) . '&page=' . ($page+1));

 
         $results = $this->searchService->searchEntities($searchTerm, 'all', $page, 20);
 
 
         $results = $this->searchService->searchEntities($searchTerm, 'all', $page, 20);
 


@@ -64,12 +53,8 @@ class SearchController extends Controller
 
     /**
      * Searches all entities within a book.
 
     /**
      * Searches all entities within a book.

-     * @param Request $request
-     * @param integer $bookId
-     * @return View
-     * @internal param string $searchTerm

      */
      */

-    public function searchBook(Request $request, $bookId)
+    public function searchBook(Request $request, int $bookId)

     {
         $term = $request->get('term', '');
         $results = $this->searchService->searchBook($bookId, $term);
     {
         $term = $request->get('term', '');
         $results = $this->searchService->searchBook($bookId, $term);


@@ -78,12 +63,8 @@ class SearchController extends Controller
 
     /**
      * Searches all entities within a chapter.
 
     /**
      * Searches all entities within a chapter.

-     * @param Request $request
-     * @param integer $chapterId
-     * @return View
-     * @internal param string $searchTerm

      */
      */

-    public function searchChapter(Request $request, $chapterId)
+    public function searchChapter(Request $request, int $chapterId)

     {
         $term = $request->get('term', '');
         $results = $this->searchService->searchChapter($chapterId, $term);
     {
         $term = $request->get('term', '');
         $results = $this->searchService->searchChapter($chapterId, $term);


@@ -93,8 +74,6 @@ class SearchController extends Controller
     /**
      * Search for a list of entities and return a partial HTML response of matching entities.
      * Returns the most popular entities if no search is provided.
     /**
      * Search for a list of entities and return a partial HTML response of matching entities.
      * Returns the most popular entities if no search is provided.

-     * @param Request $request
-     * @return mixed

      */
     public function searchEntitiesAjax(Request $request)
     {
      */
     public function searchEntitiesAjax(Request $request)
     {


@@ -115,15 +94,13 @@ class SearchController extends Controller
 
     /**
      * Search siblings items in the system.
 
     /**
      * Search siblings items in the system.

-     * @param Request $request
-     * @return Factory|View|mixed

      */
     public function searchSiblings(Request $request)
     {
         $type = $request->get('entity_type', null);
         $id = $request->get('entity_id', null);
 
      */
     public function searchSiblings(Request $request)
     {
         $type = $request->get('entity_type', null);
         $id = $request->get('entity_id', null);
 

-        $entity = $this->entityRepo->getById($type, $id);
+        $entity = Entity::getEntityInstance($type)->newQuery()->visible()->find($id);

         if (!$entity) {
             return $this->jsonError(trans('errors.entity_not_found'), 404);
         }
         if (!$entity) {
             return $this->jsonError(trans('errors.entity_not_found'), 404);
         }


@@ -132,12 +109,12 @@ class SearchController extends Controller
 
         // Page in chapter
         if ($entity->isA('page') && $entity->chapter) {
 
         // Page in chapter
         if ($entity->isA('page') && $entity->chapter) {

-            $entities = $this->entityRepo->getChapterChildren($entity->chapter);
+            $entities = $entity->chapter->getVisiblePages();

         }
 
         // Page in book or chapter
         if (($entity->isA('page') && !$entity->chapter) || $entity->isA('chapter')) {
         }
 
         // Page in book or chapter
         if (($entity->isA('page') && !$entity->chapter) || $entity->isA('chapter')) {

-            $entities = $this->entityRepo->getBookDirectChildren($entity->book);
+            $entities = $entity->book->getDirectChildren();

         }
 
         // Book
         }
 
         // Book


@@ -145,15 +122,15 @@ class SearchController extends Controller
         if ($entity->isA('book')) {
             $contextShelf = $this->entityContextManager->getContextualShelfForBook($entity);
             if ($contextShelf) {
         if ($entity->isA('book')) {
             $contextShelf = $this->entityContextManager->getContextualShelfForBook($entity);
             if ($contextShelf) {

-                $entities = $this->entityRepo->getBookshelfChildren($contextShelf);
+                $entities = $contextShelf->visibleBooks()->get();

             } else {
             } else {

-                $entities = $this->entityRepo->getAll('book');
+                $entities = Book::visible()->get();

             }
         }
 
         // Shelve
         if ($entity->isA('bookshelf')) {
             }
         }
 
         // Shelve
         if ($entity->isA('bookshelf')) {

-            $entities = $this->entityRepo->getAll('bookshelf');
+            $entities = Bookshelf::visible()->get();

         }
 
         return view('partials.entity-list-basic', ['entities' => $entities, 'style' => 'compact']);
         }
 
         return view('partials.entity-list-basic', ['entities' => $entities, 'style' => 'compact']);