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

---
 Admin/Install/Comments.php                    |  4 +-
 Admin/Install/Dashboard.php                   |  4 +-
 Admin/Install/Media.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/Status.php                              |  4 +-
 Admin/Uninstaller.php                         |  4 +-
 Admin/Updater.php                             |  4 +-
 Controller/ApiController.php                  | 45 ++++++++++---------
 Controller/BackendController.php              | 18 ++++----
 Controller/Controller.php                     |  4 +-
 Models/NewsArticle.php                        |  4 +-
 Models/NewsArticleMapper.php                  |  4 +-
 Models/NewsSeen.php                           |  4 +-
 Models/NewsSeenMapper.php                     |  4 +-
 Models/NewsStatus.php                         |  4 +-
 Models/NewsType.php                           |  4 +-
 Models/NullNewsArticle.php                    |  4 +-
 Models/NullNewsSeen.php                       |  4 +-
 Models/PermissionCategory.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/dashboard-news.tpl.php          |  6 +--
 Theme/Backend/news-analysis.tpl.php           |  2 +-
 Theme/Backend/news-archive.tpl.php            |  6 +--
 Theme/Backend/news-create.tpl.php             |  4 +-
 Theme/Backend/news-dashboard.tpl.php          |  4 +-
 Theme/Backend/news-draft.tpl.php              |  6 +--
 Theme/Backend/news-single.tpl.php             |  6 +--
 tests/Admin/AdminTest.php                     |  2 +-
 tests/Autoloader.php                          |  4 +-
 .../Api/ApiControllerNewsArticleTrait.php     |  2 +-
 tests/Controller/ApiControllerTest.php        |  2 +-
 tests/Models/NewsArticleMapperTest.php        |  2 +-
 tests/Models/NewsArticleTest.php              |  2 +-
 tests/Models/NewsSeenTest.php                 |  2 +-
 tests/Models/NullNewsArticleTest.php          |  2 +-
 tests/Models/NullNewsSeenTest.php             |  2 +-
 83 files changed, 148 insertions(+), 145 deletions(-)

diff --git a/Admin/Install/Comments.php b/Admin/Install/Comments.php
index 667ad92..419b91e 100755
--- a/Admin/Install/Comments.php
+++ b/Admin/Install/Comments.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\News\Admin\Install
  * @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\Schema\Builder;
  * Comments class.
  *
  * @package Modules\News\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/Dashboard.php b/Admin/Install/Dashboard.php
index 828274c..5cede3e 100755
--- a/Admin/Install/Dashboard.php
+++ b/Admin/Install/Dashboard.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\News\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;
  * Dashboard class.
  *
  * @package Modules\News\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/Media.php b/Admin/Install/Media.php
index 08e15b9..e007cb1 100755
--- a/Admin/Install/Media.php
+++ b/Admin/Install/Media.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\News\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;
  * Media class.
  *
  * @package Modules\News\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 d0838e3..d0548ea 100755
--- a/Admin/Install/Navigation.install.json
+++ b/Admin/Install/Navigation.install.json
@@ -5,7 +5,7 @@
         "type": 2,
         "subtype": 1,
         "name": "News",
-        "uri": "{/lang}/{/app}/news/dashboard?u={?u}",
+        "uri": "{/base}/news/dashboard?u={?u}",
         "target": "self",
         "icon": null,
         "order": 40,
@@ -19,7 +19,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "News",
-                "uri": "{/lang}/{/app}/news/dashboard?u={?u}",
+                "uri": "{/base}/news/dashboard?u={?u}",
                 "target": "self",
                 "icon": null,
                 "order": 1,
@@ -34,7 +34,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Archive",
-                "uri": "{/lang}/{/app}/news/archive?u={?u}",
+                "uri": "{/base}/news/archive?u={?u}",
                 "target": "self",
                 "icon": null,
                 "order": 5,
