Skip to content

Commit f63faee

Browse files
committed
codereview
1 parent a317325 commit f63faee

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

application/forms/Config/User/UserForm.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
use Icinga\Application\Config;
77
use Icinga\Application\Hook\ConfigFormEventsHook;
8+
use Icinga\Application\ProvidedHook\DefaultPasswordPolicy;
89
use Icinga\Authentication\PasswordValidator;
910
use Icinga\Data\Filter\Filter;
1011
use Icinga\Forms\RepositoryForm;
@@ -22,7 +23,8 @@ protected function createInsertElements(array $formData)
2223
$passwordPolicyObject = null;
2324
$passwordPolicy = Config::app()->get(
2425
'global',
25-
'password_policy'
26+
'password_policy',
27+
DefaultPasswordPolicy::class
2628
);
2729
if (isset($passwordPolicy)) {
2830
$passwordPolicyObject = new $passwordPolicy();

library/Icinga/Application/ApplicationBootstrap.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
use Exception;
99
use Icinga\Application\ProvidedHook\DbMigration;
1010
use Icinga\Application\ProvidedHook\DefaultPasswordPolicy;
11-
use Icinga\Application\ProvidedHook\NonePasswordPolicy;
11+
use Icinga\Application\ProvidedHook\NoPasswordPolicy;
1212
use ipl\I18n\GettextTranslator;
1313
use ipl\I18n\StaticTranslator;
1414
use LogicException;
@@ -743,7 +743,7 @@ protected function registerApplicationHooks(): self
743743
{
744744
Hook::register('DbMigration', DbMigration::class, DbMigration::class);
745745
Hook::register('passwordpolicy', DefaultPasswordPolicy::class, DefaultPasswordPolicy::class);
746-
Hook::register('passwordpolicy', NonePasswordPolicy::class, NonePasswordPolicy::class);
746+
Hook::register('passwordpolicy', NoPasswordPolicy::class, NoPasswordPolicy::class);
747747

748748
return $this;
749749
}

library/Icinga/Application/ProvidedHook/DefaultPasswordPolicy.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public function getName(): string
2828
public function getDescription(): string
2929
{
3030
return $this->translate(
31-
'Password requirements: minimum 12 characters,' .
31+
'Password requirements: minimum 12 characters, ' .
3232
'at least 1 number, 1 special character, uppercase and lowercase letters.'
3333
);
3434
}

library/Icinga/Application/ProvidedHook/NonePasswordPolicy.php renamed to library/Icinga/Application/ProvidedHook/NoPasswordPolicy.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@
99
/**
1010
* None Password Policy to validate all passwords
1111
*/
12-
class NonePasswordPolicy implements PasswordPolicyHook
12+
class NoPasswordPolicy implements PasswordPolicyHook
1313
{
1414
use Translation;
15+
1516
public function getName(): string
1617
{
1718
return $this->translate('None');

0 commit comments

Comments
 (0)