diff --git a/Admin/Settings/Theme/Backend/settings.tpl.php b/Admin/Settings/Theme/Backend/settings.tpl.php index 97dc1b5..5a38bc2 100755 --- a/Admin/Settings/Theme/Backend/settings.tpl.php +++ b/Admin/Settings/Theme/Backend/settings.tpl.php @@ -45,10 +45,10 @@ echo $this->data['nav']->render();
@@ -103,7 +103,7 @@ echo $this->data['nav']->render(); info - +
@@ -167,7 +167,7 @@ echo $this->data['nav']->render();
- +
diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 350dea5..64dc741 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -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; diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 19a6b98..62493bc 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -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'); diff --git a/Models/AccountExternalMapper.php b/Models/AccountExternalMapper.php index 028d381..c24373c 100755 --- a/Models/AccountExternalMapper.php +++ b/Models/AccountExternalMapper.php @@ -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'], ]; /** diff --git a/Models/AccountMapper.php b/Models/AccountMapper.php index 9a2f2c6..f0bca3c 100755 --- a/Models/AccountMapper.php +++ b/Models/AccountMapper.php @@ -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 */ diff --git a/Models/ModuleStatusUpdateType.php b/Models/ModuleStatusUpdateType.php index b136d38..f808c41 100755 --- a/Models/ModuleStatusUpdateType.php +++ b/Models/ModuleStatusUpdateType.php @@ -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 diff --git a/Models/PermissionCategory.php b/Models/PermissionCategory.php index caaf3f0..1340b05 100755 --- a/Models/PermissionCategory.php +++ b/Models/PermissionCategory.php @@ -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 diff --git a/Theme/Backend/Components/AccountPermissionSelector/account-permission-selector.tpl.php b/Theme/Backend/Components/AccountPermissionSelector/account-permission-selector.tpl.php index 839550d..5de3b68 100644 --- a/Theme/Backend/Components/AccountPermissionSelector/account-permission-selector.tpl.php +++ b/Theme/Backend/Components/AccountPermissionSelector/account-permission-selector.tpl.php @@ -1,6 +1,6 @@ book -
getHtml('Permissions', 'Admin', 'Backend'); ?>download
- book - [ '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', diff --git a/Theme/Backend/accounts-single.tpl.php b/Theme/Backend/accounts-single.tpl.php index 52fcf32..a607faf 100755 --- a/Theme/Backend/accounts-single.tpl.php +++ b/Theme/Backend/accounts-single.tpl.php @@ -62,11 +62,11 @@ echo $this->data['nav']->render(); ?>
    -
    • -
    • -
    • -
    • -
    • +
  • +
  • +
  • +
  • +
@@ -189,7 +189,7 @@ echo $this->data['nav']->render(); ?>
getHtml('Groups'); ?>download
-
+
@@ -333,7 +333,7 @@ echo $this->data['nav']->render(); ?>
getHtml('Permissions'); ?>download
- data['nav']->render(); ?>
    -
    • -
    • -
    • -
    • +
  • +
  • +
  • +
@@ -59,7 +59,7 @@ echo $this->data['nav']->render(); ?>
- +
@@ -117,7 +117,7 @@ echo $this->data['nav']->render(); ?>
getHtml('Accounts'); ?>download
-
data['nav']->render(); ?>
getHtml('Permissions'); ?>download
-
-
getHtml('Website'); ?> printHtml($modules[$id]->get()['creator']['website']); ?> -
getHtml('Description'); ?> - printHtml($modules[$id]->get()['description']); ?>
diff --git a/Theme/Backend/modules-list.tpl.php b/Theme/Backend/modules-list.tpl.php index 900e036..356d5db 100755 --- a/Theme/Backend/modules-list.tpl.php +++ b/Theme/Backend/modules-list.tpl.php @@ -29,7 +29,6 @@ $tableView->baseUri = 'admin/module/list'; $tableView->exportUri = '{/api}admin/module/list/export'; $tableView->setObjects($modules); ?> -
diff --git a/Theme/Backend/modules-log.tpl.php b/Theme/Backend/modules-log.tpl.php index bcdd340..e96387b 100755 --- a/Theme/Backend/modules-log.tpl.php +++ b/Theme/Backend/modules-log.tpl.php @@ -31,7 +31,7 @@ echo $this->data['nav']->render();
getHtml('Audits', 'Auditor'); ?>download
- +
diff --git a/Theme/Backend/settings-general.tpl.php b/Theme/Backend/settings-general.tpl.php index 1ac0429..3fb0684 100755 --- a/Theme/Backend/settings-general.tpl.php +++ b/Theme/Backend/settings-general.tpl.php @@ -43,10 +43,10 @@ $l11n = $this->getData('defaultlocalization') ?? new NullLocalization();
    -
    • -
    • -
    • -
    • +
  • +
  • +
  • +
@@ -82,7 +82,7 @@ $l11n = $this->getData('defaultlocalization') ?? new NullLocalization(); info - +
@@ -146,7 +146,7 @@ $l11n = $this->getData('defaultlocalization') ?? new NullLocalization();
- +
diff --git a/Theme/Cli/encryption-change.tpl.php b/Theme/Cli/encryption-change.tpl.php index 7f3b986..fa03171 100644 --- a/Theme/Cli/encryption-change.tpl.php +++ b/Theme/Cli/encryption-change.tpl.php @@ -1,4 +1,4 @@ -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'; diff --git a/tests/Models/AppTest.php b/tests/Models/AppTest.php index b94067f..40a05bd 100755 --- a/tests/Models/AppTest.php +++ b/tests/Models/AppTest.php @@ -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() diff --git a/tests/Models/DataChangeTest.php b/tests/Models/DataChangeTest.php index e82f75e..0b6b84f 100644 --- a/tests/Models/DataChangeTest.php +++ b/tests/Models/DataChangeTest.php @@ -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()