@@ -24,12 +24,12 @@ discard block |
||
24 | 24 | |
25 | 25 | public function getIndex() { |
26 | 26 | $data = []; |
27 | - return view($this->view.".index",$data); |
|
27 | + return view($this->view.".index", $data); |
|
28 | 28 | } |
29 | 29 | |
30 | 30 | public function postSave() |
31 | 31 | { |
32 | - if(!isConfigCached()) { |
|
32 | + if (!isConfigCached()) { |
|
33 | 33 | setEnvironmentValue([ |
34 | 34 | "APP_DEBUG"=>request("APP_DEBUG") |
35 | 35 | ]); |
@@ -41,15 +41,15 @@ discard block |
||
41 | 41 | putSetting("AUTO_REDIRECT_TO_LOGIN", request("AUTO_REDIRECT_TO_LOGIN")); |
42 | 42 | putSetting("LOGIN_NOTIFICATION", request("LOGIN_NOTIFICATION")); |
43 | 43 | |
44 | - if(request("htaccess_ServerSignature")) { |
|
44 | + if (request("htaccess_ServerSignature")) { |
|
45 | 45 | putHtaccess("ServerSignature Off"); |
46 | 46 | } |
47 | 47 | |
48 | - if(request("htaccess_IndexIgnore")) { |
|
48 | + if (request("htaccess_IndexIgnore")) { |
|
49 | 49 | putHtaccess("IndexIgnore *"); |
50 | 50 | } |
51 | 51 | |
52 | - if(request("htaccess_dotAccess")) { |
|
52 | + if (request("htaccess_dotAccess")) { |
|
53 | 53 | putHtaccess(" |
54 | 54 | <FilesMatch \"^\.\"> |
55 | 55 | Order allow,deny |
@@ -57,11 +57,11 @@ discard block |
||
57 | 57 | </FilesMatch>"); |
58 | 58 | } |
59 | 59 | |
60 | - if(request("htaccess_preventVendor")) { |
|
60 | + if (request("htaccess_preventVendor")) { |
|
61 | 61 | putHtaccess("RewriteRule ^(.*)/vendor/.*\.(php|rb|py)$ - [F,L,NC]"); |
62 | 62 | } |
63 | 63 | |
64 | 64 | |
65 | - return cb()->redirectBack("Security has been updated!","success"); |
|
65 | + return cb()->redirectBack("Security has been updated!", "success"); |
|
66 | 66 | } |
67 | 67 | } |
68 | 68 | \ No newline at end of file |
@@ -20,9 +20,9 @@ discard block |
||
20 | 20 | /* |
21 | 21 | * For security reason we have limit the upload file formats bellow |
22 | 22 | */ |
23 | - 'UPLOAD_FILE_EXTENSION_ALLOWED' => ['jpg','jpeg','png','gif','pdf','xls','xlsx','doc','docx','txt','zip','rar','rtf'], |
|
23 | + 'UPLOAD_FILE_EXTENSION_ALLOWED' => ['jpg', 'jpeg', 'png', 'gif', 'pdf', 'xls', 'xlsx', 'doc', 'docx', 'txt', 'zip', 'rar', 'rtf'], |
|
24 | 24 | |
25 | - 'UPLOAD_IMAGE_EXTENSION_ALLOWED' => ['jpg','jpeg','png','gif'], |
|
25 | + 'UPLOAD_IMAGE_EXTENSION_ALLOWED' => ['jpg', 'jpeg', 'png', 'gif'], |
|
26 | 26 | |
27 | 27 | /* |
28 | 28 | * Override Local FileSystem From Storage To Another |
@@ -58,5 +58,5 @@ discard block |
||
58 | 58 | * You can define in this array what the tables you want to include in "php artisan crudbooster:data_migration" |
59 | 59 | * The default is all cb_ prefix will be include in data migration |
60 | 60 | */ |
61 | - 'ADDITIONAL_DATA_MIGRATION'=>['users','migrations'] |
|
61 | + 'ADDITIONAL_DATA_MIGRATION'=>['users', 'migrations'] |
|
62 | 62 | ]; |
63 | 63 | \ No newline at end of file |
@@ -20,21 +20,21 @@ |
||
20 | 20 | $themes = (new Plugin())->getAllThemes(); |
21 | 21 | $data = []; |
22 | 22 | $data['result'] = $themes; |
23 | - return view($this->view.".index",$data); |
|
23 | + return view($this->view.".index", $data); |
|
24 | 24 | } |
25 | 25 | |
26 | 26 | public function getActiveTheme($theme_path) { |
27 | 27 | $theme_path = base64_decode($theme_path); |
28 | 28 | putSetting("theme_path", $theme_path); |
29 | - return cb()->redirectBack("Theme has been activated!","success"); |
|
29 | + return cb()->redirectBack("Theme has been activated!", "success"); |
|
30 | 30 | } |
31 | 31 | |
32 | 32 | public function postSaveConfig() { |
33 | 33 | |
34 | - foreach(request()->except("_token") as $key=>$val) { |
|
35 | - putSetting( $key, $val); |
|
34 | + foreach (request()->except("_token") as $key=>$val) { |
|
35 | + putSetting($key, $val); |
|
36 | 36 | } |
37 | 37 | |
38 | - return cb()->redirectBack("Theme config has been saved!","success"); |
|
38 | + return cb()->redirectBack("Theme config has been saved!", "success"); |
|
39 | 39 | } |
40 | 40 | } |
41 | 41 | \ No newline at end of file |
@@ -18,8 +18,8 @@ |
||
18 | 18 | */ |
19 | 19 | public function handle($request, Closure $next) |
20 | 20 | { |
21 | - if(auth()->guest()) { |
|
22 | - return cb()->redirect(cb()->getLoginUrl("login"),cbLang('please_login_for_first'),'warning'); |
|
21 | + if (auth()->guest()) { |
|
22 | + return cb()->redirect(cb()->getLoginUrl("login"), cbLang('please_login_for_first'), 'warning'); |
|
23 | 23 | } |
24 | 24 | |
25 | 25 | (new CBHook())->beforeBackendMiddleware($request); |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | $model->setIcon($menu->icon); |
29 | 29 | $model->setName($menu->name); |
30 | 30 | $model->setBasepath(basename($model->getUrl())); |
31 | - }elseif ($menu->type == "module") { |
|
31 | + } elseif ($menu->type == "module") { |
|
32 | 32 | $module = cb()->find("cb_modules", $menu->cb_modules_id); |
33 | 33 | $className = '\App\Http\Controllers\\'.$module->controller; |
34 | 34 | $controllerClass = new $className(); |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | $model->setIcon($module->icon); |
39 | 39 | $model->setName($module->name); |
40 | 40 | $model->setBasepath(config('crudbooster.ADMIN_PATH').'/'.basename($model->getUrl())); |
41 | - }elseif ($menu->type == "path") { |
|
41 | + } elseif ($menu->type == "path") { |
|
42 | 42 | $model->setUrl(cb()->getAdminUrl($menu->path)); |
43 | 43 | $model->setPermalink($menu->path); |
44 | 44 | $model->setIcon($menu->icon); |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | |
49 | 49 | if(request()->is($model->getBasepath()."*")) { |
50 | 50 | $model->setIsActive(true); |
51 | - }else{ |
|
51 | + } else{ |
|
52 | 52 | $model->setIsActive(false); |
53 | 53 | } |
54 | 54 | |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | $menus = DB::table("cb_menus"); |
60 | 60 | if($parent_id) { |
61 | 61 | $menus->where("parent_cb_menus_id",$parent_id); |
62 | - }else{ |
|
62 | + } else{ |
|
63 | 63 | $menus->whereNull("parent_cb_menus_id"); |
64 | 64 | } |
65 | 65 | return $menus->orderBy("sort_number","asc")->get(); |
@@ -83,20 +83,26 @@ discard block |
||
83 | 83 | public function all($withPrivilege = true) { |
84 | 84 | $roles_id = ($withPrivilege)?cb()->session()->roleId():null; |
85 | 85 | $idHash = "menuUser".$roles_id.auth()->id(); |
86 | - if($menu = CacheHelper::getItemInGroup($idHash,"sidebar_menu")) return $menu; |
|
86 | + if($menu = CacheHelper::getItemInGroup($idHash,"sidebar_menu")) { |
|
87 | + return $menu; |
|
88 | + } |
|
87 | 89 | |
88 | 90 | $menus = $this->loadData(); |
89 | 91 | $result = []; |
90 | 92 | foreach($menus as $menu) { |
91 | 93 | |
92 | - if($withPrivilege && !$this->checkPrivilege($roles_id, $menu)) continue; |
|
94 | + if($withPrivilege && !$this->checkPrivilege($roles_id, $menu)) { |
|
95 | + continue; |
|
96 | + } |
|
93 | 97 | |
94 | 98 | $sidebarModel = $this->assignToModel($menu); |
95 | 99 | if($menus2 = $this->loadData($menu->id)) { |
96 | 100 | $sub1 = []; |
97 | 101 | foreach ($menus2 as $menu2) { |
98 | 102 | |
99 | - if($withPrivilege && !$this->checkPrivilege($roles_id, $menu2)) continue; |
|
103 | + if($withPrivilege && !$this->checkPrivilege($roles_id, $menu2)) { |
|
104 | + continue; |
|
105 | + } |
|
100 | 106 | |
101 | 107 | $sidebarModel2 = $this->assignToModel($menu2); |
102 | 108 | |
@@ -104,7 +110,9 @@ discard block |
||
104 | 110 | $sub2 = []; |
105 | 111 | foreach ($menus3 as $menu3) { |
106 | 112 | |
107 | - if($withPrivilege && !$this->checkPrivilege($roles_id, $menu3)) continue; |
|
113 | + if($withPrivilege && !$this->checkPrivilege($roles_id, $menu3)) { |
|
114 | + continue; |
|
115 | + } |
|
108 | 116 | |
109 | 117 | $sidebarModel3 = $this->assignToModel($menu3); |
110 | 118 |
@@ -39,10 +39,10 @@ |
||
39 | 39 | $model->setName($menu->name); |
40 | 40 | $model->setBasepath(config('crudbooster.ADMIN_PATH').'/'.basename($model->getUrl())); |
41 | 41 | } else { |
42 | - $model->setUrl($menu->path); |
|
42 | + $model->setUrl($menu->path); |
|
43 | 43 | $model->setIcon($menu->icon); |
44 | 44 | $model->setName($menu->name); |
45 | - } |
|
45 | + } |
|
46 | 46 | |
47 | 47 | if(request()->is($model->getBasepath()."*")) { |
48 | 48 | $model->setIsActive(true); |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | private function assignToModel($menu) { |
18 | 18 | $model = new SidebarModel(); |
19 | 19 | $model->setId($menu->id); |
20 | - if($menu->type == "url") { |
|
20 | + if ($menu->type == "url") { |
|
21 | 21 | $model->setUrl($menu->path); |
22 | 22 | $model->setIcon($menu->icon); |
23 | 23 | $model->setName($menu->name); |
@@ -44,9 +44,9 @@ discard block |
||
44 | 44 | $model->setName($menu->name); |
45 | 45 | } |
46 | 46 | |
47 | - if(request()->is($model->getBasepath()."*")) { |
|
47 | + if (request()->is($model->getBasepath()."*")) { |
|
48 | 48 | $model->setIsActive(true); |
49 | - }else{ |
|
49 | + } else { |
|
50 | 50 | $model->setIsActive(false); |
51 | 51 | } |
52 | 52 | |
@@ -55,22 +55,22 @@ discard block |
||
55 | 55 | |
56 | 56 | private function loadData($parent_id = null) { |
57 | 57 | $menus = DB::table("cb_menus"); |
58 | - if($parent_id) { |
|
59 | - $menus->where("parent_cb_menus_id",$parent_id); |
|
60 | - }else{ |
|
58 | + if ($parent_id) { |
|
59 | + $menus->where("parent_cb_menus_id", $parent_id); |
|
60 | + } else { |
|
61 | 61 | $menus->whereNull("parent_cb_menus_id"); |
62 | 62 | } |
63 | - return $menus->orderBy("sort_number","asc")->get(); |
|
63 | + return $menus->orderBy("sort_number", "asc")->get(); |
|
64 | 64 | } |
65 | 65 | |
66 | 66 | private function rolePrivilege($cb_roles_id, $cb_menus_id) { |
67 | - return cb()->find("cb_role_privileges",['cb_roles_id'=>$cb_roles_id,'cb_menus_id'=>$cb_menus_id]); |
|
67 | + return cb()->find("cb_role_privileges", ['cb_roles_id'=>$cb_roles_id, 'cb_menus_id'=>$cb_menus_id]); |
|
68 | 68 | } |
69 | 69 | |
70 | - private function checkPrivilege($roles_id,$menu) { |
|
71 | - if($roles_id) { |
|
70 | + private function checkPrivilege($roles_id, $menu) { |
|
71 | + if ($roles_id) { |
|
72 | 72 | $privilege = $this->rolePrivilege($roles_id, $menu->id); |
73 | - if($privilege && !$privilege->can_browse) { |
|
73 | + if ($privilege && !$privilege->can_browse) { |
|
74 | 74 | return false; |
75 | 75 | } |
76 | 76 | } |
@@ -79,30 +79,30 @@ discard block |
||
79 | 79 | } |
80 | 80 | |
81 | 81 | public function all($withPrivilege = true) { |
82 | - $roles_id = ($withPrivilege)?cb()->session()->roleId():null; |
|
82 | + $roles_id = ($withPrivilege) ?cb()->session()->roleId() : null; |
|
83 | 83 | $idHash = "menuUser".$roles_id.auth()->id(); |
84 | - if($menu = CacheHelper::getItemInGroup($idHash,"sidebar_menu")) return $menu; |
|
84 | + if ($menu = CacheHelper::getItemInGroup($idHash, "sidebar_menu")) return $menu; |
|
85 | 85 | |
86 | 86 | $menus = $this->loadData(); |
87 | 87 | $result = []; |
88 | - foreach($menus as $menu) { |
|
88 | + foreach ($menus as $menu) { |
|
89 | 89 | |
90 | - if($withPrivilege && !$this->checkPrivilege($roles_id, $menu)) continue; |
|
90 | + if ($withPrivilege && !$this->checkPrivilege($roles_id, $menu)) continue; |
|
91 | 91 | |
92 | 92 | $sidebarModel = $this->assignToModel($menu); |
93 | - if($menus2 = $this->loadData($menu->id)) { |
|
93 | + if ($menus2 = $this->loadData($menu->id)) { |
|
94 | 94 | $sub1 = []; |
95 | 95 | foreach ($menus2 as $menu2) { |
96 | 96 | |
97 | - if($withPrivilege && !$this->checkPrivilege($roles_id, $menu2)) continue; |
|
97 | + if ($withPrivilege && !$this->checkPrivilege($roles_id, $menu2)) continue; |
|
98 | 98 | |
99 | 99 | $sidebarModel2 = $this->assignToModel($menu2); |
100 | 100 | |
101 | - if($menus3 = $this->loadData($menu2->id)) { |
|
101 | + if ($menus3 = $this->loadData($menu2->id)) { |
|
102 | 102 | $sub2 = []; |
103 | 103 | foreach ($menus3 as $menu3) { |
104 | 104 | |
105 | - if($withPrivilege && !$this->checkPrivilege($roles_id, $menu3)) continue; |
|
105 | + if ($withPrivilege && !$this->checkPrivilege($roles_id, $menu3)) continue; |
|
106 | 106 | |
107 | 107 | $sidebarModel3 = $this->assignToModel($menu3); |
108 | 108 | |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | $result[] = $sidebarModel; |
118 | 118 | } |
119 | 119 | |
120 | - CacheHelper::putInGroup($idHash, $result,"sidebar_menu", 3600); |
|
120 | + CacheHelper::putInGroup($idHash, $result, "sidebar_menu", 3600); |
|
121 | 121 | return $result; |
122 | 122 | } |
123 | 123 |
@@ -20,9 +20,9 @@ discard block |
||
20 | 20 | */ |
21 | 21 | public function indexRender($row, $column) |
22 | 22 | { |
23 | - if($column->getFormat()) { |
|
23 | + if ($column->getFormat()) { |
|
24 | 24 | return date($column->getFormat(), strtotime($row->{$column->getField()})); |
25 | - }else{ |
|
25 | + } else { |
|
26 | 26 | return $row->{$column->getField()}; |
27 | 27 | } |
28 | 28 | } |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | { |
37 | 37 | $start = sanitizeXSS($value['start']); |
38 | 38 | $end = sanitizeXSS($value['end']); |
39 | - if($start && $end) { |
|
39 | + if ($start && $end) { |
|
40 | 40 | $start = date("H:i:s", strtotime($start)); |
41 | 41 | $end = date("H:i:s", strtotime($end)); |
42 | 42 | $query->whereBetween($column->getFilterColumn(), [$start, $end]); |
@@ -22,7 +22,7 @@ |
||
22 | 22 | { |
23 | 23 | if($column->getFormat()) { |
24 | 24 | return date($column->getFormat(), strtotime($row->{$column->getField()})); |
25 | - }else{ |
|
25 | + } else{ |
|
26 | 26 | return $row->{$column->getField()}; |
27 | 27 | } |
28 | 28 | } |
@@ -18,7 +18,7 @@ |
||
18 | 18 | { |
19 | 19 | $start = sanitizeXSS($value['start']); |
20 | 20 | $end = sanitizeXSS($value['end']); |
21 | - if($start && $end) { |
|
21 | + if ($start && $end) { |
|
22 | 22 | $query->whereBetween($column->getFilterColumn(), [$start, $end]); |
23 | 23 | } |
24 | 24 | return $query; |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | public function indexRender($row, $column) |
23 | 23 | { |
24 | 24 | $value = trim(strip_tags($row->{ $column->getField() })); |
25 | - if($column->getLimit()) { |
|
25 | + if ($column->getLimit()) { |
|
26 | 26 | $value = Str::limit($value, $column->getLimit()); |
27 | 27 | } |
28 | 28 | return $value; |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | |
32 | 32 | public function filterQuery($query, $column, $value) |
33 | 33 | { |
34 | - $query->where($column->getFilterColumn(),"like","%".$value."%"); |
|
34 | + $query->where($column->getFilterColumn(), "like", "%".$value."%"); |
|
35 | 35 | return $query; |
36 | 36 | } |
37 | 37 |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | /** @var \crocodicstudio\crudbooster\types\text\TextModel $column */ |
3 | - $filterName = "filter_".slug($column->getFilterColumn(),"_"); |
|
3 | + $filterName = "filter_".slug($column->getFilterColumn(), "_"); |
|
4 | 4 | $filterValue = sanitizeXSS(request($filterName)); |
5 | 5 | ?> |
6 | 6 | <select name="filter_{{ slug($column->getFilterColumn(),"_") }}" style="width: 100%" id="filter_{{ $column->getName() }}" class="form-control select2"> |