diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 842de73..996abe7 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -608,7 +608,7 @@ final class ApiController extends Controller { if (!empty($val = $this->validateSettingsCreate($request))) { $response->data['setting_create'] = new FormValidation($val); - $response->header->status = RequestStatusCode::R_400; + $response->header->status = RequestStatusCode::R_400; return; } @@ -682,7 +682,7 @@ final class ApiController extends Controller // has required data if (!empty($val = $this->validatePasswordUpdate($request))) { $response->data['password_update'] = new FormValidation($val); - $response->header->status = RequestStatusCode::R_400; + $response->header->status = RequestStatusCode::R_400; return; } @@ -950,7 +950,7 @@ final class ApiController extends Controller { if (!empty($val = $this->validateApplicationCreate($request))) { $response->data['application_create'] = new FormValidation($val); - $response->header->status = RequestStatusCode::R_400; + $response->header->status = RequestStatusCode::R_400; return; } @@ -1199,7 +1199,7 @@ final class ApiController extends Controller { if (!empty($val = $this->validateGroupCreate($request))) { $response->data['group_create'] = new FormValidation($val); - $response->header->status = RequestStatusCode::R_400; + $response->header->status = RequestStatusCode::R_400; return; } @@ -1431,7 +1431,7 @@ final class ApiController extends Controller { if (!empty($val = $this->validateAccountCreate($request))) { $response->data['account_create'] = new FormValidation($val); - $response->header->status = RequestStatusCode::R_400; + $response->header->status = RequestStatusCode::R_400; return; } @@ -1900,7 +1900,7 @@ final class ApiController extends Controller { if (!empty($val = $this->validateDataChange($request))) { $response->data['data_change'] = new FormValidation($val); - $response->header->status = RequestStatusCode::R_400; + $response->header->status = RequestStatusCode::R_400; return; } @@ -2419,7 +2419,7 @@ final class ApiController extends Controller if (!empty($val = $this->validatePermissionCreate($request))) { $response->data['permission_create'] = new FormValidation($val); - $response->header->status = RequestStatusCode::R_400; + $response->header->status = RequestStatusCode::R_400; return; } @@ -2428,7 +2428,7 @@ final class ApiController extends Controller if (!($permission instanceof GroupPermission)) { $response->data['permission_create'] = new FormValidation($val); - $response->header->status = RequestStatusCode::R_400; + $response->header->status = RequestStatusCode::R_400; return; } @@ -2454,7 +2454,7 @@ final class ApiController extends Controller { if (!empty($val = $this->validatePermissionCreate($request))) { $response->data['permission_create'] = new FormValidation($val); - $response->header->status = RequestStatusCode::R_400; + $response->header->status = RequestStatusCode::R_400; return; } @@ -2463,7 +2463,7 @@ final class ApiController extends Controller if (!($permission instanceof AccountPermission)) { $response->data['permission_create'] = new FormValidation($val); - $response->header->status = RequestStatusCode::R_400; + $response->header->status = RequestStatusCode::R_400; return; } @@ -2917,7 +2917,7 @@ final class ApiController extends Controller { if (!empty($val = $this->validateContactCreate($request))) { $response->data['contact_create'] = new FormValidation($val); - $response->header->status = RequestStatusCode::R_400; + $response->header->status = RequestStatusCode::R_400; return; } diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 5f70685..105b577 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -132,7 +132,7 @@ final class BackendController extends Controller } } - $pageLimit = 25; + $pageLimit = 25; $view->data['pageLimit'] = $pageLimit; $mapper = AccountMapper::getAll()->with('createdBy'); @@ -218,7 +218,7 @@ final class BackendController extends Controller $view->data['permissions'] = $permissions; - $accGrpSelector = new \Modules\Admin\Theme\Backend\Components\GroupTagSelector\GroupTagSelectorView($this->app->l11nManager, $request, $response); + $accGrpSelector = new \Modules\Admin\Theme\Backend\Components\GroupTagSelector\GroupTagSelectorView($this->app->l11nManager, $request, $response); $view->data['grpSelector'] = $accGrpSelector; // audit log @@ -300,7 +300,7 @@ final class BackendController extends Controller } } - $pageLimit = 25; + $pageLimit = 25; $view->data['pageLimit'] = $pageLimit; $mapper = GroupMapper::getAll()->with('createdBy'); @@ -319,7 +319,7 @@ final class BackendController extends Controller $view->data['groups'] = $list['data']; - $memberCount = GroupMapper::countMembers(); + $memberCount = GroupMapper::countMembers(); $view->data['memberCount'] = $memberCount; /** @var \Model\Setting[] $exportTemplates */ @@ -388,10 +388,10 @@ final class BackendController extends Controller $view->data['permissions'] = $permissions; - $accGrpSelector = new \Modules\Profile\Theme\Backend\Components\AccountGroupSelector\BaseView($this->app->l11nManager, $request, $response); + $accGrpSelector = new \Modules\Profile\Theme\Backend\Components\AccountGroupSelector\BaseView($this->app->l11nManager, $request, $response); $view->data['accGrpSelector'] = $accGrpSelector; - $editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response); + $editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response); $view->data['editor'] = $editor; $mapperQuery = AuditMapper::getAll() @@ -430,7 +430,7 @@ final class BackendController extends Controller $view->setTemplate('/Modules/Admin/Theme/Backend/groups-create'); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000103001, $request, $response); - $editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response); + $editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response); $view->data['editor'] = $editor; return $view; @@ -456,8 +456,8 @@ final class BackendController extends Controller $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Admin/Theme/Backend/modules-list'); - $view->data['modules'] = $this->app->moduleManager->getAllModules(); - $view->data['active'] = $this->app->moduleManager->getActiveModules(); + $view->data['modules'] = $this->app->moduleManager->getAllModules(); + $view->data['active'] = $this->app->moduleManager->getActiveModules(); $view->data['installed'] = $this->app->moduleManager->getInstalledModules(); /** @var \Model\Setting[] $exportTemplates */ @@ -510,11 +510,11 @@ final class BackendController extends Controller $view->setTemplate('/Modules/Admin/Theme/Backend/modules-info'); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response); - $id = $request->getDataString('id') ?? ''; - $view->data['modules'] = $this->app->moduleManager->getAllModules(); - $view->data['active'] = $this->app->moduleManager->getActiveModules(); + $id = $request->getDataString('id') ?? ''; + $view->data['modules'] = $this->app->moduleManager->getAllModules(); + $view->data['active'] = $this->app->moduleManager->getActiveModules(); $view->data['installed'] = $this->app->moduleManager->getInstalledModules(); - $view->data['id'] = $id; + $view->data['id'] = $id; $type = 'Help'; $page = 'introduction'; @@ -595,7 +595,7 @@ final class BackendController extends Controller $view->setTemplate('/Modules/Admin/Theme/Backend/modules-route-list'); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response); - $module = $request->getDataString('id') ?? ''; + $module = $request->getDataString('id') ?? ''; $view->data['module'] = $module; $appPath = __DIR__ . '/../../../Web'; @@ -644,7 +644,7 @@ final class BackendController extends Controller $view->setTemplate('/Modules/Admin/Theme/Backend/modules-hook-list'); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response); - $module = $request->getDataString('id') ?? ''; + $module = $request->getDataString('id') ?? ''; $view->data['module'] = $module; $appPath = __DIR__ . '/../../../Web'; @@ -689,7 +689,7 @@ final class BackendController extends Controller */ public function viewModuleSettings(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface { - $view = new View($this->app->l11nManager, $request, $response); + $view = new View($this->app->l11nManager, $request, $response); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response); $id = $request->getDataString('id') ?? ''; @@ -725,7 +725,7 @@ final class BackendController extends Controller module: 'Admin' ); - $view->data['generalSettings'] = $generalSettings; + $view->data['generalSettings'] = $generalSettings; $view->data['defaultlocalization'] = LocalizationMapper::get()->where('id', (int) $generalSettings[SettingsEnum::DEFAULT_LOCALIZATION]->content)->execute(); return $view; diff --git a/Models/App.php b/Models/App.php index a758d2b..acc24ed 100755 --- a/Models/App.php +++ b/Models/App.php @@ -75,7 +75,6 @@ class App implements \JsonSerializable */ public ?int $defaultUnit = null; - /** * {@inheritdoc} */