Jingga/oms-Admin
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Admin.git synced 2026-02-15 12:08:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rename module constants and fix some unit test bugs

Browse Source
This commit is contained in:
Dennis Eichhorn 2021-09-28 18:28:42 +02:00
parent d5dd19543a
commit ec89e46654
6 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
Admin/Routes/Web/Api.php
View File

@ -50,7 +50,7 @@ return [
'dest' => '\Modules\Admin\Controller\ApiController:apiSettingsSet', 'dest' => '\Modules\Admin\Controller\ApiController:apiSettingsSet',
'verb' => RouteVerb::SET, 'verb' => RouteVerb::SET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::MODIFY, 'type' => PermissionType::MODIFY,
'state' => PermissionState::SETTINGS, 'state' => PermissionState::SETTINGS,
], ],
@ -59,7 +59,7 @@ return [
'dest' => '\Modules\Admin\Controller\ApiController:apiSettingsGet', 'dest' => '\Modules\Admin\Controller\ApiController:apiSettingsGet',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::SETTINGS, 'state' => PermissionState::SETTINGS,
], ],
@ -71,7 +71,7 @@ return [
'dest' => '\Modules\Admin\Controller\ApiController:apiSettingsDesignSet', 'dest' => '\Modules\Admin\Controller\ApiController:apiSettingsDesignSet',
'verb' => RouteVerb::SET, 'verb' => RouteVerb::SET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::MODIFY, 'type' => PermissionType::MODIFY,
'state' => PermissionState::SETTINGS, 'state' => PermissionState::SETTINGS,
], ],
@ -83,7 +83,7 @@ return [
'dest' => '\Modules\Admin\Controller\ApiController:apiGroupCreate', 'dest' => '\Modules\Admin\Controller\ApiController:apiGroupCreate',
'verb' => RouteVerb::PUT, 'verb' => RouteVerb::PUT,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::GROUP, 'state' => PermissionState::GROUP,
], ],
@ -92,7 +92,7 @@ return [
'dest' => '\Modules\Admin\Controller\ApiController:apiGroupUpdate', 'dest' => '\Modules\Admin\Controller\ApiController:apiGroupUpdate',
'verb' => RouteVerb::SET, 'verb' => RouteVerb::SET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::MODIFY, 'type' => PermissionType::MODIFY,
'state' => PermissionState::GROUP, 'state' => PermissionState::GROUP,
], ],
@ -101,7 +101,7 @@ return [
'dest' => '\Modules\Admin\Controller\ApiController:apiGroupDelete', 'dest' => '\Modules\Admin\Controller\ApiController:apiGroupDelete',
'verb' => RouteVerb::DELETE, 'verb' => RouteVerb::DELETE,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::DELETE, 'type' => PermissionType::DELETE,
'state' => PermissionState::GROUP, 'state' => PermissionState::GROUP,
], ],
@ -110,7 +110,7 @@ return [
'dest' => '\Modules\Admin\Controller\ApiController:apiGroupGet', 'dest' => '\Modules\Admin\Controller\ApiController:apiGroupGet',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::GROUP, 'state' => PermissionState::GROUP,
], ],
@ -122,7 +122,7 @@ return [
'dest' => '\Modules\Admin\Controller\ApiController:apiAccountFind', 'dest' => '\Modules\Admin\Controller\ApiController:apiAccountFind',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::SEARCH, 'state' => PermissionState::SEARCH,
], ],
@ -133,7 +133,7 @@ return [
'dest' => '\Modules\Admin\Controller\ApiController:apiGroupFind', 'dest' => '\Modules\Admin\Controller\ApiController:apiGroupFind',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::SEARCH, 'state' => PermissionState::SEARCH,
], ],
@ -144,7 +144,7 @@ return [
'dest' => '\Modules\Admin\Controller\ApiController:apiAccountGroupFind', 'dest' => '\Modules\Admin\Controller\ApiController:apiAccountGroupFind',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::SEARCH, 'state' => PermissionState::SEARCH,
], ],
@ -156,7 +156,7 @@ return [
'dest' => '\Modules\Admin\Controller\ApiController:apiAccountCreate', 'dest' => '\Modules\Admin\Controller\ApiController:apiAccountCreate',
'verb' => RouteVerb::PUT, 'verb' => RouteVerb::PUT,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::ACCOUNT, 'state' => PermissionState::ACCOUNT,
], ],
@ -165,7 +165,7 @@ return [
'dest' => '\Modules\Admin\Controller\ApiController:apiAccountUpdate', 'dest' => '\Modules\Admin\Controller\ApiController:apiAccountUpdate',
'verb' => RouteVerb::SET, 'verb' => RouteVerb::SET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::MODIFY, 'type' => PermissionType::MODIFY,
'state' => PermissionState::ACCOUNT, 'state' => PermissionState::ACCOUNT,
], ],
@ -174,7 +174,7 @@ return [
'dest' => '\Modules\Admin\Controller\ApiController:apiAccountDelete', 'dest' => '\Modules\Admin\Controller\ApiController:apiAccountDelete',
'verb' => RouteVerb::DELETE, 'verb' => RouteVerb::DELETE,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::DELETE, 'type' => PermissionType::DELETE,
'state' => PermissionState::ACCOUNT, 'state' => PermissionState::ACCOUNT,
], ],
@ -183,7 +183,7 @@ return [
'dest' => '\Modules\Admin\Controller\ApiController:apiAccountGet', 'dest' => '\Modules\Admin\Controller\ApiController:apiAccountGet',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::ACCOUNT, 'state' => PermissionState::ACCOUNT,
], ],
@ -194,7 +194,7 @@ return [
'dest' => '\Modules\Admin\Controller\ApiController:apiSettingsAccountLocalizationSet', 'dest' => '\Modules\Admin\Controller\ApiController:apiSettingsAccountLocalizationSet',
'verb' => RouteVerb::SET, 'verb' => RouteVerb::SET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::MODIFY, 'type' => PermissionType::MODIFY,
'state' => PermissionState::ACCOUNT_SETTINGS, 'state' => PermissionState::ACCOUNT_SETTINGS,
], ],
@ -206,7 +206,7 @@ return [
'dest' => '\Modules\Admin\Controller\ApiController:apiModuleStatusUpdate', 'dest' => '\Modules\Admin\Controller\ApiController:apiModuleStatusUpdate',
'verb' => RouteVerb::SET, 'verb' => RouteVerb::SET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::MODIFY, 'type' => PermissionType::MODIFY,
'state' => PermissionState::MODULE, 'state' => PermissionState::MODULE,
], ],
@ -218,7 +218,7 @@ return [
'dest' => '\Modules\Admin\Controller\ApiController:apiAddAccountToGroup', 'dest' => '\Modules\Admin\Controller\ApiController:apiAddAccountToGroup',
'verb' => RouteVerb::PUT, 'verb' => RouteVerb::PUT,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::MODIFY, 'type' => PermissionType::MODIFY,
'state' => PermissionState::MODULE, 'state' => PermissionState::MODULE,
], ],
@ -229,7 +229,7 @@ return [
'dest' => '\Modules\Admin\Controller\ApiController:apiAddGroupToAccount', 'dest' => '\Modules\Admin\Controller\ApiController:apiAddGroupToAccount',
'verb' => RouteVerb::PUT, 'verb' => RouteVerb::PUT,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::MODIFY, 'type' => PermissionType::MODIFY,
'state' => PermissionState::MODULE, 'state' => PermissionState::MODULE,
], ],
@ -241,7 +241,7 @@ return [
'dest' => '\Modules\Admin\Controller\ApiController:apiGroupPermissionGet', 'dest' => '\Modules\Admin\Controller\ApiController:apiGroupPermissionGet',
'verb' => RouteVerb::PUT, 'verb' => RouteVerb::PUT,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::PERMISSION, 'type' => PermissionType::PERMISSION,
'state' => PermissionState::MODULE, 'state' => PermissionState::MODULE,
], ],
@ -250,7 +250,7 @@ return [
'dest' => '\Modules\Admin\Controller\ApiController:apiAddGroupPermission', 'dest' => '\Modules\Admin\Controller\ApiController:apiAddGroupPermission',
'verb' => RouteVerb::PUT, 'verb' => RouteVerb::PUT,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::PERMISSION, 'type' => PermissionType::PERMISSION,
'state' => PermissionState::MODULE, 'state' => PermissionState::MODULE,
], ],
@ -259,7 +259,7 @@ return [
'dest' => '\Modules\Admin\Controller\ApiController:apiGroupPermissionUpdate', 'dest' => '\Modules\Admin\Controller\ApiController:apiGroupPermissionUpdate',
'verb' => RouteVerb::SET, 'verb' => RouteVerb::SET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::PERMISSION, 'type' => PermissionType::PERMISSION,
'state' => PermissionState::MODULE, 'state' => PermissionState::MODULE,
], ],
@ -268,7 +268,7 @@ return [
'dest' => '\Modules\Admin\Controller\ApiController:apiGroupPermissionDelete', 'dest' => '\Modules\Admin\Controller\ApiController:apiGroupPermissionDelete',
'verb' => RouteVerb::DELETE, 'verb' => RouteVerb::DELETE,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::PERMISSION, 'type' => PermissionType::PERMISSION,
'state' => PermissionState::MODULE, 'state' => PermissionState::MODULE,
], ],
@ -279,7 +279,7 @@ return [
'dest' => '\Modules\Admin\Controller\ApiController:apiAccountPermissionGet', 'dest' => '\Modules\Admin\Controller\ApiController:apiAccountPermissionGet',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::PERMISSION, 'type' => PermissionType::PERMISSION,
'state' => PermissionState::MODULE, 'state' => PermissionState::MODULE,
], ],
@ -288,7 +288,7 @@ return [
'dest' => '\Modules\Admin\Controller\ApiController:apiAddAccountPermission', 'dest' => '\Modules\Admin\Controller\ApiController:apiAddAccountPermission',
'verb' => RouteVerb::PUT, 'verb' => RouteVerb::PUT,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::PERMISSION, 'type' => PermissionType::PERMISSION,
'state' => PermissionState::MODULE, 'state' => PermissionState::MODULE,
], ],
@ -297,7 +297,7 @@ return [
'dest' => '\Modules\Admin\Controller\ApiController:apiAccountPermissionUpdate', 'dest' => '\Modules\Admin\Controller\ApiController:apiAccountPermissionUpdate',
'verb' => RouteVerb::SET, 'verb' => RouteVerb::SET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::PERMISSION, 'type' => PermissionType::PERMISSION,
'state' => PermissionState::MODULE, 'state' => PermissionState::MODULE,
], ],
@ -306,7 +306,7 @@ return [
'dest' => '\Modules\Admin\Controller\ApiController:apiAccountPermissionDelete', 'dest' => '\Modules\Admin\Controller\ApiController:apiAccountPermissionDelete',
'verb' => RouteVerb::DELETE, 'verb' => RouteVerb::DELETE,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::PERMISSION, 'type' => PermissionType::PERMISSION,
'state' => PermissionState::MODULE, 'state' => PermissionState::MODULE,
], ],
@ -317,7 +317,7 @@ return [
'dest' => '\Modules\Admin\Controller\ApiController:apiReInit', 'dest' => '\Modules\Admin\Controller\ApiController:apiReInit',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::ROUTE, 'state' => PermissionState::ROUTE,
], ],
@ -329,7 +329,7 @@ return [
'dest' => '\Modules\Admin\Controller\ApiController:apiUpdateFile', 'dest' => '\Modules\Admin\Controller\ApiController:apiUpdateFile',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::APP, 'state' => PermissionState::APP,
], ],
@ -340,7 +340,7 @@ return [
'dest' => '\Modules\Admin\Controller\ApiController:apiCheckForUpdates', 'dest' => '\Modules\Admin\Controller\ApiController:apiCheckForUpdates',
'verb' => RouteVerb::PUT, 'verb' => RouteVerb::PUT,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::APP, 'state' => PermissionState::APP,
], ],
@ -351,7 +351,7 @@ return [
'dest' => '\Modules\Admin\Controller\ApiController:apiCheckForUpdates', 'dest' => '\Modules\Admin\Controller\ApiController:apiCheckForUpdates',
'verb' => RouteVerb::PUT, 'verb' => RouteVerb::PUT,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::APP, 'state' => PermissionState::APP,
], ],

