crocodic-studio / crudbooster

src/configs/crudbooster.php

Spacing +3 added lines, -3 removed lines

@@ -31,9 +31,9 @@ 
     /*
      * For security reason we have limit the upload file formats bellow
      */
-    'UPLOAD_FILE_EXTENSION_ALLOWED' => ['jpg','jpeg','png','gif','pdf','xls','xlsx','doc','docx','txt','zip','rar','rtf'],
+    'UPLOAD_FILE_EXTENSION_ALLOWED' => ['jpg', 'jpeg', 'png', 'gif', 'pdf', 'xls', 'xlsx', 'doc', 'docx', 'txt', 'zip', 'rar', 'rtf'],
 
-    'UPLOAD_IMAGE_EXTENSION_ALLOWED' => ['jpg','jpeg','png','gif'],
+    'UPLOAD_IMAGE_EXTENSION_ALLOWED' => ['jpg', 'jpeg', 'png', 'gif'],
 
     /*
      * Override Local FileSystem From Storage To Another
@@ -69,7 +69,7 @@ 
      * You can define in this array what the tables you want to include in "php artisan crudbooster:data_migration"
      * The default is all cb_ prefix will be include in data migration
      */
-    'ADDITIONAL_DATA_MIGRATION'=>['users','migrations'],
+    'ADDITIONAL_DATA_MIGRATION'=>['users', 'migrations'],
 
 
     /*

src/helpers/CB.php

Spacing +31 added lines, -31 removed lines

@@ -20,7 +20,7 @@ 
 {
 
     public function getRoleByName($roleName) {
-        return $this->find("cb_roles",['name'=>$roleName]);
+        return $this->find("cb_roles", ['name'=>$roleName]);
     }
 
     public function fcm() {
@@ -36,7 +36,7 @@ 
     }
 
     public function getDeveloperUrl($path = null) {
-        $path = ($path)?"/".trim($path,"/"):null;
+        $path = ($path) ? "/".trim($path, "/") : null;
         return url("developer/".getSetting("developer_path")).$path;
     }
 
@@ -53,12 +53,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");
     }
 
     /**
@@ -72,16 +72,16 @@ 
      */
     private function uploadFileProcess($filename, $extension, $file, $encrypt = true, $resize_width = null, $resize_height = null)
     {
-        if(in_array($extension,cbConfig("UPLOAD_FILE_EXTENSION_ALLOWED"))) {
+        if (in_array($extension, cbConfig("UPLOAD_FILE_EXTENSION_ALLOWED"))) {
             $file_path = cbConfig("UPLOAD_PATH_FORMAT");
-            $file_path = str_replace("{Y}",date('Y'), $file_path);
+            $file_path = str_replace("{Y}", date('Y'), $file_path);
             $file_path = str_replace("{m}", date('m'), $file_path);
             $file_path = str_replace("{d}", date("d"), $file_path);
 
             //Create Directory Base On Template
             Storage::makeDirectory($file_path);
-            Storage::put($file_path."/index.html"," ","public");
-            Storage::put($file_path."/.gitignore","!.gitignore","public");
+            Storage::put($file_path."/index.html", " ", "public");
+            Storage::put($file_path."/.gitignore", "!.gitignore", "public");
 
             if ($encrypt == true) {
                 $filename = md5(strRandom(5)).'.'.$extension;
@@ -89,17 +89,17 @@ 
                 $filename = slug($filename, '_').'.'.$extension;
             }
 
-            if($resize_width || $resize_height) {
+            if ($resize_width || $resize_height) {
                 $this->resizeImage($file, $file_path.'/'.$filename, $resize_width, $resize_height);
                 return $file_path.'/'.$filename;
-            }else{
+            } else {
                 if (Storage::put($file_path.'/'.$filename, $file, 'public')) {
                     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!");
         }
     }
@@ -115,16 +115,16 @@ 
     {
         $fileData = base64_decode($base64_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($filename && $ext) {
+                if ($filename && $ext) {
                     return $this->uploadFileProcess($filename, $ext, $fileData, $encrypt, $resize_width, $resize_height);
                 }
-            }else {
+            } else {
                 throw new \Exception("Mime type not found");
             }
-        }else{
+        } else {
             throw new \Exception("Mime type not found");
         }
     }
@@ -144,7 +144,7 @@ 
             $filename = $file->getClientOriginalName();
             $ext = strtolower($file->getClientOriginalExtension());
 
-            if($filename && $ext) {
+            if ($filename && $ext) {
                 return $this->uploadFileProcess($filename, $ext, $file, $encrypt, $resize_width, $resize_height);
             }
 
@@ -179,29 +179,29 @@ 
             if ($resize_width && $resize_height) {
                 $img->fit($resize_width, $resize_height);
 
-            } elseif ($resize_width && ! $resize_height) {
+            } elseif ($resize_width && !$resize_height) {
 
-                $img->resize($resize_width, null, function ($constraint) {
+                $img->resize($resize_width, null, function($constraint) {
                     $constraint->aspectRatio();
                 });
 
-            } elseif (! $resize_width && $resize_height) {
+            } elseif (!$resize_width && $resize_height) {
 
-                $img->resize(null, $resize_height, function ($constraint) {
+                $img->resize(null, $resize_height, function($constraint) {
                     $constraint->aspectRatio();
                 });
 
             } else {
 
                 if ($img->width() > cbConfig("DEFAULT_IMAGE_MAX_WIDTH_RES")) {
-                    $img->resize(cbConfig("DEFAULT_IMAGE_MAX_WIDTH_RES"), null, function ($constraint) {
+                    $img->resize(cbConfig("DEFAULT_IMAGE_MAX_WIDTH_RES"), null, function($constraint) {
                         $constraint->aspectRatio();
                     });
                 }
             }
 
             Storage::put($fullFilePath, $img, 'public');
-        }else{
+        } else {
             throw new \Exception("The file format is not allowed!");
         }
     }
@@ -314,7 +314,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));
         }
     }
 
@@ -326,7 +326,7 @@ 
     public function findPrimaryKey($table)
     {
         $pk = DB::getDoctrineSchemaManager()->listTableDetails($table)->getPrimaryKey();
-        if(!$pk) {
+        if (!$pk) {
             return null;
         }
         return $pk->getColumns()[0];
@@ -375,7 +375,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]));
@@ -392,16 +392,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]);
     }
 
@@ -426,7 +426,7 @@ 
 
         $prefix = trim($prefix, '/').'/';
 
-        if(substr($controller,0,1) != "\\") {
+        if (substr($controller, 0, 1) != "\\") {
             $controller = "\App\Http\Controllers\\".$controller;
         }
 

Braces +5 added lines, -5 removed lines

@@ -92,14 +92,14 @@ 
             if($resize_width || $resize_height) {
                 $this->resizeImage($file, $file_path.'/'.$filename, $resize_width, $resize_height);
                 return $file_path.'/'.$filename;
-            }else{
+            } else{
                 if (Storage::put($file_path.'/'.$filename, $file, 'public')) {
                     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!");
         }
     }
@@ -121,10 +121,10 @@ 
                 if($filename && $ext) {
                     return $this->uploadFileProcess($filename, $ext, $fileData, $encrypt, $resize_width, $resize_height);
                 }
-            }else {
+            } else {
                 throw new \Exception("Mime type not found");
             }
-        }else{
+        } else{
             throw new \Exception("Mime type not found");
         }
     }
