diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php index 4ba6d74..e146696 100644 --- a/Admin/Install/Navigation.php +++ b/Admin/Install/Navigation.php @@ -28,7 +28,7 @@ class Navigation { /** * Install navigation providing - * + * * @param string $path Path to some file * @param DatabasePool $dbPool Database pool for database interaction * @@ -40,7 +40,7 @@ class Navigation { $navData = json_decode(file_get_contents(__DIR__ . '/Navigation.install.json'), true); $class = '\\Modules\\Navigation\\Admin\\Installer'; - + /** @var $class \Modules\Navigation\Admin\Installer */ $class::installExternal($dbPool, $navData); } diff --git a/Controller.php b/Controller.php index c6b1145..7a13562 100644 --- a/Controller.php +++ b/Controller.php @@ -41,7 +41,7 @@ use phpOMS\Views\View; /** * Admin controller class. - * + * * This class is responsible for the basic admin activities such as managing accounts, groups, permissions and modules. * * @package Modules @@ -102,10 +102,10 @@ class Controller extends ModuleAbstract implements WebInterface /** * Method which generates the general settings view. - * + * * In this view general settings for the entire application can be seen and adjusted. Settings which can be modified * here are localization, password, database, etc. - * + * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response * @param mixed $data Generic data @@ -118,7 +118,7 @@ class Controller extends ModuleAbstract implements WebInterface public function viewSettingsGeneral(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable { $view = new View($this->app, $request, $response); - + if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission( PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_ID, PermissionState::SETTINGS) ) { @@ -146,7 +146,7 @@ class Controller extends ModuleAbstract implements WebInterface /** * Method which generates the account list view. - * + * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response * @param mixed $data Generic data @@ -159,7 +159,7 @@ class Controller extends ModuleAbstract implements WebInterface public function viewAccountList(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable { $view = new View($this->app, $request, $response); - + if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission( PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_ID, PermissionState::ACCOUNT) ) { @@ -178,7 +178,7 @@ class Controller extends ModuleAbstract implements WebInterface /** * Method which generates the account view of a single account. - * + * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response * @param mixed $data Generic data @@ -191,7 +191,7 @@ class Controller extends ModuleAbstract implements WebInterface public function viewAccountSettings(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable { $view = new View($this->app, $request, $response); - + if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission( PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_ID, PermissionState::ACCOUNT) ) { @@ -219,7 +219,7 @@ class Controller extends ModuleAbstract implements WebInterface /** * Method which generates the create account view. - * + * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response * @param mixed $data Generic data @@ -232,7 +232,7 @@ class Controller extends ModuleAbstract implements WebInterface public function viewAccountCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable { $view = new View($this->app, $request, $response); - + if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission( PermissionType::CREATE, $this->app->orgId, $this->app->appName, self::MODULE_ID, PermissionState::ACCOUNT) ) { @@ -249,7 +249,7 @@ class Controller extends ModuleAbstract implements WebInterface /** * Method which generates the group list view. - * + * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response * @param mixed $data Generic data @@ -262,7 +262,7 @@ class Controller extends ModuleAbstract implements WebInterface public function viewGroupList(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable { $view = new View($this->app, $request, $response); - + if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission( PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_ID, PermissionState::GROUP) ) { @@ -270,7 +270,7 @@ class Controller extends ModuleAbstract implements WebInterface $response->getHeader()->setStatusCode(RequestStatusCode::R_403); return $view; } - + $view->setTemplate('/Modules/Admin/Theme/Backend/groups-list'); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000103001, $request, $response)); $view->setData('list:elements', GroupMapper::getAll()); @@ -280,7 +280,7 @@ class Controller extends ModuleAbstract implements WebInterface /** * Method which generates the group view of a single group. - * + * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response * @param mixed $data Generic data @@ -293,7 +293,7 @@ class Controller extends ModuleAbstract implements WebInterface public function viewGroupSettings(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable { $view = new View($this->app, $request, $response); - + if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission( PermissionType::MODIFY, $this->app->orgId, $this->app->appName, self::MODULE_ID, PermissionState::GROUP) ) { @@ -301,13 +301,13 @@ class Controller extends ModuleAbstract implements WebInterface $response->getHeader()->setStatusCode(RequestStatusCode::R_403); return $view; } - + $view->setTemplate('/Modules/Admin/Theme/Backend/groups-single'); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000103001, $request, $response)); $view->addData('group', GroupMapper::get((int) $request->getData('id'))); $permissions = GroupPermissionMapper::getFor((int) $request->getData('id'), 'group'); - + if (!isset($permissions) || $permissions instanceof NullGroupPermission) { $permissions = []; } elseif (!is_array($permissions)) { @@ -321,7 +321,7 @@ class Controller extends ModuleAbstract implements WebInterface /** * Method which generates the group create view. - * + * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response * @param mixed $data Generic data @@ -334,7 +334,7 @@ class Controller extends ModuleAbstract implements WebInterface public function viewGroupCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable { $view = new View($this->app, $request, $response); - + if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission( PermissionType::CREATE, $this->app->orgId, $this->app->appName, self::MODULE_ID, PermissionState::GROUP) ) { @@ -342,7 +342,7 @@ class Controller extends ModuleAbstract implements WebInterface $response->getHeader()->setStatusCode(RequestStatusCode::R_403); return $view; } - + $view->setTemplate('/Modules/Admin/Theme/Backend/groups-create'); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000103001, $request, $response)); @@ -351,7 +351,7 @@ class Controller extends ModuleAbstract implements WebInterface /** * Method which generates the module list view. - * + * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response * @param mixed $data Generic data @@ -364,7 +364,7 @@ class Controller extends ModuleAbstract implements WebInterface public function viewModuleList(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable { $view = new View($this->app, $request, $response); - + if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission( PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_ID, PermissionState::MODULE) ) { @@ -372,7 +372,7 @@ class Controller extends ModuleAbstract implements WebInterface $response->getHeader()->setStatusCode(RequestStatusCode::R_403); return $view; } - + $view->setTemplate('/Modules/Admin/Theme/Backend/modules-list'); return $view; @@ -380,7 +380,7 @@ class Controller extends ModuleAbstract implements WebInterface /** * Method which generates the module profile view. - * + * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response * @param mixed $data Generic data @@ -393,7 +393,7 @@ class Controller extends ModuleAbstract implements WebInterface public function viewModuleProfile(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable { $view = new View($this->app, $request, $response); - + if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission( PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_ID, PermissionState::MODULE) ) { @@ -401,7 +401,7 @@ class Controller extends ModuleAbstract implements WebInterface $response->getHeader()->setStatusCode(RequestStatusCode::R_403); return $view; } - + $view->setTemplate('/Modules/Admin/Theme/Backend/modules-single'); return $view; @@ -409,7 +409,7 @@ class Controller extends ModuleAbstract implements WebInterface /** * Api method for getting settings - * + * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response * @param mixed $data Generic data @@ -433,7 +433,7 @@ class Controller extends ModuleAbstract implements WebInterface /** * Api method for modifying settings - * + * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response * @param mixed $data Generic data @@ -453,7 +453,7 @@ class Controller extends ModuleAbstract implements WebInterface } $success = $this->app->appSettings->set( - json_decode((string) $request->getData('settings'), true), + json_decode((string) $request->getData('settings'), true), true ); @@ -462,7 +462,7 @@ class Controller extends ModuleAbstract implements WebInterface /** * Api method for getting a group - * + * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response * @param mixed $data Generic data @@ -487,7 +487,7 @@ class Controller extends ModuleAbstract implements WebInterface /** * Api method for modifying a group - * + * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response * @param mixed $data Generic data @@ -507,19 +507,19 @@ class Controller extends ModuleAbstract implements WebInterface } $group = GroupMapper::get((int) $request->getData('id')); - + $group->setName((string) ($request->getData('name') ?? $group->getName())); $group->setDescription(Markdown::parse((string) ($request->getData('description') ?? $group->getDescription()))); $group->setDescriptionRaw((string) ($request->getData('description') ?? $group->getDescriptionRaw())); GroupMapper::update($group); - + $response->set($request->__toString(), $group->jsonSerialize()); } /** * Validate group create request - * + * * @param RequestAbstract $request Request * * @return array @@ -544,7 +544,7 @@ class Controller extends ModuleAbstract implements WebInterface /** * Api method to create a group - * + * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response * @param mixed $data Generic data @@ -577,7 +577,7 @@ class Controller extends ModuleAbstract implements WebInterface /** * Method to create group from request. - * + * * @param RequestAbstract $request Request * * @return Group @@ -598,7 +598,7 @@ class Controller extends ModuleAbstract implements WebInterface /** * Api method to delete a group - * + * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response * @param mixed $data Generic data @@ -625,7 +625,7 @@ class Controller extends ModuleAbstract implements WebInterface /** * Api method to get an accoung - * + * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response * @param mixed $data Generic data @@ -650,7 +650,7 @@ class Controller extends ModuleAbstract implements WebInterface /** * Api method to find accounts - * + * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response * @param mixed $data Generic data @@ -675,7 +675,7 @@ class Controller extends ModuleAbstract implements WebInterface /** * Method to validate account creation from request - * + * * @param RequestAbstract $request Request * * @return array @@ -700,7 +700,7 @@ class Controller extends ModuleAbstract implements WebInterface /** * Api method to create an account - * + * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response * @param mixed $data Generic data @@ -733,7 +733,7 @@ class Controller extends ModuleAbstract implements WebInterface /** * Method to create an account from a request - * + * * @param RequestAbstract $request Request * * @return Account @@ -757,7 +757,7 @@ class Controller extends ModuleAbstract implements WebInterface /** * Api method to delete an account - * + * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response * @param mixed $data Generic data @@ -784,7 +784,7 @@ class Controller extends ModuleAbstract implements WebInterface /** * Api method to update an account - * + * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response * @param mixed $data Generic data @@ -819,7 +819,7 @@ class Controller extends ModuleAbstract implements WebInterface /** * Api method to update the module settigns - * + * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response * @param mixed $data Generic data diff --git a/Models/AccountMapper.php b/Models/AccountMapper.php index 0db2bb7..8b3119f 100644 --- a/Models/AccountMapper.php +++ b/Models/AccountMapper.php @@ -59,7 +59,7 @@ class AccountMapper extends DataMapperAbstract * @since 1.0.0 */ protected static $hasMany = [ - 'groups' => [ + 'groups' => [ 'mapper' => GroupMapper::class, 'table' => 'account_group', 'dst' => 'account_group_account', diff --git a/Models/AccountPermission.php b/Models/AccountPermission.php index 55a5d7a..f99f70c 100644 --- a/Models/AccountPermission.php +++ b/Models/AccountPermission.php @@ -19,7 +19,7 @@ use phpOMS\Account\PermissionAbstract; /** * Account permission class. * - * A single permission for an account consisting of read, create, modify, delete and permission flags. + * A single permission for an account consisting of read, create, modify, delete and permission flags. * * @package Modules\Admin * @license OMS License 1.0 diff --git a/Models/Group.php b/Models/Group.php index 89f6e03..2f0ba75 100644 --- a/Models/Group.php +++ b/Models/Group.php @@ -86,7 +86,7 @@ class Group extends \phpOMS\Account\Group /** * Set created by - * + * * @param mixed $createdBy Group created by * * @return void @@ -100,9 +100,9 @@ class Group extends \phpOMS\Account\Group /** * Set raw description - * + * * @param string $description Description - * + * * @return void * * @since 1.0.0 @@ -114,7 +114,7 @@ class Group extends \phpOMS\Account\Group /** * Get raw description - * + * * @return string Raw description * * @since 1.0.0 diff --git a/Models/GroupPermission.php b/Models/GroupPermission.php index dfa1149..1f8c155 100644 --- a/Models/GroupPermission.php +++ b/Models/GroupPermission.php @@ -19,7 +19,7 @@ use phpOMS\Account\PermissionAbstract; /** * Group permission class. * - * A single permission for a group consisting of read, create, modify, delete and permission flags. + * A single permission for a group consisting of read, create, modify, delete and permission flags. * * @package Modules\Admin * @license OMS License 1.0 diff --git a/Theme/Backend/accounts-list.tpl.php b/Theme/Backend/accounts-list.tpl.php index 1afecc7..ad5cefe 100644 --- a/Theme/Backend/accounts-list.tpl.php +++ b/Theme/Backend/accounts-list.tpl.php @@ -32,7 +32,7 @@ echo $this->getData('nav')->render(); ?> getData('list:elements') as $key => $value) : $c++; - $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/admin/account/settings?{?}&id=' . $value->getId()); + $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/admin/account/settings?{?}&id=' . $value->getId()); $color = 'darkred'; if ($value->getStatus() === \phpOMS\Account\AccountStatus::ACTIVE) { $color = 'green'; } elseif ($value->getStatus() === \phpOMS\Account\AccountStatus::INACTIVE) { $color = 'darkblue'; } diff --git a/Theme/Backend/accounts-single.tpl.php b/Theme/Backend/accounts-single.tpl.php index 3ef6a13..469cdee 100644 --- a/Theme/Backend/accounts-single.tpl.php +++ b/Theme/Backend/accounts-single.tpl.php @@ -68,7 +68,7 @@ echo $this->getData('nav')->render(); ?> getHtml('ID', 0, 0); ?> getHtml('Name') ?> - getGroups(); foreach ($groups as $key => $value) : $c++; + getGroups(); foreach ($groups as $key => $value) : $c++; $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/admin/group/settings?{?}&id=' . $value->getId()); ?> printHtml($value->getId()); ?> diff --git a/Theme/Backend/groups-list.tpl.php b/Theme/Backend/groups-list.tpl.php index 207959e..4ed373a 100644 --- a/Theme/Backend/groups-list.tpl.php +++ b/Theme/Backend/groups-list.tpl.php @@ -30,7 +30,7 @@ echo $this->getData('nav')->render(); ?> getData('list:elements') as $key => $value) : $c++; - $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/admin/group/settings?{?}&id=' . $value->getId()); + $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/admin/group/settings?{?}&id=' . $value->getId()); $color = 'darkred'; if ($value->getStatus() === \phpOMS\Account\GroupStatus::ACTIVE) { $color = 'green'; } elseif ($value->getStatus() === \phpOMS\Account\GroupStatus::INACTIVE) { $color = 'darkblue'; }