@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | */ |
| 80 | 80 | public function getActiveProviders(AbstractUserAuthentication $user): array |
| 81 | 81 | { |
| 82 | - return array_filter($this->providers, static function ($provider) use ($user) { |
|
| 82 | + return array_filter($this->providers, static function($provider) use ($user) { |
|
| 83 | 83 | return $provider->isActive(MfaProviderPropertyManager::create($provider, $user)); |
| 84 | 84 | }); |
| 85 | 85 | } |
@@ -131,7 +131,7 @@ discard block |
||
| 131 | 131 | */ |
| 132 | 132 | public function getLockedProviders(AbstractUserAuthentication $user): array |
| 133 | 133 | { |
| 134 | - return array_filter($this->providers, static function ($provider) use ($user) { |
|
| 134 | + return array_filter($this->providers, static function($provider) use ($user) { |
|
| 135 | 135 | return $provider->isLocked(MfaProviderPropertyManager::create($provider, $user)); |
| 136 | 136 | }); |
| 137 | 137 | } |
@@ -27,6 +27,6 @@ |
||
| 27 | 27 | class MfaViewType extends Enumeration |
| 28 | 28 | { |
| 29 | 29 | public const SETUP = 'setup'; |
| 30 | - public const EDIT ='edit'; |
|
| 31 | - public const AUTH ='auth'; |
|
| 30 | + public const EDIT = 'edit'; |
|
| 31 | + public const AUTH = 'auth'; |
|
| 32 | 32 | } |
@@ -169,7 +169,7 @@ |
||
| 169 | 169 | */ |
| 170 | 170 | protected function getAlternativeProviders(): array |
| 171 | 171 | { |
| 172 | - return array_filter($this->allowedProviders, function ($provider) { |
|
| 172 | + return array_filter($this->allowedProviders, function($provider) { |
|
| 173 | 173 | return $provider !== $this->mfaProvider |
| 174 | 174 | && $provider->isActive(MfaProviderPropertyManager::create($provider, $this->getBackendUser())); |
| 175 | 175 | }); |
@@ -110,7 +110,7 @@ |
||
| 110 | 110 | } |
| 111 | 111 | |
| 112 | 112 | // Set up allowed providers based on user TSconfig and user groupData |
| 113 | - $this->allowedProviders = array_filter($this->mfaProviderRegistry->getProviders(), function ($identifier) { |
|
| 113 | + $this->allowedProviders = array_filter($this->mfaProviderRegistry->getProviders(), function($identifier) { |
|
| 114 | 114 | return $this->getBackendUser()->check('mfa_providers', $identifier) |
| 115 | 115 | && !GeneralUtility::inList(($this->mfaTsConfig['disableProviders'] ?? ''), $identifier); |
| 116 | 116 | }, ARRAY_FILTER_USE_KEY); |
@@ -115,8 +115,8 @@ discard block |
||
| 115 | 115 | $childHtml[] = '<ul class="list-group t3js-mfa-active-providers-list">'; |
| 116 | 116 | foreach ($activeProviders as $identifier => $activeProvider) { |
| 117 | 117 | $childHtml[] = '<li class="list-group-item" id="provider-' . htmlspecialchars($identifier) . '" style="line-height: 2.1em;">'; |
| 118 | - $childHtml[] = $this->iconFactory->getIcon($activeProvider->getIconIdentifier(), Icon::SIZE_SMALL); |
|
| 119 | - $childHtml[] = htmlspecialchars($lang->sL($activeProvider->getTitle())); |
|
| 118 | + $childHtml[] = $this->iconFactory->getIcon($activeProvider->getIconIdentifier(), Icon::SIZE_SMALL); |
|
| 119 | + $childHtml[] = htmlspecialchars($lang->sL($activeProvider->getTitle())); |
|
| 120 | 120 | if (in_array($identifier, $lockedProviders, true)) { |
| 121 | 121 | $childHtml[] = '<span class="label label-danger">' . htmlspecialchars($lang->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.locked')) . '</span>'; |
| 122 | 122 | } else { |
@@ -124,15 +124,15 @@ discard block |
||
| 124 | 124 | } |
| 125 | 125 | if ($isDeactivationAllowed) { |
| 126 | 126 | $childHtml[] = '<button type="button"'; |
| 127 | - $childHtml[] = ' class="btn btn-default btn-sm pull-right t3js-deactivate-provider-button"'; |
|
| 128 | - $childHtml[] = ' data-confirmation-title="' . htmlspecialchars(sprintf($lang->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:buttons.deactivateMfaProvider'), $lang->sL($activeProvider->getTitle()))) . '"'; |
|
| 129 | - $childHtml[] = ' data-confirmation-content="' . htmlspecialchars(sprintf($lang->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:buttons.deactivateMfaProvider.confirmation.text'), $lang->sL($activeProvider->getTitle()))) . '"'; |
|
| 130 | - $childHtml[] = ' data-confirmation-cancel-text="' . htmlspecialchars($lang->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.cancel')) . '"'; |
|
| 131 | - $childHtml[] = ' data-confirmation-deactivate-text="' . htmlspecialchars($lang->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.deactivate')) . '"'; |
|
| 132 | - $childHtml[] = ' data-provider="' . htmlspecialchars($identifier) . '"'; |
|
| 133 | - $childHtml[] = ' title="' . htmlspecialchars(sprintf($lang->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:buttons.deactivateMfaProvider'), $lang->sL($activeProvider->getTitle()))) . '"'; |
|
| 134 | - $childHtml[] = '>'; |
|
| 135 | - $childHtml[] = $this->iconFactory->getIcon('actions-delete', Icon::SIZE_SMALL)->render('inline'); |
|
| 127 | + $childHtml[] = ' class="btn btn-default btn-sm pull-right t3js-deactivate-provider-button"'; |
|
| 128 | + $childHtml[] = ' data-confirmation-title="' . htmlspecialchars(sprintf($lang->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:buttons.deactivateMfaProvider'), $lang->sL($activeProvider->getTitle()))) . '"'; |
|
| 129 | + $childHtml[] = ' data-confirmation-content="' . htmlspecialchars(sprintf($lang->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:buttons.deactivateMfaProvider.confirmation.text'), $lang->sL($activeProvider->getTitle()))) . '"'; |
|
| 130 | + $childHtml[] = ' data-confirmation-cancel-text="' . htmlspecialchars($lang->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.cancel')) . '"'; |
|
| 131 | + $childHtml[] = ' data-confirmation-deactivate-text="' . htmlspecialchars($lang->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.deactivate')) . '"'; |
|
| 132 | + $childHtml[] = ' data-provider="' . htmlspecialchars($identifier) . '"'; |
|
| 133 | + $childHtml[] = ' title="' . htmlspecialchars(sprintf($lang->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:buttons.deactivateMfaProvider'), $lang->sL($activeProvider->getTitle()))) . '"'; |
|
| 134 | + $childHtml[] = '>'; |
|
| 135 | + $childHtml[] = $this->iconFactory->getIcon('actions-delete', Icon::SIZE_SMALL)->render('inline'); |
|
| 136 | 136 | $childHtml[] = '</button>'; |
| 137 | 137 | } |
| 138 | 138 | $childHtml[] = '</li>'; |
@@ -144,29 +144,29 @@ discard block |
||
| 144 | 144 | $fieldId = 't3js-form-field-mfa-id' . StringUtility::getUniqueId('-'); |
| 145 | 145 | |
| 146 | 146 | $html[] = '<div class="formengine-field-item t3js-formengine-field-item" id="' . htmlspecialchars($fieldId) . '">'; |
| 147 | - $html[] = '<div class="form-control-wrap" style="max-width: ' . (int)$this->formMaxWidth($this->defaultInputWidth) . 'px">'; |
|
| 148 | - $html[] = '<div class="form-wizards-wrap">'; |
|
| 149 | - $html[] = '<div class="form-wizards-element">'; |
|
| 150 | - $html[] = implode(PHP_EOL, $childHtml); |
|
| 147 | + $html[] = '<div class="form-control-wrap" style="max-width: ' . (int)$this->formMaxWidth($this->defaultInputWidth) . 'px">'; |
|
| 148 | + $html[] = '<div class="form-wizards-wrap">'; |
|
| 149 | + $html[] = '<div class="form-wizards-element">'; |
|
| 150 | + $html[] = implode(PHP_EOL, $childHtml); |
|
| 151 | 151 | if ($isDeactivationAllowed) { |
| 152 | 152 | $html[] = '<div class="form-wizards-items-bottom">'; |
| 153 | - $html[] = '<div class="help-block">'; |
|
| 154 | - $html[] = '<button type="button"'; |
|
| 155 | - $html[] = ' class="t3js-deactivate-mfa-button btn btn-danger ' . ($activeProviders === [] ? 'disabled" disabled="disabled' : '') . '"'; |
|
| 156 | - $html[] = ' data-confirmation-title="' . htmlspecialchars($lang->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:buttons.deactivateMfa')) . '"'; |
|
| 157 | - $html[] = ' data-confirmation-content="' . htmlspecialchars($lang->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:buttons.deactivateMfa.confirmation.text')) . '"'; |
|
| 158 | - $html[] = ' data-confirmation-cancel-text="' . htmlspecialchars($lang->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.cancel')) . '"'; |
|
| 159 | - $html[] = ' data-confirmation-deactivate-text="' . htmlspecialchars($lang->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.deactivate')) . '"'; |
|
| 160 | - $html[] = '>'; |
|
| 161 | - $html[] = $this->iconFactory->getIcon('actions-toggle-off', Icon::SIZE_SMALL)->render('inline'); |
|
| 162 | - $html[] = htmlspecialchars($lang->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:buttons.deactivateMfa')); |
|
| 163 | - $html[] = '</button>'; |
|
| 164 | - $html[] = '</div>'; |
|
| 153 | + $html[] = '<div class="help-block">'; |
|
| 154 | + $html[] = '<button type="button"'; |
|
| 155 | + $html[] = ' class="t3js-deactivate-mfa-button btn btn-danger ' . ($activeProviders === [] ? 'disabled" disabled="disabled' : '') . '"'; |
|
| 156 | + $html[] = ' data-confirmation-title="' . htmlspecialchars($lang->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:buttons.deactivateMfa')) . '"'; |
|
| 157 | + $html[] = ' data-confirmation-content="' . htmlspecialchars($lang->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:buttons.deactivateMfa.confirmation.text')) . '"'; |
|
| 158 | + $html[] = ' data-confirmation-cancel-text="' . htmlspecialchars($lang->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.cancel')) . '"'; |
|
| 159 | + $html[] = ' data-confirmation-deactivate-text="' . htmlspecialchars($lang->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.deactivate')) . '"'; |
|
| 160 | + $html[] = '>'; |
|
| 161 | + $html[] = $this->iconFactory->getIcon('actions-toggle-off', Icon::SIZE_SMALL)->render('inline'); |
|
| 162 | + $html[] = htmlspecialchars($lang->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:buttons.deactivateMfa')); |
|
| 163 | + $html[] = '</button>'; |
|
| 164 | + $html[] = '</div>'; |
|
| 165 | 165 | $html[] = '</div>'; |
| 166 | 166 | } |
| 167 | - $html[] = '</div>'; |
|
| 168 | - $html[] = '</div>'; |
|
| 169 | - $html[] = '</div>'; |
|
| 167 | + $html[] = '</div>'; |
|
| 168 | + $html[] = '</div>'; |
|
| 169 | + $html[] = '</div>'; |
|
| 170 | 170 | $html[] = '</div>'; |
| 171 | 171 | |
| 172 | 172 | $resultArray['requireJsModules'][] = ['TYPO3/CMS/Backend/FormEngine/Element/MfaInfoElement' => ' |
@@ -677,8 +677,8 @@ |
||
| 677 | 677 | break; |
| 678 | 678 | } |
| 679 | 679 | $html .= '<a href="' . htmlspecialchars((string)$uriBuilder->buildUriFromRoute('mfa')) . '" class="btn btn-' . ($hasActiveProviders ? 'default' : 'success') . '">'; |
| 680 | - $html .= GeneralUtility::makeInstance(IconFactory::class)->getIcon($hasActiveProviders ? 'actions-cog' : 'actions-add', Icon::SIZE_SMALL); |
|
| 681 | - $html .= ' <span>' . htmlspecialchars($lang->getLL('mfaProviders.' . ($hasActiveProviders ? 'manageLinkTitle' : 'setupLinkTitle'))) . '</span>'; |
|
| 680 | + $html .= GeneralUtility::makeInstance(IconFactory::class)->getIcon($hasActiveProviders ? 'actions-cog' : 'actions-add', Icon::SIZE_SMALL); |
|
| 681 | + $html .= ' <span>' . htmlspecialchars($lang->getLL('mfaProviders.' . ($hasActiveProviders ? 'manageLinkTitle' : 'setupLinkTitle'))) . '</span>'; |
|
| 682 | 682 | $html .= '</a>'; |
| 683 | 683 | break; |
| 684 | 684 | default: |