@@ -56,9 +56,9 @@ discard block |
||
| 56 | 56 | \Route::group([ |
| 57 | 57 | 'middleware' => 'web', |
| 58 | 58 | 'namespace' => $this->namespace, |
| 59 | - ], function ($router) { |
|
| 59 | + ], function($router) { |
|
| 60 | 60 | |
| 61 | - require __DIR__ . '/../routes/web.php'; |
|
| 61 | + require __DIR__.'/../routes/web.php'; |
|
| 62 | 62 | }); |
| 63 | 63 | } |
| 64 | 64 | |
@@ -75,8 +75,8 @@ discard block |
||
| 75 | 75 | 'middleware' => 'api', |
| 76 | 76 | 'namespace' => $this->namespace, |
| 77 | 77 | 'prefix' => 'api', |
| 78 | - ], function ($router) { |
|
| 79 | - require __DIR__ . '/../routes/api.php'; |
|
| 78 | + ], function($router) { |
|
| 79 | + require __DIR__.'/../routes/api.php'; |
|
| 80 | 80 | }); |
| 81 | 81 | } |
| 82 | 82 | } |
@@ -11,7 +11,9 @@ discard block |
||
| 11 | 11 | { |
| 12 | 12 | $user = Auth::user(); |
| 13 | 13 | |
| 14 | - if (empty($user)) return false; |
|
| 14 | + if (empty($user)) { |
|
| 15 | + return false; |
|
| 16 | + } |
|
| 15 | 17 | |
| 16 | 18 | return Auth::user()->role->initials == '@sa' || Auth::user()->role->initials == '@a'; |
| 17 | 19 | } |
@@ -27,7 +29,9 @@ discard block |
||
| 27 | 29 | { |
| 28 | 30 | $user = Auth::user(); |
| 29 | 31 | |
| 30 | - if (empty($user)) return false; |
|
| 32 | + if (empty($user)) { |
|
| 33 | + return false; |
|
| 34 | + } |
|
| 31 | 35 | |
| 32 | 36 | return in_array(Auth::user()->role->initials, self::frontendInitialRole()); |
| 33 | 37 | } |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | */ |
| 18 | 18 | public function __construct(Application $app) |
| 19 | 19 | { |
| 20 | - $this->app = $app; |
|
| 20 | + $this->app = $app; |
|
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | /** |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | if (UserUtils::isBackendRole()) |
| 34 | 34 | { |
| 35 | 35 | UserUtils::setDisplayAllStatus(); |
| 36 | - }else{ |
|
| 36 | + } else { |
|
| 37 | 37 | UserUtils::forgotDisplayAllStatus(); |
| 38 | 38 | } |
| 39 | 39 | |
@@ -33,7 +33,7 @@ |
||
| 33 | 33 | if (UserUtils::isBackendRole()) |
| 34 | 34 | { |
| 35 | 35 | UserUtils::setDisplayAllStatus(); |
| 36 | - }else{ |
|
| 36 | + } else{ |
|
| 37 | 37 | UserUtils::forgotDisplayAllStatus(); |
| 38 | 38 | } |
| 39 | 39 | |
@@ -32,7 +32,7 @@ |
||
| 32 | 32 | $order = 1; |
| 33 | 33 | foreach ($ids as $id) { |
| 34 | 34 | $instance = $this->model->find($id); |
| 35 | - if (! empty($instance)) { |
|
| 35 | + if (!empty($instance)) { |
|
| 36 | 36 | $instance->{$this->model->orderFieldName()} = $order; |
| 37 | 37 | $instance->save(); |
| 38 | 38 | $order++; |
@@ -18,8 +18,8 @@ |
||
| 18 | 18 | public function handle($request, Closure $next) |
| 19 | 19 | { |
| 20 | 20 | |
| 21 | - if($request->session()->has('language')){ |
|
| 22 | - $local = $request->session()->get('language',config('app.locale')); |
|
| 21 | + if ($request->session()->has('language')) { |
|
| 22 | + $local = $request->session()->get('language', config('app.locale')); |
|
| 23 | 23 | app()->setLocale($local); |
| 24 | 24 | } |
| 25 | 25 | |
@@ -29,7 +29,7 @@ |
||
| 29 | 29 | |
| 30 | 30 | }); |
| 31 | 31 | |
| 32 | -$router->group(array('middleware' => ['auth','language']), function() use($router) |
|
| 32 | +$router->group(array('middleware' => ['auth', 'language']), function() use($router) |
|
| 33 | 33 | { |
| 34 | 34 | $router->group(array('middleware' => 'permission', 'prefix' => config('expendable.admin_base_uri')), function() use($router) |
| 35 | 35 | { |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | |
| 78 | 78 | $id_element = $this->model->hasBeenTranslated($this->model->getTable(), $id, $iso); |
| 79 | 79 | if (!empty($id_element)) { |
| 80 | - return redirect()->to(action($this->getControllerNameForAction() . '@getEdit', $id_element)); |
|
| 80 | + return redirect()->to(action($this->getControllerNameForAction().'@getEdit', $id_element)); |
|
| 81 | 81 | } |
| 82 | 82 | |
| 83 | 83 | $model = (!empty($id) || $id === "0") ? $this->model->withoutTranslation()->findOrFail($id) : $this->model; |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | return $result; |
| 134 | 134 | } |
| 135 | 135 | |
| 136 | - return redirect()->to(action($this->getControllerNameForAction() . '@getIndex')); |
|
| 136 | + return redirect()->to(action($this->getControllerNameForAction().'@getIndex')); |
|
| 137 | 137 | } |
| 138 | 138 | |
| 139 | 139 | // ------------------------------------------------------------------------------------------------ |
@@ -167,7 +167,7 @@ discard block |
||
| 167 | 167 | return $result; |
| 168 | 168 | } |
| 169 | 169 | |
| 170 | - return redirect()->to(action($this->getControllerNameForAction() . '@getIndex')); |
|
| 170 | + return redirect()->to(action($this->getControllerNameForAction().'@getIndex')); |
|
| 171 | 171 | |
| 172 | 172 | } |
| 173 | 173 | |
@@ -230,7 +230,7 @@ discard block |
||
| 230 | 230 | $form_content = view('form-builder::form.components.formgenerator.info', [ |
| 231 | 231 | 'form' => $form, |
| 232 | 232 | 'id' => $id, |
| 233 | - 'route' => $this->getControllerNameForAction() . '@', |
|
| 233 | + 'route' => $this->getControllerNameForAction().'@', |
|
| 234 | 234 | ]); |
| 235 | 235 | |
| 236 | 236 | $this->layoutManager->add([ |
@@ -250,6 +250,6 @@ discard block |
||
| 250 | 250 | |
| 251 | 251 | $action = explode('@', \Route::currentRouteAction()); |
| 252 | 252 | |
| 253 | - return '\\' . $action[0]; |
|
| 253 | + return '\\'.$action[0]; |
|
| 254 | 254 | } |
| 255 | 255 | } |
| 256 | 256 | \ No newline at end of file |
@@ -13,7 +13,7 @@ |
||
| 13 | 13 | */ |
| 14 | 14 | protected function registerRouter() |
| 15 | 15 | { |
| 16 | - $this->app->singleton('router',function ($app) { |
|
| 16 | + $this->app->singleton('router', function($app) { |
|
| 17 | 17 | return new Router($app['events'], $app); |
| 18 | 18 | }); |
| 19 | 19 | } |
@@ -30,22 +30,22 @@ discard block |
||
| 30 | 30 | public function boot() |
| 31 | 31 | { |
| 32 | 32 | |
| 33 | - $this->loadViewsFrom(__DIR__ . '/../../views', 'expendable'); |
|
| 34 | - $this->loadTranslationsFrom(__DIR__ . '/../../lang', 'expendable'); |
|
| 35 | - $this->loadMigrationsFrom(__DIR__ . '/../../database/migrations/'); |
|
| 33 | + $this->loadViewsFrom(__DIR__.'/../../views', 'expendable'); |
|
| 34 | + $this->loadTranslationsFrom(__DIR__.'/../../lang', 'expendable'); |
|
| 35 | + $this->loadMigrationsFrom(__DIR__.'/../../database/migrations/'); |
|
| 36 | 36 | |
| 37 | 37 | |
| 38 | 38 | $this->publishes([ |
| 39 | - __DIR__ . '/../../config/config.php' => config_path('expendable.php'), |
|
| 40 | - __DIR__ . '/../../database/seeds/' => base_path('/database/seeds'), |
|
| 39 | + __DIR__.'/../../config/config.php' => config_path('expendable.php'), |
|
| 40 | + __DIR__.'/../../database/seeds/' => base_path('/database/seeds'), |
|
| 41 | 41 | ]); |
| 42 | 42 | |
| 43 | 43 | |
| 44 | 44 | $this->publishes([ |
| 45 | - __DIR__ . '/../../views' => base_path('resources/views/vendor/expendable'), |
|
| 45 | + __DIR__.'/../../views' => base_path('resources/views/vendor/expendable'), |
|
| 46 | 46 | ], 'views'); |
| 47 | 47 | $this->mergeConfigFrom( |
| 48 | - __DIR__ . '/../../config/config.php', 'expendable' |
|
| 48 | + __DIR__.'/../../config/config.php', 'expendable' |
|
| 49 | 49 | ); |
| 50 | 50 | |
| 51 | 51 | $autoLoaderListener = new \Distilleries\Expendable\Register\ListenerAutoLoader(config('expendable.listener')); |
@@ -128,13 +128,13 @@ discard block |
||
| 128 | 128 | protected function registerCommands() |
| 129 | 129 | { |
| 130 | 130 | $file = app('files'); |
| 131 | - $files = $file->allFiles(__DIR__ . '/Console/'); |
|
| 131 | + $files = $file->allFiles(__DIR__.'/Console/'); |
|
| 132 | 132 | |
| 133 | 133 | foreach ($files as $file) |
| 134 | 134 | { |
| 135 | 135 | if (strpos($file->getPathName(), 'Lib') === false) |
| 136 | 136 | { |
| 137 | - $this->commands('Distilleries\Expendable\Console\\' . preg_replace('/\.php/i', '', $file->getFilename())); |
|
| 137 | + $this->commands('Distilleries\Expendable\Console\\'.preg_replace('/\.php/i', '', $file->getFilename())); |
|
| 138 | 138 | } |
| 139 | 139 | } |
| 140 | 140 | } |