Changeset df6e9ec for app

Timestamp:

10/24/21 23:35:45 (3 years ago)

Author:

beratkjufliju <kufliju@…>

Branches:

develop, master

Children:

495dd28

Parents:

94f05dc

Message:

edited folder seeder

Location:

app/Http/Controllers/Dashboard

Files:

• DepartmentsController.php (modified) (2 diffs)
• FoldersController.php (modified) (1 diff)

app/Http/Controllers/Dashboard/DepartmentsController.php

@@ -119 +119 @@
     public function downloadAll()
     {
-        $zip_file=Storage::disk('uploads')->path('Departments.zip');
-        $zip = new \ZipArchive();
-        $zip->open($zip_file, \ZipArchive::CREATE | \ZipArchive::OVERWRITE);
-        $path = Storage::disk('uploads')->path('Departments');
+        try {
+            $zip_file=Storage::disk('uploads')->path('Departments.zip');
+            $zip = new \ZipArchive();
+            $zip->open($zip_file, \ZipArchive::CREATE | \ZipArchive::OVERWRITE);
+            $path = Storage::disk('uploads')->path('Departments');
 
-        try {
             $files = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($path));
             foreach ($files as $file) {
@@ -149 +149 @@
     public function downloadDepartment($id)
     {
-        $department = Department::find($id);
+        try {
+            $department = Department::find($id);
+            $zip_file=Storage::disk('uploads')->path('Department.zip');
+            $zip = new \ZipArchive();
+            $zip->open($zip_file, \ZipArchive::CREATE | \ZipArchive::OVERWRITE);
+            $path = Storage::disk('uploads')->path($department->location);
 
-        $zip_file=Storage::disk('uploads')->path('Department.zip');
-        $zip = new \ZipArchive();
-        $zip->open($zip_file, \ZipArchive::CREATE | \ZipArchive::OVERWRITE);
-        $path = Storage::disk('uploads')->path($department->location);
-
-        try {
             $files = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($path));
             foreach ($files as $file) {

app/Http/Controllers/Dashboard/FoldersController.php

@@ -276 +276 @@
     public function downloadfolder(Request $request, $id)
     {
-        $folder = Folder::find($id);
-
-        $FileSystem = new Filesystem();
-        $zip_file = Storage::disk('uploads')->path('Folder.zip');
-        $zip = new \ZipArchive();
-        $zip->open($zip_file, \ZipArchive::CREATE | \ZipArchive::OVERWRITE);
-        $path = Storage::disk('uploads')->path($folder->department->location . DIRECTORY_SEPARATOR . $folder->name);
-
         try {
+            $folder = Folder::find($id);
+            $FileSystem = new Filesystem();
+            $zip_file = Storage::disk('uploads')->path('Folder.zip');
+            $zip = new \ZipArchive();
+            $zip->open($zip_file, \ZipArchive::CREATE | \ZipArchive::OVERWRITE);
+
+            $path = Storage::disk('uploads')->path($folder->department->location . DIRECTORY_SEPARATOR . $folder->name);
+
             $files = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($path));