crocodic-studio / crudbooster

src/commands/Install.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
 
         if ($this->confirm('Do you have setting the database configuration at .env ?')) {
 
-            if (! file_exists(public_path('vendor')) ) {
+            if (!file_exists(public_path('vendor'))) {
                 mkdir(public_path('vendor'), 0777);
             }
 

src/CRUDBoosterServiceProvider.php

Spacing +8 added lines, -8 removed lines

@@ -24,13 +24,13 @@ 
         // Register views
         $this->loadViewsFrom(__DIR__.'/views', 'crudbooster');
         $this->loadViewsFrom(__DIR__.'/types', 'types');
-        $this->loadTranslationsFrom(__DIR__."/localization","cb");
+        $this->loadTranslationsFrom(__DIR__."/localization", "cb");
 
         // Publish the files
-        $this->publishes([__DIR__.'/configs/crudbooster.php' => config_path('crudbooster.php')],'cb_config');
-        $this->publishes([__DIR__.'/database' => base_path('database')],'cb_migration');
-        $this->publishes([__DIR__.'/templates/CBHook.stub'=> app_path('Http/CBHook.php')],'cb_hook');
-        $this->publishes([__DIR__ . '/assets' =>public_path('cb_asset')],'cb_asset');
+        $this->publishes([__DIR__.'/configs/crudbooster.php' => config_path('crudbooster.php')], 'cb_config');
+        $this->publishes([__DIR__.'/database' => base_path('database')], 'cb_migration');
+        $this->publishes([__DIR__.'/templates/CBHook.stub'=> app_path('Http/CBHook.php')], 'cb_hook');
+        $this->publishes([__DIR__.'/assets' =>public_path('cb_asset')], 'cb_asset');
                     
         require __DIR__.'/validations/validation.php';        
         require __DIR__.'/routes.php';
@@ -48,14 +48,14 @@ 
         require __DIR__.'/helpers/Helper.php';
 
         // Singletons
-        $this->app->singleton('crudbooster', function ()
+        $this->app->singleton('crudbooster', function()
         {
             return true;
         });
         $this->app->singleton('ColumnSingleton', ColumnSingleton::class);
 
         // Merging configuration
-        $this->mergeConfigFrom(__DIR__.'/configs/crudbooster.php','crudbooster');
+        $this->mergeConfigFrom(__DIR__.'/configs/crudbooster.php', 'crudbooster');
 
 
         // Register Commands
@@ -77,7 +77,7 @@ 
 
     private function registerTypeRoutes() {
         $routes = rglob(__DIR__.DIRECTORY_SEPARATOR."types".DIRECTORY_SEPARATOR."Route.php");
-        foreach($routes as $route) {
+        foreach ($routes as $route) {
             require $route;
         }
     }

src/controllers/AdminAuthController.php

Spacing +11 added lines, -11 removed lines

@@ -8,7 +8,7 @@ 
 
     public function getLogin()
     {
-        if(!auth()->guest()) return redirect(cb()->getAdminUrl());
+        if (!auth()->guest()) return redirect(cb()->getAdminUrl());
 
         cbHook()->hookGetLogin();
 
@@ -17,20 +17,20 @@ 
 
     public function postLogin()
     {
-        try{
+        try {
             cb()->validation([
                 'email'=>'required|email',
                 'password'=>'required'
             ]);
-            $credential = request()->only(['email','password']);
+            $credential = request()->only(['email', 'password']);
             if (auth()->attempt($credential)) {
                 cbHook()->hookPostLogin();
                 return redirect(cb()->getAdminUrl());
             } else {
-                return redirect(cb()->getLoginUrl())->with(['message'=>__('crudbooster.password_and_username_is_wrong'),'message_type'=>'warning']);
+                return redirect(cb()->getLoginUrl())->with(['message'=>__('crudbooster.password_and_username_is_wrong'), 'message_type'=>'warning']);
             }
-        }catch (CBValidationException $e) {
-            return cb()->redirect(cb()->getAdminUrl("login"),$e->getMessage(),'warning');
+        } catch (CBValidationException $e) {
+            return cb()->redirect(cb()->getAdminUrl("login"), $e->getMessage(), 'warning');
         }
     }
 
@@ -45,25 +45,25 @@ 
     }
 
     public function postLoginDeveloper() {
-        try{
+        try {
             cb()->validation([
                 'username'=>'required',
                 'password'=>'required'
             ]);
 
-            if(request('username') == getSetting('developer_username')
+            if (request('username') == getSetting('developer_username')
                 && request('password') == getSetting("developer_password")) {
 
                 session(['developer'=>1]);
 
                 return redirect(cb()->getDeveloperUrl());
 
-            }else{
+            } else {
                 return cb()->redirectBack(__("crudbooster.password_and_username_is_wrong"));
             }
 
-        }catch (CBValidationException $e) {
-            return cb()->redirect(cb()->getLoginUrl(),$e->getMessage(),'warning');
+        } catch (CBValidationException $e) {
+            return cb()->redirect(cb()->getLoginUrl(), $e->getMessage(), 'warning');
         }
     }
 

Braces +6 added lines, -4 removed lines

@@ -8,7 +8,9 @@ 
 
     public function getLogin()
     {
-        if(!auth()->guest()) return redirect(cb()->getAdminUrl());
+        if(!auth()->guest()) {
+            return redirect(cb()->getAdminUrl());
+        }
 
         cbHook()->hookGetLogin();
 
@@ -29,7 +31,7 @@ 
             } else {
                 return redirect(cb()->getLoginUrl())->with(['message'=>__('crudbooster.password_and_username_is_wrong'),'message_type'=>'warning']);
             }
-        }catch (CBValidationException $e) {
+        } catch (CBValidationException $e) {
             return cb()->redirect(cb()->getAdminUrl("login"),$e->getMessage(),'warning');
         }
     }
@@ -58,11 +60,11 @@ 
 
                 return redirect(cb()->getDeveloperUrl());
 
-            }else{
+            } else{
                 return cb()->redirectBack(__("crudbooster.password_and_username_is_wrong"));
             }
 
-        }catch (CBValidationException $e) {
+        } catch (CBValidationException $e) {
             return cb()->redirect(cb()->getLoginUrl(),$e->getMessage(),'warning');
         }
     }

src/controllers/DeveloperModulesController.php

Spacing +49 added lines, -49 removed lines

@@ -31,13 +31,13 @@ 
     public function getIndex() {
         $data = [];
         $data['result'] = DB::table("cb_modules")->get();
-        return view($this->view.'.index',$data);
+        return view($this->view.'.index', $data);
     }
 
     public function getAdd() {
         $data = [];
         $data['tables'] = cb()->listAllTable();
-        $data['module'] = (request('modules_id'))?cb()->find("cb_modules", request("modules_id")):null;
+        $data['module'] = (request('modules_id')) ?cb()->find("cb_modules", request("modules_id")) : null;
         return view($this->view.'.add', $data);
     }
 
@@ -50,17 +50,17 @@ 
         $data = cb()->listAllColumns($table);
         $pk = cb()->findPrimaryKey($table);
         $result = [];
-        foreach($data as $item) {
+        foreach ($data as $item) {
 
-            if(Str::contains(strtolower($item),["title","name","label"])) {
+            if (Str::contains(strtolower($item), ["title", "name", "label"])) {
                 $display = true;
-            }else{
+            } else {
                 $display = false;
             }
 
             $result[] = [
                 "column"=>$item,
-                "primary_key"=>($pk==$item)?true:false,
+                "primary_key"=>($pk == $item) ?true:false,
                 "display"=>$display
             ];
         }
@@ -69,9 +69,9 @@ 
 
     public function getColumns($table)
     {
-        if(request("modules_id")) {
-            $module = cb()->find("cb_modules",request("modules_id"));
-            if($module->last_column_build) {
+        if (request("modules_id")) {
+            $module = cb()->find("cb_modules", request("modules_id"));
+            if ($module->last_column_build) {
                 return response()->json(json_decode($module->last_column_build));
             }
         }
@@ -79,46 +79,46 @@ 
         $columns = cb()->listAllColumns($table);
         $pk = cb()->findPrimaryKey($table);
         $result = [];
-        foreach($columns as $column) {
-            if($column != $pk) {
+        foreach ($columns as $column) {
+            if ($column != $pk) {
 
                 // Check if any relation table candidate
                 $optionTable = "";
-                if(Str::substr(strtolower($column),-3,3) == "_id") {
-                    $relationTable = Str::substr($column,0,-3);
-                    if(Schema::hasTable($relationTable)) {
+                if (Str::substr(strtolower($column), -3, 3) == "_id") {
+                    $relationTable = Str::substr($column, 0, -3);
+                    if (Schema::hasTable($relationTable)) {
                         $optionTable = $relationTable;
                     }
-                }elseif (Str::substr(strtolower($column),0,3) == "id_") {
-                    $relationTable = Str::substr($column,3);
-                    if(Schema::hasTable($relationTable)) {
+                }elseif (Str::substr(strtolower($column), 0, 3) == "id_") {
+                    $relationTable = Str::substr($column, 3);
+                    if (Schema::hasTable($relationTable)) {
                         $optionTable = $relationTable;
                     }
                 }
 
-                $label = trim(Str::title(str_replace(["id_","_id","_"]," ",$column)));
+                $label = trim(Str::title(str_replace(["id_", "_id", "_"], " ", $column)));
                 $label = Str::singular($label);
                 $type = "text";
 
-                if(Str::contains(strtolower($label),["photo","image","picture","gambar"])) {
+                if (Str::contains(strtolower($label), ["photo", "image", "picture", "gambar"])) {
                     $type = "image";
-                }elseif (Str::contains(strtolower($label),["email","mail"])) {
+                }elseif (Str::contains(strtolower($label), ["email", "mail"])) {
                     $type = "email";
-                }elseif (Str::contains(strtolower($label),["description","content","detail"])) {
-                    $type =  "wysiwyg";
-                }elseif (Str::contains(strtolower($label),["price","money","grand_total","tax"])) {
+                }elseif (Str::contains(strtolower($label), ["description", "content", "detail"])) {
+                    $type = "wysiwyg";
+                }elseif (Str::contains(strtolower($label), ["price", "money", "grand_total", "tax"])) {
                     $type = "money";
-                }elseif (Str::contains(strtolower($label),["quantity","qty","total","phone","telp"])) {
+                }elseif (Str::contains(strtolower($label), ["quantity", "qty", "total", "phone", "telp"])) {
                     $type = "number";
-                }elseif (Str::contains(strtolower($label),["date"])) {
+                }elseif (Str::contains(strtolower($label), ["date"])) {
                     $type = "date";
                 }
 
-                if (Str::substr(strtolower($column),-3,3) == "_id") {
+                if (Str::substr(strtolower($column), -3, 3) == "_id") {
                     $type = "select_table";
                 } elseif (Str::substr($column, -3, 3) == "_at") {
                     $type = "datetime";
-                } elseif (Str::substr($column,0, 3) == "id_") {
+                } elseif (Str::substr($column, 0, 3) == "id_") {
                     $type = "select_table";
                 }
 
@@ -164,39 +164,39 @@ 
     public function postCreateMigration()
     {
         try {
-            cb()->validation(['table_name','structures']);
+            cb()->validation(['table_name', 'structures']);
 
             $tableName = request("table_name");
 
-            if(!Schema::hasTable($tableName)) {
+            if (!Schema::hasTable($tableName)) {
                 $filenameMigration = date("Y_m_d_His")."_".$tableName.".php";
                 $createTemplate = file_get_contents(base_path("vendor/laravel/framework/src/Illuminate/Database/Migrations/stubs/create.stub"));
                 $className = Str::studly($tableName);
                 $createTemplate = str_replace("DummyClass", $className, $createTemplate);
                 $createTemplate = str_replace("DummyTable", $tableName, $createTemplate);
-                $createTemplate = str_replace("\$table->increments('id');","",$createTemplate);
+                $createTemplate = str_replace("\$table->increments('id');", "", $createTemplate);
 
                 $structureItems = "";
 
-                if(request("timestamp")) {
+                if (request("timestamp")) {
                     $structureItems .= "\$table->timestamps();\n\t\t\t";
                 }
 
-                if(request("soft_deletes")) {
+                if (request("soft_deletes")) {
                     $structureItems .= "\$table->softDeletes();\n\t\t\t";
                 }
 
-                foreach(request("structures") as $item) {
+                foreach (request("structures") as $item) {
 
                     $nullable = "";
 
-                    if(!in_array($item['type_data'],["bigIncrements","increments","mediumIncrements","smallIncrements"])) {
+                    if (!in_array($item['type_data'], ["bigIncrements", "increments", "mediumIncrements", "smallIncrements"])) {
                         $nullable = "->nullable()";
                     }
 
-                    if($item['length']) {
+                    if ($item['length']) {
                         $structureItems .= "\$table->".$item['type_data']."('".$item['field_name']."', ".$item['length'].")$nullable;\n\t\t\t";
-                    }else{
+                    } else {
                         $structureItems .= "\$table->".$item['type_data']."('".$item['field_name']."')$nullable;\n\t\t\t";
                     }
                 }
@@ -215,12 +215,12 @@ 
             }
 
         } 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(['status'=>true,'message'=>'Migration successfully!']);
+        return response()->json(['status'=>true, 'message'=>'Migration successfully!']);
     }
 
     public function postCheckExistModule()
@@ -228,12 +228,12 @@ 
         try {
             cb()->validation(['name', 'table']);
 
-            if(DB::table("cb_modules")->where("table_name",request("table"))->where("name",request("name"))->count()) {
+            if (DB::table("cb_modules")->where("table_name", request("table"))->where("name", request("name"))->count()) {
                 return response()->json(['status'=>true]);
             }
 
         } catch (CBValidationException $e) {
-            return response()->json(['status'=>false,'message'=>$e->getMessage()]);
+            return response()->json(['status'=>false, 'message'=>$e->getMessage()]);
         }
 
         return response()->json(['status'=>false]);
@@ -242,12 +242,12 @@ 
     public function postAddSave() {
 
         try {
-            cb()->validation(['name', 'table','icon','columns']);
+            cb()->validation(['name', 'table', 'icon', 'columns']);
 
             $module = (new ModuleGenerator(request('table'), request('name'), request('icon'), request("columns"), request("rebuild")))->make();
 
         } catch (CBValidationException $e) {
-            return response()->json(['status'=>false,'message'=>$e->getMessage()]);
+            return response()->json(['status'=>false, 'message'=>$e->getMessage()]);
         }
 
         return response()->json(['status'=>true, 'message'=>'Please remember that you can still modify the structure by edit the controller file '.$module['controller'].' :)']);
@@ -263,9 +263,9 @@ 
         try {
             cb()->validation(['name', 'icon']);
 
-            cb()->updateCompact("cb_modules", $id, ['name','icon']);
+            cb()->updateCompact("cb_modules", $id, ['name', 'icon']);
 
-            return cb()->redirect(route("DeveloperModulesControllerGetIndex"),"Module has been updated!","success");
+            return cb()->redirect(route("DeveloperModulesControllerGetIndex"), "Module has been updated!", "success");
 
         } catch (CBValidationException $e) {
             return cb()->redirectBack($e->getMessage());
@@ -273,18 +273,18 @@ 
     }
 
     public function getDelete($id) {
-        $module = cb()->find("cb_modules",$id);
+        $module = cb()->find("cb_modules", $id);
         @unlink(app_path("Http/Controllers/".$module->controller.".php"));
         DB::table("cb_modules")->where("id", $id)->delete();
         DB::table("cb_menus")->where("cb_modules_id", $id)->delete();
-        return cb()->redirectBack("The module has been deleted!","success");
+        return cb()->redirectBack("The module has been deleted!", "success");
     }
 
     public function getDeleteSoft($id) {
-        $module = cb()->find("cb_modules",$id);
+        $module = cb()->find("cb_modules", $id);
         DB::table("cb_modules")->where("id", $id)->delete();
         DB::table("cb_menus")->where("cb_modules_id", $id)->delete();
-        return cb()->redirectBack("The module has been deleted!","success");
+        return cb()->redirectBack("The module has been deleted!", "success");
     }
 
 }
\ No newline at end of file

Braces +8 added lines, -8 removed lines

@@ -54,7 +54,7 @@ 
 
             if(Str::contains(strtolower($item),["title","name","label"])) {
                 $display = true;
-            }else{
+            } else{
                 $display = false;
             }
 
@@ -89,7 +89,7 @@ 
                     if(Schema::hasTable($relationTable)) {
                         $optionTable = $relationTable;
                     }
-                }elseif (Str::substr(strtolower($column),0,3) == "id_") {
+                } elseif (Str::substr(strtolower($column),0,3) == "id_") {
                     $relationTable = Str::substr($column,3);
                     if(Schema::hasTable($relationTable)) {
                         $optionTable = $relationTable;
@@ -102,15 +102,15 @@ 
 
                 if(Str::contains(strtolower($label),["photo","image","picture","gambar"])) {
                     $type = "image";
-                }elseif (Str::contains(strtolower($label),["email","mail"])) {
+                } elseif (Str::contains(strtolower($label),["email","mail"])) {
                     $type = "email";
-                }elseif (Str::contains(strtolower($label),["description","content","detail"])) {
+                } elseif (Str::contains(strtolower($label),["description","content","detail"])) {
                     $type =  "wysiwyg";
-                }elseif (Str::contains(strtolower($label),["price","money","grand_total","tax"])) {
+                } elseif (Str::contains(strtolower($label),["price","money","grand_total","tax"])) {
                     $type = "money";
-                }elseif (Str::contains(strtolower($label),["quantity","qty","total","phone","telp"])) {
+                } elseif (Str::contains(strtolower($label),["quantity","qty","total","phone","telp"])) {
                     $type = "number";
-                }elseif (Str::contains(strtolower($label),["date"])) {
+                } elseif (Str::contains(strtolower($label),["date"])) {
                     $type = "date";
                 }
 
@@ -196,7 +196,7 @@ 
 
                     if($item['length']) {
                         $structureItems .= "\$table->".$item['type_data']."('".$item['field_name']."', ".$item['length'].")$nullable;\n\t\t\t";
-                    }else{
+                    } else{
                         $structureItems .= "\$table->".$item['type_data']."('".$item['field_name']."')$nullable;\n\t\t\t";
                     }
                 }

src/controllers/DeveloperRolesController.php

Spacing +26 added lines, -26 removed lines

@@ -25,12 +25,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);
     }
 
@@ -49,17 +49,17 @@ 
                 $privilege = [];
                 $privilege["cb_roles_id"] = $roles_id;
                 $privilege["cb_menus_id"] = $menus_id;
-                $privilege["can_browse"]  = @$access['can_browse']?:0;
-                $privilege["can_create"] = @$access['can_create']?:0;
-                $privilege["can_read"] = @$access['can_read']?:0;
-                $privilege["can_update"] = @$access['can_update']?:0;
-                $privilege["can_delete"] = @$access['can_delete']?:0;
+                $privilege["can_browse"]  = @$access['can_browse'] ?: 0;
+                $privilege["can_create"] = @$access['can_create'] ?: 0;
+                $privilege["can_read"] = @$access['can_read'] ?: 0;
+                $privilege["can_update"] = @$access['can_update'] ?: 0;
+                $privilege["can_delete"] = @$access['can_delete'] ?: 0;
                 DB::table("cb_role_privileges")->insert($privilege);
             }
 
             DB::commit();
 
-            return cb()->redirect(route("DeveloperRolesControllerGetIndex"),"The role has been saved!","success");
+            return cb()->redirect(route("DeveloperRolesControllerGetIndex"), "The role has been saved!", "success");
 
         } catch (CBValidationException $e) {
             return cb()->redirectBack($e->getMessage());
@@ -74,21 +74,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;
         }
     }
@@ -97,26 +97,26 @@ 
         try {
             cb()->validation(['name', 'menus']);
 
-            cb()->updateCompact("cb_roles",$id,['name']);
+            cb()->updateCompact("cb_roles", $id, ['name']);
 
             foreach (request("menus") as $menus_id) {
                 @$access = request("access")[$menus_id];
                 $privilege = [];
                 $privilege["cb_roles_id"] = $id;
                 $privilege["cb_menus_id"] = $menus_id;
-                $privilege["can_browse"]  = @$access['can_browse']?:0;
-                $privilege["can_create"] = @$access['can_create']?:0;
-                $privilege["can_read"] = @$access['can_read']?:0;
-                $privilege["can_update"] = @$access['can_update']?:0;
-                $privilege["can_delete"] = @$access['can_delete']?:0;
-                if($privilege_id = $this->existsPrivilege($id, $menus_id)) {
+                $privilege["can_browse"]  = @$access['can_browse'] ?: 0;
+                $privilege["can_create"] = @$access['can_create'] ?: 0;
+                $privilege["can_read"] = @$access['can_read'] ?: 0;
+                $privilege["can_update"] = @$access['can_update'] ?: 0;
+                $privilege["can_delete"] = @$access['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(route("DeveloperRolesControllerGetIndex"),"The role has been saved!","success");
+            return cb()->redirect(route("DeveloperRolesControllerGetIndex"), "The role has been saved!", "success");
 
         } catch (CBValidationException $e) {
 
@@ -126,9 +126,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()->redirect(route("DeveloperRolesControllerGetIndex"), "The role has been deleted!","success");
+        return cb()->redirect(route("DeveloperRolesControllerGetIndex"), "The role has been deleted!", "success");
     }
 
 }
\ No newline at end of file

Braces +2 added lines, -2 removed lines

@@ -88,7 +88,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;
         }
     }
@@ -111,7 +111,7 @@ 
                 $privilege["can_delete"] = @$access['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 +38 added lines, -38 removed lines

@@ -59,8 +59,8 @@ 
         $data = new TextModel();
         $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);
@@ -75,8 +75,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);
@@ -91,8 +91,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);
@@ -109,8 +109,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);
@@ -125,8 +125,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);
@@ -141,7 +141,7 @@ 
         $data = new SelectTableModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
+        $data->setName($this->name($label, $name));
         $data->setField($this->name($label, $name));
         $data->setType("select_table");
 
@@ -149,8 +149,8 @@ 
 
         $selectTable = new SelectTable($this->index);
 
-        if($selectConfig) {
-            $selectTable->optionsFromTable($selectConfig['table'],$selectConfig['value_option'],$selectConfig['display_option'],@$selectConfig['sql_condition']);
+        if ($selectConfig) {
+            $selectTable->optionsFromTable($selectConfig['table'], $selectConfig['value_option'], $selectConfig['display_option'], @$selectConfig['sql_condition']);
         }
 
         return $selectTable;
@@ -163,7 +163,7 @@ 
         $data = new SelectOptionModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
+        $data->setName($this->name($label, $name));
         $data->setField($this->name($label, $name));
         $data->setType("select_option");
 
@@ -171,7 +171,7 @@ 
 
         $selectOption = new SelectOption($this->index);
 
-        if($options) {
+        if ($options) {
             $selectOption->options($options);
         }
 
@@ -191,15 +191,15 @@ 
         $data = new SelectQueryModel();
         $data = $this->setDefaultModelValue($data);
         $data->setLabel($label);
-        $data->setName($this->name($label,$name));
+        $data->setName($this->name($label, $name));
         $data->setField($this->name($label, $name));
         $data->setType("select_query");
 
         columnSingleton()->setColumn($this->index, $data);
 
-        $selectQuery =new SelectQuery($this->index);
+        $selectQuery = new SelectQuery($this->index);
 
-        if($query) {
+        if ($query) {
             $selectQuery->optionsFromQuery($query);
         }
 
@@ -214,8 +214,8 @@ 
         $data = new CustomModel();
         $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("custom");
 
         columnSingleton()->setColumn($this->index, $data);
@@ -230,8 +230,8 @@ 
         $data = new DateModel();
         $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("date");
 
         columnSingleton()->setColumn($this->index, $data);
@@ -246,8 +246,8 @@ 
         $data = new DatetimeModel();
         $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("datetime");
 
         columnSingleton()->setColumn($this->index, $data);
@@ -262,8 +262,8 @@ 
         $data = new EmailModel();
         $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("email");
 
         columnSingleton()->setColumn($this->index, $data);
@@ -278,8 +278,8 @@ 
         $data = new FileModel();
         $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("file");
 
         columnSingleton()->setColumn($this->index, $data);
@@ -295,8 +295,8 @@ 
         $data = new HiddenModel();
         $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("hidden");
 
         columnSingleton()->setColumn($this->index, $data);
@@ -311,8 +311,8 @@ 
         $data = new NumberModel();
         $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("number");
 
         columnSingleton()->setColumn($this->index, $data);
@@ -327,8 +327,8 @@ 
         $data = new MoneyModel();
         $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("money");
 
         columnSingleton()->setColumn($this->index, $data);
@@ -343,8 +343,8 @@ 
         $data = new RadioModel();
         $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("radio");
 
         columnSingleton()->setColumn($this->index, $data);
@@ -359,8 +359,8 @@ 
         $data = new WysiwygModel();
         $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("wysiwyg");
 
         columnSingleton()->setColumn($this->index, $data);

src/helpers/ModuleGenerator.php

Spacing +27 added lines, -27 removed lines

@@ -37,15 +37,15 @@ 
     }
 
     public function make() {
-        $name = trim(($this->name)?:ucwords(str_replace("_"," ",$this->table)));
+        $name = trim(($this->name) ?: ucwords(str_replace("_", " ", $this->table)));
 
         $template = file_get_contents(__DIR__."/../templates/FooBarController.stub");
 
         //Replace table
-        $template = str_replace("{table}",'"'.$this->table.'"', $template);
+        $template = str_replace("{table}", '"'.$this->table.'"', $template);
 
         //Replace permalink
-        $permalink = strtolower(Str::slug($name,"_"));
+        $permalink = strtolower(Str::slug($name, "_"));
         $template = str_replace("{permalink}", '"'.$permalink.'"', $template);
 
         //Replace Page title
@@ -53,42 +53,42 @@ 
 
         //Replace scaffolding
         $scaffold = "";
-        foreach($this->columns as $field) {
+        foreach ($this->columns as $field) {
             $label = $field['column_label'];
             $column = $field['column_field'];
-            $help = isset($field['column_help'])?"->help(\"".$field['column_help']."\")":"";
-            $required = ($field['column_mandatory']=="on")?"":"->required(false)";
-            $indexShow = ($field['column_browse']=="on")?"":"->showIndex(false)";
-            $detailShow = ($field['column_detail']=="on")?"":"->showDetail(false)";
-            $editShow = ($field['column_edit']=="on")?"":"->showEdit(false)";
-            $addShow = ($field['column_add']=="on")?"":"->showAdd(false)";
+            $help = isset($field['column_help']) ? "->help(\"".$field['column_help']."\")" : "";
+            $required = ($field['column_mandatory'] == "on") ? "" : "->required(false)";
+            $indexShow = ($field['column_browse'] == "on") ? "" : "->showIndex(false)";
+            $detailShow = ($field['column_detail'] == "on") ? "" : "->showDetail(false)";
+            $editShow = ($field['column_edit'] == "on") ? "" : "->showEdit(false)";
+            $addShow = ($field['column_add'] == "on") ? "" : "->showAdd(false)";
             $optionTable = $field['column_option_table'];
             $optionValue = $field['column_option_value'];
             $optionDisplay = $field['column_option_display'];
             $optionSqlCondition = $field['column_option_sql_condition'];
-            $optionSqlCondition = str_replace('"',"'", $optionSqlCondition);
+            $optionSqlCondition = str_replace('"', "'", $optionSqlCondition);
             $sqlRawQuery = $field['column_sql_query'];
             $options = $field['column_options'];
 
             $methodName = Str::studly($field['column_type']);
-            if($label && $column) {
-                if(in_array($field['column_type'],['radio','select_option','checkbox'])) {
-                    if($options) {
+            if ($label && $column) {
+                if (in_array($field['column_type'], ['radio', 'select_option', 'checkbox'])) {
+                    if ($options) {
                         $optResult = [];
-                        foreach($options as $opt) {
+                        foreach ($options as $opt) {
                             $optResult[$opt['key']] = $opt['label'];
                         }
-                        $scaffold .= '$this->add' . $methodName . '("' . $label . '","' . $column . '")->options('.min_var_export($optResult).')' . $required . $indexShow . $detailShow . $addShow . $editShow . $help . ';' . "\n\t\t";
+                        $scaffold .= '$this->add'.$methodName.'("'.$label.'","'.$column.'")->options('.min_var_export($optResult).')'.$required.$indexShow.$detailShow.$addShow.$editShow.$help.';'."\n\t\t";
                     }
-                }elseif (in_array($field['column_type'],['radio_table','select_table'])) {
+                }elseif (in_array($field['column_type'], ['radio_table', 'select_table'])) {
                     if ($optionTable && $optionValue && $optionDisplay) {
-                        $scaffold .= '$this->add' . $methodName . '("' . $label . '","' . $column . '",["table"=>"' . $optionTable . '","value_option"=>"' . $optionValue . '","display_option"=>"' . $optionDisplay . '","sql_condition"=>"' . $optionSqlCondition . '"])' . $required . $indexShow . $detailShow . $addShow . $editShow . $help . ';' . "\n\t\t";
+                        $scaffold .= '$this->add'.$methodName.'("'.$label.'","'.$column.'",["table"=>"'.$optionTable.'","value_option"=>"'.$optionValue.'","display_option"=>"'.$optionDisplay.'","sql_condition"=>"'.$optionSqlCondition.'"])'.$required.$indexShow.$detailShow.$addShow.$editShow.$help.';'."\n\t\t";
                     }
                 }elseif ($field['column_type'] == "select_query") {
-                    if($sqlRawQuery && Str::contains($sqlRawQuery,["as `key`","as `label`"])) {
-                        $scaffold .= '$this->add' . $methodName . '("' . $label . '","' . $column . '","'.$sqlRawQuery.'")' . $required . $indexShow . $detailShow . $addShow . $editShow . $help . ';' . "\n\t\t";
+                    if ($sqlRawQuery && Str::contains($sqlRawQuery, ["as `key`", "as `label`"])) {
+                        $scaffold .= '$this->add'.$methodName.'("'.$label.'","'.$column.'","'.$sqlRawQuery.'")'.$required.$indexShow.$detailShow.$addShow.$editShow.$help.';'."\n\t\t";
                     }
-                }else{
+                } else {
                     $scaffold .= '$this->add'.$methodName.'("'.$label.'","'.$column.'")'.$required.$indexShow.$detailShow.$addShow.$editShow.$help.';'."\n\t\t";
                 }
             }
@@ -111,10 +111,10 @@ 
         $module['controller'] = $filename;
         $module['last_column_build'] = json_encode($this->columns);
 
-        if($moduleData = DB::table("cb_modules")->where("name", $name)->where("table_name",$this->table)->first()) {
-            DB::table("cb_modules")->where("id",$moduleData->id)->update($module);
+        if ($moduleData = DB::table("cb_modules")->where("name", $name)->where("table_name", $this->table)->first()) {
+            DB::table("cb_modules")->where("id", $moduleData->id)->update($module);
             $id_modules = $moduleData->id;
-        }else{
+        } else {
             $id_modules = DB::table('cb_modules')->insertGetId($module);
         }
 
@@ -123,9 +123,9 @@ 
         $menu['name'] = $module['name'];
         $menu['type'] = 'module';
         $menu['cb_modules_id'] = $id_modules;
-        if(isset($moduleData)) {
-            DB::table("cb_menus")->where("cb_modules_id",$moduleData->id)->update($menu);
-        }else{
+        if (isset($moduleData)) {
+            DB::table("cb_menus")->where("cb_modules_id", $moduleData->id)->update($menu);
+        } else {
             DB::table('cb_menus')->insertGetId($menu);
         }
 

Braces +5 added lines, -5 removed lines

@@ -80,15 +80,15 @@ 
                         }
                         $scaffold .= '$this->add' . $methodName . '("' . $label . '","' . $column . '")->options('.min_var_export($optResult).')' . $required . $indexShow . $detailShow . $addShow . $editShow . $help . ';' . "\n\t\t";
                     }
-                }elseif (in_array($field['column_type'],['radio_table','select_table'])) {
+                } elseif (in_array($field['column_type'],['radio_table','select_table'])) {
                     if ($optionTable && $optionValue && $optionDisplay) {
                         $scaffold .= '$this->add' . $methodName . '("' . $label . '","' . $column . '",["table"=>"' . $optionTable . '","value_option"=>"' . $optionValue . '","display_option"=>"' . $optionDisplay . '","sql_condition"=>"' . $optionSqlCondition . '"])' . $required . $indexShow . $detailShow . $addShow . $editShow . $help . ';' . "\n\t\t";
                     }
-                }elseif ($field['column_type'] == "select_query") {
+                } elseif ($field['column_type'] == "select_query") {
                     if($sqlRawQuery && Str::contains($sqlRawQuery,["as `key`","as `label`"])) {
                         $scaffold .= '$this->add' . $methodName . '("' . $label . '","' . $column . '","'.$sqlRawQuery.'")' . $required . $indexShow . $detailShow . $addShow . $editShow . $help . ';' . "\n\t\t";
                     }
-                }else{
+                } else{
                     $scaffold .= '$this->add'.$methodName.'("'.$label.'","'.$column.'")'.$required.$indexShow.$detailShow.$addShow.$editShow.$help.';'."\n\t\t";
                 }
             }
@@ -114,7 +114,7 @@ 
         if($moduleData = DB::table("cb_modules")->where("name", $name)->where("table_name",$this->table)->first()) {
             DB::table("cb_modules")->where("id",$moduleData->id)->update($module);
             $id_modules = $moduleData->id;
-        }else{
+        } else{
             $id_modules = DB::table('cb_modules')->insertGetId($module);
         }
 
@@ -125,7 +125,7 @@ 
         $menu['cb_modules_id'] = $id_modules;
         if(isset($moduleData)) {
             DB::table("cb_menus")->where("cb_modules_id",$moduleData->id)->update($menu);
-        }else{
+        } else{
             DB::table('cb_menus')->insertGetId($menu);
         }
 

src/helpers/CB.php

Spacing +23 added lines, -23 removed lines

@@ -18,7 +18,7 @@ 
 {
 
     public function getRoleByName($roleName) {
-        return $this->find("cb_roles",['name'=>$roleName]);
+        return $this->find("cb_roles", ['name'=>$roleName]);
     }
 
     public function fcm() {
@@ -34,7 +34,7 @@ 
     }
 
     public function getDeveloperUrl($path = null) {
-        $path = ($path)?"/".trim($path,"/"):null;
+        $path = ($path) ? "/".trim($path, "/") : null;
         return url("developer/".getSetting("developer_path")).$path;
     }
 
@@ -51,12 +51,12 @@ 
     }
 
     public function getAdminUrl($path = null) {
-        $path = ($path)?"/".trim($path,"/"):null;
+        $path = ($path) ? "/".trim($path, "/") : null;
         return url(cbConfig("ADMIN_PATH")).$path;
     }
 
     public function getAppName() {
-        return env("APP_NAME","CRUDBOOSTER");
+        return env("APP_NAME", "CRUDBOOSTER");
     }
 
     /**
@@ -67,10 +67,10 @@ 
     {
         $fileData = base64_decode($value);
         $mime_type = finfo_buffer(finfo_open(), $fileData, FILEINFO_MIME_TYPE);
-        if($mime_type) {
-            if($mime_type = explode('/', $mime_type)) {
+        if ($mime_type) {
+            if ($mime_type = explode('/', $mime_type)) {
                 $ext = $mime_type[1];
-                if($ext) {
+                if ($ext) {
                     $filePath = 'uploads/'.date('Y-m');
                     Storage::makeDirectory($filePath);
                     $filename = sha1(strRandom(5)).'.'.$ext;
@@ -98,7 +98,7 @@ 
 
             $file = request()->file($name);
             $ext = strtolower($file->getClientOriginalExtension());
-            if(in_array($ext,cbConfig("UPLOAD_FILE_EXTENSION_ALLOWED"))) {
+            if (in_array($ext, cbConfig("UPLOAD_FILE_EXTENSION_ALLOWED"))) {
                 $filename = slug(pathinfo($file->getClientOriginalName(), PATHINFO_FILENAME));
                 $file_path = 'uploads/'.date('Y-m');
 
@@ -112,14 +112,14 @@ 
                 }
 
                 if (Storage::putFileAs($file_path, $file, $filename)) {
-                    if($resize_width || $resize_height) {
+                    if ($resize_width || $resize_height) {
                         $this->resizeImage($file_path.'/'.$filename, $resize_width, $resize_height);
                     }
                     return $file_path.'/'.$filename;
                 } else {
                     throw new \Exception("Something went wrong, file can't upload!");
                 }
-            }else{
+            } else {
                 throw new \Exception("The file format is not allowed!");
             }
 
@@ -142,22 +142,22 @@ 
                 $img = Image::make(storage_path('app/'.$file_path.'/'.$filename));
                 $img->fit($resize_width, $resize_height);
                 $img->save(storage_path('app/'.$file_path.'/'.$filename), $qty);
-            } elseif ($resize_width && ! $resize_height) {
+            } elseif ($resize_width && !$resize_height) {
                 $img = Image::make(storage_path('app/'.$file_path.'/'.$filename));
-                $img->resize($resize_width, null, function ($constraint) {
+                $img->resize($resize_width, null, function($constraint) {
                     $constraint->aspectRatio();
                 });
                 $img->save(storage_path('app/'.$file_path.'/'.$filename), $qty);
-            } elseif (! $resize_width && $resize_height) {
+            } elseif (!$resize_width && $resize_height) {
                 $img = Image::make(storage_path('app/'.$file_path.'/'.$filename));
-                $img->resize(null, $resize_height, function ($constraint) {
+                $img->resize(null, $resize_height, function($constraint) {
                     $constraint->aspectRatio();
                 });
                 $img->save(storage_path('app/'.$file_path.'/'.$filename), $qty);
             } else {
                 $img = Image::make(storage_path('app/'.$file_path.'/'.$filename));
                 if ($img->width() > 1300) {
-                    $img->resize(1300, null, function ($constraint) {
+                    $img->resize(1300, null, function($constraint) {
                         $constraint->aspectRatio();
                     });
                 }
@@ -274,7 +274,7 @@ 
         $validator = Validator::make($input_arr, $rules, $messages);
         if ($validator->fails()) {
             $message = $validator->errors()->all();
-            throw new CBValidationException(implode("; ",$message));
+            throw new CBValidationException(implode("; ", $message));
         }
     }
 
@@ -286,7 +286,7 @@ 
     public function findPrimaryKey($table)
     {
         $pk = DB::getDoctrineSchemaManager()->listTableDetails($table)->getPrimaryKey();
-        if(!$pk) {
+        if (!$pk) {
             return null;
         }
         return $pk->getColumns()[0];
@@ -335,7 +335,7 @@ 
             $string_parameters_array = explode('&', $string_parameters);
             foreach ($string_parameters_array as $s) {
                 $part = explode('=', $s);
-                if(isset($part[0]) && isset($part[1])) {
+                if (isset($part[0]) && isset($part[1])) {
                     $name = htmlspecialchars(urldecode($part[0]));
                     $name = strip_tags($name);
                     $value = htmlspecialchars(urldecode($part[1]));
@@ -352,16 +352,16 @@ 
 
 
     public function routeGet($prefix, $controller) {
-        $alias = str_replace("@"," ", $controller);
+        $alias = str_replace("@", " ", $controller);
         $alias = ucwords($alias);
-        $alias = str_replace(" ","",$alias);
+        $alias = str_replace(" ", "", $alias);
         Route::get($prefix, ['uses' => $controller, 'as' => $alias]);
     }
 
     public function routePost($prefix, $controller) {
-        $alias = str_replace("@"," ", $controller);
+        $alias = str_replace("@", " ", $controller);
         $alias = ucwords($alias);
-        $alias = str_replace(" ","",$alias);
+        $alias = str_replace(" ", "", $alias);
         Route::post($prefix, ['uses' => $controller, 'as' => $alias]);
     }
 
@@ -386,7 +386,7 @@ 
 
         $prefix = trim($prefix, '/').'/';
 
-        if(substr($controller,0,1) != "\\") {
+        if (substr($controller, 0, 1) != "\\") {
             $controller = "\App\Http\Controllers\\".$controller;
         }
 

src/helpers/Helper.php

Spacing +54 added lines, -54 removed lines

@@ -9,17 +9,17 @@ 
 |
 */
 
-if(!function_exists('rglob')) {
+if (!function_exists('rglob')) {
     function rglob($pattern, $flags = 0) {
         $files = glob($pattern, $flags);
-        foreach (glob(dirname($pattern).'/*', GLOB_ONLYDIR|GLOB_NOSORT) as $dir) {
+        foreach (glob(dirname($pattern).'/*', GLOB_ONLYDIR | GLOB_NOSORT) as $dir) {
             $files = array_merge($files, rglob($dir.'/'.basename($pattern), $flags));
         }
         return $files;
     }
 }
 
-if(!function_exists('convertPHPToMomentFormat')) {
+if (!function_exists('convertPHPToMomentFormat')) {
     function convertPHPToMomentFormat($format)
     {
         $replacements = [
@@ -66,13 +66,13 @@ 
     }
 }
 
-if(!function_exists('slug')) {
+if (!function_exists('slug')) {
     function slug($string, $separator = '-') {
         return \Illuminate\Support\Str::slug($string, $separator);
     }
 }
 
-if(!function_exists('columnSingleton')) {
+if (!function_exists('columnSingleton')) {
     /**
      * @return \crocodicstudio\crudbooster\controllers\scaffolding\singletons\ColumnSingleton
      */
@@ -81,7 +81,7 @@ 
     }
 }
 
-if(!function_exists('cbHook'))
+if (!function_exists('cbHook'))
 {
     /**
      * @return crocodicstudio\crudbooster\hooks\CBHook
@@ -93,7 +93,7 @@ 
     }
 }
 
-if(!function_exists('getTypeHook'))
+if (!function_exists('getTypeHook'))
 {
     /**
      * @param string $type
@@ -106,7 +106,7 @@ 
     }
 }
 
-if(!function_exists('getPrimaryKey'))
+if (!function_exists('getPrimaryKey'))
 {
     function getPrimaryKey($table_name)
     {
@@ -114,7 +114,7 @@ 
     }
 }
 
-if(!function_exists('cb'))
+if (!function_exists('cb'))
 {
     function cb()
     {
@@ -122,25 +122,25 @@ 
     }
 }
 
-if(!function_exists('cbAsset')) {
+if (!function_exists('cbAsset')) {
     function cbAsset($path) {
         return asset("cb_asset/".$path);
     }
 }
 
-if(!function_exists("cbConfig")) {
+if (!function_exists("cbConfig")) {
     function cbConfig($name) {
         return config("crudbooster.".$name);
     }
 }
 
-if(!function_exists("strRandom")) {
+if (!function_exists("strRandom")) {
     function strRandom($length = 5) {
         return \Illuminate\Support\Str::random($length);
     }
 }
 
-if(!function_exists('module')) {
+if (!function_exists('module')) {
     function module()
     {
         $module = new \crocodicstudio\crudbooster\helpers\Module();
@@ -148,43 +148,43 @@ 
     }
 }
 
-if(!function_exists('getAdminLoginURL')) {
+if (!function_exists('getAdminLoginURL')) {
     function getAdminLoginURL()
     {
         return url(config('crudbooster.ADMIN_LOGIN_PATH'));
     }
 }
 
-if(!function_exists('dummyPhoto')) {
+if (!function_exists('dummyPhoto')) {
     function dummyPhoto()
     {
         return config('crudbooster.DUMMY_PHOTO');
     }
 }
 
-if(!function_exists('assetThumbnail')) {
+if (!function_exists('assetThumbnail')) {
 	function assetThumbnail($path) {
-		$path = str_replace('uploads/','uploads_thumbnail/',$path);
+		$path = str_replace('uploads/', 'uploads_thumbnail/', $path);
 		return asset($path);
 	}
 }
 
-if(!function_exists('assetResize')) {
-	function assetResize($path,$width,$height=null,$quality=70) {
+if (!function_exists('assetResize')) {
+	function assetResize($path, $width, $height = null, $quality = 70) {
 		$basename = basename($path);
 	    $pathWithoutName = str_replace($basename, '', $path);
 	    $newLocation = $pathWithoutName.'/w_'.$width.'_h_'.$height.'_'.$basename;
-	    if(Storage::exists($newLocation)) {
+	    if (Storage::exists($newLocation)) {
 	        return asset($newLocation);
-	    }else{
-	        $img = Image::make(storage_path($path))->fit($width,$height);
-	        $img->save(storage_path($newLocation),$quality);
+	    } else {
+	        $img = Image::make(storage_path($path))->fit($width, $height);
+	        $img->save(storage_path($newLocation), $quality);
 	        return asset($newLocation);
 	    }
 	}
 }
 
-if(!function_exists('extract_unit')) {	
+if (!function_exists('extract_unit')) {	
 	/*
 	Credits: Bit Repository
 	URL: http://www.bitrepository.com/extract-content-between-two-delimiters-with-php.html
@@ -202,7 +202,7 @@ 
 }
 
 
-if(!function_exists('now')) {
+if (!function_exists('now')) {
 	function now() {		
 		return date('Y-m-d H:i:s');
 	}
@@ -216,14 +216,14 @@ 
 |
 */
 
-if(!function_exists('putSetting')) {
+if (!function_exists('putSetting')) {
     function putSetting($key, $value)
     {
-        if(file_exists(storage_path('.cbconfig'))) {
+        if (file_exists(storage_path('.cbconfig'))) {
             $settings = file_get_contents(storage_path('.cbconfig'));
             $settings = decrypt($settings);
             $settings = unserialize($settings);
-        }else{
+        } else {
             $settings = [];
         }
 
@@ -235,26 +235,26 @@ 
     }
 }
 
-if(!function_exists('getSetting')) {
+if (!function_exists('getSetting')) {
     function getSetting($key, $default = null)
     {
-        if(file_exists(storage_path('.cbconfig'))) {
+        if (file_exists(storage_path('.cbconfig'))) {
             $settings = file_get_contents(storage_path('.cbconfig'));
             $settings = decrypt($settings);
             $settings = unserialize($settings);
-        }else{
+        } else {
             $settings = [];
         }
 
-        if(isset($settings[$key])) {
-            return $settings[$key]?:$default;
-        }else{
+        if (isset($settings[$key])) {
+            return $settings[$key] ?: $default;
+        } else {
             return $default;
         }
     }
 }
 
-if(!function_exists('timeAgo')) {
+if (!function_exists('timeAgo')) {
     function timeAgo($datetime_to, $datetime_from = null, $full = false)
     {
         $datetime_from = ($datetime_from) ?: date('Y-m-d H:i:s');
@@ -285,7 +285,7 @@ 
             }
         }
 
-        if (! $full) {
+        if (!$full) {
             $string = array_slice($string, 0, 1);
         }
 
@@ -293,22 +293,22 @@ 
     }
 }
 
-if(!function_exists("array_map_r")) {
-    function array_map_r( $func, $arr )
+if (!function_exists("array_map_r")) {
+    function array_map_r($func, $arr)
     {
         $newArr = array();
 
-        foreach( $arr as $key => $value )
+        foreach ($arr as $key => $value)
         {
             $key = $func($key);
-            $newArr[ $key ] = ( is_array( $value ) ? array_map_r( $func, $value ) : ( is_array($func) ? call_user_func_array($func, $value) : $func( $value ) ) );
+            $newArr[$key] = (is_array($value) ? array_map_r($func, $value) : (is_array($func) ? call_user_func_array($func, $value) : $func($value)));
         }
 
         return $newArr;
     }
 }
 
-if(!function_exists("sanitizeXSS"))
+if (!function_exists("sanitizeXSS"))
 {
     function sanitizeXSS($value)
     {
@@ -320,7 +320,7 @@ 
     }
 }
 
-if(!function_exists("requestAll")) {
+if (!function_exists("requestAll")) {
     function requestAll() {
         $all = array_map_r("sanitizeXSS", request()->all());
         return $all;
@@ -329,22 +329,22 @@ 
 
 
 
-if(!function_exists('getURLFormat')) {
+if (!function_exists('getURLFormat')) {
     function getURLFormat($name) {
         $url = request($name);
-        if(filter_var($url, FILTER_VALIDATE_URL)) {
+        if (filter_var($url, FILTER_VALIDATE_URL)) {
             return $url;
-        }else{
+        } else {
             return request()->url();
         }
     }
 }
 
-if(!function_exists('g')) {
+if (!function_exists('g')) {
     function g($name, $safe = true) {
-        if($safe == true) {
+        if ($safe == true) {
             $response = request($name);
-            if(is_string($response)) {
+            if (is_string($response)) {
                 $response = sanitizeXSS($response);
             }elseif (is_array($response)) {
                 array_walk_recursive($response, function(&$response) {
@@ -353,25 +353,25 @@ 
             }
 
             return $response;
-        }else{
+        } else {
             return Request::get($name);
         }
     }
 }
 
-if(!function_exists('min_var_export')) {
+if (!function_exists('min_var_export')) {
     function min_var_export($input) {
-        if(is_array($input)) {
+        if (is_array($input)) {
             $buffer = [];
-            foreach($input as $key => $value)
+            foreach ($input as $key => $value)
                 $buffer[] = var_export($key, true)."=>".min_var_export($value);
-            return "[".implode(",",$buffer)."]";
+            return "[".implode(",", $buffer)."]";
         } else
             return var_export($input, true);
     }
 }
 
-if(!function_exists('rrmdir')) {
+if (!function_exists('rrmdir')) {
 	/*
 	* http://stackoverflow.com/questions/3338123/how-do-i-recursively-delete-a-directory-and-its-entire-contents-files-sub-dir
 	*/

Braces +18 added lines, -15 removed lines

@@ -176,7 +176,7 @@ 
 	    $newLocation = $pathWithoutName.'/w_'.$width.'_h_'.$height.'_'.$basename;
 	    if(Storage::exists($newLocation)) {
 	        return asset($newLocation);
-	    }else{
+	    } else{
 	        $img = Image::make(storage_path($path))->fit($width,$height);
 	        $img->save(storage_path($newLocation),$quality);
 	        return asset($newLocation);
@@ -223,7 +223,7 @@ 
             $settings = file_get_contents(storage_path('.cbconfig'));
             $settings = decrypt($settings);
             $settings = unserialize($settings);
-        }else{
+        } else{
             $settings = [];
         }
 
@@ -242,13 +242,13 @@ 
             $settings = file_get_contents(storage_path('.cbconfig'));
             $settings = decrypt($settings);
             $settings = unserialize($settings);
-        }else{
+        } else{
             $settings = [];
         }
 
         if(isset($settings[$key])) {
             return $settings[$key]?:$default;
-        }else{
+        } else{
             return $default;
         }
     }
@@ -334,7 +334,7 @@ 
         $url = request($name);
         if(filter_var($url, FILTER_VALIDATE_URL)) {
             return $url;
-        }else{
+        } else{
             return request()->url();
         }
     }
@@ -346,14 +346,14 @@ 
             $response = request($name);
             if(is_string($response)) {
                 $response = sanitizeXSS($response);
-            }elseif (is_array($response)) {
+            } elseif (is_array($response)) {
                 array_walk_recursive($response, function(&$response) {
                     $response = sanitizeXSS($response);
                 });
             }
 
             return $response;
-        }else{
+        } else{
             return Request::get($name);
         }
     }
@@ -363,11 +363,13 @@ 
     function min_var_export($input) {
         if(is_array($input)) {
             $buffer = [];
-            foreach($input as $key => $value)
-                $buffer[] = var_export($key, true)."=>".min_var_export($value);
+            foreach($input as $key => $value) {
+                            $buffer[] = var_export($key, true)."=>".min_var_export($value);
+            }
             return "[".implode(",",$buffer)."]";
-        } else
-            return var_export($input, true);
+        } else {
+                    return var_export($input, true);
+        }
     }
 }
 
@@ -380,10 +382,11 @@ 
 	     $objects = scandir($dir); 
 	     foreach ($objects as $object) { 
 	       if ($object != "." && $object != "..") { 
-	         if (is_dir($dir."/".$object))
-	           rrmdir($dir."/".$object);
-	         else
-	           unlink($dir."/".$object); 
+	         if (is_dir($dir."/".$object)) {
+	         	           rrmdir($dir."/".$object);
+	         } else {
+	         	           unlink($dir."/".$object);
+	         }
 	       } 
 	     }
 	     rmdir($dir);