@@ -65,8 +65,8 @@ discard block |
||
65 | 65 | $data = new TextModel(); |
66 | 66 | $data = $this->setDefaultModelValue($data); |
67 | 67 | $data->setLabel($label); |
68 | - $data->setName($this->name($label,$name)); |
|
69 | - $data->setField($field_to_save?:$this->name($label, $name)); |
|
68 | + $data->setName($this->name($label, $name)); |
|
69 | + $data->setField($field_to_save ?: $this->name($label, $name)); |
|
70 | 70 | $data->setOrderByColumn($this->table().".".$data->getField()); |
71 | 71 | $data->setFilterColumn($this->table().".".$data->getField()); |
72 | 72 | $data->setType("text"); |
@@ -83,8 +83,8 @@ discard block |
||
83 | 83 | $data = new CheckboxModel(); |
84 | 84 | $data = $this->setDefaultModelValue($data); |
85 | 85 | $data->setLabel($label); |
86 | - $data->setName($this->name($label,$name)); |
|
87 | - $data->setField($field_to_save?:$this->name($label, $name)); |
|
86 | + $data->setName($this->name($label, $name)); |
|
87 | + $data->setField($field_to_save ?: $this->name($label, $name)); |
|
88 | 88 | $data->setOrderByColumn($this->table().".".$data->getField()); |
89 | 89 | $data->setFilterColumn($this->table().".".$data->getField()); |
90 | 90 | $data->setType("checkbox"); |
@@ -101,8 +101,8 @@ discard block |
||
101 | 101 | $data = new PasswordModel(); |
102 | 102 | $data = $this->setDefaultModelValue($data); |
103 | 103 | $data->setLabel($label); |
104 | - $data->setName($this->name($label,$name)); |
|
105 | - $data->setField($field_to_save?:$this->name($label, $name)); |
|
104 | + $data->setName($this->name($label, $name)); |
|
105 | + $data->setField($field_to_save ?: $this->name($label, $name)); |
|
106 | 106 | $data->setOrderByColumn($this->table().".".$data->getField()); |
107 | 107 | $data->setFilterColumn($this->table().".".$data->getField()); |
108 | 108 | $data->setType("password"); |
@@ -121,8 +121,8 @@ discard block |
||
121 | 121 | $data = new ImageModel(); |
122 | 122 | $data = $this->setDefaultModelValue($data); |
123 | 123 | $data->setLabel($label); |
124 | - $data->setName($this->name($label,$name)); |
|
125 | - $data->setField($field_to_save?:$this->name($label, $name)); |
|
124 | + $data->setName($this->name($label, $name)); |
|
125 | + $data->setField($field_to_save ?: $this->name($label, $name)); |
|
126 | 126 | $data->setOrderByColumn($this->table().".".$data->getField()); |
127 | 127 | $data->setFilterColumn($this->table().".".$data->getField()); |
128 | 128 | $data->setType("image"); |
@@ -139,8 +139,8 @@ discard block |
||
139 | 139 | $data = new TextAreaModel(); |
140 | 140 | $data = $this->setDefaultModelValue($data); |
141 | 141 | $data->setLabel($label); |
142 | - $data->setName($this->name($label,$name)); |
|
143 | - $data->setField($field_to_save?:$this->name($label, $name)); |
|
142 | + $data->setName($this->name($label, $name)); |
|
143 | + $data->setField($field_to_save ?: $this->name($label, $name)); |
|
144 | 144 | $data->setOrderByColumn($this->table().".".$data->getField()); |
145 | 145 | $data->setFilterColumn($this->table().".".$data->getField()); |
146 | 146 | $data->setType("text_area"); |
@@ -165,7 +165,7 @@ discard block |
||
165 | 165 | */ |
166 | 166 | public function addSelectTable($label, $name = null, $selectConfig) |
167 | 167 | { |
168 | - if(isset($selectConfig['table']) && |
|
168 | + if (isset($selectConfig['table']) && |
|
169 | 169 | isset($selectConfig['value_option']) && |
170 | 170 | isset($selectConfig['display_option'])) { |
171 | 171 | $this->index++; |
@@ -173,7 +173,7 @@ discard block |
||
173 | 173 | $data = new SelectTableModel(); |
174 | 174 | $data = $this->setDefaultModelValue($data); |
175 | 175 | $data->setLabel($label); |
176 | - $data->setName($this->name($label,$name)); |
|
176 | + $data->setName($this->name($label, $name)); |
|
177 | 177 | $data->setField($this->name($label, $name)); |
178 | 178 | $data->setType("select_table"); |
179 | 179 | $data->setOrderByColumn($selectConfig['table'].".".$selectConfig["display_option"]); |
@@ -181,7 +181,7 @@ discard block |
||
181 | 181 | columnSingleton()->setColumn($this->index, $data); |
182 | 182 | |
183 | 183 | $selectTable = new SelectTable($this->index); |
184 | - $selectTable->optionsFromTable($selectConfig['table'],$selectConfig['value_option'],$selectConfig['display_option'],@$selectConfig['sql_condition']); |
|
184 | + $selectTable->optionsFromTable($selectConfig['table'], $selectConfig['value_option'], $selectConfig['display_option'], @$selectConfig['sql_condition']); |
|
185 | 185 | |
186 | 186 | return $selectTable; |
187 | 187 | } else { |
@@ -196,7 +196,7 @@ discard block |
||
196 | 196 | $data = new SelectOptionModel(); |
197 | 197 | $data = $this->setDefaultModelValue($data); |
198 | 198 | $data->setLabel($label); |
199 | - $data->setName($this->name($label,$name)); |
|
199 | + $data->setName($this->name($label, $name)); |
|
200 | 200 | $data->setField($this->name($label, $name)); |
201 | 201 | $data->setOrderByColumn($this->table().".".$data->getField()); |
202 | 202 | $data->setFilterColumn($this->table().".".$data->getField()); |
@@ -206,7 +206,7 @@ discard block |
||
206 | 206 | |
207 | 207 | $selectOption = new SelectOption($this->index); |
208 | 208 | |
209 | - if($options) { |
|
209 | + if ($options) { |
|
210 | 210 | $selectOption->options($options); |
211 | 211 | } |
212 | 212 | |
@@ -221,8 +221,8 @@ discard block |
||
221 | 221 | $data = new CustomModel(); |
222 | 222 | $data = $this->setDefaultModelValue($data); |
223 | 223 | $data->setLabel($label); |
224 | - $data->setName($this->name($label,$name)); |
|
225 | - $data->setField($field_to_save?:$this->name($label, $name)); |
|
224 | + $data->setName($this->name($label, $name)); |
|
225 | + $data->setField($field_to_save ?: $this->name($label, $name)); |
|
226 | 226 | $data->setOrderByColumn($this->table().".".$data->getField()); |
227 | 227 | $data->setFilterColumn($this->table().".".$data->getField()); |
228 | 228 | $data->setType("custom"); |
@@ -239,8 +239,8 @@ discard block |
||
239 | 239 | $data = new DateModel(); |
240 | 240 | $data = $this->setDefaultModelValue($data); |
241 | 241 | $data->setLabel($label); |
242 | - $data->setName($this->name($label,$name)); |
|
243 | - $data->setField($field_to_save?:$this->name($label, $name)); |
|
242 | + $data->setName($this->name($label, $name)); |
|
243 | + $data->setField($field_to_save ?: $this->name($label, $name)); |
|
244 | 244 | $data->setOrderByColumn($this->table().".".$data->getField()); |
245 | 245 | $data->setFilterColumn($this->table().".".$data->getField()); |
246 | 246 | $data->setType("date"); |
@@ -257,8 +257,8 @@ discard block |
||
257 | 257 | $data = new TimeModel(); |
258 | 258 | $data = $this->setDefaultModelValue($data); |
259 | 259 | $data->setLabel($label); |
260 | - $data->setName($this->name($label,$name)); |
|
261 | - $data->setField($field_to_save?:$this->name($label, $name)); |
|
260 | + $data->setName($this->name($label, $name)); |
|
261 | + $data->setField($field_to_save ?: $this->name($label, $name)); |
|
262 | 262 | $data->setOrderByColumn($this->table().".".$data->getField()); |
263 | 263 | $data->setFilterColumn($this->table().".".$data->getField()); |
264 | 264 | $data->setType("time"); |
@@ -275,8 +275,8 @@ discard block |
||
275 | 275 | $data = new DatetimeModel(); |
276 | 276 | $data = $this->setDefaultModelValue($data); |
277 | 277 | $data->setLabel($label); |
278 | - $data->setName($this->name($label,$name)); |
|
279 | - $data->setField($field_to_save?:$this->name($label, $name)); |
|
278 | + $data->setName($this->name($label, $name)); |
|
279 | + $data->setField($field_to_save ?: $this->name($label, $name)); |
|
280 | 280 | $data->setOrderByColumn($this->table().".".$data->getField()); |
281 | 281 | $data->setFilterColumn($this->table().".".$data->getField()); |
282 | 282 | $data->setType("datetime"); |
@@ -293,8 +293,8 @@ discard block |
||
293 | 293 | $data = new EmailModel(); |
294 | 294 | $data = $this->setDefaultModelValue($data); |
295 | 295 | $data->setLabel($label); |
296 | - $data->setName($this->name($label,$name)); |
|
297 | - $data->setField($field_to_save?:$this->name($label, $name)); |
|
296 | + $data->setName($this->name($label, $name)); |
|
297 | + $data->setField($field_to_save ?: $this->name($label, $name)); |
|
298 | 298 | $data->setOrderByColumn($this->table().".".$data->getField()); |
299 | 299 | $data->setFilterColumn($this->table().".".$data->getField()); |
300 | 300 | $data->setType("email"); |
@@ -311,8 +311,8 @@ discard block |
||
311 | 311 | $data = new FileModel(); |
312 | 312 | $data = $this->setDefaultModelValue($data); |
313 | 313 | $data->setLabel($label); |
314 | - $data->setName($this->name($label,$name)); |
|
315 | - $data->setField($field_to_save?:$this->name($label, $name)); |
|
314 | + $data->setName($this->name($label, $name)); |
|
315 | + $data->setField($field_to_save ?: $this->name($label, $name)); |
|
316 | 316 | $data->setOrderByColumn($this->table().".".$data->getField()); |
317 | 317 | $data->setFilterColumn($this->table().".".$data->getField()); |
318 | 318 | $data->setType("file"); |
@@ -330,8 +330,8 @@ discard block |
||
330 | 330 | $data = new HiddenModel(); |
331 | 331 | $data = $this->setDefaultModelValue($data); |
332 | 332 | $data->setLabel($label); |
333 | - $data->setName($this->name($label,$name)); |
|
334 | - $data->setField($field_to_save?:$this->name($label, $name)); |
|
333 | + $data->setName($this->name($label, $name)); |
|
334 | + $data->setField($field_to_save ?: $this->name($label, $name)); |
|
335 | 335 | $data->setOrderByColumn($this->table().".".$data->getField()); |
336 | 336 | $data->setFilterColumn($this->table().".".$data->getField()); |
337 | 337 | $data->setType("hidden"); |
@@ -348,8 +348,8 @@ discard block |
||
348 | 348 | $data = new NumberModel(); |
349 | 349 | $data = $this->setDefaultModelValue($data); |
350 | 350 | $data->setLabel($label); |
351 | - $data->setName($this->name($label,$name)); |
|
352 | - $data->setField($field_to_save?:$this->name($label, $name)); |
|
351 | + $data->setName($this->name($label, $name)); |
|
352 | + $data->setField($field_to_save ?: $this->name($label, $name)); |
|
353 | 353 | $data->setOrderByColumn($this->table().".".$data->getField()); |
354 | 354 | $data->setFilterColumn($this->table().".".$data->getField()); |
355 | 355 | $data->setType("number"); |
@@ -366,8 +366,8 @@ discard block |
||
366 | 366 | $data = new MoneyModel(); |
367 | 367 | $data = $this->setDefaultModelValue($data); |
368 | 368 | $data->setLabel($label); |
369 | - $data->setName($this->name($label,$name)); |
|
370 | - $data->setField($field_to_save?:$this->name($label, $name)); |
|
369 | + $data->setName($this->name($label, $name)); |
|
370 | + $data->setField($field_to_save ?: $this->name($label, $name)); |
|
371 | 371 | $data->setOrderByColumn($this->table().".".$data->getField()); |
372 | 372 | $data->setFilterColumn($this->table().".".$data->getField()); |
373 | 373 | $data->setType("money"); |
@@ -384,8 +384,8 @@ discard block |
||
384 | 384 | $data = new RadioModel(); |
385 | 385 | $data = $this->setDefaultModelValue($data); |
386 | 386 | $data->setLabel($label); |
387 | - $data->setName($this->name($label,$name)); |
|
388 | - $data->setField($field_to_save?:$this->name($label, $name)); |
|
387 | + $data->setName($this->name($label, $name)); |
|
388 | + $data->setField($field_to_save ?: $this->name($label, $name)); |
|
389 | 389 | $data->setOrderByColumn($this->table().".".$data->getField()); |
390 | 390 | $data->setFilterColumn($this->table().".".$data->getField()); |
391 | 391 | $data->setType("radio"); |
@@ -402,8 +402,8 @@ discard block |
||
402 | 402 | $data = new WysiwygModel(); |
403 | 403 | $data = $this->setDefaultModelValue($data); |
404 | 404 | $data->setLabel($label); |
405 | - $data->setName($this->name($label,$name)); |
|
406 | - $data->setField($field_to_save?:$this->name($label, $name)); |
|
405 | + $data->setName($this->name($label, $name)); |
|
406 | + $data->setField($field_to_save ?: $this->name($label, $name)); |
|
407 | 407 | $data->setOrderByColumn($this->table().".".$data->getField()); |
408 | 408 | $data->setFilterColumn($this->table().".".$data->getField()); |
409 | 409 | $data->setType("wysiwyg"); |
@@ -223,7 +223,7 @@ discard block |
||
223 | 223 | <select v-model="item.column_type" @change="changeTypeColumn($event, idx)" class="column_type form-control"> |
224 | 224 | @foreach($types as $type) |
225 | 225 | @if($type != "." && $type != ".." && is_dir($dirPath.'/'.$type)) |
226 | - <?php $filterable = (file_exists($dirPath."/filter.blade.php"))?1:0; ?> |
|
226 | + <?php $filterable = (file_exists($dirPath."/filter.blade.php")) ? 1 : 0; ?> |
|
227 | 227 | <option data-filterable="{{ $filterable }}" value="{{ $type }}">{{ $type }}</option> |
228 | 228 | @endif |
229 | 229 | @endforeach |
@@ -797,21 +797,21 @@ discard block |
||
797 | 797 | <?php |
798 | 798 | $font = new \crocodicstudio\crudbooster\helpers\FontAwesome(); |
799 | 799 | $fontData = [ |
800 | - ["data"=>$font->text(),"label"=>"Text"], |
|
801 | - ["data"=>$font->web(),"label"=>"Web"], |
|
802 | - ["data"=>$font->video(),"label"=>"Video"], |
|
803 | - ["data"=>$font->transportation(),"label"=>"Transportation"], |
|
804 | - ["data"=>$font->payment(),"label"=>"Payment"], |
|
805 | - ["data"=>$font->medical(),"label"=>"Medical"], |
|
806 | - ["data"=>$font->hand(),"label"=>"Hand"], |
|
807 | - ["data"=>$font->fileType(),"label"=>"File Type"], |
|
808 | - ["data"=>$font->directional(),"label"=>"Directional"], |
|
809 | - ["data"=>$font->currency(),"label"=>"Currency"], |
|
810 | - ["data"=>$font->chart(),"label"=>"Chart"], |
|
811 | - ["data"=>$font->brands(),"label"=>"Brand"], |
|
812 | - ["data"=>$font->gender(),"label"=>"Gender"], |
|
813 | - ["data"=>$font->form(),"label"=>"Form"], |
|
814 | - ["data"=>$font->spinner(),"label"=>"Spinner"] |
|
800 | + ["data"=>$font->text(), "label"=>"Text"], |
|
801 | + ["data"=>$font->web(), "label"=>"Web"], |
|
802 | + ["data"=>$font->video(), "label"=>"Video"], |
|
803 | + ["data"=>$font->transportation(), "label"=>"Transportation"], |
|
804 | + ["data"=>$font->payment(), "label"=>"Payment"], |
|
805 | + ["data"=>$font->medical(), "label"=>"Medical"], |
|
806 | + ["data"=>$font->hand(), "label"=>"Hand"], |
|
807 | + ["data"=>$font->fileType(), "label"=>"File Type"], |
|
808 | + ["data"=>$font->directional(), "label"=>"Directional"], |
|
809 | + ["data"=>$font->currency(), "label"=>"Currency"], |
|
810 | + ["data"=>$font->chart(), "label"=>"Chart"], |
|
811 | + ["data"=>$font->brands(), "label"=>"Brand"], |
|
812 | + ["data"=>$font->gender(), "label"=>"Gender"], |
|
813 | + ["data"=>$font->form(), "label"=>"Form"], |
|
814 | + ["data"=>$font->spinner(), "label"=>"Spinner"] |
|
815 | 815 | ]; |
816 | 816 | ?> |
817 | 817 | @foreach($fontData as $f) |
@@ -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"> |
@@ -57,7 +57,7 @@ |
||
57 | 57 | <label>Dashboard Controller</label> |
58 | 58 | <select name="dashboard_controller" class="form-control"> |
59 | 59 | <option value="">** Default CB</option> |
60 | - <?php $controllers = glob(app_path("Http/Controllers/*Controller.php"));?> |
|
60 | + <?php $controllers = glob(app_path("Http/Controllers/*Controller.php")); ?> |
|
61 | 61 | @foreach($controllers as $controller) |
62 | 62 | @if(basename($controller) != "Controller.php") |
63 | 63 | <option {{ getSetting("dashboard_controller")==rtrim(basename($controller),".php")?"selected":"" }} value="{{ rtrim(basename($controller),".php") }}">{{ rtrim(basename($controller),".php") }}</option> |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | { |
24 | 24 | // Direct return value because its been uploaded on client side |
25 | 25 | $ext = strtolower(pathinfo($value, PATHINFO_EXTENSION)); |
26 | - if(in_array($ext, cbConfig("UPLOAD_IMAGE_EXTENSION_ALLOWED"))) { |
|
26 | + if (in_array($ext, cbConfig("UPLOAD_IMAGE_EXTENSION_ALLOWED"))) { |
|
27 | 27 | return $value; |
28 | 28 | } |
29 | 29 | } |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | public function detailRender($row, $column) |
32 | 32 | { |
33 | 33 | $column->setValue($row->{ $column->getField() }); |
34 | - return view("types::image.detail",[ |
|
34 | + return view("types::image.detail", [ |
|
35 | 35 | 'row'=>$row, |
36 | 36 | 'column'=>$column |
37 | 37 | ]); |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | public function indexRender($row, $column) |
41 | 41 | { |
42 | 42 | $column->setValue($row->{ $column->getField() }); |
43 | - return view("types::image.index",[ |
|
43 | + return view("types::image.index", [ |
|
44 | 44 | 'row'=>$row, |
45 | 45 | 'column'=>$column |
46 | 46 | ]); |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | public function assignment($value, $column) |
23 | 23 | { |
24 | 24 | $ext = strtolower(pathinfo($value, PATHINFO_EXTENSION)); |
25 | - if(in_array($ext, cbConfig("UPLOAD_FILE_EXTENSION_ALLOWED"))) { |
|
25 | + if (in_array($ext, cbConfig("UPLOAD_FILE_EXTENSION_ALLOWED"))) { |
|
26 | 26 | return $value; |
27 | 27 | } |
28 | 28 | } |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | public function detailRender($row, $column) |
31 | 31 | { |
32 | 32 | $column->setValue($row->{ $column->getField() }); |
33 | - return view("types::file.detail",[ |
|
33 | + return view("types::file.detail", [ |
|
34 | 34 | 'row'=>$row, |
35 | 35 | 'column'=>$column |
36 | 36 | ]); |
@@ -32,10 +32,10 @@ discard block |
||
32 | 32 | |
33 | 33 | public function getIndex() |
34 | 34 | { |
35 | - if(!module()->canBrowse()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
35 | + if (!module()->canBrowse()) return cb()->redirect(cb()->getAdminUrl(), cbLang("you_dont_have_privilege_to_this_area")); |
|
36 | 36 | |
37 | 37 | $query = $this->repository(); |
38 | - $result = $query->paginate( request("limit")?:$this->data['limit'] ); |
|
38 | + $result = $query->paginate(request("limit") ?: $this->data['limit']); |
|
39 | 39 | $data['result'] = $result; |
40 | 40 | |
41 | 41 | return view("crudbooster::module.index.index", array_merge($data, $this->data)); |
@@ -43,17 +43,17 @@ discard block |
||
43 | 43 | |
44 | 44 | public function getAdd() |
45 | 45 | { |
46 | - if(!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
46 | + if (!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(), cbLang("you_dont_have_privilege_to_this_area")); |
|
47 | 47 | |
48 | 48 | $data = []; |
49 | 49 | $data['page_title'] = $this->data['page_title'].' : '.cbLang('add'); |
50 | 50 | $data['action_url'] = module()->addSaveURL(); |
51 | - return view('crudbooster::module.form.form',array_merge($data, $this->data)); |
|
51 | + return view('crudbooster::module.form.form', array_merge($data, $this->data)); |
|
52 | 52 | } |
53 | 53 | |
54 | 54 | public function postAddSave() |
55 | 55 | { |
56 | - if(!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
56 | + if (!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(), cbLang("you_dont_have_privilege_to_this_area")); |
|
57 | 57 | |
58 | 58 | try { |
59 | 59 | $this->validation(); |
@@ -61,38 +61,38 @@ discard block |
||
61 | 61 | $data = columnSingleton()->getAssignmentData(); |
62 | 62 | |
63 | 63 | //Clear data from Primary Key |
64 | - unset($data[ cb()->pk($this->data['table']) ]); |
|
64 | + unset($data[cb()->pk($this->data['table'])]); |
|
65 | 65 | |
66 | - if(Schema::hasColumn($this->data['table'], 'created_at')) { |
|
66 | + if (Schema::hasColumn($this->data['table'], 'created_at')) { |
|
67 | 67 | $data['created_at'] = date('Y-m-d H:i:s'); |
68 | 68 | } |
69 | 69 | |
70 | - if(Schema::hasColumn($this->data['table'], 'updated_at')) { |
|
70 | + if (Schema::hasColumn($this->data['table'], 'updated_at')) { |
|
71 | 71 | $data['updated_at'] = date('Y-m-d H:i:s'); |
72 | 72 | } |
73 | 73 | |
74 | - if(isset($this->data['hook_before_insert']) && is_callable($this->data['hook_before_insert'])) { |
|
74 | + if (isset($this->data['hook_before_insert']) && is_callable($this->data['hook_before_insert'])) { |
|
75 | 75 | $data = call_user_func($this->data['hook_before_insert'], $data); |
76 | 76 | } |
77 | 77 | |
78 | 78 | $id = DB::table($this->data['table'])->insertGetId($data); |
79 | 79 | |
80 | - if(isset($this->data['hook_after_insert']) && is_callable($this->data['hook_after_insert'])) { |
|
80 | + if (isset($this->data['hook_after_insert']) && is_callable($this->data['hook_after_insert'])) { |
|
81 | 81 | call_user_func($this->data['hook_after_insert'], $id); |
82 | 82 | } |
83 | 83 | |
84 | 84 | } catch (CBValidationException $e) { |
85 | 85 | Log::debug($e); |
86 | - return cb()->redirectBack($e->getMessage(),'info'); |
|
86 | + return cb()->redirectBack($e->getMessage(), 'info'); |
|
87 | 87 | } catch (\Exception $e) { |
88 | 88 | Log::error($e); |
89 | - return cb()->redirectBack(cbLang("something_went_wrong"),'warning'); |
|
89 | + return cb()->redirectBack(cbLang("something_went_wrong"), 'warning'); |
|
90 | 90 | } |
91 | 91 | |
92 | - if (Str::contains(request("submit"),cbLang("more"))) { |
|
92 | + if (Str::contains(request("submit"), cbLang("more"))) { |
|
93 | 93 | return cb()->redirectBack(cbLang("the_data_has_been_added"), 'success'); |
94 | 94 | } else { |
95 | - if(verifyReferalUrl()) { |
|
95 | + if (verifyReferalUrl()) { |
|
96 | 96 | return cb()->redirect(getReferalUrl("url"), cbLang("the_data_has_been_added"), 'success'); |
97 | 97 | } else { |
98 | 98 | return cb()->redirect(module()->url(), cbLang("the_data_has_been_added"), 'success'); |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | |
103 | 103 | public function getEdit($id) |
104 | 104 | { |
105 | - if(!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
105 | + if (!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(), cbLang("you_dont_have_privilege_to_this_area")); |
|
106 | 106 | |
107 | 107 | $data = []; |
108 | 108 | $data['row'] = $this->repository()->where($this->data['table'].'.'.getPrimaryKey($this->data['table']), $id)->first(); |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | |
114 | 114 | public function postEditSave($id) |
115 | 115 | { |
116 | - if(!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
116 | + if (!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(), cbLang("you_dont_have_privilege_to_this_area")); |
|
117 | 117 | |
118 | 118 | try { |
119 | 119 | $this->validation(); |
@@ -121,40 +121,40 @@ discard block |
||
121 | 121 | $data = columnSingleton()->getAssignmentData(); |
122 | 122 | |
123 | 123 | // Make sure the Primary Key is not included |
124 | - unset($data[ cb()->pk($this->data['table']) ]); |
|
124 | + unset($data[cb()->pk($this->data['table'])]); |
|
125 | 125 | |
126 | - if(Schema::hasColumn($this->data['table'], 'updated_at')) { |
|
126 | + if (Schema::hasColumn($this->data['table'], 'updated_at')) { |
|
127 | 127 | $data['updated_at'] = date('Y-m-d H:i:s'); |
128 | 128 | } |
129 | 129 | |
130 | 130 | unset($data['created_at']); |
131 | 131 | |
132 | - if(isset($this->data['hook_before_update']) && is_callable($this->data['hook_before_update'])) { |
|
132 | + if (isset($this->data['hook_before_update']) && is_callable($this->data['hook_before_update'])) { |
|
133 | 133 | $data = call_user_func($this->data['hook_before_update'], $data, $id); |
134 | 134 | } |
135 | 135 | |
136 | 136 | cb()->update($this->data['table'], $id, $data); |
137 | 137 | |
138 | - if(isset($this->data['hook_after_update']) && is_callable($this->data['hook_after_update'])) { |
|
138 | + if (isset($this->data['hook_after_update']) && is_callable($this->data['hook_after_update'])) { |
|
139 | 139 | call_user_func($this->data['hook_after_update'], $id); |
140 | 140 | } |
141 | 141 | |
142 | 142 | } catch (CBValidationException $e) { |
143 | 143 | Log::debug($e); |
144 | - return cb()->redirectBack($e->getMessage(),'info'); |
|
144 | + return cb()->redirectBack($e->getMessage(), 'info'); |
|
145 | 145 | } catch (\Exception $e) { |
146 | 146 | Log::error($e); |
147 | - return cb()->redirectBack(cbLang("something_went_wrong"),'warning'); |
|
147 | + return cb()->redirectBack(cbLang("something_went_wrong"), 'warning'); |
|
148 | 148 | } |
149 | 149 | |
150 | 150 | |
151 | 151 | if (Str::contains(request("submit"), cbLang("more"))) { |
152 | - return cb()->redirectBack( cbLang("the_data_has_been_updated"), 'success'); |
|
152 | + return cb()->redirectBack(cbLang("the_data_has_been_updated"), 'success'); |
|
153 | 153 | } else { |
154 | - if(verifyReferalUrl()) { |
|
155 | - return cb()->redirect(getReferalUrl("url"), cbLang("the_data_has_been_updated"), 'success'); |
|
154 | + if (verifyReferalUrl()) { |
|
155 | + return cb()->redirect(getReferalUrl("url"), cbLang("the_data_has_been_updated"), 'success'); |
|
156 | 156 | } else { |
157 | - return cb()->redirect(module()->url(), cbLang("the_data_has_been_updated"), 'success'); |
|
157 | + return cb()->redirect(module()->url(), cbLang("the_data_has_been_updated"), 'success'); |
|
158 | 158 | } |
159 | 159 | |
160 | 160 | } |
@@ -162,15 +162,15 @@ discard block |
||
162 | 162 | |
163 | 163 | public function getDelete($id) |
164 | 164 | { |
165 | - if(!module()->canDelete()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
165 | + if (!module()->canDelete()) return cb()->redirect(cb()->getAdminUrl(), cbLang("you_dont_have_privilege_to_this_area")); |
|
166 | 166 | |
167 | - if(isset($this->data['hook_before_delete']) && is_callable($this->data['hook_before_delete'])) { |
|
167 | + if (isset($this->data['hook_before_delete']) && is_callable($this->data['hook_before_delete'])) { |
|
168 | 168 | call_user_func($this->data['hook_before_delete'], $id); |
169 | 169 | } |
170 | 170 | |
171 | - $softDelete = isset($this->data['disable_soft_delete'])?$this->data['disable_soft_delete']:true; |
|
171 | + $softDelete = isset($this->data['disable_soft_delete']) ? $this->data['disable_soft_delete'] : true; |
|
172 | 172 | |
173 | - if ($softDelete === true && Schema::hasColumn($this->data['table'],'deleted_at')) { |
|
173 | + if ($softDelete === true && Schema::hasColumn($this->data['table'], 'deleted_at')) { |
|
174 | 174 | DB::table($this->data['table']) |
175 | 175 | ->where(getPrimaryKey($this->data['table']), $id) |
176 | 176 | ->update(['deleted_at' => date('Y-m-d H:i:s')]); |
@@ -180,16 +180,16 @@ discard block |
||
180 | 180 | ->delete(); |
181 | 181 | } |
182 | 182 | |
183 | - if(isset($this->data['hook_after_delete']) && is_callable($this->data['hook_after_delete'])) { |
|
183 | + if (isset($this->data['hook_after_delete']) && is_callable($this->data['hook_after_delete'])) { |
|
184 | 184 | call_user_func($this->data['hook_after_delete'], $id); |
185 | 185 | } |
186 | 186 | |
187 | - return cb()->redirectBack( cbLang("the_data_has_been_deleted"), 'success'); |
|
187 | + return cb()->redirectBack(cbLang("the_data_has_been_deleted"), 'success'); |
|
188 | 188 | } |
189 | 189 | |
190 | 190 | public function getDetail($id) |
191 | 191 | { |
192 | - if(!module()->canRead()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
192 | + if (!module()->canRead()) return cb()->redirect(cb()->getAdminUrl(), cbLang("you_dont_have_privilege_to_this_area")); |
|
193 | 193 | |
194 | 194 | $data = []; |
195 | 195 | $data['row'] = $this->repository()->where($this->data['table'].'.'.cb()->findPrimaryKey($this->data['table']), $id)->first(); |
@@ -208,14 +208,14 @@ discard block |
||
208 | 208 | */ |
209 | 209 | public function __call($method, $parameters) |
210 | 210 | { |
211 | - if($method == "getData") { |
|
211 | + if ($method == "getData") { |
|
212 | 212 | $key = $parameters[0]; |
213 | - if(isset($this->data[$key])) { |
|
213 | + if (isset($this->data[$key])) { |
|
214 | 214 | return $this->data[$key]; |
215 | - }else{ |
|
215 | + } else { |
|
216 | 216 | return null; |
217 | 217 | } |
218 | - }else{ |
|
218 | + } else { |
|
219 | 219 | return null; |
220 | 220 | } |
221 | 221 | } |
@@ -32,7 +32,9 @@ discard block |
||
32 | 32 | |
33 | 33 | public function getIndex() |
34 | 34 | { |
35 | - if(!module()->canBrowse()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
35 | + if(!module()->canBrowse()) { |
|
36 | + return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
37 | + } |
|
36 | 38 | |
37 | 39 | $query = $this->repository(); |
38 | 40 | $result = $query->paginate( request("limit")?:$this->data['limit'] ); |
@@ -43,7 +45,9 @@ discard block |
||
43 | 45 | |
44 | 46 | public function getAdd() |
45 | 47 | { |
46 | - if(!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
48 | + if(!module()->canCreate()) { |
|
49 | + return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
50 | + } |
|
47 | 51 | |
48 | 52 | $data = []; |
49 | 53 | $data['page_title'] = $this->data['page_title'].' : '.cbLang('add'); |
@@ -53,7 +57,9 @@ discard block |
||
53 | 57 | |
54 | 58 | public function postAddSave() |
55 | 59 | { |
56 | - if(!module()->canCreate()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
60 | + if(!module()->canCreate()) { |
|
61 | + return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
62 | + } |
|
57 | 63 | |
58 | 64 | try { |
59 | 65 | $this->validation(); |
@@ -102,7 +108,9 @@ discard block |
||
102 | 108 | |
103 | 109 | public function getEdit($id) |
104 | 110 | { |
105 | - if(!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
111 | + if(!module()->canUpdate()) { |
|
112 | + return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
113 | + } |
|
106 | 114 | |
107 | 115 | $data = []; |
108 | 116 | $data['row'] = $this->repository()->where($this->data['table'].'.'.getPrimaryKey($this->data['table']), $id)->first(); |
@@ -113,7 +121,9 @@ discard block |
||
113 | 121 | |
114 | 122 | public function postEditSave($id) |
115 | 123 | { |
116 | - if(!module()->canUpdate()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
124 | + if(!module()->canUpdate()) { |
|
125 | + return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
126 | + } |
|
117 | 127 | |
118 | 128 | try { |
119 | 129 | $this->validation(); |
@@ -162,7 +172,9 @@ discard block |
||
162 | 172 | |
163 | 173 | public function getDelete($id) |
164 | 174 | { |
165 | - if(!module()->canDelete()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
175 | + if(!module()->canDelete()) { |
|
176 | + return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
177 | + } |
|
166 | 178 | |
167 | 179 | if(isset($this->data['hook_before_delete']) && is_callable($this->data['hook_before_delete'])) { |
168 | 180 | call_user_func($this->data['hook_before_delete'], $id); |
@@ -189,7 +201,9 @@ discard block |
||
189 | 201 | |
190 | 202 | public function getDetail($id) |
191 | 203 | { |
192 | - if(!module()->canRead()) return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
204 | + if(!module()->canRead()) { |
|
205 | + return cb()->redirect(cb()->getAdminUrl(),cbLang("you_dont_have_privilege_to_this_area")); |
|
206 | + } |
|
193 | 207 | |
194 | 208 | $data = []; |
195 | 209 | $data['row'] = $this->repository()->where($this->data['table'].'.'.cb()->findPrimaryKey($this->data['table']), $id)->first(); |
@@ -212,10 +226,10 @@ discard block |
||
212 | 226 | $key = $parameters[0]; |
213 | 227 | if(isset($this->data[$key])) { |
214 | 228 | return $this->data[$key]; |
215 | - }else{ |
|
229 | + } else{ |
|
216 | 230 | return null; |
217 | 231 | } |
218 | - }else{ |
|
232 | + } else{ |
|
219 | 233 | return null; |
220 | 234 | } |
221 | 235 | } |
@@ -67,7 +67,7 @@ |
||
67 | 67 | if (Request::is(cb()->getAdminPath())) { |
68 | 68 | if($dashboard = getSetting("dashboard_controller")) { |
69 | 69 | cb()->routeGet("/", $dashboard."@getIndex"); |
70 | - }else{ |
|
70 | + } else{ |
|
71 | 71 | cb()->routeGet("/", "\crocodicstudio\crudbooster\controllers\AdminDashboardController@getIndex"); |
72 | 72 | } |
73 | 73 | } |
@@ -1,61 +1,61 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | // Developer Backend Middleware |
4 | -Route::group(['middleware' => ['web',\crocodicstudio\crudbooster\middlewares\CBDeveloper::class], |
|
4 | +Route::group(['middleware' => ['web', \crocodicstudio\crudbooster\middlewares\CBDeveloper::class], |
|
5 | 5 | 'prefix'=>"developer/".getSetting('developer_path'), |
6 | - 'namespace' => 'crocodicstudio\crudbooster\controllers'], function () { |
|
6 | + 'namespace' => 'crocodicstudio\crudbooster\controllers'], function() { |
|
7 | 7 | cb()->routeController("modules", "\crocodicstudio\crudbooster\controllers\DeveloperModulesController"); |
8 | 8 | cb()->routeController("menus", "\crocodicstudio\crudbooster\controllers\DeveloperMenusController"); |
9 | - cb()->routeController("roles","\crocodicstudio\crudbooster\controllers\DeveloperRolesController"); |
|
10 | - cb()->routeController("users","\crocodicstudio\crudbooster\controllers\DeveloperUsersController"); |
|
11 | - cb()->routeController("plugins","\crocodicstudio\crudbooster\controllers\DeveloperPluginStoreController"); |
|
12 | - cb()->routeController("mail","\crocodicstudio\crudbooster\controllers\DeveloperMailController"); |
|
13 | - cb()->routeController("security","\crocodicstudio\crudbooster\controllers\DeveloperSecurityController"); |
|
14 | - cb()->routeController("themes","\crocodicstudio\crudbooster\controllers\DeveloperThemesController"); |
|
15 | - cb()->routeController("appearance","\crocodicstudio\crudbooster\controllers\DeveloperAppearanceController"); |
|
16 | - cb()->routeController("miscellaneous","\crocodicstudio\crudbooster\controllers\DeveloperMiscellaneousController"); |
|
17 | - cb()->routePost("skip-tutorial","DeveloperDashboardController@postSkipTutorial"); |
|
18 | - cb()->routeGet("/","DeveloperDashboardController@getIndex"); |
|
9 | + cb()->routeController("roles", "\crocodicstudio\crudbooster\controllers\DeveloperRolesController"); |
|
10 | + cb()->routeController("users", "\crocodicstudio\crudbooster\controllers\DeveloperUsersController"); |
|
11 | + cb()->routeController("plugins", "\crocodicstudio\crudbooster\controllers\DeveloperPluginStoreController"); |
|
12 | + cb()->routeController("mail", "\crocodicstudio\crudbooster\controllers\DeveloperMailController"); |
|
13 | + cb()->routeController("security", "\crocodicstudio\crudbooster\controllers\DeveloperSecurityController"); |
|
14 | + cb()->routeController("themes", "\crocodicstudio\crudbooster\controllers\DeveloperThemesController"); |
|
15 | + cb()->routeController("appearance", "\crocodicstudio\crudbooster\controllers\DeveloperAppearanceController"); |
|
16 | + cb()->routeController("miscellaneous", "\crocodicstudio\crudbooster\controllers\DeveloperMiscellaneousController"); |
|
17 | + cb()->routePost("skip-tutorial", "DeveloperDashboardController@postSkipTutorial"); |
|
18 | + cb()->routeGet("/", "DeveloperDashboardController@getIndex"); |
|
19 | 19 | }); |
20 | 20 | |
21 | 21 | // Developer Auth Middleware |
22 | 22 | Route::group(['middleware' => ['web'], |
23 | 23 | 'prefix'=>"developer/".getSetting('developer_path'), |
24 | - 'namespace' => 'crocodicstudio\crudbooster\controllers'], function () { |
|
25 | - cb()->routePost("login","AdminAuthController@postLoginDeveloper"); |
|
26 | - cb()->routeGet("login","AdminAuthController@getLoginDeveloper"); |
|
27 | - cb()->routeGet("logout","AdminAuthController@getLogoutDeveloper"); |
|
24 | + 'namespace' => 'crocodicstudio\crudbooster\controllers'], function() { |
|
25 | + cb()->routePost("login", "AdminAuthController@postLoginDeveloper"); |
|
26 | + cb()->routeGet("login", "AdminAuthController@getLoginDeveloper"); |
|
27 | + cb()->routeGet("logout", "AdminAuthController@getLogoutDeveloper"); |
|
28 | 28 | }); |
29 | 29 | |
30 | 30 | // Routing without any middleware |
31 | -Route::group(['middleware' => ['web'], 'namespace' => '\crocodicstudio\crudbooster\controllers'], function () { |
|
32 | - if(getSetting("AUTO_REDIRECT_TO_LOGIN")) { |
|
33 | - cb()->routeGet("/","AdminAuthController@getRedirectToLogin"); |
|
31 | +Route::group(['middleware' => ['web'], 'namespace' => '\crocodicstudio\crudbooster\controllers'], function() { |
|
32 | + if (getSetting("AUTO_REDIRECT_TO_LOGIN")) { |
|
33 | + cb()->routeGet("/", "AdminAuthController@getRedirectToLogin"); |
|
34 | 34 | } |
35 | 35 | }); |
36 | 36 | |
37 | 37 | // Routing without any middleware with admin prefix |
38 | -Route::group(['middleware' => ['web'], 'prefix' => cb()->getAdminPath(), 'namespace' => 'crocodicstudio\crudbooster\controllers'], function () { |
|
38 | +Route::group(['middleware' => ['web'], 'prefix' => cb()->getAdminPath(), 'namespace' => 'crocodicstudio\crudbooster\controllers'], function() { |
|
39 | 39 | cb()->routeGet('logout', "AdminAuthController@getLogout"); |
40 | 40 | |
41 | - if(!getSetting("DISABLE_LOGIN")) { |
|
41 | + if (!getSetting("DISABLE_LOGIN")) { |
|
42 | 42 | cb()->routePost('login', "AdminAuthController@postLogin"); |
43 | 43 | cb()->routeGet('login', "AdminAuthController@getLogin"); |
44 | - cb()->routeGet("login-verification","AdminAuthController@getLoginVerification"); |
|
45 | - cb()->routePost("submit-login-verification","AdminAuthController@postSubmitLoginVerification"); |
|
44 | + cb()->routeGet("login-verification", "AdminAuthController@getLoginVerification"); |
|
45 | + cb()->routePost("submit-login-verification", "AdminAuthController@postSubmitLoginVerification"); |
|
46 | 46 | } |
47 | 47 | |
48 | - if(getSetting("enable_forget")) { |
|
49 | - cb()->routePost("forget","AdminAuthController@postForget"); |
|
48 | + if (getSetting("enable_forget")) { |
|
49 | + cb()->routePost("forget", "AdminAuthController@postForget"); |
|
50 | 50 | } |
51 | 51 | |
52 | - if(getSetting("enable_register")) { |
|
53 | - cb()->routePost("register","AdminAuthController@postRegister"); |
|
52 | + if (getSetting("enable_register")) { |
|
53 | + cb()->routePost("register", "AdminAuthController@postRegister"); |
|
54 | 54 | } |
55 | 55 | }); |
56 | 56 | |
57 | 57 | // Routing package controllers |
58 | -cb()->routeGroupBackend(function () { |
|
58 | +cb()->routeGroupBackend(function() { |
|
59 | 59 | cb()->routeController('profile', '\crocodicstudio\crudbooster\controllers\AdminProfileController'); |
60 | 60 | }); |
61 | 61 | |
@@ -64,24 +64,24 @@ discard block |
||
64 | 64 | 'middleware' => ['web', \crocodicstudio\crudbooster\middlewares\CBBackend::class], |
65 | 65 | 'prefix' => cb()->getAdminPath(), |
66 | 66 | 'namespace' => 'App\Http\Controllers', |
67 | -], function () { |
|
67 | +], function() { |
|
68 | 68 | |
69 | 69 | if (Request::is(cb()->getAdminPath())) { |
70 | - if($dashboard = getSetting("dashboard_controller")) { |
|
70 | + if ($dashboard = getSetting("dashboard_controller")) { |
|
71 | 71 | cb()->routeGet("/", $dashboard."@getIndex"); |
72 | - }else{ |
|
72 | + } else { |
|
73 | 73 | cb()->routeGet("/", "\crocodicstudio\crudbooster\controllers\AdminDashboardController@getIndex"); |
74 | 74 | } |
75 | 75 | } |
76 | 76 | |
77 | 77 | $controllers = glob(app_path('Http/Controllers/Admin*Controller.php')); |
78 | 78 | |
79 | - foreach($controllers as $controller) { |
|
79 | + foreach ($controllers as $controller) { |
|
80 | 80 | $controllerName = basename($controller); |
81 | - $controllerName = rtrim($controllerName,".php"); |
|
81 | + $controllerName = rtrim($controllerName, ".php"); |
|
82 | 82 | $className = '\App\Http\Controllers\\'.$controllerName; |
83 | 83 | $controllerClass = new $className(); |
84 | - if(method_exists($controllerClass, 'cbInit')) { |
|
84 | + if (method_exists($controllerClass, 'cbInit')) { |
|
85 | 85 | cb()->routeController($controllerClass->getData('permalink'), $controllerName); |
86 | 86 | } |
87 | 87 | } |