@@ -49,7 +49,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Create",
-                "uri": "{/lang}/{/app}/news/create?{?}",
+                "uri": "{/base}/news/create?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 10,
@@ -64,7 +64,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Draft",
-                "uri": "{/lang}/{/app}/news/draft/list?u={?u}",
+                "uri": "{/base}/news/draft/list?u={?u}",
                 "target": "self",
                 "icon": null,
                 "order": 15,
@@ -79,7 +79,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Analysis",
-                "uri": "{/lang}/{/app}/news/analysis",
+                "uri": "{/base}/news/analysis",
                 "target": "self",
                 "icon": null,
                 "order": 15,
diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php
index cba8256..d2cc360 100755
--- a/Admin/Install/Navigation.php
+++ b/Admin/Install/Navigation.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\News\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\News\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 82514a1..517e727 100755
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\News\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\InstallerAbstract;
  * Installer class.
  *
  * @package Modules\News\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 5a4d63b..d888151 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 2ea963c..69fc2b7 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/Status.php b/Admin/Status.php
index 85bd276..bdde17f 100755
--- a/Admin/Status.php
+++ b/Admin/Status.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\News\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\News\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 635679b..d5047db 100755
--- a/Admin/Uninstaller.php
+++ b/Admin/Uninstaller.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\News\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\News\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 af79376..e4b0670 100755
--- a/Admin/Updater.php
+++ b/Admin/Updater.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\News\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\News\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 7f3c898..4049458 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\News
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -41,7 +41,7 @@ use phpOMS\Utils\Parser\Markdown\Markdown;
  * News controller class.
  *
  * @package Modules\News
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
@@ -62,15 +62,15 @@ final class ApiController extends Controller
         if (($val['title'] = empty($request->getData('title')))
             || ($val['plain'] = empty($request->getData('plain')))
             || ($val['lang'] = (
-                $request->getData('lang') !== null
+                $request->hasData('lang')
                 && !ISO639x1Enum::isValidValue(\strtolower((string) $request->getData('lang')))
             ))
             || ($val['type'] = (
-                $request->getData('type') === null
+                !$request->hasData('type')
                 || !NewsType::isValidValue((int) $request->getData('type'))
             ))
             || ($val['status'] = (
-                $request->getData('status') === null
+                !$request->hasData('status')
                 || !NewsStatus::isValidValue((int) $request->getData('status'))
             ))
         ) {
@@ -117,15 +117,15 @@ final class ApiController extends Controller
         /** @var \Modules\News\Models\NewsArticle $newsArticle */
         $newsArticle          = NewsArticleMapper::get()->where('id', (int) $request->getData('id'))->execute();
         $newsArticle->publish = new \DateTime((string) ($request->getData('publish') ?? $newsArticle->publish->format('Y-m-d H:i:s')));
-        $newsArticle->title   = (string) ($request->getData('title') ?? $newsArticle->title);
-        $newsArticle->plain   = (string) ($request->getData('plain') ?? $newsArticle->plain);
-        $newsArticle->content = Markdown::parse((string) ($request->getData('plain') ?? $newsArticle->plain));
-        $newsArticle->setLanguage(\strtolower((string) ($request->getData('lang') ?? $newsArticle->getLanguage())));
-        $newsArticle->setType((int) ($request->getData('type') ?? $newsArticle->getType()));
-        $newsArticle->setStatus((int) ($request->getData('status') ?? $newsArticle->getStatus()));
-        $newsArticle->isFeatured = (bool) ($request->getData('featured') ?? $newsArticle->isFeatured);
-        $newsArticle->unit       = $request->getData('unit', 'int');
-        $newsArticle->app        = $request->getData('app', 'int');
+        $newsArticle->title   = $request->getDataString('title') ?? $newsArticle->title;
+        $newsArticle->plain   = $request->getDataString('plain') ?? $newsArticle->plain;
+        $newsArticle->content = Markdown::parse($request->getDataString('plain') ?? $newsArticle->plain);
+        $newsArticle->setLanguage(\strtolower($request->getDataString('lang') ?? $newsArticle->getLanguage()));
+        $newsArticle->setType($request->getDataInt('type') ?? $newsArticle->getType());
+        $newsArticle->setStatus($request->getDataInt('status') ?? $newsArticle->getStatus());
+        $newsArticle->isFeatured = $request->getDataBool('featured') ?? $newsArticle->isFeatured;
+        $newsArticle->unit       = $request->getDataInt('unit');
+        $newsArticle->app        = $request->getDataInt('app');
 
         return $newsArticle;
     }
