From 76ee816566e6a16f6bc3bfeab47b236ede5ec274 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Fri, 24 Mar 2023 16:20:25 +0100
Subject: [PATCH] registration fixes

---
 .../Install/Application/Shop/Application.php  | 12 ++---
 .../Shop/Controller/AppController.php         |  4 +-
 Admin/Install/Application/Shop/ShopView.php   |  4 +-
 .../Shop/Themes/Default/tpl/footer.tpl.php    |  8 ++--
 .../Shop/Themes/Default/tpl/front.tpl.php     |  2 +-
 .../Shop/Themes/Default/tpl/header.tpl.php    |  6 +--
 .../Shop/Themes/Default/tpl/imprint.tpl.php   |  2 +-
 .../Shop/Themes/Default/tpl/privacy.tpl.php   |  2 +-
 .../Shop/Themes/Default/tpl/terms.tpl.php     |  2 +-
 Admin/Install/Application/Shop/index.tpl.php  |  4 +-
 .../Install/Application/Shop/lang/en.lang.php |  2 +-
 Admin/Install/CMS.php                         |  4 +-
 Admin/Install/Navigation.install.json         | 12 ++---
 Admin/Install/Navigation.php                  |  4 +-
 Admin/Installer.php                           |  4 +-
 Admin/Routes/Web/Api.php                      |  2 +-
 Admin/Routes/Web/Backend.php                  |  2 +-
 Admin/Settings/Theme/Backend/settings.tpl.php |  2 +-
 Admin/Status.php                              |  4 +-
 Admin/Uninstaller.php                         |  4 +-
 Admin/Updater.php                             |  4 +-
 Controller/ApiController.php                  | 48 +++++++++----------
 Controller/BackendController.php              | 12 ++---
 Controller/Controller.php                     |  4 +-
 Models/AttributeValueType.php                 |  4 +-
 Models/NullSupportApp.php                     |  4 +-
 Models/NullTicket.php                         |  4 +-
 Models/NullTicketAttribute.php                |  4 +-
 Models/NullTicketAttributeType.php            |  4 +-
 Models/NullTicketAttributeValue.php           |  4 +-
 Models/NullTicketElement.php                  |  4 +-
 Models/PermissionCategory.php                 |  4 +-
 Models/SupportApp.php                         |  4 +-
 Models/SupportAppMapper.php                   |  4 +-
 Models/SupportStatus.php                      |  4 +-
 Models/Ticket.php                             |  4 +-
 Models/TicketAttribute.php                    |  4 +-
 Models/TicketAttributeMapper.php              |  4 +-
 Models/TicketAttributeType.php                |  6 +--
 Models/TicketAttributeTypeL11nMapper.php      |  4 +-
 Models/TicketAttributeTypeMapper.php          |  4 +-
 Models/TicketAttributeValue.php               |  6 +--
 Models/TicketAttributeValueL11nMapper.php     |  4 +-
 Models/TicketAttributeValueMapper.php         |  4 +-
 Models/TicketElement.php                      |  4 +-
 Models/TicketElementMapper.php                |  4 +-
 Models/TicketMapper.php                       |  4 +-
 Theme/Backend/Lang/Navigation.ar.lang.php     |  2 +-
 Theme/Backend/Lang/Navigation.cs.lang.php     |  2 +-
 Theme/Backend/Lang/Navigation.da.lang.php     |  2 +-
 Theme/Backend/Lang/Navigation.de.lang.php     |  2 +-
 Theme/Backend/Lang/Navigation.el.lang.php     |  2 +-
 Theme/Backend/Lang/Navigation.en.lang.php     |  2 +-
 Theme/Backend/Lang/Navigation.es.lang.php     |  2 +-
 Theme/Backend/Lang/Navigation.fi.lang.php     |  2 +-
 Theme/Backend/Lang/Navigation.fr.lang.php     |  2 +-
 Theme/Backend/Lang/Navigation.hu.lang.php     |  2 +-
 Theme/Backend/Lang/Navigation.it.lang.php     |  2 +-
 Theme/Backend/Lang/Navigation.ja.lang.php     |  2 +-
 Theme/Backend/Lang/Navigation.ko.lang.php     |  2 +-
 Theme/Backend/Lang/Navigation.no.lang.php     |  2 +-
 Theme/Backend/Lang/Navigation.pl.lang.php     |  2 +-
 Theme/Backend/Lang/Navigation.pt.lang.php     |  2 +-
 Theme/Backend/Lang/Navigation.ru.lang.php     |  2 +-
 Theme/Backend/Lang/Navigation.sv.lang.php     |  2 +-
 Theme/Backend/Lang/Navigation.th.lang.php     |  2 +-
 Theme/Backend/Lang/Navigation.tr.lang.php     |  2 +-
 Theme/Backend/Lang/Navigation.uk.lang.php     |  2 +-
 Theme/Backend/Lang/Navigation.zh.lang.php     |  2 +-
 Theme/Backend/Lang/ar.lang.php                |  2 +-
 Theme/Backend/Lang/cs.lang.php                |  2 +-
 Theme/Backend/Lang/da.lang.php                |  2 +-
 Theme/Backend/Lang/de.lang.php                |  2 +-
 Theme/Backend/Lang/el.lang.php                |  2 +-
 Theme/Backend/Lang/en.lang.php                |  2 +-
 Theme/Backend/Lang/es.lang.php                |  2 +-
 Theme/Backend/Lang/fi.lang.php                |  2 +-
 Theme/Backend/Lang/fr.lang.php                |  2 +-
 Theme/Backend/Lang/hu.lang.php                |  2 +-
 Theme/Backend/Lang/it.lang.php                |  2 +-
 Theme/Backend/Lang/ja.lang.php                |  2 +-
 Theme/Backend/Lang/ko.lang.php                |  2 +-
 Theme/Backend/Lang/no.lang.php                |  2 +-
 Theme/Backend/Lang/pl.lang.php                |  2 +-
 Theme/Backend/Lang/pt.lang.php                |  2 +-
 Theme/Backend/Lang/ru.lang.php                |  2 +-
 Theme/Backend/Lang/sv.lang.php                |  2 +-
 Theme/Backend/Lang/th.lang.php                |  2 +-
 Theme/Backend/Lang/tr.lang.php                |  2 +-
 Theme/Backend/Lang/uk.lang.php                |  2 +-
 Theme/Backend/Lang/zh.lang.php                |  2 +-
 Theme/Backend/support-list.tpl.php            |  8 ++--
 Theme/Backend/support-ticket.tpl.php          | 10 ++--
 Theme/Backend/ticket-create.tpl.php           |  2 +-
 Views/TicketView.php                          |  8 ++--
 tests/Admin/AdminTest.php                     |  2 +-
 tests/Autoloader.php                          |  4 +-
 .../Api/ApiControllerAttributeTrait.php       |  2 +-
 .../Api/ApiControllerTicketTrait.php          |  2 +-
 tests/Controller/ApiControllerTest.php        |  2 +-
 tests/Models/NullSupportAppTest.php           |  2 +-
 tests/Models/NullTicketAttributeTest.php      |  2 +-
 tests/Models/NullTicketAttributeTypeTest.php  |  2 +-
 tests/Models/NullTicketAttributeValueTest.php |  2 +-
 tests/Models/NullTicketElementTest.php        |  2 +-
 tests/Models/NullTicketTest.php               |  2 +-
 tests/Models/SupportAppTest.php               |  2 +-
 tests/Models/TicketAttributeTest.php          |  2 +-
 tests/Models/TicketAttributeTypeTest.php      |  2 +-
 tests/Models/TicketAttributeValueTest.php     |  2 +-
 tests/Models/TicketElementTest.php            |  2 +-
 tests/Models/TicketTest.php                   |  2 +-
 tests/Views/TicketViewTest.php                |  2 +-
 113 files changed, 202 insertions(+), 202 deletions(-)

