From c5d3478d673616d09d47fec3ac8e4ce9b5d7aaf8 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 19 Feb 2022 13:57:38 +0100 Subject: [PATCH] fix name --- Admin/Install/Navigation.php | 6 +++--- Admin/InstallType.php | 6 +++--- Admin/Installer.php | 8 ++++---- Admin/Routes/Web/Api.php | 4 ++-- Admin/Routes/Web/Backend.php | 4 ++-- Admin/Settings/Theme/Backend/settings.tpl.php | 4 ++-- Admin/Status.php | 6 +++--- Admin/Uninstaller.php | 6 +++--- Admin/Updater.php | 6 +++--- CONTRIBUTING.md | 4 ++-- Controller/ApiController.php | 10 +++++----- Controller/BackendController.php | 6 +++--- Controller/ConsoleController.php | 6 +++--- Controller/Controller.php | 6 +++--- Docs/Dev/img/er.png | Bin .../Help/img/general/settings-localization-area.png | Bin .../img/general/settings-localization-length.png | Bin .../img/general/settings-localization-numeric.png | Bin .../img/general/settings-localization-precision.png | Bin .../img/general/settings-localization-speed.png | Bin .../Help/img/general/settings-localization-time.png | Bin .../img/general/settings-localization-volume.png | Bin .../img/general/settings-localization-weight.png | Bin Docs/Help/img/general/settings-localization.png | Bin Models/Account.php | 6 +++--- Models/AccountMapper.php | 8 ++++---- Models/AccountPermission.php | 6 +++--- Models/AccountPermissionMapper.php | 6 +++--- Models/Address.php | 6 +++--- Models/AddressMapper.php | 6 +++--- Models/App.php | 6 +++--- Models/AppMapper.php | 6 +++--- Models/Group.php | 6 +++--- Models/GroupMapper.php | 12 +++++++++--- Models/GroupPermission.php | 6 +++--- Models/GroupPermissionMapper.php | 6 +++--- Models/LocalizationMapper.php | 6 +++--- Models/Module.php | 6 +++--- Models/ModuleMapper.php | 6 +++--- Models/ModuleStatusUpdateType.php | 6 +++--- Models/NullAccount.php | 6 +++--- Models/NullAccountPermission.php | 6 +++--- Models/NullAddress.php | 6 +++--- Models/NullGroup.php | 6 +++--- Models/NullGroupPermission.php | 6 +++--- Models/NullModule.php | 6 +++--- Models/PermissionAbstractMapper.php | 6 +++--- Models/PermissionQueryBuilder.php | 6 +++--- Models/PermissionState.php | 6 +++--- .../GroupTagSelector/GroupTagSelectorPopupView.php | 6 +++--- .../GroupTagSelector/GroupTagSelectorView.php | 6 +++--- Theme/Backend/Lang/Navigation.ar.lang.php | 4 ++-- Theme/Backend/Lang/Navigation.cs.lang.php | 4 ++-- Theme/Backend/Lang/Navigation.da.lang.php | 4 ++-- Theme/Backend/Lang/Navigation.de.lang.php | 4 ++-- Theme/Backend/Lang/Navigation.el.lang.php | 4 ++-- Theme/Backend/Lang/Navigation.en.lang.php | 4 ++-- Theme/Backend/Lang/Navigation.es.lang.php | 4 ++-- Theme/Backend/Lang/Navigation.fi.lang.php | 4 ++-- Theme/Backend/Lang/Navigation.fr.lang.php | 4 ++-- Theme/Backend/Lang/Navigation.hu.lang.php | 4 ++-- Theme/Backend/Lang/Navigation.it.lang.php | 4 ++-- Theme/Backend/Lang/Navigation.ja.lang.php | 4 ++-- Theme/Backend/Lang/Navigation.ko.lang.php | 4 ++-- Theme/Backend/Lang/Navigation.no.lang.php | 4 ++-- Theme/Backend/Lang/Navigation.pl.lang.php | 4 ++-- Theme/Backend/Lang/Navigation.pt.lang.php | 4 ++-- Theme/Backend/Lang/Navigation.ru.lang.php | 4 ++-- Theme/Backend/Lang/Navigation.sv.lang.php | 4 ++-- Theme/Backend/Lang/Navigation.th.lang.php | 4 ++-- Theme/Backend/Lang/Navigation.tr.lang.php | 4 ++-- Theme/Backend/Lang/Navigation.uk.lang.php | 4 ++-- Theme/Backend/Lang/Navigation.zh.lang.php | 4 ++-- Theme/Backend/Lang/api.en.lang.php | 4 ++-- Theme/Backend/Lang/ar.lang.php | 4 ++-- Theme/Backend/Lang/cs.lang.php | 4 ++-- Theme/Backend/Lang/da.lang.php | 4 ++-- Theme/Backend/Lang/de.lang.php | 4 ++-- Theme/Backend/Lang/el.lang.php | 4 ++-- Theme/Backend/Lang/en.lang.php | 4 ++-- Theme/Backend/Lang/es.lang.php | 4 ++-- Theme/Backend/Lang/fi.lang.php | 4 ++-- Theme/Backend/Lang/fr.lang.php | 4 ++-- Theme/Backend/Lang/hu.lang.php | 4 ++-- Theme/Backend/Lang/it.lang.php | 4 ++-- Theme/Backend/Lang/ja.lang.php | 4 ++-- Theme/Backend/Lang/ko.lang.php | 4 ++-- Theme/Backend/Lang/no.lang.php | 4 ++-- Theme/Backend/Lang/pl.lang.php | 4 ++-- Theme/Backend/Lang/pt.lang.php | 4 ++-- Theme/Backend/Lang/ru.lang.php | 4 ++-- Theme/Backend/Lang/sv.lang.php | 4 ++-- Theme/Backend/Lang/th.lang.php | 4 ++-- Theme/Backend/Lang/tr.lang.php | 4 ++-- Theme/Backend/Lang/uk.lang.php | 4 ++-- Theme/Backend/Lang/zh.lang.php | 4 ++-- Theme/Backend/accounts-create.tpl.php | 4 ++-- Theme/Backend/accounts-list.tpl.php | 4 ++-- Theme/Backend/accounts-single.tpl.php | 4 ++-- Theme/Backend/groups-create.tpl.php | 4 ++-- Theme/Backend/groups-list.tpl.php | 4 ++-- Theme/Backend/groups-single.tpl.php | 4 ++-- Theme/Backend/modules-info.tpl.php | 4 ++-- Theme/Backend/modules-list.tpl.php | 4 ++-- Theme/Backend/modules-log.tpl.php | 4 ++-- Theme/Backend/modules-route-list.tpl.php | 4 ++-- Theme/Backend/modules-settings.tpl.php | 4 ++-- Theme/Backend/page-list.tpl.php | 4 ++-- Theme/Backend/settings-general.tpl.php | 4 ++-- composer.json | 4 ++-- info.json | 2 +- tests/Admin/AdminTest.php | 4 ++-- tests/Autoloader.php | 6 +++--- tests/Controller/Api/ApiControllerAccountTrait.php | 8 ++++---- .../Api/ApiControllerApplicationTrait.php | 4 ++-- tests/Controller/Api/ApiControllerGroupTrait.php | 4 ++-- tests/Controller/Api/ApiControllerModuleTrait.php | 4 ++-- .../Controller/Api/ApiControllerPermissionTrait.php | 4 ++-- tests/Controller/Api/ApiControllerSettingsTrait.php | 4 ++-- tests/Controller/ApiControllerTest.php | 4 ++-- tests/Models/AccountMapperTest.php | 4 ++-- tests/Models/AccountPermissionTest.php | 4 ++-- tests/Models/AccountTest.php | 4 ++-- tests/Models/AddressMapperTest.php | 4 ++-- tests/Models/AddressTest.php | 4 ++-- tests/Models/AppMapperTest.php | 4 ++-- tests/Models/AppTest.php | 4 ++-- tests/Models/GroupMapperTest.php | 4 ++-- tests/Models/GroupPermissionTest.php | 4 ++-- tests/Models/GroupTest.php | 4 ++-- tests/Models/LocalizationMapperTest.php | 4 ++-- tests/Models/ModuleTest.php | 4 ++-- tests/Models/NullAccountPermissionTest.php | 4 ++-- tests/Models/NullAccountTest.php | 4 ++-- tests/Models/NullAddressTest.php | 4 ++-- tests/Models/NullGroupPermissionTest.php | 4 ++-- tests/Models/NullGroupTest.php | 4 ++-- tests/Models/NullModuleTest.php | 4 ++-- 138 files changed, 305 insertions(+), 299 deletions(-) mode change 100644 => 100755 Docs/Dev/img/er.png mode change 100644 => 100755 Docs/Help/img/general/settings-localization-area.png mode change 100644 => 100755 Docs/Help/img/general/settings-localization-length.png mode change 100644 => 100755 Docs/Help/img/general/settings-localization-numeric.png mode change 100644 => 100755 Docs/Help/img/general/settings-localization-precision.png mode change 100644 => 100755 Docs/Help/img/general/settings-localization-speed.png mode change 100644 => 100755 Docs/Help/img/general/settings-localization-time.png mode change 100644 => 100755 Docs/Help/img/general/settings-localization-volume.png mode change 100644 => 100755 Docs/Help/img/general/settings-localization-weight.png mode change 100644 => 100755 Docs/Help/img/general/settings-localization.png mode change 100755 => 100644 Theme/Backend/Lang/Navigation.de.lang.php mode change 100755 => 100644 Theme/Backend/Lang/Navigation.en.lang.php mode change 100755 => 100644 Theme/Backend/Lang/ar.lang.php mode change 100755 => 100644 Theme/Backend/Lang/cs.lang.php mode change 100755 => 100644 Theme/Backend/Lang/da.lang.php mode change 100755 => 100644 Theme/Backend/Lang/de.lang.php mode change 100755 => 100644 Theme/Backend/Lang/el.lang.php mode change 100755 => 100644 Theme/Backend/Lang/en.lang.php mode change 100755 => 100644 Theme/Backend/Lang/es.lang.php mode change 100755 => 100644 Theme/Backend/Lang/fi.lang.php mode change 100755 => 100644 Theme/Backend/Lang/fr.lang.php mode change 100755 => 100644 Theme/Backend/Lang/hu.lang.php mode change 100755 => 100644 Theme/Backend/Lang/it.lang.php mode change 100755 => 100644 Theme/Backend/Lang/ja.lang.php mode change 100755 => 100644 Theme/Backend/Lang/ko.lang.php mode change 100755 => 100644 Theme/Backend/Lang/no.lang.php mode change 100755 => 100644 Theme/Backend/Lang/pl.lang.php mode change 100755 => 100644 Theme/Backend/Lang/pt.lang.php mode change 100755 => 100644 Theme/Backend/Lang/ru.lang.php mode change 100755 => 100644 Theme/Backend/Lang/sv.lang.php mode change 100755 => 100644 Theme/Backend/Lang/th.lang.php mode change 100755 => 100644 Theme/Backend/Lang/tr.lang.php mode change 100755 => 100644 Theme/Backend/Lang/uk.lang.php mode change 100755 => 100644 Theme/Backend/Lang/zh.lang.php diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php index 917d017..f476700 100755 --- a/Admin/Install/Navigation.php +++ b/Admin/Install/Navigation.php @@ -1,6 +1,6 @@ execute(new Setting(0, SettingsEnum::DEFAULT_ORGANIZATION, '1', '\\d+')); SettingMapper::create()->execute(new Setting(0, SettingsEnum::LOGIN_STATUS, '1', '[0-3]')); SettingMapper::create()->execute(new Setting(0, SettingsEnum::DEFAULT_LOCALIZATION, '1', '\\d+')); - SettingMapper::create()->execute(new Setting(0, SettingsEnum::MAIL_SERVER_ADDR, 'admin@orange-management.email', "(?:[a-z0-9!#$%&'*+\/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+\/=?^_`{|}~-]+)*|\"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*\")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9]))\.){3}(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9])|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])", module: 'Admin')); + SettingMapper::create()->execute(new Setting(0, SettingsEnum::MAIL_SERVER_ADDR, 'admin@karaka.email', "(?:[a-z0-9!#$%&'*+\/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+\/=?^_`{|}~-]+)*|\"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*\")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9]))\.){3}(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9])|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])", module: 'Admin')); SettingMapper::create()->execute(new Setting(0, SettingsEnum::MAIL_SERVER_TYPE, SubmitType::MAIL, module: 'Admin')); SettingMapper::create()->execute(new Setting(0, SettingsEnum::MAIL_SERVER_USER, '', module: 'Admin')); SettingMapper::create()->execute(new Setting(0, SettingsEnum::MAIL_SERVER_PASS, '', module: 'Admin')); diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php index a7a5089..5d573d7 100755 --- a/Admin/Routes/Web/Api.php +++ b/Admin/Routes/Web/Api.php @@ -1,6 +1,6 @@ setFrom($emailSettings[SettingsEnum::MAIL_SERVER_ADDR], 'Orange-Management'); $mail->addTo($account->email, \trim($account->name1 . ' ' . $account->name2 . ' ' . $account->name3)); - $mail->subject = 'Orange Management: Forgot Password'; + $mail->subject = 'Karaka: Forgot Password'; $mail->body = ''; $mail->msgHTML('Please reset your password at: ' . $resetLink . ''); @@ -333,7 +333,7 @@ final class ApiController extends Controller $mail = new Email(); $mail->setFrom($emailSettings[SettingsEnum::MAIL_SERVER_ADDR], 'Orange-Management'); $mail->addTo($account->email, \trim($account->name1 . ' ' . $account->name2 . ' ' . $account->name3)); - $mail->subject = 'Orange Management: Password reset'; + $mail->subject = 'Karaka: Password reset'; $mail->body = ''; $mail->msgHTML('Your new password: ' . $pass . '' . "\n\n" diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 6dc9e13..591dd1b 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -1,6 +1,6 @@ with('groups')->with('l11n')->where('id', $id)->execute(); + $account = self::get()->with('groups')->with('groups/permissions')->with('l11n')->where('id', $id)->execute(); $groups = \array_keys($account->getGroups()); $groupPermissions = empty($groups) diff --git a/Models/AccountPermission.php b/Models/AccountPermission.php index e6b5074..1116d3e 100755 --- a/Models/AccountPermission.php +++ b/Models/AccountPermission.php @@ -1,6 +1,6 @@ 'account_group_account', 'self' => 'account_group_group', ], + 'permissions' => [ + 'mapper' => GroupPermissionMapper::class, + 'table' => 'group_permission', + 'external' => null, + 'self' => 'group_permission_group', + ], ]; /** diff --git a/Models/GroupPermission.php b/Models/GroupPermission.php index 775b368..cc4d9d7 100755 --- a/Models/GroupPermission.php +++ b/Models/GroupPermission.php @@ -1,6 +1,6 @@ header->account = 1; $request->setData('id', 1); - $request->setData('email', 'oms@orange-management.de'); + $request->setData('email', 'oms@karaka.de'); $request->setData('password', 'orange'); $this->module->apiAccountUpdate($request, $response); $this->module->apiAccountGet($request, $response); - self::assertEquals('oms@orange-management.de', $response->get('')['response']->getEmail()); + self::assertEquals('oms@karaka.de', $response->get('')['response']->getEmail()); self::assertGreaterThan(0, $response->get('')['response']->getId()); } diff --git a/tests/Controller/Api/ApiControllerApplicationTrait.php b/tests/Controller/Api/ApiControllerApplicationTrait.php index bc00500..da6f183 100755 --- a/tests/Controller/Api/ApiControllerApplicationTrait.php +++ b/tests/Controller/Api/ApiControllerApplicationTrait.php @@ -1,6 +1,6 @@