@@ -201,7 +201,7 @@ 
             }
 
             Storage::put($fullFilePath, $img, 'public');
-        }else{
+        } else{
             throw new \Exception("The file format is not allowed!");
         }
     }

src/controllers/CBController.php

Spacing +56 added lines, -56 removed lines

@@ -27,14 +27,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;
         }
     }
@@ -48,13 +48,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 && Schema::hasColumn($this->data['table'],'deleted_at')) {
+        $softDelete = isset($this->data['disable_soft_delete']) ? $this->data['disable_soft_delete'] : true;
+        if ($softDelete === true && Schema::hasColumn($this->data['table'], 'deleted_at')) {
             $query->whereNull($this->data['table'].'.deleted_at');
         }
         
-        if(isset($joins)) {
-            foreach($joins as $join)
+        if (isset($joins)) {
+            foreach ($joins as $join)
             {
                 $query->join($join['target_table'],
                         $join['target_table_primary'],
@@ -64,14 +64,14 @@ 
             }
         }
 
-        foreach($columns as $column) {
+        foreach ($columns as $column) {
             /** @var ColumnModel $column */
-            if($column->getType() != "custom") {
-                if(strpos($column->getField(),".") === false) {
-                    if(Schema::hasColumn($this->data['table'], $column->getField())) {
+            if ($column->getType() != "custom") {
+                if (strpos($column->getField(), ".") === false) {
+                    if (Schema::hasColumn($this->data['table'], $column->getField())) {
                         $query->addSelect($this->data['table'].'.'.$column->getField());
                     }
-                }else{
+                } else {
                     $query->addSelect($column->getField());
                 }
             }
@@ -79,20 +79,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').'%');
@@ -101,17 +101,17 @@ 
             }
         }
 
-        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");
         }
 
@@ -120,10 +120,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));
@@ -135,29 +135,29 @@ 
      */
     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));
             }
         }
     }
 
     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();
