Make app,localization in url optional+tld+subdomain

2026-01-11 13:28:40 +00:00 · 2019-03-09 23:21:29 +01:00 · 2019-03-09 23:21:29 +01:00 · fe32673d7b
commit fe32673d7b
parent 6b52c31784
8 changed files with 42 additions and 42 deletions
--- a/Admin/Install/Navigation.install.json
+++ b/Admin/Install/Navigation.install.json
@ -1,7 +1,7 @@
 [
    {
        "id": 1002601001,
-        "pid": "/backend",
+        "pid": "/",
        "type": 2,
        "subtype": 0,
        "name": "Accounting",
@ -15,11 +15,11 @@
        "children": [
            {
                "id": 1002602001,
-                "pid": "/backend",
+                "pid": "/",
                "type": 2,
                "subtype": 1,
                "name": "Accounts",
-                "uri": "{/lang}/backend/accounting/gl/list?{?}",
+                "uri": "{/prefix}accounting/gl/list?{?}",
                "target": "self",
                "icon": null,
                "order": 5,
@ -29,11 +29,11 @@
                "children": [
                    {
                        "id": 1002602101,
-                        "pid": "/backend/accounting",
+                        "pid": "/accounting",
                        "type": 3,
                        "subtype": 1,
                        "name": "List",
-                        "uri": "{/lang}/backend/accounting/gl/list?{?}",
+                        "uri": "{/prefix}accounting/gl/list?{?}",
                        "target": "self",
                        "icon": null,
                        "order": 1,
@ -44,11 +44,11 @@
                    },
                    {
                        "id": 1002602201,
-                        "pid": "/backend/accounting",
+                        "pid": "/accounting",
                        "type": 3,
                        "subtype": 1,
                        "name": "Create",
-                        "uri": "{/lang}/backend/accounting/gl/create?{?}",
+                        "uri": "{/prefix}accounting/gl/create?{?}",
                        "target": "self",
                        "icon": null,
                        "order": 5,
@ -61,11 +61,11 @@
            },
            {
                "id": 1002605001,
-                "pid": "/backend",
+                "pid": "/",
                "type": 2,
                "subtype": 1,
                "name": "BatchPostings",
-                "uri": "{/lang}/backend/accounting/stack/list?{?}",
+                "uri": "{/prefix}accounting/stack/list?{?}",
                "target": "self",
                "icon": null,
                "order": 10,
@ -75,11 +75,11 @@
                "children": [
                    {
                        "id": 1002605101,
-                        "pid": "/backend",
+                        "pid": "/",
                        "type": 3,
                        "subtype": 1,
                        "name": "List",
-                        "uri": "{/lang}/backend/accounting/stack/list?{?}",
+                        "uri": "{/prefix}accounting/stack/list?{?}",
                        "target": "self",
                        "icon": null,
                        "order": 5,
@ -90,11 +90,11 @@
                    },
                    {
                        "id": 1002605201,
-                        "pid": "/backend",
+                        "pid": "/",
                        "type": 3,
                        "subtype": 1,
                        "name": "Archive",
-                        "uri": "{/lang}/backend/accounting/stack/archive/list?{?}",
+                        "uri": "{/prefix}accounting/stack/archive/list?{?}",
                        "target": "self",
                        "icon": null,
                        "order": 10,
@ -105,11 +105,11 @@
                    },
                    {
                        "id": 1002605301,
-                        "pid": "/backend",
+                        "pid": "/",
                        "type": 3,
                        "subtype": 1,
                        "name": "Predefined",
-                        "uri": "{/lang}/backend/accounting/stack/predefined/list?{?}",
+                        "uri": "{/prefix}accounting/stack/predefined/list?{?}",
                        "target": "self",
                        "icon": null,
                        "order": 10,
@ -120,11 +120,11 @@
                    },
                    {
                        "id": 1002605401,
-                        "pid": "/backend",
+                        "pid": "/",
                        "type": 3,
                        "subtype": 1,
                        "name": "Create",
-                        "uri": "{/lang}/backend/accounting/stack/create?{?}",
+                        "uri": "{/prefix}accounting/stack/create?{?}",
                        "target": "self",
                        "icon": null,
                        "order": 15,
@ -137,11 +137,11 @@
            },
            {
                "id": 1002606001,
-                "pid": "/backend",
+                "pid": "/",
                "type": 2,
                "subtype": 1,
                "name": "Entries",
-                "uri": "{/lang}/backend/accounting/entries/dashboard?{?}",
+                "uri": "{/prefix}accounting/entries/dashboard?{?}",
                "target": "self",
                "icon": null,
                "order": 1,
--- a/Admin/Routes/Web/Backend.php
+++ b/Admin/Routes/Web/Backend.php
@ -6,7 +6,7 @@ use phpOMS\Account\PermissionType;
 use phpOMS\Router\RouteVerb;

 return [
-    '^.*/backend/accounting/personal/entries.*$' => [
+    '^.*/accounting/personal/entries.*$' => [
        [
            'dest' => '\Modules\Accounting\Controller\BackendController:viewPersonalEntries',
            'verb' => RouteVerb::GET,
@ -17,7 +17,7 @@ return [
            ],
        ],
    ],
-    '^.*/backend/accounting/impersonal/entries.*$' => [
+    '^.*/accounting/impersonal/entries.*$' => [
        [
            'dest' => '\Modules\Accounting\Controller\BackendController:viewImpersonalEntries',
            'verb' => RouteVerb::GET,
@ -28,7 +28,7 @@ return [
            ],
        ],
    ],
-    '^.*/backend/accounting/entries.*$' => [
+    '^.*/accounting/entries.*$' => [
        [
            'dest' => '\Modules\Accounting\Controller\BackendController:viewEntries',
            'verb' => RouteVerb::GET,
@ -39,7 +39,7 @@ return [
            ],
        ],
    ],
-    '^.*/backend/accounting/impersonal/journal/list.*$' => [
+    '^.*/accounting/impersonal/journal/list.*$' => [
        [
            'dest' => '\Modules\Accounting\Controller\BackendController:viewJournalList',
            'verb' => RouteVerb::GET,
@ -50,7 +50,7 @@ return [
            ],
        ],
    ],
-    '^.*/backend/accounting/stack/list.*$' => [
+    '^.*/accounting/stack/list.*$' => [
        [
            'dest' => '\Modules\Accounting\Controller\BackendController:viewStackList',
            'verb' => RouteVerb::GET,
@ -61,7 +61,7 @@ return [
            ],
        ],
    ],
-    '^.*/backend/accounting/stack/entries.*$' => [
+    '^.*/accounting/stack/entries.*$' => [
        [
            'dest' => '\Modules\Accounting\Controller\BackendController:viewStackEntries',
            'verb' => RouteVerb::GET,
@ -72,7 +72,7 @@ return [
            ],
        ],
    ],
-    '^.*/backend/accounting/stack/archive/list.*$' => [
+    '^.*/accounting/stack/archive/list.*$' => [
        [
            'dest' => '\Modules\Accounting\Controller\BackendController:viewStackArchiveList',
            'verb' => RouteVerb::GET,
@ -83,7 +83,7 @@ return [
            ],
        ],
    ],
-    '^.*/backend/accounting/stack/create.*$' => [
+    '^.*/accounting/stack/create.*$' => [
        [
            'dest' => '\Modules\Accounting\Controller\BackendController:viewStackCreate',
            'verb' => RouteVerb::GET,
@ -94,7 +94,7 @@ return [
            ],
        ],
    ],
-    '^.*/backend/accounting/stack/predefined/list.*$' => [
+    '^.*/accounting/stack/predefined/list.*$' => [
        [
            'dest' => '\Modules\Accounting\Controller\BackendController:viewStackPredefinedList',
            'verb' => RouteVerb::GET,
@ -105,7 +105,7 @@ return [
            ],
        ],
    ],
-    '^.*/backend/accounting/gl/list.*$' => [
+    '^.*/accounting/gl/list.*$' => [
        [
            'dest' => '\Modules\Accounting\Controller\BackendController:viewGLList',
            'verb' => RouteVerb::GET,
@ -116,7 +116,7 @@ return [
            ],
        ],
    ],
-    '^.*/backend/accounting/gl/create.*$' => [
+    '^.*/accounting/gl/create.*$' => [
        [
            'dest' => '\Modules\Accounting\Controller\BackendController:viewGLCreate',
            'verb' => RouteVerb::GET,
@ -127,7 +127,7 @@ return [
            ],
        ],
    ],
-    '^.*/backend/accounting/gl/profile.*$' => [
+    '^.*/accounting/gl/profile.*$' => [
        [
            'dest' => '\Modules\Accounting\Controller\BackendController:viewGLProfile',
            'verb' => RouteVerb::GET,
@ -138,7 +138,7 @@ return [
            ],
        ],
    ],
-    '^.*/api/accounting/dun/print.*$' => [
+    '^.*/accounting/dun/print.*$' => [
        [
            'dest' => '\Modules\Accounting\Controller\BackendController:viewCostCenterProfile',
            'verb' => RouteVerb::GET,
@ -149,7 +149,7 @@ return [
            ],
        ],
    ],
-    '^.*/api/accounting/statement/print.*$' => [
+    '^.*/accounting/statement/print.*$' => [
        [
            'dest' => '\Modules\Accounting\Controller\BackendController:viewCostCenterProfile',
            'verb' => RouteVerb::GET,
@ -160,7 +160,7 @@ return [
            ],
        ],
    ],
-    '^.*/api/accounting/balances/print.*$' => [
+    '^.*/accounting/balances/print.*$' => [
        [
            'dest' => '\Modules\Accounting\Controller\BackendController:viewCostCenterProfile',
            'verb' => RouteVerb::GET,
@ -171,7 +171,7 @@ return [
            ],
        ],
    ],
-    '^.*/api/accounting/accountform/print.*$' => [
+    '^.*/accounting/accountform/print.*$' => [
        [
            'dest' => '\Modules\Accounting\Controller\BackendController:viewCostCenterProfile',
            'verb' => RouteVerb::GET,
--- a/Theme/Backend/gl-list.tpl.php
+++ b/Theme/Backend/gl-list.tpl.php
@ -36,7 +36,7 @@ echo $this->getData('nav')->render(); ?>
                <tr><td colspan="5">
                <tbody>
                <?php $c = 0; foreach ([] 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>
                    <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
                    <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getName()); ?></a>
--- a/Theme/Backend/journal-list.tpl.php
+++ b/Theme/Backend/journal-list.tpl.php
@ -34,7 +34,7 @@ echo $this->getData('nav')->render(); ?>
        <tr><td colspan="5">
        <tbody>
        <?php $c = 0; foreach ([] 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>
            <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
            <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getName()); ?></a>
--- a/Theme/Backend/stack-archive-list.tpl.php
+++ b/Theme/Backend/stack-archive-list.tpl.php
@ -36,7 +36,7 @@ echo $this->getData('nav')->render(); ?>
        <tr><td colspan="5">
        <tbody>
        <?php $c = 0; foreach ([] 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>
            <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
            <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getName()); ?></a>
--- a/Theme/Backend/stack-list.tpl.php
+++ b/Theme/Backend/stack-list.tpl.php
@ -38,7 +38,7 @@ echo $this->getData('nav')->render(); ?>
                <tr><td colspan="5">
                <tbody>
                <?php $c = 0; foreach ([] 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>
                    <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
                    <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getName()); ?></a>
--- a/Theme/Backend/stack-predefined-list.tpl.php
+++ b/Theme/Backend/stack-predefined-list.tpl.php
@ -37,7 +37,7 @@ echo $this->getData('nav')->render(); ?>
        <tr><td colspan="5">
        <tbody>
        <?php $c = 0; foreach ([] 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>
            <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
            <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getName()); ?></a>
--- a/info.json
+++ b/info.json
@ -25,7 +25,7 @@
    "load": [
        {
            "pid": [
-                "/backend/accounting"
+                "/accounting"
            ],
            "type": 4,
            "for": "Content",
@ -34,7 +34,7 @@
        },
        {
            "pid": [
-                "/backend"
+                "/"
            ],
            "type": 5,
            "from": "Accounting",