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

make tables tabable

Browse Source
This commit is contained in:
Dennis Eichhorn 2020-05-31 18:03:29 +02:00
parent f23995005c
commit eb73cc4027
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Localization/L11nManager.php
View File

@ -146,21 +146,22 @@ final class L11nManager
/** /**
* Get translation. * Get translation.
* *
* @param string $code Language code * @param string $code Language code
* @param string $module Module name * @param string $module Module name
* @param string $theme Theme * @param string $theme Theme
* @param mixed $translation Text * @param mixed $translation Text
* @param null|string $app App name
* *
* @return string In case the language element couldn't be found 'ERROR' will be returned * @return string In case the language element couldn't be found 'ERROR' will be returned
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function getText(string $code, string $module, string $theme, $translation) : string public function getText(string $code, string $module, string $theme, $translation, string $app = null) : string
{ {
if (!isset($this->language[$code][$module][$translation])) { if (!isset($this->language[$code][$module][$translation])) {
try { try {
/** @var ModuleAbstract $class */ /** @var ModuleAbstract $class */
$class = '\Modules\\' . $module . '\\Controller\\' . $this->appName . 'Controller'; $class = '\Modules\\' . $module . '\\Controller\\' . ($app ?? $this->appName) . 'Controller';
$this->loadLanguage($code, $module, $class::getLocalization($code, $theme)); $this->loadLanguage($code, $module, $class::getLocalization($code, $theme));
if (!isset($this->language[$code][$module][$translation])) { if (!isset($this->language[$code][$module][$translation])) {

5
Module/ModuleManager.php
View File

@ -131,19 +131,20 @@ final class ModuleManager
* Get language files. * Get language files.
* *
* @param RequestAbstract $request Request * @param RequestAbstract $request Request
* @param null|string $app App name
* *
* @return string[] * @return string[]
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function getLanguageFiles(RequestAbstract $request) : array public function getLanguageFiles(RequestAbstract $request, string $app = null) : array
{ {
$files = $this->getUriLoad($request); $files = $this->getUriLoad($request);
$lang = []; $lang = [];
if (isset($files['5'])) { if (isset($files['5'])) {
foreach ($files['5'] as $module) { foreach ($files['5'] as $module) {
$lang[] = '/Modules/' . $module['module_load_from'] . '/Theme/' . $this->app->appName . '/Lang/' . $module['module_load_file']; $lang[] = '/Modules/' . $module['module_load_from'] . '/Theme/' . ($app ?? $this->app->appName) . '/Lang/' . $module['module_load_file'];
} }
} }

2
Router/SocketRouter.php
View File

@ -120,7 +120,7 @@ final class SocketRouter implements RouterInterface
if ((isset($d['permission']) && $account === null) if ((isset($d['permission']) && $account === null)
|| (isset($d['permission']) || (isset($d['permission'])
&& !$account->hasPermission( && !$account->hasPermission(
$d['permission']['type'], $orgId, $app, $d['permission']['module'], $d['permission']['state'] $d['permission']['type'] ?? null, $orgId, $app, $d['permission']['module'] ?? null, $d['permission']['state'] ?? null
) )
) )
) { ) {

2
Router/WebRouter.php
View File

@ -139,7 +139,7 @@ final class WebRouter implements RouterInterface
if ((isset($d['permission']) && $account === null) if ((isset($d['permission']) && $account === null)
|| (isset($d['permission']) || (isset($d['permission'])
&& !$account->hasPermission( && !$account->hasPermission(
$d['permission']['type'], $orgId, $app, $d['permission']['module'], $d['permission']['state'] $d['permission']['type'] ?? null, $orgId, $app, $d['permission']['module'] ?? null, $d['permission']['state'] ?? null
) )
) )
) { ) {