D1546.1774826071.diff
No OneTemporary
Actions

Authored By

Unknown

Size

1 KB

Referenced Files

None

Subscribers

None

D1546.1774826071.diff
View Options

	diff --git a/src/app/Observers/UserAliasObserver.php b/src/app/Observers/UserAliasObserver.php
	--- a/src/app/Observers/UserAliasObserver.php
	+++ b/src/app/Observers/UserAliasObserver.php
	@@ -21,17 +21,22 @@
	{
	$alias->alias = \strtolower($alias->alias);

	- if ($exists = User::emailExists($alias->alias, true, $alias_exists)) {
	+ list($login, $domain) = explode('@', $alias->alias);
	+
	+ $domain = Domain::where('namespace', $domain)->first();
	+
	+ if (!$domain) {
	+ \Log::error("Failed creating alias {$alias->alias}. Domain does not exist.");
	+ return false;
	+ }
	+
	+ if ($exists = User::emailExists($alias->alias, true, $alias_exists, !$domain->isPublic())) {
	if (!$alias_exists) {
	\Log::error("Failed creating alias {$alias->alias}. Email address exists.");
	return false;
	}

	- list($login, $domain) = explode('@', $alias->alias);
	-
	- $domain = Domain::where('namespace', $domain)->first();
	-
	- if (!$domain \|\| $domain->isPublic()) {
	+ if ($domain->isPublic()) {
	\Log::error("Failed creating alias {$alias->alias}. Alias exists in public domain.");
	return false;
	}