crocodic-studio / crudbooster

src/controllers/SubModuleController.php

Spacing +5 added lines, -5 removed lines

@@ -14,16 +14,16 @@ 
 {
 
     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)) {
+        if ($subModule = Cache::get("subModule".$subModuleKey)) {
             $foreignKey = $subModule['foreignKey'];
             $foreignValue = $subModule['foreignValue'];
 
             $query = $this->repository();
             $query->where($foreignKey, $foreignValue);
-            $result = $query->paginate( request("limit")?:$this->data["limit"] );
+            $result = $query->paginate(request("limit") ?: $this->data["limit"]);
             $data['result'] = $result;
 
             $data['additionalHeaderTitle'] = $subModule['parentTitle'];
@@ -33,7 +33,7 @@ 
             return view("crudbooster::module.index.index", array_merge($data, $this->data));
         }
 
-        return cb()->redirect(module()->url(),"It looks like your url is incorrect");
+        return cb()->redirect(module()->url(), "It looks like your url is incorrect");
     }
 
 }
\ No newline at end of file

src/helpers/Helper.php

Spacing +80 added lines, -80 removed lines

@@ -3,64 +3,64 @@ 
 /*
  * Theme Helper
  */
-if(!function_exists("themeLoginBackground")) {
+if (!function_exists("themeLoginBackground")) {
     function themeLoginBackground() {
         return "crudbooster::layouts.login_background_css";
     }
 }
-if(!function_exists("themeFlashMessageAlert")) {
+if (!function_exists("themeFlashMessageAlert")) {
     function themeFlashMessageAlert() {
         return "crudbooster::layouts.flash_message_alert";
     }
 }
 
-if(!function_exists("themeFlashMessage")) {
+if (!function_exists("themeFlashMessage")) {
     function themeFlashMessage() {
         return "crudbooster::layouts.flash_message";
     }
 }
 
-if(!function_exists("themeAlertMessage")) {
+if (!function_exists("themeAlertMessage")) {
     function themeAlertMessage() {
         return "crudbooster::layouts.alert_message";
     }
 }
 
-if(!function_exists("themeLayoutPageTitleAndButton")) {
+if (!function_exists("themeLayoutPageTitleAndButton")) {
     function themeLayoutPageTitleAndButton() {
         return 'crudbooster::module.index.index_head_buttons';
     }
 }
 
-if(!function_exists("themeLayoutHead")) {
+if (!function_exists("themeLayoutHead")) {
     function themeLayoutHead() {
         return "crudbooster::layouts.head";
     }
 }
-if(!function_exists("themeTitle")) {
+if (!function_exists("themeTitle")) {
     function themeTitle($page_title) {
-        $page_title = isset($page_title)?$page_title:module()->getPageTitle();
-        return (isset($page_title))?cb()->getAppName().': '.strip_tags($page_title):"Admin Area";
+        $page_title = isset($page_title) ? $page_title : module()->getPageTitle();
+        return (isset($page_title)) ?cb()->getAppName().': '.strip_tags($page_title) : "Admin Area";
     }
 }
 
-if(!function_exists("getThemePath")) {
+if (!function_exists("getThemePath")) {
     function getThemePath($path = null) {
-        return getSetting("theme_path", "crudbooster::themes.adminlte").(($path)?".".$path:null);
+        return getSetting("theme_path", "crudbooster::themes.adminlte").(($path) ? ".".$path : null);
     }
 }
 
 // End Theme Helper
 
-if(!function_exists("isConfigCached")) {
+if (!function_exists("isConfigCached")) {
     function isConfigCached()
     {
-        if(env("APP_NAME")=="" || env("APP_NAME")==null) return true;
+        if (env("APP_NAME") == "" || env("APP_NAME") == null) return true;
         else return false;
     }
 }
 
-if(!function_exists("miscellanousSingleton")) {
+if (!function_exists("miscellanousSingleton")) {
     /**
      * @return \crocodicstudio\crudbooster\helpers\MiscellanousSingleton
      */
@@ -69,14 +69,14 @@ 
     }
 }
 
-if(!function_exists("makeReferalUrl")) {
+if (!function_exists("makeReferalUrl")) {
     function makeReferalUrl($name = null) {
         $ref = [];
         $ref['url'] = request()->fullUrl();
         $ref['name'] = $name;
         $md5Hash = md5(serialize($ref));
 
-        if($exist = \Illuminate\Support\Facades\Cache::get("refurl_".$md5Hash)) {
+        if ($exist = \Illuminate\Support\Facades\Cache::get("refurl_".$md5Hash)) {
             return $exist['id'];
         }
 
@@ -88,12 +88,12 @@ 
     }
 }
 
-if(!function_exists("getReferalUrl")) {
+if (!function_exists("getReferalUrl")) {
     function getReferalUrl($key = null) {
-        if(verifyReferalUrl()) {
+        if (verifyReferalUrl()) {
             $md5hash = \Illuminate\Support\Facades\Cache::get("refurl_token_".request("ref"));
             $ref = \Illuminate\Support\Facades\Cache::get("refurl_".$md5hash);
-            if($key) {
+            if ($key) {
                 return @$ref[$key];
             } else {
                 return $ref;
@@ -103,13 +103,13 @@ 
     }
 }
 
-if(!function_exists("verifyReferalUrl")) {
+if (!function_exists("verifyReferalUrl")) {
     function verifyReferalUrl()
     {
-        if(request("ref")) {
-            if($md5hash = \Illuminate\Support\Facades\Cache::get("refurl_token_".request("ref"))) {
+        if (request("ref")) {
+            if ($md5hash = \Illuminate\Support\Facades\Cache::get("refurl_token_".request("ref"))) {
                 $ref = \Illuminate\Support\Facades\Cache::get("refurl_".$md5hash);
-                if(filter_var($ref['url'], FILTER_VALIDATE_URL)) {
+                if (filter_var($ref['url'], FILTER_VALIDATE_URL)) {
                     return true;
                 }
             }
@@ -118,7 +118,7 @@ 
     }
 }
 
-if(!function_exists("putHtaccess")) {
+if (!function_exists("putHtaccess")) {
     function putHtaccess($stringToPut)
     {
         file_put_contents(base_path(".htaccess"), "\n".$stringToPut, FILE_APPEND);
@@ -126,13 +126,13 @@ 
     }
 }
 
-if(!function_exists("checkHtaccess")) {
+if (!function_exists("checkHtaccess")) {
     function checkHtaccess($stringToCheck)
     {
-        if(file_exists(base_path(".htaccess")) && file_exists(public_path(".htaccess"))) {
+        if (file_exists(base_path(".htaccess")) && file_exists(public_path(".htaccess"))) {
             $htaccess = file_get_contents(base_path(".htaccess"));
-            $htaccess2= file_get_contents(public_path(".htaccess"));
-            if(\Illuminate\Support\Str::contains($htaccess, $stringToCheck) && \Illuminate\Support\Str::contains($htaccess2, $stringToCheck)) {
+            $htaccess2 = file_get_contents(public_path(".htaccess"));
+            if (\Illuminate\Support\Str::contains($htaccess, $stringToCheck) && \Illuminate\Support\Str::contains($htaccess2, $stringToCheck)) {
                 return true;
             }
         }
@@ -141,7 +141,7 @@ 
     }
 }
 
-if(!function_exists("setEnvironmentValue")) {
+if (!function_exists("setEnvironmentValue")) {
     function setEnvironmentValue(array $values)
     {
         $envFile = app()->environmentFilePath();
@@ -172,7 +172,7 @@ 
 }
 
 
-if(!function_exists("cbLang")) {
+if (!function_exists("cbLang")) {
     /**
      * @param string $key
      * @param array $replace
@@ -184,17 +184,17 @@ 
     }
 }
 
-if(!function_exists('rglob')) {
+if (!function_exists('rglob')) {
     function rglob($pattern, $flags = 0) {
         $files = glob($pattern, $flags);
-        foreach (glob(dirname($pattern).'/*', GLOB_ONLYDIR|GLOB_NOSORT) as $dir) {
+        foreach (glob(dirname($pattern).'/*', GLOB_ONLYDIR | GLOB_NOSORT) as $dir) {
             $files = array_merge($files, rglob($dir.'/'.basename($pattern), $flags));
         }
         return $files;
     }
 }
 
-if(!function_exists('convertPHPToMomentFormat')) {
+if (!function_exists('convertPHPToMomentFormat')) {
     function convertPHPToMomentFormat($format)
     {
         $replacements = [
@@ -241,13 +241,13 @@ 
     }
 }
 
-if(!function_exists('slug')) {
+if (!function_exists('slug')) {
     function slug($string, $separator = '-') {
         return \Illuminate\Support\Str::slug($string, $separator);
     }
 }
 
-if(!function_exists('columnSingleton')) {
+if (!function_exists('columnSingleton')) {
     /**
      * @return \crocodicstudio\crudbooster\controllers\scaffolding\singletons\ColumnSingleton
      */
@@ -256,7 +256,7 @@ 
     }
 }
 
-if(!function_exists('cbHook'))
+if (!function_exists('cbHook'))
 {
     /**
      * @return crocodicstudio\crudbooster\hooks\CBHook
@@ -268,7 +268,7 @@ 
     }
 }
 
-if(!function_exists('getTypeHook'))
+if (!function_exists('getTypeHook'))
 {
     /**
      * @param string $type
@@ -281,7 +281,7 @@ 
     }
 }
 
-if(!function_exists('getPrimaryKey'))
+if (!function_exists('getPrimaryKey'))
 {
     function getPrimaryKey($table_name)
     {
@@ -289,7 +289,7 @@ 
     }
 }
 
-if(!function_exists('cb'))
+if (!function_exists('cb'))
 {
     function cb()
     {
@@ -297,30 +297,30 @@ 
     }
 }
 
-if(!function_exists("cbAssetPath")) {
+if (!function_exists("cbAssetPath")) {
     function cbAssetPath($path = null) {
-        return "cb_asset".(($path)?"/".$path:null);
+        return "cb_asset".(($path) ? "/".$path : null);
     }
 }
-if(!function_exists('cbAsset')) {
+if (!function_exists('cbAsset')) {
     function cbAsset($path, $secure = null) {
         return asset(cbAssetPath()."/".$path, $secure);
     }
 }
 
-if(!function_exists("cbConfig")) {
+if (!function_exists("cbConfig")) {
     function cbConfig($name, $default = null) {
         return config("crudbooster.".$name, $default);
     }
 }
 
-if(!function_exists("strRandom")) {
+if (!function_exists("strRandom")) {
     function strRandom($length = 5) {
         return \Illuminate\Support\Str::random($length);
     }
 }
 
-if(!function_exists('module')) {
+if (!function_exists('module')) {
     function module()
     {
         $module = new \crocodicstudio\crudbooster\helpers\Module();
@@ -328,27 +328,27 @@ 
     }
 }
 
-if(!function_exists('getAdminLoginURL')) {
+if (!function_exists('getAdminLoginURL')) {
     function getAdminLoginURL()
     {
         return cb()->getAdminUrl("login");
     }
 }
 
-if(!function_exists('dummyPhoto')) {
+if (!function_exists('dummyPhoto')) {
     function dummyPhoto()
     {
-        return getSetting("dummy_photo","cb_asset/images/user8-128x128.jpg");
+        return getSetting("dummy_photo", "cb_asset/images/user8-128x128.jpg");
     }
 }
 
-if(!function_exists("str_limit")) {
+if (!function_exists("str_limit")) {
     function str_limit($string, $limit = 100, $end = "...") {
         return \Illuminate\Support\Str::limit($string, $limit, $end);
     }
 }
 
-if(!function_exists('extract_unit')) {	
+if (!function_exists('extract_unit')) {	
 	/*
 	Credits: Bit Repository
 	URL: http://www.bitrepository.com/extract-content-between-two-delimiters-with-php.html
@@ -373,14 +373,14 @@ 
 |
 */
 
-if(!function_exists('putSetting')) {
+if (!function_exists('putSetting')) {
     function putSetting($key, $value)
     {
-        if(file_exists(storage_path('.cbconfig'))) {
+        if (file_exists(storage_path('.cbconfig'))) {
             $settings = file_get_contents(storage_path('.cbconfig'));
             $settings = decrypt($settings);
             $settings = unserialize($settings);
-        }else{
+        } else {
             $settings = [];
         }
 
@@ -394,31 +394,31 @@ 
     }
 }
 
-if(!function_exists('getSetting')) {
+if (!function_exists('getSetting')) {
     function getSetting($key, $default = null)
     {
-        if($cache = \Illuminate\Support\Facades\Cache::get("setting_".$key)) {
+        if ($cache = \Illuminate\Support\Facades\Cache::get("setting_".$key)) {
             return $cache;
         }
 
-        if(file_exists(storage_path('.cbconfig'))) {
+        if (file_exists(storage_path('.cbconfig'))) {
             $settings = file_get_contents(storage_path('.cbconfig'));
             $settings = decrypt($settings);
             $settings = unserialize($settings);
-        }else{
+        } else {
             $settings = [];
         }
 
-        if(isset($settings[$key])) {
+        if (isset($settings[$key])) {
             \Illuminate\Support\Facades\Cache::forever("setting_".$key, $settings[$key]);
-            return $settings[$key]?:$default;
-        }else{
+            return $settings[$key] ?: $default;
+        } else {
             return $default;
         }
     }
 }
 
-if(!function_exists('timeAgo')) {
+if (!function_exists('timeAgo')) {
     function timeAgo($datetime_to, $datetime_from = null, $full = false)
     {
         $datetime_from = ($datetime_from) ?: date('Y-m-d H:i:s');
@@ -449,7 +449,7 @@ 
             }
         }
 
-        if (! $full) {
+        if (!$full) {
             $string = array_slice($string, 0, 1);
         }
 
@@ -457,22 +457,22 @@ 
     }
 }
 
-if(!function_exists("array_map_r")) {
-    function array_map_r( $func, $arr )
+if (!function_exists("array_map_r")) {
+    function array_map_r($func, $arr)
     {
         $newArr = array();
 
-        foreach( $arr as $key => $value )
+        foreach ($arr as $key => $value)
         {
             $key = $func($key);
-            $newArr[ $key ] = ( is_array( $value ) ? array_map_r( $func, $value ) : ( is_array($func) ? call_user_func_array($func, $value) : $func( $value ) ) );
+            $newArr[$key] = (is_array($value) ? array_map_r($func, $value) : (is_array($func) ? call_user_func_array($func, $value) : $func($value)));
         }
 
         return $newArr;
     }
 }
 
-if(!function_exists("sanitizeXSS"))
+if (!function_exists("sanitizeXSS"))
 {
     function sanitizeXSS($value)
     {
@@ -484,7 +484,7 @@ 
     }
 }
 
-if(!function_exists("requestAll")) {
+if (!function_exists("requestAll")) {
     function requestAll() {
         $all = array_map_r("sanitizeXSS", request()->all());
         return $all;
@@ -493,22 +493,22 @@ 
 
 
 
-if(!function_exists('getURLFormat')) {
+if (!function_exists('getURLFormat')) {
     function getURLFormat($name) {
         $url = request($name);
-        if(filter_var($url, FILTER_VALIDATE_URL)) {
+        if (filter_var($url, FILTER_VALIDATE_URL)) {
             return $url;
-        }else{
+        } else {
             return request()->url();
         }
     }
 }
 
-if(!function_exists('g')) {
+if (!function_exists('g')) {
     function g($name, $safe = true) {
-        if($safe == true) {
+        if ($safe == true) {
             $response = request($name);
-            if(is_string($response)) {
+            if (is_string($response)) {
                 $response = sanitizeXSS($response);
             }elseif (is_array($response)) {
                 array_walk_recursive($response, function(&$response) {
@@ -517,25 +517,25 @@ 
             }
 
             return $response;
-        }else{
+        } else {
             return Request::get($name);
         }
     }
 }
 
-if(!function_exists('min_var_export')) {
+if (!function_exists('min_var_export')) {
     function min_var_export($input) {
-        if(is_array($input)) {
+        if (is_array($input)) {
             $buffer = [];
-            foreach($input as $key => $value)
+            foreach ($input as $key => $value)
                 $buffer[] = var_export($key, true)."=>".min_var_export($value);
-            return "[".implode(",",$buffer)."]";
+            return "[".implode(",", $buffer)."]";
         } else
             return var_export($input, true);
     }
 }
 
-if(!function_exists('rrmdir')) {
+if (!function_exists('rrmdir')) {
 	/*
 	* http://stackoverflow.com/questions/3338123/how-do-i-recursively-delete-a-directory-and-its-entire-contents-files-sub-dir
 	*/

src/controllers/DeveloperMenusController.php

Spacing +22 added lines, -22 removed lines

@@ -25,14 +25,14 @@ 
 
     public function getIndex() {
         $data = [];
-        return view($this->view.".index",$data);
+        return view($this->view.".index", $data);
     }
 
     public function getAdd() {
         $data = [];
         $data['form_title'] = "Add Menu";
         $data['form_url'] = route('DeveloperMenusControllerPostAddSave');
-        $data['modules'] = DB::table("cb_modules")->orderBy("name","asc")->get();
+        $data['modules'] = DB::table("cb_modules")->orderBy("name", "asc")->get();
         return view($this->view.".form", $data);
     }
 
@@ -40,7 +40,7 @@ 
         $data = [];
         $data['form_title'] = "Edit Menu";
         $data['form_url'] = cb()->getDeveloperUrl("menus/edit-save/".$id);
-        $data['modules'] = DB::table("cb_modules")->orderBy("name","asc")->get();
+        $data['modules'] = DB::table("cb_modules")->orderBy("name", "asc")->get();
         $data['row'] = cb()->find("cb_menus", $id);
         return view($this->view.".form", $data);
     }
@@ -53,7 +53,7 @@ 
             $menu['name'] = request('name');
             $menu['icon'] = request('icon');
             $menu['type'] = request('type');
-            if(request('type') == 'module') {
+            if (request('type') == 'module') {
                 $menu['cb_modules_id'] = request('cb_modules_id');
             }elseif (request('type') == 'url') {
                 $menu['path'] = request('url_value');
@@ -67,7 +67,7 @@ 
 
             CacheHelper::forgetGroup("sidebar_menu");
 
-            return cb()->redirect(route("DeveloperMenusControllerGetIndex"),"The menu has been added!","success");
+            return cb()->redirect(route("DeveloperMenusControllerGetIndex"), "The menu has been added!", "success");
 
         } catch (CBValidationException $e) {
             return cb()->redirectBack($e->getMessage());
@@ -82,7 +82,7 @@ 
             $menu['name'] = request('name');
             $menu['icon'] = request('icon');
             $menu['type'] = request('type');
-            if(request('type') == 'module') {
+            if (request('type') == 'module') {
                 $menu['cb_modules_id'] = request('cb_modules_id');
             }elseif (request('type') == 'url') {
                 $menu['path'] = request('url_value');
@@ -91,11 +91,11 @@ 
             } elseif (request("type") == "empty") {
                 $menu['path'] = "javascript:void(0);";
             }
-            DB::table("cb_menus")->where("id",$id)->update($menu);
+            DB::table("cb_menus")->where("id", $id)->update($menu);
 
             CacheHelper::forgetGroup("sidebar_menu");
 
-            return cb()->redirect(route("DeveloperMenusControllerGetIndex"),"The menu has been saved!","success");
+            return cb()->redirect(route("DeveloperMenusControllerGetIndex"), "The menu has been saved!", "success");
 
         } catch (CBValidationException $e) {
             return cb()->redirectBack($e->getMessage());
@@ -108,20 +108,20 @@ 
 
             $menus = request('menus');
             $menus = json_decode($menus, true);
-            if($menus) {
+            if ($menus) {
                 $menus = $menus[0];
-                if($menus) {
-                    foreach($menus as $i=>$menu) {
+                if ($menus) {
+                    foreach ($menus as $i=>$menu) {
                         $id = $menu['id'];
-                        cb()->update("cb_menus",$id,["sort_number"=>$i,'parent_cb_menus_id'=>null]);
-                        if($menu['children'][0]) {
-                            foreach($menu['children'][0] as $ii=>$sub) {
+                        cb()->update("cb_menus", $id, ["sort_number"=>$i, 'parent_cb_menus_id'=>null]);
+                        if ($menu['children'][0]) {
+                            foreach ($menu['children'][0] as $ii=>$sub) {
                                 $id = $sub['id'];
-                                cb()->update("cb_menus",$id,["sort_number"=>$ii,"parent_cb_menus_id"=>$menu['id']]);
-                                if($sub['children'][0]) {
-                                    foreach($sub['children'][0] as $iii=>$subsub) {
+                                cb()->update("cb_menus", $id, ["sort_number"=>$ii, "parent_cb_menus_id"=>$menu['id']]);
+                                if ($sub['children'][0]) {
+                                    foreach ($sub['children'][0] as $iii=>$subsub) {
                                         $id = $subsub['id'];
-                                        cb()->update("cb_menus",$id,["sort_number"=>$iii,"parent_cb_menus_id"=>$sub['id']]);
+                                        cb()->update("cb_menus", $id, ["sort_number"=>$iii, "parent_cb_menus_id"=>$sub['id']]);
                                     }
                                 }
                             }
@@ -132,20 +132,20 @@ 
 
             CacheHelper::forgetGroup("sidebar_menu");
 
-            return response()->json(['api_status'=>1,'api_message'=>'success']);
+            return response()->json(['api_status'=>1, 'api_message'=>'success']);
 
         } catch (CBValidationException $e) {
-            return response()->json(['api_status'=>0,'api_message'=>$e->getMessage()]);
+            return response()->json(['api_status'=>0, 'api_message'=>$e->getMessage()]);
         }
     }
 
     public function getDelete($id) {
-        DB::table("cb_menus")->where("id",$id)->delete();
+        DB::table("cb_menus")->where("id", $id)->delete();
         DB::table("cb_role_privileges")->where("cb_menus_id", $id)->delete();
 
         CacheHelper::forgetGroup("sidebar_menu");
 
-        return cb()->redirectBack("The menu has been deleted!","success");
+        return cb()->redirectBack("The menu has been deleted!", "success");
     }
 
 }
\ No newline at end of file

src/helpers/SidebarMenus.php

Spacing +20 added lines, -20 removed lines

@@ -17,7 +17,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);
@@ -44,9 +44,9 @@ 
             $model->setName($menu->name);
 		}
 
-        if(request()->is($model->getBasepath()."*")) {
+        if (request()->is($model->getBasepath()."*")) {
             $model->setIsActive(true);
-        }else{
+        } else {
             $model->setIsActive(false);
         }
 
@@ -55,22 +55,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;
             }
         }
@@ -79,30 +79,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);
 
@@ -117,7 +117,7 @@ 
             $result[] = $sidebarModel;
         }
 
-        CacheHelper::putInGroup($idHash, $result,"sidebar_menu", 3600);
+        CacheHelper::putInGroup($idHash, $result, "sidebar_menu", 3600);
         return $result;
     }