This commit is contained in:
Dennis Eichhorn 2024-01-02 23:34:17 +00:00
parent 0d75e685da
commit cdccf946a7
22 changed files with 62 additions and 73 deletions

View File

@ -45,10 +45,10 @@ echo $this->data['nav']->render();
<div id="iSettings" class="tabview tab-2 url-rewrite">
<div class="box">
<ul class="tab-links">
<li><label for="c-tab-1"><?= $this->getHtml('General'); ?></label></li>
<li><label for="c-tab-2"><?= $this->getHtml('Localization'); ?></label></li>
<li><label for="c-tab-3"><?= $this->getHtml('Design'); ?></label></li>
<li><label for="c-tab-5"><?= $this->getHtml('Settings'); ?></label></li>
<li><label for="c-tab-1"><?= $this->getHtml('General'); ?></label>
<li><label for="c-tab-2"><?= $this->getHtml('Localization'); ?></label>
<li><label for="c-tab-3"><?= $this->getHtml('Design'); ?></label>
<li><label for="c-tab-5"><?= $this->getHtml('Settings'); ?></label>
</ul>
</div>
<div class="tab-content">
@ -103,7 +103,7 @@ echo $this->data['nav']->render();
<i class="tooltip" data-tooltip="<?= $this->getHtml('i:PasswordRegex'); ?>"><i class="g-icon">info</i></i>
</label>
<input id="iPassword" name="settings_1000000001" type="text" value="<?= $this->printHtml($generalSettings['1000000001']->content); ?>" placeholder="&#xf023; ^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[$@$!%*?&;:\(\)\[\]=\{\}\+\-])[A-Za-z\d$@$!%*?&;:\(\)\[\]=\{\}\+\-]{8,}">
<input id="iPassword" name="settings_1000000001" type="text" value="<?= $this->printHtml($generalSettings['1000000001']->content); ?>" placeholder="^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[$@$!%*?&;:\(\)\[\]=\{\}\+\-])[A-Za-z\d$@$!%*?&;:\(\)\[\]=\{\}\+\-]{8,}">
</div>
<div class="form-group">
@ -167,7 +167,7 @@ echo $this->data['nav']->render();
<div class="form-group">
<label for="iLogPath"><?= $this->getHtml('LogPath'); ?></label>
<input id="iLogPath" name="settings_1000000007" type="text" value="<?= $this->printHtml($generalSettings['1000000007']->content); ?>" placeholder="&#xf040; /Logs">
<input id="iLogPath" name="settings_1000000007" type="text" value="<?= $this->printHtml($generalSettings['1000000007']->content); ?>" placeholder="/Logs">
</div>
</div>
<div class="portlet-foot">

View File

