crocodic-studio / crudbooster

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;

Spacing +44 added lines, -44 removed lines

@@ -24,7 +24,7 @@ 
     }
 
     public function getRoleByName($roleName) {
-        return $this->find("cb_roles",['name'=>$roleName]);
+        return $this->find("cb_roles", ['name'=>$roleName]);
     }
 
     public function fcm() {
@@ -40,7 +40,7 @@ 
     }
 
     public function getDeveloperPath($path = null) {
-        $path = ($path)?"/".trim($path,"/"):null;
+        $path = ($path) ? "/".trim($path, "/") : null;
         return "developer/".getSetting("developer_path").$path;
     }
 
@@ -61,16 +61,16 @@ 
     }
 
     public function getAdminPath() {
-        return getSetting("ADMIN_PATH","admin");
+        return getSetting("ADMIN_PATH", "admin");
     }
 
     public function getAdminUrl($path = null) {
-        $path = ($path)?"/".trim($path,"/"):null;
+        $path = ($path) ? "/".trim($path, "/") : null;
         return url($this->getAdminPath()).$path;
     }
 
     public function getAppName() {
-        return getSetting("APP_NAME", env("APP_NAME","CRUDBOOSTER"));
+        return getSetting("APP_NAME", env("APP_NAME", "CRUDBOOSTER"));
     }
 
     /**
@@ -84,16 +84,16 @@ 
      */
     private function uploadFileProcess($filename, $extension, $file, $encrypt = true, $resize_width = null, $resize_height = null)
     {
-        if(in_array($extension,cbConfig("UPLOAD_FILE_EXTENSION_ALLOWED"))) {
+        if (in_array($extension, cbConfig("UPLOAD_FILE_EXTENSION_ALLOWED"))) {
             $file_path = cbConfig("UPLOAD_PATH_FORMAT");
-            $file_path = str_replace("{Y}",date('Y'), $file_path);
+            $file_path = str_replace("{Y}", date('Y'), $file_path);
             $file_path = str_replace("{m}", date('m'), $file_path);
             $file_path = str_replace("{d}", date("d"), $file_path);
 
             //Create Directory Base On Template
             Storage::makeDirectory($file_path);
-            Storage::put($file_path."/index.html"," ","public");
-            Storage::put($file_path."/.gitignore","!.gitignore","public");
+            Storage::put($file_path."/index.html", " ", "public");
+            Storage::put($file_path."/.gitignore", "!.gitignore", "public");
 
             if ($encrypt == true) {
                 $filename = md5(strRandom(5)).'.'.$extension;
@@ -101,17 +101,17 @@ 
                 $filename = slug($filename, '_').'.'.$extension;
             }
 
-            if($resize_width || $resize_height) {
+            if ($resize_width || $resize_height) {
                 $this->resizeImage($file, $file_path.'/'.$filename, $resize_width, $resize_height);
                 return $file_path.'/'.$filename;
-            }else{
+            } else {
                 if (Storage::putFileAs($file_path, $file, $filename, 'public')) {
                     return $file_path.'/'.$filename;
                 } else {
                     throw new \Exception("Something went wrong, file can't upload!");
                 }
             }
-        }else{
+        } else {
             throw new \Exception("The file format is not allowed!");
         }
     }
@@ -127,16 +127,16 @@ 
     {
         $fileData = base64_decode($base64_value);
         $mime_type = finfo_buffer(finfo_open(), $fileData, FILEINFO_MIME_TYPE);
-        if($mime_type) {
-            if($mime_type = explode('/', $mime_type)) {
+        if ($mime_type) {
+            if ($mime_type = explode('/', $mime_type)) {
                 $ext = $mime_type[1];
-                if($filename && $ext) {
+                if ($filename && $ext) {
                     return $this->uploadFileProcess($filename, $ext, $fileData, $encrypt, $resize_width, $resize_height);
                 }
-            }else {
+            } else {
                 throw new \Exception("Mime type not found");
             }
-        }else{
+        } else {
             throw new \Exception("Mime type not found");
         }
     }
@@ -156,7 +156,7 @@ 
             $filename = $file->getClientOriginalName();
             $ext = strtolower($file->getClientOriginalExtension());
 
-            if($filename && $ext) {
+            if ($filename && $ext) {
                 return $this->uploadFileProcess($filename, $ext, $file, $encrypt, $resize_width, $resize_height);
             }
 
@@ -191,29 +191,29 @@ 
             if ($resize_width && $resize_height) {
                 $img->fit($resize_width, $resize_height);
 
-            } elseif ($resize_width && ! $resize_height) {
+            } elseif ($resize_width && !$resize_height) {
 
-                $img->resize($resize_width, null, function ($constraint) {
+                $img->resize($resize_width, null, function($constraint) {
                     $constraint->aspectRatio();
                 });
 
-            } elseif (! $resize_width && $resize_height) {
+            } elseif (!$resize_width && $resize_height) {
 
-                $img->resize(null, $resize_height, function ($constraint) {
+                $img->resize(null, $resize_height, function($constraint) {
                     $constraint->aspectRatio();
                 });
 
             } else {
 
                 if ($img->width() > cbConfig("DEFAULT_IMAGE_MAX_WIDTH_RES")) {
-                    $img->resize(cbConfig("DEFAULT_IMAGE_MAX_WIDTH_RES"), null, function ($constraint) {
+                    $img->resize(cbConfig("DEFAULT_IMAGE_MAX_WIDTH_RES"), null, function($constraint) {
                         $constraint->aspectRatio();
                     });
                 }
             }
 
             Storage::put($fullFilePath, $img, 'public');
-        }else{
+        } else {
             throw new \Exception("The file format is not allowed!");
         }
     }
@@ -237,7 +237,7 @@ 
     {
         if (is_array($id)) {
             $idHash = md5("find".$table.serialize($id));
-            if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
+            if (miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
 
             $first = DB::table($table);
             foreach ($id as $k => $v) {
@@ -245,15 +245,15 @@ 
             }
 
             $data = $first->first();
-            miscellanousSingleton()->setData($idHash,$data);
+            miscellanousSingleton()->setData($idHash, $data);
             return $data;
         } else {
             $idHash = md5("find".$table.$id);
-            if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
+            if (miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
 
             $pk = $this->pk($table);
             $data = DB::table($table)->where($pk, $id)->first();
-            miscellanousSingleton()->setData($idHash,$data);
+            miscellanousSingleton()->setData($idHash, $data);
             return $data;
         }
     }
@@ -268,30 +268,30 @@ 
         $data = [];
         $idHash = null;
 
-        if(is_array($conditionOrCallback)) {
+        if (is_array($conditionOrCallback)) {
             $idHash = md5("findAll".$table.serialize($conditionOrCallback));
-            if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
+            if (miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
 
             $data = DB::table($table)->where($conditionOrCallback)->get();
         } elseif (is_callable($conditionOrCallback)) {
             $idHash = "findAll".$table.spl_object_hash($conditionOrCallback);
-            if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
+            if (miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
 
             $data = DB::table($table);
             $data = call_user_func($conditionOrCallback, $data);
             $data = $data->get();
         } else {
             $idHash = md5("findAll".$table.$conditionOrCallback);
-            if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
+            if (miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
 
             $data = DB::table($table);
-            if($conditionOrCallback) {
+            if ($conditionOrCallback) {
                 $data = $data->whereRaw($conditionOrCallback);
             }
             $data = $data->get();
         }
 
-        if($idHash && $data) {
+        if ($idHash && $data) {
             miscellanousSingleton()->setData($idHash, $data);
         }
 
@@ -301,7 +301,7 @@ 
     public function listAllTable()
     {
         $idHash = md5("listAllTable");
-        if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
+        if (miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
         $data = DB::connection()->getDoctrineSchemaManager()->listTableNames();
         miscellanousSingleton()->setData($idHash, $data);
         return $data;
@@ -310,7 +310,7 @@ 
     public function listAllColumns($table)
     {
         $idHash = md5("listAllColumns".$table);
-        if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
+        if (miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash);
         $data = Schema::getColumnListing($table);
         miscellanousSingleton()->setData($idHash, $data);
         return $data;
@@ -378,7 +378,7 @@ 
         $validator = Validator::make($input_arr, $rules, $messages);
         if ($validator->fails()) {
             $message = $validator->errors()->all();
-            throw new CBValidationException(implode("; ",$message));
+            throw new CBValidationException(implode("; ", $message));
         }
     }
 
@@ -390,7 +390,7 @@ 
     public function findPrimaryKey($table)
     {
         $pk = DB::getDoctrineSchemaManager()->listTableDetails($table)->getPrimaryKey();
-        if(!$pk) {
+        if (!$pk) {
             return null;
         }
         return $pk->getColumns()[0];
@@ -439,7 +439,7 @@ 
             $string_parameters_array = explode('&', $string_parameters);
             foreach ($string_parameters_array as $s) {
                 $part = explode('=', $s);
-                if(isset($part[0]) && isset($part[1])) {
+                if (isset($part[0]) && isset($part[1])) {
                     $name = htmlspecialchars(urldecode($part[0]));
                     $name = strip_tags($name);
                     $value = htmlspecialchars(urldecode($part[1]));
@@ -456,16 +456,16 @@ 
 
 
     public function routeGet($prefix, $controller) {
-        $alias = str_replace("@"," ", $controller);
+        $alias = str_replace("@", " ", $controller);
         $alias = ucwords($alias);
-        $alias = str_replace(" ","",$alias);
+        $alias = str_replace(" ", "", $alias);
         Route::get($prefix, ['uses' => $controller, 'as' => $alias]);
     }
 
     public function routePost($prefix, $controller) {
-        $alias = str_replace("@"," ", $controller);
+        $alias = str_replace("@", " ", $controller);
         $alias = ucwords($alias);
-        $alias = str_replace(" ","",$alias);
+        $alias = str_replace(" ", "", $alias);
         Route::post($prefix, ['uses' => $controller, 'as' => $alias]);
     }
 
@@ -498,7 +498,7 @@ 
 
         $prefix = trim($prefix, '/').'/';
 
-        if(substr($controller,0,1) != "\\") {
+        if (substr($controller, 0, 1) != "\\") {
             $controller = "\App\Http\Controllers\\".$controller;
         }
 

src/helpers/CacheHelper.php

Spacing +6 added lines, -6 removed lines

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

src/controllers/DeveloperSecurityController.php

Spacing +7 added lines, -7 removed lines

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

src/configs/crudbooster.php

Spacing +3 added lines, -3 removed lines

@@ -20,9 +20,9 @@ 
     /*
      * For security reason we have limit the upload file formats bellow
      */
-    'UPLOAD_FILE_EXTENSION_ALLOWED' => ['jpg','jpeg','png','gif','pdf','xls','xlsx','doc','docx','txt','zip','rar','rtf'],
+    'UPLOAD_FILE_EXTENSION_ALLOWED' => ['jpg', 'jpeg', 'png', 'gif', 'pdf', 'xls', 'xlsx', 'doc', 'docx', 'txt', 'zip', 'rar', 'rtf'],
 
-    'UPLOAD_IMAGE_EXTENSION_ALLOWED' => ['jpg','jpeg','png','gif'],
+    'UPLOAD_IMAGE_EXTENSION_ALLOWED' => ['jpg', 'jpeg', 'png', 'gif'],
 
     /*
      * Override Local FileSystem From Storage To Another
@@ -58,5 +58,5 @@ 
      * You can define in this array what the tables you want to include in "php artisan crudbooster:data_migration"
      * The default is all cb_ prefix will be include in data migration
      */
-    'ADDITIONAL_DATA_MIGRATION'=>['users','migrations']
+    'ADDITIONAL_DATA_MIGRATION'=>['users', 'migrations']
 ];
\ No newline at end of file

src/controllers/DeveloperThemesController.php

Spacing +5 added lines, -5 removed lines

@@ -20,21 +20,21 @@
         $themes = (new Plugin())->getAllThemes();
         $data = [];
         $data['result'] = $themes;
-        return view($this->view.".index",$data);
+        return view($this->view.".index", $data);
     }
 
     public function getActiveTheme($theme_path) {
         $theme_path = base64_decode($theme_path);
         putSetting("theme_path", $theme_path);
-        return cb()->redirectBack("Theme has been activated!","success");
+        return cb()->redirectBack("Theme has been activated!", "success");
     }
 
     public function postSaveConfig() {
 
-        foreach(request()->except("_token") as $key=>$val) {
-            putSetting( $key,  $val);
+        foreach (request()->except("_token") as $key=>$val) {
+            putSetting($key, $val);
         }
 
-        return cb()->redirectBack("Theme config has been saved!","success");
+        return cb()->redirectBack("Theme config has been saved!", "success");
     }
 }
\ No newline at end of file

src/middlewares/CBBackend.php

Spacing +2 added lines, -2 removed lines

@@ -18,8 +18,8 @@
      */
     public function handle($request, Closure $next)
     {
-        if(auth()->guest()) {
-            return cb()->redirect(cb()->getLoginUrl("login"),cbLang('please_login_for_first'),'warning');
+        if (auth()->guest()) {
+            return cb()->redirect(cb()->getLoginUrl("login"), cbLang('please_login_for_first'), 'warning');
         }
 
         (new CBHook())->beforeBackendMiddleware($request);

src/helpers/SidebarMenus.php

Spacing +20 added lines, -20 removed lines

@@ -23,7 +23,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);
@@ -46,9 +46,9 @@ 
             $model->setBasepath(config('crudbooster.ADMIN_PATH').'/'.basename($model->getUrl()));
         }
 
-        if(request()->is($model->getBasepath()."*")) {
+        if (request()->is($model->getBasepath()."*")) {
             $model->setIsActive(true);
-        }else{
+        } else {
             $model->setIsActive(false);
         }
 
@@ -57,22 +57,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 && !$privilege->can_browse) {
+            if ($privilege && !$privilege->can_browse) {
                 return false;
             }
         }
@@ -81,30 +81,30 @@ 
     }
 
     public function all($withPrivilege = true) {
-        $roles_id = ($withPrivilege)?cb()->session()->roleId():null;
+        $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 = [];
-        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);
 
@@ -119,7 +119,7 @@ 
             $result[] = $sidebarModel;
         }
 
-        CacheHelper::putInGroup($idHash, $result,"sidebar_menu", 3600);
+        CacheHelper::putInGroup($idHash, $result, "sidebar_menu", 3600);
         return $result;
     }
 

Braces +16 added lines, -8 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();
@@ -38,7 +38,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->setPermalink($menu->path);
             $model->setIcon($menu->icon);
@@ -48,7 +48,7 @@ 
 
         if(request()->is($model->getBasepath()."*")) {
             $model->setIsActive(true);
-        }else{
+        } else{
             $model->setIsActive(false);
         }
 
@@ -59,7 +59,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();
@@ -83,20 +83,26 @@ 
     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 = [];
         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);
 
@@ -104,7 +110,9 @@ 
                         $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);
 

src/types/time/Hook.php

Spacing +3 added lines, -3 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()};
         }
     }
@@ -36,7 +36,7 @@ 
     {
         $start = sanitizeXSS($value['start']);
         $end = sanitizeXSS($value['end']);
-        if($start && $end) {
+        if ($start && $end) {
             $start = date("H:i:s", strtotime($start));
             $end = date("H:i:s", strtotime($end));
             $query->whereBetween($column->getFilterColumn(), [$start, $end]);

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/number/Hook.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
     {
         $start = sanitizeXSS($value['start']);
         $end = sanitizeXSS($value['end']);
-        if($start && $end) {
+        if ($start && $end) {
             $query->whereBetween($column->getFilterColumn(), [$start, $end]);
         }
         return $query;