crocodic-studio / crudbooster

src/routes.php

Braces +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
     if (Request::is(cbConfig('ADMIN_PATH'))) {
         if($dashboard = cbConfig("ADMIN_DASHBOARD_CONTROLLER")) {
             Route::get("/", $dashboard);
-        }else{
+        } else{
             Route::get("/", "crocodicstudio\crudbooster\controllers\AdminDashboardController@getIndex");
         }
     }

Spacing +15 added lines, -15 removed lines

@@ -1,30 +1,30 @@ 
 <?php
 
 // Developer Backend Middleware
-Route::group(['middleware' => ['web',\crocodicstudio\crudbooster\middlewares\CBDeveloper::class],
+Route::group(['middleware' => ['web', \crocodicstudio\crudbooster\middlewares\CBDeveloper::class],
     'prefix'=>cbConfig('DEV_PATH'),
-    'namespace' => 'crocodicstudio\crudbooster\controllers'], function () {
+    'namespace' => 'crocodicstudio\crudbooster\controllers'], function() {
     cb()->routeController("modules", "DeveloperModulesController");
     cb()->routeController("menus", "DeveloperMenusController");
-    cb()->routeController("roles","DeveloperRolesController");
+    cb()->routeController("roles", "DeveloperRolesController");
 });
 
 // Developer Auth Middleware
 Route::group(['middleware' => ['web'],
     'prefix'=>cbConfig('DEV_PATH'),
-    'namespace' => 'crocodicstudio\crudbooster\controllers'], function () {
-    Route::post("login","AdminAuthController@postLoginDeveloper");
-    Route::get("login","AdminAuthController@getLoginDeveloper");
-    Route::get("logout","AdminAuthController@getLogoutDeveloper");
+    'namespace' => 'crocodicstudio\crudbooster\controllers'], function() {
+    Route::post("login", "AdminAuthController@postLoginDeveloper");
+    Route::get("login", "AdminAuthController@getLoginDeveloper");
+    Route::get("logout", "AdminAuthController@getLogoutDeveloper");
 });
 
 // Routing without any middleware
-Route::group(['middleware' => ['web'], 'namespace' => '\crocodicstudio\crudbooster\controllers'], function () {
+Route::group(['middleware' => ['web'], 'namespace' => '\crocodicstudio\crudbooster\controllers'], function() {
     Route::get('uploads/{one?}/{two?}/{three?}/{four?}/{five?}', ['uses' => 'FileController@getPreview', 'as' => 'fileControllerPreview']);
 });
 
 // Routing without any middleware with admin prefix
-Route::group(['middleware' => ['web'], 'prefix' => cbConfig('ADMIN_PATH'), 'namespace' => 'crocodicstudio\crudbooster\controllers'], function () {
+Route::group(['middleware' => ['web'], 'prefix' => cbConfig('ADMIN_PATH'), 'namespace' => 'crocodicstudio\crudbooster\controllers'], function() {
     Route::get('logout', ['uses' => 'AdminAuthController@getLogout', 'as' => 'getLogout']);
     Route::post('login', ['uses' => 'AdminAuthController@postLogin', 'as' => 'postLogin']);
     Route::get('login', ['uses' => 'AdminAuthController@getLogin', 'as' => 'getLogin']);
@@ -35,7 +35,7 @@ 
     'middleware' => ['web', \crocodicstudio\crudbooster\middlewares\CBBackend::class],
     'prefix' => cbConfig('ADMIN_PATH'),
     'namespace' => 'crocodicstudio\crudbooster\controllers',
-], function () {
+], function() {
     cb()->routeController('profile', 'AdminProfileController');
 });
 
@@ -44,22 +44,22 @@ 
     'middleware' => ['web', \crocodicstudio\crudbooster\middlewares\CBBackend::class],
     'prefix' => cbConfig('ADMIN_PATH'),
     'namespace' => 'App\Http\Controllers',
-], function () {
+], function() {
 
     if (Request::is(cbConfig('ADMIN_PATH'))) {
-        if($dashboard = cbConfig("ADMIN_DASHBOARD_CONTROLLER")) {
+        if ($dashboard = cbConfig("ADMIN_DASHBOARD_CONTROLLER")) {
             Route::get("/", $dashboard);
-        }else{
+        } else {
             Route::get("/", "crocodicstudio\crudbooster\controllers\AdminDashboardController@getIndex");
         }
     }
 
     $controllers = glob(app_path('Http/Controllers/Admin*Controller.php'));
-    foreach($controllers as $controller) {
+    foreach ($controllers as $controller) {
         $controllerName = basename($controller);
         $className = '\App\Http\Controllers\\'.$controllerName;
         $controllerClass = new $className();
-        if(method_exists($controllerClass, 'cbInit')) {
+        if (method_exists($controllerClass, 'cbInit')) {
             cb()->routeController($controllerClass->getData('permalink'), $controllerName);
         }
     }

src/configs/crudbooster.php

Spacing +2 added lines, -2 removed lines

@@ -30,9 +30,9 @@
     /*
      * For security reason we have limit the upload file formats bellow
      */
-    'UPLOAD_FILE_EXTENSION_ALLOWED' => ['jpg','jpeg','png','gif','pdf','xls','xlsx','doc','docx','txt','zip','rar','rtf'],
+    'UPLOAD_FILE_EXTENSION_ALLOWED' => ['jpg', 'jpeg', 'png', 'gif', 'pdf', 'xls', 'xlsx', 'doc', 'docx', 'txt', 'zip', 'rar', 'rtf'],
 
-    'UPLOAD_IMAGE_EXTENSION_ALLOWED' => ['jpg','jpeg','png','gif'],
+    'UPLOAD_IMAGE_EXTENSION_ALLOWED' => ['jpg', 'jpeg', 'png', 'gif'],
 
     /*
      * Google FCM Server Key is used to send a notification via FireBase cloud message

src/controllers/traits/ControllerSetting.php

Spacing +5 added lines, -5 removed lines

@@ -84,9 +84,9 @@ 
      * @param ButtonColor $color
      * @param string $attributes
      */
-    public function addIndexActionButton($label, $actionURL, $fontAwesome_icon=null, $color=null, $attributes = null)
+    public function addIndexActionButton($label, $actionURL, $fontAwesome_icon = null, $color = null, $attributes = null)
     {
-        $color = ($color)?:ButtonColor::DARK_BLUE;
+        $color = ($color) ?: ButtonColor::DARK_BLUE;
 
         $model = new IndexActionButtonModel();
         $model->setLabel($label);
@@ -128,12 +128,12 @@ 
      * @param $fontAwesome_icon
      * @param ButtonColor|string $color
      */
-    public function addActionButton($label, $url_target, $condition_callback=null, $fontAwesome_icon=null, $color=null, $confirmation = false)
+    public function addActionButton($label, $url_target, $condition_callback = null, $fontAwesome_icon = null, $color = null, $confirmation = false)
     {
         $new = new AddActionButtonModel();
         $new->setLabel($label);
-        $new->setIcon($fontAwesome_icon?:"fa fa-bars");
-        $new->setColor($color?:"primary");
+        $new->setIcon($fontAwesome_icon ?: "fa fa-bars");
+        $new->setColor($color ?: "primary");
         $new->setUrl($url_target);
         $new->setCondition($condition_callback);
         $new->setConfirmation($confirmation);

src/controllers/FileController.php

Spacing +3 added lines, -3 removed lines

@@ -34,7 +34,7 @@ 
         $fullStoragePath = storage_path('app/'.$fullFilePath);
         $lifetime = 31556926; // One year in seconds
 
-        if (! Storage::exists($fullFilePath)) {
+        if (!Storage::exists($fullFilePath)) {
             abort(404);
         }
 
@@ -55,10 +55,10 @@ 
                 $h = Request::get('h') ?: $w;
             }
 
-            $imgRaw = Image::cache(function ($image) use ($fullStoragePath, $w, $h) {
+            $imgRaw = Image::cache(function($image) use ($fullStoragePath, $w, $h) {
                 $im = $image->make($fullStoragePath);
                 if ($w) {
-                    if (! $h) {
+                    if (!$h) {
                         $im->fit($w);
                     } else {
                         $im->fit($w, $h);

src/controllers/DeveloperRolesController.php

Spacing +25 added lines, -25 removed lines

@@ -20,12 +20,12 @@ 
     public function getIndex() {
         $data = [];
         $data['result'] = DB::table("cb_roles")->get();
-        return view($this->view.".index",$data);
+        return view($this->view.".index", $data);
     }
 
     public function getAdd() {
         $data = [];
-        $data['menus'] = DB::table("cb_menus")->orderBy("name","asc")->get();
+        $data['menus'] = DB::table("cb_menus")->orderBy("name", "asc")->get();
         return view($this->view.".add", $data);
     }
 
@@ -43,11 +43,11 @@ 
                 $privilege = [];
                 $privilege["cb_roles_id"] = $roles_id;
                 $privilege["cb_menus_id"] = $menus_id;
-                $privilege["can_browse"]  = $menu['can_browse']?:0;
-                $privilege["can_create"] = $menu['can_create']?:0;
-                $privilege["can_read"] = $menu['can_read']?:0;
-                $privilege["can_update"] = $menu['can_update']?:0;
-                $privilege["can_delete"] = $menu['can_delete']?:0;
+                $privilege["can_browse"]  = $menu['can_browse'] ?: 0;
+                $privilege["can_create"] = $menu['can_create'] ?: 0;
+                $privilege["can_read"] = $menu['can_read'] ?: 0;
+                $privilege["can_update"] = $menu['can_update'] ?: 0;
+                $privilege["can_delete"] = $menu['can_delete'] ?: 0;
                 DB::table("cb_role_privileges")->insert($privilege);
             }
 
@@ -66,21 +66,21 @@ 
         $data['row'] = cb()->find("cb_roles", $id);
 
         $menus = DB::table("cb_menus")
-        ->leftjoin("cb_role_privileges",function($join) use ($id) {
-            $join->on("cb_role_privileges.cb_menus_id","=","cb_menus.id")->where("cb_role_privileges.cb_roles_id", $id);
+        ->leftjoin("cb_role_privileges", function($join) use ($id) {
+            $join->on("cb_role_privileges.cb_menus_id", "=", "cb_menus.id")->where("cb_role_privileges.cb_roles_id", $id);
         })
-        ->orderBy("cb_menus.name","asc")
-        ->select("cb_menus.*","can_browse","can_create","can_read","can_update","can_delete")
+        ->orderBy("cb_menus.name", "asc")
+        ->select("cb_menus.*", "can_browse", "can_create", "can_read", "can_update", "can_delete")
         ->get();
         $data['menus'] = $menus;
 
-        return view($this->view.".edit",$data);
+        return view($this->view.".edit", $data);
     }
 
     private function existsPrivilege($cb_roles_id, $cb_menus_id) {
-        if($row = cb()->find("cb_role_privileges",['cb_roles_id'=>$cb_roles_id,'cb_menus_id'=>$cb_menus_id])) {
+        if ($row = cb()->find("cb_role_privileges", ['cb_roles_id'=>$cb_roles_id, 'cb_menus_id'=>$cb_menus_id])) {
             return $row->id;
-        }else{
+        } else {
             return null;
         }
     }
@@ -89,25 +89,25 @@ 
         try {
             cb()->validation(['name', 'menus']);
 
-            cb()->updateCompact("cb_roles",$id,['name']);
+            cb()->updateCompact("cb_roles", $id, ['name']);
 
             foreach (request("menus") as $menus_id => $menu) {
                 $privilege = [];
                 $privilege["cb_roles_id"] = $id;
                 $privilege["cb_menus_id"] = $menus_id;
-                $privilege["can_browse"]  = $menu['can_browse']?:0;
-                $privilege["can_create"] = $menu['can_create']?:0;
-                $privilege["can_read"] = $menu['can_read']?:0;
-                $privilege["can_update"] = $menu['can_update']?:0;
-                $privilege["can_delete"] = $menu['can_delete']?:0;
-                if($privilege_id = $this->existsPrivilege($id, $menus_id)) {
+                $privilege["can_browse"]  = $menu['can_browse'] ?: 0;
+                $privilege["can_create"] = $menu['can_create'] ?: 0;
+                $privilege["can_read"] = $menu['can_read'] ?: 0;
+                $privilege["can_update"] = $menu['can_update'] ?: 0;
+                $privilege["can_delete"] = $menu['can_delete'] ?: 0;
+                if ($privilege_id = $this->existsPrivilege($id, $menus_id)) {
                     DB::table("cb_role_privileges")->where("id", $privilege_id)->update($privilege);
-                }else{
+                } else {
                     DB::table("cb_role_privileges")->insert($privilege);
                 }
             }
 
-            return cb()->redirect(action("DeveloperRolesController@getIndex"),"The role has been saved!","success");
+            return cb()->redirect(action("DeveloperRolesController@getIndex"), "The role has been saved!", "success");
 
         } catch (CBValidationException $e) {
 
@@ -117,9 +117,9 @@ 
 
     public function getDelete($id) {
         DB::table("cb_roles")->where("id", $id)->delete();
-        DB::table("cb_role_privileges")->where("cb_roles_id",$id)->delete();
+        DB::table("cb_role_privileges")->where("cb_roles_id", $id)->delete();
 
-        return cb()->redirectBack("The role has been deleted!","success");
+        return cb()->redirectBack("The role has been deleted!", "success");
     }
 
 }
\ No newline at end of file

Braces +2 added lines, -2 removed lines

@@ -80,7 +80,7 @@ 
     private function existsPrivilege($cb_roles_id, $cb_menus_id) {
         if($row = cb()->find("cb_role_privileges",['cb_roles_id'=>$cb_roles_id,'cb_menus_id'=>$cb_menus_id])) {
             return $row->id;
-        }else{
+        } else{
             return null;
         }
     }
@@ -102,7 +102,7 @@ 
                 $privilege["can_delete"] = $menu['can_delete']?:0;
                 if($privilege_id = $this->existsPrivilege($id, $menus_id)) {
                     DB::table("cb_role_privileges")->where("id", $privilege_id)->update($privilege);
-                }else{
+                } else{
                     DB::table("cb_role_privileges")->insert($privilege);
                 }
             }

src/controllers/scaffolding/traits/ColumnsRegister.php

Spacing +12 added lines, -12 removed lines

@@ -32,8 +32,8 @@ 
         $data = new ColumnModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setType("text");
 
         columnSingleton()->setColumn($this->index, $data);
@@ -48,8 +48,8 @@ 
         $data = new CheckboxModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setType("checkbox");
 
         columnSingleton()->setColumn($this->index, $data);
@@ -64,8 +64,8 @@ 
         $data = new PasswordModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setType("password");
         $data->setShowDetail(false);
         $data->setShowIndex(false);
@@ -82,8 +82,8 @@ 
         $data = new ImageModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setType("image");
 
         columnSingleton()->setColumn($this->index, $data);
@@ -98,8 +98,8 @@ 
         $data = new TextAreaModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setType("text_area");
 
         columnSingleton()->setColumn($this->index, $data);
@@ -114,8 +114,8 @@ 
         $data = new ColumnModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
-        $data->setField($field_to_save?:$this->name($label, $name));
+        $data->setName($this->name($label, $name));
+        $data->setField($field_to_save ?: $this->name($label, $name));
         $data->setType("select");
 
         columnSingleton()->setColumn($this->index, $data);

src/controllers/scaffolding/traits/ColumnsBasic.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 
     private function name($label, $name = null)
     {
-        return (!$name)?strtolower(Str::slug($label,'_')):$name;
+        return (!$name) ?strtolower(Str::slug($label, '_')) : $name;
     }
 
     /**

src/controllers/scaffolding/singletons/ColumnSingleton.php

Spacing +18 added lines, -18 removed lines

@@ -38,9 +38,9 @@ 
     public function getIndexColumns()
     {
         $data = $this->columns;
-        foreach($data as $i=>$item) {
+        foreach ($data as $i=>$item) {
             /** @var ColumnModel $item */
-            if($item->getShowIndex() === false) {
+            if ($item->getShowIndex() === false) {
                 unset($data[$i]);
             }
         }
@@ -50,13 +50,13 @@ 
     public function getAddEditColumns()
     {
         $data = $this->columns;
-        foreach($data as $i=>$item) {
+        foreach ($data as $i=>$item) {
             /** @var ColumnModel $item */
-            if($item->getShowIndex() === false) {
+            if ($item->getShowIndex() === false) {
                 unset($data[$i]);
             }
 
-            if($item->getShowDetail() === false) {
+            if ($item->getShowDetail() === false) {
                 unset($data[$i]);
             }
 
@@ -67,9 +67,9 @@ 
     public function getEditColumns()
     {
         $data = $this->columns;
-        foreach($data as $i=>$item) {
+        foreach ($data as $i=>$item) {
             /** @var ColumnModel $item */
-            if($item->getShowEdit() === false) {
+            if ($item->getShowEdit() === false) {
                 unset($data[$i]);
             }
         }
@@ -79,9 +79,9 @@ 
     public function getAddColumns()
     {
         $data = $this->columns;
-        foreach($data as $i=>$item) {
+        foreach ($data as $i=>$item) {
             /** @var ColumnModel $item */
-            if($item->getShowAdd() === false) {
+            if ($item->getShowAdd() === false) {
                 unset($data[$i]);
             }
         }
@@ -91,9 +91,9 @@ 
     public function getDetailColumns()
     {
         $data = $this->columns;
-        foreach($data as $i=>$item) {
+        foreach ($data as $i=>$item) {
             /** @var ColumnModel $item */
-            if($item->getShowDetail() === false) {
+            if ($item->getShowDetail() === false) {
                 unset($data[$i]);
             }
         }
@@ -103,13 +103,13 @@ 
     public function getAssignmentData()
     {
         $data = [];
-        foreach($this->columns as $column) {
+        foreach ($this->columns as $column) {
             /** @var ColumnModel $column */
-            if(is_array($column->getValue())) {
-                foreach($column->getValue() as $key=>$val) {
+            if (is_array($column->getValue())) {
+                foreach ($column->getValue() as $key=>$val) {
                     $data[$key] = $val;
                 }
-            }else{
+            } else {
                 $data[$column->getField()] = $column->getValue();
             }
         }
@@ -119,10 +119,10 @@ 
     public function removeColumn($label_or_name)
     {
         $data = $this->getColumns();
-        foreach($data as $i=>$d)
+        foreach ($data as $i=>$d)
         {
             /** @var ColumnModel $d */
-            if($d->getLabel() == $label_or_name || $d->getName() == $label_or_name) {
+            if ($d->getLabel() == $label_or_name || $d->getName() == $label_or_name) {
                 unset($data[$i]);
             }
         }
@@ -132,7 +132,7 @@ 
     public function getColumnNameOnly()
     {
         $result = [];
-        foreach($this->columns as $column) {
+        foreach ($this->columns as $column) {
             /** @var ColumnModel $column */
             $result[] = $column->getName();
         }

Braces +1 added lines, -1 removed lines

@@ -109,7 +109,7 @@
                 foreach($column->getValue() as $key=>$val) {
                     $data[$key] = $val;
                 }
-            }else{
+            } else{
                 $data[$column->getField()] = $column->getValue();
             }
         }

src/controllers/CBController.php

Spacing +42 added lines, -42 removed lines

@@ -29,10 +29,10 @@ 
 
     public function __call($method, $parameters)
     {
-        if($method == "getData") {
+        if ($method == "getData") {
             $key = $parameters[0];
             return $this->data[$key];
-        }else{
+        } else {
             return null;
         }
     }
@@ -47,19 +47,19 @@ 
 
         $query->addSelect($this->data['table'].'.'.cb()->pk($this->data['table']).' as primary_key');
 
-        if(isset($this->data['hook_query_index']) && is_callable($this->data['hook_query_index']))
+        if (isset($this->data['hook_query_index']) && is_callable($this->data['hook_query_index']))
         {
             $query = call_user_func($this->data['hook_query_index'], $query);
         }
 
-        $softDelete = isset($this->data['disable_soft_delete'])?$this->data['disable_soft_delete']:true;
-        if($softDelete === true && Schema::hasColumn($this->data['table'],'deleted_at')) {
+        $softDelete = isset($this->data['disable_soft_delete']) ? $this->data['disable_soft_delete'] : true;
+        if ($softDelete === true && Schema::hasColumn($this->data['table'], 'deleted_at')) {
             $query->whereNull($this->data['table'].'.deleted_at');
         }
 
 
-        if(isset($joins)) {
-            foreach($joins as $join)
+        if (isset($joins)) {
+            foreach ($joins as $join)
             {
                 $query->join($join['target_table'],
                         $join['target_table_primary'],
@@ -69,16 +69,16 @@ 
             }
         }
 
-        if(request()->has('q'))
+        if (request()->has('q'))
         {
-            if(isset($this->data['hook_search_query'])) {
+            if (isset($this->data['hook_search_query'])) {
                 $query = call_user_func($this->data['hook_search_query'], $query);
-            }else{
-                $query->where(function ($where) use ($columns) {
+            } else {
+                $query->where(function($where) use ($columns) {
                     /**
                      * @var $where Builder
                      */
-                    foreach($columns as $column)
+                    foreach ($columns as $column)
                     {
                         $where->orWhere($column['name'], 'like', '%'.request('q').'%');
                     }
@@ -86,17 +86,17 @@ 
             }
         }
 
-        if(isset($this->data['hook_query_index']) && is_callable($this->data['hook_query_index'])) {
+        if (isset($this->data['hook_query_index']) && is_callable($this->data['hook_query_index'])) {
             $query = call_user_func($this->data['hook_query_index'], $query);
         }
 
 
-        if(request()->has(['order_by','order_sort']))
+        if (request()->has(['order_by', 'order_sort']))
         {
-            if(in_array(request('order_by'),columnSingleton()->getColumnNameOnly())) {
+            if (in_array(request('order_by'), columnSingleton()->getColumnNameOnly())) {
                 $query->orderBy(request('order_by'), request('order_sort'));
             }
-        }else{
+        } else {
             $query->orderBy($this->data['order_by'][0], $this->data['order_by'][1]);
         }
 
@@ -105,7 +105,7 @@ 
 
     public function getIndex()
     {
-        if(!module()->canBrowse()) return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        if (!module()->canBrowse()) return cb()->redirect(cb()->getAdminUrl(), "You do not have access to this area");
 
         $query = $this->repository();
         $result = $query->paginate(20);
@@ -123,7 +123,7 @@ 
         if ($validator->fails()) {
             $message = $validator->messages();
             $message_all = $message->all();
-            throw new CBValidationException(implode(', ',$message_all));
+            throw new CBValidationException(implode(', ', $message_all));
         }
     }
 
@@ -133,7 +133,7 @@ 
             /** @var ColumnModel $column */
             $value = request($column->getName());
 
-            if (! $column->getName()) {
+            if (!$column->getName()) {
                 continue;
             }
 
@@ -144,7 +144,7 @@ 
 
     public function getAdd()
     {
-        if(!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        if (!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(), "You do not have access to this area");
 
         $data = [];
         $data['page_title'] = $this->data['page_title'].' : Add';
@@ -155,29 +155,29 @@ 
 
     public function postAddSave()
     {
-        if(!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        if (!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(), "You do not have access to this area");
 
         try {
             $this->validation();
             $this->assignment();
             $data = columnSingleton()->getAssignmentData();
 
-            if(Schema::hasColumn($this->data['table'], 'created_at')) {
+            if (Schema::hasColumn($this->data['table'], 'created_at')) {
                 $data['created_at'] = date('Y-m-d H:i:s');
             }
 
             $id = DB::table($this->data['table'])->insertGetId($data);
 
-            if(isset($this->data['hook_after_insert']) && is_callable($this->data['hook_after_insert'])) {
+            if (isset($this->data['hook_after_insert']) && is_callable($this->data['hook_after_insert'])) {
                 call_user_func($this->data['hook_after_insert'], $id);
             }
 
         } catch (CBValidationException $e) {
             Log::debug($e);
-            return cb()->redirectBack($e->getMessage(),'info');
+            return cb()->redirectBack($e->getMessage(), 'info');
         } catch (\Exception $e) {
             Log::error($e);
-            return cb()->redirectBack($e->getMessage(),'warning');
+            return cb()->redirectBack($e->getMessage(), 'warning');
         }
 
         if (request('submit') == trans('crudbooster.button_save_more')) {
@@ -189,7 +189,7 @@ 
 
     public function getEdit($id)
     {
-        if(!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        if (!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(), "You do not have access to this area");
 
         $data = [];
         $data['row'] = $this->repository()->where(getPrimaryKey($this->data['table']), $id)->first();
@@ -201,17 +201,17 @@ 
 
     public function postEditSave($id)
     {
-        if(!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        if (!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(), "You do not have access to this area");
 
         try {
             $this->validation();
             $this->assignment();
             $data = columnSingleton()->getAssignmentData();
-            if(Schema::hasColumn($this->data['table'], 'updated_at')) {
+            if (Schema::hasColumn($this->data['table'], 'updated_at')) {
                 $data['updated_at'] = date('Y-m-d H:i:s');
             }
 
-            if(isset($this->data['hook_before_update']) && is_callable($this->data['hook_before_update'])) {
+            if (isset($this->data['hook_before_update']) && is_callable($this->data['hook_before_update'])) {
                 call_user_func($this->data['hook_before_update'], $id);
             }
 
@@ -219,16 +219,16 @@ 
                 ->where(cb()->pk($this->data['table']), $id)
                 ->update($data);
 
-            if(isset($this->data['hook_after_update']) && is_callable($this->data['hook_after_update'])) {
+            if (isset($this->data['hook_after_update']) && is_callable($this->data['hook_after_update'])) {
                 call_user_func($this->data['hook_after_update'], $id);
             }
 
         } catch (CBValidationException $e) {
             Log::debug($e);
-            return cb()->redirectBack($e->getMessage(),'info');
+            return cb()->redirectBack($e->getMessage(), 'info');
         } catch (\Exception $e) {
             Log::error($e);
-            return cb()->redirectBack($e->getMessage(),'warning');
+            return cb()->redirectBack($e->getMessage(), 'warning');
         }
 
 
@@ -241,15 +241,15 @@ 
 
     public function getDelete($id)
     {
-        if(!module()->canDelete()) return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        if (!module()->canDelete()) return cb()->redirect(cb()->getAdminUrl(), "You do not have access to this area");
 
-        if(isset($this->data['hook_before_delete']) && is_callable($this->data['hook_before_delete'])) {
+        if (isset($this->data['hook_before_delete']) && is_callable($this->data['hook_before_delete'])) {
             call_user_func($this->data['hook_before_delete'], $id);
         }
 
-        $softDelete = isset($this->data['disable_soft_delete'])?$this->data['disable_soft_delete']:true;
+        $softDelete = isset($this->data['disable_soft_delete']) ? $this->data['disable_soft_delete'] : true;
 
-        if ($softDelete === true && Schema::hasColumn($this->data['table'],'deleted_at')) {
+        if ($softDelete === true && Schema::hasColumn($this->data['table'], 'deleted_at')) {
             DB::table($this->data['table'])
                 ->where(getPrimaryKey($this->data['table']), $id)
                 ->update(['deleted_at' => date('Y-m-d H:i:s')]);
@@ -259,7 +259,7 @@ 
                 ->delete();
         }
 
-        if(isset($this->data['hook_after_delete']) && is_callable($this->data['hook_after_delete'])) {
+        if (isset($this->data['hook_after_delete']) && is_callable($this->data['hook_after_delete'])) {
             call_user_func($this->data['hook_after_delete'], $id);
         }
 
@@ -268,7 +268,7 @@ 
 
     public function getDetail($id)
     {
-        if(!module()->canRead()) return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        if (!module()->canRead()) return cb()->redirect(cb()->getAdminUrl(), "You do not have access to this area");
 
         $data = [];
         $data['row'] = $this->repository()->where(getPrimaryKey($this->data['table']), $id)->first();
@@ -279,21 +279,21 @@ 
 
     public function postUploadFile()
     {
-        if(auth()->guest()) return redirect(getAdminLoginURL());
+        if (auth()->guest()) return redirect(getAdminLoginURL());
 
         $file = null;
         try {
 
             cb()->validation([
-                'userfile' => 'required|mimes:' . config('crudbooster.UPLOAD_TYPES')
+                'userfile' => 'required|mimes:'.config('crudbooster.UPLOAD_TYPES')
             ]);
 
             $file = cb()->uploadFile('userfile', true);
 
         } catch (CBValidationException $e) {
-            return response()->json(['status'=>false,'message'=>$e->getMessage()]);
+            return response()->json(['status'=>false, 'message'=>$e->getMessage()]);
         } catch (\Exception $e) {
-            return response()->json(['status'=>false,'message'=>$e->getMessage()]);
+            return response()->json(['status'=>false, 'message'=>$e->getMessage()]);
         }
 
         return response()->json([

Braces +27 added lines, -11 removed lines

@@ -32,7 +32,7 @@ 
         if($method == "getData") {
             $key = $parameters[0];
             return $this->data[$key];
-        }else{
+        } else{
             return null;
         }
     }
@@ -73,7 +73,7 @@ 
         {
             if(isset($this->data['hook_search_query'])) {
                 $query = call_user_func($this->data['hook_search_query'], $query);
-            }else{
+            } else{
                 $query->where(function ($where) use ($columns) {
                     /**
                      * @var $where Builder
@@ -96,7 +96,7 @@ 
             if(in_array(request('order_by'),columnSingleton()->getColumnNameOnly())) {
                 $query->orderBy(request('order_by'), request('order_sort'));
             }
-        }else{
+        } else{
             $query->orderBy($this->data['order_by'][0], $this->data['order_by'][1]);
         }
 
@@ -105,7 +105,9 @@ 
 
     public function getIndex()
     {
-        if(!module()->canBrowse()) return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        if(!module()->canBrowse()) {
+            return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        }
 
         $query = $this->repository();
         $result = $query->paginate(20);
@@ -144,7 +146,9 @@ 
 
     public function getAdd()
     {
-        if(!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        if(!module()->canCreate()) {
+            return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        }
 
         $data = [];
         $data['page_title'] = $this->data['page_title'].' : Add';
@@ -155,7 +159,9 @@ 
 
     public function postAddSave()
     {
-        if(!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        if(!module()->canCreate()) {
+            return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        }
 
         try {
             $this->validation();
@@ -189,7 +195,9 @@ 
 
     public function getEdit($id)
     {
-        if(!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        if(!module()->canUpdate()) {
+            return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        }
 
         $data = [];
         $data['row'] = $this->repository()->where(getPrimaryKey($this->data['table']), $id)->first();
@@ -201,7 +209,9 @@ 
 
     public function postEditSave($id)
     {
-        if(!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        if(!module()->canUpdate()) {
+            return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        }
 
         try {
             $this->validation();
@@ -241,7 +251,9 @@ 
 
     public function getDelete($id)
     {
-        if(!module()->canDelete()) return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        if(!module()->canDelete()) {
+            return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        }
 
         if(isset($this->data['hook_before_delete']) && is_callable($this->data['hook_before_delete'])) {
             call_user_func($this->data['hook_before_delete'], $id);
@@ -268,7 +280,9 @@ 
 
     public function getDetail($id)
     {
-        if(!module()->canRead()) return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        if(!module()->canRead()) {
+            return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        }
 
         $data = [];
         $data['row'] = $this->repository()->where(getPrimaryKey($this->data['table']), $id)->first();
@@ -279,7 +293,9 @@ 
 
     public function postUploadFile()
     {
-        if(auth()->guest()) return redirect(getAdminLoginURL());
+        if(auth()->guest()) {
+            return redirect(getAdminLoginURL());
+        }
 
         $file = null;
         try {