@@ -255,7 +255,10 @@ final class ApiController extends Controller
                     $request->getOrigin()
                 );
 
-                $mediaObject = MediaMapper::get()->where('id', (int) $media)->execute();
+                /** @var \Modules\Media\Models\Media $mediaObject */
+                $mediaObject = MediaMapper::get()
+                    ->where('id', (int) $media)
+                    ->execute();
 
                 $ref            = new Reference();
                 $ref->source    = new NullMedia((int) $media);
@@ -322,13 +325,13 @@ final class ApiController extends Controller
         $newsArticle            = new NewsArticle();
         $newsArticle->createdBy = new NullAccount($request->header->account);
         $newsArticle->publish   = new \DateTime((string) ($request->getData('publish') ?? 'now'));
-        $newsArticle->title     = (string) ($request->getData('title') ?? '');
-        $newsArticle->plain     = (string) ($request->getData('plain') ?? '');
-        $newsArticle->content   = Markdown::parse((string) ($request->getData('plain') ?? ''));
+        $newsArticle->title     = $request->getDataString('title') ?? '';
+        $newsArticle->plain     = $request->getDataString('plain') ?? '';
+        $newsArticle->content   = Markdown::parse($request->getDataString('plain') ?? '');
         $newsArticle->setLanguage(\strtolower((string) ($request->getData('lang') ?? $request->getLanguage())));
