- public sharing refactored part 3

app/Http/Controllers/Sharing/BrowseShareController.php

@@ -61,6 +61,7 @@ class BrowseShareController extends Controller
 
     /**
      * Check Password for protected item
+     *
      * @param AuthenticateShareRequest $request
      * @param Share $shared
      * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response
@@ -84,7 +85,7 @@ class BrowseShareController extends Controller
     }
 
     /**
-     * Browse public folders
+     * Browse shared folder
      *
      * @param $id
      * @param Share $shared
@@ -112,7 +113,7 @@ class BrowseShareController extends Controller
     }
 
     /**
-     * Search public files
+     * Search shared files
      *
      * @param Request $request
      * @param Share $shared
@@ -167,7 +168,7 @@ class BrowseShareController extends Controller
     }
 
     /**
-     * Get navigation tree
+     * Get navigation tree of shared folder
      *
      * @param Share $shared
      * @return array
@@ -198,7 +199,7 @@ class BrowseShareController extends Controller
     }
 
     /**
-     * Get shared public file record
+     * Get shared file record
      *
      * @param Share $shared
      * @return mixed

app/Http/Controllers/Sharing/FileSharedAccessController.php

@@ -54,14 +54,13 @@ class FileSharedAccessController extends Controller
      * Get file public
      *
      * @param $filename
-     * @param $permission
      * @param Share $shared
      * @return mixed
      */
-    public function get_file_public($filename, $permission, Share $shared)
+    public function get_file_public($filename, Share $shared)
     {
         // Check ability to access protected share files
-        $this->helper->check_protected_share_record($shared, $permission);
+        $this->helper->check_protected_share_record($shared);
 
         // Get file record
         $file = UserFile::where('user_id', $shared->user_id)
@@ -85,14 +84,13 @@ class FileSharedAccessController extends Controller
      * Get public image thumbnail
      *
      * @param $filename
-     * @param $permission
      * @param Share $shared
      * @return mixed
      */
-    public function get_thumbnail_public($filename, $permission, Share $shared)
+    public function get_thumbnail_public($filename, Share $shared)
     {
         // Check ability to access protected share files
-        $this->helper->check_protected_share_record($shared, $permission);
+        $this->helper->check_protected_share_record($shared);
 
         // Get file record
         $file = UserFile::where('user_id', $shared->user_id)

app/Http/Controllers/Sharing/ManipulateShareItemsController.php

@@ -19,7 +19,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
-class EditShareItemsController extends Controller
+class ManipulateShareItemsController extends Controller
 {
     private $filemanager;
     private $helper;
@@ -45,6 +45,9 @@ class EditShareItemsController extends Controller
             return $this->demo->create_folder($request);
         }
 
+        // Check ability to access protected share record
+        $this->helper->check_protected_share_record($shared);
+
         // Check shared permission
         if (is_visitor($shared)) {
             abort(403);
@@ -74,6 +77,9 @@ class EditShareItemsController extends Controller
             return $this->demo->rename_item($request, $id);
         }
 
+        // Check ability to access protected share record
+        $this->helper->check_protected_share_record($shared);
+
         // Check shared permission
         if (is_visitor($shared)) {
             abort(403);
@@ -91,7 +97,7 @@ class EditShareItemsController extends Controller
 
         // If request have a change folder icon values set the folder icon
         if ($request->type === 'folder' && $request->filled('icon')) {
-            $this->filemanager->set_folder_icon($request, $id);
+            $this->filemanager->edit_folder_properties($request, $id);
         }
 
         // Rename item
@@ -119,6 +125,9 @@ class EditShareItemsController extends Controller
             return $this->demo->response_with_no_content();
         }
 
+        // Check ability to access protected share record
+        $this->helper->check_protected_share_record($shared);
+
         // Check shared permission
         if (is_visitor($shared)) {
             abort(403);
@@ -157,6 +166,9 @@ class EditShareItemsController extends Controller
             return $this->demo->upload($request);
         }
 
+        // Check ability to access protected share record
+        $this->helper->check_protected_share_record($shared);
+
         // Check shared permission
         if (is_visitor($shared)) {
             abort(403);
@@ -187,6 +199,9 @@ class EditShareItemsController extends Controller
             return $this->demo->response_with_no_content();
         }
 
+        // Check ability to access protected share record
+        $this->helper->check_protected_share_record($shared);
+
         // Check shared permission
         if (is_visitor($shared)) {
             abort(403);