20
Admin/Routes/Web/Backend.php
View File

@ -32,7 +32,7 @@ return [
'dest' => '\Modules\Admin\Controller\BackendController:viewModuleSettings', 'dest' => '\Modules\Admin\Controller\BackendController:viewModuleSettings',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => \Modules\Admin\Models\PermissionState::MODULE, 'state' => \Modules\Admin\Models\PermissionState::MODULE,
], ],
@ -44,7 +44,7 @@ return [
'dest' => '\Modules\Admin\Controller\BackendController:viewAccountList', 'dest' => '\Modules\Admin\Controller\BackendController:viewAccountList',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::ACCOUNT, 'state' => PermissionState::ACCOUNT,
], ],
@ -55,7 +55,7 @@ return [
'dest' => '\Modules\Admin\Controller\BackendController:viewAccountSettings', 'dest' => '\Modules\Admin\Controller\BackendController:viewAccountSettings',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::ACCOUNT, 'state' => PermissionState::ACCOUNT,
], ],
@ -66,7 +66,7 @@ return [
'dest' => '\Modules\Admin\Controller\BackendController:viewAccountCreate', 'dest' => '\Modules\Admin\Controller\BackendController:viewAccountCreate',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::ACCOUNT, 'state' => PermissionState::ACCOUNT,
], ],
@ -77,7 +77,7 @@ return [
'dest' => '\Modules\Admin\Controller\BackendController:viewGroupList', 'dest' => '\Modules\Admin\Controller\BackendController:viewGroupList',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::GROUP, 'state' => PermissionState::GROUP,
], ],
@ -88,7 +88,7 @@ return [
'dest' => '\Modules\Admin\Controller\BackendController:viewGroupSettings', 'dest' => '\Modules\Admin\Controller\BackendController:viewGroupSettings',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::MODIFY, 'type' => PermissionType::MODIFY,
'state' => PermissionState::GROUP, 'state' => PermissionState::GROUP,
], ],
@ -99,7 +99,7 @@ return [
'dest' => '\Modules\Admin\Controller\BackendController:viewGroupCreate', 'dest' => '\Modules\Admin\Controller\BackendController:viewGroupCreate',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::GROUP, 'state' => PermissionState::GROUP,
], ],
@ -110,7 +110,7 @@ return [
'dest' => '\Modules\Admin\Controller\BackendController:viewModuleList', 'dest' => '\Modules\Admin\Controller\BackendController:viewModuleList',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::MODULE, 'state' => PermissionState::MODULE,
], ],
@ -121,7 +121,7 @@ return [
'dest' => '\Modules\Admin\Controller\BackendController:viewModuleInfo', 'dest' => '\Modules\Admin\Controller\BackendController:viewModuleInfo',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::MODULE, 'state' => PermissionState::MODULE,
], ],
@ -132,7 +132,7 @@ return [
'dest' => '\Modules\Admin\Controller\BackendController:viewModuleLog', 'dest' => '\Modules\Admin\Controller\BackendController:viewModuleLog',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::MODULE, 'state' => PermissionState::MODULE,
], ],