@@ -165,35 +165,35 @@ 
             $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()->redirect(module()->addURL(), cbLang("the_data_has_been_added"), 'success');
         } else {
             return cb()->redirect(module()->url(), cbLang("the_data_has_been_added"), 'success');
@@ -202,7 +202,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();
@@ -213,7 +213,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();
@@ -221,51 +221,51 @@ 
             $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 {
-            return cb()->redirect(module()->url(),  cbLang("the_data_has_been_updated"), 'success');
+            return cb()->redirect(module()->url(), cbLang("the_data_has_been_updated"), 'success');
         }
     }
 
     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')]);
@@ -275,16 +275,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();

Braces +27 added lines, -13 removed lines

@@ -31,10 +31,10 @@ 
             $key = $parameters[0];
             if(isset($this->data[$key])) {
                 return $this->data[$key];
-            }else{
+            } else{
                 return null;
             }
-        }else{
+        } else{
             return null;
         }
     }
@@ -71,7 +71,7 @@ 
                     if(Schema::hasColumn($this->data['table'], $column->getField())) {
                         $query->addSelect($this->data['table'].'.'.$column->getField());
                     }
-                }else{
+                } else{
                     $query->addSelect($column->getField());
                 }
             }
@@ -83,7 +83,7 @@ 
         {
             if(isset($this->data['hook_search_query'])) {
                 $query = call_user_func($this->data['hook_search_query'], $query);
-            }else{
+            } else{
                 $query->where(function ($where) use ($columns) {
                     /**
                      * @var $where Builder
@@ -92,7 +92,7 @@ 
                     {
                         if(strpos($column->getField(),".") === false) {
                             $field = $this->data['table'].'.'.$column->getField();
-                        }else{
+                        } else{
                             $field = $column->getField();
                         }
                         $where->orWhere($field, 'like', '%'.request('q').'%');
@@ -111,7 +111,7 @@ 
             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");
         }
 
@@ -120,7 +120,9 @@ 
 
     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") );
@@ -147,7 +149,9 @@ 
 
     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');
@@ -157,7 +161,9 @@ 
 
     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();
@@ -202,7 +208,9 @@ 
 
     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();
@@ -213,7 +221,9 @@ 
 
     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();
@@ -257,7 +267,9 @@ 
 
     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'])) {
             call_user_func($this->data['hook_before_delete'], $id);
@@ -284,7 +296,9 @@ 
 
     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();

src/controllers/AdminAuthController.php

Spacing +12 added lines, -12 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'=>cbLang('password_and_username_is_wrong'),'message_type'=>'warning']);
+                return redirect(cb()->getLoginUrl())->with(['message'=>cbLang('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'=>getSetting('developer_username')]);
 
                 return redirect(cb()->getDeveloperUrl());
 
-            }else{
-                return cb()->redirectBack( cbLang("password_and_username_is_wrong"));
+            } else {
+                return cb()->redirectBack(cbLang("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'=>cbLang('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( cbLang("password_and_username_is_wrong"));
             }
 
-        }catch (CBValidationException $e) {
+        } catch (CBValidationException $e) {
             return cb()->redirect(cb()->getLoginUrl(),$e->getMessage(),'warning');
         }
     }

src/middlewares/CBDeveloper.php

Spacing +2 added lines, -2 removed lines

@@ -18,8 +18,8 @@
     public function handle($request, Closure $next)
     {
 
-        if(session()->get("developer") != getSetting('developer_username')) {
-            return cb()->redirect(cb()->getDeveloperUrl("login"),"Please login for first");
+        if (session()->get("developer") != getSetting('developer_username')) {
+            return cb()->redirect(cb()->getDeveloperUrl("login"), "Please login for first");
         }
 
         return $next($request);

src/commands/DeveloperCommandService.php

Spacing +4 added lines, -4 removed lines

@@ -25,15 +25,15 @@
     {
 
         try {
-            if(@$this->command->option("password") == "AUTO" || !@$this->command->option("password")) {
+            if (@$this->command->option("password") == "AUTO" || !@$this->command->option("password")) {
                 $password = Str::random(16);
-            }else{
+            } else {
                 $password = $this->command->option("password");
             }
 
-            if(@$this->command->option("username") == "AUTO" || !@$this->command->option("username")) {
+            if (@$this->command->option("username") == "AUTO" || !@$this->command->option("username")) {
                 $username = Str::random(5);
-            }else{
+            } else {
                 $username = $this->command->option("username");
             }
         } catch (\Exception $e) {

Braces +2 added lines, -2 removed lines

@@ -27,13 +27,13 @@
         try {
             if(@$this->command->option("password") == "AUTO" || !@$this->command->option("password")) {
                 $password = Str::random(16);
-            }else{
+            } else{
                 $password = $this->command->option("password");
             }
 
             if(@$this->command->option("username") == "AUTO" || !@$this->command->option("username")) {
                 $username = Str::random(5);
-            }else{
+            } else{
                 $username = $this->command->option("username");
             }
         } catch (\Exception $e) {

src/CRUDBoosterServiceProvider.php

Spacing +11 added lines, -11 removed lines

@@ -25,13 +25,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');
 
         // Override Local FileSystem
         Config::set("filesystems.disks.local.root", cbConfig("LOCAL_FILESYSTEM_PATH", public_path("storage")));
@@ -53,7 +53,7 @@ 
         require __DIR__.'/helpers/Helper.php';
 
         // Singletons
-        $this->app->singleton('crudbooster', function ()
+        $this->app->singleton('crudbooster', function()
         {
             return true;
         });
@@ -71,7 +71,7 @@ 
         }
 
         // Merging configuration
-        $this->mergeConfigFrom(__DIR__.'/configs/crudbooster.php','crudbooster');
+        $this->mergeConfigFrom(__DIR__.'/configs/crudbooster.php', 'crudbooster');
 
         // Register additional library
         $this->app->register('Intervention\Image\ImageServiceProvider');
@@ -83,11 +83,11 @@ 
     private function registerPlugin()
     {
         $views = scandir(app_path("CBPlugins"));
-        foreach($views as $view) {
-            if($view != "." && $view != "..") {
+        foreach ($views as $view) {
+            if ($view != "." && $view != "..") {
                 $basename = basename($view);
                 // register view
-                $this->loadViewsFrom(app_path("CBPlugins".DIRECTORY_SEPARATOR.$basename.DIRECTORY_SEPARATOR."Views"),$basename);
+                $this->loadViewsFrom(app_path("CBPlugins".DIRECTORY_SEPARATOR.$basename.DIRECTORY_SEPARATOR."Views"), $basename);
                 // register route
                 require app_path("CBPlugins".DIRECTORY_SEPARATOR.$basename.DIRECTORY_SEPARATOR."Routes".DIRECTORY_SEPARATOR."Route.php");
             }
@@ -96,7 +96,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/helpers/Plugin.php

Spacing +10 added lines, -10 removed lines

@@ -15,26 +15,26 @@ 
 
     public static function has($key)
     {
-        if(file_exists(app_path("CBPlugins/".$key))) return true;
+        if (file_exists(app_path("CBPlugins/".$key))) return true;
         else return false;
     }
 
     public static function isNeedUpgrade($pluginKey, $versionToCompare)
     {
         $pluginJson = json_decode(file_get_contents(app_path("CBPlugins/".$pluginKey."/plugin.json")), true);
-        if($pluginJson) {
-            return version_compare($pluginJson['version'], $versionToCompare,"!=");
-        }else{
+        if ($pluginJson) {
+            return version_compare($pluginJson['version'], $versionToCompare, "!=");
+        } else {
             return false;
         }
     }
 
     public static function registerDefaultRoute($dir)
     {
-        Route::group(['middleware' => ['web',\crocodicstudio\crudbooster\middlewares\CBDeveloper::class],
+        Route::group(['middleware' => ['web', \crocodicstudio\crudbooster\middlewares\CBDeveloper::class],
             'prefix'=>"developer/".getSetting('developer_path'),
-            'namespace' => 'App\CBPlugins\\'.basename(dirname("./../".$dir)).'\Controllers'], function () use ($dir) {
-            cb()->routeController("plugins/".basename(dirname("./../".$dir)),"\App\CBPlugins\\".basename(dirname("./../".$dir))."\Controllers\\".basename(dirname("./../".$dir))."Controller");
+            'namespace' => 'App\CBPlugins\\'.basename(dirname("./../".$dir)).'\Controllers'], function() use ($dir) {
+            cb()->routeController("plugins/".basename(dirname("./../".$dir)), "\App\CBPlugins\\".basename(dirname("./../".$dir))."\Controllers\\".basename(dirname("./../".$dir))."Controller");
         });
     }
 
@@ -43,11 +43,11 @@ 
         $plugins = scandir(app_path("CBPlugins"));
 
         $result = [];
-        foreach($plugins as $plugin) {
-            if($plugin != "." && $plugin != "..") {
+        foreach ($plugins as $plugin) {
+            if ($plugin != "." && $plugin != "..") {
                 $basename = basename($plugin);
                 $row = json_decode(file_get_contents(app_path("CBPlugins".DIRECTORY_SEPARATOR.$plugin.DIRECTORY_SEPARATOR."plugin.json")), true);
-                if($row) {
+                if ($row) {
                     $result[] = [
                         "name"=>$row['name'],
                         "version"=>$row['version'],

Braces +6 added lines, -3 removed lines

@@ -15,8 +15,11 @@ 
 
     public static function has($key)
     {
-        if(file_exists(app_path("CBPlugins/".$key))) return true;
-        else return false;
+        if(file_exists(app_path("CBPlugins/".$key))) {
+            return true;
+        } else {
+            return false;
+        }
     }
 
     public static function isNeedUpgrade($pluginKey, $versionToCompare)
@@ -24,7 +27,7 @@ 
         $pluginJson = json_decode(file_get_contents(app_path("CBPlugins/".$pluginKey."/plugin.json")), true);
         if($pluginJson) {
             return version_compare($pluginJson['version'], $versionToCompare,"!=");
-        }else{
+        } else{
             return false;
         }
     }

src/controllers/DeveloperDashboardController.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
     public function getIndex() {
         $data = [];
         $data['page_title'] = "Dashboard";
-        return view('crudbooster::dev_layouts.modules.dashboard',$data);
+        return view('crudbooster::dev_layouts.modules.dashboard', $data);
     }
     
     public function postSkipTutorial()