crocodic-studio / crudbooster

src/helpers/Helper.php

Braces +20 added lines, -15 removed lines

@@ -48,7 +48,9 @@ 
         }
 
         $str = substr($str, 0, -1);
-        if (!file_put_contents($envFile, $str)) return false;
+        if (!file_put_contents($envFile, $str)) {
+            return false;
+        }
         return true;
     }
 }
@@ -251,7 +253,7 @@ 
             $settings = file_get_contents(storage_path('.cbconfig'));
             $settings = decrypt($settings);
             $settings = unserialize($settings);
-        }else{
+        } else{
             $settings = [];
         }
 
@@ -276,14 +278,14 @@ 
             $settings = file_get_contents(storage_path('.cbconfig'));
             $settings = decrypt($settings);
             $settings = unserialize($settings);
-        }else{
+        } else{
             $settings = [];
         }
 
         if(isset($settings[$key])) {
             \Illuminate\Support\Facades\Cache::forever("setting_".$key, $settings[$key]);
             return $settings[$key]?:$default;
-        }else{
+        } else{
             return $default;
         }
     }
@@ -369,7 +371,7 @@ 
         $url = request($name);
         if(filter_var($url, FILTER_VALIDATE_URL)) {
             return $url;
-        }else{
+        } else{
             return request()->url();
         }
     }
@@ -381,14 +383,14 @@ 
             $response = request($name);
             if(is_string($response)) {
                 $response = sanitizeXSS($response);
-            }elseif (is_array($response)) {
+            } elseif (is_array($response)) {
                 array_walk_recursive($response, function(&$response) {
                     $response = sanitizeXSS($response);
                 });
             }
 
             return $response;
-        }else{
+        } else{
             return Request::get($name);
         }
     }
@@ -398,11 +400,13 @@ 
     function min_var_export($input) {
         if(is_array($input)) {
             $buffer = [];
-            foreach($input as $key => $value)
-                $buffer[] = var_export($key, true)."=>".min_var_export($value);
+            foreach($input as $key => $value) {
+                            $buffer[] = var_export($key, true)."=>".min_var_export($value);
+            }
             return "[".implode(",",$buffer)."]";
-        } else
-            return var_export($input, true);
+        } else {
+                    return var_export($input, true);
+        }
     }
 }
 
@@ -415,10 +419,11 @@ 
 	     $objects = scandir($dir); 
 	     foreach ($objects as $object) { 
 	       if ($object != "." && $object != "..") { 
-	         if (is_dir($dir."/".$object))
-	           rrmdir($dir."/".$object);
-	         else
-	           unlink($dir."/".$object); 
+	         if (is_dir($dir."/".$object)) {
+	         	           rrmdir($dir."/".$object);
+	         } else {
+	         	           unlink($dir."/".$object);
+	         }
 	       } 
 	     }
 	     rmdir($dir); 

src/controllers/SubModuleController.php

Braces +6 added lines, -2 removed lines

