Make app,localization in url optional+tld+subdomain

This commit is contained in:
Dennis Eichhorn 2019-03-09 23:21:29 +01:00
parent efb353ea38
commit ac3c2a8c16
4 changed files with 16 additions and 16 deletions

View File

@ -1,11 +1,11 @@
[ [
{ {
"id": 1000706001, "id": 1000706001,
"pid": "/backend", "pid": "/",
"type": 2, "type": 2,
"subtype": 1, "subtype": 1,
"name": "Monitoring", "name": "Monitoring",
"uri": "{/lang}/backend/admin/monitoring/general?{?}", "uri": "{/prefix}admin/monitoring/general?{?}",
"target": "self", "target": "self",
"icon": null, "icon": null,
"order": 50, "order": 50,
@ -15,11 +15,11 @@
"children": [ "children": [
{ {
"id": 1000706101, "id": 1000706101,
"pid": "/backend/admin/monitoring", "pid": "/admin/monitoring",
"type": 3, "type": 3,
"subtype": 1, "subtype": 1,
"name": "Dashboard", "name": "Dashboard",
"uri": "{/lang}/backend/admin/monitoring/general?{?}", "uri": "{/prefix}admin/monitoring/general?{?}",
"target": "self", "target": "self",
"icon": null, "icon": null,
"order": 1, "order": 1,
@ -30,11 +30,11 @@
}, },
{ {
"id": 1000706102, "id": 1000706102,
"pid": "/backend/admin/monitoring", "pid": "/admin/monitoring",
"type": 3, "type": 3,
"subtype": 1, "subtype": 1,
"name": "Logs", "name": "Logs",
"uri": "{/lang}/backend/admin/monitoring/log/list?{?}", "uri": "{/prefix}admin/monitoring/log/list?{?}",
"target": "self", "target": "self",
"icon": null, "icon": null,
"order": 5, "order": 5,
@ -45,11 +45,11 @@
}, },
{ {
"id": 1000706103, "id": 1000706103,
"pid": "/backend/admin/monitoring", "pid": "/admin/monitoring",
"type": 3, "type": 3,
"subtype": 1, "subtype": 1,
"name": "Security", "name": "Security",
"uri": "{/lang}/backend/admin/monitoring/security/dashboard?{?}", "uri": "{/prefix}admin/monitoring/security/dashboard?{?}",
"target": "self", "target": "self",
"icon": null, "icon": null,
"order": 5, "order": 5,

View File

@ -6,7 +6,7 @@ use phpOMS\Account\PermissionType;
use phpOMS\Router\RouteVerb; use phpOMS\Router\RouteVerb;
return [ return [
'^.*/backend/admin/monitoring/general.*$' => [ '^.*/admin/monitoring/general.*$' => [
[ [
'dest' => '\Modules\Monitoring\Controller\BackendController:viewMonitoringGeneral', 'dest' => '\Modules\Monitoring\Controller\BackendController:viewMonitoringGeneral',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
@ -17,7 +17,7 @@ return [
], ],
], ],
], ],
'^.*/backend/admin/monitoring/log/list.*$' => [ '^.*/admin/monitoring/log/list.*$' => [
[ [
'dest' => '\Modules\Monitoring\Controller\BackendController:viewMonitoringLogList', 'dest' => '\Modules\Monitoring\Controller\BackendController:viewMonitoringLogList',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
@ -28,7 +28,7 @@ return [
], ],
], ],
], ],
'^.*/backend/admin/monitoring/log/single.*$' => [ '^.*/admin/monitoring/log/single.*$' => [
[ [
'dest' => '\Modules\Monitoring\Controller\BackendController:viewMonitoringLogEntry', 'dest' => '\Modules\Monitoring\Controller\BackendController:viewMonitoringLogEntry',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
@ -39,7 +39,7 @@ return [
], ],
], ],
], ],
'^.*/backend/admin/monitoring/security/dashboard.*$' => [ '^.*/admin/monitoring/security/dashboard.*$' => [
[ [
'dest' => '\Modules\Monitoring\Controller\BackendController:viewMonitoringSecurityDashboard', 'dest' => '\Modules\Monitoring\Controller\BackendController:viewMonitoringSecurityDashboard',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
@ -50,7 +50,7 @@ return [
], ],
], ],
], ],
'^.*/backend/admin/monitoring/security/file/list.*$' => [ '^.*/admin/monitoring/security/file/list.*$' => [
[ [
'dest' => '\Modules\Monitoring\Controller\BackendController:viewMonitoringSecurityFileList', 'dest' => '\Modules\Monitoring\Controller\BackendController:viewMonitoringSecurityFileList',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,

View File

@ -32,7 +32,7 @@ echo $this->getData('nav')->render(); ?>
<td colspan="5"> <td colspan="5">
<tbody> <tbody>
<?php foreach ($logs as $key => $value) : <?php foreach ($logs as $key => $value) :
$url = \phpOMS\Uri\UriFactory::build('{/lang}/backend/admin/monitoring/logs/single?{?}&id=' . $key);?> $url = \phpOMS\Uri\UriFactory::build('{/prefix}admin/monitoring/logs/single?{?}&id=' . $key);?>
<tr> <tr>
<td><a href=<?= $this->printHtml($url); ?>><i class="fa fa-clock-o"></i> <?= $this->printHtml($value[0] ?? ''); ?></a> <td><a href=<?= $this->printHtml($url); ?>><i class="fa fa-clock-o"></i> <?= $this->printHtml($value[0] ?? ''); ?></a>
<td><a href=<?= $this->printHtml($url); ?>><i class="fa fa-<?= $this->printHtml(\in_array($value[1], ['notice', 'info', 'debug']) ? 'info-circle' : 'warning'); ?>"></i> <?= $this->printHtml($value[1] ?? ''); ?></a> <td><a href=<?= $this->printHtml($url); ?>><i class="fa fa-<?= $this->printHtml(\in_array($value[1], ['notice', 'info', 'debug']) ? 'info-circle' : 'warning'); ?>"></i> <?= $this->printHtml($value[1] ?? ''); ?></a>

View File

@ -25,7 +25,7 @@
"load": [ "load": [
{ {
"pid": [ "pid": [
"/backend" "/"
], ],
"type": 5, "type": 5,
"from": "Monitoring", "from": "Monitoring",
@ -34,7 +34,7 @@
}, },
{ {
"pid": [ "pid": [
"/backend/admin/monitoring" "/admin/monitoring"
], ],
"type": 4, "type": 4,
"for": "Content", "for": "Content",