Make app,localization in url optional+tld+subdomain

This commit is contained in:
Dennis Eichhorn 2019-03-09 23:21:29 +01:00
parent 362bee2b02
commit a714111ec0
15 changed files with 67 additions and 67 deletions

View File

@ -1,7 +1,7 @@
[
{
"id": 1000101001,
"pid": "/backend",
"pid": "/",
"type": 2,
"subtype": 0,
"name": "Admin",
@ -15,11 +15,11 @@
"children": [
{
"id": 1000102001,
"pid": "/backend",
"pid": "/",
"type": 2,
"subtype": 1,
"name": "General",
"uri": "{/lang}/backend/admin/settings/general?{?}",
"uri": "{/prefix}admin/settings/general?{?}",
"target": "self",
"icon": null,
"order": 1,
@ -30,11 +30,11 @@
},
{
"id": 1000103001,
"pid": "/backend",
"pid": "/",
"type": 2,
"subtype": 1,
"name": "Groups",
"uri": "{/lang}/backend/admin/group/list?{?}",
"uri": "{/prefix}admin/group/list?{?}",
"target": "self",
"icon": null,
"order": 2,
@ -44,11 +44,11 @@
"children": [
{
"id": 1000103103,
"pid": "/backend/admin/group",
"pid": "/admin/group",
"type": 3,
"subtype": 1,
"name": "List",
"uri": "{/lang}/backend/admin/group/list?{?}",
"uri": "{/prefix}admin/group/list?{?}",
"target": "self",
"icon": null,
"order": 1,
@ -59,11 +59,11 @@
},
{
"id": 1000103104,
"pid": "/backend/admin/group",
"pid": "/admin/group",
"type": 3,
"subtype": 1,
"name": "Create",
"uri": "{/lang}/backend/admin/group/create?{?}",
"uri": "{/prefix}admin/group/create?{?}",
"target": "self",
"icon": null,
"order": 5,
@ -76,11 +76,11 @@
},
{
"id": 1000104001,
"pid": "/backend",
"pid": "/",
"type": 2,
"subtype": 1,
"name": "Accounts",
"uri": "{/lang}/backend/admin/account/list?{?}",
"uri": "{/prefix}admin/account/list?{?}",
"target": "self",
"icon": null,
"order": 3,
@ -90,11 +90,11 @@
"children": [
{
"id": 1000104101,
"pid": "/backend/admin/account",
"pid": "/admin/account",
"type": 3,
"subtype": 1,
"name": "List",
"uri": "{/lang}/backend/admin/account/list?{?}",
"uri": "{/prefix}admin/account/list?{?}",
"target": "self",
"icon": null,
"order": 1,
@ -105,11 +105,11 @@
},
{
"id": 1000104202,
"pid": "/backend/admin/account",
"pid": "/admin/account",
"type": 3,
"subtype": 1,
"name": "Create",
"uri": "{/lang}/backend/admin/account/create?{?}",
"uri": "{/prefix}admin/account/create?{?}",
"target": "self",
"icon": null,
"order": 5,
@ -122,11 +122,11 @@
},
{
"id": 1000105001,
"pid": "/backend",
"pid": "/",
"type": 2,
"subtype": 1,
"name": "Modules",
"uri": "{/lang}/backend/admin/module/list?{?}",
"uri": "{/prefix}admin/module/list?{?}",
"target": "self",
"icon": null,
"order": 4,
@ -136,11 +136,11 @@
"children": [
{
"id": 1000105101,
"pid": "/backend/admin/module",
"pid": "/admin/module",
"type": 3,
"subtype": 1,
"name": "Settings",
"uri": "{/lang}/backend/admin/module/setting?{?}",
"uri": "{/prefix}admin/module/setting?{?}",
"target": "self",
"icon": null,
"order": 4,

View File

@ -6,7 +6,7 @@ use phpOMS\Account\PermissionType;
use phpOMS\Router\RouteVerb;
return [
'^.*/api/admin/settings.*$' => [
'^.*/admin/settings.*$' => [
[
'dest' => '\Modules\Admin\Controller\ApiController:apiSettingsSet',
'verb' => RouteVerb::SET,
@ -27,7 +27,7 @@ return [
],
],
'^.*/api/admin/group$' => [
'^.*/admin/group$' => [
[
'dest' => '\Modules\Admin\Controller\ApiController:apiGroupCreate',
'verb' => RouteVerb::PUT,
@ -67,7 +67,7 @@ return [
],
// todo: the order of find and account is bad but needed for now. otherwise the admin/account.* also matches and we match two routes = bad
'^.*/api/admin/find/account.*$' => [
'^.*/admin/find/account.*$' => [
[
'dest' => '\Modules\Admin\Controller\ApiController:apiAccountFind',
'verb' => RouteVerb::GET,
@ -78,7 +78,7 @@ return [
],
],
],
'^.*/api/admin/find/group.*$' => [
'^.*/admin/find/group.*$' => [
[
'dest' => '\Modules\Admin\Controller\ApiController:apiGroupFind',
'verb' => RouteVerb::GET,
@ -90,7 +90,7 @@ return [
],
],
'^.*/api/admin/account$' => [
'^.*/admin/account$' => [
[
'dest' => '\Modules\Admin\Controller\ApiController:apiAccountCreate',
'verb' => RouteVerb::PUT,
@ -129,7 +129,7 @@ return [
],
],
'^.*/api/admin/module/status.*$' => [
'^.*/admin/module/status.*$' => [
[
'dest' => '\Modules\Admin\Controller\ApiController:apiModuleStatusUpdate',
'verb' => RouteVerb::SET,
@ -141,7 +141,7 @@ return [
],
],
'^.*/api/admin/group/account.*$' => [
'^.*/admin/group/account.*$' => [
[
'dest' => '\Modules\Admin\Controller\ApiController:apiAddAccountToGroup',
'verb' => RouteVerb::PUT,
@ -152,7 +152,7 @@ return [
],
],
],
'^.*/api/admin/account/group.*$' => [
'^.*/admin/account/group.*$' => [
[
'dest' => '\Modules\Admin\Controller\ApiController:apiAddGroupToAccount',
'verb' => RouteVerb::PUT,
@ -164,7 +164,7 @@ return [
],
],
'^.*/api/admin/group/permission.*$' => [
'^.*/admin/group/permission.*$' => [
[
'dest' => '\Modules\Admin\Controller\ApiController:apiAddGroupPermission',
'verb' => RouteVerb::PUT,
@ -175,7 +175,7 @@ return [
],
],
],
'^.*/api/admin/account/permission.*$' => [
'^.*/admin/account/permission.*$' => [
[
'dest' => '\Modules\Admin\Controller\ApiController:apiAddAccountPermission',
'verb' => RouteVerb::PUT,
@ -186,7 +186,7 @@ return [
],
],
],
'^.*/api/admin/module/reinit.*$' => [
'^.*/admin/module/reinit.*$' => [
[
'dest' => '\Modules\Admin\Controller\ApiController:apiReInit',
'verb' => RouteVerb::GET,

View File

@ -6,7 +6,7 @@ use phpOMS\Account\PermissionType;
use phpOMS\Router\RouteVerb;
return [
'^.*/backend/admin/settings/general.*$' => [
'^.*/admin/settings/general.*$' => [
[
'dest' => '\Modules\Admin\Controller\BackendController:viewSettingsGeneral',
'verb' => RouteVerb::GET,
@ -17,7 +17,7 @@ return [
],
],
],
'^.*/backend/admin/account/list.*$' => [
'^.*/admin/account/list.*$' => [
[
'dest' => '\Modules\Admin\Controller\BackendController:viewAccountList',
'verb' => RouteVerb::GET,
@ -28,7 +28,7 @@ return [
],
],
],
'^.*/backend/admin/account/settings.*$' => [
'^.*/admin/account/settings.*$' => [
[
'dest' => '\Modules\Admin\Controller\BackendController:viewAccountSettings',
'verb' => RouteVerb::GET,
@ -39,7 +39,7 @@ return [
],
],
],
'^.*/backend/admin/account/create.*$' => [
'^.*/admin/account/create.*$' => [
[
'dest' => '\Modules\Admin\Controller\BackendController:viewAccountCreate',
'verb' => RouteVerb::GET,
@ -50,7 +50,7 @@ return [
],
],
],
'^.*/backend/admin/group/list.*$' => [
'^.*/admin/group/list.*$' => [
[
'dest' => '\Modules\Admin\Controller\BackendController:viewGroupList',
'verb' => RouteVerb::GET,
@ -61,7 +61,7 @@ return [
],
],
],
'^.*/backend/admin/group/settings.*$' => [
'^.*/admin/group/settings.*$' => [
[
'dest' => '\Modules\Admin\Controller\BackendController:viewGroupSettings',
'verb' => RouteVerb::GET,
@ -72,7 +72,7 @@ return [
],
],
],
'^.*/backend/admin/group/create.*$' => [
'^.*/admin/group/create.*$' => [
[
'dest' => '\Modules\Admin\Controller\BackendController:viewGroupCreate',
'verb' => RouteVerb::GET,
@ -83,7 +83,7 @@ return [
],
],
],
'^.*/backend/admin/module/list.*$' => [
'^.*/admin/module/list.*$' => [
[
'dest' => '\Modules\Admin\Controller\BackendController:viewModuleList',
'verb' => RouteVerb::GET,
@ -94,7 +94,7 @@ return [
],
],
],
'^.*/backend/admin/module/settings\?.*$' => [
'^.*/admin/module/settings\?.*$' => [
[
'dest' => '\Modules\Admin\Controller\BackendController:viewModuleProfile',
'verb' => RouteVerb::GET,

View File

@ -91,7 +91,7 @@ final class ApiController extends Controller
*/
public function apiSettingsSet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{
$data = empty($request->getData('settings')) ? $request->getLike('(settings_)(.*)') : \json_decode((string) $request->getData('settings'), true);
$data = empty($request->getData('settings')) ? $request->getLike('(settings_)(.*)') : $request->getDataJson('settings');
$this->updateModel($request, $data, $data, function() use($data) : void {
$this->app->appSettings->set($data, true);

View File

@ -5,9 +5,9 @@
{
"key": 1, "listener": "click", "action": [
{"key": 1, "type": "dom.popup", "selector": "#group-selector-tpl", "aniIn": "fadeIn", "id": "<?= $this->printHtml($this->getId()); ?>"},
{"key": 2, "type": "message.request", "uri": "<?= \phpOMS\Uri\UriFactory::build('{/lang}/api/admin/group?filter=some&limit=10'); ?>", "method": "GET", "request_type": "json"},
{"key": 2, "type": "message.request", "uri": "<?= \phpOMS\Uri\UriFactory::build('{/prefix}admin/group?filter=some&limit=10'); ?>", "method": "GET", "request_type": "json"},
{"key": 3, "type": "dom.table.append", "id": "acc-table", "aniIn": "fadeIn", "data": [], "bindings": {"id": "id", "name": "name/0"}, "position": -1},
{"key": 4, "type": "message.request", "uri": "<?= \phpOMS\Uri\UriFactory::build('{/lang}/api/admin/group?filter=some&limit=10'); ?>", "method": "GET", "request_type": "json"},
{"key": 4, "type": "message.request", "uri": "<?= \phpOMS\Uri\UriFactory::build('{/prefix}admin/group?filter=some&limit=10'); ?>", "method": "GET", "request_type": "json"},
{"key": 5, "type": "dom.table.append", "id": "grp-table", "aniIn": "fadeIn", "data": [], "bindings": {"id": "id", "name": "name/0"}, "position": -1}
]
}

View File

@ -21,7 +21,7 @@ echo $this->getData('nav')->render(); ?>
<section class="box wf-100">
<header><h1><?= $this->getHtml('Account'); ?></h1></header>
<div class="inner">
<form id="fAccount" action="<?= \phpOMS\Uri\UriFactory::build('{/lang}/api/admin/account'); ?>" method="put">
<form id="fAccount" action="<?= \phpOMS\Uri\UriFactory::build('{/api}admin/account'); ?>" method="put">
<table class="layout wf-100">
<tbody>
<tr><td><label for="iType"><?= $this->getHtml('Type'); ?></label>

View File

@ -34,7 +34,7 @@ echo $this->getData('nav')->render(); ?>
<tr><td colspan="5">
<tbody>
<?php $c = 0; foreach ($this->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('{/prefix}admin/account/settings?{?}&id=' . $value->getId());
$color = 'darkred';
if ($value->getStatus() === AccountStatus::ACTIVE) { $color = 'green'; }
elseif ($value->getStatus() === AccountStatus::INACTIVE) { $color = 'darkblue'; }

View File

@ -28,7 +28,7 @@ echo $this->getData('nav')->render(); ?>
<section class="box wf-100">
<header><h1><?= $this->getHtml('Account'); ?></h1></header>
<div class="inner">
<form id="account-edit" action="<?= \phpOMS\Uri\UriFactory::build('{/lang}/api/admin/account'); ?>" method="post">
<form id="account-edit" action="<?= \phpOMS\Uri\UriFactory::build('{/api}admin/account'); ?>" method="post">
<table class="layout wf-100">
<tbody>
<tr><td><label for="iId"><?= $this->getHtml('ID', 0, 0); ?></label>
@ -114,7 +114,7 @@ echo $this->getData('nav')->render(); ?>
<td class="wf-100"><?= $this->getHtml('Name') ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
<tbody>
<?php $c = 0; $groups = $account->getGroups(); foreach ($groups as $key => $value) : $c++;
$url = \phpOMS\Uri\UriFactory::build('{/lang}/backend/admin/group/settings?{?}&id=' . $value->getId()); ?>
$url = \phpOMS\Uri\UriFactory::build('{/prefix}admin/group/settings?{?}&id=' . $value->getId()); ?>
<tr data-href="<?= $url; ?>">
<td><a href="#"><i class="fa fa-times"></i></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
@ -128,7 +128,7 @@ echo $this->getData('nav')->render(); ?>
<section class="box wf-100">
<header><h1><?= $this->getHtml('Groups'); ?></h1></header>
<div class="inner">
<form id="iAddGroupToAccount" action="<?= \phpOMS\Uri\UriFactory::build('{/lang}/api/admin/account/group'); ?>" method="put">
<form id="iAddGroupToAccount" action="<?= \phpOMS\Uri\UriFactory::build('{/api}admin/account/group'); ?>" method="put">
<table class="layout wf-100">
<tbody>
<tr><td><label for="iGroup"><?= $this->getHtml('Name'); ?></label>
@ -184,7 +184,7 @@ echo $this->getData('nav')->render(); ?>
<section class="box wf-100">
<header><h1><?= $this->getHtml('Permissions'); ?></h1></header>
<div class="inner">
<form id="fAccountAddPermission" action="<?= \phpOMS\Uri\UriFactory::build('{/lang}/api/admin/account/permission'); ?>" method="put">
<form id="fAccountAddPermission" action="<?= \phpOMS\Uri\UriFactory::build('{/api}admin/account/permission'); ?>" method="put">
<table class="layout wf-100">
<tbody>
<tr><td><label for="iPermissionUnit"><?= $this->getHtml('Unit'); ?></label>

View File

@ -21,7 +21,7 @@ echo $this->getData('nav')->render(); ?>
<section class="box wf-100">
<header><h1><?= $this->getHtml('Group'); ?></h1></header>
<div class="inner">
<form id="fGroupCreate" action="<?= \phpOMS\Uri\UriFactory::build('{/lang}/api/admin/group'); ?>" method="put">
<form id="fGroupCreate" action="<?= \phpOMS\Uri\UriFactory::build('{/api}admin/group'); ?>" method="put">
<table class="layout wf-100" style="table-layout: fixed">
<tbody>
<tr><td><label for="iStatus"><?= $this->getHtml('Status'); ?></label>

View File

@ -30,7 +30,7 @@ echo $this->getData('nav')->render(); ?>
<tr><td colspan="5">
<tbody>
<?php $c = 0; foreach ($this->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('{/prefix}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'; }

View File

@ -35,7 +35,7 @@ echo $this->getData('nav')->render(); ?>
<section class="box wf-100">
<header><h1><?= $this->getHtml('Group'); ?></h1></header>
<div class="inner">
<form id="fGroupEdit" action="<?= \phpOMS\Uri\UriFactory::build('{/lang}/api/admin/group'); ?>" method="post">
<form id="fGroupEdit" action="<?= \phpOMS\Uri\UriFactory::build('{/api}admin/group'); ?>" method="post">
<label for="iGid"><?= $this->getHtml('ID', 0, 0); ?></label>
<input id="iGid" name="id" type="text" value="<?= $this->printHtml($group->getId()); ?>" disabled>
<label for="iGname"><?= $this->getHtml('Name'); ?></label>
@ -71,7 +71,7 @@ echo $this->getData('nav')->render(); ?>
<?php $c = 0; foreach ($accounts as $key => $value) : $c++; ?>
<tr>
<td><a href="#"><i class="fa fa-times"></i></a>
<td><a href="<?= \phpOMS\Uri\UriFactory::build('{/lang}/backend/admin/account/settings?{?}&id=' . $value->getId()) ?>"><?= $value->getName1(); ?></a>
<td><a href="<?= \phpOMS\Uri\UriFactory::build('{/prefix}admin/account/settings?{?}&id=' . $value->getId()) ?>"><?= $value->getName1(); ?></a>
<?php endforeach; ?>
<?php if ($c === 0) : ?>
<tr><td colspan="2" class="empty"><?= $this->getHtml('Empty', 0, 0); ?>
@ -81,7 +81,7 @@ echo $this->getData('nav')->render(); ?>
<section class="box wf-100">
<header><h1><?= $this->getHtml('Accounts'); ?></h1></header>
<div class="inner">
<form id="iAddAccountToGroup" action="<?= \phpOMS\Uri\UriFactory::build('{/lang}/api/admin/group/account'); ?>" method="put">
<form id="iAddAccountToGroup" action="<?= \phpOMS\Uri\UriFactory::build('{/api}admin/group/account'); ?>" method="put">
<label for="iAccount"><?= $this->getHtml('Name'); ?></label>
<?= $this->getData('accGrpSelector')->render('iAccount', 'group', true); ?>
<input type="submit" value="<?= $this->getHtml('Add', 0, 0); ?>">
@ -132,7 +132,7 @@ echo $this->getData('nav')->render(); ?>
<section class="box wf-100">
<header><h1><?= $this->getHtml('Permissions'); ?></h1></header>
<div class="inner">
<form id="fGroupAddPermission" action="<?= \phpOMS\Uri\UriFactory::build('{/lang}/api/admin/group/permission'); ?>" method="put">
<form id="fGroupAddPermission" action="<?= \phpOMS\Uri\UriFactory::build('{/api}admin/group/permission'); ?>" method="put">
<table class="layout wf-100">
<tbody>
<tr><td><label for="iPermissionUnit"><?= $this->getHtml('Unit'); ?></label>

View File

@ -37,7 +37,7 @@ $installed = $this->app->moduleManager->getInstalledModules();
<td colspan="4">
<tbody>
<?php $count = 0; foreach ($modules as $key => $module) : ++$count;
$url = \phpOMS\Uri\UriFactory::build('{/lang}/backend/admin/module/settings?{?}&id=' . $module['name']['internal']);
$url = \phpOMS\Uri\UriFactory::build('{/prefix}admin/module/settings?{?}&id=' . $module['name']['internal']);
if (isset($active[$module['name']['internal']])) { $status = ModuleStatus::ACTIVE; }
elseif (isset($installed[$module['name']['internal']])) { $status = ModuleStatus::INACTIVE; }
else { $status = ModuleStatus::AVAILABLE; }

View File

@ -54,18 +54,18 @@ if ($nav !== null) {
<tr>
<td colspan="2">
<?php if (isset($active[$id])) : ?>
<form id="fModuleDeactivate" action="<?= \phpOMS\Uri\UriFactory::build('{/lang}/api/admin/module/status?module=' . $id); ?>" method="POST">
<form id="fModuleDeactivate" action="<?= \phpOMS\Uri\UriFactory::build('{/api}admin/module/status?module=' . $id); ?>" method="POST">
<button id="fModuleDeactivateButton" name="status" type="submit" value="<?= ModuleStatusUpdateType::DEACTIVATE ?>"><?= $this->getHtml('Deactivate'); ?></button>
</form>
<?php elseif (isset($installed[$id])) : ?>
<div class="ipt-wrap">
<div class="ipt-first">
<form id="fModuleUninstall" action="<?= \phpOMS\Uri\UriFactory::build('{/lang}/api/admin/module/status?module=' . $id); ?>" method="POST">
<form id="fModuleUninstall" action="<?= \phpOMS\Uri\UriFactory::build('{/api}admin/module/status?module=' . $id); ?>" method="POST">
<button id="fModuleUninstallButton" name="status" type="submit" value="<?= ModuleStatusUpdateType::UNINSTALL ?>"><?= $this->getHtml('Uninstall'); ?></button>
</form>
</div>
<div class="ipt-second">
<form id="fModuleActivate" action="<?= \phpOMS\Uri\UriFactory::build('{/lang}/api/admin/module/status?module=' . $id); ?>" method="POST">
<form id="fModuleActivate" action="<?= \phpOMS\Uri\UriFactory::build('{/api}admin/module/status?module=' . $id); ?>" method="POST">
<button id="fModuleActivateButton" name="status" type="submit" value="<?= ModuleStatusUpdateType::ACTIVATE ?>"><?= $this->getHtml('Activate'); ?></button>
</form>
</div>
@ -73,12 +73,12 @@ if ($nav !== null) {
<?php elseif (isset($modules[$id])) : ?>
<div class="ipt-wrap">
<div class="ipt-first">
<form id="fModuleInstall" action="<?= \phpOMS\Uri\UriFactory::build('{/lang}/api/admin/module/status?module=' . $id); ?>" method="POST">
<form id="fModuleInstall" action="<?= \phpOMS\Uri\UriFactory::build('{/api}admin/module/status?module=' . $id); ?>" method="POST">
<button id="fModuleInstallButton" name="status" type="submit" value="<?= ModuleStatusUpdateType::INSTALL ?>"><?= $this->getHtml('Install'); ?></button>
</form>
</div>
<div class="ipt-second">
<form id="fModuleDelete" action="<?= \phpOMS\Uri\UriFactory::build('{/lang}/api/admin/module/status?module=' . $id); ?>" method="POST">
<form id="fModuleDelete" action="<?= \phpOMS\Uri\UriFactory::build('{/api}admin/module/status?module=' . $id); ?>" method="POST">
<button id="fModuleDeleteButton" name="status" type="submit" value="<?= ModuleStatusUpdateType::DELETE ?>"><?= $this->getHtml('Delete'); ?></button>
</form>
</div>

View File

@ -46,7 +46,7 @@ $temperatures = \phpOMS\Utils\Converter\TemperatureType::getConstants();
<section class="box wf-100">
<header><h1><?= $this->getHtml('Settings'); ?></h1></header>
<div class="inner">
<form id="iGeneralSettings" action="<?= \phpOMS\Uri\UriFactory::build('{/lang}/api/admin/settings/general'); ?>" method="post">
<form id="iGeneralSettings" action="<?= \phpOMS\Uri\UriFactory::build('{/api}admin/settings/general'); ?>" method="post">
<table class="layout wf-100">
<tbody>
<tr><td><label for="iOname"><?= $this->getHtml('OrganizationName'); ?></label>
@ -62,7 +62,7 @@ $temperatures = \phpOMS\Utils\Converter\TemperatureType::getConstants();
<section class="box wf-100">
<header><h1><?= $this->getHtml('Security'); ?></h1></header>
<div class="inner">
<form id="iSecuritySettings" action="<?= \phpOMS\Uri\UriFactory::build('{/lang}/api/admin/settings/general'); ?>" method="post">
<form id="iSecuritySettings" action="<?= \phpOMS\Uri\UriFactory::build('{/api}admin/settings/general'); ?>" method="post">
<table class="layout wf-100">
<tbody>
<tr><td>
@ -96,7 +96,7 @@ $temperatures = \phpOMS\Utils\Converter\TemperatureType::getConstants();
<section class="box wf-100">
<header><h1><?= $this->getHtml('Logging'); ?></h1></header>
<div class="inner">
<form id="iLoggingSettings" action="<?= \phpOMS\Uri\UriFactory::build('{/lang}/api/admin/settings/general'); ?>" method="post">
<form id="iLoggingSettings" action="<?= \phpOMS\Uri\UriFactory::build('{/api}admin/settings/general'); ?>" method="post">
<table class="layout wf-100">
<tbody>
<tr><td>
@ -121,7 +121,7 @@ $temperatures = \phpOMS\Utils\Converter\TemperatureType::getConstants();
<section class="box wf-100">
<header><h1><?= $this->getHtml('Localization'); ?></h1></header>
<div class="inner">
<form id="fLocalization" name="fLocalization" action="<?= \phpOMS\Uri\UriFactory::build('{/lang}/api/admin/settings/localization'); ?>" method="post">
<form id="fLocalization" name="fLocalization" action="<?= \phpOMS\Uri\UriFactory::build('{/api}admin/settings/localization'); ?>" method="post">
<table class="layout wf-100">
<tbody>
<tr><td><label for="iDefaultLocalizations"><?= $this->getHtml('Defaults'); ?></label>

View File

@ -23,7 +23,7 @@
"load": [
{
"pid": [
"/backend/admin"
"/admin"
],
"type": 4,
"for": "Content",
@ -32,7 +32,7 @@
},
{
"pid": [
"/backend"
"/"
],
"type": 5,
"from": "Admin",
@ -41,7 +41,7 @@
},
{
"pid": [
"/backend/admin"
"/admin"
],
"type": 5,
"for": "Content",