crocodic-studio / crudbooster

src/types/datetime/Hook.php

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/radio/Radio.php

Braces +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
         $data = DB::table($table);
         if($SQLCondition && is_callable($SQLCondition)) {
             $data = call_user_func($SQLCondition, $data);
-        }elseif ($SQLCondition && is_string($SQLCondition)) {
+        } elseif ($SQLCondition && is_string($SQLCondition)) {
             $data->whereRaw($SQLCondition);
         }
         $data = $data->get();

src/types/select/Hook.php

Braces +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
         if($column->getOptionsFromTable()) {
             $option = $column->getOptionsFromTable();
             return $row->{ $option['table'].'_'.$option['display_field'] };
-        }else{
+        } else{
             $option = $column->getOptions();
             $key = $row->{ $column->getField() };
             return @$option[ $key ];

src/types/checkbox/Checkbox.php

Braces +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
         $data = DB::table($table);
         if($SQLCondition && is_callable($SQLCondition)) {
             $data = call_user_func($SQLCondition, $data);
-        }elseif ($SQLCondition && is_string($SQLCondition)) {
+        } elseif ($SQLCondition && is_string($SQLCondition)) {
             $data->whereRaw($SQLCondition);
         }
         $data = $data->get();

src/types/select/Select.php

Braces +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
         $data = DB::table($table);
         if($SQLCondition && is_callable($SQLCondition)) {
             $data = call_user_func($SQLCondition, $data);
-        }elseif ($SQLCondition && is_string($SQLCondition)) {
+        } elseif ($SQLCondition && is_string($SQLCondition)) {
             $data->whereRaw($SQLCondition);
         }
         $data = $data->get();

src/types/date/Hook.php

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/helpers/UserSession.php

Braces +5 added lines, -2 removed lines

@@ -28,8 +28,11 @@
     {
         $user = $this->user();
         $role = cb()->find("cb_roles", $user->cb_roles_id);
-        if($role) return $role->name;
-        else return null;
+        if($role) {
+            return $role->name;
+        } else {
+            return null;
+        }
     }
 
     public function roleId()

src/helpers/SidebarMenus.php

Braces +19 added lines, -9 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(config('crudbooster.ADMIN_PATH').'/'.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);
@@ -45,7 +45,7 @@ 
 
         if(request()->is($model->getBasepath()."*")) {
             $model->setIsActive(true);
-        }else{
+        } else{
             $model->setIsActive(false);
         }
 
@@ -56,7 +56,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();
@@ -84,26 +84,36 @@ 
         $menus_active = false;
         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($sidebarModel->getisActive()) $menus_active = true;
+            if($sidebarModel->getisActive()) {
+                $menus_active = true;
+            }
             if($menus2 = $this->loadData($menu->id)) {
                 $sub1 = [];
                 $menus2_active = false;
                 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($sidebarModel2->getisActive()) $menus2_active = true;
+                    if($sidebarModel2->getisActive()) {
+                        $menus2_active = true;
+                    }
 
                     if($menus3 = $this->loadData($menu2->id)) {
                         $sub2 = [];
                         $menus3_active = false;
                         foreach ($menus3 as $menu3) {
 
-                            if($withPrivilege && !$this->checkPrivilege($roles_id, $menu3)) continue;
+                            if($withPrivilege && !$this->checkPrivilege($roles_id, $menu3)) {
+                                continue;
+                            }
 
                             $sidebarModel3 = $this->assignToModel($menu3);
 

src/controllers/CBController.php

Braces +33 added lines, -15 removed lines

@@ -30,10 +30,10 @@ 
             $key = $parameters[0];
             if(isset($this->data[$key])) {
                 return $this->data[$key];
-            }else{
+            } else{
                 return null;
             }
-        }else{
+        } else{
             return null;
         }
     }
@@ -74,7 +74,7 @@ 
             /** @var ColumnModel $column */
             if(strpos($column->getField(),".") === false) {
                 $query->addSelect($this->data['table'].'.'.$column->getField());
-            }else{
+            } else{
                 $query->addSelect($column->getField());
             }
 
@@ -85,7 +85,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
@@ -94,7 +94,7 @@ 
                     {
                         if(strpos($column->getField(),".") === false) {
                             $field = $this->data['table'].'.'.$column->getField();
-                        }else{
+                        } else{
                             $field = $column->getField();
                         }
                         $where->orWhere($field, 'like', '%'.request('q').'%');
@@ -113,7 +113,7 @@ 
             if(in_array(request('order_by'),columnSingleton()->getColumnNameOnly())) {
                 $query->orderBy(request('order_by'), request('order_sort'));
             }
-        }else{
+        } else{
             $query->orderBy($this->data['table'].'.'.cb()->findPrimaryKey($this->data['table']), "desc");
         }
 
@@ -122,7 +122,9 @@ 
 
     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(20);
@@ -149,7 +151,9 @@ 
 
     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';
@@ -159,7 +163,9 @@ 
 
     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();
@@ -193,7 +199,9 @@ 
 
     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();
@@ -204,7 +212,9 @@ 
 
     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();
@@ -244,7 +254,9 @@ 
 
     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'])) {
             call_user_func($this->data['hook_before_delete'], $id);
@@ -271,7 +283,9 @@ 
 
     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();
@@ -281,7 +295,9 @@ 
 
     public function postUploadImage()
     {
-        if(auth()->guest()) return redirect(cb()->getLoginUrl());
+        if(auth()->guest()) {
+            return redirect(cb()->getLoginUrl());
+        }
 
         $file = null;
         try {
@@ -308,7 +324,9 @@ 
 
     public function postUploadFile()
     {
-        if(auth()->guest()) return redirect(cb()->getLoginUrl());
+        if(auth()->guest()) {
+            return redirect(cb()->getLoginUrl());
+        }
 
         $file = null;
         try {