Update PageRepo.php

[bookstack] / app / Services / ImageService.php

diff --git a/app/Services/ImageService.php b/app/Services/ImageService.php
index 57293209c5f5969842009de26c0764812b6d5049..47c27cd0a2930f08fedba74127d9c76548d99de0 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;


@@ -71,6 +74,7 @@ class ImageService
      * @param string $imageData
      * @param string $type
      * @return Image
      * @param string $imageData
      * @param string $type
      * @return Image

+     * @throws ImageUploadException

      */
     private function saveNew($imageName, $imageData, $type)
     {
      */
     private function saveNew($imageName, $imageData, $type)
     {


@@ -86,17 +90,26 @@ 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),
             'name'       => $imageName,
             'path'       => $fullPath,
             'url'        => $this->getPublicUrl($fullPath),

-            'type'       => $type,
-            'created_by' => $userId,
-            'updated_by' => $userId
-        ]);
+            'type'       => $type
+        ];
+
+        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 +120,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 +142,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();


@@ -183,15 +206,13 @@ class ImageService
      */
     public function saveUserGravatar(User $user, $size = 500)
     {
      */
     public function saveUserGravatar(User $user, $size = 500)
     {

-        if (!env('USE_GRAVATAR', false)) return false;

         $emailHash = md5(strtolower(trim($user->email)));
         $url = 'http://www.gravatar.com/avatar/' . $emailHash . '?s=' . $size . '&d=identicon';
         $imageName = str_replace(' ', '-', $user->name . '-gravatar.png');
         $image = $this->saveNewFromUrl($url, 'user', $imageName);
         $image->created_by = $user->id;
         $emailHash = md5(strtolower(trim($user->email)));
         $url = 'http://www.gravatar.com/avatar/' . $emailHash . '?s=' . $size . '&d=identicon';
         $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();
         $image->save();

-        $user->avatar()->associate($image);
-        $user->save();

         return $image;
     }
 
         return $image;
     }
 


@@ -203,7 +224,7 @@ class ImageService
     {
         if ($this->storageInstance !== null) return $this->storageInstance;
 
     {
         if ($this->storageInstance !== null) return $this->storageInstance;
 

-        $storageType = env('STORAGE_TYPE');
+        $storageType = config('filesystems.default');

         $this->storageInstance = $this->fileSystem->disk($storageType);
 
         return $this->storageInstance;
         $this->storageInstance = $this->fileSystem->disk($storageType);
 
         return $this->storageInstance;


@@ -229,10 +250,10 @@ class ImageService
     private function getPublicUrl($filePath)
     {
         if ($this->storageUrl === null) {
     private function getPublicUrl($filePath)
     {
         if ($this->storageUrl === null) {

-            $storageUrl = env('STORAGE_URL');
+            $storageUrl = config('filesystems.url');

 
             // Get the standard public s3 url if s3 is set as storage type
 
             // Get the standard public s3 url if s3 is set as storage type

-            if ($storageUrl == false && env('STORAGE_TYPE') === 's3') {
+            if ($storageUrl == false && config('filesystems.default') === 's3') {

                 $storageDetails = config('filesystems.disks.s3');
                 $storageUrl = 'https://s3-' . $storageDetails['region'] . '.amazonaws.com/' . $storageDetails['bucket'];
             }
                 $storageDetails = config('filesystems.disks.s3');
                 $storageUrl = 'https://s3-' . $storageDetails['region'] . '.amazonaws.com/' . $storageDetails['bucket'];
             }