diff --git a/Admin/Install/Application/Shop/Application.php b/Admin/Install/Application/Shop/Application.php
index fd9d452..896cf49 100755
--- a/Admin/Install/Application/Shop/Application.php
+++ b/Admin/Install/Application/Shop/Application.php
@@ -6,7 +6,7 @@
  *
  * @package   Web\{APPNAME}
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -50,7 +50,7 @@ use Web\{APPNAME}\ShopView;
  * Application class.
  *
  * @package Web\{APPNAME}
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  * @codeCoverageIgnore
@@ -101,7 +101,7 @@ final class Application
      */
     public function run(HttpRequest $request, HttpResponse $response) : void
     {
-        $this->app->l11nManager    = new L11nManager($this->app->appName);
+        $this->app->l11nManager    = new L11nManager();
         $this->app->dbPool         = new DatabasePool();
         $this->app->sessionManager = new HttpSession(36000);
         $this->app->cookieJar      = new CookieJar();
@@ -126,8 +126,8 @@ final class Application
         );
 
         /* CSRF token OK? */
-        if ($request->getData('CSRF') !== null
-            && !\hash_equals($this->app->sessionManager->get('CSRF'), $request->getData('CSRF'))
+        if ($request->hasData('CSRF')
+            && !\hash_equals($this->app->sessionManager->get('CSRF'), $request->getDataString('CSRF'))
         ) {
             $response->header->status = RequestStatusCode::R_403;
 
@@ -210,7 +210,7 @@ final class Application
         $dispatched = $this->app->dispatcher->dispatch(
             $this->app->router->route(
                 $request->uri->getRoute(),
-                $request->getData('CSRF'),
+                $request->getDataString('CSRF'),
                 $request->getRouteVerb(),
                 $this->app->appName,
                 $this->app->unitId,
diff --git a/Admin/Install/Application/Shop/Controller/AppController.php b/Admin/Install/Application/Shop/Controller/AppController.php
index 66243a4..bf478e8 100755
--- a/Admin/Install/Application/Shop/Controller/AppController.php
+++ b/Admin/Install/Application/Shop/Controller/AppController.php
@@ -6,7 +6,7 @@
  *
  * @package   Web\{APPNAME}
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -24,7 +24,7 @@ use phpOMS\Views\View;
  * Calendar controller class.
  *
  * @package Web\{APPNAME}
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Admin/Install/Application/Shop/ShopView.php b/Admin/Install/Application/Shop/ShopView.php
index 5b19e83..5761713 100755
--- a/Admin/Install/Application/Shop/ShopView.php
+++ b/Admin/Install/Application/Shop/ShopView.php
@@ -6,7 +6,7 @@
  *
  * @package   Web\{APPNAME}
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -23,7 +23,7 @@ use phpOMS\Views\View;
  * List view.
  *
  * @package Web\{APPNAME}
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Admin/Install/Application/Shop/Themes/Default/tpl/footer.tpl.php b/Admin/Install/Application/Shop/Themes/Default/tpl/footer.tpl.php
index c537444..66e6d47 100755
--- a/Admin/Install/Application/Shop/Themes/Default/tpl/footer.tpl.php
+++ b/Admin/Install/Application/Shop/Themes/Default/tpl/footer.tpl.php
@@ -6,7 +6,7 @@
  *
  * @package   Template
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -19,9 +19,9 @@ use phpOMS\Uri\UriFactory;
     <div class="floater">
         <hr>
         <ul>
-            <li><a href="<?= UriFactory::build('{/lang}/{/app}/{/app}/terms'); ?>">Terms</a>
-            <li><a href="<?= UriFactory::build('{/lang}/{/app}/{/app}/privacy'); ?>">Data Protection</a>
-            <li><a href="<?= UriFactory::build('{/lang}/{/app}/{/app}/imprint'); ?>">Imprint</a>
+            <li><a href="<?= UriFactory::build('{/base}/{/app}/terms'); ?>">Terms</a>
+            <li><a href="<?= UriFactory::build('{/base}/{/app}/privacy'); ?>">Data Protection</a>
+            <li><a href="<?= UriFactory::build('{/base}/{/app}/imprint'); ?>">Imprint</a>
         </ul>
     </div>
 </footer>
\ No newline at end of file
diff --git a/Admin/Install/Application/Shop/Themes/Default/tpl/front.tpl.php b/Admin/Install/Application/Shop/Themes/Default/tpl/front.tpl.php
index 3a8c873..6d10c1d 100755
--- a/Admin/Install/Application/Shop/Themes/Default/tpl/front.tpl.php
+++ b/Admin/Install/Application/Shop/Themes/Default/tpl/front.tpl.php
@@ -6,7 +6,7 @@
  *
  * @package   Web\{APPNAME}
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Admin/Install/Application/Shop/Themes/Default/tpl/header.tpl.php b/Admin/Install/Application/Shop/Themes/Default/tpl/header.tpl.php
index 42be184..7d00528 100755
--- a/Admin/Install/Application/Shop/Themes/Default/tpl/header.tpl.php
+++ b/Admin/Install/Application/Shop/Themes/Default/tpl/header.tpl.php
@@ -6,7 +6,7 @@
  *
  * @package   Web\{APPNAME}
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -18,8 +18,8 @@ use phpOMS\Uri\UriFactory;
 <header>
     <nav>
        <ul>
-          <li><a href="<?= UriFactory::build('{/lang}/{/app}/{/app}'); ?>">Website</a>
-          <li><a href="<?= UriFactory::build('{/lang}/{/app}/{/app}/components'); ?>">Profile</a>
+          <li><a href="<?= UriFactory::build('{/base}/{/app}'); ?>">Website</a>
+          <li><a href="<?= UriFactory::build('{/base}/{/app}/components'); ?>">Profile</a>
        </ul>
     </nav>
     <div id="search">
diff --git a/Admin/Install/Application/Shop/Themes/Default/tpl/imprint.tpl.php b/Admin/Install/Application/Shop/Themes/Default/tpl/imprint.tpl.php
index a91d924..196d2ca 100755
--- a/Admin/Install/Application/Shop/Themes/Default/tpl/imprint.tpl.php
+++ b/Admin/Install/Application/Shop/Themes/Default/tpl/imprint.tpl.php
@@ -6,7 +6,7 @@
  *
  * @package   Web\{APPNAME}
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Admin/Install/Application/Shop/Themes/Default/tpl/privacy.tpl.php b/Admin/Install/Application/Shop/Themes/Default/tpl/privacy.tpl.php
index eb14b99..b40c121 100755
--- a/Admin/Install/Application/Shop/Themes/Default/tpl/privacy.tpl.php
+++ b/Admin/Install/Application/Shop/Themes/Default/tpl/privacy.tpl.php
@@ -6,7 +6,7 @@
  *
  * @package   Web\{APPNAME}
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Admin/Install/Application/Shop/Themes/Default/tpl/terms.tpl.php b/Admin/Install/Application/Shop/Themes/Default/tpl/terms.tpl.php
index a6e6d06..08b545a 100755
--- a/Admin/Install/Application/Shop/Themes/Default/tpl/terms.tpl.php
+++ b/Admin/Install/Application/Shop/Themes/Default/tpl/terms.tpl.php
@@ -6,7 +6,7 @@
  *
  * @package   Web\{APPNAME}
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Admin/Install/Application/Shop/index.tpl.php b/Admin/Install/Application/Shop/index.tpl.php
index bda9bae..6e064d3 100755
--- a/Admin/Install/Application/Shop/index.tpl.php
+++ b/Admin/Install/Application/Shop/index.tpl.php
@@ -6,7 +6,7 @@
  *
  * @package   Web\{APPNAME}
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  *
  * @link      https://jingga.app
@@ -32,7 +32,7 @@ $dispatch = $this->getData('dispatch') ?? [];
     <meta name="description" content="<?= $this->getHtml(':meta', '0', '0'); ?>">
     <?= $head->render(); ?>
 
-    <base href="<?= UriFactory::build('{/base}'); ?>/">
+    <base href="/">
 
     <link rel="manifest" href="<?= UriFactory::build('Web/{APPNAME}/manifest.json'); ?>">
     <link rel="shortcut icon" href="<?= UriFactory::build('Web/{APPNAME}/img/favicon.ico'); ?>" type="image/x-icon">
diff --git a/Admin/Install/Application/Shop/lang/en.lang.php b/Admin/Install/Application/Shop/lang/en.lang.php
index ae6af8b..8b8c6f1 100755
--- a/Admin/Install/Application/Shop/lang/en.lang.php
+++ b/Admin/Install/Application/Shop/lang/en.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Web\{APPNAME}
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  *
  * @version   1.0.0
  *
diff --git a/Admin/Install/CMS.php b/Admin/Install/CMS.php
index 524db57..428413b 100755
--- a/Admin/Install/CMS.php
+++ b/Admin/Install/CMS.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Shop\Admin\Install
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ use phpOMS\Application\ApplicationAbstract;
  * CMS class.
  *
  * @package Modules\Shop\Admin\Install
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json
index 8b7841c..86e6a18 100755
--- a/Admin/Install/Navigation.install.json
+++ b/Admin/Install/Navigation.install.json
@@ -19,7 +19,7 @@
                 "type": 2,
                 "subtype": 1,
                 "name": "Tickets",
-                "uri": "{/lang}/{/app}/support/list",
+                "uri": "{/base}/support/list",
                 "target": "self",
                 "icon": null,
                 "order": 1,
@@ -33,7 +33,7 @@
                         "type": 3,
                         "subtype": 1,
                         "name": "List",
-                        "uri": "{/lang}/{/app}/support/list",
+                        "uri": "{/base}/support/list",
                         "target": "self",
                         "icon": null,
                         "order": 1,
@@ -49,7 +49,7 @@
                         "type": 3,
                         "subtype": 1,
                         "name": "Create",
-                        "uri": "{/lang}/{/app}/support/create?{?}",
+                        "uri": "{/base}/support/create?{?}",
                         "target": "self",
                         "icon": null,
                         "order": 5,
@@ -67,7 +67,7 @@
                 "type": 2,
                 "subtype": 1,
                 "name": "Settings",
-                "uri": "{/lang}/{/app}/support/settings/dashboard?{?}",
+                "uri": "{/base}/support/settings/dashboard?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 5,
@@ -83,7 +83,7 @@
                 "type": 2,
                 "subtype": 1,
                 "name": "Analysis",
-                "uri": "{/lang}/{/app}/support/analysis/dashboard?{?}",
+                "uri": "{/base}/support/analysis/dashboard?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 10,
@@ -101,7 +101,7 @@
         "type": 2,
         "subtype": 1,
         "name": "Support",
-        "uri": "{/lang}/{/app}/private/support/dashboard?{?}",
+        "uri": "{/base}/private/support/dashboard?{?}",
         "target": "self",
         "icon": null,
         "order": 5,
diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php
index b75ce5b..247012a 100755
--- a/Admin/Install/Navigation.php
+++ b/Admin/Install/Navigation.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Support\Admin\Install
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ use phpOMS\Application\ApplicationAbstract;
  * Navigation class.
  *
  * @package Modules\Support\Admin\Install
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Admin/Installer.php b/Admin/Installer.php
index b553dde..bbf7259 100755
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Support\Admin
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -26,7 +26,7 @@ use phpOMS\Module\ModuleInfo;
  * Installer class.
  *
  * @package Modules\Support\Admin
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php
index 2e5c712..ad219cc 100755
--- a/Admin/Routes/Web/Api.php
+++ b/Admin/Routes/Web/Api.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php
index e9af893..675a1b7 100755
--- a/Admin/Routes/Web/Backend.php
+++ b/Admin/Routes/Web/Backend.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Admin/Settings/Theme/Backend/settings.tpl.php b/Admin/Settings/Theme/Backend/settings.tpl.php
index a430d57..43e881a 100755
--- a/Admin/Settings/Theme/Backend/settings.tpl.php
+++ b/Admin/Settings/Theme/Backend/settings.tpl.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Admin\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Admin/Status.php b/Admin/Status.php
index bcda81f..9e60b9b 100755
--- a/Admin/Status.php
+++ b/Admin/Status.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Support\Admin
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ use phpOMS\Module\StatusAbstract;
  * Status class.
  *
  * @package Modules\Support\Admin
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Admin/Uninstaller.php b/Admin/Uninstaller.php
index b34db2c..0c0137d 100755
--- a/Admin/Uninstaller.php
+++ b/Admin/Uninstaller.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Support\Admin
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ use phpOMS\Module\UninstallerAbstract;
  * Uninstaller class.
  *
  * @package Modules\Support\Admin
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Admin/Updater.php b/Admin/Updater.php
index b0ee167..de9adcd 100755
--- a/Admin/Updater.php
+++ b/Admin/Updater.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Support\Admin
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ use phpOMS\Module\UpdaterAbstract;
  * Updater class.
  *
  * @package Modules\Support\Admin
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index fa67c8d..5f82511 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Support
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -49,7 +49,7 @@ use phpOMS\Model\Message\FormValidation;
  * Api controller for the tickets module.
  *
  * @package Modules\Support
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
@@ -120,9 +120,9 @@ final class ApiController extends Controller
         $task->setType(TaskType::HIDDEN);
 
         $ticket      = new Ticket($task);
-        $ticket->app = new NullSupportApp((int) ($request->getData('app') ?? 1));
+        $ticket->app = new NullSupportApp($request->getDataInt('app') ?? 1);
 
-        if ($request->getData('for') !== null) {
+        if ($request->hasData('for')) {
             $ticket->for = new NullAccount((int) $request->getData('for'));
         }
 
@@ -264,7 +264,7 @@ final class ApiController extends Controller
         $taskElement = $this->app->moduleManager->get('Tasks')->createTaskElementFromRequest($request, $ticket->task);
 
         $ticketElement         = new TicketElement($taskElement);
-        $ticketElement->time   = (int) ($request->getData('time') ?? 0);
+        $ticketElement->time   = $request->getDataInt('time') ?? 0;
         $ticketElement->ticket = $ticket->getId();
 
         return $ticketElement;
@@ -375,8 +375,8 @@ final class ApiController extends Controller
     public function createSupportAppFromRequest(RequestAbstract $request) : SupportApp
     {
         $app       = new SupportApp();
-        $app->name = (string) ($request->getData('name') ?? '');
-        $app->unit = $request->getData('unit', 'int');
+        $app->name = $request->getDataString('name') ?? '';
+        $app->unit = $request->getDataInt('unit');
 
         return $app;
     }
@@ -516,11 +516,11 @@ final class ApiController extends Controller
     private function createTicketAttributeTypeL11nFromRequest(RequestAbstract $request) : BaseStringL11n
     {
         $attrL11n      = new BaseStringL11n();
-        $attrL11n->ref = (int) ($request->getData('type') ?? 0);
-        $attrL11n->setLanguage((string) (
-            $request->getData('language') ?? $request->getLanguage()
-        ));
-        $attrL11n->content = (string) ($request->getData('title') ?? '');
+        $attrL11n->ref = $request->getDataInt('type') ?? 0;
+        $attrL11n->setLanguage(
+            $request->getDataString('language') ?? $request->getLanguage()
+        );
+        $attrL11n->content = $request->getDataString('title') ?? '';
 
         return $attrL11n;
     }
@@ -586,9 +586,9 @@ final class ApiController extends Controller
     private function createTicketAttributeTypeFromRequest(RequestAbstract $request) : TicketAttributeType
     {
         $attrType = new TicketAttributeType();
-        $attrType->setL11n((string) ($request->getData('title') ?? ''), $request->getData('language') ?? ISO639x1Enum::_EN);
-        $attrType->fields = (int) ($request->getData('fields') ?? 0);
-        $attrType->custom = (bool) ($request->getData('custom') ?? false);
+        $attrType->setL11n($request->getDataString('title') ?? '', $request->getDataString('language') ?? ISO639x1Enum::_EN);
+        $attrType->fields = $request->getDataInt('fields') ?? 0;
+        $attrType->custom = $request->getDataBool('custom') ?? false;
 
         return $attrType;
     }
@@ -663,15 +663,15 @@ final class ApiController extends Controller
     {
         /** @var TicketAttributeType $type */
         $type = TicketAttributeTypeMapper::get()
-            ->where('id', (int) ($request->getData('type') ?? 0))
+            ->where('id', $request->getDataInt('type') ?? 0)
             ->execute();
 
         $attrValue            = new TicketAttributeValue();
-        $attrValue->isDefault = (bool) ($request->getData('default') ?? false);
+        $attrValue->isDefault = $request->getDataBool('default') ?? false;
         $attrValue->setValue($request->getData('value'), $type->datatype);
 
-        if ($request->getData('title') !== null) {
-            $attrValue->setL11n($request->getData('title'), $request->getData('language') ?? ISO639x1Enum::_EN);
+        if ($request->hasData('title')) {
+            $attrValue->setL11n($request->getDataString('title') ?? '', $request->getDataString('language') ?? ISO639x1Enum::_EN);
         }
 
         return $attrValue;
@@ -737,11 +737,11 @@ final class ApiController extends Controller
     private function createTicketAttributeValueL11nFromRequest(RequestAbstract $request) : BaseStringL11n
     {
         $attrL11n      = new BaseStringL11n();
-        $attrL11n->ref = (int) ($request->getData('value') ?? 0);
-        $attrL11n->setLanguage((string) (
-            $request->getData('language') ?? $request->getLanguage()
-        ));
-        $attrL11n->content = (string) ($request->getData('title') ?? '');
+        $attrL11n->ref = $request->getDataInt('value') ?? 0;
+        $attrL11n->setLanguage(
+            $request->getDataString('language') ?? $request->getLanguage()
+        );
+        $attrL11n->content = $request->getDataString('title') ?? '';
 
         return $attrL11n;
     }
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 66cb5f6..337f622 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Support
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -29,7 +29,7 @@ use phpOMS\Views\View;
  * Support controller class.
  *
  * @package Modules\Support
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  * @codeCoverageIgnore
@@ -85,11 +85,11 @@ final class BackendController extends Controller
 
         if ($request->getData('ptype') === 'p') {
             $view->setData('tickets',
-                $mapperQuery->where('id', (int) ($request->getData('id') ?? 0), '<')->execute()
+                $mapperQuery->where('id', $request->getDataInt('id') ?? 0, '<')->execute()
             );
         } elseif ($request->getData('ptype') === 'n') {
             $view->setData('tickets',
-                $mapperQuery->where('id', (int) ($request->getData('id') ?? 0), '>')->execute()
+                $mapperQuery->where('id', $request->getDataInt('id') ?? 0, '>')->execute()
             );
         } else {
             $view->setData('tickets',
@@ -134,7 +134,7 @@ final class BackendController extends Controller
             ->where('task/tags/title/language', $request->getLanguage());
 
         /** @var \Modules\Support\Models\Ticket $ticket */
-        $ticket = $request->getData('for') !== null
+        $ticket = $request->hasData('for')
             ? $mapperQuery->where('task', (int) $request->getData('for'))->execute()
             : $mapperQuery->where('id', (int) $request->getData('id'))->execute();
 
@@ -249,7 +249,7 @@ final class BackendController extends Controller
         $view = new View($this->app->l11nManager, $request, $response);
         $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response));
 
-        $id = $request->getData('id') ?? '';
+        $id = $request->getDataString('id') ?? '';
 
         $settings = SettingMapper::getAll()->where('module', $id)->execute();
         if (!($settings instanceof NullSetting)) {
diff --git a/Controller/Controller.php b/Controller/Controller.php
index 30742f0..b8914ab 100755
--- a/Controller/Controller.php
+++ b/Controller/Controller.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Support
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ use phpOMS\Module\ModuleAbstract;
  * Support controller class.
  *
  * @package Modules\Support
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/AttributeValueType.php b/Models/AttributeValueType.php
index a2ca382..bb7b0dd 100755
--- a/Models/AttributeValueType.php
+++ b/Models/AttributeValueType.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Support\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum;
  * Attribute value type enum.
  *
  * @package Modules\Support\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/NullSupportApp.php b/Models/NullSupportApp.php
index 73159da..a805b5a 100755
--- a/Models/NullSupportApp.php
+++ b/Models/NullSupportApp.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Support\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -18,7 +18,7 @@ namespace Modules\Support\Models;
  * Null model class.
  *
  * @package Modules\Support\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/NullTicket.php b/Models/NullTicket.php
index 93c1e71..0a3ef9b 100755
--- a/Models/NullTicket.php
+++ b/Models/NullTicket.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Support\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -18,7 +18,7 @@ namespace Modules\Support\Models;
  * Null model
  *
  * @package Modules\Support\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/NullTicketAttribute.php b/Models/NullTicketAttribute.php
index c4e96b7..65bfb80 100755
--- a/Models/NullTicketAttribute.php
+++ b/Models/NullTicketAttribute.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Support\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -18,7 +18,7 @@ namespace Modules\Support\Models;
  * Null model
  *
  * @package Modules\Support\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/NullTicketAttributeType.php b/Models/NullTicketAttributeType.php
index ace4a21..6a25329 100755
--- a/Models/NullTicketAttributeType.php
+++ b/Models/NullTicketAttributeType.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Support\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -18,7 +18,7 @@ namespace Modules\Support\Models;
  * Null model
  *
  * @package Modules\Support\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/NullTicketAttributeValue.php b/Models/NullTicketAttributeValue.php
index 4dd2173..168b650 100755
--- a/Models/NullTicketAttributeValue.php
+++ b/Models/NullTicketAttributeValue.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Support\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -18,7 +18,7 @@ namespace Modules\Support\Models;
  * Null model
  *
  * @package Modules\Support\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/NullTicketElement.php b/Models/NullTicketElement.php
index 3345fca..2c48e9c 100755
--- a/Models/NullTicketElement.php
+++ b/Models/NullTicketElement.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Support\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -18,7 +18,7 @@ namespace Modules\Support\Models;
  * Null model
  *
  * @package Modules\Support\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/PermissionCategory.php b/Models/PermissionCategory.php
index e21b98a..5148502 100755
--- a/Models/PermissionCategory.php
+++ b/Models/PermissionCategory.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Support\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum;
  * Permision state enum.
  *
  * @package Modules\Support\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/SupportApp.php b/Models/SupportApp.php
index ba6a053..3de2510 100755
--- a/Models/SupportApp.php
+++ b/Models/SupportApp.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Support\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -18,7 +18,7 @@ namespace Modules\Support\Models;
  * Support app class.
  *
  * @package Modules\Support\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/SupportAppMapper.php b/Models/SupportAppMapper.php
index 5ebeb93..1a4db70 100755
--- a/Models/SupportAppMapper.php
+++ b/Models/SupportAppMapper.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Support\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
  * Mapper class.
  *
  * @package Modules\Support\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/SupportStatus.php b/Models/SupportStatus.php
index c13096d..6153aeb 100755
--- a/Models/SupportStatus.php
+++ b/Models/SupportStatus.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Support\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum;
  * Support status enum.
  *
  * @package Modules\Support\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/Ticket.php b/Models/Ticket.php
index 8d45dda..17029d3 100755
--- a/Models/Ticket.php
+++ b/Models/Ticket.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Support\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -22,7 +22,7 @@ use Modules\Tasks\Models\TaskType;
  * Ticket class.
  *
  * @package Modules\Support\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/TicketAttribute.php b/Models/TicketAttribute.php
index 45a3600..3781c0d 100755
--- a/Models/TicketAttribute.php
+++ b/Models/TicketAttribute.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Support\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -18,7 +18,7 @@ namespace Modules\Support\Models;
  * Ticket class.
  *
  * @package Modules\Support\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/TicketAttributeMapper.php b/Models/TicketAttributeMapper.php
index fa99a87..0260712 100755
--- a/Models/TicketAttributeMapper.php
+++ b/Models/TicketAttributeMapper.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Support\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
  * Ticket mapper class.
  *
  * @package Modules\Support\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/TicketAttributeType.php b/Models/TicketAttributeType.php
index 32403d0..3707ecf 100755
--- a/Models/TicketAttributeType.php
+++ b/Models/TicketAttributeType.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Support\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -21,7 +21,7 @@ use phpOMS\Localization\ISO639x1Enum;
  * Ticket Attribute Type class.
  *
  * @package Modules\Support\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
@@ -124,7 +124,7 @@ class TicketAttributeType implements \JsonSerializable
         if ($l11n instanceof BaseStringL11n) {
             $this->l11n = $l11n;
         } elseif (isset($this->l11n) && $this->l11n instanceof BaseStringL11n) {
-            $this->l11n->content  = $l11n;
+            $this->l11n->content = $l11n;
             $this->l11n->setLanguage($lang);
         } else {
             $this->l11n          = new BaseStringL11n();
diff --git a/Models/TicketAttributeTypeL11nMapper.php b/Models/TicketAttributeTypeL11nMapper.php
index 884013c..5d12c93 100755
--- a/Models/TicketAttributeTypeL11nMapper.php
+++ b/Models/TicketAttributeTypeL11nMapper.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Support\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -21,7 +21,7 @@ use phpOMS\Localization\BaseStringL11n;
  * Ticket mapper class.
  *
  * @package Modules\Support\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/TicketAttributeTypeMapper.php b/Models/TicketAttributeTypeMapper.php
index b9f98b3..ed65407 100755
--- a/Models/TicketAttributeTypeMapper.php
+++ b/Models/TicketAttributeTypeMapper.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Support\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
  * Ticket mapper class.
  *
  * @package Modules\Support\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/TicketAttributeValue.php b/Models/TicketAttributeValue.php
index 10dd5e1..f45b4cd 100755
--- a/Models/TicketAttributeValue.php
+++ b/Models/TicketAttributeValue.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Support\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -24,7 +24,7 @@ use phpOMS\Localization\ISO639x1Enum;
  * The relation with the type/supplier is defined in the TicketAttribute class.
  *
  * @package Modules\Support\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
@@ -184,7 +184,7 @@ class TicketAttributeValue implements \JsonSerializable
         if ($l11n instanceof BaseStringL11n) {
             $this->l11n = $l11n;
         } elseif (isset($this->l11n) && $this->l11n instanceof BaseStringL11n) {
-            $this->l11n->content  = $l11n;
+            $this->l11n->content = $l11n;
             $this->l11n->setLanguage($lang);
         } else {
             $this->l11n          = new BaseStringL11n();
diff --git a/Models/TicketAttributeValueL11nMapper.php b/Models/TicketAttributeValueL11nMapper.php
index a777fd1..88f5853 100644
--- a/Models/TicketAttributeValueL11nMapper.php
+++ b/Models/TicketAttributeValueL11nMapper.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Support\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -21,7 +21,7 @@ use phpOMS\Localization\BaseStringL11n;
  * Item mapper class.
  *
  * @package Modules\Support\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/TicketAttributeValueMapper.php b/Models/TicketAttributeValueMapper.php
index 10e95a4..a5ef8aa 100755
--- a/Models/TicketAttributeValueMapper.php
+++ b/Models/TicketAttributeValueMapper.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Support\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
  * Ticket mapper class.
  *
  * @package Modules\Support\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/TicketElement.php b/Models/TicketElement.php
index 7175d53..0429e01 100755
--- a/Models/TicketElement.php
+++ b/Models/TicketElement.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Support\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ use Modules\Tasks\Models\TaskElement;
  * Ticket element class.
  *
  * @package Modules\Support\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/TicketElementMapper.php b/Models/TicketElementMapper.php
index a0311a6..63bcc4e 100755
--- a/Models/TicketElementMapper.php
+++ b/Models/TicketElementMapper.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Support\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -21,7 +21,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
  * Mapper class.
  *
  * @package Modules\Support\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/TicketMapper.php b/Models/TicketMapper.php
index deecf2e..1479810 100755
--- a/Models/TicketMapper.php
+++ b/Models/TicketMapper.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Support\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -22,7 +22,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
  * Mapper class.
  *
  * @package Modules\Support\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Theme/Backend/Lang/Navigation.ar.lang.php b/Theme/Backend/Lang/Navigation.ar.lang.php
index 224653e..76a7b42 100755
--- a/Theme/Backend/Lang/Navigation.ar.lang.php
+++ b/Theme/Backend/Lang/Navigation.ar.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.cs.lang.php b/Theme/Backend/Lang/Navigation.cs.lang.php
index 7d528d7..49e9219 100755
--- a/Theme/Backend/Lang/Navigation.cs.lang.php
+++ b/Theme/Backend/Lang/Navigation.cs.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.da.lang.php b/Theme/Backend/Lang/Navigation.da.lang.php
index a2d4020..08a6d6b 100755
--- a/Theme/Backend/Lang/Navigation.da.lang.php
+++ b/Theme/Backend/Lang/Navigation.da.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.de.lang.php b/Theme/Backend/Lang/Navigation.de.lang.php
index 0fd6a3d..d5eb302 100755
--- a/Theme/Backend/Lang/Navigation.de.lang.php
+++ b/Theme/Backend/Lang/Navigation.de.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.el.lang.php b/Theme/Backend/Lang/Navigation.el.lang.php
index 16eaba5..2549525 100755
--- a/Theme/Backend/Lang/Navigation.el.lang.php
+++ b/Theme/Backend/Lang/Navigation.el.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php
index a6fc49b..915de8a 100755
--- a/Theme/Backend/Lang/Navigation.en.lang.php
+++ b/Theme/Backend/Lang/Navigation.en.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.es.lang.php b/Theme/Backend/Lang/Navigation.es.lang.php
index 9a29fc5..d3462fe 100755
--- a/Theme/Backend/Lang/Navigation.es.lang.php
+++ b/Theme/Backend/Lang/Navigation.es.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.fi.lang.php b/Theme/Backend/Lang/Navigation.fi.lang.php
index 1c9293e..1c5099d 100755
--- a/Theme/Backend/Lang/Navigation.fi.lang.php
+++ b/Theme/Backend/Lang/Navigation.fi.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.fr.lang.php b/Theme/Backend/Lang/Navigation.fr.lang.php
index 16f544f..9ee3771 100755
--- a/Theme/Backend/Lang/Navigation.fr.lang.php
+++ b/Theme/Backend/Lang/Navigation.fr.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.hu.lang.php b/Theme/Backend/Lang/Navigation.hu.lang.php
index ff25ef4..2be5c98 100755
--- a/Theme/Backend/Lang/Navigation.hu.lang.php
+++ b/Theme/Backend/Lang/Navigation.hu.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.it.lang.php b/Theme/Backend/Lang/Navigation.it.lang.php
index 404f6a6..9794cef 100755
--- a/Theme/Backend/Lang/Navigation.it.lang.php
+++ b/Theme/Backend/Lang/Navigation.it.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.ja.lang.php b/Theme/Backend/Lang/Navigation.ja.lang.php
index 0dbb93e..e466f1c 100755
--- a/Theme/Backend/Lang/Navigation.ja.lang.php
+++ b/Theme/Backend/Lang/Navigation.ja.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.ko.lang.php b/Theme/Backend/Lang/Navigation.ko.lang.php
index 31038e2..cfa2161 100755
--- a/Theme/Backend/Lang/Navigation.ko.lang.php
+++ b/Theme/Backend/Lang/Navigation.ko.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.no.lang.php b/Theme/Backend/Lang/Navigation.no.lang.php
index 783e983..6021a8e 100755
--- a/Theme/Backend/Lang/Navigation.no.lang.php
+++ b/Theme/Backend/Lang/Navigation.no.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.pl.lang.php b/Theme/Backend/Lang/Navigation.pl.lang.php
index 877d0cd..7337254 100755
--- a/Theme/Backend/Lang/Navigation.pl.lang.php
+++ b/Theme/Backend/Lang/Navigation.pl.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.pt.lang.php b/Theme/Backend/Lang/Navigation.pt.lang.php
index cfaf2e8..2c3336b 100755
--- a/Theme/Backend/Lang/Navigation.pt.lang.php
+++ b/Theme/Backend/Lang/Navigation.pt.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.ru.lang.php b/Theme/Backend/Lang/Navigation.ru.lang.php
index 0207ca3..239f8fa 100755
--- a/Theme/Backend/Lang/Navigation.ru.lang.php
+++ b/Theme/Backend/Lang/Navigation.ru.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.sv.lang.php b/Theme/Backend/Lang/Navigation.sv.lang.php
index 71add51..a4d93b0 100755
--- a/Theme/Backend/Lang/Navigation.sv.lang.php
+++ b/Theme/Backend/Lang/Navigation.sv.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.th.lang.php b/Theme/Backend/Lang/Navigation.th.lang.php
index e9c7154..5d93aa4 100755
--- a/Theme/Backend/Lang/Navigation.th.lang.php
+++ b/Theme/Backend/Lang/Navigation.th.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.tr.lang.php b/Theme/Backend/Lang/Navigation.tr.lang.php
index bf157f8..e45298b 100755
--- a/Theme/Backend/Lang/Navigation.tr.lang.php
+++ b/Theme/Backend/Lang/Navigation.tr.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.uk.lang.php b/Theme/Backend/Lang/Navigation.uk.lang.php
index 7c980e6..447b3ea 100755
--- a/Theme/Backend/Lang/Navigation.uk.lang.php
+++ b/Theme/Backend/Lang/Navigation.uk.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/Navigation.zh.lang.php b/Theme/Backend/Lang/Navigation.zh.lang.php
index c9df369..50dd6ee 100755
--- a/Theme/Backend/Lang/Navigation.zh.lang.php
+++ b/Theme/Backend/Lang/Navigation.zh.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/ar.lang.php b/Theme/Backend/Lang/ar.lang.php
index 2e8951c..9bdf39e 100755
--- a/Theme/Backend/Lang/ar.lang.php
+++ b/Theme/Backend/Lang/ar.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/cs.lang.php b/Theme/Backend/Lang/cs.lang.php
index 5829e81..4ea0368 100755
--- a/Theme/Backend/Lang/cs.lang.php
+++ b/Theme/Backend/Lang/cs.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/da.lang.php b/Theme/Backend/Lang/da.lang.php
index 3e270eb..17cf073 100755
--- a/Theme/Backend/Lang/da.lang.php
+++ b/Theme/Backend/Lang/da.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php
index b60184f..04a53c7 100755
--- a/Theme/Backend/Lang/de.lang.php
+++ b/Theme/Backend/Lang/de.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/el.lang.php b/Theme/Backend/Lang/el.lang.php
index d9d64bc..4988065 100755
--- a/Theme/Backend/Lang/el.lang.php
+++ b/Theme/Backend/Lang/el.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php
index e8fe237..ca9b8ac 100755
--- a/Theme/Backend/Lang/en.lang.php
+++ b/Theme/Backend/Lang/en.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/es.lang.php b/Theme/Backend/Lang/es.lang.php
index d3dcc1f..e3f0e9c 100755
--- a/Theme/Backend/Lang/es.lang.php
+++ b/Theme/Backend/Lang/es.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/fi.lang.php b/Theme/Backend/Lang/fi.lang.php
index 3b076f4..4e52207 100755
--- a/Theme/Backend/Lang/fi.lang.php
+++ b/Theme/Backend/Lang/fi.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/fr.lang.php b/Theme/Backend/Lang/fr.lang.php
index 69d38d1..aaebc58 100755
--- a/Theme/Backend/Lang/fr.lang.php
+++ b/Theme/Backend/Lang/fr.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/hu.lang.php b/Theme/Backend/Lang/hu.lang.php
index 78ebe08..5010a86 100755
--- a/Theme/Backend/Lang/hu.lang.php
+++ b/Theme/Backend/Lang/hu.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/it.lang.php b/Theme/Backend/Lang/it.lang.php
index 8db40b0..8c9ced3 100755
--- a/Theme/Backend/Lang/it.lang.php
+++ b/Theme/Backend/Lang/it.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/ja.lang.php b/Theme/Backend/Lang/ja.lang.php
index f47ca00..8f0ea7a 100755
--- a/Theme/Backend/Lang/ja.lang.php
+++ b/Theme/Backend/Lang/ja.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/ko.lang.php b/Theme/Backend/Lang/ko.lang.php
index fb1294a..e0f4e91 100755
--- a/Theme/Backend/Lang/ko.lang.php
+++ b/Theme/Backend/Lang/ko.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/no.lang.php b/Theme/Backend/Lang/no.lang.php
index 870c454..ec764d9 100755
--- a/Theme/Backend/Lang/no.lang.php
+++ b/Theme/Backend/Lang/no.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/pl.lang.php b/Theme/Backend/Lang/pl.lang.php
index ed2f249..c6dea31 100755
--- a/Theme/Backend/Lang/pl.lang.php
+++ b/Theme/Backend/Lang/pl.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/pt.lang.php b/Theme/Backend/Lang/pt.lang.php
index 321192b..e288829 100755
--- a/Theme/Backend/Lang/pt.lang.php
+++ b/Theme/Backend/Lang/pt.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/ru.lang.php b/Theme/Backend/Lang/ru.lang.php
index 5bef113..50fc413 100755
--- a/Theme/Backend/Lang/ru.lang.php
+++ b/Theme/Backend/Lang/ru.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/sv.lang.php b/Theme/Backend/Lang/sv.lang.php
index ed05c73..f8cf997 100755
--- a/Theme/Backend/Lang/sv.lang.php
+++ b/Theme/Backend/Lang/sv.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/th.lang.php b/Theme/Backend/Lang/th.lang.php
index 8cb6f96..b24fec8 100755
--- a/Theme/Backend/Lang/th.lang.php
+++ b/Theme/Backend/Lang/th.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/tr.lang.php b/Theme/Backend/Lang/tr.lang.php
index ff798f3..ed0f659 100755
--- a/Theme/Backend/Lang/tr.lang.php
+++ b/Theme/Backend/Lang/tr.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/uk.lang.php b/Theme/Backend/Lang/uk.lang.php
index 2b117cb..dd6e02f 100755
--- a/Theme/Backend/Lang/uk.lang.php
+++ b/Theme/Backend/Lang/uk.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/Lang/zh.lang.php b/Theme/Backend/Lang/zh.lang.php
index 41a596a..176c065 100755
--- a/Theme/Backend/Lang/zh.lang.php
+++ b/Theme/Backend/Lang/zh.lang.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Theme/Backend/support-list.tpl.php b/Theme/Backend/support-list.tpl.php
index ebc566b..5ece8b4 100755
--- a/Theme/Backend/support-list.tpl.php
+++ b/Theme/Backend/support-list.tpl.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Support
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -40,7 +40,7 @@ echo $this->getData('nav')->render(); ?>
                 <?php
                     $c = 0;
                 foreach ($tickets as $key => $ticket) : ++$c;
-                    $url = UriFactory::build('{/lang}/{/app}/support/ticket?{?}&id=' . $ticket->getId());
+                    $url = UriFactory::build('{/base}/support/ticket?{?}&id=' . $ticket->getId());
                 ?>
                     <tr data-href="<?= $url; ?>">
                         <td><a href="<?= $url; ?>">
@@ -49,9 +49,9 @@ echo $this->getData('nav')->render(); ?>
                             </span></a>
                         <td><a href="<?= $url; ?>"><?= $this->getHtml('P' . $ticket->task->getPriority(), 'Tasks'); ?></a>
                         <td><a href="<?= $url; ?>"><?= $this->printHtml($ticket->task->title); ?></a>
-                        <td><a class="content" href="<?= UriFactory::build('{/lang}/{/app}/profile/single?for=' . $ticket->task->createdBy->getId()); ?>"><?= $this->printHtml($ticket->task->createdBy->name1); ?> <?= $this->printHtml($ticket->task->createdBy->name2); ?></a>
+                        <td><a class="content" href="<?= UriFactory::build('{/base}/profile/single?for=' . $ticket->task->createdBy->getId()); ?>"><?= $this->printHtml($ticket->task->createdBy->name1); ?> <?= $this->printHtml($ticket->task->createdBy->name2); ?></a>
                         <td><a class="content" href="<?= $url; ?>"><?= $this->printHtml($ticket->task->createdBy->name1); ?> <?= $this->printHtml($ticket->task->createdBy->name2); ?></a>
-                        <td><a class="content" href="<?= UriFactory::build('{/lang}/{/app}/profile/single?for=' . $ticket->for->getId()); ?>"><?= $this->printHtml($ticket->for->name1); ?> <?= $this->printHtml($ticket->for->name2); ?></a>
+                        <td><a class="content" href="<?= UriFactory::build('{/base}/profile/single?for=' . $ticket->for->getId()); ?>"><?= $this->printHtml($ticket->for->name1); ?> <?= $this->printHtml($ticket->for->name2); ?></a>
                         <td><a href="<?= $url; ?>"><?= $this->printHtml($ticket->task->createdAt->format('Y-m-d H:i')); ?></a>
                 <?php endforeach; if ($c == 0) : ?>
                     <tr><td colspan="7" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
diff --git a/Theme/Backend/support-ticket.tpl.php b/Theme/Backend/support-ticket.tpl.php
index 36a501e..00ef72b 100755
--- a/Theme/Backend/support-ticket.tpl.php
+++ b/Theme/Backend/support-ticket.tpl.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Support
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -88,7 +88,7 @@ echo $this->getData('nav')->render(); ?>
                         <?php if (!empty($taskMedia)) : ?>
                             <div>
                                 <?php foreach ($taskMedia as $media) : ?>
-                                     <span><a class="content" href="<?= UriFactory::build('{/lang}/{/app}/media/single?id=' . $media->getId());?>"><?= $media->name; ?></a></span>
+                                     <span><a class="content" href="<?= UriFactory::build('{/base}/media/single?id=' . $media->getId());?>"><?= $media->name; ?></a></span>
                                 <?php endforeach; ?>
                             </div>
                         <?php endif; ?>
@@ -245,7 +245,7 @@ echo $this->getData('nav')->render(); ?>
                         <?php if (!empty($elementMedia)) : ?>
                             <div>
                                 <?php foreach ($elementMedia as $media) : ?>
-                                     <span><a class="content" href="<?= UriFactory::build('{/lang}/{/app}/media/single?id=' . $media->getId());?>"><?= $media->name; ?></a></span>
+                                     <span><a class="content" href="<?= UriFactory::build('{/base}/media/single?id=' . $media->getId());?>"><?= $media->name; ?></a></span>
                                 <?php endforeach; ?>
                             </div>
                         <?php endif; ?>
@@ -291,10 +291,10 @@ echo $this->getData('nav')->render(); ?>
                     ) : ?>
                     <section class="portlet wf-100">
                         <div class="portlet-body">
-                            <a href="<?= UriFactory::build('{/lang}/{/app}/profile/single?{?}&for=' . $element->taskElement->createdBy->getId()); ?>"><?= $this->printHtml($element->taskElement->createdBy->name1); ?></a> <?= $this->getHtml('forwarded_to'); ?>
+                            <a href="<?= UriFactory::build('{/base}/profile/single?{?}&for=' . $element->taskElement->createdBy->getId()); ?>"><?= $this->printHtml($element->taskElement->createdBy->name1); ?></a> <?= $this->getHtml('forwarded_to'); ?>
                             <?php foreach ($tos as $to) : ?>
                                 <?php if ($to instanceof AccountRelation) : ?>
-                                    <a href="<?= UriFactory::build('{/lang}/{/app}/profile/single?{?}&for=' . $to->getRelation()->getId()); ?>"><?= $this->printHtml($to->getRelation()->name1); ?></a>
+                                    <a href="<?= UriFactory::build('{/base}/profile/single?{?}&for=' . $to->getRelation()->getId()); ?>"><?= $this->printHtml($to->getRelation()->name1); ?></a>
                                 <?php elseif ($to instanceof GroupRelation) : ?>
                                     <?= $this->printHtml($to->getRelation()->name); ?>
                                 <?php endif; ?>
diff --git a/Theme/Backend/ticket-create.tpl.php b/Theme/Backend/ticket-create.tpl.php
index 267c4d1..bc6c58d 100755
--- a/Theme/Backend/ticket-create.tpl.php
+++ b/Theme/Backend/ticket-create.tpl.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Support
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/Views/TicketView.php b/Views/TicketView.php
index 24224ad..fc68d1a 100755
--- a/Views/TicketView.php
+++ b/Views/TicketView.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\Support
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -29,7 +29,7 @@ use phpOMS\Views\View;
  * Task view class.
  *
  * @package Modules\Support
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
@@ -71,10 +71,10 @@ class TicketView extends View
         $profile = ProfileMapper::get()->with('image')->where('account', $account)->execute();
 
         if (($profile instanceof NullProfile) || $profile->image->getPath() === '') {
-            return UriFactory::build('{/lang}/{/app}/' . $this->defaultProfileImage->getPath());
+            return UriFactory::build('{/base}/' . $this->defaultProfileImage->getPath());
         }
 
-        return UriFactory::build('{/lang}/{/app}/' . $profile->image->getPath());
+        return UriFactory::build('{/base}/' . $profile->image->getPath());
     }
 
     /**
diff --git a/tests/Admin/AdminTest.php b/tests/Admin/AdminTest.php
index 9d52fc0..9561651 100755
--- a/tests/Admin/AdminTest.php
+++ b/tests/Admin/AdminTest.php
@@ -6,7 +6,7 @@
  *
  * @package   tests
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/tests/Autoloader.php b/tests/Autoloader.php
index d032623..d08f1b7 100755
--- a/tests/Autoloader.php
+++ b/tests/Autoloader.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules/tests
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ namespace tests;
  * Autoloader class.
  *
  * @package tests
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/tests/Controller/Api/ApiControllerAttributeTrait.php b/tests/Controller/Api/ApiControllerAttributeTrait.php
index 3afaece..30d0e46 100755
--- a/tests/Controller/Api/ApiControllerAttributeTrait.php
+++ b/tests/Controller/Api/ApiControllerAttributeTrait.php
@@ -6,7 +6,7 @@
  *
  * @package   tests
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/tests/Controller/Api/ApiControllerTicketTrait.php b/tests/Controller/Api/ApiControllerTicketTrait.php
index 925c9d7..25a089c 100755
--- a/tests/Controller/Api/ApiControllerTicketTrait.php
+++ b/tests/Controller/Api/ApiControllerTicketTrait.php
@@ -6,7 +6,7 @@
  *
  * @package   tests
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php
index a510176..69b2c73 100755
--- a/tests/Controller/ApiControllerTest.php
+++ b/tests/Controller/ApiControllerTest.php
@@ -6,7 +6,7 @@
  *
  * @package   tests
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/tests/Models/NullSupportAppTest.php b/tests/Models/NullSupportAppTest.php
index 791fc97..35aadac 100755
--- a/tests/Models/NullSupportAppTest.php
+++ b/tests/Models/NullSupportAppTest.php
@@ -6,7 +6,7 @@
  *
  * @package   tests
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/tests/Models/NullTicketAttributeTest.php b/tests/Models/NullTicketAttributeTest.php
index f18600a..e8bf95a 100755
--- a/tests/Models/NullTicketAttributeTest.php
+++ b/tests/Models/NullTicketAttributeTest.php
@@ -6,7 +6,7 @@
  *
  * @package   tests
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/tests/Models/NullTicketAttributeTypeTest.php b/tests/Models/NullTicketAttributeTypeTest.php
index 2df866d..1e466cd 100755
--- a/tests/Models/NullTicketAttributeTypeTest.php
+++ b/tests/Models/NullTicketAttributeTypeTest.php
@@ -6,7 +6,7 @@
  *
  * @package   tests
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/tests/Models/NullTicketAttributeValueTest.php b/tests/Models/NullTicketAttributeValueTest.php
index ee69dcf..e363591 100755
--- a/tests/Models/NullTicketAttributeValueTest.php
+++ b/tests/Models/NullTicketAttributeValueTest.php
@@ -6,7 +6,7 @@
  *
  * @package   tests
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/tests/Models/NullTicketElementTest.php b/tests/Models/NullTicketElementTest.php
index 4b5728b..f11ba57 100755
--- a/tests/Models/NullTicketElementTest.php
+++ b/tests/Models/NullTicketElementTest.php
@@ -6,7 +6,7 @@
  *
  * @package   tests
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/tests/Models/NullTicketTest.php b/tests/Models/NullTicketTest.php
index 439adde..0d3821b 100755
--- a/tests/Models/NullTicketTest.php
+++ b/tests/Models/NullTicketTest.php
@@ -6,7 +6,7 @@
  *
  * @package   tests
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/tests/Models/SupportAppTest.php b/tests/Models/SupportAppTest.php
index 8b17eed..8a16305 100755
--- a/tests/Models/SupportAppTest.php
+++ b/tests/Models/SupportAppTest.php
@@ -6,7 +6,7 @@
  *
  * @package   tests
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/tests/Models/TicketAttributeTest.php b/tests/Models/TicketAttributeTest.php
index 338b7a1..8c84505 100755
--- a/tests/Models/TicketAttributeTest.php
+++ b/tests/Models/TicketAttributeTest.php
@@ -6,7 +6,7 @@
  *
  * @package   tests
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/tests/Models/TicketAttributeTypeTest.php b/tests/Models/TicketAttributeTypeTest.php
index 6d814c2..a49a4e6 100755
--- a/tests/Models/TicketAttributeTypeTest.php
+++ b/tests/Models/TicketAttributeTypeTest.php
@@ -6,7 +6,7 @@
  *
  * @package   tests
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/tests/Models/TicketAttributeValueTest.php b/tests/Models/TicketAttributeValueTest.php
index 900906f..883e6cc 100755
--- a/tests/Models/TicketAttributeValueTest.php
+++ b/tests/Models/TicketAttributeValueTest.php
@@ -6,7 +6,7 @@
  *
  * @package   tests
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/tests/Models/TicketElementTest.php b/tests/Models/TicketElementTest.php
index e8a6ebd..e843b40 100755
--- a/tests/Models/TicketElementTest.php
+++ b/tests/Models/TicketElementTest.php
@@ -6,7 +6,7 @@
  *
  * @package   tests
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/tests/Models/TicketTest.php b/tests/Models/TicketTest.php
index 0d1602f..1d55f92 100755
--- a/tests/Models/TicketTest.php
+++ b/tests/Models/TicketTest.php
@@ -6,7 +6,7 @@
  *
  * @package   tests
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
diff --git a/tests/Views/TicketViewTest.php b/tests/Views/TicketViewTest.php
index a5b5a8a..6c2bf46 100755
--- a/tests/Views/TicketViewTest.php
+++ b/tests/Views/TicketViewTest.php
@@ -6,7 +6,7 @@
  *
  * @package   tests
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */