System CLI: Updated to 126de5599c state

[bookstack] / app / Entities / Tools / Cloner.php

diff --git a/app/Entities/Tools/Cloner.php b/app/Entities/Tools/Cloner.php
index 3553a9db3cd569dbd9030439512ba4beb6737fb6..2030b050c4b19f39e01b1c6312c3e381405ff855 100644 (file)
--- a/app/Entities/Tools/Cloner.php
+++ b/app/Entities/Tools/Cloner.php
@@ -2,10 +2,12 @@
 
 namespace BookStack\Entities\Tools;
 
 
 namespace BookStack\Entities\Tools;
 

-use BookStack\Actions\Tag;
+use BookStack\Activity\Models\Tag;

 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Book;

+use BookStack\Entities\Models\Bookshelf;

 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Entity;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Entity;

+use BookStack\Entities\Models\HasCoverImage;

 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Repos\BookRepo;
 use BookStack\Entities\Repos\ChapterRepo;
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Repos\BookRepo;
 use BookStack\Entities\Repos\ChapterRepo;


@@ -16,25 +18,10 @@ use Illuminate\Http\UploadedFile;
 
 class Cloner
 {
 
 class Cloner
 {

-    /**
-     * @var PageRepo
-     */
-    protected $pageRepo;
-
-    /**
-     * @var ChapterRepo
-     */
-    protected $chapterRepo;
-
-    /**
-     * @var BookRepo
-     */
-    protected $bookRepo;
-
-    /**
-     * @var ImageService
-     */
-    protected $imageService;
+    protected PageRepo $pageRepo;
+    protected ChapterRepo $chapterRepo;
+    protected BookRepo $bookRepo;
+    protected ImageService $imageService;

 
     public function __construct(PageRepo $pageRepo, ChapterRepo $chapterRepo, BookRepo $bookRepo, ImageService $imageService)
     {
 
     public function __construct(PageRepo $pageRepo, ChapterRepo $chapterRepo, BookRepo $bookRepo, ImageService $imageService)
     {


@@ -86,9 +73,11 @@ class Cloner
         $bookDetails = $this->entityToInputData($original);
         $bookDetails['name'] = $newName;
 
         $bookDetails = $this->entityToInputData($original);
         $bookDetails['name'] = $newName;
 

+        // Clone book

         $copyBook = $this->bookRepo->create($bookDetails);
 
         $copyBook = $this->bookRepo->create($bookDetails);
 

-        $directChildren = $original->getDirectChildren();
+        // Clone contents
+        $directChildren = $original->getDirectVisibleChildren();

         foreach ($directChildren as $child) {
             if ($child instanceof Chapter && userCan('chapter-create', $copyBook)) {
                 $this->cloneChapter($child, $copyBook, $child->name);
         foreach ($directChildren as $child) {
             if ($child instanceof Chapter && userCan('chapter-create', $copyBook)) {
                 $this->cloneChapter($child, $copyBook, $child->name);


@@ -99,11 +88,20 @@ class Cloner
             }
         }
 
             }
         }
 

+        // Clone bookshelf relationships
+        /** @var Bookshelf $shelf */
+        foreach ($original->shelves as $shelf) {
+            if (userCan('bookshelf-update', $shelf)) {
+                $shelf->appendBook($copyBook);
+            }
+        }
+

         return $copyBook;
     }
 
     /**
      * Convert an entity to a raw data array of input data.
         return $copyBook;
     }
 
     /**
      * Convert an entity to a raw data array of input data.

+     *

      * @return array<string, mixed>
      */
     public function entityToInputData(Entity $entity): array
      * @return array<string, mixed>
      */
     public function entityToInputData(Entity $entity): array


@@ -112,23 +110,35 @@ class Cloner
         $inputData['tags'] = $this->entityTagsToInputArray($entity);
 
         // Add a cover to the data if existing on the original entity
         $inputData['tags'] = $this->entityTagsToInputArray($entity);
 
         // Add a cover to the data if existing on the original entity

-        if ($entity->cover instanceof Image) {
-            $tmpImgFile = tmpfile();
-            $uploadedFile = $this->imageToUploadedFile($entity->cover, $tmpImgFile);
-            $inputData['image'] = $uploadedFile;
+        if ($entity instanceof HasCoverImage) {
+            $cover = $entity->cover()->first();
+            if ($cover) {
+                $inputData['image'] = $this->imageToUploadedFile($cover);
+            }

         }
 
         return $inputData;
     }
 
         }
 
         return $inputData;
     }
 

+    /**
+     * Copy the permission settings from the source entity to the target entity.
+     */
+    public function copyEntityPermissions(Entity $sourceEntity, Entity $targetEntity): void
+    {
+        $permissions = $sourceEntity->permissions()->get(['role_id', 'view', 'create', 'update', 'delete'])->toArray();
+        $targetEntity->permissions()->delete();
+        $targetEntity->permissions()->createMany($permissions);
+        $targetEntity->rebuildPermissions();
+    }
+

     /**
      * Convert an image instance to an UploadedFile instance to mimic
      * a file being uploaded.
      */
     /**
      * Convert an image instance to an UploadedFile instance to mimic
      * a file being uploaded.
      */

-    protected function imageToUploadedFile(Image $image, &$tmpFile): ?UploadedFile
+    protected function imageToUploadedFile(Image $image): ?UploadedFile

     {
         $imgData = $this->imageService->getImageData($image);
     {
         $imgData = $this->imageService->getImageData($image);

-        $tmpImgFilePath = stream_get_meta_data($tmpFile)['uri'];
+        $tmpImgFilePath = tempnam(sys_get_temp_dir(), 'bs_cover_clone_');

         file_put_contents($tmpImgFilePath, $imgData);
 
         return new UploadedFile($tmpImgFilePath, basename($image->path));
         file_put_contents($tmpImgFilePath, $imgData);
 
         return new UploadedFile($tmpImgFilePath, basename($image->path));