@@ -23,12 +23,12 @@ discard block |
||
23 | 23 | $this->cbLoader(); |
24 | 24 | $selectedIds = request('checkbox'); |
25 | 25 | $btnName = request('button_name'); |
26 | - if (! $selectedIds) { |
|
26 | + if (!$selectedIds) { |
|
27 | 27 | CRUDBooster::redirect($_SERVER['HTTP_REFERER'], 'Please select 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 | CRUDBooster::redirect(Request::server('HTTP_REFERER'), cbTrans('alert_delete_data_success'), 'success'); |
73 | 73 | } |
@@ -19,12 +19,12 @@ |
||
19 | 19 | $data['page_menu'] = Route::getCurrentRoute()->getActionName(); |
20 | 20 | $data['page_title'] = 'Import Data '.CRUDBooster::getCurrentModule()->name; |
21 | 21 | |
22 | - if (! request('file') || request('import')) { |
|
22 | + if (!request('file') || request('import')) { |
|
23 | 23 | return $this->cbView('crudbooster::import', $data); |
24 | 24 | } |
25 | 25 | |
26 | 26 | $file = 'storage'.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.base64_decode(request('file')); |
27 | - $rows = Excel::load($file, function ($reader) { |
|
27 | + $rows = Excel::load($file, function($reader) { |
|
28 | 28 | })->get(); |
29 | 29 | |
30 | 30 | session()->put('total_data_import', count($rows)); |
@@ -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 |
@@ -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 | } |
@@ -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>'; |
@@ -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 = [ |
@@ -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 | |
@@ -176,7 +176,7 @@ discard block |
||
176 | 176 | } |
177 | 177 | |
178 | 178 | |
179 | - $tables = array_map(function ($table) { |
|
179 | + $tables = array_map(function($table) { |
|
180 | 180 | return $table->TABLE_NAME; |
181 | 181 | }, $tables); |
182 | 182 |