12
Controller/ApiController.php
View File

@ -163,7 +163,7 @@ final class ApiController extends Controller
$forgotten = $this->app->appSettings->get( $forgotten = $this->app->appSettings->get(
names: ['forgott_date', 'forgrott_count'], names: ['forgott_date', 'forgrott_count'],
module: self::MODULE_NAME, module: self::NAME,
account: $account->getId() account: $account->getId()
); );
@ -187,8 +187,8 @@ final class ApiController extends Controller
$mail->body = 'Please reset your password at: .....'; $mail->body = 'Please reset your password at: .....';
$this->app->appSettings->set([ $this->app->appSettings->set([
['name' => 'forgott_date', 'module' => self::MODULE_NAME, 'account' => $account->getId(), 'content' => (string) \time()], ['name' => 'forgott_date', 'module' => self::NAME, 'account' => $account->getId(), 'content' => (string) \time()],
['name' => 'forgotten_count', 'module' => self::MODULE_NAME, 'account' => $account->getId(), 'content' => (string) (((int) $forgotten['forgrotten_count']) + 1)], ['name' => 'forgotten_count', 'module' => self::NAME, 'account' => $account->getId(), 'content' => (string) (((int) $forgotten['forgrotten_count']) + 1)],
], true); ], true);
$response->header->set('Content-Type', MimeType::M_JSON . '; charset=utf-8', true); $response->header->set('Content-Type', MimeType::M_JSON . '; charset=utf-8', true);
@ -242,8 +242,8 @@ final class ApiController extends Controller
[ [
'response' => $this->app->appSettings->get( 'response' => $this->app->appSettings->get(
$id !== null ? (int) $id : $id, $id !== null ? (int) $id : $id,
$request->getData('app') ?? null,
$request->getData('name') ?? '', $request->getData('name') ?? '',
$request->getData('app') ?? null,
$request->getData('module') ?? null, $request->getData('module') ?? null,
$group !== null ? (int) $group : $group, $group !== null ? (int) $group : $group,
$account !== null ? (int) $account : $account $account !== null ? (int) $account : $account
@ -326,7 +326,7 @@ final class ApiController extends Controller
PermissionType::MODIFY, PermissionType::MODIFY,
$this->app->orgId, $this->app->orgId,
$this->app->appName, $this->app->appName,
self::MODULE_NAME, self::NAME,
PermissionState::ACCOUNT_SETTINGS, PermissionState::ACCOUNT_SETTINGS,
$accountId $accountId
) )
@ -1168,7 +1168,7 @@ final class ApiController extends Controller
$old, $new, $old, $new,
StringUtils::intHash(ModuleMapper::class), 'module-status', StringUtils::intHash(ModuleMapper::class), 'module-status',
$module, $module,
self::MODULE_NAME, self::NAME,
$request->getOrigin(), $request->getOrigin(),
] ]
); );

