Pre-Release Audit for v1.1.2 (PRs #1275–#1299) - AUDIT V1

app/Http/Controllers/Admin/UserController.php

@@ -86,13 +86,50 @@ public function show(User $user, LocaleSettings $locale_settings, GeneralSetting
         $this->checkPermission(self::READ_PERMISSION);
 
         //QUERY ALL REFERRALS A USER HAS
-        //i am not proud of this at all.
+        $referralRecords = DB::table('user_referrals')->where('referral_id', '=', $user->id)->get();
         $allReferrals = [];
-        $referrals = DB::table('user_referrals')->where('referral_id', '=', $user->id)->get();
-        foreach ($referrals as $referral) {
-            array_push($allReferrals, $allReferrals['id'] = User::query()->findOrFail($referral->registered_user_id));
+
+        foreach ($referralRecords as $referral) {
+            $deleted = $referral->deleted_at !== null;
+
+            if ($deleted) {
+                $deletedId = $referral->deleted_user_id;
+                $name = $referral->deleted_username ? $referral->deleted_username . ' (deleted)' : 'Deleted User';
+
+                $allReferrals[] = (object)[
+                    'id' => $deletedId,
+                    'name' => $name,
+                    'created_at' => \Carbon\Carbon::parse($referral->created_at),
+                    'deleted' => true,
+                ];
+            } else {
+                $userObj = User::query()->find($referral->registered_user_id);
+                if ($userObj) {
+                    $allReferrals[] = (object)[
+                        'id' => $userObj->id,
+                        'name' => $userObj->name,
+                        'created_at' => $userObj->created_at,
+                        'deleted' => false,
+                    ];
+                } else {
+                    if ($referral->deleted_user_id) {
+                        $allReferrals[] = (object)[
+                            'id' => $referral->deleted_user_id,
+                            'name' => ($referral->deleted_username ? $referral->deleted_username . ' (deleted)' : 'Deleted User'),
+                            'created_at' => \Carbon\Carbon::parse($referral->created_at),
+                            'deleted' => true,
+                        ];
+                    } else {
+                        $allReferrals[] = (object)[
+                            'id' => null,
+                            'name' => 'Unknown (deleted)',
+                            'created_at' => \Carbon\Carbon::parse($referral->created_at),
+                            'deleted' => true,
+                        ];
+                    }
+                }
+            }
         }
-        array_pop($allReferrals);
 
         return view('admin.users.show')->with([
             'user' => $user,
@@ -385,7 +422,7 @@ public function notify(Request $request)
             try {
                 $user->notify(new DynamicNotification($data['via'], $database, $mail));
                 $successCount++;
-            } catch (\Throwable $e)
+            } catch (\Throwable $e) {
                 Log::error('Mass notification error for user ' . $user->id . ': ' . $e->getMessage());
             }
         }

app/Http/Controllers/Api/ServerController.php

@@ -18,6 +18,12 @@ class ServerController extends Controller
 
     public const ALLOWED_FILTERS = ['name', 'suspended', 'identifier', 'pterodactyl_id', 'user_id', 'product_id'];
 
+    /**
+     * Display a listing of the resource.
+     *
+     * @param  Request  $request
+     * @return LengthAwarePaginator
+     */
     public function index(Request $request)
     {
         $query = QueryBuilder::for(Server::class)
@@ -27,6 +33,12 @@ public function index(Request $request)
         return $query->paginate($request->input('per_page') ?? 50);
     }
 
+    /**
+     * Display the specified resource.
+     *
+     * @param  Server  $server
+     * @return Server|Collection|Model
+     */
     public function show(Server $server)
     {
         $query = QueryBuilder::for(Server::class)
@@ -38,71 +50,69 @@ public function show(Server $server)
 
     /**
      * Remove the specified resource from storage.
+     *
+     * @param  Request  $request
+     * @param  Server  $server
+     * @return Server
      */
     public function destroy(Request $request, Server $server)
     {
         $request->validate([
             'reason' => 'sometimes|string|max:320',
         ]);
 
-        $reason = $request->input('reason');
-
-        $logMessage = "The server with ID: " . $server->id . " was deleted via API";
-
-        if ($reason) {
-            $logMessage .= ". Reason: " . e($reason);
-        }
-
-        activity()->performedOn($server)->log($logMessage);
+        // Reason is captured by the model's activity log (tapActivity) — no local use required here.
 
         $server->delete();
 
         return $server;
     }
 
+    /**
+     * suspend server
+     *
+     * @param  Request  $request
+     * @param  Server  $server
+     * @return Server|JsonResponse
+     */
     public function suspend(Request $request, Server $server)
     {
         $request->validate([
             'reason' => 'sometimes|string|max:320',
         ]);
 
-        $reason = $request->input('reason');
+        // Reason is captured by the model's activity log (tapActivity) — no local use required here.
 
         try {
             $server->suspend();
         } catch (Exception $exception) {
             return response()->json(['message' => $exception->getMessage()], 500);
         }
 
-        $logMessage = "The server with ID: " . $server->id . " was suspended via API";
-        if ($reason) {
-            $logMessage .= ". Reason: " . e($reason);
-        }
-        activity()->performedOn($server)->log($logMessage);
-
         return $server->load('product');
     }
 
+    /**
+     * unsuspend server
+     *
+     * @param  Request  $request
+     * @param  Server  $server
+     * @return Server|JsonResponse
+     */
     public function unSuspend(Request $request, Server $server)
     {
         $request->validate([
             'reason' => 'sometimes|string|max:320',
         ]);
 
-        $reason = $request->input('reason');
+        // Reason is captured by the model's activity log (tapActivity) — no local use required here.
 
         try {
             $server->unSuspend();
         } catch (Exception $exception) {
             return response()->json(['message' => $exception->getMessage()], 500);
         }
 
-        $logMessage = "The server with ID: " . $server->id . " was unsuspended via API";
-        if ($reason) {
-            $logMessage .= ". Reason: " . e($reason);
-        }
-        activity()->performedOn($server)->log($logMessage);
-
         return $server->load('product');
     }
 }

app/Http/Controllers/Api/UserController.php

@@ -123,6 +123,12 @@ public function update(Request $request, int $id)
 
     /**
      * increments the users credits or/and server_limit
+     *
+     * @param  Request  $request
+     * @param  int  $id
+     * @return User
+     *
+     * @throws ValidationException
      */
     public function increment(Request $request, int $id)
     {
@@ -158,6 +164,12 @@ public function increment(Request $request, int $id)
 
     /**
      * decrements the users credits or/and server_limit
+     *
+     * @param  Request  $request
+     * @param  int  $id
+     * @return User
+     *
+     * @throws ValidationException
      */
     public function decrement(Request $request, int $id)
     {
@@ -192,16 +204,22 @@ public function decrement(Request $request, int $id)
 
     /**
      * Suspends the user
+     *
+     * @param  Request  $request
+     * @param  int  $id
+     * @return User
+     *
+     * @throws ValidationException
      */
     public function suspend(Request $request, int $id)
     {
         $discordUser = DiscordUser::find($id);
         $user = $discordUser ? $discordUser->user : User::findOrFail($id);
-        
+
         $request->validate([
             'reason' => 'sometimes|string|max:320',
         ]);
-        
+
         $reason = $request->input('reason');
 
         if ($user->isSuspended()) {
@@ -211,27 +229,27 @@ public function suspend(Request $request, int $id)
         }
         $user->suspend();
 
-        $logMessage = "The user " . $user->name . " (ID: " . $user->id . ") was suspended via API";
-        if ($reason) {
-            $logMessage .= ". Reason: " . e($reason);
-        }
-        activity()->performedOn($user)->log($logMessage);
-
         return $user;
     }
 
     /**
      * Unsuspend the user
+     *
+     * @param  Request  $request
+     * @param  int  $id
+     * @return User
+     *
+     * @throws ValidationException
      */
     public function unsuspend(Request $request, int $id)
     {
         $discordUser = DiscordUser::find($id);
         $user = $discordUser ? $discordUser->user : User::findOrFail($id);
-        
+
         $request->validate([
             'reason' => 'sometimes|string|max:320',
         ]);
-        
+
         $reason = $request->input('reason');
 
         if (! $user->isSuspended()) {
@@ -242,35 +260,26 @@ public function unsuspend(Request $request, int $id)
 
         $user->unSuspend();
 
-        $logMessage = "The user " . $user->name . " (ID: " . $user->id . ") was unsuspended via API";
-        if ($reason) {
-            $logMessage .= ". Reason: " . e($reason);
-        }
-        activity()->performedOn($user)->log($logMessage);
-
         return $user;
     }
 
     /**
      * Remove the specified resource from storage.
+     *
+     * @param  Request  $request
+     * @param  int  $id
+     * @return Response
      */
     public function destroy(Request $request, int $id)
     {
         $discordUser = DiscordUser::find($id);
         $user = $discordUser ? $discordUser->user : User::findOrFail($id);
-        
+
         $request->validate([
             'reason' => 'sometimes|string|max:320',
         ]);
-
-        $reason = $request->input('reason');
-
-        $logMessage = "The user " . $user->name . " (ID: " . $user->id . ") was deleted via API";
-        if ($reason) {
-            $logMessage .= ". Reason: " . e($reason);
-        }
 
-        activity()->performedOn($user)->log($logMessage);
+        $reason = $request->input('reason');
 
         $user->delete();
 

app/Http/Controllers/Auth/RegisterController.php

@@ -138,7 +138,7 @@ protected function create(array $data)
         $user = User::create([
             'name' => $data['name'],
             'email' => $data['email'],
-            'credits' => Currency::prepareForDatabase($this->initial_credits),
+            'credits' => $this->initial_credits,
             'server_limit' => $this->initial_server_limit,
             'password' => Hash::make($data['password']),
             'referral_code' => $this->createReferralCode(),