Page MenuHomePhorge
Files F117739292

D2692.1775158025.diff
No OneTemporary
Actions

Authored By
Unknown
Size
4 KB
Referenced Files
None
Subscribers
None

D2692.1775158025.diff
View Options

diff --git a/src/app/Traits/UserConfigTrait.php b/src/app/Traits/UserConfigTrait.php
--- a/src/app/Traits/UserConfigTrait.php
+++ b/src/app/Traits/UserConfigTrait.php
@@ -13,7 +13,7 @@
// TODO: Should we store the default value somewhere in config?
- $config['greylist_enabled'] = $this->getSetting('greylist_enabled') !== 'false';
+ $config['greylisting'] = $this->getSetting('greylist_enabled') !== 'false';
return $config;
}
@@ -30,7 +30,7 @@
$errors = [];
foreach ($config as $key => $value) {
- if ($key == 'greylist_enabled') {
+ if ($key == 'greylisting') {
$this->setSetting('greylist_enabled', $value ? 'true' : 'false');
} else {
$errors[$key] = \trans('validation.invalid-config-parameter');
diff --git a/src/tests/Browser/Admin/UserTest.php b/src/tests/Browser/Admin/UserTest.php
--- a/src/tests/Browser/Admin/UserTest.php
+++ b/src/tests/Browser/Admin/UserTest.php
@@ -197,7 +197,7 @@
$wallet->save();
$group = $this->getTestGroup('group-test@kolab.org');
$group->assignToWallet($john->wallets->first());
- $john->setSetting('greylisting', null);
+ $john->setSetting('greylist_enabled', null);
// Click the managed-by link on Jack's page
$browser->click('@user-info #manager a')
@@ -322,7 +322,7 @@
]);
$page = new UserPage($ned->id);
- $ned->setSetting('greylisting', 'false');
+ $ned->setSetting('greylist_enabled', 'false');
$browser->click('@user-users tbody tr:nth-child(4) td:first-child a')
->on($page);
diff --git a/src/tests/Browser/UsersTest.php b/src/tests/Browser/UsersTest.php
--- a/src/tests/Browser/UsersTest.php
+++ b/src/tests/Browser/UsersTest.php
@@ -341,7 +341,7 @@
public function testUserSettings(): void
{
$john = $this->getTestUser('john@kolab.org');
- $john->setSetting('greylisting', null);
+ $john->setSetting('greylist_enabled', null);
$this->browse(function (Browser $browser) {
$browser->on(new UserInfo())
@@ -357,7 +357,7 @@
});
});
- $this->assertSame('false', $john->fresh()->getSetting('greylisting'));
+ $this->assertSame('false', $john->fresh()->getSetting('greylist_enabled'));
}
/**
diff --git a/src/tests/Feature/Controller/UsersTest.php b/src/tests/Feature/Controller/UsersTest.php
--- a/src/tests/Feature/Controller/UsersTest.php
+++ b/src/tests/Feature/Controller/UsersTest.php
@@ -66,7 +66,7 @@
$wallet->discount()->dissociate();
$wallet->settings()->whereIn('key', ['mollie_id', 'stripe_id'])->delete();
$wallet->save();
- $user->settings()->whereIn('key', ['greylisting'])->delete();
+ $user->settings()->whereIn('key', ['greylist_enabled'])->delete();
$user->status |= User::STATUS_IMAP_READY;
$user->save();
@@ -475,7 +475,7 @@
$jack = $this->getTestUser('jack@kolab.org');
$john = $this->getTestUser('john@kolab.org');
- $john->setSetting('greylisting', null);
+ $john->setSetting('greylist_enabled', null);
// Test unknown user id
$post = ['greylisting' => 1];
@@ -507,7 +507,7 @@
$this->assertCount(1, $json['errors']);
$this->assertSame('The requested configuration parameter is not supported.', $json['errors']['grey']);
- $this->assertNull($john->fresh()->getSetting('greylisting'));
+ $this->assertNull($john->fresh()->getSetting('greylist_enabled'));
// Test some valid data
$post = ['greylisting' => 1];
@@ -520,7 +520,7 @@
$this->assertSame('success', $json['status']);
$this->assertSame('User settings updated successfully.', $json['message']);
- $this->assertSame('true', $john->fresh()->getSetting('greylisting'));
+ $this->assertSame('true', $john->fresh()->getSetting('greylist_enabled'));
// Test some valid data
$post = ['greylisting' => 0];
@@ -533,7 +533,7 @@
$this->assertSame('success', $json['status']);
$this->assertSame('User settings updated successfully.', $json['message']);
- $this->assertSame('false', $john->fresh()->getSetting('greylisting'));
+ $this->assertSame('false', $john->fresh()->getSetting('greylist_enabled'));
}
/**

File Metadata

Mime Type
text/plain
Expires
Thu, Apr 2, 7:27 PM (21 h, 16 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
18820493
Default Alt Text
D2692.1775158025.diff (4 KB)

Event Timeline