diff options
Diffstat (limited to 'main/app/sprinkles/admin/src/Controller')
6 files changed, 76 insertions, 106 deletions
diff --git a/main/app/sprinkles/admin/src/Controller/ActivityController.php b/main/app/sprinkles/admin/src/Controller/ActivityController.php index 2fbe0d9..09675d2 100644 --- a/main/app/sprinkles/admin/src/Controller/ActivityController.php +++ b/main/app/sprinkles/admin/src/Controller/ActivityController.php @@ -5,6 +5,7 @@ * @link https://github.com/userfrosting/UserFrosting * @license https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License) */ + namespace UserFrosting\Sprinkle\Admin\Controller; use Illuminate\Database\Capsule\Manager as Capsule; @@ -31,8 +32,7 @@ class ActivityController extends SimpleController * This page requires authentication. * Request type: GET */ - public function getList($request, $response, $args) - { + public function getList($request, $response, $args) { // GET parameters $params = $request->getQueryParams(); @@ -67,8 +67,7 @@ class ActivityController extends SimpleController * This page requires authentication. * Request type: GET */ - public function pageList($request, $response, $args) - { + public function pageList($request, $response, $args) { /** @var UserFrosting\Sprinkle\Account\Authorize\AuthorizationManager */ $authorizer = $this->ci->authorizer; diff --git a/main/app/sprinkles/admin/src/Controller/GroupController.php b/main/app/sprinkles/admin/src/Controller/GroupController.php index 7ca94b1..2077363 100644 --- a/main/app/sprinkles/admin/src/Controller/GroupController.php +++ b/main/app/sprinkles/admin/src/Controller/GroupController.php @@ -5,6 +5,7 @@ * @link https://github.com/userfrosting/UserFrosting * @license https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License) */ + namespace UserFrosting\Sprinkle\Admin\Controller; use Carbon\Carbon; @@ -43,8 +44,7 @@ class GroupController extends SimpleController * Request type: POST * @see getModalCreateGroup */ - public function create($request, $response, $args) - { + public function create($request, $response, $args) { // Get POST parameters: name, slug, icon, description $params = $request->getParsedBody(); @@ -69,13 +69,13 @@ class GroupController extends SimpleController $transformer = new RequestDataTransformer($schema); $data = $transformer->transform($params); - $error = false; + $error = FALSE; // Validate request data $validator = new ServerSideValidator($schema, $this->ci->translator); if (!$validator->validate($data)) { $ms->addValidationErrors($validator); - $error = true; + $error = TRUE; } /** @var UserFrosting\Sprinkle\Core\Util\ClassMapper $classMapper */ @@ -84,12 +84,12 @@ class GroupController extends SimpleController // Check if name or slug already exists if ($classMapper->staticMethod('group', 'where', 'name', $data['name'])->first()) { $ms->addMessageTranslated('danger', 'GROUP.NAME.IN_USE', $data); - $error = true; + $error = TRUE; } if ($classMapper->staticMethod('group', 'where', 'slug', $data['slug'])->first()) { $ms->addMessageTranslated('danger', 'GROUP.SLUG.IN_USE', $data); - $error = true; + $error = TRUE; } if ($error) { @@ -101,7 +101,7 @@ class GroupController extends SimpleController // All checks passed! log events/activities and create group // Begin transaction - DB will be rolled back if an exception occurs - Capsule::transaction( function() use ($classMapper, $data, $ms, $config, $currentUser) { + Capsule::transaction(function () use ($classMapper, $data, $ms, $config, $currentUser) { // Create the group $group = $classMapper->createInstance('group', $data); @@ -132,8 +132,7 @@ class GroupController extends SimpleController * This route requires authentication (and should generally be limited to admins or the root user). * Request type: DELETE */ - public function delete($request, $response, $args) - { + public function delete($request, $response, $args) { $group = $this->getGroupFromParams($args); // If the group doesn't exist, return 404 @@ -179,7 +178,7 @@ class GroupController extends SimpleController $groupName = $group->name; // Begin transaction - DB will be rolled back if an exception occurs - Capsule::transaction( function() use ($group, $groupName, $currentUser) { + Capsule::transaction(function () use ($group, $groupName, $currentUser) { $group->delete(); unset($group); @@ -206,8 +205,7 @@ class GroupController extends SimpleController * This page requires authentication. * Request type: GET */ - public function getInfo($request, $response, $args) - { + public function getInfo($request, $response, $args) { /** @var UserFrosting\Sprinkle\Account\Authorize\AuthorizationManager */ $authorizer = $this->ci->authorizer; @@ -246,8 +244,7 @@ class GroupController extends SimpleController * This page requires authentication. * Request type: GET */ - public function getList($request, $response, $args) - { + public function getList($request, $response, $args) { // GET parameters $params = $request->getQueryParams(); @@ -272,8 +269,7 @@ class GroupController extends SimpleController return $sprunje->toResponse($response); } - public function getModalConfirmDelete($request, $response, $args) - { + public function getModalConfirmDelete($request, $response, $args) { // GET parameters $params = $request->getQueryParams(); @@ -323,8 +319,7 @@ class GroupController extends SimpleController * This page requires authentication. * Request type: GET */ - public function getModalCreate($request, $response, $args) - { + public function getModalCreate($request, $response, $args) { // GET parameters $params = $request->getQueryParams(); @@ -369,7 +364,7 @@ class GroupController extends SimpleController 'submit_text' => $translator->translate('CREATE') ], 'page' => [ - 'validators' => $validator->rules('json', false) + 'validators' => $validator->rules('json', FALSE) ] ]); } @@ -381,8 +376,7 @@ class GroupController extends SimpleController * This page requires authentication. * Request type: GET */ - public function getModalEdit($request, $response, $args) - { + public function getModalEdit($request, $response, $args) { // GET parameters $params = $request->getQueryParams(); @@ -433,13 +427,12 @@ class GroupController extends SimpleController 'submit_text' => $translator->translate('UPDATE') ], 'page' => [ - 'validators' => $validator->rules('json', false) + 'validators' => $validator->rules('json', FALSE) ] ]); } - public function getUsers($request, $response, $args) - { + public function getUsers($request, $response, $args) { $group = $this->getGroupFromParams($args); // If the group no longer exists, forward to main group listing page @@ -486,8 +479,7 @@ class GroupController extends SimpleController * This page requires authentication. * Request type: GET */ - public function pageInfo($request, $response, $args) - { + public function pageInfo($request, $response, $args) { $group = $this->getGroupFromParams($args); // If the group no longer exists, forward to main group listing page @@ -504,8 +496,8 @@ class GroupController extends SimpleController // Access-controlled page if (!$authorizer->checkAccess($currentUser, 'uri_group', [ - 'group' => $group - ])) { + 'group' => $group + ])) { throw new ForbiddenException(); } @@ -559,8 +551,7 @@ class GroupController extends SimpleController * This page requires authentication. * Request type: GET */ - public function pageList($request, $response, $args) - { + public function pageList($request, $response, $args) { /** @var UserFrosting\Sprinkle\Account\Authorize\AuthorizationManager $authorizer */ $authorizer = $this->ci->authorizer; @@ -586,8 +577,7 @@ class GroupController extends SimpleController * Request type: PUT * @see getModalGroupEdit */ - public function updateInfo($request, $response, $args) - { + public function updateInfo($request, $response, $args) { // Get the group based on slug in URL $group = $this->getGroupFromParams($args); @@ -611,13 +601,13 @@ class GroupController extends SimpleController $transformer = new RequestDataTransformer($schema); $data = $transformer->transform($params); - $error = false; + $error = FALSE; // Validate request data $validator = new ServerSideValidator($schema, $this->ci->translator); if (!$validator->validate($data)) { $ms->addValidationErrors($validator); - $error = true; + $error = TRUE; } // Determine targeted fields @@ -650,7 +640,7 @@ class GroupController extends SimpleController $classMapper->staticMethod('group', 'where', 'name', $data['name'])->first() ) { $ms->addMessageTranslated('danger', 'GROUP.NAME.IN_USE', $data); - $error = true; + $error = TRUE; } if ( @@ -659,7 +649,7 @@ class GroupController extends SimpleController $classMapper->staticMethod('group', 'where', 'slug', $data['slug'])->first() ) { $ms->addMessageTranslated('danger', 'GROUP.SLUG.IN_USE', $data); - $error = true; + $error = TRUE; } if ($error) { @@ -667,7 +657,7 @@ class GroupController extends SimpleController } // Begin transaction - DB will be rolled back if an exception occurs - Capsule::transaction( function() use ($data, $group, $currentUser) { + Capsule::transaction(function () use ($data, $group, $currentUser) { // Update the group and generate success messages foreach ($data as $name => $value) { if ($value != $group->$name) { @@ -691,8 +681,7 @@ class GroupController extends SimpleController return $response->withStatus(200); } - protected function getGroupFromParams($params) - { + protected function getGroupFromParams($params) { // Load the request schema $schema = new RequestSchema('schema://requests/group/get-by-slug.yaml'); @@ -706,7 +695,7 @@ class GroupController extends SimpleController // TODO: encapsulate the communication of error messages from ServerSideValidator to the BadRequestException $e = new BadRequestException(); foreach ($validator->errors() as $idx => $field) { - foreach($field as $eidx => $error) { + foreach ($field as $eidx => $error) { $e->addUserMessage($error); } } diff --git a/main/app/sprinkles/admin/src/Controller/PermissionController.php b/main/app/sprinkles/admin/src/Controller/PermissionController.php index f3e93ce..e8e542f 100644 --- a/main/app/sprinkles/admin/src/Controller/PermissionController.php +++ b/main/app/sprinkles/admin/src/Controller/PermissionController.php @@ -5,6 +5,7 @@ * @link https://github.com/userfrosting/UserFrosting * @license https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License) */ + namespace UserFrosting\Sprinkle\Admin\Controller; use Carbon\Carbon; @@ -38,8 +39,7 @@ class PermissionController extends SimpleController * This page requires authentication. * Request type: GET */ - public function getInfo($request, $response, $args) - { + public function getInfo($request, $response, $args) { /** @var UserFrosting\Sprinkle\Account\Authorize\AuthorizationManager */ $authorizer = $this->ci->authorizer; @@ -78,8 +78,7 @@ class PermissionController extends SimpleController * This page requires authentication. * Request type: GET */ - public function getList($request, $response, $args) - { + public function getList($request, $response, $args) { // GET parameters $params = $request->getQueryParams(); @@ -111,8 +110,7 @@ class PermissionController extends SimpleController * This page requires authentication. * Request type: GET */ - public function getUsers($request, $response, $args) - { + public function getUsers($request, $response, $args) { // GET parameters $params = $request->getQueryParams(); @@ -150,8 +148,7 @@ class PermissionController extends SimpleController * This page requires authentication. * Request type: GET */ - public function pageInfo($request, $response, $args) - { + public function pageInfo($request, $response, $args) { /** @var UserFrosting\Sprinkle\Account\Authorize\AuthorizationManager */ $authorizer = $this->ci->authorizer; @@ -188,8 +185,7 @@ class PermissionController extends SimpleController * This page requires authentication. * Request type: GET */ - public function pageList($request, $response, $args) - { + public function pageList($request, $response, $args) { /** @var UserFrosting\Sprinkle\Account\Authorize\AuthorizationManager */ $authorizer = $this->ci->authorizer; diff --git a/main/app/sprinkles/admin/src/Controller/RoleController.php b/main/app/sprinkles/admin/src/Controller/RoleController.php index ab86c88..e4ebd98 100644 --- a/main/app/sprinkles/admin/src/Controller/RoleController.php +++ b/main/app/sprinkles/admin/src/Controller/RoleController.php @@ -5,6 +5,7 @@ * @link https://github.com/userfrosting/UserFrosting * @license https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License) */ + namespace UserFrosting\Sprinkle\Admin\Controller; use Carbon\Carbon; @@ -43,8 +44,7 @@ class RoleController extends SimpleController * Request type: POST * @see getModalCreateRole */ - public function create($request, $response, $args) - { + public function create($request, $response, $args) { // Get POST parameters: name, slug, description $params = $request->getParsedBody(); @@ -69,13 +69,13 @@ class RoleController extends SimpleController $transformer = new RequestDataTransformer($schema); $data = $transformer->transform($params); - $error = false; + $error = FALSE; // Validate request data $validator = new ServerSideValidator($schema, $this->ci->translator); if (!$validator->validate($data)) { $ms->addValidationErrors($validator); - $error = true; + $error = TRUE; } /** @var UserFrosting\Sprinkle\Core\Util\ClassMapper $classMapper */ @@ -84,12 +84,12 @@ class RoleController extends SimpleController // Check if name or slug already exists if ($classMapper->staticMethod('role', 'where', 'name', $data['name'])->first()) { $ms->addMessageTranslated('danger', 'ROLE.NAME_IN_USE', $data); - $error = true; + $error = TRUE; } if ($classMapper->staticMethod('role', 'where', 'slug', $data['slug'])->first()) { $ms->addMessageTranslated('danger', 'SLUG_IN_USE', $data); - $error = true; + $error = TRUE; } if ($error) { @@ -101,7 +101,7 @@ class RoleController extends SimpleController // All checks passed! log events/activities and create role // Begin transaction - DB will be rolled back if an exception occurs - Capsule::transaction( function() use ($classMapper, $data, $ms, $config, $currentUser) { + Capsule::transaction(function () use ($classMapper, $data, $ms, $config, $currentUser) { // Create the role $role = $classMapper->createInstance('role', $data); @@ -132,8 +132,7 @@ class RoleController extends SimpleController * This route requires authentication (and should generally be limited to admins or the root user). * Request type: DELETE */ - public function delete($request, $response, $args) - { + public function delete($request, $response, $args) { $role = $this->getRoleFromParams($args); // If the role doesn't exist, return 404 @@ -178,7 +177,7 @@ class RoleController extends SimpleController $roleName = $role->name; // Begin transaction - DB will be rolled back if an exception occurs - Capsule::transaction( function() use ($role, $roleName, $currentUser) { + Capsule::transaction(function () use ($role, $roleName, $currentUser) { $role->delete(); unset($role); @@ -205,8 +204,7 @@ class RoleController extends SimpleController * This page requires authentication. * Request type: GET */ - public function getInfo($request, $response, $args) - { + public function getInfo($request, $response, $args) { /** @var UserFrosting\Sprinkle\Account\Authorize\AuthorizationManager */ $authorizer = $this->ci->authorizer; @@ -245,8 +243,7 @@ class RoleController extends SimpleController * This page requires authentication. * Request type: GET */ - public function getList($request, $response, $args) - { + public function getList($request, $response, $args) { // GET parameters $params = $request->getQueryParams(); @@ -271,8 +268,7 @@ class RoleController extends SimpleController return $sprunje->toResponse($response); } - public function getModalConfirmDelete($request, $response, $args) - { + public function getModalConfirmDelete($request, $response, $args) { // GET parameters $params = $request->getQueryParams(); @@ -332,8 +328,7 @@ class RoleController extends SimpleController * This page requires authentication. * Request type: GET */ - public function getModalCreate($request, $response, $args) - { + public function getModalCreate($request, $response, $args) { // GET parameters $params = $request->getQueryParams(); @@ -376,7 +371,7 @@ class RoleController extends SimpleController 'submit_text' => $translator->translate('CREATE') ], 'page' => [ - 'validators' => $validator->rules('json', false) + 'validators' => $validator->rules('json', FALSE) ] ]); } @@ -388,8 +383,7 @@ class RoleController extends SimpleController * This page requires authentication. * Request type: GET */ - public function getModalEdit($request, $response, $args) - { + public function getModalEdit($request, $response, $args) { // GET parameters $params = $request->getQueryParams(); @@ -440,7 +434,7 @@ class RoleController extends SimpleController 'submit_text' => $translator->translate('UPDATE') ], 'page' => [ - 'validators' => $validator->rules('json', false) + 'validators' => $validator->rules('json', FALSE) ] ]); } @@ -452,8 +446,7 @@ class RoleController extends SimpleController * This page requires authentication. * Request type: GET */ - public function getModalEditPermissions($request, $response, $args) - { + public function getModalEditPermissions($request, $response, $args) { // GET parameters $params = $request->getQueryParams(); @@ -490,8 +483,7 @@ class RoleController extends SimpleController * This page requires authentication. * Request type: GET */ - public function getPermissions($request, $response, $args) - { + public function getPermissions($request, $response, $args) { $role = $this->getRoleFromParams($args); // If the role no longer exists, forward to main role listing page @@ -535,8 +527,7 @@ class RoleController extends SimpleController * This page requires authentication. * Request type: GET */ - public function getUsers($request, $response, $args) - { + public function getUsers($request, $response, $args) { $role = $this->getRoleFromParams($args); // If the role doesn't exist, return 404 @@ -583,8 +574,7 @@ class RoleController extends SimpleController * This page requires authentication. * Request type: GET */ - public function pageInfo($request, $response, $args) - { + public function pageInfo($request, $response, $args) { $role = $this->getRoleFromParams($args); // If the role no longer exists, forward to main role listing page @@ -601,8 +591,8 @@ class RoleController extends SimpleController // Access-controlled page if (!$authorizer->checkAccess($currentUser, 'uri_role', [ - 'role' => $role - ])) { + 'role' => $role + ])) { throw new ForbiddenException(); } @@ -656,8 +646,7 @@ class RoleController extends SimpleController * This page requires authentication. * Request type: GET */ - public function pageList($request, $response, $args) - { + public function pageList($request, $response, $args) { /** @var UserFrosting\Sprinkle\Account\Authorize\AuthorizationManager $authorizer */ $authorizer = $this->ci->authorizer; @@ -683,8 +672,7 @@ class RoleController extends SimpleController * Request type: PUT * @see getModalRoleEdit */ - public function updateInfo($request, $response, $args) - { + public function updateInfo($request, $response, $args) { // Get the role based on slug in the URL $role = $this->getRoleFromParams($args); @@ -708,13 +696,13 @@ class RoleController extends SimpleController $transformer = new RequestDataTransformer($schema); $data = $transformer->transform($params); - $error = false; + $error = FALSE; // Validate request data $validator = new ServerSideValidator($schema, $this->ci->translator); if (!$validator->validate($data)) { $ms->addValidationErrors($validator); - $error = true; + $error = TRUE; } // Determine targeted fields @@ -747,7 +735,7 @@ class RoleController extends SimpleController $classMapper->staticMethod('role', 'where', 'name', $data['name'])->first() ) { $ms->addMessageTranslated('danger', 'ROLE.NAME_IN_USE', $data); - $error = true; + $error = TRUE; } if ( @@ -756,7 +744,7 @@ class RoleController extends SimpleController $classMapper->staticMethod('role', 'where', 'slug', $data['slug'])->first() ) { $ms->addMessageTranslated('danger', 'SLUG_IN_USE', $data); - $error = true; + $error = TRUE; } if ($error) { @@ -764,10 +752,10 @@ class RoleController extends SimpleController } // Begin transaction - DB will be rolled back if an exception occurs - Capsule::transaction( function() use ($data, $role, $currentUser) { + Capsule::transaction(function () use ($data, $role, $currentUser) { // Update the role and generate success messages foreach ($data as $name => $value) { - if ($value != $role->$name){ + if ($value != $role->$name) { $role->$name = $value; } } @@ -797,8 +785,7 @@ class RoleController extends SimpleController * This route requires authentication. * Request type: PUT */ - public function updateField($request, $response, $args) - { + public function updateField($request, $response, $args) { // Get the username from the URL $role = $this->getRoleFromParams($args); @@ -852,7 +839,7 @@ class RoleController extends SimpleController // TODO: encapsulate the communication of error messages from ServerSideValidator to the BadRequestException $e = new BadRequestException(); foreach ($validator->errors() as $idx => $field) { - foreach($field as $eidx => $error) { + foreach ($field as $eidx => $error) { $e->addUserMessage($error); } } @@ -866,7 +853,7 @@ class RoleController extends SimpleController $ms = $this->ci->alerts; // Begin transaction - DB will be rolled back if an exception occurs - Capsule::transaction( function() use ($fieldName, $fieldValue, $role, $currentUser) { + Capsule::transaction(function () use ($fieldName, $fieldValue, $role, $currentUser) { if ($fieldName == 'permissions') { $newPermissions = collect($fieldValue)->pluck('permission_id')->all(); $role->permissions()->sync($newPermissions); @@ -896,8 +883,7 @@ class RoleController extends SimpleController return $response->withStatus(200); } - protected function getRoleFromParams($params) - { + protected function getRoleFromParams($params) { // Load the request schema $schema = new RequestSchema('schema://requests/role/get-by-slug.yaml'); @@ -911,7 +897,7 @@ class RoleController extends SimpleController // TODO: encapsulate the communication of error messages from ServerSideValidator to the BadRequestException $e = new BadRequestException(); foreach ($validator->errors() as $idx => $field) { - foreach($field as $eidx => $error) { + foreach ($field as $eidx => $error) { $e->addUserMessage($error); } } diff --git a/main/app/sprinkles/admin/src/Controller/UserController.php b/main/app/sprinkles/admin/src/Controller/UserController.php index ede9523..3621fbc 100644 --- a/main/app/sprinkles/admin/src/Controller/UserController.php +++ b/main/app/sprinkles/admin/src/Controller/UserController.php @@ -1005,8 +1005,8 @@ class UserController extends SimpleController } if ((Capsule::table('public_keys') - ->where('user_id', "=", $requestedUser->id) - ->exists())) { + ->where('user_id', "=", $requestedUser->id) + ->exists())) { $RawPublicKey = Capsule::table('public_keys') ->where('user_id', "=", $requestedUser->id) diff --git a/main/app/sprinkles/admin/src/Controller/WormholeController.php b/main/app/sprinkles/admin/src/Controller/WormholeController.php index e7cd9aa..e40a7e3 100644 --- a/main/app/sprinkles/admin/src/Controller/WormholeController.php +++ b/main/app/sprinkles/admin/src/Controller/WormholeController.php @@ -111,7 +111,7 @@ class WormholeController extends SimpleController ->where('id', 1) ->where('token', '=', $access_token) ->exists()) { - return true; + return TRUE; } else { throw new NotFoundException(); } |