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

Install Laravel 5.6

Browse Source
This commit is contained in:
James Brooks
2018-06-17 00:23:59 +01:00
parent bdacc81b8d
commit 57aef06927
80 changed files with 2105 additions and 1461 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Dashboard/ComponentController.php
View File

@@ -61,8 +61,8 @@ class ComponentController extends Controller
];
View::share([
'sub_menu' => $this->subMenu,
'sub_title' => trans_choice('dashboard.components.components', 2),
'subMenu' => $this->subMenu,
'subTitle' => trans_choice('dashboard.components.components', 2),
]);
}

2
app/Http/Controllers/Dashboard/IncidentController.php
View File

@@ -65,7 +65,7 @@ class IncidentController extends Controller
$this->auth = $auth;
$this->system = $system;
View::share('sub_title', trans('dashboard.incidents.title'));
View::share('subTitle', trans('dashboard.incidents.title'));
}
/**

2
app/Http/Controllers/Dashboard/ScheduleController.php
View File

@@ -42,7 +42,7 @@ class ScheduleController extends Controller
*/
public function __construct()
{
View::share('sub_title', trans('dashboard.schedule.title'));
View::share('subTitle', trans('dashboard.schedule.title'));
}
/**

4
app/Http/Controllers/Dashboard/SettingsController.php
View File

@@ -116,8 +116,8 @@ class SettingsController extends Controller
];
View::share([
'sub_title' => trans('dashboard.settings.settings'),
'sub_menu' => $this->subMenu,
'subTitle' => trans('dashboard.settings.settings'),
'subMenu' => $this->subMenu,
]);
}

36
app/Http/Kernel.php
View File

@@ -11,7 +11,19 @@
namespace CachetHQ\Cachet\Http;
use AltThree\Throttle\ThrottlingMiddleware;
use CachetHQ\Cachet\Http\Middleware\Admin;
use CachetHQ\Cachet\Http\Middleware\ApiAuthentication;
use CachetHQ\Cachet\Http\Middleware\Authenticate;
use CachetHQ\Cachet\Http\Middleware\Localize;
use CachetHQ\Cachet\Http\Middleware\ReadyForUse;
use CachetHQ\Cachet\Http\Middleware\RedirectIfAuthenticated;
use CachetHQ\Cachet\Http\Middleware\SetupAlreadyCompleted;
use CachetHQ\Cachet\Http\Middleware\SubscribersConfigured;
use CachetHQ\Cachet\Http\Middleware\TrustProxies;
use Illuminate\Auth\Middleware\Authorize;
use Illuminate\Foundation\Http\Kernel as HttpKernel;
use Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode;
class Kernel extends HttpKernel
{
@@ -21,8 +33,8 @@ class Kernel extends HttpKernel
* @var array
*/
protected $middleware = [
'Fideloper\Proxy\TrustProxies',
'Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode',
TrustProxies::class,
CheckForMaintenanceMode::class,
];
/**
@@ -31,15 +43,15 @@ class Kernel extends HttpKernel
* @var array
*/
protected $routeMiddleware = [
'admin' => 'CachetHQ\Cachet\Http\Middleware\Admin',
'can' => 'Illuminate\Auth\Middleware\Authorize',
'auth' => 'CachetHQ\Cachet\Http\Middleware\Authenticate',
'auth.api' => 'CachetHQ\Cachet\Http\Middleware\ApiAuthentication',
'guest' => 'CachetHQ\Cachet\Http\Middleware\RedirectIfAuthenticated',
'localize' => 'CachetHQ\Cachet\Http\Middleware\Localize',
'ready' => 'CachetHQ\Cachet\Http\Middleware\ReadyForUse',
'setup' => 'CachetHQ\Cachet\Http\Middleware\SetupAlreadyCompleted',
'subscribers' => 'CachetHQ\Cachet\Http\Middleware\SubscribersConfigured',
'throttle' => 'AltThree\Throttle\ThrottlingMiddleware',
'admin' => Admin::class,
'can' => Authorize::class,
'auth' => Authenticate::class,
'auth.api' => ApiAuthentication::class,
'guest' => RedirectIfAuthenticated::class,
'localize' => Localize::class,
'ready' => ReadyForUse::class,
'setup' => SetupAlreadyCompleted::class,
'subscribers' => SubscribersConfigured::class,
'throttle' => ThrottlingMiddleware::class,
];
}

47
app/Http/Middleware/TrustProxies.php Normal file
View File

@@ -0,0 +1,47 @@
<?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 Illuminate\Http\Request;
use Fideloper\Proxy\TrustProxies as Middleware;
/**
* This is the trust proxies middleware class.
*
* @author James Brooks <james@alt-three.com>
*/
class TrustProxies extends Middleware
{
/**
* The trusted proxies for this application.
*
* @var array
*/
protected $proxies;
/**
* The headers that should be used to detect proxies.
*
* @var int
*/
protected $headers = Request::HEADER_X_FORWARDED_ALL;
/**
* Create new trust proxies instance.
*
* @return void
*/
public function __construct()
{
$this->proxies = empty(env('TRUSTED_PROXIES')) ? '*' : explode(',', trim(env('TRUSTED_PROXIES')));
}
}