From bbbc520d9852e8fba58d78597dda060721f31292 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Mon, 31 Aug 2020 22:30:36 +0200 Subject: [PATCH] php cs autofix --- .github/workflows/main.yml | 2 +- Admin/Installer.php | 2 +- Admin/Routes/Web/Api.php | 236 +++++++++---------- Admin/Routes/Web/Backend.php | 76 +++--- Controller/ApiController.php | 6 +- Models/AccountMapper.php | 2 +- Models/GroupMapper.php | 6 +- Models/LocalizationMapper.php | 24 +- Theme/Backend/Lang/de.lang.php | 322 +++++++++++++------------- Theme/Backend/Lang/en.lang.php | 322 +++++++++++++------------- Theme/Backend/accounts-list.tpl.php | 12 +- Theme/Backend/accounts-single.tpl.php | 4 +- Theme/Backend/groups-list.tpl.php | 10 +- Theme/Backend/groups-single.tpl.php | 2 +- Theme/Backend/modules-list.tpl.php | 8 +- Theme/Backend/modules-single.tpl.php | 2 +- 16 files changed, 518 insertions(+), 518 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d44f65c..e942af8 100755 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,7 +26,7 @@ jobs: - name: Setup Composer run: composer install - name: Autoformat - run: 'vendor/bin/php-cs-fixer fix ./ --rules=''{"array_syntax": {"syntax": "short"}, "blank_line_after_namespace": true, "cast_spaces": {"space": "single"}, "class_attributes_separation": { "elements": ["const", "method", "property"] }, "combine_consecutive_issets": true, "compact_nullable_typehint": true, "declare_strict_types": true, "elseif": true, "encoding": true, "explicit_indirect_variable": true, "explicit_string_variable": true, "function_to_constant": true, "implode_call": true, "increment_style": {"style": "pre"}, "is_null": {"use_yoda_style": false}, "line_ending": true, "logical_operators": true, "lowercase_cast": true, "lowercase_constants": true, "lowercase_keywords": true, "modernize_types_casting": true, "native_constant_invocation": true, "native_function_casing": true, "native_function_invocation": true, "new_with_braces": true, "no_alias_functions": true, "no_closing_tag": true, "no_empty_comment": true, "no_empty_phpdoc": true, "no_empty_statement": true, "no_homoglyph_names": true, "no_mixed_echo_print": {"use": "echo"}, "no_php4_constructor": true, "no_singleline_whitespace_before_semicolons": true, "no_spaces_inside_parenthesis": true, "no_trailing_whitespace": true, "no_unneeded_final_method": true, "no_unused_imports": true, "no_useless_return": true, "no_whitespace_before_comma_in_array": true, "no_whitespace_in_blank_line": true, "non_printable_character": true, "normalize_index_brace": true, "ordered_imports": {"sort_algorithm": "alpha"}, "ordered_interfaces": {"order": "alpha"}, "php_unit_construct": true, "php_unit_internal_class": true, "php_unit_ordered_covers": true, "php_unit_set_up_tear_down_visibility": true, "phpdoc_indent": true, "phpdoc_align": {"align": "vertical"}, "phpdoc_annotation_without_dot": true, "phpdoc_scalar": true, "phpdoc_return_self_reference": {"this": "self"}, "phpdoc_trim": true, "phpdoc_trim_consecutive_blank_line_separation": true, "random_api_migration": true, "self_accessor": true, "return_type_declaration": {"space_before": "one"}, "semicolon_after_instruction": true, "set_type_to_cast": true, "short_scalar_cast": true, "single_blank_line_at_eof": true, "single_line_after_imports": true, "standardize_increment": true, "trailing_comma_in_multiline_array": true, "trim_array_spaces": true, "visibility_required": true, "void_return": true}'' --allow-risky=yes' + run: 'vendor/bin/php-cs-fixer fix ./ --rules=''{"array_syntax": {"syntax": "short"}, "blank_line_after_namespace": true, "binary_operator_spaces": {"operators": {"=": "align", ".=": "align", "+=": "align", "-=": "align", "*=": "align", "/=": "align", "|=": "align", "&=": "align", "=>": "align", "??=": "align"}}, "cast_spaces": {"space": "single"}, "class_attributes_separation": { "elements": ["const", "method", "property"] }, "combine_consecutive_issets": true, "compact_nullable_typehint": true, "declare_strict_types": true, "elseif": true, "encoding": true, "explicit_indirect_variable": true, "explicit_string_variable": true, "function_to_constant": true, "implode_call": true, "increment_style": {"style": "pre"}, "is_null": {"use_yoda_style": false}, "line_ending": true, "logical_operators": true, "lowercase_cast": true, "lowercase_constants": true, "lowercase_keywords": true, "modernize_types_casting": true, "native_constant_invocation": true, "native_function_casing": true, "native_function_invocation": true, "new_with_braces": true, "no_alias_functions": true, "no_closing_tag": true, "no_empty_comment": true, "no_empty_phpdoc": true, "no_empty_statement": true, "no_homoglyph_names": true, "no_mixed_echo_print": {"use": "echo"}, "no_php4_constructor": true, "no_singleline_whitespace_before_semicolons": true, "no_spaces_inside_parenthesis": true, "no_trailing_whitespace": true, "no_unneeded_final_method": true, "no_unused_imports": true, "no_useless_return": true, "no_whitespace_before_comma_in_array": true, "no_whitespace_in_blank_line": true, "non_printable_character": true, "normalize_index_brace": true, "ordered_imports": {"sort_algorithm": "alpha"}, "ordered_interfaces": {"order": "alpha"}, "php_unit_construct": true, "php_unit_internal_class": true, "php_unit_ordered_covers": true, "php_unit_set_up_tear_down_visibility": true, "phpdoc_indent": true, "phpdoc_align": {"align": "vertical"}, "phpdoc_annotation_without_dot": true, "phpdoc_scalar": true, "phpdoc_return_self_reference": {"this": "self"}, "phpdoc_trim": true, "phpdoc_trim_consecutive_blank_line_separation": true, "random_api_migration": true, "self_accessor": true, "return_type_declaration": {"space_before": "one"}, "semicolon_after_instruction": true, "set_type_to_cast": true, "short_scalar_cast": true, "single_blank_line_at_eof": true, "single_line_after_imports": true, "standardize_increment": true, "trailing_comma_in_multiline_array": true, "trim_array_spaces": true, "visibility_required": true, "void_return": true}'' --allow-risky=yes' - name: Check for modified files id: git-check run: echo ::set-output name=modified::$(if git diff-index --quiet HEAD --; then echo "false"; else echo "true"; fi) diff --git a/Admin/Installer.php b/Admin/Installer.php index 522ee38..228ebc1 100755 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -40,7 +40,7 @@ final class Installer extends InstallerAbstract parent::install($dbPool, $info, $cfgHandler); $sqlite = new SQLiteConnection([ - 'db' => 'sqlite', + 'db' => 'sqlite', 'database' => __DIR__ . '/../../../phpOMS/Localization/Defaults/localization.sqlite', ]); diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php index f92138f..af60632 100755 --- a/Admin/Routes/Web/Api.php +++ b/Admin/Routes/Web/Api.php @@ -8,8 +8,8 @@ use phpOMS\Router\RouteVerb; return [ '^.*/login(\?.*|$)' => [ [ - 'dest' => '\Modules\Admin\Controller\ApiController:apiLogin', - 'verb' => RouteVerb::SET, + 'dest' => '\Modules\Admin\Controller\ApiController:apiLogin', + 'verb' => RouteVerb::SET, 'permission' => [ ], ], @@ -17,8 +17,8 @@ return [ '^.*/logout(\?.*|$)' => [ [ - 'dest' => '\Modules\Admin\Controller\ApiController:apiLogout', - 'verb' => RouteVerb::SET, + 'dest' => '\Modules\Admin\Controller\ApiController:apiLogout', + 'verb' => RouteVerb::SET, 'permission' => [ ], ], @@ -26,8 +26,8 @@ return [ '^.*/forgott(\?.*|$)' => [ [ - 'dest' => '\Modules\Admin\Controller\ApiController:apiForgott', - 'verb' => RouteVerb::SET, + 'dest' => '\Modules\Admin\Controller\ApiController:apiForgott', + 'verb' => RouteVerb::SET, 'permission' => [ ], ], @@ -35,290 +35,290 @@ return [ '^.*/admin/settings(\?.*|$)' => [ [ - 'dest' => '\Modules\Admin\Controller\ApiController:apiSettingsSet', - 'verb' => RouteVerb::SET, + 'dest' => '\Modules\Admin\Controller\ApiController:apiSettingsSet', + 'verb' => RouteVerb::SET, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::MODIFY, - 'state' => PermissionState::SETTINGS, + 'type' => PermissionType::MODIFY, + 'state' => PermissionState::SETTINGS, ], ], [ - 'dest' => '\Modules\Admin\Controller\ApiController:apiSettingsGet', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Admin\Controller\ApiController:apiSettingsGet', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::SETTINGS, + 'type' => PermissionType::READ, + 'state' => PermissionState::SETTINGS, ], ], ], '^.*/admin/group$' => [ [ - 'dest' => '\Modules\Admin\Controller\ApiController:apiGroupCreate', - 'verb' => RouteVerb::PUT, + 'dest' => '\Modules\Admin\Controller\ApiController:apiGroupCreate', + 'verb' => RouteVerb::PUT, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::CREATE, - 'state' => PermissionState::GROUP, + 'type' => PermissionType::CREATE, + 'state' => PermissionState::GROUP, ], ], [ - 'dest' => '\Modules\Admin\Controller\ApiController:apiGroupUpdate', - 'verb' => RouteVerb::SET, + 'dest' => '\Modules\Admin\Controller\ApiController:apiGroupUpdate', + 'verb' => RouteVerb::SET, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::MODIFY, - 'state' => PermissionState::GROUP, + 'type' => PermissionType::MODIFY, + 'state' => PermissionState::GROUP, ], ], [ - 'dest' => '\Modules\Admin\Controller\ApiController:apiGroupDelete', - 'verb' => RouteVerb::DELETE, + 'dest' => '\Modules\Admin\Controller\ApiController:apiGroupDelete', + 'verb' => RouteVerb::DELETE, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::DELETE, - 'state' => PermissionState::GROUP, + 'type' => PermissionType::DELETE, + 'state' => PermissionState::GROUP, ], ], [ - 'dest' => '\Modules\Admin\Controller\ApiController:apiGroupGet', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Admin\Controller\ApiController:apiGroupGet', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::GROUP, + 'type' => PermissionType::READ, + 'state' => PermissionState::GROUP, ], ], ], '^.*/admin/find/account(\?.*|$)' => [ [ - 'dest' => '\Modules\Admin\Controller\ApiController:apiAccountFind', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Admin\Controller\ApiController:apiAccountFind', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::SEARCH, + 'type' => PermissionType::READ, + 'state' => PermissionState::SEARCH, ], ], ], '^.*/admin/find/group.*$' => [ [ - 'dest' => '\Modules\Admin\Controller\ApiController:apiGroupFind', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Admin\Controller\ApiController:apiGroupFind', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::SEARCH, + 'type' => PermissionType::READ, + 'state' => PermissionState::SEARCH, ], ], ], '^.*/admin/find/accgrp.*$' => [ [ - 'dest' => '\Modules\Admin\Controller\ApiController:apiAccountGroupFind', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Admin\Controller\ApiController:apiAccountGroupFind', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::SEARCH, + 'type' => PermissionType::READ, + 'state' => PermissionState::SEARCH, ], ], ], '^.*/admin/account(\?.*|$)' => [ [ - 'dest' => '\Modules\Admin\Controller\ApiController:apiAccountCreate', - 'verb' => RouteVerb::PUT, + 'dest' => '\Modules\Admin\Controller\ApiController:apiAccountCreate', + 'verb' => RouteVerb::PUT, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::CREATE, - 'state' => PermissionState::ACCOUNT, + 'type' => PermissionType::CREATE, + 'state' => PermissionState::ACCOUNT, ], ], [ - 'dest' => '\Modules\Admin\Controller\ApiController:apiAccountUpdate', - 'verb' => RouteVerb::SET, + 'dest' => '\Modules\Admin\Controller\ApiController:apiAccountUpdate', + 'verb' => RouteVerb::SET, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::MODIFY, - 'state' => PermissionState::ACCOUNT, + 'type' => PermissionType::MODIFY, + 'state' => PermissionState::ACCOUNT, ], ], [ - 'dest' => '\Modules\Admin\Controller\ApiController:apiAccountDelete', - 'verb' => RouteVerb::DELETE, + 'dest' => '\Modules\Admin\Controller\ApiController:apiAccountDelete', + 'verb' => RouteVerb::DELETE, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::DELETE, - 'state' => PermissionState::ACCOUNT, + 'type' => PermissionType::DELETE, + 'state' => PermissionState::ACCOUNT, ], ], [ - 'dest' => '\Modules\Admin\Controller\ApiController:apiAccountGet', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Admin\Controller\ApiController:apiAccountGet', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::ACCOUNT, + 'type' => PermissionType::READ, + 'state' => PermissionState::ACCOUNT, ], ], ], '^.*/admin/module/status.*$' => [ [ - 'dest' => '\Modules\Admin\Controller\ApiController:apiModuleStatusUpdate', - 'verb' => RouteVerb::SET, + 'dest' => '\Modules\Admin\Controller\ApiController:apiModuleStatusUpdate', + 'verb' => RouteVerb::SET, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::MODIFY, - 'state' => PermissionState::MODULE, + 'type' => PermissionType::MODIFY, + 'state' => PermissionState::MODULE, ], ], ], '^.*/admin/group/account.*$' => [ [ - 'dest' => '\Modules\Admin\Controller\ApiController:apiAddAccountToGroup', - 'verb' => RouteVerb::PUT, + 'dest' => '\Modules\Admin\Controller\ApiController:apiAddAccountToGroup', + 'verb' => RouteVerb::PUT, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::MODIFY, - 'state' => PermissionState::MODULE, + 'type' => PermissionType::MODIFY, + 'state' => PermissionState::MODULE, ], ], ], '^.*/admin/account/group.*$' => [ [ - 'dest' => '\Modules\Admin\Controller\ApiController:apiAddGroupToAccount', - 'verb' => RouteVerb::PUT, + 'dest' => '\Modules\Admin\Controller\ApiController:apiAddGroupToAccount', + 'verb' => RouteVerb::PUT, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::MODIFY, - 'state' => PermissionState::MODULE, + 'type' => PermissionType::MODIFY, + 'state' => PermissionState::MODULE, ], ], ], '^.*/admin/group/permission.*$' => [ [ - 'dest' => '\Modules\Admin\Controller\ApiController:apiGroupPermissionGet', - 'verb' => RouteVerb::PUT, + 'dest' => '\Modules\Admin\Controller\ApiController:apiGroupPermissionGet', + 'verb' => RouteVerb::PUT, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::PERMISSION, - 'state' => PermissionState::MODULE, + 'type' => PermissionType::PERMISSION, + 'state' => PermissionState::MODULE, ], ], [ - 'dest' => '\Modules\Admin\Controller\ApiController:apiAddGroupPermission', - 'verb' => RouteVerb::PUT, + 'dest' => '\Modules\Admin\Controller\ApiController:apiAddGroupPermission', + 'verb' => RouteVerb::PUT, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::PERMISSION, - 'state' => PermissionState::MODULE, + 'type' => PermissionType::PERMISSION, + 'state' => PermissionState::MODULE, ], ], [ - 'dest' => '\Modules\Admin\Controller\ApiController:apiGroupPermissionUpdate', - 'verb' => RouteVerb::SET, + 'dest' => '\Modules\Admin\Controller\ApiController:apiGroupPermissionUpdate', + 'verb' => RouteVerb::SET, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::PERMISSION, - 'state' => PermissionState::MODULE, + 'type' => PermissionType::PERMISSION, + 'state' => PermissionState::MODULE, ], ], [ - 'dest' => '\Modules\Admin\Controller\ApiController:apiGroupPermissionDelete', - 'verb' => RouteVerb::DELETE, + 'dest' => '\Modules\Admin\Controller\ApiController:apiGroupPermissionDelete', + 'verb' => RouteVerb::DELETE, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::PERMISSION, - 'state' => PermissionState::MODULE, + 'type' => PermissionType::PERMISSION, + 'state' => PermissionState::MODULE, ], ], ], '^.*/admin/account/permission.*$' => [ [ - 'dest' => '\Modules\Admin\Controller\ApiController:apiAccountPermissionGet', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Admin\Controller\ApiController:apiAccountPermissionGet', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::PERMISSION, - 'state' => PermissionState::MODULE, + 'type' => PermissionType::PERMISSION, + 'state' => PermissionState::MODULE, ], ], [ - 'dest' => '\Modules\Admin\Controller\ApiController:apiAddAccountPermission', - 'verb' => RouteVerb::PUT, + 'dest' => '\Modules\Admin\Controller\ApiController:apiAddAccountPermission', + 'verb' => RouteVerb::PUT, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::PERMISSION, - 'state' => PermissionState::MODULE, + 'type' => PermissionType::PERMISSION, + 'state' => PermissionState::MODULE, ], ], [ - 'dest' => '\Modules\Admin\Controller\ApiController:apiAccountPermissionUpdate', - 'verb' => RouteVerb::SET, + 'dest' => '\Modules\Admin\Controller\ApiController:apiAccountPermissionUpdate', + 'verb' => RouteVerb::SET, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::PERMISSION, - 'state' => PermissionState::MODULE, + 'type' => PermissionType::PERMISSION, + 'state' => PermissionState::MODULE, ], ], [ - 'dest' => '\Modules\Admin\Controller\ApiController:apiAccountPermissionDelete', - 'verb' => RouteVerb::DELETE, + 'dest' => '\Modules\Admin\Controller\ApiController:apiAccountPermissionDelete', + 'verb' => RouteVerb::DELETE, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::PERMISSION, - 'state' => PermissionState::MODULE, + 'type' => PermissionType::PERMISSION, + 'state' => PermissionState::MODULE, ], ], ], '^.*/admin/module/reinit.*$' => [ [ - 'dest' => '\Modules\Admin\Controller\ApiController:apiReInit', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Admin\Controller\ApiController:apiReInit', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::CREATE, - 'state' => PermissionState::ROUTE, + 'type' => PermissionType::CREATE, + 'state' => PermissionState::ROUTE, ], ], ], '^.*/admin/update/url.*$' => [ [ - 'dest' => '\Modules\Admin\Controller\ApiController:apiUpdateFile', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Admin\Controller\ApiController:apiUpdateFile', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::CREATE, - 'state' => PermissionState::APP, + 'type' => PermissionType::CREATE, + 'state' => PermissionState::APP, ], ], ], '^.*/admin/update/check.*$' => [ [ - 'dest' => '\Modules\Admin\Controller\ApiController:apiCheckForUpdates', - 'verb' => RouteVerb::PUT, + 'dest' => '\Modules\Admin\Controller\ApiController:apiCheckForUpdates', + 'verb' => RouteVerb::PUT, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::CREATE, - 'state' => PermissionState::APP, + 'type' => PermissionType::CREATE, + 'state' => PermissionState::APP, ], ], ], '^.*/admin/update/component.*$' => [ [ - 'dest' => '\Modules\Admin\Controller\ApiController:apiCheckForUpdates', - 'verb' => RouteVerb::PUT, + 'dest' => '\Modules\Admin\Controller\ApiController:apiCheckForUpdates', + 'verb' => RouteVerb::PUT, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::CREATE, - 'state' => PermissionState::APP, + 'type' => PermissionType::CREATE, + 'state' => PermissionState::APP, ], ], ], diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index a832ada..f33efd9 100755 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -8,8 +8,8 @@ use phpOMS\Router\RouteVerb; return [ '^.*/forgott.*$' => [ [ - 'dest' => '\Modules\Admin\Controller\BackendController:viewForgott', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Admin\Controller\BackendController:viewForgott', + 'verb' => RouteVerb::GET, 'permission' => [ ], ], @@ -17,100 +17,100 @@ return [ '^.*/admin/settings/general.*$' => [ [ - 'dest' => '\Modules\Admin\Controller\BackendController:viewSettingsGeneral', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Admin\Controller\BackendController:viewSettingsGeneral', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::SETTINGS, + 'type' => PermissionType::READ, + 'state' => PermissionState::SETTINGS, ], ], ], '^.*/admin/account/list.*$' => [ [ - 'dest' => '\Modules\Admin\Controller\BackendController:viewAccountList', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Admin\Controller\BackendController:viewAccountList', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::ACCOUNT, + 'type' => PermissionType::READ, + 'state' => PermissionState::ACCOUNT, ], ], ], '^.*/admin/account/settings.*$' => [ [ - 'dest' => '\Modules\Admin\Controller\BackendController:viewAccountSettings', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Admin\Controller\BackendController:viewAccountSettings', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::ACCOUNT, + 'type' => PermissionType::READ, + 'state' => PermissionState::ACCOUNT, ], ], ], '^.*/admin/account/create.*$' => [ [ - 'dest' => '\Modules\Admin\Controller\BackendController:viewAccountCreate', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Admin\Controller\BackendController:viewAccountCreate', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::CREATE, - 'state' => PermissionState::ACCOUNT, + 'type' => PermissionType::CREATE, + 'state' => PermissionState::ACCOUNT, ], ], ], '^.*/admin/group/list.*$' => [ [ - 'dest' => '\Modules\Admin\Controller\BackendController:viewGroupList', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Admin\Controller\BackendController:viewGroupList', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::GROUP, + 'type' => PermissionType::READ, + 'state' => PermissionState::GROUP, ], ], ], '^.*/admin/group/settings.*$' => [ [ - 'dest' => '\Modules\Admin\Controller\BackendController:viewGroupSettings', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Admin\Controller\BackendController:viewGroupSettings', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::MODIFY, - 'state' => PermissionState::GROUP, + 'type' => PermissionType::MODIFY, + 'state' => PermissionState::GROUP, ], ], ], '^.*/admin/group/create.*$' => [ [ - 'dest' => '\Modules\Admin\Controller\BackendController:viewGroupCreate', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Admin\Controller\BackendController:viewGroupCreate', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::CREATE, - 'state' => PermissionState::GROUP, + 'type' => PermissionType::CREATE, + 'state' => PermissionState::GROUP, ], ], ], '^.*/admin/module/list.*$' => [ [ - 'dest' => '\Modules\Admin\Controller\BackendController:viewModuleList', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Admin\Controller\BackendController:viewModuleList', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::MODULE, + 'type' => PermissionType::READ, + 'state' => PermissionState::MODULE, ], ], ], '^.*/admin/module/settings\?.*$' => [ [ - 'dest' => '\Modules\Admin\Controller\BackendController:viewModuleProfile', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Admin\Controller\BackendController:viewModuleProfile', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::MODULE, + 'type' => PermissionType::READ, + 'state' => PermissionState::MODULE, ], ], ], diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 3bc663e..e20e6bd 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -919,9 +919,9 @@ final class ApiController extends Controller if (empty($module) || empty($status)) { $response->set($request->getUri()->__toString(), [ - 'status' => 'warning', - 'title' => 'Module', - 'message' => 'Invalid module or status', + 'status' => 'warning', + 'title' => 'Module', + 'message' => 'Invalid module or status', 'response' => [], ]); diff --git a/Models/AccountMapper.php b/Models/AccountMapper.php index a4794d7..c564c47 100755 --- a/Models/AccountMapper.php +++ b/Models/AccountMapper.php @@ -215,7 +215,7 @@ final class AccountMapper extends DataMapperAbstract $query->update('account') ->set([ 'account_password_temp' => '', - 'account_lactive' => new \DateTime('now'), + 'account_lactive' => new \DateTime('now'), ]) ->where('account_login', '=', $login) ->execute(); diff --git a/Models/GroupMapper.php b/Models/GroupMapper.php index ba2d721..52cc3aa 100755 --- a/Models/GroupMapper.php +++ b/Models/GroupMapper.php @@ -82,10 +82,10 @@ final class GroupMapper extends DataMapperAbstract */ protected static array $hasMany = [ 'accounts' => [ - 'mapper' => AccountMapper::class, - 'table' => 'account_group', + 'mapper' => AccountMapper::class, + 'table' => 'account_group', 'external' => 'account_group_group', - 'self' => 'account_group_account', + 'self' => 'account_group_account', ], ]; diff --git a/Models/LocalizationMapper.php b/Models/LocalizationMapper.php index a6397d5..f53119a 100755 --- a/Models/LocalizationMapper.php +++ b/Models/LocalizationMapper.php @@ -99,24 +99,24 @@ final class LocalizationMapper extends DataMapperAbstract */ protected static array $ownsOne = [ 'country' => [ - 'mapper' => CountryMapper::class, - 'self' => 'l11n_country', - 'by' => 'code2', - 'column' => 'code2', + 'mapper' => CountryMapper::class, + 'self' => 'l11n_country', + 'by' => 'code2', + 'column' => 'code2', 'conditional' => true, ], 'lang' => [ - 'mapper' => LanguageMapper::class, - 'self' => 'l11n_language', - 'by' => 'code2', - 'column' => 'code2', + 'mapper' => LanguageMapper::class, + 'self' => 'l11n_language', + 'by' => 'code2', + 'column' => 'code2', 'conditional' => true, ], 'currency' => [ - 'mapper' => CurrencyMapper::class, - 'self' => 'l11n_currency', - 'by' => 'code', - 'column' => 'code', + 'mapper' => CurrencyMapper::class, + 'self' => 'l11n_currency', + 'by' => 'code', + 'column' => 'code', 'conditional' => true, ], ]; diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php index cf3a450..7475c12 100755 --- a/Theme/Backend/Lang/de.lang.php +++ b/Theme/Backend/Lang/de.lang.php @@ -14,167 +14,167 @@ declare(strict_types=1); return [ 'Admin' => [ - ':s1' => 'Aktiv', - ':s2' => 'Inaktiv', - ':s3' => 'Timeout', - ':s4' => 'Gebannt', - 'Account' => 'Account', - 'Account/Group' => 'Account/Groupe', - 'Accounts' => 'Konten', - 'Active' => 'Aktiv', - 'Activate' => 'Aktivieren', - 'Activity' => 'Aktivität', - 'AuditLog' => 'Audit Log', - 'Available' => 'Verfügbar', - 'All' => 'Alle', - 'Amount' => 'Menge', - 'App' => 'App', - 'Area' => 'Gebiet', - 'Banned' => 'Gabannt', - 'Cache' => 'Cache', - 'Children' => 'Kinder', - 'Close' => 'Schließen', - 'Comp' => 'Komp.', - 'Component' => 'Komponent', - 'Country' => 'Land', - 'Create' => 'Erstellen', - 'CreateProfile' => 'Erstelle Profil', - 'Created' => 'Erstellt', - 'CreatedBy' => 'Erstellt von', - 'Currency' => 'Currency', - 'Currencyformat' => 'Währungsformat', - 'Customized' => 'Customized', - 'DecimalPoint' => 'Decimal Point', - 'Defaults' => 'Defaults', - 'Description' => 'Description', - 'Delete' => 'Delete', - 'Deactivate' => 'Deactivate', - 'Ele' => 'Ele.', - 'Element' => 'Element', - 'Email' => 'Email', - 'EmailAdmin' => 'Email Admin', - 'Fast' => 'Fast', - 'Features' => 'Features', - 'File' => 'File', - 'General' => 'General', - 'Glass' => 'Glass', - 'Group' => 'Group', - 'Groups' => 'Groups', - 'Heavy' => 'Heavy', - 'Inactive' => 'Inactive', - 'Install' => 'Install', - 'Installed' => 'Installed', - 'LAddress' => 'Local Address', - 'Language' => 'Language', - 'Large' => 'Large', - 'Length' => 'Length', - 'Light' => 'Light', - 'Load' => 'Load', - 'Localization' => 'Localization', - 'Long' => 'Long', - 'Log' => 'Log', - 'LoginRetries' => 'Login Retries', - 'LogPath' => 'Log Path', - 'Logging' => 'Logging', - 'Loginname' => 'Login Name', - 'Lowercase' => 'Lowercase', - 'Maintenance' => 'Maintenance', - 'Medium' => 'Medium', - 'Member' => 'Member', - 'Members' => 'Members', - 'Memcache' => 'Memcache', - 'MemoryLimit' => 'Memory Limit', - 'Message' => 'Message', - 'Module' => 'Module', - 'Modules' => 'Modules', - 'Name' => 'Name', - 'Name1' => 'Name 1', - 'Name2' => 'Name 2', - 'Name3' => 'Name 3', - 'None' => 'None', - 'Numberformat' => 'Numberformat', - 'Numeric' => 'Numeric', - 'Organization' => 'Organization', - 'OrganizationName' => 'Organization Name', - 'Page' => 'Page', - 'Parent' => 'Parent', - 'Parents' => 'Parents', - 'Password' => 'Password', - 'PasswordChangeInterval' => 'Password Change Interval (days)', - 'PasswordHistory' => 'Password History', - 'PasswordRegex' => 'Password Regex', - 'Perm' => 'Perm.', - 'Permission' => 'Permission', - 'Permissions' => 'Permissions', - 'Person' => 'Person', - 'Precision' => 'Genauigkeit', - 'Profile' => 'Profile', - 'Read' => 'Read', - 'RAddress' => 'Remote Address', - 'ReCache' => 'Re-Cache', - 'Release' => 'Release', - 'Reset' => 'Reset', - 'Running' => 'Running', - 'Short' => 'Short', - 'Sea' => 'Sea', - 'Security' => 'Security', - 'Settings' => 'Settings', - 'SettingsGeneral' => 'Settings - General', - 'Single' => 'Single', - 'Slow' => 'Slow', - 'Small' => 'Small', - 'Speed' => 'Speed', - 'Specialchar' => 'Special character', - 'Status' => 'Status', - 'Total' => 'Total', - 'Type' => 'Type', - 'Tablespoon' => 'Tablespoon', - 'Teaspoon' => 'Teaspoon', - 'Temperature' => 'Temperature', - 'Theme' => 'Theme', - 'ThousandsSeparator' => 'Thousands Separator', - 'Time' => 'Time', - 'TimeoutPeriod' => 'Timeout Period (minutes)', - 'Timestamp' => 'Timestamp', - 'Timeformat' => 'Timeformat', - 'Timeout' => 'Timeout', - 'Timezone' => 'Timezone', - 'Unit' => 'Unit', - 'Uninstall' => 'Uninstall', - 'Update' => 'Update', - 'Uppercase' => 'Uppercase', - 'Username' => 'Username', - 'Version' => 'Version', - 'VeryFast' => 'Very Fast', - 'VeryHeavy' => 'Very Heavy', - 'VeryLarge' => 'Very Large', - 'VeryLight' => 'Very Light', - 'VeryLong' => 'Very Long', - 'VerySlow' => 'Very Slow', - 'VeryShort' => 'Very Short', - 'VerySmall' => 'Very Small', - 'Volume' => 'Volume', - 'Warnings' => 'Warnings', - 'Website' => 'Website', - 'Weight' => 'Weight', - 'i:loc' => 'IP address or URL for remote access.', - 'i:mail' => 'Email address.', - 'i:oname' => 'Organization name.', - 'i:rem' => 'IP address or URL for remote access.', - 'i:rc' => 'Forcing re-cache for every user.', - 'i:timef' => 'Time format.', - 'Status0' => 'None', - 'Status1' => 'Active', - 'Status2' => 'Inactive', - 'Status3' => 'Timehout', - 'Status4' => 'Banned', - 'GroupStatus1' => 'Active', - 'GroupStatus2' => 'Inactive', - 'GroupStatus4' => 'Hidden', - 'i:PasswordRegex' => 'Password requirement for users', - 'i:LoginRetries' => 'Amount of allowed retries (-1 = unlimited)', - 'i:TimeoutPeriod' => 'Timeout period after too many logins', + ':s1' => 'Aktiv', + ':s2' => 'Inaktiv', + ':s3' => 'Timeout', + ':s4' => 'Gebannt', + 'Account' => 'Account', + 'Account/Group' => 'Account/Groupe', + 'Accounts' => 'Konten', + 'Active' => 'Aktiv', + 'Activate' => 'Aktivieren', + 'Activity' => 'Aktivität', + 'AuditLog' => 'Audit Log', + 'Available' => 'Verfügbar', + 'All' => 'Alle', + 'Amount' => 'Menge', + 'App' => 'App', + 'Area' => 'Gebiet', + 'Banned' => 'Gabannt', + 'Cache' => 'Cache', + 'Children' => 'Kinder', + 'Close' => 'Schließen', + 'Comp' => 'Komp.', + 'Component' => 'Komponent', + 'Country' => 'Land', + 'Create' => 'Erstellen', + 'CreateProfile' => 'Erstelle Profil', + 'Created' => 'Erstellt', + 'CreatedBy' => 'Erstellt von', + 'Currency' => 'Currency', + 'Currencyformat' => 'Währungsformat', + 'Customized' => 'Customized', + 'DecimalPoint' => 'Decimal Point', + 'Defaults' => 'Defaults', + 'Description' => 'Description', + 'Delete' => 'Delete', + 'Deactivate' => 'Deactivate', + 'Ele' => 'Ele.', + 'Element' => 'Element', + 'Email' => 'Email', + 'EmailAdmin' => 'Email Admin', + 'Fast' => 'Fast', + 'Features' => 'Features', + 'File' => 'File', + 'General' => 'General', + 'Glass' => 'Glass', + 'Group' => 'Group', + 'Groups' => 'Groups', + 'Heavy' => 'Heavy', + 'Inactive' => 'Inactive', + 'Install' => 'Install', + 'Installed' => 'Installed', + 'LAddress' => 'Local Address', + 'Language' => 'Language', + 'Large' => 'Large', + 'Length' => 'Length', + 'Light' => 'Light', + 'Load' => 'Load', + 'Localization' => 'Localization', + 'Long' => 'Long', + 'Log' => 'Log', + 'LoginRetries' => 'Login Retries', + 'LogPath' => 'Log Path', + 'Logging' => 'Logging', + 'Loginname' => 'Login Name', + 'Lowercase' => 'Lowercase', + 'Maintenance' => 'Maintenance', + 'Medium' => 'Medium', + 'Member' => 'Member', + 'Members' => 'Members', + 'Memcache' => 'Memcache', + 'MemoryLimit' => 'Memory Limit', + 'Message' => 'Message', + 'Module' => 'Module', + 'Modules' => 'Modules', + 'Name' => 'Name', + 'Name1' => 'Name 1', + 'Name2' => 'Name 2', + 'Name3' => 'Name 3', + 'None' => 'None', + 'Numberformat' => 'Numberformat', + 'Numeric' => 'Numeric', + 'Organization' => 'Organization', + 'OrganizationName' => 'Organization Name', + 'Page' => 'Page', + 'Parent' => 'Parent', + 'Parents' => 'Parents', + 'Password' => 'Password', + 'PasswordChangeInterval' => 'Password Change Interval (days)', + 'PasswordHistory' => 'Password History', + 'PasswordRegex' => 'Password Regex', + 'Perm' => 'Perm.', + 'Permission' => 'Permission', + 'Permissions' => 'Permissions', + 'Person' => 'Person', + 'Precision' => 'Genauigkeit', + 'Profile' => 'Profile', + 'Read' => 'Read', + 'RAddress' => 'Remote Address', + 'ReCache' => 'Re-Cache', + 'Release' => 'Release', + 'Reset' => 'Reset', + 'Running' => 'Running', + 'Short' => 'Short', + 'Sea' => 'Sea', + 'Security' => 'Security', + 'Settings' => 'Settings', + 'SettingsGeneral' => 'Settings - General', + 'Single' => 'Single', + 'Slow' => 'Slow', + 'Small' => 'Small', + 'Speed' => 'Speed', + 'Specialchar' => 'Special character', + 'Status' => 'Status', + 'Total' => 'Total', + 'Type' => 'Type', + 'Tablespoon' => 'Tablespoon', + 'Teaspoon' => 'Teaspoon', + 'Temperature' => 'Temperature', + 'Theme' => 'Theme', + 'ThousandsSeparator' => 'Thousands Separator', + 'Time' => 'Time', + 'TimeoutPeriod' => 'Timeout Period (minutes)', + 'Timestamp' => 'Timestamp', + 'Timeformat' => 'Timeformat', + 'Timeout' => 'Timeout', + 'Timezone' => 'Timezone', + 'Unit' => 'Unit', + 'Uninstall' => 'Uninstall', + 'Update' => 'Update', + 'Uppercase' => 'Uppercase', + 'Username' => 'Username', + 'Version' => 'Version', + 'VeryFast' => 'Very Fast', + 'VeryHeavy' => 'Very Heavy', + 'VeryLarge' => 'Very Large', + 'VeryLight' => 'Very Light', + 'VeryLong' => 'Very Long', + 'VerySlow' => 'Very Slow', + 'VeryShort' => 'Very Short', + 'VerySmall' => 'Very Small', + 'Volume' => 'Volume', + 'Warnings' => 'Warnings', + 'Website' => 'Website', + 'Weight' => 'Weight', + 'i:loc' => 'IP address or URL for remote access.', + 'i:mail' => 'Email address.', + 'i:oname' => 'Organization name.', + 'i:rem' => 'IP address or URL for remote access.', + 'i:rc' => 'Forcing re-cache for every user.', + 'i:timef' => 'Time format.', + 'Status0' => 'None', + 'Status1' => 'Active', + 'Status2' => 'Inactive', + 'Status3' => 'Timehout', + 'Status4' => 'Banned', + 'GroupStatus1' => 'Active', + 'GroupStatus2' => 'Inactive', + 'GroupStatus4' => 'Hidden', + 'i:PasswordRegex' => 'Password requirement for users', + 'i:LoginRetries' => 'Amount of allowed retries (-1 = unlimited)', + 'i:TimeoutPeriod' => 'Timeout period after too many logins', 'i:PasswordChangeInterval' => 'Interval in which passwards need to be changed (-1 = never)', - 'i:PasswordHistory' => 'New password has to be different from the last N passwords', + 'i:PasswordHistory' => 'New password has to be different from the last N passwords', ], ]; diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php index ebb0cb1..8ec5dbf 100755 --- a/Theme/Backend/Lang/en.lang.php +++ b/Theme/Backend/Lang/en.lang.php @@ -14,167 +14,167 @@ declare(strict_types=1); return [ 'Admin' => [ - ':s1' => 'Active', - ':s2' => 'Inactive', - ':s3' => 'Timeout', - ':s4' => 'Banned', - 'Account' => 'Account', - 'Account/Group' => 'Account/Group', - 'Accounts' => 'Accounts', - 'Active' => 'Active', - 'Activate' => 'Activate', - 'Activity' => 'Activity', - 'AuditLog' => 'Audit Log', - 'Available' => 'Available', - 'All' => 'All', - 'Amount' => 'Amount', - 'App' => 'App', - 'Area' => 'Area', - 'Banned' => 'Banned', - 'Cache' => 'Cache', - 'Children' => 'Children', - 'Close' => 'Close', - 'Comp' => 'Comp.', - 'Component' => 'Component', - 'Country' => 'Country', - 'Create' => 'Create', - 'CreateProfile' => 'Create Profile', - 'Created' => 'Created', - 'CreatedBy' => 'Created By', - 'Currency' => 'Currency', - 'Currencyformat' => 'Currency Format', - 'Customized' => 'Customized', - 'DecimalPoint' => 'Decimal Point', - 'Defaults' => 'Defaults', - 'Description' => 'Description', - 'Delete' => 'Delete', - 'Deactivate' => 'Deactivate', - 'Ele' => 'Ele.', - 'Element' => 'Element', - 'Email' => 'Email', - 'EmailAdmin' => 'Email Admin', - 'Fast' => 'Fast', - 'Features' => 'Features', - 'File' => 'File', - 'General' => 'General', - 'Glass' => 'Glass', - 'Group' => 'Group', - 'Groups' => 'Groups', - 'Heavy' => 'Heavy', - 'Inactive' => 'Inactive', - 'Install' => 'Install', - 'Installed' => 'Installed', - 'LAddress' => 'Local Address', - 'Language' => 'Language', - 'Large' => 'Large', - 'Length' => 'Length', - 'Light' => 'Light', - 'Load' => 'Load', - 'Localization' => 'Localization', - 'Long' => 'Long', - 'Log' => 'Log', - 'LoginRetries' => 'Login Retries', - 'LogPath' => 'Log Path', - 'Logging' => 'Logging', - 'Loginname' => 'Login Name', - 'Lowercase' => 'Lowercase', - 'Maintenance' => 'Maintenance', - 'Medium' => 'Medium', - 'Member' => 'Member', - 'Members' => 'Members', - 'Memcache' => 'Memcache', - 'MemoryLimit' => 'Memory Limit', - 'Message' => 'Message', - 'Module' => 'Module', - 'Modules' => 'Modules', - 'Name' => 'Name', - 'Name1' => 'Name 1', - 'Name2' => 'Name 2', - 'Name3' => 'Name 3', - 'None' => 'None', - 'Numberformat' => 'Numberformat', - 'Numeric' => 'Numeric', - 'Organization' => 'Organization', - 'OrganizationName' => 'Organization Name', - 'Page' => 'Page', - 'Parent' => 'Parent', - 'Parents' => 'Parents', - 'Password' => 'Password', - 'PasswordChangeInterval' => 'Password Change Interval (days)', - 'PasswordHistory' => 'Password History', - 'PasswordRegex' => 'Password Regex', - 'Perm' => 'Perm.', - 'Permission' => 'Permission', - 'Permissions' => 'Permissions', - 'Person' => 'Person', - 'Precision' => 'Precision', - 'Profile' => 'Profile', - 'Read' => 'Read', - 'RAddress' => 'Remote Address', - 'ReCache' => 'Re-Cache', - 'Release' => 'Release', - 'Reset' => 'Reset', - 'Running' => 'Running', - 'Short' => 'Short', - 'Sea' => 'Sea', - 'Security' => 'Security', - 'Settings' => 'Settings', - 'SettingsGeneral' => 'Settings - General', - 'Single' => 'Single', - 'Slow' => 'Slow', - 'Small' => 'Small', - 'Speed' => 'Speed', - 'Specialchar' => 'Special character', - 'Status' => 'Status', - 'Total' => 'Total', - 'Type' => 'Type', - 'Tablespoon' => 'Tablespoon', - 'Teaspoon' => 'Teaspoon', - 'Temperature' => 'Temperature', - 'Theme' => 'Theme', - 'ThousandsSeparator' => 'Thousands Separator', - 'Time' => 'Time', - 'TimeoutPeriod' => 'Timeout Period (minutes)', - 'Timestamp' => 'Timestamp', - 'Timeformat' => 'Timeformat', - 'Timeout' => 'Timeout', - 'Timezone' => 'Timezone', - 'Unit' => 'Unit', - 'Uninstall' => 'Uninstall', - 'Update' => 'Update', - 'Uppercase' => 'Uppercase', - 'Username' => 'Username', - 'Version' => 'Version', - 'VeryFast' => 'Very Fast', - 'VeryHeavy' => 'Very Heavy', - 'VeryLarge' => 'Very Large', - 'VeryLight' => 'Very Light', - 'VeryLong' => 'Very Long', - 'VerySlow' => 'Very Slow', - 'VeryShort' => 'Very Short', - 'VerySmall' => 'Very Small', - 'Volume' => 'Volume', - 'Warnings' => 'Warnings', - 'Website' => 'Website', - 'Weight' => 'Weight', - 'i:loc' => 'IP address or URL for remote access.', - 'i:mail' => 'Email address.', - 'i:oname' => 'Organization name.', - 'i:rem' => 'IP address or URL for remote access.', - 'i:rc' => 'Forcing re-cache for every user.', - 'i:timef' => 'Time format.', - 'Status0' => 'None', - 'Status1' => 'Active', - 'Status2' => 'Inactive', - 'Status3' => 'Timehout', - 'Status4' => 'Banned', - 'GroupStatus1' => 'Active', - 'GroupStatus2' => 'Inactive', - 'GroupStatus4' => 'Hidden', - 'i:PasswordRegex' => 'Password requirement for users', - 'i:LoginRetries' => 'Amount of allowed retries (-1 = unlimited)', - 'i:TimeoutPeriod' => 'Timeout period after too many logins', + ':s1' => 'Active', + ':s2' => 'Inactive', + ':s3' => 'Timeout', + ':s4' => 'Banned', + 'Account' => 'Account', + 'Account/Group' => 'Account/Group', + 'Accounts' => 'Accounts', + 'Active' => 'Active', + 'Activate' => 'Activate', + 'Activity' => 'Activity', + 'AuditLog' => 'Audit Log', + 'Available' => 'Available', + 'All' => 'All', + 'Amount' => 'Amount', + 'App' => 'App', + 'Area' => 'Area', + 'Banned' => 'Banned', + 'Cache' => 'Cache', + 'Children' => 'Children', + 'Close' => 'Close', + 'Comp' => 'Comp.', + 'Component' => 'Component', + 'Country' => 'Country', + 'Create' => 'Create', + 'CreateProfile' => 'Create Profile', + 'Created' => 'Created', + 'CreatedBy' => 'Created By', + 'Currency' => 'Currency', + 'Currencyformat' => 'Currency Format', + 'Customized' => 'Customized', + 'DecimalPoint' => 'Decimal Point', + 'Defaults' => 'Defaults', + 'Description' => 'Description', + 'Delete' => 'Delete', + 'Deactivate' => 'Deactivate', + 'Ele' => 'Ele.', + 'Element' => 'Element', + 'Email' => 'Email', + 'EmailAdmin' => 'Email Admin', + 'Fast' => 'Fast', + 'Features' => 'Features', + 'File' => 'File', + 'General' => 'General', + 'Glass' => 'Glass', + 'Group' => 'Group', + 'Groups' => 'Groups', + 'Heavy' => 'Heavy', + 'Inactive' => 'Inactive', + 'Install' => 'Install', + 'Installed' => 'Installed', + 'LAddress' => 'Local Address', + 'Language' => 'Language', + 'Large' => 'Large', + 'Length' => 'Length', + 'Light' => 'Light', + 'Load' => 'Load', + 'Localization' => 'Localization', + 'Long' => 'Long', + 'Log' => 'Log', + 'LoginRetries' => 'Login Retries', + 'LogPath' => 'Log Path', + 'Logging' => 'Logging', + 'Loginname' => 'Login Name', + 'Lowercase' => 'Lowercase', + 'Maintenance' => 'Maintenance', + 'Medium' => 'Medium', + 'Member' => 'Member', + 'Members' => 'Members', + 'Memcache' => 'Memcache', + 'MemoryLimit' => 'Memory Limit', + 'Message' => 'Message', + 'Module' => 'Module', + 'Modules' => 'Modules', + 'Name' => 'Name', + 'Name1' => 'Name 1', + 'Name2' => 'Name 2', + 'Name3' => 'Name 3', + 'None' => 'None', + 'Numberformat' => 'Numberformat', + 'Numeric' => 'Numeric', + 'Organization' => 'Organization', + 'OrganizationName' => 'Organization Name', + 'Page' => 'Page', + 'Parent' => 'Parent', + 'Parents' => 'Parents', + 'Password' => 'Password', + 'PasswordChangeInterval' => 'Password Change Interval (days)', + 'PasswordHistory' => 'Password History', + 'PasswordRegex' => 'Password Regex', + 'Perm' => 'Perm.', + 'Permission' => 'Permission', + 'Permissions' => 'Permissions', + 'Person' => 'Person', + 'Precision' => 'Precision', + 'Profile' => 'Profile', + 'Read' => 'Read', + 'RAddress' => 'Remote Address', + 'ReCache' => 'Re-Cache', + 'Release' => 'Release', + 'Reset' => 'Reset', + 'Running' => 'Running', + 'Short' => 'Short', + 'Sea' => 'Sea', + 'Security' => 'Security', + 'Settings' => 'Settings', + 'SettingsGeneral' => 'Settings - General', + 'Single' => 'Single', + 'Slow' => 'Slow', + 'Small' => 'Small', + 'Speed' => 'Speed', + 'Specialchar' => 'Special character', + 'Status' => 'Status', + 'Total' => 'Total', + 'Type' => 'Type', + 'Tablespoon' => 'Tablespoon', + 'Teaspoon' => 'Teaspoon', + 'Temperature' => 'Temperature', + 'Theme' => 'Theme', + 'ThousandsSeparator' => 'Thousands Separator', + 'Time' => 'Time', + 'TimeoutPeriod' => 'Timeout Period (minutes)', + 'Timestamp' => 'Timestamp', + 'Timeformat' => 'Timeformat', + 'Timeout' => 'Timeout', + 'Timezone' => 'Timezone', + 'Unit' => 'Unit', + 'Uninstall' => 'Uninstall', + 'Update' => 'Update', + 'Uppercase' => 'Uppercase', + 'Username' => 'Username', + 'Version' => 'Version', + 'VeryFast' => 'Very Fast', + 'VeryHeavy' => 'Very Heavy', + 'VeryLarge' => 'Very Large', + 'VeryLight' => 'Very Light', + 'VeryLong' => 'Very Long', + 'VerySlow' => 'Very Slow', + 'VeryShort' => 'Very Short', + 'VerySmall' => 'Very Small', + 'Volume' => 'Volume', + 'Warnings' => 'Warnings', + 'Website' => 'Website', + 'Weight' => 'Weight', + 'i:loc' => 'IP address or URL for remote access.', + 'i:mail' => 'Email address.', + 'i:oname' => 'Organization name.', + 'i:rem' => 'IP address or URL for remote access.', + 'i:rc' => 'Forcing re-cache for every user.', + 'i:timef' => 'Time format.', + 'Status0' => 'None', + 'Status1' => 'Active', + 'Status2' => 'Inactive', + 'Status3' => 'Timehout', + 'Status4' => 'Banned', + 'GroupStatus1' => 'Active', + 'GroupStatus2' => 'Inactive', + 'GroupStatus4' => 'Hidden', + 'i:PasswordRegex' => 'Password requirement for users', + 'i:LoginRetries' => 'Amount of allowed retries (-1 = unlimited)', + 'i:TimeoutPeriod' => 'Timeout period after too many logins', 'i:PasswordChangeInterval' => 'Interval in which passwards need to be changed (-1 = never)', - 'i:PasswordHistory' => 'New password has to be different from the last N passwords', + 'i:PasswordHistory' => 'New password has to be different from the last N passwords', ], ]; diff --git a/Theme/Backend/accounts-list.tpl.php b/Theme/Backend/accounts-list.tpl.php index 8456d34..670c949 100755 --- a/Theme/Backend/accounts-list.tpl.php +++ b/Theme/Backend/accounts-list.tpl.php @@ -39,13 +39,13 @@ echo $this->getData('nav')->render(); ?> getHtml('Activity'); ?> getHtml('Created'); ?> - $value) : ++$c; - $url = \phpOMS\Uri\UriFactory::build('{/prefix}admin/account/settings?{?}&id=' . $value->getId()); - $color = 'darkred'; - if ($value->getStatus() === AccountStatus::ACTIVE) { $color = 'green'; } + $value) : ++$c; + $url = \phpOMS\Uri\UriFactory::build('{/prefix}admin/account/settings?{?}&id=' . $value->getId()); + $color = 'darkred'; + if ($value->getStatus() === AccountStatus::ACTIVE) { $color = 'green'; } elseif ($value->getStatus() === AccountStatus::INACTIVE) { $color = 'darkblue'; } - elseif ($value->getStatus() === AccountStatus::TIMEOUT) { $color = 'purple'; } - elseif ($value->getStatus() === AccountStatus::BANNED) { $color = 'red'; } ?> + elseif ($value->getStatus() === AccountStatus::TIMEOUT) { $color = 'purple'; } + elseif ($value->getStatus() === AccountStatus::BANNED) { $color = 'red'; } ?> printHtml($value->getId()); ?> getHtml('Status'. $value->getStatus()); ?> diff --git a/Theme/Backend/accounts-single.tpl.php b/Theme/Backend/accounts-single.tpl.php index b7ee0d2..b74a778 100755 --- a/Theme/Backend/accounts-single.tpl.php +++ b/Theme/Backend/accounts-single.tpl.php @@ -149,7 +149,7 @@ echo $this->getData('nav')->render(); ?> getHtml('Name'); ?> getGroups(); foreach ($groups as $key => $value) : ++$c; - $url = UriFactory::build('{/prefix}admin/group/settings?{?}&id=' . $value->getId()); ?> + $url = UriFactory::build('{/prefix}admin/group/settings?{?}&id=' . $value->getId()); ?> printHtml($value->getId()); ?> @@ -308,7 +308,7 @@ echo $this->getData('nav')->render(); ?> getHtml('Date', 'Auditor'); ?> $audit) : ++$count; - $url = UriFactory::build('{/prefix}admin/audit/single?{?}&id=' . $audit->getId()); ?> + $url = UriFactory::build('{/prefix}admin/audit/single?{?}&id=' . $audit->getId()); ?> getId(); ?> printHtml($audit->getModule()); ?> diff --git a/Theme/Backend/groups-list.tpl.php b/Theme/Backend/groups-list.tpl.php index 6dc5595..b6c53f2 100755 --- a/Theme/Backend/groups-list.tpl.php +++ b/Theme/Backend/groups-list.tpl.php @@ -37,12 +37,12 @@ echo $this->getData('nav')->render(); ?> getHtml('Name'); ?> getHtml('Members'); ?> - $value) : ++$c; - $url = \phpOMS\Uri\UriFactory::build('{/prefix}admin/group/settings?{?}&id=' . $value->getId()); - $color = 'darkred'; - if ($value->getStatus() === \phpOMS\Account\GroupStatus::ACTIVE) { $color = 'green'; } + $value) : ++$c; + $url = \phpOMS\Uri\UriFactory::build('{/prefix}admin/group/settings?{?}&id=' . $value->getId()); + $color = 'darkred'; + if ($value->getStatus() === \phpOMS\Account\GroupStatus::ACTIVE) { $color = 'green'; } elseif ($value->getStatus() === \phpOMS\Account\GroupStatus::INACTIVE) { $color = 'darkblue'; } - elseif ($value->getStatus() === \phpOMS\Account\GroupStatus::HIDDEN) { $color = 'purple'; } ?> + elseif ($value->getStatus() === \phpOMS\Account\GroupStatus::HIDDEN) { $color = 'purple'; } ?> printHtml($value->getId()); ?> getHtml('Status'. $value->getStatus()); ?> diff --git a/Theme/Backend/groups-single.tpl.php b/Theme/Backend/groups-single.tpl.php index 23ba431..0f84637 100755 --- a/Theme/Backend/groups-single.tpl.php +++ b/Theme/Backend/groups-single.tpl.php @@ -284,7 +284,7 @@ echo $this->getData('nav')->render(); ?> getHtml('Date', 'Auditor'); ?> $audit) : ++$count; - $url = UriFactory::build('{/prefix}admin/audit/single?{?}&id=' . $audit->getId()); ?> + $url = UriFactory::build('{/prefix}admin/audit/single?{?}&id=' . $audit->getId()); ?> getId(); ?> printHtml($audit->getModule()); ?> diff --git a/Theme/Backend/modules-list.tpl.php b/Theme/Backend/modules-list.tpl.php index c9bdcc6..7258716 100755 --- a/Theme/Backend/modules-list.tpl.php +++ b/Theme/Backend/modules-list.tpl.php @@ -35,11 +35,11 @@ $isntalled = $this->getData('isntalled') ?? []; getHtml('Version'); ?> getHtml('Status'); ?> - $module) : ++$count; - $url = \phpOMS\Uri\UriFactory::build('{/prefix}admin/module/settings?{?}&id=' . $module['name']['internal']); - if (isset($active[$module['name']['internal']])) { $status = ModuleStatus::ACTIVE; } + $module) : ++$count; + $url = \phpOMS\Uri\UriFactory::build('{/prefix}admin/module/settings?{?}&id=' . $module['name']['internal']); + if (isset($active[$module['name']['internal']])) { $status = ModuleStatus::ACTIVE; } elseif (isset($installed[$module['name']['internal']])) { $status = ModuleStatus::INACTIVE; } - else { $status = ModuleStatus::AVAILABLE; } + else { $status = ModuleStatus::AVAILABLE; } ?> printHtml($module['name']['id']); ?> diff --git a/Theme/Backend/modules-single.tpl.php b/Theme/Backend/modules-single.tpl.php index 9d311f1..154d9d7 100755 --- a/Theme/Backend/modules-single.tpl.php +++ b/Theme/Backend/modules-single.tpl.php @@ -175,7 +175,7 @@ if ($nav !== null) { getHtml('Date', 'Auditor'); ?> $audit) : ++$count; - $url = UriFactory::build('{/prefix}admin/audit/single?{?}&id=' . $audit->getId()); ?> + $url = UriFactory::build('{/prefix}admin/audit/single?{?}&id=' . $audit->getId()); ?> getId(); ?> printHtml($audit->getModule()); ?>