@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | { |
33 | 33 | $filterColumn = $this->filterFalsyValues($filterColumn); |
34 | 34 | |
35 | - $this->query->where(function ($query) use ($filterColumn) { |
|
35 | + $this->query->where(function($query) use ($filterColumn) { |
|
36 | 36 | foreach ($filterColumn as $key => $fc) { |
37 | 37 | |
38 | 38 | $value = array_get($fc, 'value'); |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | case 'in': |
56 | 56 | case 'not in': |
57 | 57 | $value = explode(',', $value); |
58 | - if (! empty($value)) { |
|
58 | + if (!empty($value)) { |
|
59 | 59 | $query->whereIn($key, $value); |
60 | 60 | } |
61 | 61 | break; |
@@ -97,11 +97,11 @@ discard block |
||
97 | 97 | */ |
98 | 98 | private function filterFalsyValues($filterColumn) |
99 | 99 | { |
100 | - return array_filter($filterColumn, function ($fc) { |
|
100 | + return array_filter($filterColumn, function($fc) { |
|
101 | 101 | $value = array_get($fc, 'value'); |
102 | 102 | $type = array_get($fc, 'type'); |
103 | 103 | |
104 | - if (($type == 'between') || ! $value || ! $type) { |
|
104 | + if (($type == 'between') || !$value || !$type) { |
|
105 | 105 | return false; |
106 | 106 | } |
107 | 107 |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | //LISTING INDEX HTML |
111 | 111 | $addAction = $this->cb->data['addAction']; |
112 | 112 | |
113 | - if (! empty($this->cb->sub_module)) { |
|
113 | + if (!empty($this->cb->sub_module)) { |
|
114 | 114 | $addAction = $this->_handleSubModules($addAction); |
115 | 115 | } |
116 | 116 | |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | return CRUDBooster::adminPath($module['path']).'?parent_table='.$parentTable.'&parent_columns=' |
159 | 159 | .$module['parent_columns'].'&parent_columns_alias=' |
160 | 160 | .$module['parent_columns_alias'].'&parent_id=[' |
161 | - .(! isset($module['custom_parent_id']) ? "id" : $module['custom_parent_id']) |
|
161 | + .(!isset($module['custom_parent_id']) ? "id" : $module['custom_parent_id']) |
|
162 | 162 | .']&return_url='.urlencode(request()->fullUrl()).'&foreign_key=' |
163 | 163 | .$module['foreign_key'].'&label='.urlencode($module['label']); |
164 | 164 | } |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | //$orig_mainpath = $CbCtrl->data['mainpath']; |
78 | 78 | //$titleField = $CbCtrl->titleField; |
79 | 79 | $number = (request('page', 1) - 1) * $limit + 1; |
80 | - $columnsTable = array_filter($columns, function ($col) { |
|
80 | + $columnsTable = array_filter($columns, function($col) { |
|
81 | 81 | return $col['visible'] !== false; |
82 | 82 | }); |
83 | 83 | $htmlContents = (new RowContent($CbCtrl))->calculate($data, $number, $columnsTable); //end foreach data[result] |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | $data['parent_field'] = DbInspector::getRelatedTableName($parent); |
102 | 102 | } |
103 | 103 | |
104 | - if (! $data['parent_field']) { |
|
104 | + if (!$data['parent_field']) { |
|
105 | 105 | return $data; |
106 | 106 | } |
107 | 107 | |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | */ |
121 | 121 | private function _filterForParent($result) |
122 | 122 | { |
123 | - if (! request('parent_id')) { |
|
123 | + if (!request('parent_id')) { |
|
124 | 124 | return null; |
125 | 125 | } |
126 | 126 | |
@@ -191,9 +191,9 @@ discard block |
||
191 | 191 | private function _applyWhereAndQfilters($result, $columnsTable, $table) |
192 | 192 | { |
193 | 193 | if (request('q')) { |
194 | - $result->where(function ($query) use ($columnsTable) { |
|
194 | + $result->where(function($query) use ($columnsTable) { |
|
195 | 195 | foreach ($columnsTable as $col) { |
196 | - if (! $col['field_with']) { |
|
196 | + if (!$col['field_with']) { |
|
197 | 197 | continue; |
198 | 198 | } |
199 | 199 | $query->orwhere($col['field_with'], "like", "%".request("q")."%"); |
@@ -12,7 +12,7 @@ |
||
12 | 12 | */ |
13 | 13 | public function handle($query, $table, $orderBy, $primaryKey) |
14 | 14 | { |
15 | - if (! $orderBy) { |
|
15 | + if (!$orderBy) { |
|
16 | 16 | $query->orderby($table.'.'.$primaryKey, 'desc'); |
17 | 17 | return; |
18 | 18 | } |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | |
20 | 20 | $validator = \Validator::make(request()->all(), $rules); |
21 | 21 | |
22 | - if (! $validator->fails()) { |
|
22 | + if (!$validator->fails()) { |
|
23 | 23 | return null; |
24 | 24 | } |
25 | 25 | |
@@ -37,12 +37,12 @@ discard block |
||
37 | 37 | $rules = []; |
38 | 38 | foreach ($form as $formInput) { |
39 | 39 | $name = $formInput['name']; |
40 | - if (! $name) { |
|
40 | + if (!$name) { |
|
41 | 41 | continue; |
42 | 42 | } |
43 | 43 | |
44 | 44 | $ai = []; |
45 | - if ($formInput['required'] && ! \Request::hasFile($name)) { |
|
45 | + if ($formInput['required'] && !\Request::hasFile($name)) { |
|
46 | 46 | $ai[] = 'required'; |
47 | 47 | } |
48 | 48 | |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | { |
72 | 72 | $exp = explode('|', $formInput['validation']); |
73 | 73 | |
74 | - $uniqueRules = array_filter($exp, function($item){ |
|
74 | + $uniqueRules = array_filter($exp, function($item) { |
|
75 | 75 | return starts_with($item, 'unique'); |
76 | 76 | }); |
77 | 77 |
@@ -4,11 +4,11 @@ discard block |
||
4 | 4 | |
5 | 5 | $namespace = cbControllersNS(); |
6 | 6 | /* ROUTER FOR UPLOADS */ |
7 | -Route::group(['middleware' => ['web'], 'namespace' => $namespace], function () { |
|
7 | +Route::group(['middleware' => ['web'], 'namespace' => $namespace], function() { |
|
8 | 8 | Route::get('uploads/{one?}/{two?}/{three?}/{four?}/{five?}', ['uses' => 'FileController@getPreview', 'as' => 'fileControllerPreview']); |
9 | 9 | }); |
10 | 10 | |
11 | -Route::group(['middleware' => ['web']], function () { |
|
11 | +Route::group(['middleware' => ['web']], function() { |
|
12 | 12 | Route::get(cbAdminPath(), '\crocodicstudio\crudbooster\controllers\DashboardController@index')->name('CbDashboard'); |
13 | 13 | }); |
14 | 14 | |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | 'middleware' => ['web', \crocodicstudio\crudbooster\CBCoreModule\middlewares\CBBackend::class], |
18 | 18 | 'prefix' => cbAdminPath(), |
19 | 19 | 'namespace' => ctrlNamespace(), |
20 | -], function () { |
|
20 | +], function() { |
|
21 | 21 | try { |
22 | 22 | $argv = request()->server('argv'); |
23 | 23 | if (is_array($argv) && isset($argv[1]) && !starts_with($argv[1], 'route:')) { |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | 'middleware' => ['web', \crocodicstudio\crudbooster\CBCoreModule\middlewares\CBSuperadmin::class], |
38 | 38 | 'prefix' => cbAdminPath(), |
39 | 39 | 'namespace' => $namespace, |
40 | -], function () { |
|
40 | +], function() { |
|
41 | 41 | Route::post('{module}/do-upload-import-data', 'FileController@uploadImportData')->name('UploadImportData'); |
42 | 42 | Route::post('{module}/upload-summernote', 'FileController@uploadSummernote')->name('UploadImportData'); |
43 | 43 | Route::post('{module}/upload-file', 'FileController@uploadFile')->name('UploadImportData'); |
@@ -24,9 +24,9 @@ |
||
24 | 24 | public static function getCurrentModule() |
25 | 25 | { |
26 | 26 | $modulePath = self::getModulePath(); |
27 | - return cache()->remember('crudbooster_modules_'.$modulePath, 2, function () use ($modulePath) { |
|
27 | + return cache()->remember('crudbooster_modules_'.$modulePath, 2, function() use ($modulePath) { |
|
28 | 28 | $module = app('CbModulesRegistery')->getModule($modulePath); |
29 | - return $module?: ModulesRepo::getByPath($modulePath); |
|
29 | + return $module ?: ModulesRepo::getByPath($modulePath); |
|
30 | 30 | }); |
31 | 31 | } |
32 | 32 |
@@ -15,11 +15,11 @@ discard block |
||
15 | 15 | */ |
16 | 16 | public static function findPK(string $table): string |
17 | 17 | { |
18 | - if (! $table) { |
|
18 | + if (!$table) { |
|
19 | 19 | return 'id'; |
20 | 20 | } |
21 | 21 | |
22 | - return cache()->remember('CrudBooster_pk_'.$table, 10, function () use ($table) { |
|
22 | + return cache()->remember('CrudBooster_pk_'.$table, 10, function() use ($table) { |
|
23 | 23 | return self::findPKname($table) ?: 'id'; |
24 | 24 | }); |
25 | 25 | } |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | private static function findPKname($table) |
32 | 32 | { |
33 | 33 | $pk = \DB::getDoctrineSchemaManager()->listTableDetails($table)->getPrimaryKey(); |
34 | - if(!$pk) { |
|
34 | + if (!$pk) { |
|
35 | 35 | throw new \Exception("The '$table' table does not have a primary key"); |
36 | 36 | } |
37 | 37 | $cols = $pk->getColumns(); |
@@ -46,11 +46,11 @@ discard block |
||
46 | 46 | public static function isNullableColumn($table, $colName) |
47 | 47 | { |
48 | 48 | $colObj = \DB::getDoctrineSchemaManager()->listTableColumns($table)[$colName]; |
49 | - if (! $colObj) { |
|
49 | + if (!$colObj) { |
|
50 | 50 | return; |
51 | 51 | } |
52 | 52 | |
53 | - return ! $colObj->getNotnull(); |
|
53 | + return !$colObj->getNotnull(); |
|
54 | 54 | } |
55 | 55 | |
56 | 56 | /** |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | */ |
79 | 79 | public static function isForeignKey($fieldName) |
80 | 80 | { |
81 | - return Cache::rememberForever('crudbooster_isForeignKey_'.$fieldName, function () use ($fieldName) { |
|
81 | + return Cache::rememberForever('crudbooster_isForeignKey_'.$fieldName, function() use ($fieldName) { |
|
82 | 82 | $table = self::getRelatedTableName($fieldName); |
83 | 83 | return ($table && Schema::hasTable($table)); |
84 | 84 | }); |
@@ -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,28 +74,28 @@ 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); |
@@ -109,14 +109,14 @@ discard block |
||
109 | 109 | | $name = name of input |
110 | 110 | | |
111 | 111 | */ |
112 | -if (! function_exists('g')) { |
|
112 | +if (!function_exists('g')) { |
|
113 | 113 | function g($name) |
114 | 114 | { |
115 | 115 | return Request::get($name); |
116 | 116 | } |
117 | 117 | } |
118 | 118 | |
119 | -if (! function_exists('cbTrans')) { |
|
119 | +if (!function_exists('cbTrans')) { |
|
120 | 120 | /** |
121 | 121 | * Translate the given message. |
122 | 122 | * |
@@ -130,38 +130,38 @@ discard block |
||
130 | 130 | } |
131 | 131 | } |
132 | 132 | |
133 | -if (! function_exists('cbAsset')) { |
|
133 | +if (!function_exists('cbAsset')) { |
|
134 | 134 | function cbAsset($key) |
135 | 135 | { |
136 | 136 | return asset('vendor/crudbooster/assets/'.$key); |
137 | 137 | } |
138 | 138 | } |
139 | 139 | |
140 | -if (! function_exists('cbScript')) { |
|
140 | +if (!function_exists('cbScript')) { |
|
141 | 141 | function cbScript($key) |
142 | 142 | { |
143 | 143 | return '<script src="'.cbAsset($key).'" type="text/javascript"></script>'; |
144 | 144 | } |
145 | 145 | } |
146 | 146 | |
147 | -if (! function_exists('cbStyleSheet')) { |
|
147 | +if (!function_exists('cbStyleSheet')) { |
|
148 | 148 | function cbStyleSheet($key) |
149 | 149 | { |
150 | 150 | return '<link rel="stylesheet" type="text/css" href="'.cbAsset($key).'"/>'; |
151 | 151 | } |
152 | 152 | } |
153 | 153 | |
154 | -if (! function_exists('cbConfig')) { |
|
154 | +if (!function_exists('cbConfig')) { |
|
155 | 155 | function cbConfig($key, $default = null) |
156 | 156 | { |
157 | 157 | return config('crudbooster.'.$key, $default); |
158 | 158 | } |
159 | 159 | } |
160 | -if (! function_exists('makeValidationForHTML')) { |
|
160 | +if (!function_exists('makeValidationForHTML')) { |
|
161 | 161 | function makeValidationForHTML($rules) |
162 | 162 | { |
163 | 163 | $validation = []; |
164 | - $validation_raw = is_string($rules)? explode('|', $rules) : $rules; |
|
164 | + $validation_raw = is_string($rules) ? explode('|', $rules) : $rules; |
|
165 | 165 | foreach ($validation_raw as $vr) { |
166 | 166 | $vr_a = explode(':', $vr); |
167 | 167 | if (isset($vr_a[1])) { |
@@ -175,7 +175,7 @@ discard block |
||
175 | 175 | } |
176 | 176 | } |
177 | 177 | |
178 | -if (! function_exists('findSelected')) { |
|
178 | +if (!function_exists('findSelected')) { |
|
179 | 179 | /** |
180 | 180 | * @param $rawvalue |
181 | 181 | * @param $form |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | */ |
185 | 185 | function findSelected($rawvalue, $form, $optionValue) |
186 | 186 | { |
187 | - if (! $rawvalue) { |
|
187 | + if (!$rawvalue) { |
|
188 | 188 | return ''; |
189 | 189 | } |
190 | 190 | $value = $rawvalue; |
@@ -206,7 +206,7 @@ discard block |
||
206 | 206 | return $selected; |
207 | 207 | } |
208 | 208 | } |
209 | -if (! function_exists('array_get_keys')) { |
|
209 | +if (!function_exists('array_get_keys')) { |
|
210 | 210 | |
211 | 211 | /** |
212 | 212 | * @param array $_array |
@@ -222,21 +222,21 @@ discard block |
||
222 | 222 | } |
223 | 223 | } |
224 | 224 | |
225 | -if (! function_exists('cbGetSetting')) { |
|
225 | +if (!function_exists('cbGetSetting')) { |
|
226 | 226 | function cbGetSetting($name) |
227 | 227 | { |
228 | 228 | return \crocodicstudio\crudbooster\Modules\SettingModule\SettingRepo::getSetting($name); |
229 | 229 | } |
230 | 230 | } |
231 | 231 | |
232 | -if (! function_exists('backWithMsg')) { |
|
232 | +if (!function_exists('backWithMsg')) { |
|
233 | 233 | function backWithMsg($msg, $type = 'success') |
234 | 234 | { |
235 | - sendAndTerminate(redirect()->back()->with(['message' => $msg, 'message_type' => $type,])); |
|
235 | + sendAndTerminate(redirect()->back()->with(['message' => $msg, 'message_type' => $type, ])); |
|
236 | 236 | } |
237 | 237 | } |
238 | 238 | |
239 | -if (! function_exists('underField')) { |
|
239 | +if (!function_exists('underField')) { |
|
240 | 240 | function underField($help, $error) |
241 | 241 | { |
242 | 242 | $error = $error ? "<i class='fa fa-info-circle'></i> $error" : ''; |
@@ -244,21 +244,21 @@ discard block |
||
244 | 244 | return "<div class='text-danger'>$error</div><p class='help-block'>$help</p>"; |
245 | 245 | } |
246 | 246 | } |
247 | -if (! function_exists('cbIcon')) { |
|
247 | +if (!function_exists('cbIcon')) { |
|
248 | 248 | function cbIcon($icon) |
249 | 249 | { |
250 | 250 | return '<i class=\'fa fa-'.$icon.'\'></i>'; |
251 | 251 | } |
252 | 252 | } |
253 | 253 | |
254 | -if (! function_exists('YmdHis')) { |
|
254 | +if (!function_exists('YmdHis')) { |
|
255 | 255 | function YmdHis() |
256 | 256 | { |
257 | 257 | return date('Y-m-d H:i:s'); |
258 | 258 | } |
259 | 259 | } |
260 | 260 | |
261 | -if (! function_exists('cbUser')) { |
|
261 | +if (!function_exists('cbUser')) { |
|
262 | 262 | function cbUser() |
263 | 263 | { |
264 | 264 | return auth('cbAdmin')->user(); |