From 73ecb41d9d729bb3f520ab85e607ef41ab504b43 Mon Sep 17 00:00:00 2001 From: Joseph Cohen Date: Wed, 11 Mar 2015 01:53:01 -0600 Subject: [PATCH] Fixes scheduled incidents timezones --- src/Http/Controllers/DashScheduleController.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Http/Controllers/DashScheduleController.php b/src/Http/Controllers/DashScheduleController.php index d244a573..f0358d25 100644 --- a/src/Http/Controllers/DashScheduleController.php +++ b/src/Http/Controllers/DashScheduleController.php @@ -4,13 +4,16 @@ namespace CachetHQ\Cachet\Http\Controllers; use CachetHQ\Cachet\Models\Incident; use CachetHQ\Cachet\Models\IncidentTemplate; +use CachetHQ\Cachet\Facades\Setting; use Carbon\Carbon; use GrahamCampbell\Binput\Facades\Binput; use Illuminate\Routing\Controller; use Illuminate\Support\Facades\Auth; +use Illuminate\Support\Facades\Config; use Illuminate\Support\Facades\Redirect; use Illuminate\Support\Facades\View; use Illuminate\Support\MessageBag; +use Jenssegers\Date\Date; class DashScheduleController extends Controller { @@ -84,7 +87,8 @@ class DashScheduleController extends Controller $scheduleData = Binput::get('incident'); $scheduleData['user_id'] = Auth::user()->id; // Parse the schedule date. - $scheduledAt = Carbon::createFromFormat('d/m/Y H:i', $scheduleData['scheduled_at']); + $scheduledAt = Date::createFromFormat('d/m/Y H:i', $scheduleData['scheduled_at'], Setting::get('app_timezone')) + ->setTimezone(Config::get('app.timezone')); if ($scheduledAt->isPast()) { $messageBag = new MessageBag(); @@ -159,7 +163,8 @@ class DashScheduleController extends Controller $scheduleData = Binput::get('incident'); $scheduleData['user_id'] = Auth::user()->id; // Parse the schedule date. - $scheduledAt = Carbon::createFromFormat('d/m/Y H:i', $scheduleData['scheduled_at']); + $scheduledAt = Date::createFromFormat('d/m/Y H:i', $scheduleData['scheduled_at'], Setting::get('app_timezone')) + ->setTimezone(Config::get('app.timezone')); if ($scheduledAt->isPast()) { $messageBag = new MessageBag();