-        $newsArticle->setType((int) ($request->getData('type') ?? NewsType::ARTICLE));
-        $newsArticle->setStatus((int) ($request->getData('status') ?? NewsStatus::VISIBLE));
-        $newsArticle->isFeatured = (bool) ($request->getData('featured') ?? true);
+        $newsArticle->setType($request->getDataInt('type') ?? NewsType::ARTICLE);
+        $newsArticle->setStatus($request->getDataInt('status') ?? NewsStatus::VISIBLE);
+        $newsArticle->isFeatured = $request->getDataBool('featured') ?? true;
 
         // allow comments
         if (!empty($request->getData('allow_comments'))
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index e45cf1e..f8c0aeb 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\News
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -33,7 +33,7 @@ use phpOMS\Views\View;
  * News controller class.
  *
  * @package Modules\News
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
@@ -71,13 +71,13 @@ final class BackendController extends Controller implements DashboardElementInte
         $objs = [];
         if ($request->getData('ptype') === 'p') {
             /** @var \Modules\News\Models\NewsArticle[] $objs */
-            $objs = $mapperQuery->where('id', (int) ($request->getData('id') ?? 0), '<')
+            $objs = $mapperQuery->where('id', $request->getDataInt('id') ?? 0, '<')
                     ->limit(25)->execute();
 
             $view->setData('news', $objs);
         } elseif ($request->getData('ptype') === 'n') {
             /** @var \Modules\News\Models\NewsArticle[] $objs */
-            $objs = $mapperQuery->where('id', (int) ($request->getData('id') ?? 0), '>')
+            $objs = $mapperQuery->where('id', $request->getDataInt('id') ?? 0, '>')
                     ->limit(25)->execute();
 
             $view->setData('news', $objs);
@@ -246,12 +246,12 @@ final class BackendController extends Controller implements DashboardElementInte
 
         if ($request->getData('ptype') === 'p') {
             $view->setData('news',
-                $mapperQuery->where('id', (int) ($request->getData('id') ?? 0), '<')
+                $mapperQuery->where('id', $request->getDataInt('id') ?? 0, '<')
                     ->limit(25)->execute()
             );
         } elseif ($request->getData('ptype') === 'n') {
             $view->setData('news',
-                $mapperQuery->where('id', (int) ($request->getData('id') ?? 0), '>')
+                $mapperQuery->where('id', $request->getDataInt('id') ?? 0, '>')
                     ->limit(25)->execute()
             );
         } else {
@@ -285,11 +285,11 @@ final class BackendController extends Controller implements DashboardElementInte
 
         if ($request->getData('ptype') === 'p') {
             $view->setData('news',
-                NewsArticleMapper::getAll()->where('id', (int) ($request->getData('id') ?? 0), '<')->where('status', NewsStatus::DRAFT)->limit(25)->execute()
+                NewsArticleMapper::getAll()->where('id', $request->getDataInt('id') ?? 0, '<')->where('status', NewsStatus::DRAFT)->limit(25)->execute()
             );
         } elseif ($request->getData('ptype') === 'n') {
             $view->setData('news',
-                NewsArticleMapper::getAll()->where('id', (int) ($request->getData('id') ?? 0), '>')->where('status', NewsStatus::DRAFT)->limit(25)->execute()
+                NewsArticleMapper::getAll()->where('id', $request->getDataInt('id') ?? 0, '>')->where('status', NewsStatus::DRAFT)->limit(25)->execute()
             );
         } else {
             $view->setData('news', NewsArticleMapper::getAll()->where('id', 0, '>')->where('status', NewsStatus::DRAFT)->limit(25)->execute());
@@ -357,7 +357,7 @@ final class BackendController extends Controller implements DashboardElementInte
         $tagSelector = new \Modules\Tag\Theme\Backend\Components\TagSelector\BaseView($this->app->l11nManager, $request, $response);
         $view->addData('tagSelector', $tagSelector);
 
-        $view->addData('news', NewsArticleMapper::get()->where('id', (int) ($request->getData('id') ?? 0))->execute());
+        $view->addData('news', NewsArticleMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute());
 
         return $view;
     }
diff --git a/Controller/Controller.php b/Controller/Controller.php
index 2313dc6..1260452 100755
--- a/Controller/Controller.php
+++ b/Controller/Controller.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\News
  * @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;
  * News controller class.
  *
  * @package Modules\News
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/NewsArticle.php b/Models/NewsArticle.php
index 05b645f..b9385fa 100755
--- a/Models/NewsArticle.php
+++ b/Models/NewsArticle.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\News\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -27,7 +27,7 @@ use phpOMS\Stdlib\Base\Exception\InvalidEnumValue;
  * News article class.
  *
  * @package Modules\News\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/NewsArticleMapper.php b/Models/NewsArticleMapper.php
index 0ec6882..808aa5a 100755
--- a/Models/NewsArticleMapper.php
+++ b/Models/NewsArticleMapper.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\News\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\DataStorage\Database\Mapper\DataMapperFactory;
  * News mapper class.
  *
  * @package Modules\News\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/NewsSeen.php b/Models/NewsSeen.php
index b46b6bc..af0af45 100755
--- a/Models/NewsSeen.php
+++ b/Models/NewsSeen.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\News\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\News\Models;
  * Null model
  *
  * @package Modules\News\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/NewsSeenMapper.php b/Models/NewsSeenMapper.php
index 06f53e3..9a022df 100755
--- a/Models/NewsSeenMapper.php
+++ b/Models/NewsSeenMapper.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\News\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;
  * News mapper class.
  *
  * @package Modules\News\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/NewsStatus.php b/Models/NewsStatus.php
index 0b8242a..f630315 100755
--- a/Models/NewsStatus.php
+++ b/Models/NewsStatus.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\News\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;
  * News type status.
  *
  * @package Modules\News\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/NewsType.php b/Models/NewsType.php
index 705da3f..c33bd14 100755
--- a/Models/NewsType.php
+++ b/Models/NewsType.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\News\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;
  * News type enum.
  *
  * @package Modules\News\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/NullNewsArticle.php b/Models/NullNewsArticle.php
index f8d0f46..db71b6f 100755
--- a/Models/NullNewsArticle.php
+++ b/Models/NullNewsArticle.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\News\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\News\Models;
  * Null model
  *
  * @package Modules\News\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
diff --git a/Models/NullNewsSeen.php b/Models/NullNewsSeen.php
index 82895c3..086ef06 100755
--- a/Models/NullNewsSeen.php
+++ b/Models/NullNewsSeen.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\News\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\News\Models;
  * Null model
  *
  * @package Modules\News\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 7591038..6d41180 100755
--- a/Models/PermissionCategory.php
+++ b/Models/PermissionCategory.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\News\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\News\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 d948c8a..2f63a14 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 60b74f1..9c462f9 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 ef9849a..5317881 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 95f54e5..9194d1a 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 e0de831..7a6ac01 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 85169f3..5f50b90 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 957d0ab..4552074 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 fe1cc19..1c61e6b 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 d085c0e..c60bc72 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 ca22fbc..18b7f18 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 ebaa08d..985c70d 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 fd329aa..cbc6723 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 118147c..5c45bcf 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 dcc9fe0..660e02a 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 6eec67c..75a4577 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 5ca4abf..524fc33 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 b8b8daf..ed980f3 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 44f1390..b0c8309 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 9ed739a..3c40dac 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 be00836..8d02617 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 ffd7144..5452a73 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 6144e9f..74b2168 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 3dc5ea1..8672e41 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 5c19ecd..5afbdc3 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 3ef7cf9..99e315d 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 5e0bb44..5412e3a 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 c402ba1..94fa9fd 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 9f3b75d..7230550 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 b111021..09e25e9 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 d4c48fa..1575c52 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 c2a52e9..0903671 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 0d83e48..c8c66c7 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 514db7b..9045c95 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 d2f395d..3189ede 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 4dcc29d..1759c61 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 74c4ec1..dc0863b 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 f8cdf6e..24501d6 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 0fb769c..b3a3363 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 d1a825d..4971f8d 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 62289f2..c8f6bc3 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 49e9667..fac4610 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 0867ee5..a66ec19 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 d9c68b4..fcfbbb1 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 9dee0d6..d877f0d 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/dashboard-news.tpl.php b/Theme/Backend/dashboard-news.tpl.php
index 57805a7..33ea010 100755
--- a/Theme/Backend/dashboard-news.tpl.php
+++ b/Theme/Backend/dashboard-news.tpl.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\News
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -35,7 +35,7 @@ $newsList = $this->getData('news') ?? [];
             <?php
             $count = 0;
             foreach ($newsList as $key => $news) : ++$count;
-            $url    = UriFactory::build('{/lang}/{/app}/news/article?{?}&id=' . $news->getId());
+            $url    = UriFactory::build('{/base}/news/article?{?}&id=' . $news->getId());
             $color  = 'darkred';
 
             if ($news->getType() === NewsType::ARTICLE) { $color      = 'green'; }
@@ -66,7 +66,7 @@ $newsList = $this->getData('news') ?? [];
         </table>
         </div>
         <div class="portlet-foot">
-            <a class="button" href="<?= UriFactory::build('{/lang}/{/app}/news/dashboard?{?}'); ?>"><?= $this->getHtml('More', '0', '0'); ?></a>
+            <a class="button" href="<?= UriFactory::build('{/base}/news/dashboard?{?}'); ?>"><?= $this->getHtml('More', '0', '0'); ?></a>
         </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/Theme/Backend/news-analysis.tpl.php b/Theme/Backend/news-analysis.tpl.php
index 07f6446..737839d 100755
--- a/Theme/Backend/news-analysis.tpl.php
+++ b/Theme/Backend/news-analysis.tpl.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\News
  * @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/news-archive.tpl.php b/Theme/Backend/news-archive.tpl.php
index 5784dce..bac0a2c 100755
--- a/Theme/Backend/news-archive.tpl.php
+++ b/Theme/Backend/news-archive.tpl.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\News
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -84,12 +84,12 @@ echo $this->getData('nav')->render(); ?>
                     $count = 0;
 
                     foreach ($newsList as $key => $news) : ++$count;
-                    $url   = UriFactory::build('{/lang}/{/app}/news/article?{?}&id=' . $news->getId());
+                    $url   = UriFactory::build('{/base}/news/article?{?}&id=' . $news->getId());
                 ?>
                     <tr tabindex="0" data-href="<?= $url; ?>">
                         <td><span class="tag"><?= $this->getHtml('TYPE' . $news->getType()); ?></span></a>
                         <td><a href="<?= $url; ?>"><?= $this->printHtml($news->title); ?></a>
-                        <td><a class="content" href="<?= UriFactory::build('{/lang}/{/app}/profile/single?{?}&for=' . $news->createdBy->getId()); ?>"><?= $this->printHtml($news->createdBy->name2 . ', ' . $news->createdBy->name1); ?></a>
+                        <td><a class="content" href="<?= UriFactory::build('{/base}/profile/single?{?}&for=' . $news->createdBy->getId()); ?>"><?= $this->printHtml($news->createdBy->name2 . ', ' . $news->createdBy->name1); ?></a>
                         <td><a href="<?= $url; ?>"><?= $this->printHtml($news->publish->format('Y-m-d')); ?></a>
                 <?php endforeach; ?>
                 <?php if ($count === 0) : ?>
diff --git a/Theme/Backend/news-create.tpl.php b/Theme/Backend/news-create.tpl.php
index 72dba02..ef80a01 100755
--- a/Theme/Backend/news-create.tpl.php
+++ b/Theme/Backend/news-create.tpl.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\News
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -87,7 +87,7 @@ echo $this->getData('nav')->render(); ?>
                         <tr>
                             <td>
                                 <?php if ($isNewArticle) : ?>
-                                    <a href="<?= UriFactory::build('{/lang}/{/app}//news/dashboard'); ?>" class="button"><?= $this->getHtml('Delete', '0', '0'); ?></a>
+                                    <a href="<?= UriFactory::build('{/base}//news/dashboard'); ?>" class="button"><?= $this->getHtml('Delete', '0', '0'); ?></a>
                                 <?php else : ?>
                                     <input type="submit" name="deleteButton" id="iDeleteButton" value="<?= $this->getHtml('Delete', '0', '0'); ?>">
                                 <?php endif; ?>
diff --git a/Theme/Backend/news-dashboard.tpl.php b/Theme/Backend/news-dashboard.tpl.php
index e1ac5b8..05d3b3e 100755
--- a/Theme/Backend/news-dashboard.tpl.php
+++ b/Theme/Backend/news-dashboard.tpl.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\News
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -27,7 +27,7 @@ echo $this->getData('nav')->render(); ?>
 <div class="row">
     <div class="col-xs-12">
         <?php foreach ($newsList as $news) :
-            $url     = UriFactory::build('{/lang}/{/app}/news/article?id=' . $news->getId());
+            $url     = UriFactory::build('{/base}/news/article?id=' . $news->getId());
             $profile = UriFactory::build('profile/single?{?}&id=' . $news->createdBy->getId());
         ?>
         <div class="portlet">
diff --git a/Theme/Backend/news-draft.tpl.php b/Theme/Backend/news-draft.tpl.php
index dbe2b14..347ffbc 100755
--- a/Theme/Backend/news-draft.tpl.php
+++ b/Theme/Backend/news-draft.tpl.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\News
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -84,12 +84,12 @@ echo $this->getData('nav')->render(); ?>
                     $count = 0;
 
                     foreach ($newsList as $key => $news) : ++$count;
-                    $url   = UriFactory::build('{/lang}/{/app}/news/edit?{?}&id=' . $news->getId());
+                    $url   = UriFactory::build('{/base}/news/edit?{?}&id=' . $news->getId());
                 ?>
                     <tr tabindex="0" data-href="<?= $url; ?>">
                         <td><span class="tag"><?= $this->getHtml('TYPE' . $news->getType()); ?></span></a>
                         <td><a href="<?= $url; ?>"><?= $this->printHtml($news->title); ?></a>
-                        <td><a class="content" href="<?= UriFactory::build('{/lang}/{/app}/profile/single?{?}&for=' . $news->createdBy->getId()); ?>"><?= $this->printHtml($news->createdBy->name2 . ', ' . $news->createdBy->name1); ?></a>
+                        <td><a class="content" href="<?= UriFactory::build('{/base}/profile/single?{?}&for=' . $news->createdBy->getId()); ?>"><?= $this->printHtml($news->createdBy->name2 . ', ' . $news->createdBy->name1); ?></a>
                         <td><a href="<?= $url; ?>"><?= $this->printHtml($news->publish->format('Y-m-d')); ?></a>
                 <?php endforeach; ?>
                 <?php if ($count === 0) : ?>
diff --git a/Theme/Backend/news-single.tpl.php b/Theme/Backend/news-single.tpl.php
index 9444164..f10b267 100755
--- a/Theme/Backend/news-single.tpl.php
+++ b/Theme/Backend/news-single.tpl.php
@@ -6,7 +6,7 @@
  *
  * @package   Modules\News
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -44,12 +44,12 @@ echo $this->getData('nav')->render(); ?>
                         <?php endforeach; ?>
 
                         <?php $files = $news->getMedia(); foreach ($files as $file) : ?>
-                            <span><a class="content" href="<?= UriFactory::build('{/lang}/{/app}/media/single?id=' . $file->getId());?>"><?= $file->name; ?></a></span>
+                            <span><a class="content" href="<?= UriFactory::build('{/base}/media/single?id=' . $file->getId());?>"><?= $file->name; ?></a></span>
                         <?php endforeach; ?>
                     </div>
                     <?php if ($editable) : ?>
                     <div class="col-xs-6 end-xs plain-grid">
-                        <a tabindex="0" class="button" href="<?= UriFactory::build('{/lang}/{/app}/news/edit?id=' . $news->getId()); ?>"><?= $this->getHtml('Edit'); ?></a>
+                        <a tabindex="0" class="button" href="<?= UriFactory::build('{/base}/news/edit?id=' . $news->getId()); ?>"><?= $this->getHtml('Edit'); ?></a>
                     </div>
                     <?php endif; ?>
                 </div>
diff --git a/tests/Admin/AdminTest.php b/tests/Admin/AdminTest.php
index 1bcf867..09ba417 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/ApiControllerNewsArticleTrait.php b/tests/Controller/Api/ApiControllerNewsArticleTrait.php
index 5381472..efeb3f3 100755
--- a/tests/Controller/Api/ApiControllerNewsArticleTrait.php
+++ b/tests/Controller/Api/ApiControllerNewsArticleTrait.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 d4a2235..5c2f764 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/NewsArticleMapperTest.php b/tests/Models/NewsArticleMapperTest.php
index 6751bab..f1f08a4 100755
--- a/tests/Models/NewsArticleMapperTest.php
+++ b/tests/Models/NewsArticleMapperTest.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/NewsArticleTest.php b/tests/Models/NewsArticleTest.php
index 34b7319..8acdc07 100755
--- a/tests/Models/NewsArticleTest.php
+++ b/tests/Models/NewsArticleTest.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/NewsSeenTest.php b/tests/Models/NewsSeenTest.php
index 2cefca2..81cf24c 100755
--- a/tests/Models/NewsSeenTest.php
+++ b/tests/Models/NewsSeenTest.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/NullNewsArticleTest.php b/tests/Models/NullNewsArticleTest.php
index 2c72f3d..0547fe1 100755
--- a/tests/Models/NullNewsArticleTest.php
+++ b/tests/Models/NullNewsArticleTest.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/NullNewsSeenTest.php b/tests/Models/NullNewsSeenTest.php
index b9d94df..09c41c4 100755
--- a/tests/Models/NullNewsSeenTest.php
+++ b/tests/Models/NullNewsSeenTest.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
  */