Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

fix: email notifications subscription fixed

Browse Source
This commit is contained in:
Andras Bacsai 2023-10-05 14:37:16 +02:00
parent ab8a7893d9
commit 35f45492e3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bootstrap/helpers/shared.php
View File

@ -353,13 +353,14 @@ function setNotificationChannels($notifiable, $event)
$isEmailEnabled = isEmailEnabled($notifiable); $isEmailEnabled = isEmailEnabled($notifiable);
$isDiscordEnabled = data_get($notifiable, 'discord_enabled'); $isDiscordEnabled = data_get($notifiable, 'discord_enabled');
$isTelegramEnabled = data_get($notifiable, 'telegram_enabled'); $isTelegramEnabled = data_get($notifiable, 'telegram_enabled');
$isSubscribedToEmailEvent = data_get($notifiable, "smtp_notifications_$event");
$isSubscribedToDiscordEvent = data_get($notifiable, "discord_notifications_$event"); $isSubscribedToDiscordEvent = data_get($notifiable, "discord_notifications_$event");
$isSubscribedToTelegramEvent = data_get($notifiable, "telegram_notifications_$event"); $isSubscribedToTelegramEvent = data_get($notifiable, "telegram_notifications_$event");
if ($isDiscordEnabled && $isSubscribedToDiscordEvent) { if ($isDiscordEnabled && $isSubscribedToDiscordEvent) {
$channels[] = DiscordChannel::class; $channels[] = DiscordChannel::class;
} }
if ($isEmailEnabled) { if ($isEmailEnabled && $isSubscribedToEmailEvent) {
$channels[] = EmailChannel::class; $channels[] = EmailChannel::class;
} }
if ($isTelegramEnabled && $isSubscribedToTelegramEvent) { if ($isTelegramEnabled && $isSubscribedToTelegramEvent) {
@ -406,7 +407,7 @@ function generateFqdn(Server $server, string $random)
$host = $url->getHost(); $host = $url->getHost();
$path = $url->getPath() === '/' ? '' : $url->getPath(); $path = $url->getPath() === '/' ? '' : $url->getPath();
$scheme = $url->getScheme(); $scheme = $url->getScheme();
$finalFqdn = "$scheme://{$random}.$host$path" ; $finalFqdn = "$scheme://{$random}.$host$path";
return $finalFqdn; return $finalFqdn;
} }
function sslip(Server $server) function sslip(Server $server)
@ -431,7 +432,7 @@ function getServiceTemplates()
$services = $services->merge($deprecated); $services = $services->merge($deprecated);
$version = config('version'); $version = config('version');
$services = $services->map(function ($service) use ($version) { $services = $services->map(function ($service) use ($version) {
if (version_compare($version, data_get($service,'minVersion', '0.0.0'), '<')) { if (version_compare($version, data_get($service, 'minVersion', '0.0.0'), '<')) {
$service->disabled = true; $service->disabled = true;
} }
return $service; return $service;