X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/8e8d582bc67c6ec440229a7fa9d4998fc9129ac1..refs/pull/139/head:/app/Services/ImageService.php diff --git a/app/Services/ImageService.php b/app/Services/ImageService.php index 47c27cd0a..dd965c90f 100644 --- a/app/Services/ImageService.php +++ b/app/Services/ImageService.php @@ -41,14 +41,16 @@ class ImageService /** * Saves a new image from an upload. * @param UploadedFile $uploadedFile - * @param string $type + * @param string $type + * @param int $uploadedTo * @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()); - return $this->saveNew($imageName, $imageData, $type); + return $this->saveNew($imageName, $imageData, $type, $uploadedTo); } @@ -73,13 +75,14 @@ class ImageService * @param string $imageName * @param string $imageData * @param string $type + * @param int $uploadedTo * @return Image * @throws ImageUploadException */ - private function saveNew($imageName, $imageData, $type) + private function saveNew($imageName, $imageData, $type, $uploadedTo = 0) { $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; @@ -100,7 +103,8 @@ class ImageService 'name' => $imageName, 'path' => $fullPath, 'url' => $this->getPublicUrl($fullPath), - 'type' => $type + 'type' => $type, + 'uploaded_to' => $uploadedTo ]; if (auth()->user() && auth()->user()->id !== 0) {