Jingga/phpOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/phpOMS.git synced 2026-02-09 21:48:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

change from org to unit

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-01-26 21:42:06 +01:00
parent 65b455f6c0
commit de4f390344
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Router/RouterInterface.php
View File

@ -75,7 +75,7 @@ interface RouterInterface
* @param string $csrf CSRF token * @param string $csrf CSRF token
* @param int $verb Route verb * @param int $verb Route verb
* @param string $app Application name * @param string $app Application name
* @param int $orgId Organization id * @param int $unitId Organization id
* @param Account $account Account * @param Account $account Account
* @param array $data Data * @param array $data Data
* *
@ -88,7 +88,7 @@ interface RouterInterface
string $csrf = null, string $csrf = null,
int $verb = RouteVerb::GET, int $verb = RouteVerb::GET,
string $app = null, string $app = null,
int $orgId = null, int $unitId = null,
Account $account = null, Account $account = null,
array $data = null array $data = null
) : array; ) : array;

4
Router/SocketRouter.php
View File

@ -114,7 +114,7 @@ final class SocketRouter implements RouterInterface
string $csrf = null, string $csrf = null,
int $verb = RouteVerb::GET, int $verb = RouteVerb::GET,
string $app = null, string $app = null,
int $orgId = null, int $unitId = null,
Account $account = null, Account $account = null,
array $data = null array $data = null
) : array ) : array
@ -143,7 +143,7 @@ final class SocketRouter implements RouterInterface
} elseif (isset($d['permission']) && !empty($d['permission']) } elseif (isset($d['permission']) && !empty($d['permission'])
&& !($account?->hasPermission( && !($account?->hasPermission(
$d['permission']['type'] ?? 0, $d['permission']['type'] ?? 0,
$d['permission']['unit'] ?? $orgId, $d['permission']['unit'] ?? $unitId,
$app, $app,
$d['permission']['module'] ?? null, $d['permission']['module'] ?? null,
$d['permission']['category'] ?? null $d['permission']['category'] ?? null

4
Router/WebRouter.php
View File

@ -116,7 +116,7 @@ final class WebRouter implements RouterInterface
string $csrf = null, string $csrf = null,
int $verb = RouteVerb::GET, int $verb = RouteVerb::GET,
string $app = null, string $app = null,
int $orgId = null, int $unitId = null,
Account $account = null, Account $account = null,
array $data = null array $data = null
) : array ) : array
@ -145,7 +145,7 @@ final class WebRouter implements RouterInterface
} elseif (isset($d['permission']) && !empty($d['permission']) } elseif (isset($d['permission']) && !empty($d['permission'])
&& !($account?->hasPermission( && !($account?->hasPermission(
$d['permission']['type'] ?? 0, $d['permission']['type'] ?? 0,
$d['permission']['unit'] ?? $orgId, $d['permission']['unit'] ?? $unitId,
$app, $app,
$d['permission']['module'] ?? null, $d['permission']['module'] ?? null,
$d['permission']['category'] ?? null $d['permission']['category'] ?? null