X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/867fc8be64ec41c41c5646499c1aa34c1e817d53..refs/pull/232/head:/app/Http/Controllers/FileController.php

diff --git a/app/Http/Controllers/FileController.php b/app/Http/Controllers/FileController.php
index 4cdcf66dc..668e9ec6c 100644
--- a/app/Http/Controllers/FileController.php
+++ b/app/Http/Controllers/FileController.php
@@ -34,7 +34,6 @@ class FileController extends Controller
      */
     public function upload(Request $request)
     {
-        // TODO - ensure uploads are deleted on page delete.
         $this->validate($request, [
             'uploaded_to' => 'required|integer|exists:pages,id',
             'file' => 'required|file'
@@ -102,8 +101,8 @@ class FileController extends Controller
     {
         $this->validate($request, [
             'uploaded_to' => 'required|integer|exists:pages,id',
-            'name' => 'string|max:255',
-            'link' =>  'url'
+            'name' => 'required|string|min:1|max:255',
+            'link' =>  'url|min:1|max:255'
         ]);
 
         $pageId = $request->get('uploaded_to');
@@ -130,8 +129,8 @@ class FileController extends Controller
     {
         $this->validate($request, [
             'uploaded_to' => 'required|integer|exists:pages,id',
-            'name' => 'string|max:255',
-            'link' =>  'url|max:255'
+            'name' => 'required|string|min:1|max:255',
+            'link' =>  'required|url|min:1|max:255'
         ]);
 
         $pageId = $request->get('uploaded_to');
@@ -196,7 +195,7 @@ class FileController extends Controller
         $fileContents = $this->fileService->getFile($file);
         return response($fileContents, 200, [
             'Content-Type' => 'application/octet-stream',
-            'Content-Disposition' => 'attachment; filename="'. $file->name .'"'
+            'Content-Disposition' => 'attachment; filename="'. $file->getFileName() .'"'
         ]);
     }