Add APP_LOGGING

[bookstack] / app / Services / PermissionService.php

diff --git a/app/Services/PermissionService.php b/app/Services/PermissionService.php
index 39a2c38beda24f795dbe4d0d0d88c3fec3a9f40f..1e75308a07e3734ac6771cf2b78a5c5babe8f3d7 100644 (file)
--- a/app/Services/PermissionService.php
+++ b/app/Services/PermissionService.php
@@ -243,13 +243,14 @@ class PermissionService
      */
     protected function deleteManyJointPermissionsForEntities($entities)
     {
      */
     protected function deleteManyJointPermissionsForEntities($entities)
     {

+        if (count($entities) === 0) return;

         $query = $this->jointPermission->newQuery();
         $query = $this->jointPermission->newQuery();

-        foreach ($entities as $entity) {
-            $query->orWhere(function($query) use ($entity) {
-                $query->where('entity_id', '=', $entity->id)
-                    ->where('entity_type', '=', $entity->getMorphClass());
-            });
-        }
+            foreach ($entities as $entity) {
+                $query->orWhere(function($query) use ($entity) {
+                    $query->where('entity_id', '=', $entity->id)
+                        ->where('entity_type', '=', $entity->getMorphClass());
+                });
+            }

         $query->delete();
     }
 
         $query->delete();
     }
 


@@ -473,11 +474,12 @@ class PermissionService
     /**
      * Get the children of a book in an efficient single query, Filtered by the permission system.
      * @param integer $book_id
     /**
      * Get the children of a book in an efficient single query, Filtered by the permission system.
      * @param integer $book_id

-     * @param bool    $filterDrafts
+     * @param bool $filterDrafts
+     * @param bool $fetchPageContent

      * @return \Illuminate\Database\Query\Builder
      */
      * @return \Illuminate\Database\Query\Builder
      */

-    public function bookChildrenQuery($book_id, $filterDrafts = false) {
-        $pageSelect = $this->db->table('pages')->selectRaw("'BookStack\\\\Page' as entity_type, id, slug, name, text, '' as description, book_id, priority, chapter_id, draft")->where('book_id', '=', $book_id)->where(function($query) use ($filterDrafts) {
+    public function bookChildrenQuery($book_id, $filterDrafts = false, $fetchPageContent = false) {
+        $pageSelect = $this->db->table('pages')->selectRaw($this->page->entityRawQuery($fetchPageContent))->where('book_id', '=', $book_id)->where(function($query) use ($filterDrafts) {

             $query->where('draft', '=', 0);
             if (!$filterDrafts) {
                 $query->orWhere(function($query) {
             $query->where('draft', '=', 0);
             if (!$filterDrafts) {
                 $query->orWhere(function($query) {


@@ -485,7 +487,7 @@ class PermissionService
                 });
             }
         });
                 });
             }
         });

-        $chapterSelect = $this->db->table('chapters')->selectRaw("'BookStack\\\\Chapter' as entity_type, id, slug, name, '' as text, description, book_id, priority, 0 as chapter_id, 0 as draft")->where('book_id', '=', $book_id);
+        $chapterSelect = $this->db->table('chapters')->selectRaw($this->chapter->entityRawQuery())->where('book_id', '=', $book_id);

         $query = $this->db->query()->select('*')->from($this->db->raw("({$pageSelect->toSql()} UNION {$chapterSelect->toSql()}) AS U"))
             ->mergeBindings($pageSelect)->mergeBindings($chapterSelect);
 
         $query = $this->db->query()->select('*')->from($this->db->raw("({$pageSelect->toSql()} UNION {$chapterSelect->toSql()}) AS U"))
             ->mergeBindings($pageSelect)->mergeBindings($chapterSelect);
 


@@ -511,7 +513,7 @@ class PermissionService
      * @param string $entityType
      * @param Builder|Entity $query
      * @param string $action
      * @param string $entityType
      * @param Builder|Entity $query
      * @param string $action

-     * @return mixed
+     * @return Builder

      */
     public function enforceEntityRestrictions($entityType, $query, $action = 'view')
     {
      */
     public function enforceEntityRestrictions($entityType, $query, $action = 'view')
     {


@@ -537,7 +539,7 @@ class PermissionService
     }
 
     /**
     }
 
     /**

-     * Filter items that have entities set a a polymorphic relation.
+     * Filter items that have entities set as a polymorphic relation.

      * @param $query
      * @param string $tableName
      * @param string $entityIdColumn
      * @param $query
      * @param string $tableName
      * @param string $entityIdColumn