Jingga/oms-OnlineResourceWatcher
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-OnlineResourceWatcher.git synced 2026-02-10 05:18:41 +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 e8fc0cb8db
commit 81093300fb
31 changed files with 73 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@
"type": 2,
"subtype": 1,
"name": "OnlineResourceWatcher",
"uri": "{/lang}/{/app}/orw/resource/list?u={?u}",
"uri": "{/base}/orw/resource/list?u={?u}",
"target": "self",
"icon": null,
"order": 40,
@ -19,7 +19,7 @@
"type": 3,
"subtype": 1,
"name": "Resources",
"uri": "{/lang}/{/app}/orw/resource/list?u={?u}",
"uri": "{/base}/orw/resource/list?u={?u}",
"target": "self",
"icon": null,
"order": 1,

4
Admin/Install/Navigation.php
View File

@ -6,7 +6,7 @@
*
* @package Modules\OnlineResourceWatcher\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\OnlineResourceWatcher\Admin\Install
* @license OMS License 1.0
* @license OMS License 2.0
* @link https://jingga.app
* @since 1.0.0
*/

4
Admin/Install/Workflow.php
View File

@ -6,7 +6,7 @@
*
* @package Modules\OnlineResourceWatcher\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;
* Workflow class.
*
* @package Modules\OnlineResourceWatcher\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\OnlineResourceWatcher\Admin
* @copyright Dennis Eichhorn
* @license OMS License 1.0
* @license OMS License 2.0
* @version 1.0.0
* @link https://jingga.app
*/
@ -23,7 +23,7 @@ use phpOMS\Module\ModuleInfo;
* Installer class.
*
* @package Modules\OnlineResourceWatcher\Admin
* @license OMS License 1.0
* @license OMS License 2.0
* @link https://jingga.app
* @since 1.0.0
*/

2
Admin/Routes/Cli.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/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\OnlineResourceWatcher\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\OnlineResourceWatcher\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\OnlineResourceWatcher\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\OnlineResourceWatcher\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\OnlineResourceWatcher\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\OnlineResourceWatcher\Admin
* @license OMS License 1.0
* @license OMS License 2.0
* @link https://jingga.app
* @since 1.0.0
*/

26
Controller/ApiController.php
View File

