@@ -60,7 +60,7 @@ |
||
60 | 60 | { |
61 | 61 | $methods = (new \ReflectionClass($ctrl))->getMethods(\ReflectionMethod::IS_PUBLIC); |
62 | 62 | |
63 | - return array_filter($methods, function ($method) { |
|
63 | + return array_filter($methods, function($method) { |
|
64 | 64 | return ($method->class !== 'Illuminate\Routing\Controller' && $method->name !== 'getIndex'); |
65 | 65 | }); |
66 | 66 | } |
@@ -58,7 +58,7 @@ |
||
58 | 58 | */ |
59 | 59 | private function limitRows($data) |
60 | 60 | { |
61 | - $num = (int)$data['limit'] ?: 10; |
|
61 | + $num = (int) $data['limit'] ?: 10; |
|
62 | 62 | $this->rows->take($num); |
63 | 63 | } |
64 | 64 |
@@ -27,7 +27,7 @@ |
||
27 | 27 | $format_validation[] = $this->existOrUnique($config, $type); |
28 | 28 | } elseif (in_array($type, ['date_format', 'digits_between', 'in', 'mimes', 'min', 'max', 'not_in'])) { |
29 | 29 | $format_validation[] = $type.':'.$config; |
30 | - } elseif (! in_array($type, $typeExcept)) { |
|
30 | + } elseif (!in_array($type, $typeExcept)) { |
|
31 | 31 | $format_validation[] = $type; |
32 | 32 | } |
33 | 33 |
@@ -94,11 +94,11 @@ discard block |
||
94 | 94 | $component_name = $component->component_name; |
95 | 95 | $area_name = $component->area_name; |
96 | 96 | $config = json_decode($component->config); |
97 | - if (! $config) { |
|
97 | + if (!$config) { |
|
98 | 98 | return response()->json(compact('componentID', 'layout')); |
99 | 99 | } |
100 | 100 | foreach ($config as $key => $value) { |
101 | - if (! $value) { |
|
101 | + if (!$value) { |
|
102 | 102 | continue; |
103 | 103 | } |
104 | 104 | $command = 'showFunction'; |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | 'name' => 'Untitled', |
127 | 127 | ]; |
128 | 128 | |
129 | - if (! $data['created_at'] && Schema::hasColumn('cms_statistic_components', 'created_at')) { |
|
129 | + if (!$data['created_at'] && Schema::hasColumn('cms_statistic_components', 'created_at')) { |
|
130 | 130 | $data['created_at'] = YmdHis(); |
131 | 131 | } |
132 | 132 |
@@ -6,7 +6,7 @@ |
||
6 | 6 | { |
7 | 7 | public static function getSetting($name) |
8 | 8 | { |
9 | - return cache()->rememberForever('crudbooster_setting_'.$name, function () use($name) { |
|
9 | + return cache()->rememberForever('crudbooster_setting_'.$name, function() use($name) { |
|
10 | 10 | return \DB::table('cms_settings')->where('name', $name)->first()->content; |
11 | 11 | }); |
12 | 12 | } |
@@ -8,49 +8,49 @@ discard block |
||
8 | 8 | | --------------------------------------------------------------------------------------------------------------- |
9 | 9 | | |
10 | 10 | */ |
11 | -if (! function_exists('cbModulesNS')) { |
|
11 | +if (!function_exists('cbModulesNS')) { |
|
12 | 12 | function cbModulesNS(string $path = ''): string |
13 | 13 | { |
14 | 14 | return \crocodicstudio\crudbooster\helpers\CbStructure::cbModulesNS($path); |
15 | 15 | } |
16 | 16 | } |
17 | 17 | |
18 | -if (! function_exists('cbStartMarker')) { |
|
18 | +if (!function_exists('cbStartMarker')) { |
|
19 | 19 | function cbStartMarker(string $section): string |
20 | 20 | { |
21 | 21 | return "# START $section DO NOT REMOVE THIS LINE"; |
22 | 22 | } |
23 | 23 | } |
24 | 24 | |
25 | -if (! function_exists('cbEndMarker')) { |
|
25 | +if (!function_exists('cbEndMarker')) { |
|
26 | 26 | function cbEndMarker(string $section): string |
27 | 27 | { |
28 | 28 | return "# END $section DO NOT REMOVE THIS LINE"; |
29 | 29 | } |
30 | 30 | } |
31 | 31 | |
32 | -if (! function_exists('cbAdminPath')) { |
|
32 | +if (!function_exists('cbAdminPath')) { |
|
33 | 33 | function cbAdminPath(): string |
34 | 34 | { |
35 | 35 | return cbConfig('ADMIN_PATH'); |
36 | 36 | } |
37 | 37 | } |
38 | 38 | |
39 | -if (! function_exists('ctrlNamespace')) { |
|
39 | +if (!function_exists('ctrlNamespace')) { |
|
40 | 40 | function ctrlNamespace(): string |
41 | 41 | { |
42 | 42 | return \crocodicstudio\crudbooster\helpers\CbStructure::ctrlNamespace(); |
43 | 43 | } |
44 | 44 | } |
45 | 45 | |
46 | -if (! function_exists('cbControllersNS')) { |
|
46 | +if (!function_exists('cbControllersNS')) { |
|
47 | 47 | function cbControllersNS(): string |
48 | 48 | { |
49 | 49 | return \crocodicstudio\crudbooster\helpers\CbStructure::cbControllersNS(); |
50 | 50 | } |
51 | 51 | } |
52 | 52 | |
53 | -if (! function_exists('is_checked')) { |
|
53 | +if (!function_exists('is_checked')) { |
|
54 | 54 | /** |
55 | 55 | * @param $format |
56 | 56 | * @param $value |
@@ -74,35 +74,35 @@ discard block |
||
74 | 74 | } |
75 | 75 | } |
76 | 76 | |
77 | -if (! function_exists('CbComponentsPath')) { |
|
77 | +if (!function_exists('CbComponentsPath')) { |
|
78 | 78 | function CbComponentsPath(string $type = ''): string |
79 | 79 | { |
80 | 80 | return \crocodicstudio\crudbooster\helpers\CbStructure::componentsPath($type); |
81 | 81 | } |
82 | 82 | } |
83 | 83 | |
84 | -if (! function_exists('CbPublishedComponentsPath')) { |
|
84 | +if (!function_exists('CbPublishedComponentsPath')) { |
|
85 | 85 | function CbPublishedComponentsPath(string $type = ''): string |
86 | 86 | { |
87 | 87 | return \crocodicstudio\crudbooster\helpers\CbStructure::publishedComponentsPath($type); |
88 | 88 | } |
89 | 89 | } |
90 | 90 | |
91 | -if (! function_exists('controllers_dir')) { |
|
91 | +if (!function_exists('controllers_dir')) { |
|
92 | 92 | function controllers_dir(): string |
93 | 93 | { |
94 | 94 | return \crocodicstudio\crudbooster\helpers\CbStructure::controllersDir(); |
95 | 95 | } |
96 | 96 | } |
97 | 97 | |
98 | -if (! function_exists('controller_path')) { |
|
98 | +if (!function_exists('controller_path')) { |
|
99 | 99 | function controller_path(string $controller): string |
100 | 100 | { |
101 | 101 | return \crocodicstudio\crudbooster\helpers\CbStructure::controllerPath($controller); |
102 | 102 | } |
103 | 103 | } |
104 | 104 | |
105 | -if (! function_exists('now')) { |
|
105 | +if (!function_exists('now')) { |
|
106 | 106 | function now() |
107 | 107 | { |
108 | 108 | return date('Y-m-d H:i:s'); |
@@ -116,14 +116,14 @@ discard block |
||
116 | 116 | | $name = name of input |
117 | 117 | | |
118 | 118 | */ |
119 | -if (! function_exists('g')) { |
|
119 | +if (!function_exists('g')) { |
|
120 | 120 | function g($name) |
121 | 121 | { |
122 | 122 | return Request::get($name); |
123 | 123 | } |
124 | 124 | } |
125 | 125 | |
126 | -if (! function_exists('cbTrans')) { |
|
126 | +if (!function_exists('cbTrans')) { |
|
127 | 127 | /** |
128 | 128 | * Translate the given message. |
129 | 129 | * |
@@ -137,34 +137,34 @@ discard block |
||
137 | 137 | } |
138 | 138 | } |
139 | 139 | |
140 | -if (! function_exists('cbAsset')) { |
|
140 | +if (!function_exists('cbAsset')) { |
|
141 | 141 | function cbAsset($key) |
142 | 142 | { |
143 | 143 | return asset('vendor/crudbooster/assets/'.$key); |
144 | 144 | } |
145 | 145 | } |
146 | 146 | |
147 | -if (! function_exists('cbScript')) { |
|
147 | +if (!function_exists('cbScript')) { |
|
148 | 148 | function cbScript($key) |
149 | 149 | { |
150 | 150 | return '<script src="'.cbAsset($key).'" type="text/javascript"></script>'; |
151 | 151 | } |
152 | 152 | } |
153 | 153 | |
154 | -if (! function_exists('cbStyleSheet')) { |
|
154 | +if (!function_exists('cbStyleSheet')) { |
|
155 | 155 | function cbStyleSheet($key) |
156 | 156 | { |
157 | 157 | return '<link rel="stylesheet" type="text/css" href="'.cbAsset($key).'"/>'; |
158 | 158 | } |
159 | 159 | } |
160 | 160 | |
161 | -if (! function_exists('cbConfig')) { |
|
161 | +if (!function_exists('cbConfig')) { |
|
162 | 162 | function cbConfig($key, $default = null) |
163 | 163 | { |
164 | 164 | return config('crudbooster.'.$key, $default); |
165 | 165 | } |
166 | 166 | } |
167 | -if (! function_exists('makeValidationForHTML')) { |
|
167 | +if (!function_exists('makeValidationForHTML')) { |
|
168 | 168 | function makeValidationForHTML($rules) |
169 | 169 | { |
170 | 170 | $validation = []; |
@@ -182,7 +182,7 @@ discard block |
||
182 | 182 | } |
183 | 183 | } |
184 | 184 | |
185 | -if (! function_exists('findSelected')) { |
|
185 | +if (!function_exists('findSelected')) { |
|
186 | 186 | /** |
187 | 187 | * @param $rawvalue |
188 | 188 | * @param $form |
@@ -191,7 +191,7 @@ discard block |
||
191 | 191 | */ |
192 | 192 | function findSelected($rawvalue, $form, $optionValue) |
193 | 193 | { |
194 | - if (! $rawvalue) { |
|
194 | + if (!$rawvalue) { |
|
195 | 195 | return ''; |
196 | 196 | } |
197 | 197 | $value = $rawvalue; |
@@ -213,7 +213,7 @@ discard block |
||
213 | 213 | return $selected; |
214 | 214 | } |
215 | 215 | } |
216 | -if (! function_exists('array_get_keys')) { |
|
216 | +if (!function_exists('array_get_keys')) { |
|
217 | 217 | |
218 | 218 | /** |
219 | 219 | * @param array $_array |
@@ -229,21 +229,21 @@ discard block |
||
229 | 229 | } |
230 | 230 | } |
231 | 231 | |
232 | -if (! function_exists('cbGetSetting')) { |
|
232 | +if (!function_exists('cbGetSetting')) { |
|
233 | 233 | function cbGetSetting($name) |
234 | 234 | { |
235 | 235 | return \crocodicstudio\crudbooster\Modules\SettingModule\SettingRepo::getSetting($name); |
236 | 236 | } |
237 | 237 | } |
238 | 238 | |
239 | -if (! function_exists('backWithMsg')) { |
|
239 | +if (!function_exists('backWithMsg')) { |
|
240 | 240 | function backWithMsg($msg, $type = 'success') |
241 | 241 | { |
242 | - sendAndTerminate(redirect()->back()->with(['message' => $msg, 'message_type' => $type,])); |
|
242 | + sendAndTerminate(redirect()->back()->with(['message' => $msg, 'message_type' => $type, ])); |
|
243 | 243 | } |
244 | 244 | } |
245 | 245 | |
246 | -if (! function_exists('underField')) { |
|
246 | +if (!function_exists('underField')) { |
|
247 | 247 | function underField($help, $error) |
248 | 248 | { |
249 | 249 | $error = $error ? "<i class='fa fa-info-circle'></i> $error" : ''; |
@@ -251,14 +251,14 @@ discard block |
||
251 | 251 | return "<div class='text-danger'>$error</div><p class='help-block'>$help</p>"; |
252 | 252 | } |
253 | 253 | } |
254 | -if (! function_exists('cbIcon')) { |
|
254 | +if (!function_exists('cbIcon')) { |
|
255 | 255 | function cbIcon($icon) |
256 | 256 | { |
257 | 257 | return '<i class=\'fa fa-'.$icon.'\'></i>'; |
258 | 258 | } |
259 | 259 | } |
260 | 260 | |
261 | -if (! function_exists('YmdHis')) { |
|
261 | +if (!function_exists('YmdHis')) { |
|
262 | 262 | function YmdHis() |
263 | 263 | { |
264 | 264 | return date('Y-m-d H:i:s'); |
@@ -23,12 +23,12 @@ discard block |
||
23 | 23 | $this->genericLoader(); |
24 | 24 | $selectedIds = request('checkbox'); |
25 | 25 | $btnName = request('button_name'); |
26 | - if (! $selectedIds) { |
|
26 | + if (!$selectedIds) { |
|
27 | 27 | backWithMsg(cbTrans('at_least_one_row'), 'warning'); |
28 | 28 | } |
29 | 29 | if ($btnName == 'delete') { |
30 | 30 | (new DataRemover($this))->doDeleteWithHook($selectedIds); |
31 | - $this->insertLog('log_delete', implode(',', $selectedIds) . ' - '. $this->table); |
|
31 | + $this->insertLog('log_delete', implode(',', $selectedIds).' - '.$this->table); |
|
32 | 32 | backWithMsg(cbTrans('alert_delete_selected_success')); |
33 | 33 | } |
34 | 34 | |
@@ -47,8 +47,8 @@ discard block |
||
47 | 47 | $message = cbTrans('alert_action', ['action' => $action]); |
48 | 48 | |
49 | 49 | if ($this->actionButtonSelected($id_selected, $button_name) === false) { |
50 | - $message = ! empty($this->alert['message']) ? $this->alert['message'] : 'Error'; |
|
51 | - $type = ! empty($this->alert['type']) ? $this->alert['type'] : 'danger'; |
|
50 | + $message = !empty($this->alert['message']) ? $this->alert['message'] : 'Error'; |
|
51 | + $type = !empty($this->alert['type']) ? $this->alert['type'] : 'danger'; |
|
52 | 52 | } |
53 | 53 | |
54 | 54 | backWithMsg($message, $type); |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | |
68 | 68 | $this->findRow($id)->update([$column => null]); |
69 | 69 | |
70 | - $this->insertLog('log_delete_image', $id . ' - '. $this->table); |
|
70 | + $this->insertLog('log_delete_image', $id.' - '.$this->table); |
|
71 | 71 | |
72 | 72 | backWithMsg(cbTrans('alert_delete_data_success')); |
73 | 73 | } |
@@ -24,15 +24,15 @@ discard block |
||
24 | 24 | { |
25 | 25 | $this->cbLoader(); |
26 | 26 | |
27 | - $columns = array_filter(\Schema::getColumnListing($table), function ($colName) { |
|
28 | - return ! (in_array($colName, ['created_at', 'deleted_at', 'updated_at'])); |
|
27 | + $columns = array_filter(\Schema::getColumnListing($table), function($colName) { |
|
28 | + return !(in_array($colName, ['created_at', 'deleted_at', 'updated_at'])); |
|
29 | 29 | }); |
30 | 30 | |
31 | 31 | $result = []; |
32 | 32 | foreach ($columns as $colName) { |
33 | 33 | $result[] = ['name' => $colName, 'type' => $this->getFieldType($colName, $table)]; |
34 | 34 | |
35 | - if (! in_array($type, ['list', 'detail']) || ! starts_with($colName, 'id_')) { |
|
35 | + if (!in_array($type, ['list', 'detail']) || !starts_with($colName, 'id_')) { |
|
36 | 36 | continue; |
37 | 37 | } |
38 | 38 | $relatedTable = str_after($colName, 'id_'); |
@@ -73,8 +73,8 @@ discard block |
||
73 | 73 | private function addRelatedTableColTypes($table, $result) |
74 | 74 | { |
75 | 75 | $columns = DB::getSchemaBuilder()->getColumnListing($table); |
76 | - $columns = array_filter($columns, function ($col) { |
|
77 | - return ! FieldDetector::isExceptional($col) && !starts_with($col, 'id_'); |
|
76 | + $columns = array_filter($columns, function($col) { |
|
77 | + return !FieldDetector::isExceptional($col) && !starts_with($col, 'id_'); |
|
78 | 78 | }); |
79 | 79 | |
80 | 80 | foreach ($columns as $col) { |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | */ |
68 | 68 | public function validateForImport($file) |
69 | 69 | { |
70 | - return Validator::make(['extension' => $file->getClientOriginalExtension(),], ['extension' => 'in:xls,xlsx,csv']); |
|
70 | + return Validator::make(['extension' => $file->getClientOriginalExtension(), ], ['extension' => 'in:xls,xlsx,csv']); |
|
71 | 71 | } |
72 | 72 | |
73 | 73 | /** |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | |
83 | 83 | $file = base64_decode(request('file')); |
84 | 84 | $file = 'storage'.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.$file; |
85 | - $rows = Excel::load($file, function ($reader) { |
|
85 | + $rows = Excel::load($file, function($reader) { |
|
86 | 86 | })->get(); |
87 | 87 | |
88 | 88 | //$data_import_column = []; |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | foreach ($selectColumn as $sk => $s) { |
128 | 128 | $colname = $table_columns[$sk]; |
129 | 129 | |
130 | - if (! DbInspector::isForeignKey($colname) || intval($value->$s)) { |
|
130 | + if (!DbInspector::isForeignKey($colname) || intval($value->$s)) { |
|
131 | 131 | $a[$colname] = $value->$s; |
132 | 132 | continue; |
133 | 133 | } |
@@ -175,10 +175,10 @@ discard block |
||
175 | 175 | { |
176 | 176 | $module = ModulesRepo::getByTableName($table); |
177 | 177 | if (is_null($module)) { |
178 | - return ; |
|
178 | + return; |
|
179 | 179 | } |
180 | 180 | $relation_class = __NAMESPACE__.'\\'.$module->controller; |
181 | - if (! class_exists($relation_class)) { |
|
181 | + if (!class_exists($relation_class)) { |
|
182 | 182 | $relation_class = ctrlNamespace().'\\'.$module->controller; |
183 | 183 | } |
184 | 184 |