D5102.1775293599.diff
No OneTemporary
Actions

Authored By

Unknown

Size

1 KB

Referenced Files

None

Subscribers

None

D5102.1775293599.diff
View Options

	diff --git a/src/app/Rules/UserEmailLocal.php b/src/app/Rules/UserEmailLocal.php
	--- a/src/app/Rules/UserEmailLocal.php
	+++ b/src/app/Rules/UserEmailLocal.php
	@@ -51,9 +51,9 @@
	}

	// Check if the local part is not one of exceptions
	- // (when signing up for an account in public domain
	+ // (when creating an account/alias in a public domain)
	if (!$this->external) {
	- $exceptions = '/^(admin\|administrator\|sales\|root)$/i';
	+ $exceptions = '/^(admin\|administrator\|postmaster\|sales\|root\|webmaster)$/i';

	if (preg_match($exceptions, $login)) {
	$this->message = \trans('validation.entryexists', ['attribute' => $attribute]);
	diff --git a/src/tests/Unit/Rules/UserEmailLocalTest.php b/src/tests/Unit/Rules/UserEmailLocalTest.php
	--- a/src/tests/Unit/Rules/UserEmailLocalTest.php
	+++ b/src/tests/Unit/Rules/UserEmailLocalTest.php
	@@ -27,6 +27,8 @@
	['Admin', false, 'The specified user is not available.'],
	['Sales', false, 'The specified user is not available.'],
	['Root', false, 'The specified user is not available.'],
	+ ['Postmaster', false, 'The specified user is not available.'],
	+ ['Webmaster', false, 'The specified user is not available.'],
	// Valid
	['test.test', false, null],
	// Valid for external domains
	@@ -34,6 +36,8 @@
	['Admin', true, null],
	['Sales', true, null],
	['Root', true, null],
	+ ['Postmaster', true, null],
	+ ['Webmaster', true, null],
	];
	}