FEATURE #1508: add directories to uploaded files

This commit contains both creating and editing directories.

app/Http/Controllers/Admin/CreateNewDirectory.php

@@ -0,0 +1,62 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use App\Http\Controllers\Controller;
+use App\Http\Requests;
+use App\Models\Directory;
+
+class CreateNewDirectory extends Controller
+{
+    /**
+     * Create new directory
+     *
+     * @param Requests\CreateNewDirectoryRequest $request
+     *
+     * @return $this|\Illuminate\Http\JsonResponse|\Illuminate\Http\RedirectResponse
+     */
+    public function postNew(Requests\CreateNewDirectoryRequest $request)
+    {
+        // check if created folder does not exist in current directory
+        $exists = Directory::where('name', $request->name)
+                           ->where('parent_id', $request->parentDirectory)
+                           ->exists();
+        if ($exists) {
+            if ($request->ajax()) {
+                return response()->json([
+                                            'status'  => 'failed',
+                                            'message' => trans('admin/fileManager.subdirectoryExists')
+                                        ]);
+            } else {
+                return redirect()
+                    ->route('upload.overview', ['id' => $request->parentDirectory])
+                    ->with('error', trans('admin/fileManager.subdirectoryExists'))
+                    ->withInput();
+            }
+        }
+
+        // create new database entry
+        $directory = new Directory();
+        $directory->name = $request->name;
+        $directory->parent_id = $request->parentDirectory;
+        $directory->user_id = \Auth::user()->id;
+        $directory->description = $request->description;
+
+        $directory->save();
+
+        $message = trans('admin/fileManager.newDirectorySuccess');
+        if (!$request->ajax()) {
+            return redirect()
+                ->route('upload.overview', ['id' => $request->parentDirectory])
+                ->with('success', $message);
+        } else {
+            $payload = [
+                'status'          => 'success',
+                'message'         => $message,
+                'parentDirectory' => $request->parentDirectory
+            ];
+
+            return response()->json($payload);
+        }
+    }
+}

app/Http/Controllers/Admin/EditDirectory.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use App\Http\Controllers\Controller;
+use App\Http\Requests;
+use App\Models\Directory;
+
+class EditDirectory extends Controller
+{
+    /**
+     * @param Requests\EditDirectoryRequest $request
+     * @param                               $directoryId
+     *
+     * @return $this|\Illuminate\Http\JsonResponse
+     */
+    public function postEdit(Requests\EditDirectoryRequest $request, $directoryId)
+    {
+        $directory = Directory::findOrFail($directoryId);
+
+        // check if given name is not used in parent directory
+
+        $exists = Directory::where('parent_id', $directory->parent_id)
+                           ->where('name', $request->name)
+                           ->where('id', '!=', $directoryId)
+                           ->exists();
+
+        if ($exists) {
+            if ($request->ajax()) {
+                return response()->json([
+                                            'status'  => 'failed',
+                                            'message' => trans('admin/fileManager.subdirectoryExists')
+                                        ]);
+            } else {
+                return redirect()
+                    ->route('upload.overview', ['id' => $directoryId])
+                    ->with('error', trans('admin/fileManager.subdirectoryExists'))
+                    ->withInput();
+            }
+        }
+
+        $directory->name = $request->name;
+        $directory->description = $request->description;
+
+        $directory->save();
+
+        $message = trans('admin/fileManager.editDirectorySuccess');
+        if (!$request->ajax()) {
+            return redirect()
+                ->route('upload.overview', ['id' => $directory->id])
+                ->with('success', $message);
+        } else {
+            $payload = [
+                'status'  => 'success',
+                'message' => $message
+            ];
+
+            return response()->json($payload);
+        }
+    }
+}

app/Http/Requests/CreateNewDirectoryRequest.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Requests;
+
+class CreateNewDirectoryRequest extends Request
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'name'            => 'required|max:255',
+            'parentDirectory' => 'exists:directories,id'
+        ];
+    }
+}

app/Http/Requests/EditDirectoryRequest.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Requests;
+
+class EditDirectoryRequest extends Request
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'name'            => 'required|max:255',
+            'parentDirectory' => 'exists:directories,id'
+        ];
+    }
+}

app/Http/routes.php

@@ -186,9 +186,17 @@ Route::group([
     // uploader methods
     Route::get('upload/file', 'UploadFile@getFile')
          ->name('upload.file');
+    Route::get('directories/new/{id?}', 'CreateNewDirectory@getNew')
+         ->name('upload.newDirectory');
 
-    Route::get('directories/overview/{id?}', 'DirectoriesOverview@getOverview')
-         ->name('upload.directories');
+    Route::get('directories/edit/{id}', 'EditDirectory@getEdit')
+         ->name('upload.editDirectory');
+
+    Route::post('directories/edit/{id}', 'EditDirectory@postEdit')
+         ->name('upload.postEditDirectory');
+
+    Route::get('files/overview/{id?}/{type?}/{subtype?}', 'UploadedFilesOverview@getOverview')
+         ->name('upload.overview');
 
     route::post('directories/new', 'CreateNewDirectory@postNew')
          ->name('upload.postNewDirectory');
@@ -202,9 +210,6 @@ Route::group([
     Route::get('upload/delete/{id}', 'EditUploadedFile@deleteFile')
          ->name('upload.delete');
 
-    Route::get('upload/overview/{type?}/{subtype?}', 'UploadedFilesOverview@getOverview')
-         ->name('upload.overview');
-
     // uploader methods
     Route::post('upload/file', 'UploadFile@postFile')
          ->name('upload.postFile');

app/Models/Directory.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Directory extends Model
+{
+    /**
+     * @var bool $timstamps have created_at and updated_at fields
+     */
+    public $timestamps = true;
+    protected $fillable = [
+        'name',
+        'description',
+        'parent_id',
+        'user_id',
+        'hidden'
+    ];
+    protected $guarded = [];
+
+    /**
+     * Relationship with parent/sub directories
+     *
+     * @param bool $includeHidden
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function subdirectories($includeHidden = false)
+    {
+
+        $subdirectories = Directory::where('parent_id', $this->id);
+
+        if (!$includeHidden) {
+            $subdirectories = $subdirectories->where('hidden', 0);
+
+        }
+
+        return $subdirectories->get();
+
+    }
+}