Jingga/oms-News
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-News.git synced 2026-02-10 22:08:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

registration fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-03-24 16:20:24 +01:00
parent 0908cbc7fc
commit 4035d30c35
83 changed files with 148 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Admin/Install/Comments.php
View File

@ -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
*/

4
Admin/Install/Dashboard.php
View File

@ -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
*/

4
Admin/Install/Media.php
View File

@ -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
*/

12
Admin/Install/Navigation.install.json
View File

@ -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,

4
Admin/Install/Navigation.php
View File

@ -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
*/

4
Admin/Installer.php
View File

@ -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
*/

2
Admin/Routes/Web/Api.php
View File

@ -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
*/

2
Admin/Routes/Web/Backend.php
View File

@ -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
*/

4
Admin/Status.php
View File

@ -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
*/

4
Admin/Uninstaller.php
View File

@ -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
*/

4
Admin/Updater.php
View File

@ -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
*/

45
Controller/ApiController.php
View File

@ -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'))

18
Controller/BackendController.php
View File

@ -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;
}

4
Controller/Controller.php
View File

@ -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
*/

4
Models/NewsArticle.php
View File

@ -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
*/

4
Models/NewsArticleMapper.php
View File

@ -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
*/

4
Models/NewsSeen.php
View File

@ -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
*/

4
Models/NewsSeenMapper.php
View File

@ -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
*/

4
Models/NewsStatus.php
View File

@ -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
*/

4
Models/NewsType.php
View File

@ -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
*/

4
Models/NullNewsArticle.php
View File

@ -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
*/

4
Models/NullNewsSeen.php
View File

@ -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
*/

4
Models/PermissionCategory.php
View File

@ -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
*/

2
Theme/Backend/Lang/Navigation.ar.lang.php
View File

@ -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
*/

2
Theme/Backend/Lang/Navigation.cs.lang.php
View File

@ -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
*/

2
Theme/Backend/Lang/Navigation.da.lang.php
View File

@ -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
*/

2
Theme/Backend/Lang/Navigation.de.lang.php
View File

@ -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
*/

2
Theme/Backend/Lang/Navigation.el.lang.php
View File

@ -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
*/

2
Theme/Backend/Lang/Navigation.en.lang.php
View File

@ -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
*/

2
Theme/Backend/Lang/Navigation.es.lang.php
View File

@ -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
*/

2
Theme/Backend/Lang/Navigation.fi.lang.php
View File

@ -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
*/

2
Theme/Backend/Lang/Navigation.fr.lang.php
View File

@ -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
*/

2
Theme/Backend/Lang/Navigation.hu.lang.php
View File

@ -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
*/

2
Theme/Backend/Lang/Navigation.it.lang.php
View File

@ -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
*/

2
Theme/Backend/Lang/Navigation.ja.lang.php
View File

@ -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
*/

2
Theme/Backend/Lang/Navigation.ko.lang.php
View File

@ -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
*/

2
Theme/Backend/Lang/Navigation.no.lang.php
View File

@ -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
*/

2
Theme/Backend/Lang/Navigation.pl.lang.php
View File

@ -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
*/

2
Theme/Backend/Lang/Navigation.pt.lang.php
View File

@ -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
*/

2
Theme/Backend/Lang/Navigation.ru.lang.php
View File

@ -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
*/

2
Theme/Backend/Lang/Navigation.sv.lang.php
View File

@ -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
*/

2
Theme/Backend/Lang/Navigation.th.lang.php
View File

@ -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
*/

2
Theme/Backend/Lang/Navigation.tr.lang.php
View File

@ -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
*/

2
Theme/Backend/Lang/Navigation.uk.lang.php
View File

@ -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
*/

2
Theme/Backend/Lang/Navigation.zh.lang.php
View File

@ -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
*/

2
Theme/Backend/Lang/ar.lang.php
View File

@ -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
*/

2
Theme/Backend/Lang/cs.lang.php
View File

@ -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
*/

2
Theme/Backend/Lang/da.lang.php
View File

@ -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
*/

2
Theme/Backend/Lang/de.lang.php
View File

@ -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
*/

2
Theme/Backend/Lang/el.lang.php
View File

@ -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
*/

2
Theme/Backend/Lang/en.lang.php
View File

@ -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
*/

2
Theme/Backend/Lang/es.lang.php
View File

@ -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
*/

2
Theme/Backend/Lang/fi.lang.php
View File

@ -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
*/

2
Theme/Backend/Lang/fr.lang.php
View File

@ -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
*/

2
Theme/Backend/Lang/hu.lang.php
View File

@ -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
*/

2
Theme/Backend/Lang/it.lang.php
View File

@ -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
*/

2
Theme/Backend/Lang/ja.lang.php
View File

@ -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
*/

2
Theme/Backend/Lang/ko.lang.php
View File

@ -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
*/

2
Theme/Backend/Lang/no.lang.php
View File

@ -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
*/

2
Theme/Backend/Lang/pl.lang.php
View File

@ -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
*/

2
Theme/Backend/Lang/pt.lang.php
View File

@ -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
*/

2
Theme/Backend/Lang/ru.lang.php
View File

@ -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
*/

2
Theme/Backend/Lang/sv.lang.php
View File

@ -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
*/

2
Theme/Backend/Lang/th.lang.php
View File

@ -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
*/

2
Theme/Backend/Lang/tr.lang.php
View File

@ -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
*/

2
Theme/Backend/Lang/uk.lang.php
View File

@ -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
*/

2
Theme/Backend/Lang/zh.lang.php
View File

@ -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
*/

6
Theme/Backend/dashboard-news.tpl.php
View File

@ -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>

2
Theme/Backend/news-analysis.tpl.php
View File

@ -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
*/

6
Theme/Backend/news-archive.tpl.php
View File

@ -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) : ?>

4
Theme/Backend/news-create.tpl.php
View File

@ -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; ?>

4
Theme/Backend/news-dashboard.tpl.php
View File

@ -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">

6
Theme/Backend/news-draft.tpl.php
View File

@ -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) : ?>

6
Theme/Backend/news-single.tpl.php
View File

@ -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>

2
tests/Admin/AdminTest.php
View File

@ -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
*/

4
tests/Autoloader.php
View File

@ -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
*/

2
tests/Controller/Api/ApiControllerNewsArticleTrait.php
View File

@ -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
*/

2
tests/Controller/ApiControllerTest.php
View File

@ -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
*/

2
tests/Models/NewsArticleMapperTest.php
View File

@ -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
*/

2
tests/Models/NewsArticleTest.php
View File

@ -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
*/

2
tests/Models/NewsSeenTest.php
View File

@ -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
*/

2
tests/Models/NullNewsArticleTest.php
View File

@ -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
*/

2
tests/Models/NullNewsSeenTest.php
View File

@ -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
*/