@@ -1,19 +1,19 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -Route::group(['namespace' => 'Back', 'prefix' => 'blender'], function () { |
|
3 | +Route::group(['namespace' => 'Back', 'prefix' => 'blender'], function() { |
|
4 | 4 | |
5 | 5 | require __DIR__.'/back_auth.php'; |
6 | 6 | |
7 | - Route::group(['middleware' => 'auth'], function () { |
|
7 | + Route::group(['middleware' => 'auth'], function() { |
|
8 | 8 | require __DIR__.'/back.php'; |
9 | 9 | }); |
10 | 10 | }); |
11 | 11 | |
12 | -Route::group(['namespace' => 'Front'], function () { |
|
12 | +Route::group(['namespace' => 'Front'], function() { |
|
13 | 13 | |
14 | 14 | $multiLingual = count(config('app.locales')) > 1; |
15 | 15 | |
16 | - Route::group($multiLingual ? ['prefix' => locale()] : [], function () { |
|
16 | + Route::group($multiLingual ? ['prefix' => locale()] : [], function() { |
|
17 | 17 | try { |
18 | 18 | require __DIR__.'/front_auth.php'; |
19 | 19 | require __DIR__.'/front.php'; |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | }); |
24 | 24 | |
25 | 25 | if ($multiLingual) { |
26 | - Route::get('/', function () { |
|
26 | + Route::get('/', function() { |
|
27 | 27 | return redirect(locale()); |
28 | 28 | }); |
29 | 29 | } |
@@ -21,14 +21,14 @@ discard block |
||
21 | 21 | |
22 | 22 | public function map(Router $router) |
23 | 23 | { |
24 | - $router->group(['namespace' => $this->namespace], function () { |
|
24 | + $router->group(['namespace' => $this->namespace], function() { |
|
25 | 25 | require app_path('Http/Routes/routes.php'); |
26 | 26 | }); |
27 | 27 | } |
28 | 28 | |
29 | 29 | protected function registerMacros(Router $router) |
30 | 30 | { |
31 | - $router->macro('module', function ($slug, $className, $sortable = false) use ($router) { |
|
31 | + $router->macro('module', function($slug, $className, $sortable = false) use ($router) { |
|
32 | 32 | if ($sortable) { |
33 | 33 | $router->patch("{$slug}/changeOrder", "{$className}Controller@changeOrder"); |
34 | 34 | } |
@@ -36,15 +36,15 @@ discard block |
||
36 | 36 | $router->resource($slug, "{$className}Controller"); |
37 | 37 | }); |
38 | 38 | |
39 | - $router->macro('articleList', function ($technicalNamePrefix, $action) use ($router) { |
|
39 | + $router->macro('articleList', function($technicalNamePrefix, $action) use ($router) { |
|
40 | 40 | |
41 | 41 | $articles = Article::getWithTechnicalNameLike($technicalNamePrefix); |
42 | 42 | |
43 | - $router->get(app()->getLocale().'/'.fragment_slug("navigation.{$technicalNamePrefix}"), function () use ($articles) { |
|
43 | + $router->get(app()->getLocale().'/'.fragment_slug("navigation.{$technicalNamePrefix}"), function() use ($articles) { |
|
44 | 44 | return redirect(route("{$articles->first()->technical_name}")); |
45 | 45 | })->name($technicalNamePrefix); |
46 | 46 | |
47 | - $articles->map(function ($article) use ($technicalNamePrefix, $action, $router) { |
|
47 | + $articles->map(function($article) use ($technicalNamePrefix, $action, $router) { |
|
48 | 48 | $router->get(app()->getLocale().'/'.fragment_slug("navigation.{$technicalNamePrefix}").'/'.$article->url, $action)->name("{$article->technical_name}"); |
49 | 49 | }); |
50 | 50 | }); |
@@ -55,7 +55,7 @@ |
||
55 | 55 | |
56 | 56 | public function isCurrentUser() : bool |
57 | 57 | { |
58 | - if (! $this->id) { |
|
58 | + if (!$this->id) { |
|
59 | 59 | return false; |
60 | 60 | } |
61 | 61 |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | |
25 | 25 | public static function getContentLocale() : string |
26 | 26 | { |
27 | - if (! static::isValidLocale(locale())) { |
|
27 | + if (!static::isValidLocale(locale())) { |
|
28 | 28 | return config('app.locales')[0]; |
29 | 29 | } |
30 | 30 | |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | |
34 | 34 | protected static function isValidLocale($locale) : bool |
35 | 35 | { |
36 | - if (! is_string($locale)) { |
|
36 | + if (!is_string($locale)) { |
|
37 | 37 | return false; |
38 | 38 | } |
39 | 39 |
@@ -19,7 +19,7 @@ |
||
19 | 19 | |
20 | 20 | public function sendPasswordEmail(User $user) |
21 | 21 | { |
22 | - Password::broker('front')->sendResetLink(['email' => $user->email], function (Message $message) { |
|
22 | + Password::broker('front')->sendResetLink(['email' => $user->email], function(Message $message) { |
|
23 | 23 | $message->subject('Welkom bij '.request()->getHost()); |
24 | 24 | }); |
25 | 25 | } |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | $menu->add('/'.$locale.'/auth/login', $locale); |
36 | 36 | } |
37 | 37 | |
38 | - $menu = $this->setActiveMenuItem($menu, function ($item) { |
|
38 | + $menu = $this->setActiveMenuItem($menu, function($item) { |
|
39 | 39 | return app()->getLocale() == explode('/', trim($item->getContent()->getUrl(), '/'))[0]; |
40 | 40 | }); |
41 | 41 | |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | $menu->add(action('Back\NewsItemController@index', [], false), fragment('back.newsItems.title'), null, null, ['class'=>'menu_group_item -secondary']); |
50 | 50 | $menu->add(action('Back\PersonController@index', [], false), fragment('back.people.title'), null, null, ['class'=>'menu_group_item -secondary']); |
51 | 51 | |
52 | - $menu = $this->setActiveMenuItem($menu, function ($item) { |
|
52 | + $menu = $this->setActiveMenuItem($menu, function($item) { |
|
53 | 53 | return str_replace('/blender/', '/', $item->getContent()->getUrl()) == ('/'.Request::segment(2)); |
54 | 54 | }); |
55 | 55 | |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | $menu->add(action('Back\FormResponseController@showDownloadButton', [], false), fragment('back.formResponses.title'), null, null, ['class'=>'menu_group_item -secondary']); |
64 | 64 | $menu->add(action('Back\TagController@index', [], false), fragment('back.tags.title'), null, null, ['class'=>'menu_group_item -secondary']); |
65 | 65 | |
66 | - $menu = $this->setActiveMenuItem($menu, function ($item) { |
|
66 | + $menu = $this->setActiveMenuItem($menu, function($item) { |
|
67 | 67 | return str_replace('/blender/', '/', $item->getContent()->getUrl()) == ('/'.Request::segment(2)); |
68 | 68 | }); |
69 | 69 | |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | $menu->add(action('Back\ActivitylogController@index', [], false), 'Log', null, null, ['class'=>'menu_group_item -secondary']); |
81 | 81 | $menu->add(action('Back\StatisticsController@index', [], false), fragment('back.statistics.menuTitle'), null, null, ['class'=>'menu_group_item -secondary']); |
82 | 82 | |
83 | - $menu = $this->setActiveMenuItem($menu, function ($item) { |
|
83 | + $menu = $this->setActiveMenuItem($menu, function($item) { |
|
84 | 84 | return str_replace('/blender/', '/', $item->getContent()->getUrl()) == ('/'.Request::segment(2)); |
85 | 85 | }); |
86 | 86 | |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | |
94 | 94 | $menu->add(action('Back\DashboardController@index', [], false), 'Dashboard', null, null, ['class'=>'menu_group_item']); |
95 | 95 | |
96 | - $menu = $this->setActiveMenuItem($menu, function ($item) { |
|
96 | + $menu = $this->setActiveMenuItem($menu, function($item) { |
|
97 | 97 | return str_replace('/blender/', '/', $item->getContent()->getUrl()) == ('/'.Request::segment(2)); |
98 | 98 | }); |
99 | 99 | |
@@ -104,10 +104,10 @@ discard block |
||
104 | 104 | { |
105 | 105 | $menu = Menu::handler('backUser'); |
106 | 106 | |
107 | - $menu->add(action('Back\BackUserController@edit', ['id' => auth()->user()->id], false), HTML::avatar(auth()->user(), '-small') . '<span class=":responsive-desktop-only">' . auth()->user()->email . '</span>', null, null); |
|
107 | + $menu->add(action('Back\BackUserController@edit', ['id' => auth()->user()->id], false), HTML::avatar(auth()->user(), '-small').'<span class=":responsive-desktop-only">'.auth()->user()->email.'</span>', null, null); |
|
108 | 108 | $menu->add(action('Back\AuthController@getLogout', [], false), '<span class="fa fa-power-off"></span>', null, ['class' => 'menu_circle -log-out', 'title' => 'log out']); |
109 | 109 | |
110 | - $menu = $this->setActiveMenuItem($menu, function ($item) { |
|
110 | + $menu = $this->setActiveMenuItem($menu, function($item) { |
|
111 | 111 | return str_replace('/blender/', '/', $item->getContent()->getUrl()) == ('/'.Request::segment(2)); |
112 | 112 | }); |
113 | 113 | |
@@ -116,7 +116,7 @@ discard block |
||
116 | 116 | |
117 | 117 | protected function setActiveMenuItem($menu, callable $activeTest) |
118 | 118 | { |
119 | - $menu->getItemsByContentType('Menu\Items\Contents\Link')->map(function ($item) use ($activeTest) { |
|
119 | + $menu->getItemsByContentType('Menu\Items\Contents\Link')->map(function($item) use ($activeTest) { |
|
120 | 120 | if ($activeTest($item)) { |
121 | 121 | $item->addClass('active'); |
122 | 122 | } |
@@ -6,7 +6,7 @@ |
||
6 | 6 | { |
7 | 7 | public function section() : string |
8 | 8 | { |
9 | - if(request()->segment(1) === 'blender') { |
|
9 | + if (request()->segment(1) === 'blender') { |
|
10 | 10 | return 'back'; |
11 | 11 | } |
12 | 12 |
@@ -38,6 +38,9 @@ |
||
38 | 38 | return fragment('auth.failed'); |
39 | 39 | } |
40 | 40 | |
41 | + /** |
|
42 | + * @param Request $request |
|
43 | + */ |
|
41 | 44 | protected function sendInactiveAccountResponse($request) |
42 | 45 | { |
43 | 46 | return redirect()->back() |
@@ -24,7 +24,7 @@ |
||
24 | 24 | |
25 | 25 | protected function authenticated(Request $request, User $user) |
26 | 26 | { |
27 | - if (! $user->isActive()) { |
|
27 | + if (!$user->isActive()) { |
|
28 | 28 | auth()->guard('front')->logout(); |
29 | 29 | |
30 | 30 | return $this->sendInactiveAccountResponse($request); |
@@ -57,7 +57,7 @@ |
||
57 | 57 | { |
58 | 58 | $user = $this->frontUserRepository->find($id); |
59 | 59 | |
60 | - if (! $user) abort(404); |
|
60 | + if (!$user) abort(404); |
|
61 | 61 | |
62 | 62 | return view('back.frontUsers.edit')->with(compact('user')); |
63 | 63 | } |
@@ -57,7 +57,9 @@ |
||
57 | 57 | { |
58 | 58 | $user = $this->frontUserRepository->find($id); |
59 | 59 | |
60 | - if (! $user) abort(404); |
|
60 | + if (! $user) { |
|
61 | + abort(404); |
|
62 | + } |
|
61 | 63 | |
62 | 64 | return view('back.frontUsers.edit')->with(compact('user')); |
63 | 65 | } |