crocodic-studio / crudbooster

src/helpers/MiscellanousSingleton.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 
     public function hasData($key) {
         $data = $this->data;
-        if(isset($data[$key])) return true;
+        if (isset($data[$key])) return true;
         else return false;
     }
 

src/helpers/SchemaHelper.php

Spacing +1 added lines, -1 removed lines

@@ -16,6 +16,6 @@
     public static function hasColumn($table, $column)
     {
         $columns = cb()->listAllColumns($table);
-        return in_array($column,$columns);
+        return in_array($column, $columns);
     }
 }
\ No newline at end of file

src/helpers/CB.php

Spacing +44 added lines, -44 removed lines

@@ -24,7 +24,7 @@ 
     }
 
     public function getRoleByName($roleName) {
-        return $this->find("cb_roles",['name'=>$roleName]);
+        return $this->find("cb_roles", ['name'=>$roleName]);
     }
 
     public function fcm() {
@@ -40,7 +40,7 @@ 
     }
 
     public function getDeveloperUrl($path = null) {
-        $path = ($path)?"/".trim($path,"/"):null;
+        $path = ($path) ? "/".trim($path, "/") : null;
         return url("developer/".getSetting("developer_path")).$path;
     }
 
@@ -57,16 +57,16 @@ 
     }
 
     public function getAdminPath() {
-        return getSetting("ADMIN_PATH","admin");
+        return getSetting("ADMIN_PATH", "admin");
     }
 
     public function getAdminUrl($path = null) {
-        $path = ($path)?"/".trim($path,"/"):null;
+        $path = ($path) ? "/".trim($path, "/") : null;
         return url($this->getAdminPath()).$path;
     }
 
     public function getAppName() {
-        return getSetting("APP_NAME", env("APP_NAME","CRUDBOOSTER"));
+        return getSetting("APP_NAME", env("APP_NAME", "CRUDBOOSTER"));
     }
 
     /**
@@ -80,16 +80,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;
@@ -97,17 +97,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::putFileAs($file_path, $file, $filename, '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!");
         }
     }
@@ -123,16 +123,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");
         }
     }
@@ -152,7 +152,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);
             }
 
@@ -187,29 +187,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!");
         }
     }
@@ -233,7 +233,7 @@ 
     {
         if (is_array($id)) {
             $idHash = md5("find".$table.serialize($id));
-            if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
+            if (miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
 
             $first = DB::table($table);
             foreach ($id as $k => $v) {
@@ -241,15 +241,15 @@ 
             }
 
             $data = $first->first();
-            miscellanousSingleton()->setData($idHash,$data);
+            miscellanousSingleton()->setData($idHash, $data);
             return $data;
         } else {
             $idHash = md5("find".$table.$id);
-            if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
+            if (miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
 
             $pk = $this->pk($table);
             $data = DB::table($table)->where($pk, $id)->first();
-            miscellanousSingleton()->setData($idHash,$data);
+            miscellanousSingleton()->setData($idHash, $data);
             return $data;
         }
     }
@@ -264,30 +264,30 @@ 
         $data = [];
         $idHash = null;
 
-        if(is_array($conditionOrCallback)) {
+        if (is_array($conditionOrCallback)) {
             $idHash = md5("findAll".$table.serialize($conditionOrCallback));
-            if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
+            if (miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
 
             $data = DB::table($table)->where($conditionOrCallback)->get();
         } elseif (is_callable($conditionOrCallback)) {
             $idHash = "findAll".$table.spl_object_hash($conditionOrCallback);
-            if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
+            if (miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
 
             $data = DB::table($table);
             $data = call_user_func($conditionOrCallback, $data);
             $data = $data->get();
         } else {
             $idHash = md5("findAll".$table.$conditionOrCallback);
-            if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
+            if (miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
 
             $data = DB::table($table);
-            if($conditionOrCallback) {
+            if ($conditionOrCallback) {
                 $data = $data->whereRaw($conditionOrCallback);
             }
             $data = $data->get();
         }
 
-        if($idHash && $data) {
+        if ($idHash && $data) {
             miscellanousSingleton()->setData($idHash, $data);
         }
 
@@ -297,7 +297,7 @@ 
     public function listAllTable()
     {
         $idHash = md5("listAllTable");
-        if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
+        if (miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
         $data = DB::connection()->getDoctrineSchemaManager()->listTableNames();
         miscellanousSingleton()->setData($idHash, $data);
         return $data;
@@ -306,7 +306,7 @@ 
     public function listAllColumns($table)
     {
         $idHash = md5("listAllColumns".$table);
-        if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
+        if (miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
         $data = Schema::getColumnListing($table);
         miscellanousSingleton()->setData($idHash, $data);
         return $data;
@@ -374,7 +374,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));
         }
     }
 
@@ -386,7 +386,7 @@ 
     public function findPrimaryKey($table)
     {
         $pk = DB::getDoctrineSchemaManager()->listTableDetails($table)->getPrimaryKey();
-        if(!$pk) {
+        if (!$pk) {
             return null;
         }
         return $pk->getColumns()[0];
@@ -435,7 +435,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]));
@@ -452,16 +452,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]);
     }
 
@@ -494,7 +494,7 @@ 
 
         $prefix = trim($prefix, '/').'/';
 
-        if(substr($controller,0,1) != "\\") {
+        if (substr($controller, 0, 1) != "\\") {
             $controller = "\App\Http\Controllers\\".$controller;
         }
 

src/helpers/Module.php

Spacing +50 added lines, -50 removed lines

@@ -26,17 +26,17 @@ 
         try {
             $routeArray = request()->route()->getAction();
             $this->controller = class_basename($routeArray['controller']);
-            $this->controller = strtok($this->controller,"@");
+            $this->controller = strtok($this->controller, "@");
 
             $className = "\\".$routeArray["namespace"]."\\".$this->controller;
-            if(class_exists($className)) {
-                $this->module = cb()->find("cb_modules",["controller"=>$this->controller]);
-                if($this->module) {
+            if (class_exists($className)) {
+                $this->module = cb()->find("cb_modules", ["controller"=>$this->controller]);
+                if ($this->module) {
                     $this->controller_class = new $className();
-                    $this->menu = cb()->find("cb_menus",["cb_modules_id"=>$this->module->id]);
-                    $this->menu = (!$this->menu)?cb()->find("cb_menus",["type"=>"path","path"=>request()->segment(2)]):$this->menu;
-                    if($this->menu) {
-                        $this->privilege = cb()->find("cb_role_privileges",[
+                    $this->menu = cb()->find("cb_menus", ["cb_modules_id"=>$this->module->id]);
+                    $this->menu = (!$this->menu) ?cb()->find("cb_menus", ["type"=>"path", "path"=>request()->segment(2)]) : $this->menu;
+                    if ($this->menu) {
+                        $this->privilege = cb()->find("cb_role_privileges", [
                            "cb_menus_id"=>$this->menu->id,
                            "cb_roles_id"=>cb()->session()->roleId()
                         ]);
@@ -57,9 +57,9 @@ 
     }
 
     public function getData($key) {
-        if($this->controller_class) {
+        if ($this->controller_class) {
             $value = $this->controller_class->getData($key);
-            if(isset($value)) {
+            if (isset($value)) {
                 return $value;
             }
         }
@@ -70,128 +70,128 @@ 
      * @return CBController
      */
     public function getController() {
-        return ($this->controller_class)?$this->controller_class:null;
+        return ($this->controller_class) ? $this->controller_class : null;
     }
 
     public function getPageTitle()
     {
-        return ($this->controller_class)?$this->controller_class->getData("page_title")?:cb()->getAppName():null;
+        return ($this->controller_class) ? $this->controller_class->getData("page_title") ?: cb()->getAppName() : null;
     }
 
     public function getTable()
     {
-        return ($this->controller_class)?$this->controller_class->getData("table"):null;
+        return ($this->controller_class) ? $this->controller_class->getData("table") : null;
     }
 
     public function getPageIcon()
     {
-        return ($this->controller_class)?$this->controller_class->getData('page_icon')?:"fa fa-bars":null;
+        return ($this->controller_class) ? $this->controller_class->getData('page_icon') ?: "fa fa-bars" : null;
     }
 
     public function canBrowse() {
-        if($this->privilege) {
-            if($this->privilege->can_browse) return true;
+        if ($this->privilege) {
+            if ($this->privilege->can_browse) return true;
             else return false;
-        }else{
+        } else {
             return true;
         }
     }
 
     public function canCreate() {
-        if($this->privilege) {
-            if($this->privilege->can_create) return true;
+        if ($this->privilege) {
+            if ($this->privilege->can_create) return true;
             else return false;
-        }else{
+        } else {
             return true;
         }
     }
 
     public function canRead() {
-        if($this->privilege) {
-            if($this->privilege->can_read) return true;
+        if ($this->privilege) {
+            if ($this->privilege->can_read) return true;
             else return false;
-        }else{
+        } else {
             return true;
         }
     }
 
     public function canUpdate() {
-        if($this->privilege) {
-            if($this->privilege->can_update) return true;
+        if ($this->privilege) {
+            if ($this->privilege->can_update) return true;
             else return false;
-        }else{
+        } else {
             return true;
         }
     }
 
     public function canDelete() {
-        if($this->privilege) {
-            if($this->privilege->can_delete) return true;
+        if ($this->privilege) {
+            if ($this->privilege->can_delete) return true;
             else return false;
-        }else{
+        } else {
             return true;
         }
     }
 
     public function addURL()
     {
-        if($this->controller_class && method_exists($this->controller_class, 'getAdd')) {
+        if ($this->controller_class && method_exists($this->controller_class, 'getAdd')) {
             return action($this->controller.'@getAdd');
-        }else{
+        } else {
             return null;
         }
     }
 
     public function addSaveURL()
     {
-        if($this->controller_class && method_exists($this->controller_class, 'postAddSave')) {
+        if ($this->controller_class && method_exists($this->controller_class, 'postAddSave')) {
             return action($this->controller.'@postAddSave');
-        }else{
+        } else {
             return null;
         }
     }
 
     public function editURL($id = null)
     {
-        if($this->controller_class && method_exists($this->controller_class, 'getEdit')) {
-            return action($this->controller.'@getEdit',['id'=>$id]);
-        }else{
+        if ($this->controller_class && method_exists($this->controller_class, 'getEdit')) {
+            return action($this->controller.'@getEdit', ['id'=>$id]);
+        } else {
             return null;
         }
     }
 
     public function editSaveURL($id = null)
     {
-        if(method_exists($this->controller_class, 'postEditSave')) {
-            return action($this->controller.'@postEditSave',['id'=>$id]);
-        }else{
+        if (method_exists($this->controller_class, 'postEditSave')) {
+            return action($this->controller.'@postEditSave', ['id'=>$id]);
+        } else {
             return null;
         }
     }
 
-    public function detailURL($id=null)
+    public function detailURL($id = null)
     {
-        if($this->controller_class && method_exists($this->controller_class, 'getDetail')) {
-            return action($this->controller.'@getDetail',['id'=>$id]);
-        }else{
+        if ($this->controller_class && method_exists($this->controller_class, 'getDetail')) {
+            return action($this->controller.'@getDetail', ['id'=>$id]);
+        } else {
             return null;
         }
     }
 
-    public function deleteURL($id=null)
+    public function deleteURL($id = null)
     {
-        if($this->controller_class && method_exists($this->controller_class, 'getDelete')) {
-            return action($this->controller.'@getDelete',['id'=>$id]);
-        }else{
+        if ($this->controller_class && method_exists($this->controller_class, 'getDelete')) {
+            return action($this->controller.'@getDelete', ['id'=>$id]);
+        } else {
             return null;
         }
     }
 
     public function url($path = null)
     {
-        if($this->controller_class && method_exists($this->controller_class, 'getIndex')) {
-            return trim(action($this->controller.'@getIndex').'/'.$path,'/');
-        }else{
+        if ($this->controller_class && method_exists($this->controller_class, 'getIndex')) {
+            return trim(action($this->controller.'@getIndex').'/'.$path, '/');
+        } else {
             return null;
         }
     }

src/helpers/CacheHelper.php

Spacing +6 added lines, -6 removed lines

@@ -15,10 +15,10 @@ 
 {
     public static function putInGroup($key, $value, $group, $duration) {
         $key = md5($key);
-        $exist = (Cache::get($group))?:[];
-        $exist[ $key ] = ['value'=>$value,'duration'=>$duration];
+        $exist = (Cache::get($group)) ?: [];
+        $exist[$key] = ['value'=>$value, 'duration'=>$duration];
 
-        if($duration == -1) {
+        if ($duration == -1) {
             Cache::forever($group, $exist);
         } else {
             Cache::put($group, $exist, $duration);
@@ -28,7 +28,7 @@ 
     public static function getItemInGroup($key, $group) {
         $groupdata = Cache::get($group);
         $key = md5($key);
-        if(isset($groupdata[$key])) {
+        if (isset($groupdata[$key])) {
             return $groupdata[$key]['value'];
         }
         return null;
@@ -38,11 +38,11 @@ 
         Cache::forget($group);
     }
 
-    public static function forgetInGroup($key,$group) {
+    public static function forgetInGroup($key, $group) {
         $key = md5($key);
         $data = Cache::get($group);
         $duration = null;
-        if(isset($data[$key])) {
+        if (isset($data[$key])) {
             $item = $data[$key];
             unset($data[$key]);
         }

src/controllers/traits/Query.php

Spacing +26 added lines, -26 removed lines

@@ -24,13 +24,13 @@ 
 
         $query->addSelect($this->data['table'].'.'.cb()->pk($this->data['table']).' as primary_key');
 
-        $softDelete = isset($this->data['disable_soft_delete'])?$this->data['disable_soft_delete']:true;
-        if($softDelete === true && SchemaHelper::hasColumn($this->data['table'],'deleted_at')) {
+        $softDelete = isset($this->data['disable_soft_delete']) ? $this->data['disable_soft_delete'] : true;
+        if ($softDelete === true && SchemaHelper::hasColumn($this->data['table'], 'deleted_at')) {
             $query->whereNull($this->data['table'].'.deleted_at');
         }
 
-        if(isset($joins)) {
-            foreach($joins as $join)
+        if (isset($joins)) {
+            foreach ($joins as $join)
             {
                 $query->join($join['target_table'],
                     $join['target_table_primary'],
@@ -40,14 +40,14 @@ 
             }
         }
 
-        foreach($columns as $column) {
+        foreach ($columns as $column) {
             /** @var ColumnModel $column */
-            if($column->getType() != "custom") {
-                if(strpos($column->getField(),".") === false) {
-                    if(SchemaHelper::hasColumn($this->data['table'], $column->getField())) {
+            if ($column->getType() != "custom") {
+                if (strpos($column->getField(), ".") === false) {
+                    if (SchemaHelper::hasColumn($this->data['table'], $column->getField())) {
                         $query->addSelect($this->data['table'].'.'.$column->getField());
                     }
-                }else{
+                } else {
                     $query->addSelect($column->getField());
                 }
             }
@@ -55,21 +55,21 @@ 
             $query = getTypeHook($column->getType())->query($query, $column);
         }
 
-        if(request()->has('q'))
+        if (request()->has('q'))
         {
             $keyword = sanitizeXSS(request("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, $keyword) {
+            } else {
+                $query->where(function($where) use ($columns, $keyword) {
                     /**
                      * @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', '%'.$keyword.'%');
@@ -82,36 +82,36 @@ 
         /*
          * This script to hanlde the callback inputed on this query method
          */
-        if(isset($callback) && is_callable($callback)) {
+        if (isset($callback) && is_callable($callback)) {
             $query = call_user_func($callback, $query);
         }
 
-        if(isset($this->data['hook_index_query']) && is_callable($this->data['hook_index_query'])) {
+        if (isset($this->data['hook_index_query']) && is_callable($this->data['hook_index_query'])) {
             $query = call_user_func($this->data['hook_index_query'], $query);
         }
 
 
-        if(request()->has(['order_by','order_sort']))
+        if (request()->has(['order_by', 'order_sort']))
         {
-            $sort = (request("order_sort")=="asc")?"asc":"desc";
+            $sort = (request("order_sort") == "asc") ? "asc" : "desc";
             /*
              * Check if order by contain "." it means {table}.{column} we have to parsing that
              */
-            if(strpos(request("order_by"), ".")!==false) {
-                $orderByTable = explode(".",request("order_by"))[0];
-                $orderByColumn = explode(".",request("order_by"))[1];
-                if(SchemaHelper::hasColumn($orderByTable, $orderByColumn)) {
+            if (strpos(request("order_by"), ".") !== false) {
+                $orderByTable = explode(".", request("order_by"))[0];
+                $orderByColumn = explode(".", request("order_by"))[1];
+                if (SchemaHelper::hasColumn($orderByTable, $orderByColumn)) {
                     $query->orderBy($orderByTable.".".$orderByColumn, $sort);
                 }
             } else {
                 /*
                  * Check if order_by column in registered columns
                  */
-                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 {
             /*
              * For default, query will be order by primary key as descending
              */

src/controllers/scaffolding/traits/ColumnsRegister.php

Spacing +38 added lines, -38 removed lines

@@ -65,8 +65,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->setOrderByColumn($data->getField());
         $data->setType("text");
 
@@ -82,8 +82,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->setOrderByColumn($data->getField());
         $data->setType("checkbox");
 
@@ -99,8 +99,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->setOrderByColumn($data->getField());
         $data->setType("password");
         $data->setShowDetail(false);
@@ -118,8 +118,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->setOrderByColumn($data->getField());
         $data->setType("image");
 
@@ -135,8 +135,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->setOrderByColumn($data->getField());
         $data->setType("text_area");
 
@@ -147,20 +147,20 @@ 
 
     public function addSelectTable($label, $name = null, $selectConfig)
     {
-        if(isset($selectConfig['table']) && isset($selectConfig['value_option']) && isset($selectConfig['display_option'])) {
+        if (isset($selectConfig['table']) && isset($selectConfig['value_option']) && isset($selectConfig['display_option'])) {
             $this->index++;
 
             $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");
             $data->setOrderByColumn($selectConfig['table'].".".$selectConfig["display_option"]);
             columnSingleton()->setColumn($this->index, $data);
 
             $selectTable = new SelectTable($this->index);
-            $selectTable->optionsFromTable($selectConfig['table'],$selectConfig['value_option'],$selectConfig['display_option'],@$selectConfig['sql_condition']);
+            $selectTable->optionsFromTable($selectConfig['table'], $selectConfig['value_option'], $selectConfig['display_option'], @$selectConfig['sql_condition']);
 
             return $selectTable;
         } else {
@@ -175,7 +175,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->setOrderByColumn($data->getField());
         $data->setType("select_option");
@@ -184,7 +184,7 @@ 
 
         $selectOption = new SelectOption($this->index);
 
-        if($options) {
+        if ($options) {
             $selectOption->options($options);
         }
 
@@ -204,16 +204,16 @@ 
         $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->setOrderByColumn($data->getField());
         $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);
         }
 
@@ -228,8 +228,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->setOrderByColumn($data->getField());
         $data->setType("custom");
 
@@ -245,8 +245,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->setOrderByColumn($data->getField());
         $data->setType("date");
 
@@ -262,8 +262,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->setOrderByColumn($data->getField());
         $data->setType("datetime");
 
@@ -279,8 +279,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->setOrderByColumn($data->getField());
         $data->setType("email");
 
@@ -296,8 +296,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->setOrderByColumn($data->getField());
         $data->setType("file");
 
@@ -314,8 +314,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->setOrderByColumn($data->getField());
         $data->setType("hidden");
 
@@ -331,8 +331,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->setOrderByColumn($data->getField());
         $data->setType("number");
 
@@ -348,8 +348,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->setOrderByColumn($data->getField());
         $data->setType("money");
 
@@ -365,8 +365,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->setOrderByColumn($data->getField());
         $data->setType("radio");
 
@@ -382,8 +382,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->setOrderByColumn($data->getField());
         $data->setType("wysiwyg");
 

src/controllers/DeveloperSecurityController.php

Spacing +7 added lines, -7 removed lines

@@ -24,12 +24,12 @@ 
 
     public function getIndex() {
         $data = [];
-        return view($this->view.".index",$data);
+        return view($this->view.".index", $data);
     }
 
     public function postSave()
     {
-        if(!isConfigCached()) {
+        if (!isConfigCached()) {
             setEnvironmentValue([
                 "APP_DEBUG"=>request("APP_DEBUG")
             ]);
@@ -41,15 +41,15 @@ 
         putSetting("AUTO_REDIRECT_TO_LOGIN", request("AUTO_REDIRECT_TO_LOGIN"));
         putSetting("LOGIN_NOTIFICATION", request("LOGIN_NOTIFICATION"));
 
-        if(request("htaccess_ServerSignature")) {
+        if (request("htaccess_ServerSignature")) {
             putHtaccess("ServerSignature Off");
         }
 
-        if(request("htaccess_IndexIgnore")) {
+        if (request("htaccess_IndexIgnore")) {
             putHtaccess("IndexIgnore *");
         }
 
-        if(request("htaccess_dotAccess")) {
+        if (request("htaccess_dotAccess")) {
 putHtaccess("
 <FilesMatch \"^\.\">
 Order allow,deny
@@ -57,11 +57,11 @@ 
 </FilesMatch>");
         }
 
-        if(request("htaccess_preventVendor")) {
+        if (request("htaccess_preventVendor")) {
             putHtaccess("RewriteRule ^(.*)/vendor/.*\.(php|rb|py)$ - [F,L,NC]");
         }
 
 
-        return cb()->redirectBack("Security has been updated!","success");
+        return cb()->redirectBack("Security has been updated!", "success");
     }
 }
\ No newline at end of file

src/CRUDBoosterServiceProvider.php

Spacing +12 added lines, -12 removed lines

@@ -26,13 +26,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")));
@@ -54,7 +54,7 @@ 
         require __DIR__.'/helpers/Helper.php';
 
         // Singletons
-        $this->app->singleton('crudbooster', function ()
+        $this->app->singleton('crudbooster', function()
         {
             return true;
         });
@@ -77,7 +77,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');
@@ -88,13 +88,13 @@ 
 
     private function registerPlugin()
     {
-        if(file_exists(app_path("CBPlugins"))) {
+        if (file_exists(app_path("CBPlugins"))) {
             $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");
                 }
@@ -106,7 +106,7 @@ 
 
     private function registerTypeRoutes() {
         $routes = rglob(__DIR__.DIRECTORY_SEPARATOR."types".DIRECTORY_SEPARATOR."Route.php");
-        foreach($routes as $route) {
+        foreach ($routes as $route) {
             require $route;
         }
     }