crocodic-studio / crudbooster

src/controllers/DeveloperDashboardController.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,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);
     }
     
 

src/controllers/CBController.php

Spacing +49 added lines, -49 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;
         }
     }
@@ -49,19 +49,19 @@ 
 
         $query->addSelect($this->data['table'].'.'.cb()->pk($this->data['table']).' as primary_key');
 
-        if(isset($this->data['hook_query_index']) && is_callable($this->data['hook_query_index']))
+        if (isset($this->data['hook_query_index']) && is_callable($this->data['hook_query_index']))
         {
             $query = call_user_func($this->data['hook_query_index'], $query);
         }
 
-        $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'],
@@ -71,27 +71,27 @@ 
             }
         }
 
-        foreach($columns as $column) {
+        foreach ($columns as $column) {
             /** @var ColumnModel $column */
-            if(strpos($column->getField(),".") === false) {
+            if (strpos($column->getField(), ".") === false) {
                 $query->addSelect($this->data['table'].'.'.$column->getField());
-            }else{
+            } else {
                 $query->addSelect($column->getField());
             }
 
             $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)
                     {
                         $where->orWhere($column['name'], 'like', '%'.request('q').'%');
                     }
@@ -99,18 +99,18 @@ 
             }
         }
 
-        if(isset($this->data['hook_query_index']) && is_callable($this->data['hook_query_index'])) {
+        if (isset($this->data['hook_query_index']) && is_callable($this->data['hook_query_index'])) {
             $query = call_user_func($this->data['hook_query_index'], $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{
-            if(isset($this->data['order_by'])) {
+        } else {
+            if (isset($this->data['order_by'])) {
                 $query->orderBy($this->data['order_by'][0], $this->data['order_by'][1]);
             }
         }
@@ -120,7 +120,7 @@ 
 
     public function getIndex()
     {
-        if(!module()->canBrowse()) return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        if (!module()->canBrowse()) return cb()->redirect(cb()->getAdminUrl(), "You do not have access to this area");
 
         $query = $this->repository();
         $result = $query->paginate(20);
@@ -134,51 +134,51 @@ 
      */
     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 access to this area");
+        if (!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(), "You do not have access to this area");
 
         $data = [];
         $data['page_title'] = $this->data['page_title'].' : Add';
         $data['action_url'] = module()->addSaveURL();
-        return view('crudbooster::module.form.form',$data);
+        return view('crudbooster::module.form.form', $data);
     }
 
     public function postAddSave()
     {
-        if(!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        if (!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(), "You do not have access to this area");
 
         try {
             $this->validation();
             columnSingleton()->valueAssignment();
             $data = columnSingleton()->getAssignmentData();
 
-            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');
             }
 
             $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')) {
@@ -190,7 +190,7 @@ 
 
     public function getEdit($id)
     {
-        if(!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        if (!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(), "You do not have access to this area");
 
         $data = [];
         $data['row'] = $this->repository()->where($this->data['table'].'.'.getPrimaryKey($this->data['table']), $id)->first();
@@ -201,17 +201,17 @@ 
 
     public function postEditSave($id)
     {
-        if(!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        if (!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(), "You do not have access to this area");
 
         try {
             $this->validation();
             columnSingleton()->valueAssignment();
             $data = columnSingleton()->getAssignmentData();
-            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'])) {
                 call_user_func($this->data['hook_before_update'], $id);
             }
 
@@ -219,16 +219,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');
         }
 
 
@@ -241,15 +241,15 @@ 
 
     public function getDelete($id)
     {
-        if(!module()->canDelete()) return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        if (!module()->canDelete()) return cb()->redirect(cb()->getAdminUrl(), "You do not have 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')]);
@@ -259,7 +259,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);
         }
 
@@ -268,7 +268,7 @@ 
 
     public function getDetail($id)
     {
-        if(!module()->canRead()) return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        if (!module()->canRead()) return cb()->redirect(cb()->getAdminUrl(), "You do not have access to this area");
 
         $data = [];
         $data['row'] = $this->repository()->where($this->data['table'].'.'.getPrimaryKey($this->data['table']), $id)->first();
@@ -278,21 +278,21 @@ 
 
     public function postUploadFile()
     {
-        if(auth()->guest()) return redirect(cb()->getLoginUrl());
+        if (auth()->guest()) return redirect(cb()->getLoginUrl());
 
         $file = null;
         try {
 
             cb()->validation([
-                'userfile' => 'required|mimes:' . config('crudbooster.UPLOAD_TYPES')
+                'userfile' => 'required|mimes:'.config('crudbooster.UPLOAD_TYPES')
             ]);
 
             $file = cb()->uploadFile('userfile', true);
 
         } catch (CBValidationException $e) {
-            return response()->json(['status'=>false,'message'=>$e->getMessage()]);
+            return response()->json(['status'=>false, 'message'=>$e->getMessage()]);
         } catch (\Exception $e) {
-            return response()->json(['status'=>false,'message'=>$e->getMessage()]);
+            return response()->json(['status'=>false, 'message'=>$e->getMessage()]);
         }
 
         return response()->json([

Braces +29 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;
         }
     }
@@ -75,7 +75,7 @@ 
             /** @var ColumnModel $column */
             if(strpos($column->getField(),".") === false) {
                 $query->addSelect($this->data['table'].'.'.$column->getField());
-            }else{
+            } else{
                 $query->addSelect($column->getField());
             }
 
@@ -86,7 +86,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
@@ -109,7 +109,7 @@ 
             if(in_array(request('order_by'),columnSingleton()->getColumnNameOnly())) {
                 $query->orderBy(request('order_by'), request('order_sort'));
             }
-        }else{
+        } else{
             if(isset($this->data['order_by'])) {
                 $query->orderBy($this->data['order_by'][0], $this->data['order_by'][1]);
             }
@@ -120,7 +120,9 @@ 
 
     public function getIndex()
     {
-        if(!module()->canBrowse()) return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        if(!module()->canBrowse()) {
+            return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        }
 
         $query = $this->repository();
         $result = $query->paginate(20);
@@ -146,7 +148,9 @@ 
 
     public function getAdd()
     {
-        if(!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        if(!module()->canCreate()) {
+            return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        }
 
         $data = [];
         $data['page_title'] = $this->data['page_title'].' : Add';
@@ -156,7 +160,9 @@ 
 
     public function postAddSave()
     {
-        if(!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        if(!module()->canCreate()) {
+            return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        }
 
         try {
             $this->validation();
@@ -190,7 +196,9 @@ 
 
     public function getEdit($id)
     {
-        if(!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        if(!module()->canUpdate()) {
+            return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        }
 
         $data = [];
         $data['row'] = $this->repository()->where($this->data['table'].'.'.getPrimaryKey($this->data['table']), $id)->first();
@@ -201,7 +209,9 @@ 
 
     public function postEditSave($id)
     {
-        if(!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        if(!module()->canUpdate()) {
+            return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        }
 
         try {
             $this->validation();
@@ -241,7 +251,9 @@ 
 
     public function getDelete($id)
     {
-        if(!module()->canDelete()) return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        if(!module()->canDelete()) {
+            return cb()->redirect(cb()->getAdminUrl(),"You do not have access 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);
@@ -268,7 +280,9 @@ 
 
     public function getDetail($id)
     {
-        if(!module()->canRead()) return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        if(!module()->canRead()) {
+            return cb()->redirect(cb()->getAdminUrl(),"You do not have access to this area");
+        }
 
         $data = [];
         $data['row'] = $this->repository()->where($this->data['table'].'.'.getPrimaryKey($this->data['table']), $id)->first();
@@ -278,7 +292,9 @@ 
 
     public function postUploadFile()
     {
-        if(auth()->guest()) return redirect(cb()->getLoginUrl());
+        if(auth()->guest()) {
+            return redirect(cb()->getLoginUrl());
+        }
 
         $file = null;
         try {

src/controllers/DeveloperModulesController.php

Spacing +7 added lines, -7 removed lines

@@ -26,7 +26,7 @@ 
     public function getIndex() {
         $data = [];
         $data['result'] = DB::table("cb_modules")->get();
-        return view($this->view.'.index',$data);
+        return view($this->view.'.index', $data);
     }
 
     public function getAdd() {
@@ -37,11 +37,11 @@ 
 
     public function postAddSave() {
         try {
-            cb()->validation(['name', 'table','icon']);
+            cb()->validation(['name', 'table', 'icon']);
 
             (new ModuleGenerator(request('table'), request('name'), request('icon')))->make();
 
-            return cb()->redirect(route("DeveloperModulesControllerGetIndex"),"New module has been created!","success");
+            return cb()->redirect(route("DeveloperModulesControllerGetIndex"), "New module has been created!", "success");
 
         } catch (CBValidationException $e) {
             return cb()->redirectBack($e->getMessage());
@@ -58,9 +58,9 @@ 
         try {
             cb()->validation(['name', 'icon']);
 
-            cb()->updateCompact("cb_modules", $id, ['name','icon']);
+            cb()->updateCompact("cb_modules", $id, ['name', 'icon']);
 
-            return cb()->redirect(route("DeveloperModulesControllerGetIndex"),"Module has been updated!","success");
+            return cb()->redirect(route("DeveloperModulesControllerGetIndex"), "Module has been updated!", "success");
 
         } catch (CBValidationException $e) {
             return cb()->redirectBack($e->getMessage());
@@ -68,12 +68,12 @@ 
     }
 
     public function getDelete($id) {
-        $module = cb()->find("cb_modules",$id);
+        $module = cb()->find("cb_modules", $id);
         @unlink(app_path("Http/Controllers/".$module->controller));
         DB::table("cb_modules")->where("id", $id)->delete();
         DB::table("cb_menus")->where("cb_modules_id", $id)->delete();
 
-        return cb()->redirectBack("The module has been deleted!","success");
+        return cb()->redirectBack("The module has been deleted!", "success");
     }
 
 }
\ No newline at end of file

src/controllers/AdminAuthController.php

Spacing +11 added lines, -11 removed lines

@@ -7,7 +7,7 @@ 
 
     public function getLogin()
     {
-        if(!auth()->guest()) return redirect(cb()->getAdminUrl());
+        if (!auth()->guest()) return redirect(cb()->getAdminUrl());
 
         cbHook()->hookGetLogin();
 
@@ -16,20 +16,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.alert_password_wrong'),'message_type'=>'warning']);
+                return redirect(cb()->getLoginUrl())->with(['message'=>__('crudbooster.alert_password_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');
         }
     }
 
@@ -44,25 +44,25 @@ 
     }
 
     public function postLoginDeveloper() {
-        try{
+        try {
             cb()->validation([
                 'username'=>'required',
                 'password'=>'required'
             ]);
 
-            if(request('username') == config('crudbooster.DEV_USERNAME')
+            if (request('username') == config('crudbooster.DEV_USERNAME')
                 && request('password') == config('crudbooster.DEV_PASSWORD')) {
 
                 session(['developer'=>1]);
 
                 return redirect(cb()->getDeveloperUrl());
 
-            }else{
+            } else {
                 return cb()->redirectBack("Username and or password 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

@@ -7,7 +7,9 @@ 
 
     public function getLogin()
     {
-        if(!auth()->guest()) return redirect(cb()->getAdminUrl());
+        if(!auth()->guest()) {
+            return redirect(cb()->getAdminUrl());
+        }
 
         cbHook()->hookGetLogin();
 
@@ -28,7 +30,7 @@ 
             } else {
                 return redirect(cb()->getLoginUrl())->with(['message'=>__('crudbooster.alert_password_wrong'),'message_type'=>'warning']);
             }
-        }catch (CBValidationException $e) {
+        } catch (CBValidationException $e) {
             return cb()->redirect(cb()->getAdminUrl("login"),$e->getMessage(),'warning');
         }
     }
@@ -57,11 +59,11 @@ 
 
                 return redirect(cb()->getDeveloperUrl());
 
-            }else{
+            } else{
                 return cb()->redirectBack("Username and or password is wrong!");
             }
 
-        }catch (CBValidationException $e) {
+        } catch (CBValidationException $e) {
             return cb()->redirect(cb()->getLoginUrl(),$e->getMessage(),'warning');
         }
     }

src/helpers/Module.php

Spacing +46 added lines, -46 removed lines

@@ -25,14 +25,14 @@ 
     {
         $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)) {
+        if (class_exists($className)) {
             $this->controller_class = new $className();
-            $this->module = cb()->find("cb_modules",["controller"=>$this->controller]);
-            $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;
+            $this->module = cb()->find("cb_modules", ["controller"=>$this->controller]);
+            $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;
             $this->privilege = DB::table("cb_role_privileges")
                 ->where("cb_menus_id", $this->menu->id)
                 ->where("cb_roles_id", cb()->session()->roleId())
@@ -49,135 +49,135 @@ 
     }
 
     public function getData($key) {
-        return ($this->controller_class)?$this->controller_class->getData($key)?:cb()->getAppName():null;
+        return ($this->controller_class) ? $this->controller_class->getData($key) ?: cb()->getAppName() : null;
     }
 
     /**
      * @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;
         }
     }

Braces +37 added lines, -22 removed lines

@@ -76,45 +76,60 @@ 
 
     public function canBrowse() {
         if($this->privilege) {
-            if($this->privilege->can_browse) return true;
-            else return false;
-        }else{
+            if($this->privilege->can_browse) {
+                return true;
+            } else {
+                return false;
+            }
+        } else{
             return true;
         }
     }
 
     public function canCreate() {
         if($this->privilege) {
-            if($this->privilege->can_create) return true;
-            else return false;
-        }else{
+            if($this->privilege->can_create) {
+                return true;
+            } else {
+                return false;
+            }
+        } else{
             return true;
         }
     }
 
     public function canRead() {
         if($this->privilege) {
-            if($this->privilege->can_read) return true;
-            else return false;
-        }else{
+            if($this->privilege->can_read) {
+                return true;
+            } else {
+                return false;
+            }
+        } else{
             return true;
         }
     }
 
     public function canUpdate() {
         if($this->privilege) {
-            if($this->privilege->can_update) return true;
-            else return false;
-        }else{
+            if($this->privilege->can_update) {
+                return true;
+            } else {
+                return false;
+            }
+        } else{
             return true;
         }
     }
 
     public function canDelete() {
         if($this->privilege) {
-            if($this->privilege->can_delete) return true;
-            else return false;
-        }else{
+            if($this->privilege->can_delete) {
+                return true;
+            } else {
+                return false;
+            }
+        } else{
             return true;
         }
     }
@@ -123,7 +138,7 @@ 
     {
         if($this->controller_class && method_exists($this->controller_class, 'getAdd')) {
             return action($this->controller.'@getAdd');
-        }else{
+        } else{
             return null;
         }
     }
@@ -132,7 +147,7 @@ 
     {
         if($this->controller_class && method_exists($this->controller_class, 'postAddSave')) {
             return action($this->controller.'@postAddSave');
-        }else{
+        } else{
             return null;
         }
     }
@@ -141,7 +156,7 @@ 
     {
         if($this->controller_class && method_exists($this->controller_class, 'getEdit')) {
             return action($this->controller.'@getEdit',['id'=>$id]);
-        }else{
+        } else{
             return null;
         }
     }
@@ -150,7 +165,7 @@ 
     {
         if(method_exists($this->controller_class, 'postEditSave')) {
             return action($this->controller.'@postEditSave',['id'=>$id]);
-        }else{
+        } else{
             return null;
         }
     }
@@ -159,7 +174,7 @@ 
     {
         if($this->controller_class && method_exists($this->controller_class, 'getDetail')) {
             return action($this->controller.'@getDetail',['id'=>$id]);
-        }else{
+        } else{
             return null;
         }
     }
@@ -168,7 +183,7 @@ 
     {
         if($this->controller_class && method_exists($this->controller_class, 'getDelete')) {
             return action($this->controller.'@getDelete',['id'=>$id]);
-        }else{
+        } else{
             return null;
         }
     }
@@ -177,7 +192,7 @@ 
     {
         if($this->controller_class && method_exists($this->controller_class, 'getIndex')) {
             return trim(action($this->controller.'@getIndex').'/'.$path,'/');
-        }else{
+        } else{
             return null;
         }
     }

src/helpers/ModuleGenerator.php

Spacing +3 added lines, -3 removed lines

@@ -43,7 +43,7 @@ 
         $template = file_get_contents(__DIR__."/../templates/FooBarController.stub");
 
         //Replace table
-        $template = str_replace("{table}",'"'.$this->table.'"', $template);
+        $template = str_replace("{table}", '"'.$this->table.'"', $template);
 
         //Replace permalink
         $template = str_replace("{permalink}", '"'.$this->table.'"', $template);
@@ -51,7 +51,7 @@ 
         //Replace scaffolding
         $fields = DB::getSchemaBuilder()->getColumnListing($this->table);
         $scaffold = "";
-        foreach($fields as $field) {
+        foreach ($fields as $field) {
             $scaffold .= '$this->addText("'.$field.'");'."\n\t\t";
         }
         $template = str_replace("{scaffolding}", $scaffold, $template);
@@ -66,7 +66,7 @@ 
 
         //Save to database
         $module = [];
-        $module['name'] = ($this->name)?:ucwords(str_replace("_"," ",$this->table));
+        $module['name'] = ($this->name) ?: ucwords(str_replace("_", " ", $this->table));
         $module['icon'] = $this->icon;
         $module['table_name'] = $this->table;
         $module['controller'] = $filename;

src/helpers/SidebarMenus.php

Spacing +16 added lines, -16 removed lines

@@ -22,7 +22,7 @@ 
     private function assignToModel($menu) {
         $model = new SidebarModel();
         $model->setId($menu->id);
-        if($menu->type == "url") {
+        if ($menu->type == "url") {
             $model->setUrl($menu->path);
             $model->setIcon($menu->icon);
             $model->setName($menu->name);
@@ -47,22 +47,22 @@ 
 
     private function loadData($parent_id = null) {
         $menus = DB::table("cb_menus");
-        if($parent_id) {
-            $menus->where("parent_cb_menus_id",$parent_id);
-        }else{
+        if ($parent_id) {
+            $menus->where("parent_cb_menus_id", $parent_id);
+        } else {
             $menus->whereNull("parent_cb_menus_id");
         }
-        return $menus->orderBy("sort_number","asc")->get();
+        return $menus->orderBy("sort_number", "asc")->get();
     }
 
     private function rolePrivilege($cb_roles_id, $cb_menus_id) {
-        return cb()->find("cb_role_privileges",['cb_roles_id'=>$cb_roles_id,'cb_menus_id'=>$cb_menus_id]);
+        return cb()->find("cb_role_privileges", ['cb_roles_id'=>$cb_roles_id, 'cb_menus_id'=>$cb_menus_id]);
     }
 
-    private function checkPrivilege($roles_id,$menu) {
-        if($roles_id) {
+    private function checkPrivilege($roles_id, $menu) {
+        if ($roles_id) {
             $privilege = $this->rolePrivilege($roles_id, $menu->id);
-            if(!$privilege->can_browse) {
+            if (!$privilege->can_browse) {
                 return false;
             }
         }
@@ -71,26 +71,26 @@ 
     }
 
     public function all($withPrivilege = true) {
-        $roles_id = ($withPrivilege)?cb()->session()->roleId():null;
+        $roles_id = ($withPrivilege) ?cb()->session()->roleId() : null;
         $menus = $this->loadData();
         $result = [];
-        foreach($menus as $menu) {
+        foreach ($menus as $menu) {
 
-            if($withPrivilege && !$this->checkPrivilege($roles_id, $menu)) continue;
+            if ($withPrivilege && !$this->checkPrivilege($roles_id, $menu)) continue;
 
             $sidebarModel = $this->assignToModel($menu);
-            if($menus2 = $this->loadData($menu->id)) {
+            if ($menus2 = $this->loadData($menu->id)) {
                 $sub1 = [];
                 foreach ($menus2 as $menu2) {
 
-                    if($withPrivilege && !$this->checkPrivilege($roles_id, $menu2)) continue;
+                    if ($withPrivilege && !$this->checkPrivilege($roles_id, $menu2)) continue;
 
                     $sidebarModel2 = $this->assignToModel($menu2);
-                    if($menus3 = $this->loadData($menu2->id)) {
+                    if ($menus3 = $this->loadData($menu2->id)) {
                         $sub2 = [];
                         foreach ($menus3 as $menu3) {
 
-                            if($withPrivilege && !$this->checkPrivilege($roles_id, $menu3)) continue;
+                            if ($withPrivilege && !$this->checkPrivilege($roles_id, $menu3)) continue;
 
                             $sidebarModel3 = $this->assignToModel($menu3);
                             $sub2[] = $sidebarModel3;

Braces +12 added lines, -6 removed lines

@@ -27,7 +27,7 @@ 
             $model->setIcon($menu->icon);
             $model->setName($menu->name);
             $model->setBasepath(basename($model->getUrl()));
-        }elseif ($menu->type == "module") {
+        } elseif ($menu->type == "module") {
             $module = cb()->find("cb_modules", $menu->cb_modules_id);
             $className = '\App\Http\Controllers\\'.$module->controller;
             $controllerClass = new $className();
@@ -36,7 +36,7 @@ 
             $model->setIcon($module->icon);
             $model->setName($module->name);
             $model->setBasepath(basename($model->getUrl()));
-        }elseif ($menu->type == "path") {
+        } elseif ($menu->type == "path") {
             $model->setUrl(cb()->getAdminUrl($menu->path));
             $model->setIcon($menu->icon);
             $model->setName($menu->name);
@@ -49,7 +49,7 @@ 
         $menus = DB::table("cb_menus");
         if($parent_id) {
             $menus->where("parent_cb_menus_id",$parent_id);
-        }else{
+        } else{
             $menus->whereNull("parent_cb_menus_id");
         }
         return $menus->orderBy("sort_number","asc")->get();
@@ -76,21 +76,27 @@ 
         $result = [];
         foreach($menus as $menu) {
 
-            if($withPrivilege && !$this->checkPrivilege($roles_id, $menu)) continue;
+            if($withPrivilege && !$this->checkPrivilege($roles_id, $menu)) {
+                continue;
+            }
 
             $sidebarModel = $this->assignToModel($menu);
             if($menus2 = $this->loadData($menu->id)) {
                 $sub1 = [];
                 foreach ($menus2 as $menu2) {
 
-                    if($withPrivilege && !$this->checkPrivilege($roles_id, $menu2)) continue;
+                    if($withPrivilege && !$this->checkPrivilege($roles_id, $menu2)) {
+                        continue;
+                    }
 
                     $sidebarModel2 = $this->assignToModel($menu2);
                     if($menus3 = $this->loadData($menu2->id)) {
                         $sub2 = [];
                         foreach ($menus3 as $menu3) {
 
-                            if($withPrivilege && !$this->checkPrivilege($roles_id, $menu3)) continue;
+                            if($withPrivilege && !$this->checkPrivilege($roles_id, $menu3)) {
+                                continue;
+                            }
 
                             $sidebarModel3 = $this->assignToModel($menu3);
                             $sub2[] = $sidebarModel3;

src/types/datetime/Hook.php

Spacing +2 added lines, -2 removed lines

@@ -20,9 +20,9 @@
      */
     public function indexRender($row, $column)
     {
-        if($column->getFormat()) {
+        if ($column->getFormat()) {
             return date($column->getFormat(), strtotime($row->{$column->getField()}));
-        }else{
+        } else {
             return $row->{$column->getField()};
         }
     }

Braces +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
     {
         if($column->getFormat()) {
             return date($column->getFormat(), strtotime($row->{$column->getField()}));
-        }else{
+        } else{
             return $row->{$column->getField()};
         }
     }

src/types/date/Hook.php

Spacing +2 added lines, -2 removed lines

@@ -19,9 +19,9 @@
      */
     public function indexRender($row, $column)
     {
-        if($column->getFormat()) {
+        if ($column->getFormat()) {
             return date($column->getFormat(), strtotime($row->{$column->getField()}));
-        }else{
+        } else {
             return $row->{$column->getField()};
         }
     }

Braces +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
     {
         if($column->getFormat()) {
             return date($column->getFormat(), strtotime($row->{$column->getField()}));
-        }else{
+        } else{
             return $row->{$column->getField()};
         }
     }