lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stop calling the env function in naughty places

Browse Source
This commit is contained in:
Graham Campbell
2015-11-21 22:43:06 +00:00
parent 0e6ac90f7b
commit 236d52714d
6 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Composers/AppComposer.php
View File

@@ -35,6 +35,7 @@ class AppComposer
$view->withAppBannerType(Setting::get('app_banner_type'));
$view->withAppDomain(Setting::get('app_domain'));
$view->withAppName(Setting::get('app_name'));
$view->withAppUrl(Config::get('app.url'));
$view->withShowSupport(Setting::get('show_support'));
$view->withSubscribersEnabled($isEnabled && $mailAddress && $mailFrom);
}

1
app/Handlers/Events/Incident/SendIncidentEmailNotificationHandler.php
View File

@@ -76,7 +76,6 @@ class SendIncidentEmailNotificationHandler
'text_content' => $incident->message,
'token' => $subscriber->token,
'unsubscribe_link' => route('subscribe.unsubscribe', ['code' => $subscriber->verify_code]),
'app_url' => env('APP_URL'),
];
$this->mailer->queue([

1
app/Handlers/Events/Incident/SendMaintenanceEmailNotificationHandler.php
View File

@@ -72,7 +72,6 @@ class SendMaintenanceEmailNotificationHandler
'scheduled_at' => $data->scheduled_at_formatted,
'token' => $subscriber->token,
'unsubscribe_link' => route('subscribe.unsubscribe', ['code' => $subscriber->verify_code]),
'app_url' => env('APP_URL'),
];
$this->mailer->queue([

1
app/Handlers/Events/Subscriber/SendSubscriberVerificationEmailHandler.php
View File

@@ -49,7 +49,6 @@ class SendSubscriberVerificationEmailHandler
'email' => $event->subscriber->email,
'subject' => 'Confirm your subscription.',
'link' => route('subscribe.verify', ['code' => $event->subscriber->verify_code]),
'app_url' => env('APP_URL'),
];
$this->mailer->queue([

1
app/Handlers/Events/User/SendInviteUserEmailHandler.php
View File

@@ -49,7 +49,6 @@ class SendInviteUserEmailHandler
'email' => $event->invite->email,
'subject' => 'You have been invited.',
'link' => route('signup.invite', ['code' => $event->invite->code]),
'app_url' => env('APP_URL'),
];
$this->mailer->queue([

2
app/Providers/ConfigServiceProvider.php
View File

@@ -45,7 +45,7 @@ class ConfigServiceProvider extends ServiceProvider
$allowedOrigins[] = $domain;
}
} else {
$allowedOrigins[] = env('APP_URL');
$allowedOrigins[] = $this->app->config->get('app.url');
}
$this->app->config->set('cors.paths.api/v1/*.allowedOrigins', $allowedOrigins);