@@ -119,7 +119,7 @@ |
||
119 | 119 | continue; |
120 | 120 | } |
121 | 121 | |
122 | - $s = str_replace("'", '',$s); |
|
122 | + $s = str_replace("'", '', $s); |
|
123 | 123 | list($key, $val) = explode('=>', $s); |
124 | 124 | $colInnerItem[$key] = $val; |
125 | 125 |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | $data['parent_field'] = DbInspector::getTableForeignKey(request('parent_table'), $this->table); |
109 | 109 | } |
110 | 110 | |
111 | - if (! $data['parent_field']) { |
|
111 | + if (!$data['parent_field']) { |
|
112 | 112 | return $data; |
113 | 113 | } |
114 | 114 | |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | */ |
127 | 127 | private function _filterForParent($result) |
128 | 128 | { |
129 | - if (! request('parent_id')) { |
|
129 | + if (!request('parent_id')) { |
|
130 | 130 | return null; |
131 | 131 | } |
132 | 132 | |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | */ |
141 | 141 | private function _filterOutSoftDeleted($tableColumns, $result) |
142 | 142 | { |
143 | - if (! in_array('deleted_at', $tableColumns)) { |
|
143 | + if (!in_array('deleted_at', $tableColumns)) { |
|
144 | 144 | return; |
145 | 145 | } |
146 | 146 | $result->where($this->table.'.deleted_at', '=', null); |
@@ -199,9 +199,9 @@ discard block |
||
199 | 199 | private function _applyWhereAndQfilters($result, $columnsTable, $table) |
200 | 200 | { |
201 | 201 | if (request('q')) { |
202 | - $result->where(function ($query) use ($columnsTable) { |
|
202 | + $result->where(function($query) use ($columnsTable) { |
|
203 | 203 | foreach ($columnsTable as $col) { |
204 | - if (! $col['field_with']) { |
|
204 | + if (!$col['field_with']) { |
|
205 | 205 | continue; |
206 | 206 | } |
207 | 207 | $query->orwhere($col['field_with'], "like", "%".request("q")."%"); |
@@ -273,7 +273,7 @@ discard block |
||
273 | 273 | return CRUDBooster::adminPath($module['path']).'?parent_table='.$table_parent.'&parent_columns=' |
274 | 274 | .$module['parent_columns'].'&parent_columns_alias=' |
275 | 275 | .$module['parent_columns_alias'].'&parent_id=[' |
276 | - .(! isset($module['custom_parent_id']) ? "id" : $module['custom_parent_id']) |
|
276 | + .(!isset($module['custom_parent_id']) ? "id" : $module['custom_parent_id']) |
|
277 | 277 | .']&return_url='.urlencode(Request::fullUrl()).'&foreign_key=' |
278 | 278 | .$module['foreign_key'].'&label='.urlencode($module['label']); |
279 | 279 | } |
@@ -116,7 +116,7 @@ discard block |
||
116 | 116 | } |
117 | 117 | |
118 | 118 | if (in_array($actionType, ['save_add', 'save_edit'])) { |
119 | - $rowAssign = array_filter($input_validator, function ($column) use ($table) { |
|
119 | + $rowAssign = array_filter($input_validator, function($column) use ($table) { |
|
120 | 120 | return \Schema::hasColumn($table, $column); |
121 | 121 | }, ARRAY_FILTER_USE_KEY); |
122 | 122 | |
@@ -228,7 +228,7 @@ discard block |
||
228 | 228 | */ |
229 | 229 | private function filterRows($data, $parameters, $posts, $table, $typeExcept) |
230 | 230 | { |
231 | - $data->where(function ($w) use ($parameters, $posts, $table, $typeExcept) { |
|
231 | + $data->where(function($w) use ($parameters, $posts, $table, $typeExcept) { |
|
232 | 232 | foreach ($parameters as $param) { |
233 | 233 | $name = $param['name']; |
234 | 234 | $type = $param['type']; |
@@ -320,7 +320,7 @@ discard block |
||
320 | 320 | $row->$k = asset($v); |
321 | 321 | } |
322 | 322 | |
323 | - if (! in_array($k, $responsesFields)) { |
|
323 | + if (!in_array($k, $responsesFields)) { |
|
324 | 324 | unset($row[$k]); |
325 | 325 | } |
326 | 326 | } |
@@ -383,7 +383,7 @@ discard block |
||
383 | 383 | $rows->$k = asset($v); |
384 | 384 | } |
385 | 385 | |
386 | - if (! in_array($k, $responsesFields)) { |
|
386 | + if (!in_array($k, $responsesFields)) { |
|
387 | 387 | unset($row[$k]); |
388 | 388 | } |
389 | 389 | } |
@@ -406,7 +406,7 @@ discard block |
||
406 | 406 | $subquery = $resp['subquery']; |
407 | 407 | $used = intval($resp['used']); |
408 | 408 | |
409 | - if ($used == 0 && ! DbInspector::isForeignKey($name)) { |
|
409 | + if ($used == 0 && !DbInspector::isForeignKey($name)) { |
|
410 | 410 | continue; |
411 | 411 | } |
412 | 412 | |
@@ -461,7 +461,7 @@ discard block |
||
461 | 461 | */ |
462 | 462 | private function applyLike($data, $search_in, $value) |
463 | 463 | { |
464 | - $data->where(function ($w) use ($search_in, $value) { |
|
464 | + $data->where(function($w) use ($search_in, $value) { |
|
465 | 465 | foreach ($search_in as $k => $field) { |
466 | 466 | if ($k == 0) { |
467 | 467 | $w->where($field, "like", "%$value%"); |
@@ -482,7 +482,7 @@ discard block |
||
482 | 482 | */ |
483 | 483 | private function joinRelatedTables($table, $responsesFields, $name, $data, $nameTmp) |
484 | 484 | { |
485 | - if (! DbInspector::isForeignKey($name)) { |
|
485 | + if (!DbInspector::isForeignKey($name)) { |
|
486 | 486 | return $nameTmp; |
487 | 487 | } |
488 | 488 | $jointable = DbInspector::getTableForeignKey($name); |
@@ -509,7 +509,7 @@ discard block |
||
509 | 509 | private function validateMethodType($row_api, $result, $debugModeMessage, $posts) |
510 | 510 | { |
511 | 511 | $methodType = $row_api->method_type; |
512 | - if (! $methodType || ! Request::isMethod($methodType)) { |
|
512 | + if (!$methodType || !Request::isMethod($methodType)) { |
|
513 | 513 | $result['api_status'] = 0; |
514 | 514 | $result['api_message'] = "The request method is not allowed !"; |
515 | 515 | |
@@ -547,7 +547,7 @@ discard block |
||
547 | 547 | */ |
548 | 548 | private function checkApiDefined($row_api, $result, $debugModeMessage, $posts) |
549 | 549 | { |
550 | - if (! $row_api) { |
|
550 | + if (!$row_api) { |
|
551 | 551 | $result['api_status'] = 0; |
552 | 552 | $result['api_message'] = 'Sorry this API is no longer available, maybe has changed by admin, or please make sure api url is correct.'; |
553 | 553 | |
@@ -617,11 +617,11 @@ discard block |
||
617 | 617 | $value = $param['config']; |
618 | 618 | } |
619 | 619 | |
620 | - if ($required && $type == 'password' && ! Hash::check($value, $row->{$name})) { |
|
620 | + if ($required && $type == 'password' && !Hash::check($value, $row->{$name})) { |
|
621 | 621 | $this->passwordError($result, $debugModeMessage, $posts); |
622 | 622 | } |
623 | 623 | |
624 | - if (! $required && $used && $value && ! Hash::check($value, $row->{$name})) { |
|
624 | + if (!$required && $used && $value && !Hash::check($value, $row->{$name})) { |
|
625 | 625 | $this->passwordError($result, $debugModeMessage, $posts); |
626 | 626 | } |
627 | 627 | } |
@@ -8,28 +8,28 @@ discard block |
||
8 | 8 | | --------------------------------------------------------------------------------------------------------------- |
9 | 9 | | |
10 | 10 | */ |
11 | -if (! function_exists('cbModulesNS')) { |
|
11 | +if (!function_exists('cbModulesNS')) { |
|
12 | 12 | function cbModulesNS($path = '') |
13 | 13 | { |
14 | 14 | return \crocodicstudio\crudbooster\helpers\CbStructure::cbModulesNS($path); |
15 | 15 | } |
16 | 16 | } |
17 | 17 | |
18 | -if (! function_exists('cbAdminPath')) { |
|
18 | +if (!function_exists('cbAdminPath')) { |
|
19 | 19 | function cbAdminPath() |
20 | 20 | { |
21 | 21 | return cbConfig('ADMIN_PATH'); |
22 | 22 | } |
23 | 23 | } |
24 | 24 | |
25 | -if (! function_exists('ctrlNamespace')) { |
|
25 | +if (!function_exists('ctrlNamespace')) { |
|
26 | 26 | function ctrlNamespace() |
27 | 27 | { |
28 | 28 | return \crocodicstudio\crudbooster\helpers\CbStructure::ctrlNamespace(); |
29 | 29 | } |
30 | 30 | } |
31 | 31 | |
32 | -if (! function_exists('is_checked')) { |
|
32 | +if (!function_exists('is_checked')) { |
|
33 | 33 | /** |
34 | 34 | * @param $format |
35 | 35 | * @param $value |
@@ -53,35 +53,35 @@ discard block |
||
53 | 53 | } |
54 | 54 | } |
55 | 55 | |
56 | -if (! function_exists('CbComponentsPath')) { |
|
56 | +if (!function_exists('CbComponentsPath')) { |
|
57 | 57 | function CbComponentsPath($type = '') |
58 | 58 | { |
59 | 59 | return \crocodicstudio\crudbooster\helpers\CbStructure::componentsPath($type); |
60 | 60 | } |
61 | 61 | } |
62 | 62 | |
63 | -if (! function_exists('CbPublishedComponentsPath')) { |
|
63 | +if (!function_exists('CbPublishedComponentsPath')) { |
|
64 | 64 | function CbPublishedComponentsPath($type = '') |
65 | 65 | { |
66 | 66 | return \crocodicstudio\crudbooster\helpers\CbStructure::publishedComponentsPath($type); |
67 | 67 | } |
68 | 68 | } |
69 | 69 | |
70 | -if (! function_exists('controllers_dir')) { |
|
70 | +if (!function_exists('controllers_dir')) { |
|
71 | 71 | function controllers_dir() |
72 | 72 | { |
73 | 73 | return \crocodicstudio\crudbooster\helpers\CbStructure::controllersDir(); |
74 | 74 | } |
75 | 75 | } |
76 | 76 | |
77 | -if (! function_exists('controller_path')) { |
|
77 | +if (!function_exists('controller_path')) { |
|
78 | 78 | function controller_path($controller) |
79 | 79 | { |
80 | 80 | return \crocodicstudio\crudbooster\helpers\CbStructure::controllerPath($controller); |
81 | 81 | } |
82 | 82 | } |
83 | 83 | |
84 | -if (! function_exists('extract_unit')) { |
|
84 | +if (!function_exists('extract_unit')) { |
|
85 | 85 | /* |
86 | 86 | Credits: Bit Repository |
87 | 87 | URL: http://www.bitrepository.com/extract-content-between-two-delimiters-with-php.html |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | } |
100 | 100 | } |
101 | 101 | |
102 | -if (! function_exists('now')) { |
|
102 | +if (!function_exists('now')) { |
|
103 | 103 | function now() |
104 | 104 | { |
105 | 105 | return date('Y-m-d H:i:s'); |
@@ -113,14 +113,14 @@ discard block |
||
113 | 113 | | $name = name of input |
114 | 114 | | |
115 | 115 | */ |
116 | -if (! function_exists('g')) { |
|
116 | +if (!function_exists('g')) { |
|
117 | 117 | function g($name) |
118 | 118 | { |
119 | 119 | return Request::get($name); |
120 | 120 | } |
121 | 121 | } |
122 | 122 | |
123 | -if (! function_exists('cbTrans')) { |
|
123 | +if (!function_exists('cbTrans')) { |
|
124 | 124 | /** |
125 | 125 | * Translate the given message. |
126 | 126 | * |
@@ -134,34 +134,34 @@ discard block |
||
134 | 134 | } |
135 | 135 | } |
136 | 136 | |
137 | -if (! function_exists('cbAsset')) { |
|
137 | +if (!function_exists('cbAsset')) { |
|
138 | 138 | function cbAsset($key) |
139 | 139 | { |
140 | 140 | return asset('vendor/crudbooster/assets/'.$key); |
141 | 141 | } |
142 | 142 | } |
143 | 143 | |
144 | -if (! function_exists('cbScript')) { |
|
144 | +if (!function_exists('cbScript')) { |
|
145 | 145 | function cbScript($key) |
146 | 146 | { |
147 | 147 | return '<script src="'.cbAsset($key).'" type="text/javascript"></script>'; |
148 | 148 | } |
149 | 149 | } |
150 | 150 | |
151 | -if (! function_exists('cbStyleSheet')) { |
|
151 | +if (!function_exists('cbStyleSheet')) { |
|
152 | 152 | function cbStyleSheet($key) |
153 | 153 | { |
154 | 154 | return '<link rel="stylesheet" type="text/css" href="'.cbAsset($key).'"/>'; |
155 | 155 | } |
156 | 156 | } |
157 | 157 | |
158 | -if (! function_exists('cbConfig')) { |
|
158 | +if (!function_exists('cbConfig')) { |
|
159 | 159 | function cbConfig($key, $default = null) |
160 | 160 | { |
161 | 161 | return config('crudbooster.'.$key, $default); |
162 | 162 | } |
163 | 163 | } |
164 | -if (! function_exists('makeValidationForHTML')) { |
|
164 | +if (!function_exists('makeValidationForHTML')) { |
|
165 | 165 | function makeValidationForHTML($rules) |
166 | 166 | { |
167 | 167 | $validation = []; |
@@ -179,7 +179,7 @@ discard block |
||
179 | 179 | } |
180 | 180 | } |
181 | 181 | |
182 | -if (! function_exists('findSelected')) { |
|
182 | +if (!function_exists('findSelected')) { |
|
183 | 183 | /** |
184 | 184 | * @param $rawvalue |
185 | 185 | * @param $form |
@@ -188,7 +188,7 @@ discard block |
||
188 | 188 | */ |
189 | 189 | function findSelected($rawvalue, $form, $optionValue) |
190 | 190 | { |
191 | - if (! $rawvalue) { |
|
191 | + if (!$rawvalue) { |
|
192 | 192 | return ''; |
193 | 193 | } |
194 | 194 | $value = $rawvalue; |
@@ -210,7 +210,7 @@ discard block |
||
210 | 210 | return $selected; |
211 | 211 | } |
212 | 212 | } |
213 | -if (! function_exists('array_get_keys')) { |
|
213 | +if (!function_exists('array_get_keys')) { |
|
214 | 214 | |
215 | 215 | /** |
216 | 216 | * @param array $_array |
@@ -226,28 +226,28 @@ discard block |
||
226 | 226 | } |
227 | 227 | } |
228 | 228 | |
229 | -if (! function_exists('cbGetSetting')) { |
|
229 | +if (!function_exists('cbGetSetting')) { |
|
230 | 230 | function cbGetSetting($name) |
231 | 231 | { |
232 | 232 | return \crocodicstudio\crudbooster\Modules\SettingModule\SettingRepo::getSetting($name); |
233 | 233 | } |
234 | 234 | } |
235 | 235 | |
236 | -if (! function_exists('backWithMsg')) { |
|
236 | +if (!function_exists('backWithMsg')) { |
|
237 | 237 | function backWithMsg($msg, $type = 'success') |
238 | 238 | { |
239 | 239 | sendAndTerminate(redirect()->back()->with(['message_type' => $type, 'message' => $msg])); |
240 | 240 | } |
241 | 241 | } |
242 | 242 | |
243 | -if (! function_exists('underField')) { |
|
243 | +if (!function_exists('underField')) { |
|
244 | 244 | function underField($help, $error) |
245 | 245 | { |
246 | - $error = $error ? "<i class='fa fa-info-circle'></i> $error":'' ; |
|
246 | + $error = $error ? "<i class='fa fa-info-circle'></i> $error" : ''; |
|
247 | 247 | return "<div class='text-danger'>$error</div><p class='help-block'>$help</p>"; |
248 | 248 | } |
249 | 249 | } |
250 | -if (! function_exists('cbIcon')) { |
|
250 | +if (!function_exists('cbIcon')) { |
|
251 | 251 | function cbIcon($icon) |
252 | 252 | { |
253 | 253 | return '<i class=\'fa fa-'.$icon.'\'></i>'; |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | */ |
17 | 17 | public static function findPK($table) |
18 | 18 | { |
19 | - if (! $table) { |
|
19 | + if (!$table) { |
|
20 | 20 | return 'id'; |
21 | 21 | } |
22 | 22 | |
@@ -25,13 +25,13 @@ discard block |
||
25 | 25 | } |
26 | 26 | $table = CRUDBooster::parseSqlTable($table); |
27 | 27 | |
28 | - if (! $table['table']) { |
|
28 | + if (!$table['table']) { |
|
29 | 29 | throw new \Exception("parseSqlTable can't determine the table"); |
30 | 30 | } |
31 | 31 | |
32 | 32 | $primaryKey = self::findPKname($table); |
33 | 33 | |
34 | - if (! $primaryKey) { |
|
34 | + if (!$primaryKey) { |
|
35 | 35 | return 'id'; |
36 | 36 | } |
37 | 37 | CbCache::put('table_'.$table, 'primaryKey', $primaryKey); |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | $cols = collect(DB::select('SELECT * FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = :database AND TABLE_NAME = :table', [ |
94 | 94 | 'database' => $table['database'], |
95 | 95 | 'table' => $table['table'], |
96 | - ]))->map(function ($x) { |
|
96 | + ]))->map(function($x) { |
|
97 | 97 | return (array) $x; |
98 | 98 | })->toArray(); |
99 | 99 | |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | { |
110 | 110 | $field = 'field_type_'.$table.'_'.$field; |
111 | 111 | |
112 | - return Cache::rememberForever($field, function () use ($table, $field) { |
|
112 | + return Cache::rememberForever($field, function() use ($table, $field) { |
|
113 | 113 | try { |
114 | 114 | //MySQL & SQL Server |
115 | 115 | return DB::select(DB::raw("select DATA_TYPE from INFORMATION_SCHEMA.COLUMNS where TABLE_NAME='$table' and COLUMN_NAME = '$field'"))[0]->DATA_TYPE; |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | } |
133 | 133 | |
134 | 134 | $table = self::getTableForeignKey($fieldName); |
135 | - if (! $table) { |
|
135 | + if (!$table) { |
|
136 | 136 | return false; |
137 | 137 | } |
138 | 138 |