crocodic-studio / crudbooster

src/types/checkbox/Checkbox.php

Spacing +3 added lines, -3 removed lines

@@ -40,13 +40,13 @@ 
      * @param $SQLCondition string|callable
      */
     public function optionsFromTable($table, $key_field, $display_field, $SQLCondition = null) {
-        if(strpos($table,"App\Models")!==false) {
+        if (strpos($table, "App\Models") !== false) {
             $table = new $table();
             $table = $table::$tableName;
         }
 
         $data = DB::table($table);
-        if($SQLCondition && is_callable($SQLCondition)) {
+        if ($SQLCondition && is_callable($SQLCondition)) {
             $data = call_user_func($SQLCondition, $data);
         }elseif ($SQLCondition && is_string($SQLCondition)) {
             $data->whereRaw($SQLCondition);
@@ -54,7 +54,7 @@ 
         $data = $data->get();
         $options = [];
         foreach ($data as $d) {
-            $options[ $d->$key_field ] = $d->$display_field;
+            $options[$d->$key_field] = $d->$display_field;
         }
         $this->options($options);
     }

src/controllers/CBController.php

Spacing +51 added lines, -51 removed lines

@@ -26,14 +26,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;
         }
     }
@@ -47,13 +47,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'],
@@ -63,14 +63,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());
                 }
             }
@@ -78,20 +78,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').'%');
@@ -100,17 +100,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");
         }
 
@@ -119,10 +119,10 @@ 
 
     public function getIndex()
     {
-        if(!module()->canBrowse()) return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area");
+        if (!module()->canBrowse()) return cb()->redirect(cb()->getAdminUrl(), "You do not have a privilege access 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));
@@ -134,29 +134,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(),"You do not have a privilege access to this area");
+        if (!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(), "You do not have a privilege access to this area");
 
         $data = [];
         $data['page_title'] = $this->data['page_title'].' : 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(),"You do not have a privilege access to this area");
+        if (!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(), "You do not have a privilege access to this area");
 
         try {
             $this->validation();
@@ -164,28 +164,28 @@ 
             $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(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($e->getMessage(),'warning');
+            return cb()->redirectBack($e->getMessage(), 'warning');
         }
 
         if (request('submit') == trans('crudbooster.button_save_more')) {
@@ -197,7 +197,7 @@ 
 
     public function getEdit($id)
     {
-        if(!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area");
+        if (!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(), "You do not have a privilege access to this area");
 
         $data = [];
         $data['row'] = $this->repository()->where($this->data['table'].'.'.getPrimaryKey($this->data['table']), $id)->first();
@@ -208,7 +208,7 @@ 
 
     public function postEditSave($id)
     {
-        if(!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area");
+        if (!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(), "You do not have a privilege access to this area");
 
         try {
             $this->validation();
@@ -216,13 +216,13 @@ 
             $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'], 'updated_at')) {
+            if (Schema::hasColumn($this->data['table'], 'updated_at')) {
                 $data['updated_at'] = date('Y-m-d H:i:s');
             }
 
-            if(isset($this->data['hook_before_update']) && is_callable($this->data['hook_before_update'])) {
+            if (isset($this->data['hook_before_update']) && is_callable($this->data['hook_before_update'])) {
                 $data = call_user_func($this->data['hook_before_update'], $id, $data);
             }
 
@@ -230,16 +230,16 @@ 
                 ->where(cb()->pk($this->data['table']), $id)
                 ->update($data);
 
-            if(isset($this->data['hook_after_update']) && is_callable($this->data['hook_after_update'])) {
+            if (isset($this->data['hook_after_update']) && is_callable($this->data['hook_after_update'])) {
                 call_user_func($this->data['hook_after_update'], $id);
             }
 
         } catch (CBValidationException $e) {
             Log::debug($e);
-            return cb()->redirectBack($e->getMessage(),'info');
+            return cb()->redirectBack($e->getMessage(), 'info');
         } catch (\Exception $e) {
             Log::error($e);
-            return cb()->redirectBack($e->getMessage(),'warning');
+            return cb()->redirectBack($e->getMessage(), 'warning');
         }
 
 
@@ -252,15 +252,15 @@ 
 
     public function getDelete($id)
     {
-        if(!module()->canDelete()) return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area");
+        if (!module()->canDelete()) return cb()->redirect(cb()->getAdminUrl(), "You do not have a privilege access to this area");
 
-        if(isset($this->data['hook_before_delete']) && is_callable($this->data['hook_before_delete'])) {
+        if (isset($this->data['hook_before_delete']) && is_callable($this->data['hook_before_delete'])) {
             call_user_func($this->data['hook_before_delete'], $id);
         }
 
-        $softDelete = isset($this->data['disable_soft_delete'])?$this->data['disable_soft_delete']:true;
+        $softDelete = isset($this->data['disable_soft_delete']) ? $this->data['disable_soft_delete'] : true;
 
-        if ($softDelete === true && Schema::hasColumn($this->data['table'],'deleted_at')) {
+        if ($softDelete === true && Schema::hasColumn($this->data['table'], 'deleted_at')) {
             DB::table($this->data['table'])
                 ->where(getPrimaryKey($this->data['table']), $id)
                 ->update(['deleted_at' => date('Y-m-d H:i:s')]);
@@ -270,7 +270,7 @@ 
                 ->delete();
         }
 
-        if(isset($this->data['hook_after_delete']) && is_callable($this->data['hook_after_delete'])) {
+        if (isset($this->data['hook_after_delete']) && is_callable($this->data['hook_after_delete'])) {
             call_user_func($this->data['hook_after_delete'], $id);
         }
 
@@ -279,7 +279,7 @@ 
 
     public function getDetail($id)
     {
-        if(!module()->canRead()) return cb()->redirect(cb()->getAdminUrl(),"You do not have a privilege access to this area");
+        if (!module()->canRead()) return cb()->redirect(cb()->getAdminUrl(), "You do not have a privilege access to this area");
 
         $data = [];
         $data['row'] = $this->repository()->where($this->data['table'].'.'.getPrimaryKey($this->data['table']), $id)->first();

src/controllers/DeveloperMenusController.php

Spacing +23 added lines, -23 removed lines

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

src/helpers/Module.php

Spacing +49 added lines, -49 removed lines

@@ -26,16 +26,16 @@ 
         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->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 = DB::table("cb_role_privileges")
                             ->where("cb_menus_id", $this->menu->id)
                             ->where("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/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');
         }
     }
 

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

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/commands/DeveloperCommandService.php

Spacing +5 added lines, -5 removed lines

@@ -23,16 +23,16 @@
 
     public function create()
     {
-        if($this->command->)
-        if($this->command->option("password") == "AUTO") {
+        if ($this->command->)
+        if ($this->command->option("password") == "AUTO") {
             $password = Str::random(16);
-        }else{
+        } else {
             $password = $this->command->option("password");
         }
 
-        if($this->command->option("username") == "AUTO") {
+        if ($this->command->option("username") == "AUTO") {
             $username = Str::random(5);
-        }else{
+        } else {
             $username = $this->command->option("username");
         }
 

src/types/select_option/SelectOption.php

Spacing +3 added lines, -3 removed lines

@@ -21,10 +21,10 @@
     public function options($data_options) {
         $data = columnSingleton()->getColumn($this->index);
 
-        foreach($data_options as $key=>$option) {
-            if(is_int($key)) {
+        foreach ($data_options as $key=>$option) {
+            if (is_int($key)) {
                 $data_options[$option] = $option;
-            }else{
+            } else {
                 $data_options[$key] = $option;
             }
         }