some more stuff

lib/account.php

@@ -265,9 +265,9 @@ function getUserInfo(): array
         $stmt->bind_result($firstName, $lastName, $nickname, $email, $minecraft_nickname);
         $stmt->fetch();
         $stmt->close();
-        $output = ["Status" => "Success"];
+        $output["Status"] = "Success";
 
-        $output += [
+        $output["UserInfo"] = [
             "ID" => $userID,
             "FirstName" => $firstName,
             "LastName" => $lastName,
@@ -286,6 +286,8 @@ function addActivationCodes($count): array
     global $mysqli, $routerConfig;
     $activationCodes = [];
 
+    $output = ["Status" => "Fail"]; // Default Status is "Fail"
+
     if (is_numeric($count) && $count > 0 && $_SESSION["privilege_level"] >= $routerConfig["user_admin_permission_level"] && isLoggedIn()) {
         $stmt = $mysqli->prepare("UPDATE Users SET ActivationToken = ?, CreatedAt = NOW(), CreatedBy = ? WHERE ID = ?");
 
@@ -300,19 +302,21 @@ function addActivationCodes($count): array
                     "CreatedAt" => date("Y-m-d H:i:s"),
                     "CreatedBy" => $_SESSION["ID"]
                 ];
+                $output["Status"] = "Success";
+                $output["ActivationCodes"] = $activationCodes;
             }
         }
 
         $stmt->close();
     }
 
-    return $activationCodes;
+    return $output;
 }
 
 function listUsers(): array
 {
     global $mysqli, $routerConfig;
-    $users = ["Status" => "Fail"]; // Default Status is "Fail"
+    $output = ["Status" => "Fail"]; // Default Status is "Fail"
 
     if (isUserAdmin()) {
         $users = [];
@@ -323,16 +327,18 @@ function listUsers(): array
             while ($row = $result->fetch_assoc()) {
                 $users[] = $row;
             }
+            $output["Status"] = "Success";
+            $output["Users"] = $users;
         }
     }
 
-    return $users;
+    return $output;
 }
 
 function listActivationCodes(): array
 {
     global $mysqli, $routerConfig;
-    $activationCodes = ["Status" => "Fail"]; // Default Status is "Fail"
+    $output = ["Status" => "Fail"]; // Default Status is "Fail"
 
     if (isUserAdmin()) {
         $activationCodes = [];
@@ -343,10 +349,11 @@ function listActivationCodes(): array
             while ($row = $result->fetch_assoc()) {
                 $activationCodes[] = $row;
             }
+            $output["Status"] = "Success";
+            $output["ActivationCodes"] = $activationCodes;
         }
     }
-
-    return $activationCodes;
+    return $output;
 }
 
 function deleteUser($userID): array