@@ -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>'; |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | } |
118 | 118 | |
119 | 119 | if (in_array($actionType, ['save_add', 'save_edit'])) { |
120 | - $rowAssign = array_filter($input_validator, function ($column) use ($table) { |
|
120 | + $rowAssign = array_filter($input_validator, function($column) use ($table) { |
|
121 | 121 | return Schema::hasColumn($table, $column); |
122 | 122 | }, ARRAY_FILTER_USE_KEY); |
123 | 123 | |
@@ -229,7 +229,7 @@ discard block |
||
229 | 229 | */ |
230 | 230 | private function filterRows($data, $parameters, $posts, $table, $typeExcept) |
231 | 231 | { |
232 | - $data->where(function ($w) use ($parameters, $posts, $table, $typeExcept) { |
|
232 | + $data->where(function($w) use ($parameters, $posts, $table, $typeExcept) { |
|
233 | 233 | foreach ($parameters as $param) { |
234 | 234 | $name = $param['name']; |
235 | 235 | $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 | } |
@@ -455,7 +455,7 @@ discard block |
||
455 | 455 | */ |
456 | 456 | private function applyLike($data, $search_in, $value) |
457 | 457 | { |
458 | - $data->where(function ($w) use ($search_in, $value) { |
|
458 | + $data->where(function($w) use ($search_in, $value) { |
|
459 | 459 | foreach ($search_in as $k => $field) { |
460 | 460 | if ($k == 0) { |
461 | 461 | $w->where($field, "like", "%$value%"); |
@@ -476,7 +476,7 @@ discard block |
||
476 | 476 | */ |
477 | 477 | private function joinRelatedTables($table, $responsesFields, $name, $data, $nameTmp) |
478 | 478 | { |
479 | - if (! DbInspector::isForeignKey($name)) { |
|
479 | + if (!DbInspector::isForeignKey($name)) { |
|
480 | 480 | return $nameTmp; |
481 | 481 | } |
482 | 482 | $jointable = DbInspector::getTableForeignKey($name); |
@@ -503,7 +503,7 @@ discard block |
||
503 | 503 | private function validateMethodType($row_api, $result, $debugModeMessage, $posts) |
504 | 504 | { |
505 | 505 | $methodType = $row_api->method_type; |
506 | - if (! $methodType || ! Request::isMethod($methodType)) { |
|
506 | + if (!$methodType || !Request::isMethod($methodType)) { |
|
507 | 507 | $result['api_status'] = 0; |
508 | 508 | $result['api_message'] = "The request method is not allowed !"; |
509 | 509 | |
@@ -541,7 +541,7 @@ discard block |
||
541 | 541 | */ |
542 | 542 | private function checkApiDefined($row_api, $result, $debugModeMessage, $posts) |
543 | 543 | { |
544 | - if (! $row_api) { |
|
544 | + if (!$row_api) { |
|
545 | 545 | $result['api_status'] = 0; |
546 | 546 | $result['api_message'] = 'Sorry this API is no longer available, maybe has changed by admin, or please make sure api url is correct.'; |
547 | 547 | |
@@ -611,11 +611,11 @@ discard block |
||
611 | 611 | $value = $param['config']; |
612 | 612 | } |
613 | 613 | |
614 | - if ($required && $type == 'password' && ! Hash::check($value, $row->{$name})) { |
|
614 | + if ($required && $type == 'password' && !Hash::check($value, $row->{$name})) { |
|
615 | 615 | $this->passwordError($result, $debugModeMessage, $posts); |
616 | 616 | } |
617 | 617 | |
618 | - if (! $required && $used && $value && ! Hash::check($value, $row->{$name})) { |
|
618 | + if (!$required && $used && $value && !Hash::check($value, $row->{$name})) { |
|
619 | 619 | $this->passwordError($result, $debugModeMessage, $posts); |
620 | 620 | } |
621 | 621 | } |
@@ -633,11 +633,11 @@ discard block |
||
633 | 633 | */ |
634 | 634 | private function filterRedundantResp($responses) |
635 | 635 | { |
636 | - $responses = array_filter($responses, function ($resp) { |
|
637 | - return ! ($resp['name'] == 'ref_id' || $resp['type'] == 'custom'); |
|
636 | + $responses = array_filter($responses, function($resp) { |
|
637 | + return !($resp['name'] == 'ref_id' || $resp['type'] == 'custom'); |
|
638 | 638 | }); |
639 | 639 | |
640 | - $responses = array_filter($responses, function ($resp) { |
|
640 | + $responses = array_filter($responses, function($resp) { |
|
641 | 641 | return (intval($resp['used']) != 0 || DbInspector::isForeignKey($resp['name'])); |
642 | 642 | }); |
643 | 643 |
@@ -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); |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | } |
97 | 97 | |
98 | 98 | $table = self::getTableForeignKey($fieldName); |
99 | - if (! $table) { |
|
99 | + if (!$table) { |
|
100 | 100 | return false; |
101 | 101 | } |
102 | 102 |
@@ -9,7 +9,7 @@ |
||
9 | 9 | { |
10 | 10 | public function showForm($id) |
11 | 11 | { |
12 | - $row = ModulesRepo::find($id);; |
|
12 | + $row = ModulesRepo::find($id); ; |
|
13 | 13 | |
14 | 14 | $columns = \Schema::getColumnListing($row->table_name); |
15 | 15 |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | |
89 | 89 | $props = array_get($map, FieldDetector::detect($colName), null); |
90 | 90 | unset($map); |
91 | - if($props !== null){ |
|
91 | + if ($props !== null) { |
|
92 | 92 | $input = array_merge($input, $props); |
93 | 93 | } |
94 | 94 | |
@@ -129,8 +129,8 @@ discard block |
||
129 | 129 | $arr = array_get([ |
130 | 130 | 'string' => $default, |
131 | 131 | 'text' => ['textarea', "string|min:5", []], |
132 | - 'date' => ['date', "date", ['php_format' => 'M, d Y', 'datepicker_format' => 'M, dd YYYY',]], |
|
133 | - 'datetime' => ['datetime', "date_format:Y-m-d H:i:s", ['php_format' => 'M, d Y H:i',]], |
|
132 | + 'date' => ['date', "date", ['php_format' => 'M, d Y', 'datepicker_format' => 'M, dd YYYY', ]], |
|
133 | + 'datetime' => ['datetime', "date_format:Y-m-d H:i:s", ['php_format' => 'M, d Y H:i', ]], |
|
134 | 134 | 'time' => ['time', 'date_format:H:i:s', []], |
135 | 135 | 'double' => ['money', "integer|min:0", []], |
136 | 136 | 'int' => ['number', 'integer|min:0', []], |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | private static function handleForeignKey($field) |
151 | 151 | { |
152 | 152 | $jointable = str_replace(['id_', '_id'], '', $field); |
153 | - if (! Schema::hasTable($jointable)) { |
|
153 | + if (!Schema::hasTable($jointable)) { |
|
154 | 154 | return ['', '']; |
155 | 155 | } |
156 | 156 | $options = [ |