8
Controller/BackendController.php
View File

@ -253,19 +253,19 @@ final class BackendController extends Controller
// audit log // audit log
if ($request->getData('ptype') === 'p') { if ($request->getData('ptype') === 'p') {
$view->setData('auditlogs', $view->setData('auditlogs',
AuditMapper::with('module', self::MODULE_NAME, [Audit::class]) AuditMapper::with('module', self::NAME, [Audit::class])
::with('type', StringUtils::intHash(GroupMapper::class), [Audit::class]) ::with('type', StringUtils::intHash(GroupMapper::class), [Audit::class])
::with('ref', (string) $request->getData('id') ?? '0', [Audit::class]) ::with('ref', (string) $request->getData('id') ?? '0', [Audit::class])
::getBeforePivot((int) $request->getData('audit'), null, 25)); ::getBeforePivot((int) $request->getData('audit'), null, 25));
} elseif ($request->getData('ptype') === 'n') { } elseif ($request->getData('ptype') === 'n') {
$view->setData('auditlogs', $view->setData('auditlogs',
AuditMapper::with('module', self::MODULE_NAME, [Audit::class]) AuditMapper::with('module', self::NAME, [Audit::class])
::with('type', StringUtils::intHash(GroupMapper::class), [Audit::class]) ::with('type', StringUtils::intHash(GroupMapper::class), [Audit::class])
::with('ref', (string) $request->getData('id') ?? '0', [Audit::class]) ::with('ref', (string) $request->getData('id') ?? '0', [Audit::class])
::getAfterPivot((int) $request->getData('audit'), null, 25)); ::getAfterPivot((int) $request->getData('audit'), null, 25));
} else { } else {
$view->setData('auditlogs', $view->setData('auditlogs',
AuditMapper::with('module', self::MODULE_NAME, [Audit::class]) AuditMapper::with('module', self::NAME, [Audit::class])
::with('type', StringUtils::intHash(GroupMapper::class), [Audit::class]) ::with('type', StringUtils::intHash(GroupMapper::class), [Audit::class])
::with('ref', (string) $request->getData('id') ?? '0', [Audit::class]) ::with('ref', (string) $request->getData('id') ?? '0', [Audit::class])
::getAfterPivot(0, null, 25)); ::getAfterPivot(0, null, 25));
@ -425,7 +425,7 @@ final class BackendController extends Controller
} }
if (\is_file(__DIR__ . '/../Admin/Settings/Theme/Backend/settings.tpl.php')) { if (\is_file(__DIR__ . '/../Admin/Settings/Theme/Backend/settings.tpl.php')) {
$view->setTemplate('/Modules/' . static::MODULE_NAME . '/Admin/Settings/Theme/Backend/settings'); $view->setTemplate('/Modules/' . static::NAME . '/Admin/Settings/Theme/Backend/settings');
} else { } else {
$view->setTemplate('/Modules/Admin/Theme/Backend/modules-settings'); $view->setTemplate('/Modules/Admin/Theme/Backend/modules-settings');
} }