@@ -14,8 +14,12 @@
 {
 
     public function getSubModule($subModuleKey) {
-        if(!module()->canBrowse()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
-        if(!verifyReferalUrl()) return cb()->redirect(module()->url(),"It looks like your url is incorrect");
+        if(!module()->canBrowse()) {
+            return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        }
+        if(!verifyReferalUrl()) {
+            return cb()->redirect(module()->url(),"It looks like your url is incorrect");
+        }
 
         if($subModule = Cache::get("subModule".$subModuleKey)) {
             $foreignKey = $subModule['foreignKey'];

src/controllers/CBController.php

Braces +23 added lines, -9 removed lines

@@ -32,7 +32,9 @@ 
 
     public function getIndex()
     {
-        if(!module()->canBrowse()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        if(!module()->canBrowse()) {
+            return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        }
 
         $query = $this->repository();
         $result = $query->paginate( request("limit")?:cbConfig("LIMIT_TABLE_DATA") );
@@ -43,7 +45,9 @@ 
 
     public function getAdd()
     {
-        if(!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        if(!module()->canCreate()) {
+            return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        }
 
         $data = [];
         $data['page_title'] = $this->data['page_title'].' : '.cbLang('add');
@@ -53,7 +57,9 @@ 
 
     public function postAddSave()
     {
-        if(!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        if(!module()->canCreate()) {
+            return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        }
 
         try {
             $this->validation();
@@ -102,7 +108,9 @@ 
 
     public function getEdit($id)
     {
-        if(!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        if(!module()->canUpdate()) {
+            return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        }
 
         $data = [];
         $data['row'] = $this->repository()->where($this->data['table'].'.'.getPrimaryKey($this->data['table']), $id)->first();
@@ -113,7 +121,9 @@ 
 
     public function postEditSave($id)
     {
-        if(!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        if(!module()->canUpdate()) {
+            return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        }
 
         try {
             $this->validation();
@@ -162,7 +172,9 @@ 
 
     public function getDelete($id)
     {
-        if(!module()->canDelete()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        if(!module()->canDelete()) {
+            return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        }
 
         if(isset($this->data['hook_before_delete']) && is_callable($this->data['hook_before_delete'])) {
             call_user_func($this->data['hook_before_delete'], $id);
@@ -189,7 +201,9 @@ 
 
     public function getDetail($id)
     {
-        if(!module()->canRead()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        if(!module()->canRead()) {
+            return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area"));
+        }
 
         $data = [];
         $data['row'] = $this->repository()->where($this->data['table'].'.'.cb()->findPrimaryKey($this->data['table']), $id)->first();
@@ -212,10 +226,10 @@ 
             $key = $parameters[0];
             if(isset($this->data[$key])) {
                 return $this->data[$key];
-            }else{
+            } else{
                 return null;
             }
-        }else{
+        } else{
             return null;
         }
     }

src/controllers/traits/ControllerSetting.php

Indentation +15 added lines, -15 removed lines

@@ -202,13 +202,13 @@ 
         $parentPath = $this->getData("permalink");
         $parentTitle = $this->getData("page_title");
         $this->addActionButton($label,function($row) use ($label, $controllerName, $foreignKey, $additionalInfo, $parentPath, $parentTitle) {
-           $actionParameters = [
-               "label"=>$label,
-               "foreignKey"=>$foreignKey,
-               "foreignValue"=>$row->primary_key,
-               "parentPath"=>$parentPath,
-               "parentTitle"=>$parentTitle
-           ];
+            $actionParameters = [
+                "label"=>$label,
+                "foreignKey"=>$foreignKey,
+                "foreignValue"=>$row->primary_key,
+                "parentPath"=>$parentPath,
+                "parentTitle"=>$parentTitle
+            ];
 
             if(isset($additionalInfo) && is_callable($additionalInfo)) {
                 $additionalInfo = call_user_func($additionalInfo, $row);
@@ -217,15 +217,15 @@ 
                 }
             }
 
-           $actionHash = md5(serialize($actionParameters));
-           $actionHashToken = Cache::get("subModule".$actionHash);
-           if(!$actionHashToken) {
-               $actionHashToken = Str::random(5);
-               Cache::forever("subModule".$actionHash, $actionHashToken);
-               Cache::forever("subModule".$actionHashToken, $actionParameters);
-           }
+            $actionHash = md5(serialize($actionParameters));
+            $actionHashToken = Cache::get("subModule".$actionHash);
+            if(!$actionHashToken) {
+                $actionHashToken = Str::random(5);
+                Cache::forever("subModule".$actionHash, $actionHashToken);
+                Cache::forever("subModule".$actionHashToken, $actionParameters);
+            }
 
-           return action(class_basename($controllerName)."@getSubModule",['subModuleKey'=>$actionHashToken])."?ref=".makeReferalUrl($parentTitle);
+            return action(class_basename($controllerName)."@getSubModule",['subModuleKey'=>$actionHashToken])."?ref=".makeReferalUrl($parentTitle);
         }, $condition, $font, $color);
 
     }

src/controllers/traits/Query.php

Braces +4 added lines, -4 removed lines

@@ -47,7 +47,7 @@ 
                     if(SchemaHelper::hasColumn($this->data['table'], $column->getField())) {
                         $query->addSelect($this->data['table'].'.'.$column->getField());
                     }
-                }else{
+                } else{
                     $query->addSelect($column->getField());
                 }
             }
@@ -59,7 +59,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
@@ -68,7 +68,7 @@ 
                     {
                         if(strpos($column->getField(),".") === false) {
                             $field = $this->data['table'].'.'.$column->getField();
-                        }else{
+                        } else{
                             $field = $column->getField();
                         }
                         $where->orWhere($field, 'like', '%'.request('q').'%');
@@ -93,7 +93,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");
         }
 

src/helpers/SidebarMenus.php

Braces +22 added lines, -10 removed lines

@@ -28,7 +28,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();
@@ -37,7 +37,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);
@@ -46,7 +46,7 @@ 
 
         if(request()->is($model->getBasepath()."*")) {
             $model->setIsActive(true);
-        }else{
+        } else{
             $model->setIsActive(false);
         }
 
@@ -57,7 +57,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();
@@ -81,33 +81,45 @@ 
     public function all($withPrivilege = true) {
         $roles_id = ($withPrivilege)?cb()->session()->roleId():null;
         $idHash = "menuUser".$roles_id.auth()->id();
-        if($menu = CacheHelper::getItemInGroup($idHash,"sidebar_menu")) return $menu;
+        if($menu = CacheHelper::getItemInGroup($idHash,"sidebar_menu")) {
+            return $menu;
+        }
 
         $menus = $this->loadData();
         $result = [];
         $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/helpers/MiscellanousSingleton.php

Braces +5 added lines, -2 removed lines

@@ -23,8 +23,11 @@
 
     public function hasData($key) {
         $data = $this->data;
-        if(isset($data[$key])) return true;
-        else return false;
+        if(isset($data[$key])) {
+            return true;
+        } else {
+            return false;
+        }
     }
 
     public function setData($key, $value): void

src/helpers/CB.php

Braces +26 added lines, -12 removed lines

@@ -100,14 +100,14 @@ 
             if($resize_width || $resize_height) {
                 $this->resizeImage($file, $file_path.'/'.$filename, $resize_width, $resize_height);
                 return $file_path.'/'.$filename;
-            }else{
+            } else{
                 if (Storage::putFileAs($file_path, $file, $filename, 'public')) {
                     return $file_path.'/'.$filename;
                 } else {
                     throw new \Exception("Something went wrong, file can't upload!");
                 }
             }
-        }else{
+        } else{
             throw new \Exception("The file format is not allowed!");
         }
     }
@@ -129,10 +129,10 @@ 
                 if($filename && $ext) {
                     return $this->uploadFileProcess($filename, $ext, $fileData, $encrypt, $resize_width, $resize_height);
                 }
-            }else {
+            } else {
                 throw new \Exception("Mime type not found");
             }
-        }else{
+        } else{
             throw new \Exception("Mime type not found");
         }
     }
@@ -209,7 +209,7 @@ 
             }
 
             Storage::put($fullFilePath, $img, 'public');
-        }else{
+        } else{
             throw new \Exception("The file format is not allowed!");
         }
     }
@@ -233,7 +233,9 @@ 
     {
         if (is_array($id)) {
             $idHash = md5("find".$table.serialize($id));
-            if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
+            if(miscellanousSingleton()->hasData($idHash)) {
+                return miscellanousSingleton()->getData($idHash);
+            }
 
             $first = DB::table($table);
             foreach ($id as $k => $v) {
@@ -245,7 +247,9 @@ 
             return $data;
         } else {
             $idHash = md5("find".$table.$id);
-            if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
+            if(miscellanousSingleton()->hasData($idHash)) {
+                return miscellanousSingleton()->getData($idHash);
+            }
 
             $pk = $this->pk($table);
             $data = DB::table($table)->where($pk, $id)->first();
@@ -266,19 +270,25 @@ 
 
         if(is_array($conditionOrCallback)) {
             $idHash = md5("findAll".$table.serialize($conditionOrCallback));
-            if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
+            if(miscellanousSingleton()->hasData($idHash)) {
+                return miscellanousSingleton()->getData($idHash);
+            }
 
             $data = DB::table($table)->where($conditionOrCallback)->get();
         } elseif (is_callable($conditionOrCallback)) {
             $idHash = "findAll".$table.spl_object_hash($conditionOrCallback);
-            if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
+            if(miscellanousSingleton()->hasData($idHash)) {
+                return miscellanousSingleton()->getData($idHash);
+            }
 
             $data = DB::table($table);
             $data = call_user_func($conditionOrCallback, $data);
             $data = $data->get();
         } else {
             $idHash = md5("findAll".$table.$conditionOrCallback);
-            if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
+            if(miscellanousSingleton()->hasData($idHash)) {
+                return miscellanousSingleton()->getData($idHash);
+            }
 
             $data = DB::table($table);
             if($conditionOrCallback) {
@@ -297,7 +307,9 @@ 
     public function listAllTable()
     {
         $idHash = md5("listAllTable");
-        if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
+        if(miscellanousSingleton()->hasData($idHash)) {
+            return miscellanousSingleton()->getData($idHash);
+        }
         $data = DB::connection()->getDoctrineSchemaManager()->listTableNames();
         miscellanousSingleton()->setData($idHash, $data);
         return $data;
@@ -306,7 +318,9 @@ 
     public function listAllColumns($table)
     {
         $idHash = md5("listAllColumns".$table);
-        if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
+        if(miscellanousSingleton()->hasData($idHash)) {
+            return miscellanousSingleton()->getData($idHash);
+        }
         $data = Schema::getColumnListing($table);
         miscellanousSingleton()->setData($idHash, $data);
         return $data;

src/helpers/Module.php

Indentation +2 added lines, -2 removed lines

@@ -37,8 +37,8 @@
                     $this->menu = (!$this->menu)?cb()->find("cb_menus",["type"=>"path","path"=>request()->segment(2)]):$this->menu;
                     if($this->menu) {
                         $this->privilege = cb()->find("cb_role_privileges",[
-                           "cb_menus_id"=>$this->menu->id,
-                           "cb_roles_id"=>cb()->session()->roleId()
+                            "cb_menus_id"=>$this->menu->id,
+                            "cb_roles_id"=>cb()->session()->roleId()
                         ]);
                     }
                 }