crocodic-studio / crudbooster

src/routes.php

Spacing +31 added lines, -31 removed lines

@@ -1,58 +1,58 @@ 
 <?php
 
 // Developer Backend Middleware
-Route::group(['middleware' => ['web',\crocodicstudio\crudbooster\middlewares\CBDeveloper::class],
+Route::group(['middleware' => ['web', \crocodicstudio\crudbooster\middlewares\CBDeveloper::class],
     'prefix'=>"developer/".getSetting('developer_path'),
-    'namespace' => 'crocodicstudio\crudbooster\controllers'], function () {
+    'namespace' => 'crocodicstudio\crudbooster\controllers'], function() {
     cb()->routeController("modules", "\crocodicstudio\crudbooster\controllers\DeveloperModulesController");
     cb()->routeController("menus", "\crocodicstudio\crudbooster\controllers\DeveloperMenusController");
-    cb()->routeController("roles","\crocodicstudio\crudbooster\controllers\DeveloperRolesController");
-    cb()->routeController("users","\crocodicstudio\crudbooster\controllers\DeveloperUsersController");
-    cb()->routeController("plugins","\crocodicstudio\crudbooster\controllers\DeveloperPluginStoreController");
-    cb()->routeController("mail","\crocodicstudio\crudbooster\controllers\DeveloperMailController");
-    cb()->routeController("security","\crocodicstudio\crudbooster\controllers\DeveloperSecurityController");
-    cb()->routeController("appearance","\crocodicstudio\crudbooster\controllers\DeveloperAppearanceController");
-    cb()->routeController("miscellaneous","\crocodicstudio\crudbooster\controllers\DeveloperMiscellaneousController");
-    cb()->routePost("skip-tutorial","DeveloperDashboardController@postSkipTutorial");
-    cb()->routeGet("/","DeveloperDashboardController@getIndex");
+    cb()->routeController("roles", "\crocodicstudio\crudbooster\controllers\DeveloperRolesController");
+    cb()->routeController("users", "\crocodicstudio\crudbooster\controllers\DeveloperUsersController");
+    cb()->routeController("plugins", "\crocodicstudio\crudbooster\controllers\DeveloperPluginStoreController");
+    cb()->routeController("mail", "\crocodicstudio\crudbooster\controllers\DeveloperMailController");
+    cb()->routeController("security", "\crocodicstudio\crudbooster\controllers\DeveloperSecurityController");
+    cb()->routeController("appearance", "\crocodicstudio\crudbooster\controllers\DeveloperAppearanceController");
+    cb()->routeController("miscellaneous", "\crocodicstudio\crudbooster\controllers\DeveloperMiscellaneousController");
+    cb()->routePost("skip-tutorial", "DeveloperDashboardController@postSkipTutorial");
+    cb()->routeGet("/", "DeveloperDashboardController@getIndex");
 });
 
 // Developer Auth Middleware
 Route::group(['middleware' => ['web'],
     'prefix'=>"developer/".getSetting('developer_path'),
-    'namespace' => 'crocodicstudio\crudbooster\controllers'], function () {
-    cb()->routePost("login","AdminAuthController@postLoginDeveloper");
-    cb()->routeGet("login","AdminAuthController@getLoginDeveloper");
-    cb()->routeGet("logout","AdminAuthController@getLogoutDeveloper");
+    'namespace' => 'crocodicstudio\crudbooster\controllers'], function() {
+    cb()->routePost("login", "AdminAuthController@postLoginDeveloper");
+    cb()->routeGet("login", "AdminAuthController@getLoginDeveloper");
+    cb()->routeGet("logout", "AdminAuthController@getLogoutDeveloper");
 });
 
 // Routing without any middleware
-Route::group(['middleware' => ['web'], 'namespace' => '\crocodicstudio\crudbooster\controllers'], function () {
-    if(getSetting("AUTO_REDIRECT_TO_LOGIN")) {
-        cb()->routeGet("/","AdminAuthController@getRedirectToLogin");
+Route::group(['middleware' => ['web'], 'namespace' => '\crocodicstudio\crudbooster\controllers'], function() {
+    if (getSetting("AUTO_REDIRECT_TO_LOGIN")) {
+        cb()->routeGet("/", "AdminAuthController@getRedirectToLogin");
     }
 });
 
 // Routing without any middleware with admin prefix
-Route::group(['middleware' => ['web'], 'prefix' => cb()->getAdminPath(), 'namespace' => 'crocodicstudio\crudbooster\controllers'], function () {
+Route::group(['middleware' => ['web'], 'prefix' => cb()->getAdminPath(), 'namespace' => 'crocodicstudio\crudbooster\controllers'], function() {
     cb()->routeGet('logout', "AdminAuthController@getLogout");
 
-    if(!getSetting("DISABLE_LOGIN")) {
+    if (!getSetting("DISABLE_LOGIN")) {
         cb()->routePost('login', "AdminAuthController@postLogin");
         cb()->routeGet('login', "AdminAuthController@getLogin");
     }
 
-    if(getSetting("enable_forget")) {
-        cb()->routePost("forget","AdminAuthController@postForget");
+    if (getSetting("enable_forget")) {
+        cb()->routePost("forget", "AdminAuthController@postForget");
     }
 
-    if(getSetting("enable_register")) {
-        cb()->routePost("register","AdminAuthController@postRegister");
+    if (getSetting("enable_register")) {
+        cb()->routePost("register", "AdminAuthController@postRegister");
     }
 });
 
 // Routing package controllers
-cb()->routeGroupBackend(function () {
+cb()->routeGroupBackend(function() {
     cb()->routeController('profile', '\crocodicstudio\crudbooster\controllers\AdminProfileController');
 });
 
@@ -61,24 +61,24 @@ 
     'middleware' => ['web', \crocodicstudio\crudbooster\middlewares\CBBackend::class],
     'prefix' => cb()->getAdminPath(),
     'namespace' => 'App\Http\Controllers',
-], function () {
+], function() {
 
     if (Request::is(cb()->getAdminPath())) {
-        if($dashboard = cbConfig("ADMIN_DASHBOARD_CONTROLLER")) {
+        if ($dashboard = cbConfig("ADMIN_DASHBOARD_CONTROLLER")) {
             cb()->routeGet("/", $dashboard);
-        }else{
+        } else {
             cb()->routeGet("/", "\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);
-        $controllerName = rtrim($controllerName,".php");
+        $controllerName = rtrim($controllerName, ".php");
         $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/types/select_table/SelectTable.php

Spacing +3 added lines, -3 removed lines

@@ -41,7 +41,7 @@ 
      */
     public function optionsFromTable($table, $value_option, $display_option, $SQLCondition = null) {
 
-        if(strpos($table,"App\Models")!==false) {
+        if (strpos($table, "App\Models") !== false) {
             $table = new $table();
             $table = $table::$tableName;
         }
@@ -50,11 +50,11 @@ 
 
         $options = [];
         foreach ($data as $d) {
-            $options[ $d->$value_option ] = $d->$display_option;
+            $options[$d->$value_option] = $d->$display_option;
         }
         $data = columnSingleton()->getColumn($this->index);
         /** @var $data SelectTableModel */
-        $data->setOptionsFromTable(["table"=>$table,"key_field"=>$value_option,"display_field"=>$display_option,"sql_condition"=>$SQLCondition]);
+        $data->setOptionsFromTable(["table"=>$table, "key_field"=>$value_option, "display_field"=>$display_option, "sql_condition"=>$SQLCondition]);
         columnSingleton()->setColumn($this->index, $data);
 
         $this->options($options);

src/controllers/DeveloperMenusController.php

Spacing +23 added lines, -23 removed lines

@@ -25,22 +25,22 @@ 
 
     public function getIndex() {
         $data = [];
-        return view($this->view.".index",$data);
+        return view($this->view.".index", $data);
     }
 
     public function getAdd() {
         $data = [];
         $data['form_title'] = "Add Menu";
         $data['form_url'] = route('DeveloperMenusControllerPostAddSave');
-        $data['modules'] = DB::table("cb_modules")->orderBy("name","asc")->get();
+        $data['modules'] = DB::table("cb_modules")->orderBy("name", "asc")->get();
         return view($this->view.".form", $data);
     }
 
     public function getEdit($id) {
         $data = [];
         $data['form_title'] = "Edit Menu";
-        $data['form_url'] = route('DeveloperMenusControllerPostEditSave',['id'=>$id]);
-        $data['modules'] = DB::table("cb_modules")->orderBy("name","asc")->get();
+        $data['form_url'] = route('DeveloperMenusControllerPostEditSave', ['id'=>$id]);
+        $data['modules'] = DB::table("cb_modules")->orderBy("name", "asc")->get();
         $data['row'] = cb()->find("cb_menus", $id);
         return view($this->view.".form", $data);
     }
@@ -53,7 +53,7 @@ 
             $menu['name'] = request('name');
             $menu['icon'] = request('icon');
             $menu['type'] = request('type');
-            if(request('type') == 'module') {
+            if (request('type') == 'module') {
                 $menu['cb_modules_id'] = request('cb_modules_id');
             }elseif (request('type') == 'url') {
                 $menu['path'] = request('url_value');
@@ -65,7 +65,7 @@ 
 
             CacheHelper::forgetGroup("sidebar_menu");
 
-            return cb()->redirect(route("DeveloperMenusControllerGetIndex"),"The menu has been added!","success");
+            return cb()->redirect(route("DeveloperMenusControllerGetIndex"), "The menu has been added!", "success");
 
         } catch (CBValidationException $e) {
             return cb()->redirectBack($e->getMessage());
@@ -80,18 +80,18 @@ 
             $menu['name'] = request('name');
             $menu['icon'] = request('icon');
             $menu['type'] = request('type');
-            if(request('type') == 'module') {
+            if (request('type') == 'module') {
                 $menu['cb_modules_id'] = request('cb_modules_id');
             }elseif (request('type') == 'url') {
                 $menu['path'] = request('url_value');
             }elseif (request('type') == 'path') {
                 $menu['path'] = request('path_value');
             }
-            DB::table("cb_menus")->where("id",$id)->update($menu);
+            DB::table("cb_menus")->where("id", $id)->update($menu);
 
             CacheHelper::forgetGroup("sidebar_menu");
 
-            return cb()->redirect(route("DeveloperMenusControllerGetIndex"),"The menu has been saved!","success");
+            return cb()->redirect(route("DeveloperMenusControllerGetIndex"), "The menu has been saved!", "success");
 
         } catch (CBValidationException $e) {
             return cb()->redirectBack($e->getMessage());
@@ -104,20 +104,20 @@ 
 
             $menus = request('menus');
             $menus = json_decode($menus, true);
-            if($menus) {
+            if ($menus) {
                 $menus = $menus[0];
-                if($menus) {
-                    foreach($menus as $i=>$menu) {
+                if ($menus) {
+                    foreach ($menus as $i=>$menu) {
                         $id = $menu['id'];
-                        cb()->update("cb_menus",$id,["sort_number"=>$i,'parent_cb_menus_id'=>null]);
-                        if($menu['children'][0]) {
-                            foreach($menu['children'][0] as $ii=>$sub) {
+                        cb()->update("cb_menus", $id, ["sort_number"=>$i, 'parent_cb_menus_id'=>null]);
+                        if ($menu['children'][0]) {
+                            foreach ($menu['children'][0] as $ii=>$sub) {
                                 $id = $sub['id'];
-                                cb()->update("cb_menus",$id,["sort_number"=>$ii,"parent_cb_menus_id"=>$menu['id']]);
-                                if($sub['children'][0]) {
-                                    foreach($sub['children'][0] as $iii=>$subsub) {
+                                cb()->update("cb_menus", $id, ["sort_number"=>$ii, "parent_cb_menus_id"=>$menu['id']]);
+                                if ($sub['children'][0]) {
+                                    foreach ($sub['children'][0] as $iii=>$subsub) {
                                         $id = $subsub['id'];
-                                        cb()->update("cb_menus",$id,["sort_number"=>$iii,"parent_cb_menus_id"=>$sub['id']]);
+                                        cb()->update("cb_menus", $id, ["sort_number"=>$iii, "parent_cb_menus_id"=>$sub['id']]);
                                     }
                                 }
                             }
@@ -128,20 +128,20 @@ 
 
             CacheHelper::forgetGroup("sidebar_menu");
 
-            return response()->json(['api_status'=>1,'api_message'=>'success']);
+            return response()->json(['api_status'=>1, 'api_message'=>'success']);
 
         } catch (CBValidationException $e) {
-            return response()->json(['api_status'=>0,'api_message'=>$e->getMessage()]);
+            return response()->json(['api_status'=>0, 'api_message'=>$e->getMessage()]);
         }
     }
 
     public function getDelete($id) {
-        DB::table("cb_menus")->where("id",$id)->delete();
+        DB::table("cb_menus")->where("id", $id)->delete();
         DB::table("cb_role_privileges")->where("cb_menus_id", $id)->delete();
 
         CacheHelper::forgetGroup("sidebar_menu");
 
-        return cb()->redirectBack("The menu has been deleted!","success");
+        return cb()->redirectBack("The menu has been deleted!", "success");
     }
 
 }
\ No newline at end of file

src/controllers/SubModuleController.php

Spacing +5 added lines, -5 removed lines

@@ -14,16 +14,16 @@ 
 {
 
     public function getSubModule($subModuleKey) {
-        if(!module()->canBrowse()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
-        if(!verifyReferalUrl()) return cb()->redirect(module()->url(),"It looks like your url is incorrect");
+        if (!module()->canBrowse()) return cb()->redirect(cb()->getAdminUrl(), cbLang("you_dont_have_privilege_to_this_area"));
+        if (!verifyReferalUrl()) return cb()->redirect(module()->url(), "It looks like your url is incorrect");
 
-        if($subModule = Cache::get("subModule".$subModuleKey)) {
+        if ($subModule = Cache::get("subModule".$subModuleKey)) {
             $foreignKey = $subModule['foreignKey'];
             $foreignValue = $subModule['foreignValue'];
 
             $query = $this->repository();
             $query->where($foreignKey, $foreignValue);
-            $result = $query->paginate( request("limit")?:cbConfig("LIMIT_TABLE_DATA") );
+            $result = $query->paginate(request("limit") ?: cbConfig("LIMIT_TABLE_DATA"));
             $data['result'] = $result;
 
             $data['additionalHeaderTitle'] = $subModule['parentTitle'];
@@ -33,7 +33,7 @@ 
             return view("crudbooster::module.index.index", array_merge($data, $this->data));
         }
 
-        return cb()->redirect(module()->url(),"It looks like your url is incorrect");
+        return cb()->redirect(module()->url(), "It looks like your url is incorrect");
     }
 
 }
\ No newline at end of file

src/controllers/CBController.php

Spacing +37 added lines, -37 removed lines

@@ -32,10 +32,10 @@ 
 
     public function getIndex()
     {
-        if(!module()->canBrowse()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        if (!module()->canBrowse()) return cb()->redirect(cb()->getAdminUrl(), cbLang("you_dont_have_privilege_to_this_area"));
 
         $query = $this->repository();
-        $result = $query->paginate( request("limit")?:cbConfig("LIMIT_TABLE_DATA") );
+        $result = $query->paginate(request("limit") ?: cbConfig("LIMIT_TABLE_DATA"));
         $data['result'] = $result;
 
         return view("crudbooster::module.index.index", array_merge($data, $this->data));
@@ -43,17 +43,17 @@ 
 
     public function getAdd()
     {
-        if(!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        if (!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(), cbLang("you_dont_have_privilege_to_this_area"));
 
         $data = [];
         $data['page_title'] = $this->data['page_title'].' : '.cbLang('add');
         $data['action_url'] = module()->addSaveURL();
-        return view('crudbooster::module.form.form',array_merge($data, $this->data));
+        return view('crudbooster::module.form.form', array_merge($data, $this->data));
     }
 
     public function postAddSave()
     {
-        if(!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        if (!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(), cbLang("you_dont_have_privilege_to_this_area"));
 
         try {
             $this->validation();
@@ -61,38 +61,38 @@ 
             $data = columnSingleton()->getAssignmentData();
 
             //Clear data from Primary Key
-            unset($data[ cb()->pk($this->data['table']) ]);
+            unset($data[cb()->pk($this->data['table'])]);
 
-            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');
             }
 
-            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_insert']) && is_callable($this->data['hook_before_insert'])) {
+            if (isset($this->data['hook_before_insert']) && is_callable($this->data['hook_before_insert'])) {
                 $data = call_user_func($this->data['hook_before_insert'], $data);
             }
 
             $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(cbLang("something_went_wrong"),'warning');
+            return cb()->redirectBack(cbLang("something_went_wrong"), 'warning');
         }
 
-        if (Str::contains(request("submit"),cbLang("more"))) {
+        if (Str::contains(request("submit"), cbLang("more"))) {
             return cb()->redirectBack(cbLang("the_data_has_been_added"), 'success');
         } else {
-            if(verifyReferalUrl()) {
+            if (verifyReferalUrl()) {
                 return cb()->redirect(getReferalUrl("url"), cbLang("the_data_has_been_added"), 'success');
             } else {
                 return cb()->redirect(module()->url(), cbLang("the_data_has_been_added"), 'success');
@@ -102,7 +102,7 @@ 
 
     public function getEdit($id)
     {
-        if(!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        if (!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(), cbLang("you_dont_have_privilege_to_this_area"));
 
         $data = [];
         $data['row'] = $this->repository()->where($this->data['table'].'.'.getPrimaryKey($this->data['table']), $id)->first();
@@ -113,7 +113,7 @@ 
 
     public function postEditSave($id)
     {
-        if(!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        if (!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(), cbLang("you_dont_have_privilege_to_this_area"));
 
         try {
             $this->validation();
@@ -121,40 +121,40 @@ 
             $data = columnSingleton()->getAssignmentData();
 
             // Make sure the Primary Key is not included
-            unset($data[ cb()->pk($this->data['table']) ]);
+            unset($data[cb()->pk($this->data['table'])]);
 
-            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');
             }
 
             unset($data['created_at']);
 
-            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'])) {
                 $data = call_user_func($this->data['hook_before_update'], $id, $data);
             }
 
             cb()->update($this->data['table'], $id, $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(cbLang("something_went_wrong"),'warning');
+            return cb()->redirectBack(cbLang("something_went_wrong"), 'warning');
         }
 
 
         if (Str::contains(request("submit"), cbLang("more"))) {
-            return cb()->redirectBack( cbLang("the_data_has_been_updated"), 'success');
+            return cb()->redirectBack(cbLang("the_data_has_been_updated"), 'success');
         } else {
-            if(verifyReferalUrl()) {
-                return cb()->redirect(getReferalUrl("url"),  cbLang("the_data_has_been_updated"), 'success');
+            if (verifyReferalUrl()) {
+                return cb()->redirect(getReferalUrl("url"), cbLang("the_data_has_been_updated"), 'success');
             } else {
-                return cb()->redirect(module()->url(),  cbLang("the_data_has_been_updated"), 'success');
+                return cb()->redirect(module()->url(), cbLang("the_data_has_been_updated"), 'success');
             }
 
         }
@@ -162,15 +162,15 @@ 
 
     public function getDelete($id)
     {
-        if(!module()->canDelete()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        if (!module()->canDelete()) return cb()->redirect(cb()->getAdminUrl(), cbLang("you_dont_have_privilege_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')]);
@@ -180,16 +180,16 @@ 
                 ->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);
         }
 
-        return cb()->redirectBack( cbLang("the_data_has_been_deleted"), 'success');
+        return cb()->redirectBack(cbLang("the_data_has_been_deleted"), 'success');
     }
 
     public function getDetail($id)
     {
-        if(!module()->canRead()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        if (!module()->canRead()) return cb()->redirect(cb()->getAdminUrl(), cbLang("you_dont_have_privilege_to_this_area"));
 
         $data = [];
         $data['row'] = $this->repository()->where($this->data['table'].'.'.cb()->findPrimaryKey($this->data['table']), $id)->first();
@@ -208,14 +208,14 @@ 
      */
     public function __call($method, $parameters)
     {
-        if($method == "getData") {
+        if ($method == "getData") {
             $key = $parameters[0];
-            if(isset($this->data[$key])) {
+            if (isset($this->data[$key])) {
                 return $this->data[$key];
-            }else{
+            } else {
                 return null;
             }
-        }else{
+        } else {
             return null;
         }
     }

src/controllers/traits/ColumnIntervention.php

Spacing +2 added lines, -2 removed lines

@@ -18,14 +18,14 @@
      */
     public function columnIntervention()
     {
-        if(request("sub_module") && Cache::has("subModule".request("sub_module")) && cb()->getCurrentMethod() != "getDetail") {
+        if (request("sub_module") && Cache::has("subModule".request("sub_module")) && cb()->getCurrentMethod() != "getDetail") {
             /*
              * If there is sub module, the column that has same name with foreign key should be remove
              * And change to hidden. So we can save the foreign Key id from the parent module.
              */
             $subModule = Cache::get("subModule".request("sub_module"));
             $this->removeColumn($subModule["foreignKey"])
-                ->addHidden($subModule["foreignKey"],$subModule['foreignKey'])
+                ->addHidden($subModule["foreignKey"], $subModule['foreignKey'])
                 ->defaultValue($subModule['foreignValue']);
         }
     }

src/controllers/traits/ControllerSetting.php

Spacing +15 added lines, -15 removed lines

@@ -32,11 +32,11 @@ 
         $this->setButtonDetail(true);
         $this->setButtonSave(true);
         $this->setButtonLimitPage(true);
-        $this->hideButtonDeleteWhen(function ($row) { return false; });
-        $this->hideButtonDetailWhen(function ($row) { return false; });
-        $this->hideButtonEditWhen(function ($row) { return false; });
-        $this->style(function () { return null; });
-        $this->javascript(function () { return null; });
+        $this->hideButtonDeleteWhen(function($row) { return false; });
+        $this->hideButtonDetailWhen(function($row) { return false; });
+        $this->hideButtonEditWhen(function($row) { return false; });
+        $this->style(function() { return null; });
+        $this->javascript(function() { return null; });
     }
 
     public function style(callable $style) {
@@ -140,9 +140,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);
@@ -201,7 +201,7 @@ 
     public function addSubModule($label, $controllerName, $foreignKey, callable $additionalInfo = null, callable $condition = null, $font = null, $color = null) {
         $parentPath = $this->getData("permalink");
         $parentTitle = $this->getData("page_title");
-        $this->addActionButton($label,function($row) use ($label, $controllerName, $foreignKey, $additionalInfo, $parentPath, $parentTitle) {
+        $this->addActionButton($label, function($row) use ($label, $controllerName, $foreignKey, $additionalInfo, $parentPath, $parentTitle) {
            $actionParameters = [
                "label"=>$label,
                "foreignKey"=>$foreignKey,
@@ -210,22 +210,22 @@ 
                "parentTitle"=>$parentTitle
            ];
 
-            if(isset($additionalInfo) && is_callable($additionalInfo)) {
+            if (isset($additionalInfo) && is_callable($additionalInfo)) {
                 $additionalInfo = call_user_func($additionalInfo, $row);
-                if(is_array($additionalInfo)) {
+                if (is_array($additionalInfo)) {
                     $actionParameters['info'] = $additionalInfo;
                 }
             }
 
            $actionHash = md5(serialize($actionParameters));
            $actionHashToken = Cache::get("subModule".$actionHash);
-           if(!$actionHashToken) {
+           if (!$actionHashToken) {
                $actionHashToken = Str::random(5);
                Cache::forever("subModule".$actionHash, $actionHashToken);
                Cache::forever("subModule".$actionHashToken, $actionParameters);
            }
 
-           return action(class_basename($controllerName)."@getSubModule",['subModuleKey'=>$actionHashToken])."?ref=".makeReferalUrl($parentTitle);
+           return action(class_basename($controllerName)."@getSubModule", ['subModuleKey'=>$actionHashToken])."?ref=".makeReferalUrl($parentTitle);
         }, $condition, $font, $color);
 
     }
@@ -238,12 +238,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/traits/Query.php

Spacing +21 added lines, -21 removed lines

@@ -24,13 +24,13 @@ 
 
         $query->addSelect($this->data['table'].'.'.cb()->pk($this->data['table']).' as primary_key');
 
-        $softDelete = isset($this->data['disable_soft_delete'])?$this->data['disable_soft_delete']:true;
-        if($softDelete === true && SchemaHelper::hasColumn($this->data['table'],'deleted_at')) {
+        $softDelete = isset($this->data['disable_soft_delete']) ? $this->data['disable_soft_delete'] : true;
+        if ($softDelete === true && SchemaHelper::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'],
@@ -40,14 +40,14 @@ 
             }
         }
 
-        foreach($columns as $column) {
+        foreach ($columns as $column) {
             /** @var ColumnModel $column */
-            if($column->getType() != "custom") {
-                if(strpos($column->getField(),".") === false) {
-                    if(SchemaHelper::hasColumn($this->data['table'], $column->getField())) {
+            if ($column->getType() != "custom") {
+                if (strpos($column->getField(), ".") === false) {
+                    if (SchemaHelper::hasColumn($this->data['table'], $column->getField())) {
                         $query->addSelect($this->data['table'].'.'.$column->getField());
                     }
-                }else{
+                } else {
                     $query->addSelect($column->getField());
                 }
             }
@@ -55,20 +55,20 @@ 
             $query = getTypeHook($column->getType())->query($query, $column);
         }
 
-        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)
                     {
-                        if(strpos($column->getField(),".") === false) {
+                        if (strpos($column->getField(), ".") === false) {
                             $field = $this->data['table'].'.'.$column->getField();
-                        }else{
+                        } else {
                             $field = $column->getField();
                         }
                         $where->orWhere($field, 'like', '%'.request('q').'%');
@@ -79,21 +79,21 @@ 
 
 
         // Callback From this Method
-        if(isset($callback) && is_callable($callback)) {
+        if (isset($callback) && is_callable($callback)) {
             $query = call_user_func($callback, $query);
         }
 
-        if(isset($this->data['hook_index_query']) && is_callable($this->data['hook_index_query'])) {
+        if (isset($this->data['hook_index_query']) && is_callable($this->data['hook_index_query'])) {
             $query = call_user_func($this->data['hook_index_query'], $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['table'].'.'.cb()->findPrimaryKey($this->data['table']), "desc");
         }
 

src/controllers/traits/Validation.php

Spacing +2 added lines, -2 removed lines

@@ -19,12 +19,12 @@
      */
     private function validation()
     {
-        if(isset($this->data['validation'])) {
+        if (isset($this->data['validation'])) {
             $validator = Validator::make(request()->all(), @$this->data['validation'], @$this->data['validation_messages']);
             if ($validator->fails()) {
                 $message = $validator->messages();
                 $message_all = $message->all();
-                throw new CBValidationException(implode(', ',$message_all));
+                throw new CBValidationException(implode(', ', $message_all));
             }
         }
     }