@@ -5,46 +5,46 @@ |
||
| 5 | 5 | |
| 6 | 6 | class Authenticate { |
| 7 | 7 | |
| 8 | - /** |
|
| 9 | - * The Guard implementation. |
|
| 10 | - * |
|
| 11 | - * @var Guard |
|
| 12 | - */ |
|
| 13 | - protected $auth; |
|
| 8 | + /** |
|
| 9 | + * The Guard implementation. |
|
| 10 | + * |
|
| 11 | + * @var Guard |
|
| 12 | + */ |
|
| 13 | + protected $auth; |
|
| 14 | 14 | |
| 15 | - /** |
|
| 16 | - * Create a new filter instance. |
|
| 17 | - * |
|
| 18 | - * @param Guard $auth |
|
| 19 | - * @return void |
|
| 20 | - */ |
|
| 21 | - public function __construct(Guard $auth) |
|
| 22 | - { |
|
| 23 | - $this->auth = $auth; |
|
| 24 | - } |
|
| 15 | + /** |
|
| 16 | + * Create a new filter instance. |
|
| 17 | + * |
|
| 18 | + * @param Guard $auth |
|
| 19 | + * @return void |
|
| 20 | + */ |
|
| 21 | + public function __construct(Guard $auth) |
|
| 22 | + { |
|
| 23 | + $this->auth = $auth; |
|
| 24 | + } |
|
| 25 | 25 | |
| 26 | - /** |
|
| 27 | - * Handle an incoming request. |
|
| 28 | - * |
|
| 29 | - * @param \Illuminate\Http\Request $request |
|
| 30 | - * @param \Closure $next |
|
| 31 | - * @return mixed |
|
| 32 | - */ |
|
| 33 | - public function handle($request, Closure $next) |
|
| 34 | - { |
|
| 35 | - if ($this->auth->guest()) |
|
| 36 | - { |
|
| 37 | - if ($request->ajax()) |
|
| 38 | - { |
|
| 39 | - return response('Unauthorized.', 401); |
|
| 40 | - } |
|
| 41 | - else |
|
| 42 | - { |
|
| 43 | - return redirect()->guest('auth/login'); |
|
| 44 | - } |
|
| 45 | - } |
|
| 26 | + /** |
|
| 27 | + * Handle an incoming request. |
|
| 28 | + * |
|
| 29 | + * @param \Illuminate\Http\Request $request |
|
| 30 | + * @param \Closure $next |
|
| 31 | + * @return mixed |
|
| 32 | + */ |
|
| 33 | + public function handle($request, Closure $next) |
|
| 34 | + { |
|
| 35 | + if ($this->auth->guest()) |
|
| 36 | + { |
|
| 37 | + if ($request->ajax()) |
|
| 38 | + { |
|
| 39 | + return response('Unauthorized.', 401); |
|
| 40 | + } |
|
| 41 | + else |
|
| 42 | + { |
|
| 43 | + return redirect()->guest('auth/login'); |
|
| 44 | + } |
|
| 45 | + } |
|
| 46 | 46 | |
| 47 | - return $next($request); |
|
| 48 | - } |
|
| 47 | + return $next($request); |
|
| 48 | + } |
|
| 49 | 49 | |
| 50 | 50 | } |
@@ -3,7 +3,8 @@ discard block |
||
| 3 | 3 | use Closure; |
| 4 | 4 | use Illuminate\Contracts\Auth\Guard; |
| 5 | 5 | |
| 6 | -class Authenticate { |
|
| 6 | +class Authenticate |
|
| 7 | +{ |
|
| 7 | 8 | |
| 8 | 9 | /** |
| 9 | 10 | * The Guard implementation. |
@@ -32,14 +33,10 @@ discard block |
||
| 32 | 33 | */ |
| 33 | 34 | public function handle($request, Closure $next) |
| 34 | 35 | { |
| 35 | - if ($this->auth->guest()) |
|
| 36 | - { |
|
| 37 | - if ($request->ajax()) |
|
| 38 | - { |
|
| 36 | + if ($this->auth->guest()) { |
|
| 37 | + if ($request->ajax()) { |
|
| 39 | 38 | return response('Unauthorized.', 401); |
| 40 | - } |
|
| 41 | - else |
|
| 42 | - { |
|
| 39 | + } else { |
|
| 43 | 40 | return redirect()->guest('auth/login'); |
| 44 | 41 | } |
| 45 | 42 | } |
@@ -4,21 +4,21 @@ |
||
| 4 | 4 | |
| 5 | 5 | class BrandingHeaders { |
| 6 | 6 | |
| 7 | - /** |
|
| 8 | - * Handle an incoming request. |
|
| 9 | - * |
|
| 10 | - * @param \Illuminate\Http\Request $request |
|
| 11 | - * @param \Closure $next |
|
| 12 | - * @return mixed |
|
| 13 | - */ |
|
| 14 | - public function handle($request, Closure $next) |
|
| 15 | - { |
|
| 7 | + /** |
|
| 8 | + * Handle an incoming request. |
|
| 9 | + * |
|
| 10 | + * @param \Illuminate\Http\Request $request |
|
| 11 | + * @param \Closure $next |
|
| 12 | + * @return mixed |
|
| 13 | + */ |
|
| 14 | + public function handle($request, Closure $next) |
|
| 15 | + { |
|
| 16 | 16 | //Don't add the header to acs requests |
| 17 | 17 | if ((strpos($request->path(), 'access-control/') === 0) || ($request->path() === 'acs') || ($request->path() === 'acs/spark')) { |
| 18 | 18 | return $next($request); |
| 19 | 19 | } |
| 20 | 20 | |
| 21 | - return $next($request)->header('Built-By', 'arthurguy.co.uk'); |
|
| 22 | - } |
|
| 21 | + return $next($request)->header('Built-By', 'arthurguy.co.uk'); |
|
| 22 | + } |
|
| 23 | 23 | |
| 24 | 24 | } |
@@ -2,7 +2,8 @@ |
||
| 2 | 2 | |
| 3 | 3 | use Closure; |
| 4 | 4 | |
| 5 | -class BrandingHeaders { |
|
| 5 | +class BrandingHeaders |
|
| 6 | +{ |
|
| 6 | 7 | |
| 7 | 8 | /** |
| 8 | 9 | * Handle an incoming request. |
@@ -6,39 +6,39 @@ |
||
| 6 | 6 | |
| 7 | 7 | class RedirectIfAuthenticated { |
| 8 | 8 | |
| 9 | - /** |
|
| 10 | - * The Guard implementation. |
|
| 11 | - * |
|
| 12 | - * @var Guard |
|
| 13 | - */ |
|
| 14 | - protected $auth; |
|
| 9 | + /** |
|
| 10 | + * The Guard implementation. |
|
| 11 | + * |
|
| 12 | + * @var Guard |
|
| 13 | + */ |
|
| 14 | + protected $auth; |
|
| 15 | 15 | |
| 16 | - /** |
|
| 17 | - * Create a new filter instance. |
|
| 18 | - * |
|
| 19 | - * @param Guard $auth |
|
| 20 | - * @return void |
|
| 21 | - */ |
|
| 22 | - public function __construct(Guard $auth) |
|
| 23 | - { |
|
| 24 | - $this->auth = $auth; |
|
| 25 | - } |
|
| 16 | + /** |
|
| 17 | + * Create a new filter instance. |
|
| 18 | + * |
|
| 19 | + * @param Guard $auth |
|
| 20 | + * @return void |
|
| 21 | + */ |
|
| 22 | + public function __construct(Guard $auth) |
|
| 23 | + { |
|
| 24 | + $this->auth = $auth; |
|
| 25 | + } |
|
| 26 | 26 | |
| 27 | - /** |
|
| 28 | - * Handle an incoming request. |
|
| 29 | - * |
|
| 30 | - * @param \Illuminate\Http\Request $request |
|
| 31 | - * @param \Closure $next |
|
| 32 | - * @return mixed |
|
| 33 | - */ |
|
| 34 | - public function handle($request, Closure $next) |
|
| 35 | - { |
|
| 36 | - if ($this->auth->check()) |
|
| 37 | - { |
|
| 38 | - return new RedirectResponse(url('/home')); |
|
| 39 | - } |
|
| 27 | + /** |
|
| 28 | + * Handle an incoming request. |
|
| 29 | + * |
|
| 30 | + * @param \Illuminate\Http\Request $request |
|
| 31 | + * @param \Closure $next |
|
| 32 | + * @return mixed |
|
| 33 | + */ |
|
| 34 | + public function handle($request, Closure $next) |
|
| 35 | + { |
|
| 36 | + if ($this->auth->check()) |
|
| 37 | + { |
|
| 38 | + return new RedirectResponse(url('/home')); |
|
| 39 | + } |
|
| 40 | 40 | |
| 41 | - return $next($request); |
|
| 42 | - } |
|
| 41 | + return $next($request); |
|
| 42 | + } |
|
| 43 | 43 | |
| 44 | 44 | } |
@@ -4,7 +4,8 @@ discard block |
||
| 4 | 4 | use Illuminate\Contracts\Auth\Guard; |
| 5 | 5 | use Illuminate\Http\RedirectResponse; |
| 6 | 6 | |
| 7 | -class RedirectIfAuthenticated { |
|
| 7 | +class RedirectIfAuthenticated |
|
| 8 | +{ |
|
| 8 | 9 | |
| 9 | 10 | /** |
| 10 | 11 | * The Guard implementation. |
@@ -33,8 +34,7 @@ discard block |
||
| 33 | 34 | */ |
| 34 | 35 | public function handle($request, Closure $next) |
| 35 | 36 | { |
| 36 | - if ($this->auth->check()) |
|
| 37 | - { |
|
| 37 | + if ($this->auth->check()) { |
|
| 38 | 38 | return new RedirectResponse(url('/home')); |
| 39 | 39 | } |
| 40 | 40 | |
@@ -13,7 +13,7 @@ |
||
| 13 | 13 | */ |
| 14 | 14 | public function handle($request, Closure $next) |
| 15 | 15 | { |
| 16 | - if( ! $request->isSecure() && env('FORCE_SECURE', 'true')) { |
|
| 16 | + if ( ! $request->isSecure() && env('FORCE_SECURE', 'true')) { |
|
| 17 | 17 | if ((strpos($request->path(), 'access-control/') !== 0) && ($request->path() !== 'acs') && ($request->path() !== 'acs/spark')) { |
| 18 | 18 | //return redirect()->secure($request->path()); |
| 19 | 19 | } |
@@ -5,16 +5,16 @@ |
||
| 5 | 5 | |
| 6 | 6 | class VerifyCsrfToken extends BaseVerifier { |
| 7 | 7 | |
| 8 | - /** |
|
| 9 | - * Handle an incoming request. |
|
| 10 | - * |
|
| 11 | - * @param \Illuminate\Http\Request $request |
|
| 12 | - * @param \Closure $next |
|
| 13 | - * @return mixed |
|
| 14 | - */ |
|
| 15 | - public function handle($request, Closure $next) |
|
| 16 | - { |
|
| 17 | - return parent::handle($request, $next); |
|
| 18 | - } |
|
| 8 | + /** |
|
| 9 | + * Handle an incoming request. |
|
| 10 | + * |
|
| 11 | + * @param \Illuminate\Http\Request $request |
|
| 12 | + * @param \Closure $next |
|
| 13 | + * @return mixed |
|
| 14 | + */ |
|
| 15 | + public function handle($request, Closure $next) |
|
| 16 | + { |
|
| 17 | + return parent::handle($request, $next); |
|
| 18 | + } |
|
| 19 | 19 | |
| 20 | 20 | } |
@@ -3,7 +3,8 @@ |
||
| 3 | 3 | use Closure; |
| 4 | 4 | use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as BaseVerifier; |
| 5 | 5 | |
| 6 | -class VerifyCsrfToken extends BaseVerifier { |
|
| 6 | +class VerifyCsrfToken extends BaseVerifier |
|
| 7 | +{ |
|
| 7 | 8 | |
| 8 | 9 | /** |
| 9 | 10 | * Handle an incoming request. |
@@ -4,6 +4,6 @@ |
||
| 4 | 4 | |
| 5 | 5 | abstract class Request extends FormRequest { |
| 6 | 6 | |
| 7 | - // |
|
| 7 | + // |
|
| 8 | 8 | |
| 9 | 9 | } |
@@ -2,7 +2,8 @@ |
||
| 2 | 2 | |
| 3 | 3 | use Illuminate\Foundation\Http\FormRequest; |
| 4 | 4 | |
| 5 | -abstract class Request extends FormRequest { |
|
| 5 | +abstract class Request extends FormRequest |
|
| 6 | +{ |
|
| 6 | 7 | |
| 7 | 8 | // |
| 8 | 9 | |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | |
| 62 | 62 | Route::post('account/{account}/payment', ['uses' => 'PaymentController@store', 'as' => 'account.payment.store', 'middleware' => 'role:admin']); |
| 63 | 63 | |
| 64 | -Route::group(array('middleware' => 'role:finance'), function() { |
|
| 64 | +Route::group(array('middleware' => 'role:finance'), function () { |
|
| 65 | 65 | Route::resource('payments', 'PaymentController', ['only' => ['index', 'destroy', 'update']]); |
| 66 | 66 | Route::get('payments/overview', ['uses'=>'PaymentOverviewController@index', 'as'=>'payments.overview']); |
| 67 | 67 | Route::get('payments/sub-charges', ['as' => 'payments.sub-charges', 'uses' => 'SubscriptionController@listCharges']); |
@@ -80,13 +80,13 @@ discard block |
||
| 80 | 80 | |
| 81 | 81 | |
| 82 | 82 | //Cash |
| 83 | -Route::group(array('middleware' => 'role:finance'), function() { |
|
| 83 | +Route::group(array('middleware' => 'role:finance'), function () { |
|
| 84 | 84 | Route::post('account/{account}/payment/cash/create', ['as'=>'account.payment.cash.create', 'uses' => 'CashPaymentController@store']); |
| 85 | 85 | Route::delete('account/{account}/payment/cash', ['as'=>'account.payment.cash.destroy', 'uses' => 'CashPaymentController@destroy']); |
| 86 | 86 | }); |
| 87 | 87 | |
| 88 | 88 | # Statements |
| 89 | -Route::group(array('middleware' => 'role:finance'), function() { |
|
| 89 | +Route::group(array('middleware' => 'role:finance'), function () { |
|
| 90 | 90 | Route::resource('statement-import', 'StatementImportController', ['except' => ['index', 'show', 'edit', 'update', 'destroy']]); |
| 91 | 91 | }); |
| 92 | 92 | |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | # Inductions |
| 100 | 100 | ########################## |
| 101 | 101 | |
| 102 | -Route::group(array('middleware' => 'role:admin'), function() { |
|
| 102 | +Route::group(array('middleware' => 'role:admin'), function () { |
|
| 103 | 103 | Route::post('equipment_training/update', ['uses'=>'InductionController@update', 'as'=>'equipment_training.update']); |
| 104 | 104 | Route::resource('account.induction', 'InductionController', ['only' => ['update', 'destroy']]); |
| 105 | 105 | }); |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | # Equipment |
| 111 | 111 | ########################## |
| 112 | 112 | |
| 113 | -Route::group(array('middleware' => 'role:member'), function() { |
|
| 113 | +Route::group(array('middleware' => 'role:member'), function () { |
|
| 114 | 114 | Route::resource('equipment', 'EquipmentController'); |
| 115 | 115 | Route::post('equipment/{id}/photo', ['uses'=>'EquipmentController@addPhoto', 'as'=>'equipment.photo.store']); |
| 116 | 116 | Route::delete('equipment/{id}/photo/{key}', ['uses'=>'EquipmentController@destroyPhoto', 'as'=>'equipment.photo.destroy']); |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | # Key fobs |
| 134 | 134 | ########################## |
| 135 | 135 | |
| 136 | -Route::group(array('middleware' => 'role:admin'), function() { |
|
| 136 | +Route::group(array('middleware' => 'role:admin'), function () { |
|
| 137 | 137 | Route::resource('keyfob', 'KeyFobController', ['only' => ['index', 'store', 'update', 'destroy']]); |
| 138 | 138 | }); |
| 139 | 139 | |
@@ -165,11 +165,11 @@ discard block |
||
| 165 | 165 | |
| 166 | 166 | Route::post('camera/event/store', ['uses' => 'CCTVController@store']); |
| 167 | 167 | |
| 168 | -Route::group(array('middleware' => 'role:admin'), function() { |
|
| 168 | +Route::group(array('middleware' => 'role:admin'), function () { |
|
| 169 | 169 | Route::resource('detected_devices', 'DetectedDevicesController'); |
| 170 | 170 | }); |
| 171 | 171 | |
| 172 | -Route::group(array('middleware' => 'role:acs'), function() { |
|
| 172 | +Route::group(array('middleware' => 'role:acs'), function () { |
|
| 173 | 173 | Route::resource('devices', 'DeviceController'); |
| 174 | 174 | }); |
| 175 | 175 | |
@@ -245,11 +245,11 @@ discard block |
||
| 245 | 245 | # Roles |
| 246 | 246 | ########################## |
| 247 | 247 | |
| 248 | -Route::group(array('middleware' => 'role:admin'), function() { |
|
| 248 | +Route::group(array('middleware' => 'role:admin'), function () { |
|
| 249 | 249 | Route::resource('roles', 'RolesController', []); |
| 250 | 250 | Route::resource('roles.users', 'RoleUsersController', ['only' => ['destroy', 'store']]); |
| 251 | 251 | }); |
| 252 | -Route::group(array('middleware' => 'role:member'), function() { |
|
| 252 | +Route::group(array('middleware' => 'role:member'), function () { |
|
| 253 | 253 | Route::resource('groups', 'GroupsController', ['only' => ['index', 'show']]); |
| 254 | 254 | }); |
| 255 | 255 | |
@@ -268,7 +268,7 @@ discard block |
||
| 268 | 268 | # Expenses |
| 269 | 269 | ########################## |
| 270 | 270 | |
| 271 | -Route::group(array('middleware' => 'role:member'), function() { |
|
| 271 | +Route::group(array('middleware' => 'role:member'), function () { |
|
| 272 | 272 | Route::resource('expenses', 'ExpensesController'); |
| 273 | 273 | }); |
| 274 | 274 | |
@@ -285,10 +285,10 @@ discard block |
||
| 285 | 285 | |
| 286 | 286 | |
| 287 | 287 | |
| 288 | -Route::any('api-docs.json', function() { |
|
| 288 | +Route::any('api-docs.json', function () { |
|
| 289 | 289 | $filePath = Config::get('swagger.doc-dir') . "/api-docs.json"; |
| 290 | 290 | |
| 291 | - if (!File::Exists($filePath)) { |
|
| 291 | + if ( ! File::Exists($filePath)) { |
|
| 292 | 292 | App::abort(404, "Cannot find {$filePath}"); |
| 293 | 293 | } |
| 294 | 294 | |
@@ -298,13 +298,13 @@ discard block |
||
| 298 | 298 | )); |
| 299 | 299 | }); |
| 300 | 300 | |
| 301 | -Route::get('api-docs', function() { |
|
| 301 | +Route::get('api-docs', function () { |
|
| 302 | 302 | if (Config::get('swagger.generateAlways')) { |
| 303 | - $appDir = base_path()."/".Config::get('swagger.app-dir'); |
|
| 303 | + $appDir = base_path() . "/" . Config::get('swagger.app-dir'); |
|
| 304 | 304 | $docDir = Config::get('swagger.doc-dir'); |
| 305 | 305 | |
| 306 | 306 | |
| 307 | - if (!File::exists($docDir) || is_writable($docDir)) { |
|
| 307 | + if ( ! File::exists($docDir) || is_writable($docDir)) { |
|
| 308 | 308 | // delete all existing documentation |
| 309 | 309 | if (File::exists($docDir)) { |
| 310 | 310 | File::deleteDirectory($docDir); |
@@ -314,7 +314,7 @@ discard block |
||
| 314 | 314 | |
| 315 | 315 | $excludeDirs = Config::get('swagger.excludes'); |
| 316 | 316 | |
| 317 | - $swagger = \Swagger\scan($appDir, [ |
|
| 317 | + $swagger = \Swagger\scan($appDir, [ |
|
| 318 | 318 | 'exclude' => $excludeDirs |
| 319 | 319 | ]); |
| 320 | 320 | |
@@ -3,7 +3,7 @@ |
||
| 3 | 3 | namespace BB\Listeners; |
| 4 | 4 | |
| 5 | 5 | use BB\Events\MemberActivity; |
| 6 | -use BB\Repo\ActivityRepository;use Illuminate\Queue\InteractsWithQueue; |
|
| 6 | +use BB\Repo\ActivityRepository; use Illuminate\Queue\InteractsWithQueue; |
|
| 7 | 7 | use Illuminate\Contracts\Queue\ShouldQueue; |
| 8 | 8 | |
| 9 | 9 | class RecordMemberActivity |
@@ -28,8 +28,7 @@ |
||
| 28 | 28 | if (\App::environment('production')) { |
| 29 | 29 | |
| 30 | 30 | //If the user doesn't have a slack username registered there is nothing we can do |
| 31 | - if (empty($event->notification->user()->slack_username)) |
|
| 32 | - { |
|
| 31 | + if (empty($event->notification->user()->slack_username)) { |
|
| 33 | 32 | return; |
| 34 | 33 | } |
| 35 | 34 | |