From 84db963beb4633aae489492e5f58b46fc23ac7e9 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 11 Nov 2025 23:30:40 +0000 Subject: [PATCH 1/2] Initial plan From 3f97074fc97b9e185b7ed0f200a0374f8a344388 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 11 Nov 2025 23:34:39 +0000 Subject: [PATCH 2/2] Add validation to prevent empty username/email updates in UserController Co-authored-by: ljonesfl <1099983+ljonesfl@users.noreply.github.com> --- src/Cms/Controllers/Admin/UserController.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/Cms/Controllers/Admin/UserController.php b/src/Cms/Controllers/Admin/UserController.php index 2f341d5..6116bc2 100644 --- a/src/Cms/Controllers/Admin/UserController.php +++ b/src/Cms/Controllers/Admin/UserController.php @@ -191,8 +191,17 @@ public function update( array $parameters ): never $this->redirect( 'admin_users', [], ['error', 'User not found'] ); } - $username = $_POST['username'] ?? $user->getUsername(); - $email = $_POST['email'] ?? $user->getEmail(); + $usernameInput = $_POST['username'] ?? null; + $emailInput = $_POST['email'] ?? null; + + $username = $usernameInput !== null ? trim( (string)$usernameInput ) : $user->getUsername(); + $email = $emailInput !== null ? trim( (string)$emailInput ) : $user->getEmail(); + + if( $username === '' || $email === '' ) + { + $this->redirect( 'admin_users_edit', ['id' => $id], ['error', 'Username and email are required'] ); + } + $role = $_POST['role'] ?? $user->getRole(); $password = $_POST['password'] ?? null;