@ -954,7 +954,7 @@ final class ApiController extends Controller
}
/**
* Routing end-point for application behaviour.
* Routing end-point for application behavior.
*
* @param RequestAbstract $request Request
* @param ResponseAbstract $response Response
@ -3076,7 +3076,7 @@ final class ApiController extends Controller
}
/**
* Routing end-point for application behaviour.
* Routing end-point for application behavior.
*
* @param RequestAbstract $request Request
* @param ResponseAbstract $response Response
@ -3456,7 +3456,7 @@ final class ApiController extends Controller
*/
public function updateContactFromRequest(RequestAbstract $request, Contact $new) : Contact
{
$new->type = $request->getDataInt('type') ?? $new->type;
$new->type = $request->getDataInt('type') ?? $new->type;
$new->subtype = $request->getDataInt('subtype') ?? $new->subtype;
$new->content = $request->getDataString('content') ?? $new->content;
$new->account = $request->getDataInt('account') ?? $new->account;

View File

@ -533,10 +533,6 @@ final class BackendController extends Controller
*/
public function viewModuleList(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface
{
/** @var \phpOMS\Model\Html\Head $head */
$head = $response->data['Content']->head;
$head->addAsset(AssetType::CSS, 'Modules/Admin/Theme/Backend/css/styles.css?v=1.0.0');
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Admin/Theme/Backend/modules-list');

View File

@ -36,16 +36,16 @@ class AccountExternalMapper extends DataMapperFactory
* @since 1.0.0
*/
public const COLUMNS = [
'account_external_id' => ['name' => 'account_external_id', 'type' => 'int', 'internal' => 'id'],
'account_external_status' => ['name' => 'account_external_status', 'type' => 'int', 'internal' => 'status'],
'account_external_type' => ['name' => 'account_external_type', 'type' => 'int', 'internal' => 'type'],
'account_external_subtype' => ['name' => 'account_external_subtype', 'type' => 'int', 'internal' => 'subtype'],
'account_external_name' => ['name' => 'account_external_name', 'type' => 'string', 'internal' => 'name'],
'account_external_uid' => ['name' => 'account_external_uid', 'type' => 'string', 'internal' => 'uid', ],
'account_external_login' => ['name' => 'account_external_login', 'type' => 'string', 'internal' => 'login', ],
'account_external_id' => ['name' => 'account_external_id', 'type' => 'int', 'internal' => 'id'],
'account_external_status' => ['name' => 'account_external_status', 'type' => 'int', 'internal' => 'status'],
'account_external_type' => ['name' => 'account_external_type', 'type' => 'int', 'internal' => 'type'],
'account_external_subtype' => ['name' => 'account_external_subtype', 'type' => 'int', 'internal' => 'subtype'],
'account_external_name' => ['name' => 'account_external_name', 'type' => 'string', 'internal' => 'name'],
'account_external_uid' => ['name' => 'account_external_uid', 'type' => 'string', 'internal' => 'uid', ],
'account_external_login' => ['name' => 'account_external_login', 'type' => 'string', 'internal' => 'login', ],
'account_external_password' => ['name' => 'account_external_password', 'type' => 'string', 'internal' => 'password', ],
'account_external_key' => ['name' => 'account_external_key', 'type' => 'string', 'internal' => 'key'],
'account_external_account' => ['name' => 'account_external_account', 'type' => 'int', 'internal' => 'account'],
'account_external_key' => ['name' => 'account_external_key', 'type' => 'string', 'internal' => 'key'],
'account_external_account' => ['name' => 'account_external_account', 'type' => 'int', 'internal' => 'account'],
];
/**

View File

@ -170,8 +170,8 @@ class AccountMapper extends DataMapperFactory
from `group`
join group_permission on `group`.group_id = group_permission.group_permission_group
join account_group on group_permission.group_permission_group = account_group.account_group_group
AND account_group.account_group_account = ((int) $id)
where `group`.group_status = 1;
AND account_group.account_group_account = ((int) $id)
where `group`.group_status = 1;
*/
/** @var \Modules\Admin\Models\Account $account */

View File

@ -17,7 +17,7 @@ namespace Modules\Admin\Models;
use phpOMS\Stdlib\Base\Enum;
/**
* Permision state enum.
* Permission category enum.
*
* @package Modules\Admin\Models
* @license OMS License 2.0

View File

@ -17,7 +17,7 @@ namespace Modules\Admin\Models;
use phpOMS\Stdlib\Base\Enum;
/**
* Permision state enum.
* Permission category enum.
*
* @package Modules\Admin\Models
* @license OMS License 2.0

View File

@ -1,6 +1,6 @@
<?php
/**
* Karaka
* Jingga
*
* PHP Version 8.1
*
@ -41,7 +41,7 @@ $categories = ISO639Enum::getConstants();
]
}
]'><i class="g-icon">book</i></button>
<input type="text" list="<?= $this->id; ?>-datalist" id="<?= $this->id; ?>" name="receiver" placeholder="&#xf007; Guest" data-action='[
<input type="text" list="<?= $this->id; ?>-datalist" id="<?= $this->id; ?>" name="receiver" placeholder="Guest" data-action='[
{
"key": 1, "listener": "keyup", "action": [
{"key": 1, "type": "validate.keypress", "pressed": "!13!37!38!39!40"},
@ -196,7 +196,7 @@ $categories = ISO639Enum::getConstants();
<section class="portlet">
<div class="portlet-head"><?= $this->getHtml('Permissions', 'Admin', 'Backend'); ?><i class="g-icon download btn end-xs">download</i></div>
<div class="slider">
<table id="attributeTable" class="default"
<table id="attributeTable" class="default sticky"
data-tag="form"
data-ui-element="tr"
data-add-tpl=".oms-add-tpl-attribute"

View File

@ -13,7 +13,7 @@
]
}
]'><i class="g-icon">book</i></button>
<input type="text" list="<?= $this->id; ?>-datalist" id="<?= $this->id; ?>" name="receiver" placeholder="&#xf007; Guest" data-action='[
<input type="text" list="<?= $this->id; ?>-datalist" id="<?= $this->id; ?>" name="receiver" placeholder="Guest" data-action='[
{
"key": 1, "listener": "keyup", "action": [
{"key": 1, "type": "validate.keypress", "pressed": "!13!37!38!39!40"},

View File

@ -188,7 +188,7 @@ return ['Admin' => [
'Zip' => 'Zip.',
'active' => '',
'available' => '',
'i:LoginRetries' => 'Mængden af tilladte retries (-1 = ubegrænset)',
'i:LoginRetries' => "Mængden af \u{200b}\u{200b}tilladte retries (-1 = ubegrænset)",
'i:PasswordChangeInterval' => 'Interval, hvor passager skal ændres (-1 = aldrig)',
'i:PasswordHistory' => 'Ny adgangskode skal være forskellig fra de sidste N-adgangskoder',
'i:PasswordRegex' => 'Adgangskode krav til brugere',

View File

@ -62,11 +62,11 @@ echo $this->data['nav']->render(); ?>
<div id="iaccount-tabs" class="tabview tab-2 url-rewrite">
<div class="box">
<ul class="tab-links">
<li><label for="c-tab-1"><?= $this->getHtml('General'); ?></label></li>
<li><label for="c-tab-2"><?= $this->getHtml('Groups'); ?></label></li>
<li><label for="c-tab-3"><?= $this->getHtml('Permissions'); ?></label></li>
<li><label for="c-tab-4"><?= $this->getHtml('Localization'); ?></label></li>
<li><label for="c-tab-5"><?= $this->getHtml('AuditLog'); ?></label></li>
<li><label for="c-tab-1"><?= $this->getHtml('General'); ?></label>
<li><label for="c-tab-2"><?= $this->getHtml('Groups'); ?></label>
<li><label for="c-tab-3"><?= $this->getHtml('Permissions'); ?></label>
<li><label for="c-tab-4"><?= $this->getHtml('Localization'); ?></label>
<li><label for="c-tab-5"><?= $this->getHtml('AuditLog'); ?></label>
</ul>
</div>
<div class="tab-content">
@ -189,7 +189,7 @@ echo $this->data['nav']->render(); ?>
<div class="col-xs-12">
<div class="portlet">
<div class="portlet-head"><?= $this->getHtml('Groups'); ?><i class="g-icon download btn end-xs">download</i></div>
<table id="groupTable" class="default">
<table id="groupTable" class="default sticky">
<thead>
<tr>
<td>
@ -333,7 +333,7 @@ echo $this->data['nav']->render(); ?>
<div class="portlet">
<div class="portlet-head"><?= $this->getHtml('Permissions'); ?><i class="g-icon download btn end-xs">download</i></div>
<div class="slider">
<table id="permissionTable" class="default"
<table id="permissionTable" class="default sticky"
data-tag="form"
data-ui-element="tr"
data-add-tpl=".oms-add-tpl-permission"

View File

@ -38,10 +38,10 @@ echo $this->data['nav']->render(); ?>
<div id="igroup-tabs" class="tabview tab-2 url-rewrite">
<div class="box">
<ul class="tab-links">
<li><label for="c-tab-1"><?= $this->getHtml('General'); ?></label></li>
<li><label for="c-tab-2"><?= $this->getHtml('Accounts'); ?></label></li>
<li><label for="c-tab-3"><?= $this->getHtml('Permissions'); ?></label></li>
<li><label for="c-tab-4"><?= $this->getHtml('AuditLog'); ?></label></li>
<li><label for="c-tab-1"><?= $this->getHtml('General'); ?></label>
<li><label for="c-tab-2"><?= $this->getHtml('Accounts'); ?></label>
<li><label for="c-tab-3"><?= $this->getHtml('Permissions'); ?></label>
<li><label for="c-tab-4"><?= $this->getHtml('AuditLog'); ?></label>
</ul>
</div>
<div class="tab-content">
@ -59,7 +59,7 @@ echo $this->data['nav']->render(); ?>
</div>
<div class="form-group">
<label for="iGname"><?= $this->getHtml('Name'); ?></label>
<input id="iGname" name="name" type="text" spellcheck="false" autocomplete="off" placeholder="&#xf0c0; Guest" value="<?= $this->printHtml($group->name); ?>">
<input id="iGname" name="name" type="text" spellcheck="false" autocomplete="off" placeholder="Guest" value="<?= $this->printHtml($group->name); ?>">
</div>
<div class="form-group">
<label for="iGstatus"><?= $this->getHtml('Status'); ?></label>
@ -117,7 +117,7 @@ echo $this->data['nav']->render(); ?>
<div class="col-xs-12">
<div class="portlet">
<div class="portlet-head"><?= $this->getHtml('Accounts'); ?><i class="g-icon download btn end-xs">download</i></div>
<table id="accountTable" class="default"
<table id="accountTable" class="default sticky"
data-tag="form"
data-ui-element="tr"
data-add-tpl=".oms-add-tpl-account"
@ -282,7 +282,7 @@ echo $this->data['nav']->render(); ?>
<div class="portlet">
<div class="portlet-head"><?= $this->getHtml('Permissions'); ?><i class="g-icon download btn end-xs">download</i></div>
<div class="slider">
<table id="permissionTable" class="default"
<table id="permissionTable" class="default sticky"
data-tag="form"
data-ui-element="tr"
data-add-tpl=".oms-add-tpl-permission"

View File

@ -48,9 +48,6 @@ if (isset($installed[$id])) {
<tr>
<td><?= $this->getHtml('Website'); ?>
<td><?= $this->printHtml($modules[$id]->get()['creator']['website']); ?>
<tr>
<td><?= $this->getHtml('Description'); ?>
<td><?= $this->printHtml($modules[$id]->get()['description']); ?>
</table>
</div>
<div class="portlet-foot">

View File

@ -29,7 +29,6 @@ $tableView->baseUri = 'admin/module/list';
$tableView->exportUri = '{/api}admin/module/list/export';
$tableView->setObjects($modules);
?>
<div class="row">
<div class="col-xs-12">
<div class="portlet">

View File

@ -31,7 +31,7 @@ echo $this->data['nav']->render();
<div class="portlet">
<div class="portlet-head"><?= $this->getHtml('Audits', 'Auditor'); ?><i class="g-icon download btn end-xs">download</i></div>
<div class="slider">
<table class="default">
<table class="default sticky">
<colgroup>
<col style="width: 75px">
<col style="width: 150px">

View File

@ -43,10 +43,10 @@ $l11n = $this->getData('defaultlocalization') ?? new NullLocalization();
<div class="tabview tab-2 url-rewrite">
<div class="box">
<ul class="tab-links">
<li><label for="c-tab-1"><?= $this->getHtml('General'); ?></label></li>
<li><label for="c-tab-2"><?= $this->getHtml('Localization'); ?></label></li>
<li><label for="c-tab-3"><?= $this->getHtml('Settings'); ?></label></li>
<li><label for="c-tab-4"><?= $this->getHtml('Design'); ?></label></li>
<li><label for="c-tab-1"><?= $this->getHtml('General'); ?></label>
<li><label for="c-tab-2"><?= $this->getHtml('Localization'); ?></label>
<li><label for="c-tab-3"><?= $this->getHtml('Settings'); ?></label>
<li><label for="c-tab-4"><?= $this->getHtml('Design'); ?></label>
</ul>
</div>
<div class="tab-content">
@ -82,7 +82,7 @@ $l11n = $this->getData('defaultlocalization') ?? new NullLocalization();
<i class="tooltip" data-tooltip="<?= $this->getHtml('i:PasswordRegex'); ?>"><i class="g-icon">info</i></i>
</label>
<input id="iPassword" name="settings_1000000001" type="text" value="<?= $this->printHtml($generalSettings['1000000001']->content); ?>" placeholder="&#xf023; ^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[$@$!%*?&;:\(\)\[\]=\{\}\+\-])[A-Za-z\d$@$!%*?&;:\(\)\[\]=\{\}\+\-]{8,}">
<input id="iPassword" name="settings_1000000001" type="text" value="<?= $this->printHtml($generalSettings['1000000001']->content); ?>" placeholder="^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[$@$!%*?&;:\(\)\[\]=\{\}\+\-])[A-Za-z\d$@$!%*?&;:\(\)\[\]=\{\}\+\-]{8,}">
</div>
<div class="form-group">
@ -146,7 +146,7 @@ $l11n = $this->getData('defaultlocalization') ?? new NullLocalization();
<div class="form-group">
<label for="iLogPath"><?= $this->getHtml('LogPath'); ?></label>
<input id="iLogPath" name="settings_1000000007" type="text" value="<?= $this->printHtml($generalSettings['1000000007']->content); ?>" placeholder="&#xf040; /Logs">
<input id="iLogPath" name="settings_1000000007" type="text" value="<?= $this->printHtml($generalSettings['1000000007']->content); ?>" placeholder="/Logs">
</div>
</div>
<div class="portlet-foot">

View File

@ -1,4 +1,4 @@
<?php
<?php declare(strict_types=1);
echo 'Use "/admin/encryption/change -old {old_hash} -new {new_hash}" to change the encryption'
, "\n\n"

View File

@ -14,7 +14,6 @@
"name": "Jingga",
"website": "jingga.app"
},
"description": "The administration module.",
"directory": "Admin",
"dependencies": {},
"providing": {

View File

@ -4,7 +4,7 @@
*
* PHP Version 8.1
*
* @package Karaka
* @package Jingga
* @copyright Dennis Eichhorn
* @license OMS License 2.0
* @version 1.0.0

View File

@ -33,10 +33,10 @@ final class AddressMapperTest extends \PHPUnit\Framework\TestCase
{
$address = new Address();
$address->name = 'name';
$address->fao = 'fao';
$address->name = 'name';
$address->fao = 'fao';
$address->addressAddition = 'addition';
$address->postal = '0123456789';
$address->postal = '0123456789';
$address->setType(AddressType::BUSINESS);
$address->city = 'city';
$address->address = 'Some address here';

View File

@ -40,9 +40,9 @@ final class AppTest extends \PHPUnit\Framework\TestCase
$app = new App();
self::assertEquals(
[
'id' => 0,
'name' => '',
'type' => ApplicationType::WEB,
'id' => 0,
'name' => '',
'type' => ApplicationType::WEB,
'status' => ApplicationStatus::NORMAL,
],
$app->toArray()
@ -54,9 +54,9 @@ final class AppTest extends \PHPUnit\Framework\TestCase
$app = new App();
self::assertEquals(
[
'id' => 0,
'name' => '',
'type' => ApplicationType::WEB,
'id' => 0,
'name' => '',
'type' => ApplicationType::WEB,
'status' => ApplicationStatus::NORMAL,
],
$app->jsonSerialize()

View File

@ -15,8 +15,6 @@ declare(strict_types=1);
namespace Modules\Admin\tests\Models;
use Modules\Admin\Models\DataChange;
use phpOMS\Application\ApplicationStatus;
use phpOMS\Application\ApplicationType;
/**
* @testdox Modules\Admin\tests\Models\DataChangeTest: DataChange model
@ -40,7 +38,7 @@ final class DataChangeTest extends \PHPUnit\Framework\TestCase
public function testReHash() : void
{
$change = new DataChange();
$hash = $change->getHash();
$hash = $change->getHash();
$change->reHash();
self::assertNotEquals($hash, $change->getHash());
@ -51,7 +49,7 @@ final class DataChangeTest extends \PHPUnit\Framework\TestCase
$change = new DataChange();
self::assertEquals(
[
'id' => 0,
'id' => 0,
'data' => '',
],
$change->toArray()
@ -63,7 +61,7 @@ final class DataChangeTest extends \PHPUnit\Framework\TestCase
$change = new DataChange();
self::assertEquals(
[
'id' => 0,
'id' => 0,
'data' => '',
],
$change->jsonSerialize()