Browse Source

Moved function

Sergio Brighenti 5 years ago
parent
commit
c65539e447
3 changed files with 32 additions and 31 deletions
  1. 0 29
      app/Controllers/MediaController.php
  2. 31 0
      app/Controllers/UserController.php
  3. 1 2
      app/routes.php

+ 0 - 29
app/Controllers/MediaController.php

@@ -260,35 +260,6 @@ class MediaController extends Controller
         return redirect($response, route('home'));
         return redirect($response, route('home'));
     }
     }
 
 
-    /**
-     * @param  Request  $request
-     * @param  Response  $response
-     * @param  int  $id
-     * @return Response
-     */
-    public function clearUserMedia(Request $request, Response $response, int $id): Response
-    {
-        $user = make(UserQuery::class)->get($request, $id, true);
-
-        $medias = $this->database->query('SELECT * FROM `uploads` WHERE `user_id` = ?', $user->id);
-
-        foreach ($medias as $media) {
-            try {
-                $this->storage->delete($media->storage_path);
-            } catch (FileNotFoundException $e) {
-            }
-        }
-
-        $this->database->query('DELETE FROM `uploads` WHERE `user_id` = ?', $user->id);
-        $this->database->query('UPDATE `users` SET `current_disk_quota`=? WHERE `id` = ?', [
-            0,
-            $user->id,
-        ]);
-
-        $this->session->alert(lang('account_media_deleted'), 'success');
-        return redirect($response, route('user.edit', ['id' => $id]));
-    }
-
     /**
     /**
      * @param  Request  $request
      * @param  Request  $request
      * @param  string  $storagePath
      * @param  string  $storagePath

+ 31 - 0
app/Controllers/UserController.php

@@ -4,6 +4,7 @@ namespace App\Controllers;
 
 
 use App\Database\Queries\UserQuery;
 use App\Database\Queries\UserQuery;
 use App\Web\ValidationChecker;
 use App\Web\ValidationChecker;
+use League\Flysystem\FileNotFoundException;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Http\Message\ServerRequestInterface as Request;
 
 
@@ -218,6 +219,36 @@ class UserController extends Controller
         return redirect($response, route('user.index'));
         return redirect($response, route('user.index'));
     }
     }
 
 
+
+    /**
+     * @param  Request  $request
+     * @param  Response  $response
+     * @param  int  $id
+     * @return Response
+     */
+    public function clearUserMedia(Request $request, Response $response, int $id): Response
+    {
+        $user = make(UserQuery::class)->get($request, $id, true);
+
+        $medias = $this->database->query('SELECT * FROM `uploads` WHERE `user_id` = ?', $user->id);
+
+        foreach ($medias as $media) {
+            try {
+                $this->storage->delete($media->storage_path);
+            } catch (FileNotFoundException $e) {
+            }
+        }
+
+        $this->database->query('DELETE FROM `uploads` WHERE `user_id` = ?', $user->id);
+        $this->database->query('UPDATE `users` SET `current_disk_quota`=? WHERE `id` = ?', [
+            0,
+            $user->id,
+        ]);
+
+        $this->session->alert(lang('account_media_deleted'), 'success');
+        return redirect($response, route('user.edit', ['id' => $id]));
+    }
+
     /**
     /**
      * @param  Request  $request
      * @param  Request  $request
      * @param  Response  $response
      * @param  Response  $response

+ 1 - 2
app/routes.php

@@ -1,6 +1,5 @@
 <?php
 <?php
 
 
-// Auth routes
 use App\Controllers\AdminController;
 use App\Controllers\AdminController;
 use App\Controllers\Auth\LoginController;
 use App\Controllers\Auth\LoginController;
 use App\Controllers\Auth\PasswordRecoveryController;
 use App\Controllers\Auth\PasswordRecoveryController;
@@ -49,7 +48,7 @@ $app->group('', function (RouteCollectorProxy $group) {
         $group->get('/{id}/edit', [UserController::class, 'edit'])->setName('user.edit');
         $group->get('/{id}/edit', [UserController::class, 'edit'])->setName('user.edit');
         $group->post('/{id}', [UserController::class, 'update'])->setName('user.update');
         $group->post('/{id}', [UserController::class, 'update'])->setName('user.update');
         $group->get('/{id}/delete', [UserController::class, 'delete'])->setName('user.delete');
         $group->get('/{id}/delete', [UserController::class, 'delete'])->setName('user.delete');
-        $group->get('/{id}/clear', [MediaController::class, 'clearUserMedia'])->setName('user.clear');
+        $group->get('/{id}/clear', [UserController::class, 'clearUserMedia'])->setName('user.clear');
     })->add(AdminMiddleware::class);
     })->add(AdminMiddleware::class);
 
 
     $group->get('/profile', [ProfileController::class, 'profile'])->setName('profile');
     $group->get('/profile', [ProfileController::class, 'profile'])->setName('profile');