8
Controller/Controller.php
View File

@ -34,7 +34,7 @@ abstract class Controller extends ModuleAbstract
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
public const MODULE_PATH = __DIR__ . '/../'; public const PATH = __DIR__ . '/../';
/** /**
* Module version. * Module version.
@ -42,7 +42,7 @@ abstract class Controller extends ModuleAbstract
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
public const MODULE_VERSION = '1.0.0'; public const VERSION = '1.0.0';
/** /**
* Module name. * Module name.
@ -50,7 +50,7 @@ abstract class Controller extends ModuleAbstract
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
public const MODULE_NAME = 'Admin'; public const NAME = 'Admin';
/** /**
* Module id. * Module id.
@ -58,7 +58,7 @@ abstract class Controller extends ModuleAbstract
* @var int * @var int
* @since 1.0.0 * @since 1.0.0
*/ */
public const MODULE_ID = 1000100000; public const ID = 1000100000;
/** /**
* Providing. * Providing.

2
tests/Admin/AdminTest.php
View File

@ -19,7 +19,7 @@ namespace Modules\Admin\tests\Admin;
*/ */
class AdminTest extends \PHPUnit\Framework\TestCase class AdminTest extends \PHPUnit\Framework\TestCase
{ {
protected const MODULE_NAME = 'Admin'; protected const NAME = 'Admin';
protected const URI_LOAD = 'http://127.0.0.1/en/backend/admin'; protected const URI_LOAD = 'http://127.0.0.1/en/backend/admin';