Fixed attachment base-url usage and non-existant images

Images now self-delete if the original file does not exist.
Prevents simply getting non-fixable errors.

Also cleaned some JS.

diff --git a/app/Repos/ImageRepo.php b/app/Repos/ImageRepo.php
index 435b8bbd795666bddc12d1b8e0e687eecb4bcb8b..8ddde7b0f9aaa3857b44d937a4065595a35e49de 100644 (file)
--- a/app/Repos/ImageRepo.php
+++ b/app/Repos/ImageRepo.php
@@ -5,6 +5,7 @@ use BookStack\Image;
 use BookStack\Page;
 use BookStack\Services\ImageService;
 use BookStack\Services\PermissionService;
 use BookStack\Page;
 use BookStack\Services\ImageService;
 use BookStack\Services\PermissionService;

+use Illuminate\Contracts\Filesystem\FileNotFoundException;

 use Setting;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 use Setting;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 


@@ -191,7 +192,12 @@ class ImageRepo
      */
     public function getThumbnail(Image $image, $width = 220, $height = 220, $keepRatio = false)
     {
      */
     public function getThumbnail(Image $image, $width = 220, $height = 220, $keepRatio = false)
     {

-        return $this->imageService->getThumbnail($image, $width, $height, $keepRatio);
+        try {
+            return $this->imageService->getThumbnail($image, $width, $height, $keepRatio);
+        } catch (FileNotFoundException $exception) {
+            $image->delete();
+            return [];
+        }

     }
 
 
     }
 
 

diff --git a/app/Repos/PageRepo.php b/app/Repos/PageRepo.php
index 8cd5c35a9d6ac87ae1eaac6ff70914ac64889b69..521cad07bc2611512d3b5ab08530641f4c0ccf22 100644 (file)
--- a/app/Repos/PageRepo.php
+++ b/app/Repos/PageRepo.php
@@ -60,7 +60,7 @@ class PageRepo extends EntityRepo
      * Get a page identified by the given slug.
      * @param $slug
      * @param $bookId
      * Get a page identified by the given slug.
      * @param $slug
      * @param $bookId

-     * @return mixed
+     * @return Page

      * @throws NotFoundException
      */
     public function getBySlug($slug, $bookId)
      * @throws NotFoundException
      */
     public function getBySlug($slug, $bookId)

diff --git a/resources/assets/js/controllers.js b/resources/assets/js/controllers.js
index f4f1f3e3926a0e576cd9460fbecc0cd7497e2de0..fe8e414ac8f76407002681ceaac23c9d8be8900f 100644 (file)
--- a/resources/assets/js/controllers.js
+++ b/resources/assets/js/controllers.js
@@ -4,7 +4,7 @@ import moment from 'moment';
 import 'moment/locale/en-gb';
 moment.locale('en-gb');
 
 import 'moment/locale/en-gb';
 moment.locale('en-gb');
 

