Updated System CLI

[bookstack] / app / Http / Controllers / RoleController.php

diff --git a/app/Http/Controllers/RoleController.php b/app/Http/Controllers/RoleController.php
index 2bf0a7b19b9afeaa803c698753d844cdeded0acb..6d397bdae61c491f30e183f7c4efd23ecf2c5ca8 100644 (file)
--- a/app/Http/Controllers/RoleController.php
+++ b/app/Http/Controllers/RoleController.php
@@ -116,14 +116,8 @@ class RoleController extends Controller
             'mfa_enforced' => ['string'],
         ]);
 
             'mfa_enforced' => ['string'],
         ]);
 

-        if (isset($data['permissions'])) {
-            $data['permissions'] = array_keys($data['permissions']);
-        }
-
-        if (isset($data['mfa_enforced'])) {
-            $data['mfa_enforced'] = $data['mfa_enforced'] === 'true';
-        }
-
+        $data['permissions'] = array_keys($data['permissions'] ?? []);
+        $data['mfa_enforced'] = ($data['mfa_enforced'] ?? 'false') === 'true';

         $this->permissionsRepo->updateRole($id, $data);
 
         return redirect('/settings/roles');
         $this->permissionsRepo->updateRole($id, $data);
 
         return redirect('/settings/roles');


@@ -157,7 +151,8 @@ class RoleController extends Controller
         $this->checkPermission('user-roles-manage');
 
         try {
         $this->checkPermission('user-roles-manage');
 
         try {

-            $this->permissionsRepo->deleteRole($id, $request->get('migrate_role_id', 0));
+            $migrateRoleId = intval($request->get('migrate_role_id') ?: "0");
+            $this->permissionsRepo->deleteRole($id, $migrateRoleId);

         } catch (PermissionsException $e) {
             $this->showErrorNotification($e->getMessage());
 
         } catch (PermissionsException $e) {
             $this->showErrorNotification($e->getMessage());