From 16c4fcd109623e0dd804985ef306cc3af16f65d0 Mon Sep 17 00:00:00 2001 From: Raikia Date: Sun, 7 Jan 2018 17:50:27 +0000 Subject: [PATCH] Fixed a bug with the patch for issue #52. This fix should properly account for UTC time --- app/Http/Controllers/CampaignController.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/CampaignController.php b/app/Http/Controllers/CampaignController.php index 28625aec..f2714992 100644 --- a/app/Http/Controllers/CampaignController.php +++ b/app/Http/Controllers/CampaignController.php @@ -59,8 +59,9 @@ public function create_post(Request $request) $start_date = $request->input('starting_date') ?: \App\Libraries\DateHelper::now()->format('m/d/Y'); $start_time = $request->input('starting_time') ?: \App\Libraries\DateHelper::now()->format('g:ia'); $start_date = Carbon::parse($start_date . ' ' . $start_time, config('fiercephish.APP_TIMEZONE'))->addSeconds(1)->timezone('UTC'); - if ($start_date < \App\Libraries\DateHelper::now()) { - $start_date = \App\Libraries\DateHelper::now(); + $nowTime = Carbon::now()->timezone('UTC'); + if ($start_date < $nowTime) { + $start_date = $nowTime; } $send_num_emails = min((int)$request->input('send_num'),1000); $send_every_minutes = min((int)$request->input('send_every_x_minutes'), 1000);