jdrda / olapus

app/Http/Middleware/AddPublishedAt.php

Braces +1 added lines, -2 removed lines

@@ -31,8 +31,7 @@
         if($request->has('published')){
             
             $request->merge(['published_at' => \Carbon\Carbon::now()]);
-        }
-        else{
+        } else{
 
             $request->merge(['published_at' => NULL]);
         }

Spacing +4 added lines, -4 removed lines

@@ -29,13 +29,13 @@
     public function handle(Request $request, Closure $next)
     {
  
-        if($request->has('published')){
+        if ($request->has('published')) {
             
-            $request->merge(['published_at' => \Carbon\Carbon::now()]);
+            $request->merge([ 'published_at' => \Carbon\Carbon::now() ]);
         }
-        else{
+        else {
 
-            $request->merge(['published_at' => NULL]);
+            $request->merge([ 'published_at' => NULL ]);
         }
         
         return $next($request);

app/Http/Middleware/AddLookupTables.php

Spacing +3 added lines, -3 removed lines

@@ -31,12 +31,12 @@
          * Get lookup table data and insert into request
          */
         $intArgs = func_num_args();
-        for($a = 2; $a < $intArgs; $a++){
+        for ($a = 2; $a < $intArgs; $a++) {
             
             $model = func_get_arg($a);
-            $modelWithNamespace = 'App\\'.$model;
+            $modelWithNamespace = 'App\\' . $model;
             
-            $request->merge([$model => $modelWithNamespace::orderBy('name', 'asc')->get()]);
+            $request->merge([ $model => $modelWithNamespace::orderBy('name', 'asc')->get() ]);
         }
   
         return $next($request);     

app/Http/routes.php

Indentation +2 added lines, -2 removed lines

@@ -153,8 +153,8 @@
         ]]);
     
      /**
-     * Advertising
-     */
+      * Advertising
+      */
     Route::resource('advert', 'Admin\AdvertController', ['names' => [
         'index' => 'advert.index',
         'create' => 'advert.create',

Spacing +38 added lines, -38 removed lines

@@ -15,14 +15,14 @@ 
 /**
  * Root
  */
-Route::get('/', ['as' => 'root', function () {
+Route::get('/', [ 'as' => 'root', function() {
         return view('welcome');
-}]);
+} ]);
 
 /**
  * Main index
  */
-Route::get('/home', function () {
+Route::get('/home', function() {
 
     return redirect()->route('admin.dashboard.index');
 });
@@ -30,7 +30,7 @@ 
 /**
  * Admin
  */
-Route::group(['prefix' => env('APP_ADMIN_URL', 'admin'), 'as' => 'admin.', 'middleware' => ['web', 'auth']], function () {
+Route::group([ 'prefix' => env('APP_ADMIN_URL', 'admin'), 'as' => 'admin.', 'middleware' => [ 'web', 'auth' ] ], function() {
 
 
     /**
@@ -43,7 +43,7 @@ 
     /**
      * Articles and categories
      */
-    Route::resource('page', 'Admin\PageController', ['names' => [
+    Route::resource('page', 'Admin\PageController', [ 'names' => [
         'index' => 'page.index',
         'create' => 'page.create',
         'store' => 'page.store',
@@ -51,8 +51,8 @@ 
         'edit' => 'page.edit',
         'update' => 'page.update',
         'destroy' => 'page.destroy'
-        ]]);
-    Route::resource('pageCategory', 'Admin\PageCategoryController', ['names' => [
+        ] ]);
+    Route::resource('pageCategory', 'Admin\PageCategoryController', [ 'names' => [
         'index' => 'pageCategory.index',
         'create' => 'pageCategory.create',
         'store' => 'pageCategory.store',
@@ -60,12 +60,12 @@ 
         'edit' => 'pageCategory.edit',
         'update' => 'pageCategory.update',
         'destroy' => 'pageCategory.destroy'
-        ]]);
+        ] ]);
     
     /**
      * Articles and categories
      */
-    Route::resource('article', 'Admin\ArticleController', ['names' => [
+    Route::resource('article', 'Admin\ArticleController', [ 'names' => [
         'index' => 'article.index',
         'create' => 'article.create',
         'store' => 'article.store',
@@ -73,8 +73,8 @@ 
         'edit' => 'article.edit',
         'update' => 'article.update',
         'destroy' => 'article.destroy'
-        ]]);
-    Route::resource('articleCategory', 'Admin\ArticleCategoryController', ['names' => [
+        ] ]);
+    Route::resource('articleCategory', 'Admin\ArticleCategoryController', [ 'names' => [
         'index' => 'articleCategory.index',
         'create' => 'articleCategory.create',
         'store' => 'articleCategory.store',
@@ -82,12 +82,12 @@ 
         'edit' => 'articleCategory.edit',
         'update' => 'articleCategory.update',
         'destroy' => 'articleCategory.destroy'
-        ]]);
+        ] ]);
     
     /**
      * Feedback
      */
-    Route::resource('feedback', 'Admin\FeedbackController', ['names' => [
+    Route::resource('feedback', 'Admin\FeedbackController', [ 'names' => [
         'index' => 'feedback.index',
         'create' => 'feedback.create',
         'store' => 'feedback.store',
@@ -95,12 +95,12 @@ 
         'edit' => 'feedback.edit',
         'update' => 'feedback.update',
         'destroy' => 'feedback.destroy'
-        ]]);
+        ] ]);
     
     /**
      * Comment
      */
-    Route::resource('comment', 'Admin\CommentController', ['names' => [
+    Route::resource('comment', 'Admin\CommentController', [ 'names' => [
         'index' => 'comment.index',
         'create' => 'comment.create',
         'store' => 'comment.store',
@@ -108,7 +108,7 @@ 
         'edit' => 'comment.edit',
         'update' => 'comment.update',
         'destroy' => 'comment.destroy'
-        ]]);
+        ] ]);
     Route::get('comment/{id}/approve', [
         'as' => 'comment.approve', 'uses' => 'Admin\CommentController@approve'
     ]);
@@ -119,7 +119,7 @@ 
     /**
      * Sliders and slides
      */
-    Route::resource('slider', 'Admin\SliderController', ['names' => [
+    Route::resource('slider', 'Admin\SliderController', [ 'names' => [
         'index' => 'slider.index',
         'create' => 'slider.create',
         'store' => 'slider.store',
@@ -127,8 +127,8 @@ 
         'edit' => 'slider.edit',
         'update' => 'slider.update',
         'destroy' => 'slider.destroy'
-        ]]);
-    Route::resource('slide', 'Admin\SlideController', ['names' => [
+        ] ]);
+    Route::resource('slide', 'Admin\SlideController', [ 'names' => [
         'index' => 'slide.index',
         'create' => 'slide.create',
         'store' => 'slide.store',
@@ -136,12 +136,12 @@ 
         'edit' => 'slide.edit',
         'update' => 'slide.update',
         'destroy' => 'slide.destroy'
-        ]]);
+        ] ]);
     
     /**
      * Images and categories
      */
-    Route::resource('image', 'Admin\ImageController', ['middleware' => ['media.addparameters'],
+    Route::resource('image', 'Admin\ImageController', [ 'middleware' => [ 'media.addparameters' ],
         'names' => [
         'index' => 'image.index',
         'create' => 'image.create',
@@ -150,8 +150,8 @@ 
         'edit' => 'image.edit',
         'update' => 'image.update',
         'destroy' => 'image.destroy'
-        ]]);
-    Route::resource('imageCategory', 'Admin\ImageCategoryController', ['names' => [
+        ] ]);
+    Route::resource('imageCategory', 'Admin\ImageCategoryController', [ 'names' => [
         'index' => 'imageCategory.index',
         'create' => 'imageCategory.create',
         'store' => 'imageCategory.store',
@@ -159,12 +159,12 @@ 
         'edit' => 'imageCategory.edit',
         'update' => 'imageCategory.update',
         'destroy' => 'imageCategory.destroy'
-        ]]);
+        ] ]);
     
      /**
      * Advertising
      */
-    Route::resource('advert', 'Admin\AdvertController', ['names' => [
+    Route::resource('advert', 'Admin\AdvertController', [ 'names' => [
         'index' => 'advert.index',
         'create' => 'advert.create',
         'store' => 'advert.store',
@@ -172,8 +172,8 @@ 
         'edit' => 'advert.edit',
         'update' => 'advert.update',
         'destroy' => 'advert.destroy'
-        ]]);
-    Route::resource('advertLocation', 'Admin\AdvertLocationController', ['names' => [
+        ] ]);
+    Route::resource('advertLocation', 'Admin\AdvertLocationController', [ 'names' => [
         'index' => 'advertLocation.index',
         'create' => 'advertLocation.create',
         'store' => 'advertLocation.store',
@@ -181,12 +181,12 @@ 
         'edit' => 'advertLocation.edit',
         'update' => 'advertLocation.update',
         'destroy' => 'advertLocation.destroy'
-        ]]);
+        ] ]);
     
     /**
      * Products and categories
      */
-    Route::resource('productCategory', 'Admin\ProductCategoryController', ['names' => [
+    Route::resource('productCategory', 'Admin\ProductCategoryController', [ 'names' => [
         'index' => 'productCategory.index',
         'create' => 'productCategory.create',
         'store' => 'productCategory.store',
@@ -194,8 +194,8 @@ 
         'edit' => 'productCategory.edit',
         'update' => 'productCategory.update',
         'destroy' => 'productCategory.destroy'
-        ]]);
-    Route::resource('product', 'Admin\ProductController', ['names' => [
+        ] ]);
+    Route::resource('product', 'Admin\ProductController', [ 'names' => [
         'index' => 'product.index',
         'create' => 'product.create',
         'store' => 'product.store',
@@ -203,13 +203,13 @@ 
         'edit' => 'product.edit',
         'update' => 'product.update',
         'destroy' => 'product.destroy'
-        ]]);
+        ] ]);
     
     /**
      * Settings
      */
     Route::resource('settings', 'Admin\SettingsController', [
-        'except' => ['delete', 'show'],
+        'except' => [ 'delete', 'show' ],
         'names' => [
         'index' => 'settings.index',
         'create' => 'settings.create',
@@ -218,13 +218,13 @@ 
         'edit' => 'settings.edit',
         'update' => 'settings.update',
         'destroy' => 'settings.destroy'
-        ]]);
+        ] ]);
     
     /**
      * Users
      */
     Route::resource('user', 'Admin\UserController', [
-        'except' => ['show'],
+        'except' => [ 'show' ],
         'names' => [
         'index' => 'user.index',
         'create' => 'user.create',
@@ -233,14 +233,14 @@ 
         'edit' => 'user.edit',
         'update' => 'user.update',
         'destroy' => 'user.destroy'
-        ]]);
+        ] ]);
     
 });
 
 /**
  * Authentication
  */
-Route::group(['middleware' => 'web'], function () {
+Route::group([ 'middleware' => 'web' ], function() {
 
     Route::get('login', 'Auth\LoginController@showLoginForm')->name('login');
     Route::post('login', 'Auth\LoginController@login')->name('authPostLogin');
@@ -260,7 +260,7 @@ 
 /**
  * Images
  */
-Route::get('/' . env('APP_IMAGE_URL', 'images').'/{imageName}.{imageExtension}', [
+Route::get('/' . env('APP_IMAGE_URL', 'images') . '/{imageName}.{imageExtension}', [
     'as' => 'getImage', 'uses' => 'Media\ImageController@getImage'
 ]);
 

app/AdvertLocation.php

Spacing +5 added lines, -5 removed lines

@@ -33,21 +33,21 @@ 
      *
      * @var array
      */
-    protected $dates = ['created_at', 'updated_at', 'deleted_at'];
+    protected $dates = [ 'created_at', 'updated_at', 'deleted_at' ];
 
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
-    protected $fillable = ['name', 'description', 'color'];
+    protected $fillable = [ 'name', 'description', 'color' ];
     
     /**
      * Columns to exclude from index
      * 
      * @var array 
      */
-    protected $excludedFromIndex = [];
+    protected $excludedFromIndex = [ ];
 
     /**
      * Fields to search in fulltext mode
@@ -82,7 +82,7 @@ 
      * 
      * @return object
      */
-    public function adverts(){
+    public function adverts() {
         
         return $this->belongsToMany('App\Advert', 'advert_advertlocation', 'advert_id', 'advertlocation_id');
     }
@@ -93,7 +93,7 @@ 
      * @param type $query
      * @return object
      */
-    public function scopeRelationships($query){
+    public function scopeRelationships($query) {
         
         return $query->with('adverts');
     }

app/PageCategory.php

Spacing +5 added lines, -5 removed lines

@@ -32,21 +32,21 @@ 
      *
      * @var array
      */
-    protected $dates = ['created_at', 'updated_at', 'deleted_at'];
+    protected $dates = [ 'created_at', 'updated_at', 'deleted_at' ];
 
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
-    protected $fillable = ['name', 'description', 'class'];
+    protected $fillable = [ 'name', 'description', 'class' ];
     
     /**
      * Columns to exclude from index
      * 
      * @var array 
      */
-    protected $excludedFromIndex = [];
+    protected $excludedFromIndex = [ ];
 
     /**
      * Fields to search in fulltext mode
@@ -86,7 +86,7 @@ 
      * 
      * @return object
      */
-    public function pages(){
+    public function pages() {
         
         return $this->belongsToMany('App\Page', 'page_pagecategory', 'page_id', 'pagecategory_id');
     }
@@ -97,7 +97,7 @@ 
      * @param query $query
      * @return query
      */
-    public function scopeRelationships($query){
+    public function scopeRelationships($query) {
         
         return $query->with('pages');
     }

app/Feedback.php

Spacing +5 added lines, -5 removed lines

@@ -33,21 +33,21 @@ 
      *
      * @var array
      */
-    protected $dates = ['created_at', 'updated_at', 'deleted_at'];
+    protected $dates = [ 'created_at', 'updated_at', 'deleted_at' ];
     
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
-    protected $fillable = ['name', 'description', 'position', 'image_id'];
+    protected $fillable = [ 'name', 'description', 'position', 'image_id' ];
     
     /**
      * Columns to exclude from index
      * 
      * @var array 
      */
-    protected $excludedFromIndex = ['image'];
+    protected $excludedFromIndex = [ 'image' ];
     
     /**
      * Fields to search in fulltext mode
@@ -83,7 +83,7 @@ 
      * 
      * @return object
      */
-    public function images(){
+    public function images() {
         
         return $this->belongsTo('App\Image', 'image_id')->select('id', 'name', 'description', 
                 'alt', 'url', 'imagecategory_id', 'image_mime_type', 'image_extension', 
@@ -97,7 +97,7 @@ 
      * @param query $query
      * @return query
      */
-    public function scopeRelationships($query){
+    public function scopeRelationships($query) {
         
         return $query->with('images', 'images.imagecategories');
     }

app/AdminModelTrait.php

Braces +1 added lines, -2 removed lines

@@ -72,8 +72,7 @@
     {
         if(isset($this->excludedFromFind) == TRUE && is_array($this->excludedFromFind) == TRUE){
             return $query->select( array_diff(Schema::getColumnListing($this->table), $this->excludedFromFind) );
-        }
-        else{
+        } else{
             return $query;
         }
     }

Spacing +17 added lines, -17 removed lines

@@ -35,7 +35,7 @@ 
      *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeFulltextAllColumns(Builder $query){
+    public function scopeFulltextAllColumns(Builder $query) {
   
         return Helpers::virtualFulltextSearchColumns($query, request('search'), $this->fulltextFields);
     }
@@ -45,7 +45,7 @@ 
      *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeOrderByColumns(Builder $query){
+    public function scopeOrderByColumns(Builder $query) {
         
         return Helpers::orderByColumns($query, $this->defaultOrderBy);
     }
@@ -57,7 +57,7 @@ 
      */
     public function scopeExcludeFromIndex(Builder $query)
     {
-        return $query->select( array_diff(Schema::getColumnListing($this->table), $this->excludedFromIndex) );
+        return $query->select(array_diff(Schema::getColumnListing($this->table), $this->excludedFromIndex));
     }
     
     /**
@@ -67,10 +67,10 @@ 
      */
     public function scopeExcludeFromFind(Builder $query)
     {
-        if(isset($this->excludedFromFind) == TRUE && is_array($this->excludedFromFind) == TRUE){
-            return $query->select( array_diff(Schema::getColumnListing($this->table), $this->excludedFromFind) );
+        if (isset($this->excludedFromFind) == TRUE && is_array($this->excludedFromFind) == TRUE) {
+            return $query->select(array_diff(Schema::getColumnListing($this->table), $this->excludedFromFind));
         }
-        else{
+        else {
             return $query;
         }
     }
@@ -80,7 +80,7 @@ 
      *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeRelationships(Builder $query){
+    public function scopeRelationships(Builder $query) {
         
         return $query;
     }
@@ -90,30 +90,30 @@ 
      *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    public function scopeExternalTablesFilter(Builder $query){
+    public function scopeExternalTablesFilter(Builder $query) {
         
-        if(Request::input('relation')){
+        if (Request::input('relation')) {
             
-            $allTables = [];
+            $allTables = [ ];
             
             $relations = explode(',', Request::input('relation'));
             
-            foreach ($relations as $relation){
+            foreach ($relations as $relation) {
                 
                 $keyvalue = explode(':', $relation);
                 
-                $key = trim($keyvalue[0]);
-                $value = trim($keyvalue[1]);
+                $key = trim($keyvalue[ 0 ]);
+                $value = trim($keyvalue[ 1 ]);
                 
-                $allTables[$key] = $value;
+                $allTables[ $key ] = $value;
                 
-                if(is_numeric($value) == TRUE){
+                if (is_numeric($value) == TRUE) {
                     
-                    $query->where(strtolower($key)."_id", '=', $value);
+                    $query->where(strtolower($key) . "_id", '=', $value);
                 }
             }
             
-             request()->merge(['external_tables_filter' => $allTables]);
+             request()->merge([ 'external_tables_filter' => $allTables ]);
         }
         
         return $query;

app/Http/Controllers/Admin/DashboardController.php

Braces +1 added lines, -2 removed lines

@@ -126,8 +126,7 @@
         {
             return round((($thisValue / ($lastValue / 100)) - 100), $round);
 
-        }
-        else {
+        } else {
 
             return 0;
         }

Spacing +6 added lines, -6 removed lines

@@ -41,7 +41,7 @@ 
      * 
      * @var array
      */
-    protected $gaData = [];
+    protected $gaData = [ ];
 
     /**
      * Constructor
@@ -58,7 +58,7 @@ 
          * Module name for blade
          */
         $temp = explode('.', $this->moduleBasicRoute);
-        View::share('moduleNameBlade', $temp[0] . "_module_" . $temp[1]);
+        View::share('moduleNameBlade', $temp[ 0 ] . "_module_" . $temp[ 1 ]);
 
 
     }
@@ -78,14 +78,14 @@ 
             $ga = $this->getGAValues();
         } else {
 
-            $ga = [];
+            $ga = [ ];
         }
 
         $statistics = [
             'ga' => $ga
         ];
 
-        return view('admin.modules.dashboard.index', ['statistics' => $statistics]);
+        return view('admin.modules.dashboard.index', [ 'statistics' => $statistics ]);
     }
 
     /**
@@ -100,7 +100,7 @@ 
         /**
          * Get the data
          */
-        $data =  \Analytics::getVisitorsAndPageViews($days);
+        $data = \Analytics::getVisitorsAndPageViews($days);
 
         /**
          * Calculate total
@@ -108,7 +108,7 @@ 
         $total = 0;
         foreach ($data as $value) {
 
-            $total += $value[$type];
+            $total += $value[ $type ];
         }
 
         return $total;

app/Http/Controllers/Admin/SettingsController.php

Spacing +1 added lines, -1 removed lines

@@ -24,5 +24,5 @@
     protected $arValidationArray = [
                     'name' => 'required|max:255|unique:settings,name',
                     'value' => 'max:255',
-                    'description' => 'max:255'];
+                    'description' => 'max:255' ];
 }