-module.exports = function (ngApp, events) {
+export default function (ngApp, events) {

 
     ngApp.controller('ImageManagerController', ['$scope', '$attrs', '$http', '$timeout', 'imageManagerService',
         function ($scope, $attrs, $http, $timeout, imageManagerService) {
 
     ngApp.controller('ImageManagerController', ['$scope', '$attrs', '$http', '$timeout', 'imageManagerService',
         function ($scope, $attrs, $http, $timeout, imageManagerService) {


@@ -164,7 +164,6 @@ module.exports = function (ngApp, events) {
 
             /**
              * Start a search operation
 
             /**
              * Start a search operation

-             * @param searchTerm

              */
             $scope.searchImages = function() {
 
              */
             $scope.searchImages = function() {
 


@@ -198,7 +197,7 @@ module.exports = function (ngApp, events) {
                 $scope.view = viewName;
                 baseUrl = window.baseUrl('/images/' + $scope.imageType  + '/' + viewName + '/');
                 fetchData();
                 $scope.view = viewName;
                 baseUrl = window.baseUrl('/images/' + $scope.imageType  + '/' + viewName + '/');
                 fetchData();

-            }
+            };

 
             /**
              * Save the details of an image.
 
             /**
              * Save the details of an image.


@@ -207,7 +206,7 @@ module.exports = function (ngApp, events) {
             $scope.saveImageDetails = function (event) {
                 event.preventDefault();
                 var url = window.baseUrl('/images/update/' + $scope.selectedImage.id);
             $scope.saveImageDetails = function (event) {
                 event.preventDefault();
                 var url = window.baseUrl('/images/update/' + $scope.selectedImage.id);

-                $http.put(url, this.selectedImage).then((response) => {
+                $http.put(url, this.selectedImage).then(response => {

                     events.emit('success', 'Image details updated');
                 }, (response) => {
                     if (response.status === 422) {
                     events.emit('success', 'Image details updated');
                 }, (response) => {
                     if (response.status === 422) {


@@ -306,12 +305,12 @@ module.exports = function (ngApp, events) {
         $scope.isUpdateDraft = Number($attrs.pageUpdateDraft) === 1;
         $scope.isNewPageDraft = Number($attrs.pageNewDraft) === 1;
 
         $scope.isUpdateDraft = Number($attrs.pageUpdateDraft) === 1;
         $scope.isNewPageDraft = Number($attrs.pageNewDraft) === 1;
 

-        // Set inital header draft text
+        // Set initial header draft text

         if ($scope.isUpdateDraft || $scope.isNewPageDraft) {
             $scope.draftText = 'Editing Draft'
         } else {
             $scope.draftText = 'Editing Page'
         if ($scope.isUpdateDraft || $scope.isNewPageDraft) {
             $scope.draftText = 'Editing Draft'
         } else {
             $scope.draftText = 'Editing Page'

-        };
+        }

 
         var autoSave = false;
 
 
         var autoSave = false;
 


@@ -571,7 +570,7 @@ module.exports = function (ngApp, events) {
                 if (newOrder === currentOrder) return;
 
                 currentOrder = newOrder;
                 if (newOrder === currentOrder) return;
 
                 currentOrder = newOrder;

-                $http.put(`/files/sort/page/${pageId}`, {files: $scope.files}).then(resp => {
+                $http.put(window.baseUrl(`/files/sort/page/${pageId}`), {files: $scope.files}).then(resp => {

                     events.emit('success', resp.data.message);
                 }, checkError('sort'));
             }
                     events.emit('success', resp.data.message);
                 }, checkError('sort'));
             }


@@ -637,7 +636,7 @@ module.exports = function (ngApp, events) {
                     file.deleting = true;
                     return;
                 }
                     file.deleting = true;
                     return;
                 }

-                  $http.delete(`/files/${file.id}`).then(resp => {
+                  $http.delete(window.baseUrl(`/files/${file.id}`)).then(resp => {

                       events.emit('success', resp.data.message);
                       $scope.files.splice($scope.files.indexOf(file), 1);
                   }, checkError('delete'));
                       events.emit('success', resp.data.message);
                       $scope.files.splice($scope.files.indexOf(file), 1);
                   }, checkError('delete'));


@@ -645,12 +644,11 @@ module.exports = function (ngApp, events) {
 
             /**
              * Attach a link to a page.
 
             /**
              * Attach a link to a page.

-             * @param fileName
-             * @param fileLink
+             * @param file

              */
             $scope.attachLinkSubmit = function(file) {
                 file.uploaded_to = pageId;
              */
             $scope.attachLinkSubmit = function(file) {
                 file.uploaded_to = pageId;

-                $http.post('/files/link', file).then(resp => {
+                $http.post(window.baseUrl('/files/link'), file).then(resp => {

                     $scope.files.push(resp.data);
                     events.emit('success', 'Link attached');
                     $scope.file = getCleanFile();
                     $scope.files.push(resp.data);
                     events.emit('success', 'Link attached');
                     $scope.file = getCleanFile();


@@ -659,10 +657,9 @@ module.exports = function (ngApp, events) {
 
             /**
              * Start the edit mode for a file.
 
             /**
              * Start the edit mode for a file.

-             * @param fileId
+             * @param file

              */
             $scope.startEdit = function(file) {
              */
             $scope.startEdit = function(file) {

-                console.log(file);

                 $scope.editFile = angular.copy(file);
                 $scope.editFile.link = (file.external) ? file.path : '';
             };
                 $scope.editFile = angular.copy(file);
                 $scope.editFile.link = (file.external) ? file.path : '';
             };


@@ -679,7 +676,7 @@ module.exports = function (ngApp, events) {
              * @param file
              */
             $scope.updateFile = function(file) {
              * @param file
              */
             $scope.updateFile = function(file) {

-                $http.put(`/files/${file.id}`, file).then(resp => {
+                $http.put(window.baseUrl(`/files/${file.id}`), file).then(resp => {

                     let search = filesIndexOf(resp.data);
                     if (search !== -1) $scope.files[search] = resp.data;
 
                     let search = filesIndexOf(resp.data);
                     if (search !== -1) $scope.files[search] = resp.data;
 


@@ -696,7 +693,7 @@ module.exports = function (ngApp, events) {
              */
             $scope.getFileUrl = function(file) {
                 return window.baseUrl('/files/' + file.id);
              */
             $scope.getFileUrl = function(file) {
                 return window.baseUrl('/files/' + file.id);

-            }
+            };

 
             /**
              * Search the local files via another file object.
 
             /**
              * Search the local files via another file object.


@@ -713,7 +710,7 @@ module.exports = function (ngApp, events) {
 
             /**
              * Check for an error response in a ajax request.
 
             /**
              * Check for an error response in a ajax request.

-             * @param response
+             * @param errorGroupName

              */
             function checkError(errorGroupName) {
                 $scope.errors[errorGroupName] = {};
              */
             function checkError(errorGroupName) {
                 $scope.errors[errorGroupName] = {};

diff --git a/resources/assets/js/global.js b/resources/assets/js/global.js
index 9ca335ee7c4546f39b902b807d69c60ab4eff366..9aa5dff527adcf04298e80dc28003f004080448f 100644 (file)
--- a/resources/assets/js/global.js
+++ b/resources/assets/js/global.js
@@ -38,13 +38,17 @@ class EventManager {
         this.listeners[eventName].push(callback);
         return this;
     }
         this.listeners[eventName].push(callback);
         return this;
     }

-};
-window.Events = new EventManager();
+}

 
 

+window.Events = new EventManager();

 
 

-var services = require('./services')(ngApp, window.Events);
-var directives = require('./directives')(ngApp, window.Events);
-var controllers = require('./controllers')(ngApp, window.Events);
+// Load in angular specific items
+import Services from './services';
+import Directives from './directives';
+import Controllers from './controllers';
+Services(ngApp, window.Events);
+Directives(ngApp, window.Events);
+Controllers(ngApp, window.Events);

 
 //Global jQuery Config & Extensions
 
 
 //Global jQuery Config & Extensions
 

diff --git a/resources/assets/js/pages/page-form.js b/resources/assets/js/pages/page-form.js
index c1e6a92df26941dc683b92e3990f38aabb8a2bf0..1fb8b915f91482941fd96d6ef48d234311be6ac2 100644 (file)
--- a/resources/assets/js/pages/page-form.js
+++ b/resources/assets/js/pages/page-form.js
@@ -6,11 +6,11 @@
  * @param editor - editor instance
  */
 function editorPaste(e, editor) {
  * @param editor - editor instance
  */
 function editorPaste(e, editor) {

-    if (!e.clipboardData) return
+    if (!e.clipboardData) return;

     let items = e.clipboardData.items;
     if (!items) return;
     for (let i = 0; i < items.length; i++) {
     let items = e.clipboardData.items;
     if (!items) return;
     for (let i = 0; i < items.length; i++) {

-        if (items[i].type.indexOf("image") === -1) return
+        if (items[i].type.indexOf("image") === -1) return;

 
         let file = items[i].getAsFile();
         let formData = new FormData();
 
         let file = items[i].getAsFile();
         let formData = new FormData();