@ -6,7 +6,7 @@
*
* @package Modules\OnlineResourceWatcher
* @copyright Dennis Eichhorn
* @license OMS License 1.0
* @license OMS License 2.0
* @version 1.0.0
* @link https://jingga.app
*/
@ -36,7 +36,7 @@ use phpOMS\Utils\StringUtils;
* OnlineResourceWatcher controller class.
*
* @package Modules\OnlineResourceWatcher
* @license OMS License 1.0
* @license OMS License 2.0
* @link https://jingga.app
* @since 1.0.0
*/
@ -70,17 +70,21 @@ final class ApiController extends Controller
$path = 'Modules/OnlineResourceWatcher/Files/' . $resource->path . '/' . $resource->lastVersionPath . '/index.html';
} else {
$files = \scandir($basePath);
foreach ($files as $file) {
if ($file === '.' || $files === '..') {
continue;
}
$path = '';
$path = 'Modules/OnlineResourceWatcher/Files/' . $resource->path . '/' . $resource->lastVersionPath . '/' . $file;
if ($files !== false) {
foreach ($files as $file) {
if ($file === '.' || $files === '..') {
continue;
}
$path = 'Modules/OnlineResourceWatcher/Files/' . $resource->path . '/' . $resource->lastVersionPath . '/' . $file;
}
}
}
}
$internalRequest = new HttpRequest();
$internalRequest = new HttpRequest();
$internalRequest->header->account = $request->header->account;
$internalRequest->setData('path', $path);
$this->app->moduleManager->get('Media')->apiMediaExport($internalRequest, $response, ['guard' => __DIR__ . '/../Files']);
@ -148,8 +152,8 @@ final class ApiController extends Controller
{
$resource = new Resource();
$resource->owner = new NullAccount($request->header->account);
$resource->title = (string) ($request->getData('title') ?? '');
$resource->uri = (string) ($request->getData('uri') ?? '');
$resource->title = $request->getDataString('title') ?? '';
$resource->uri = $request->getDataString('uri') ?? '';
$resource->owner = new NullAccount($request->header->account);
// @todo: check if user is part of organization below AND has free resources to add!!!
@ -297,7 +301,7 @@ final class ApiController extends Controller
$resource->path = (string) $resource->getId();
$resource->lastVersionPath = (string) $check['timestamp'];
$resource->lastVersionDate = $report->createdAt;
$resource->hash = $hash;
$resource->hash = $hash == false ? '' : $hash;
$resource->checkedAt = $report->createdAt;
ResourceMapper::update()->execute($resource);

18
Controller/BackendController.php
View File

@ -6,7 +6,7 @@
*
* @package Modules\OnlineResourceWatcher
* @copyright Dennis Eichhorn
* @license OMS License 1.0
* @license OMS License 2.0
* @version 1.0.0
* @link https://jingga.app
*/
@ -26,7 +26,7 @@ use Web\Backend\Views\TableView;
* OnlineResourceWatcher controller class.
*
* @package Modules\OnlineResourceWatcher
* @license OMS License 1.0
* @license OMS License 2.0
* @link https://jingga.app
* @since 1.0.0
*/
@ -86,14 +86,14 @@ final class BackendController extends Controller
$mapper = ResourceMapper::getAll()->with('createdBy');
$list = ResourceMapper::find(
search: $request->getData('search'),
search: $request->getDataString('search'),
mapper: $mapper,
id: (int) ($request->getData('id') ?? 0),
secondaryId: (string) ($request->getData('subid') ?? ''),
type: $request->getData('pType'),
pageLimit: empty((int) ($request->getData('limit') ?? 0)) ? 100 : ((int) $request->getData('limit')),
sortBy: $request->getData('sort_by') ?? '',
sortOrder: $request->getData('sort_order') ?? OrderType::DESC,
id: $request->getDataInt('id') ?? 0,
secondaryId: $request->getDataString('subid') ?? '',
type: $request->getDataString('pType'),
pageLimit: empty($request->getDataInt('limit') ?? 0) ? 100 : ((int) $request->getData('limit')),
sortBy: $request->getDataString('sort_by') ?? '',
sortOrder: $request->getDataString('sort_order') ?? OrderType::DESC,
searchFields: $searchField,
filters: $filterField
);

4
Controller/Controller.php
View File

@ -6,7 +6,7 @@
*
* @package Modules\OnlineResourceWatcher
* @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;
* OnlineResourceWatcher controller class.
*
* @package Modules\OnlineResourceWatcher
* @license OMS License 1.0
* @license OMS License 2.0
* @link https://jingga.app
* @since 1.0.0
*/

4
Models/NullResource.php
View File

@ -6,7 +6,7 @@
*
* @package Modules\OnlineResourceWatcher\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\OnlineResourceWatcher\Models;
* Null model
*
* @package Modules\OnlineResourceWatcher\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\OnlineResourceWatcher\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\OnlineResourceWatcher\Models
* @license OMS License 1.0
* @license OMS License 2.0
* @link https://jingga.app
* @since 1.0.0
*/

4
Models/Report.php
View File

@ -6,7 +6,7 @@
*
* @package Modules\OnlineResourceWatcher\Models
* @copyright Dennis Eichhorn
* @license OMS License 1.0
* @license OMS License 2.0
* @version 1.0.0
* @link https://jingga.app
*/
@ -21,7 +21,7 @@ use Modules\Admin\Models\NullAccount;
* Report class.
*
* @package Modules\OnlineResourceWatcher\Models
* @license OMS License 1.0
* @license OMS License 2.0
* @link https://jingga.app
* @since 1.0.0
*/

4
Models/ReportMapper.php
View File

@ -6,7 +6,7 @@
*
* @package Modules\OnlineResourceWatcher\Models
* @copyright Dennis Eichhorn
* @license OMS License 1.0
* @license OMS License 2.0
* @version 1.0.0
* @link https://jingga.app
*/
@ -21,7 +21,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
* Resource mapper class.
*
* @package Modules\OnlineResourceWatcher\Models
* @license OMS License 1.0
* @license OMS License 2.0
* @link https://jingga.app
* @since 1.0.0
*/

4
Models/ReportStatus.php
View File

@ -6,7 +6,7 @@
*
* @package Modules\OnlineResourceWatcher\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;
* Event type enum.
*
* @package Modules\OnlineResourceWatcher\Models
* @license OMS License 1.0
* @license OMS License 2.0
* @link https://jingga.app
* @since 1.0.0
*/

4
Models/Resource.php
View File

@ -6,7 +6,7 @@
*
* @package Modules\OnlineResourceWatcher\Models
* @copyright Dennis Eichhorn
* @license OMS License 1.0
* @license OMS License 2.0
* @version 1.0.0
* @link https://jingga.app
*/
@ -21,7 +21,7 @@ use Modules\Admin\Models\NullAccount;
* Resource class.
*
* @package Modules\OnlineResourceWatcher\Models
* @license OMS License 1.0
* @license OMS License 2.0
* @link https://jingga.app
* @since 1.0.0
*/

4
Models/ResourceMapper.php
View File

@ -6,7 +6,7 @@
*
* @package Modules\OnlineResourceWatcher\Models
* @copyright Dennis Eichhorn
* @license OMS License 1.0
* @license OMS License 2.0
* @version 1.0.0
* @link https://jingga.app
*/
@ -21,7 +21,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
* Resource mapper class.
*
* @package Modules\OnlineResourceWatcher\Models
* @license OMS License 1.0
* @license OMS License 2.0
* @link https://jingga.app
* @since 1.0.0
*/

4
Models/ResourceStatus.php
View File

@ -6,7 +6,7 @@
*
* @package Modules\OnlineResourceWatcher\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;
* Event type enum.
*
* @package Modules\OnlineResourceWatcher\Models
* @license OMS License 1.0
* @license OMS License 2.0
* @link https://jingga.app
* @since 1.0.0
*/

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.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/de.lang.php
View File

@ -6,7 +6,7 @@
*
* @package Modules\OnlineResourceWatcher
* @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\OnlineResourceWatcher
* @copyright Dennis Eichhorn
* @license OMS License 1.0
* @license OMS License 2.0
* @version 1.0.0
* @link https://jingga.app
*/

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

@ -6,7 +6,7 @@
*
* @package Web\Backend
* @copyright Dennis Eichhorn
* @license OMS License 1.0
* @license OMS License 2.0
* @version 1.0.0
* @link https://jingga.app
*/
@ -76,7 +76,7 @@ use phpOMS\Uri\UriFactory;
<td><?= $this->getHtml('User', '0', '0'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
<td><?= $this->getHtml('Email', '0', '0'); ?><i class="sort-asc fa fa-chevron-up"></i><i class="sort-desc fa fa-chevron-down"></i>
<tbody>
<?php $c = 0; foreach ([] as $key => $value) : ++$c; $url = UriFactory::build('{/lang}/{/app}/admin/account/settings?{?}&id=' . $value->getId()); ?>
<?php $c = 0; foreach ([] as $key => $value) : ++$c; $url = UriFactory::build('{/base}/admin/account/settings?{?}&id=' . $value->getId()); ?>
<tr data-href="<?= $url; ?>">
<td>
<td>

6
Theme/Backend/resource-list.tpl.php
View File

@ -6,7 +6,7 @@
*
* @package Modules\OnlineResourceWatcher
* @copyright Dennis Eichhorn
* @license OMS License 1.0
* @license OMS License 2.0
* @version 1.0.0
* @link https://jingga.app
*/
@ -44,7 +44,7 @@ $next = $tableView->getNextLink(
<?= $tableView->renderTitle(
$this->getHtml('Resources')
); ?>
<a class="button rf save" href="<?= UriFactory::build('{/lang}/{/app}/'); ?>orw/resources/create"><?= $this->getHtml('New', '0', '0'); ?></a>
<a class="button rf save" href="<?= UriFactory::build('{/base}/'); ?>orw/resources/create"><?= $this->getHtml('New', '0', '0'); ?></a>
</div>
<div class="slider">
<table id="<?= $tableView->id; ?>" class="default sticky">
@ -78,7 +78,7 @@ $next = $tableView->getNextLink(
<tbody>
<?php $count = 0;
foreach ($resources as $key => $resource) : ++$count;
$url = UriFactory::build('{/lang}/{/app}/orw/resource?id=' . $resource->getId()); ?>
$url = UriFactory::build('{/base}/orw/resource?id=' . $resource->getId()); ?>
<tr tabindex="0" data-href="<?= $url; ?>">
<td><?= $resource->getId(); ?>
<td><?= $this->printHtml($resource->title); ?>

2
Theme/Backend/resource-single.tpl.php
View File

@ -6,7 +6,7 @@
*
* @package Web\Backend
* @copyright Dennis Eichhorn
* @license OMS License 1.0
* @license OMS License 2.0
* @version 1.0.0
* @link https://jingga.app
*/

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