replace GPL diff lib with MIT lib

[bookstack] / app / Services / ImageService.php

diff --git a/app/Services/ImageService.php b/app/Services/ImageService.php
index 600c85a24443413f82946c6c24c65f9ff1380f76..dd965c90fb449368f92a787d5f9b58d2eedf609d 100644 (file)
--- a/app/Services/ImageService.php
+++ b/app/Services/ImageService.php
@@ -1,7 +1,10 @@
 <?php namespace BookStack\Services;
 
 <?php namespace BookStack\Services;
 

+use BookStack\Exceptions\ImageUploadException;

 use BookStack\Image;
 use BookStack\User;
 use BookStack\Image;
 use BookStack\User;

+use Exception;
+use Intervention\Image\Exception\NotSupportedException;

 use Intervention\Image\ImageManager;
 use Illuminate\Contracts\Filesystem\Factory as FileSystem;
 use Illuminate\Contracts\Filesystem\Filesystem as FileSystemInstance;
 use Intervention\Image\ImageManager;
 use Illuminate\Contracts\Filesystem\Factory as FileSystem;
 use Illuminate\Contracts\Filesystem\Filesystem as FileSystemInstance;


@@ -38,14 +41,16 @@ class ImageService
     /**
      * Saves a new image from an upload.
      * @param UploadedFile $uploadedFile
     /**
      * Saves a new image from an upload.
      * @param UploadedFile $uploadedFile

-     * @param  string      $type
+     * @param  string $type
+     * @param int $uploadedTo

      * @return mixed
      * @return mixed

+     * @throws ImageUploadException

      */
      */

-    public function saveNewFromUpload(UploadedFile $uploadedFile, $type)
+    public function saveNewFromUpload(UploadedFile $uploadedFile, $type, $uploadedTo = 0)

     {
         $imageName = $uploadedFile->getClientOriginalName();
         $imageData = file_get_contents($uploadedFile->getRealPath());
     {
         $imageName = $uploadedFile->getClientOriginalName();
         $imageData = file_get_contents($uploadedFile->getRealPath());

-        return $this->saveNew($imageName, $imageData, $type);
+        return $this->saveNew($imageName, $imageData, $type, $uploadedTo);

     }
 
 
     }
 
 


@@ -70,12 +75,14 @@ class ImageService
      * @param string $imageName
      * @param string $imageData
      * @param string $type
      * @param string $imageName
      * @param string $imageData
      * @param string $type

+     * @param int $uploadedTo

      * @return Image
      * @return Image

+     * @throws ImageUploadException

      */
      */

-    private function saveNew($imageName, $imageData, $type)
+    private function saveNew($imageName, $imageData, $type, $uploadedTo = 0)

     {
         $storage = $this->getStorage();
     {
         $storage = $this->getStorage();

-        $secureUploads = Setting::get('app-secure-images');
+        $secureUploads = setting('app-secure-images');

         $imageName = str_replace(' ', '-', $imageName);
 
         if ($secureUploads) $imageName = str_random(16) . '-' . $imageName;
         $imageName = str_replace(' ', '-', $imageName);
 
         if ($secureUploads) $imageName = str_random(16) . '-' . $imageName;


@@ -86,17 +93,27 @@ class ImageService
         }
         $fullPath = $imagePath . $imageName;
 
         }
         $fullPath = $imagePath . $imageName;
 

-        $storage->put($fullPath, $imageData);
+        try {
+            $storage->put($fullPath, $imageData);
+        } catch (Exception $e) {
+            throw new ImageUploadException('Image Path ' . $fullPath . ' is not writable by the server.');
+        }

 
 

-        $userId = auth()->user()->id;
-        $image = Image::forceCreate([
+        $imageDetails = [

             'name'       => $imageName,
             'path'       => $fullPath,
             'url'        => $this->getPublicUrl($fullPath),
             'type'       => $type,
             'name'       => $imageName,
             'path'       => $fullPath,
             'url'        => $this->getPublicUrl($fullPath),
             'type'       => $type,

-            'created_by' => $userId,
-            'updated_by' => $userId
-        ]);
+            'uploaded_to' => $uploadedTo
+        ];
+
+        if (auth()->user() && auth()->user()->id !== 0) {
+            $userId = auth()->user()->id;
+            $imageDetails['created_by'] = $userId;
+            $imageDetails['updated_by'] = $userId;
+        }
+
+        $image = Image::forceCreate($imageDetails);

 
         return $image;
     }
 
         return $image;
     }


@@ -107,10 +124,12 @@ class ImageService
      * Checks the cache then storage to avoid creating / accessing the filesystem on every check.
      *
      * @param Image $image
      * Checks the cache then storage to avoid creating / accessing the filesystem on every check.
      *
      * @param Image $image

-     * @param int   $width
-     * @param int   $height
-     * @param bool  $keepRatio
+     * @param int $width
+     * @param int $height
+     * @param bool $keepRatio

      * @return string
      * @return string

+     * @throws Exception
+     * @throws ImageUploadException

      */
     public function getThumbnail(Image $image, $width = 220, $height = 220, $keepRatio = false)
     {
      */
     public function getThumbnail(Image $image, $width = 220, $height = 220, $keepRatio = false)
     {


@@ -127,8 +146,16 @@ class ImageService
             return $this->getPublicUrl($thumbFilePath);
         }
 
             return $this->getPublicUrl($thumbFilePath);
         }
 

-        // Otherwise create the thumbnail
-        $thumb = $this->imageTool->make($storage->get($image->path));
+        try {
+            $thumb = $this->imageTool->make($storage->get($image->path));
+        } catch (Exception $e) {
+            if ($e instanceof \ErrorException || $e instanceof NotSupportedException) {
+                throw new ImageUploadException('The server cannot create thumbnails. Please check you have the GD PHP extension installed.');
+            } else {
+                throw $e;
+            }
+        }
+

         if ($keepRatio) {
             $thumb->resize($width, null, function ($constraint) {
                 $constraint->aspectRatio();
         if ($keepRatio) {
             $thumb->resize($width, null, function ($constraint) {
                 $constraint->aspectRatio();


@@ -188,6 +215,7 @@ class ImageService
         $imageName = str_replace(' ', '-', $user->name . '-gravatar.png');
         $image = $this->saveNewFromUrl($url, 'user', $imageName);
         $image->created_by = $user->id;
         $imageName = str_replace(' ', '-', $user->name . '-gravatar.png');
         $image = $this->saveNewFromUrl($url, 'user', $imageName);
         $image->created_by = $user->id;

+        $image->updated_by = $user->id;

         $image->save();
         return $image;
     }
         $image->save();
         return $image;
     }