Merge pull request #1025 from cachethq/cachet-timezone

[WIP] Cachet timezone
This commit is contained in:
Graham Campbell
2015-10-09 14:41:30 +01:00
9 changed files with 69 additions and 10 deletions
@@ -13,7 +13,6 @@ namespace CachetHQ\Cachet\Http\Controllers\Dashboard;
use AltThree\Validator\ValidationException;
use CachetHQ\Cachet\Commands\Incident\ReportMaintenanceCommand;
use CachetHQ\Cachet\Facades\Setting;
use CachetHQ\Cachet\Models\Incident;
use CachetHQ\Cachet\Models\IncidentTemplate;
use GrahamCampbell\Binput\Facades\Binput;
@@ -140,7 +139,7 @@ class ScheduleController extends Controller
{
$scheduleData = Binput::get('incident');
// Parse the schedule date.
$scheduledAt = Date::createFromFormat('d/m/Y H:i', $scheduleData['scheduled_at'], Setting::get('app_timezone'))
$scheduledAt = Date::createFromFormat('d/m/Y H:i', $scheduleData['scheduled_at'], config('cachet.timezone'))
->setTimezone(Config::get('app.timezone'));
if ($scheduledAt->isPast()) {
+1
View File
@@ -46,6 +46,7 @@ class Kernel extends HttpKernel
'csrf' => 'Illuminate\Foundation\Http\Middleware\VerifyCsrfToken',
'guest' => 'CachetHQ\Cachet\Http\Middleware\RedirectIfAuthenticated',
'localize' => 'CachetHQ\Cachet\Http\Middleware\Localize',
'timezone' => 'CachetHQ\Cachet\Http\Middleware\Timezone',
'throttling' => 'GrahamCampbell\Throttle\Http\Middleware\ThrottleMiddleware',
];
}
+35
View File
@@ -0,0 +1,35 @@
<?php
/*
* This file is part of Cachet.
*
* (c) Alt Three Services Limited
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace CachetHQ\Cachet\Http\Middleware;
use Closure;
class Timezone
{
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @param string $type
*
* @return mixed
*/
public function handle($request, Closure $next)
{
if ($tz = $request->header('Time-Zone')) {
app('config')->set('cachet.timezone', $tz);
}
return $next($request);
}
}
+1 -1
View File
@@ -30,7 +30,7 @@ class ApiRoutes
$router->group([
'namespace' => 'Api',
'prefix' => 'api/v1',
'middleware' => 'accept:application/json',
'middleware' => ['accept:application/json', 'timezone'],
], function ($router) {
// General
$router->get('ping', 'GeneralController@ping');