@@ -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 | - respondWith(redirect()->back()->with(['message' => $msg, 'message_type' => $type,])); |
|
| 235 | + respondWith(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(); |
@@ -74,7 +74,7 @@ |
||
| 74 | 74 | * @param $name |
| 75 | 75 | * @return mixed |
| 76 | 76 | */ |
| 77 | - /* private function handleBase64($value, $uploads_format_candidate, $row_assign, $name) |
|
| 77 | + /* private function handleBase64($value, $uploads_format_candidate, $row_assign, $name) |
|
| 78 | 78 | { |
| 79 | 79 | $filedata = base64_decode($value); |
| 80 | 80 | $f = finfo_open(); |
@@ -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 | |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | { |
| 19 | 19 | $row = $data->first(); |
| 20 | 20 | |
| 21 | - if (! $row) { |
|
| 21 | + if (!$row) { |
|
| 22 | 22 | return ApiResponder::makeResult(0, 'There is no data found !'); |
| 23 | 23 | } |
| 24 | 24 | |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | self::passwordError($posts, $ctrl); |
| 41 | 41 | } |
| 42 | 42 | |
| 43 | - if (! $required && $used && $value) { |
|
| 43 | + if (!$required && $used && $value) { |
|
| 44 | 44 | self::passwordError($posts, $ctrl); |
| 45 | 45 | } |
| 46 | 46 | } |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | { |
| 70 | 70 | $result = ApiResponder::makeResult(1, 'success'); |
| 71 | 71 | |
| 72 | - return array_merge($result, (array)$rows); |
|
| 72 | + return array_merge($result, (array) $rows); |
|
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | /** |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | $rows->$k = asset($v); |
| 84 | 84 | } |
| 85 | 85 | |
| 86 | - if (! in_array($k, $responsesFields)) { |
|
| 86 | + if (!in_array($k, $responsesFields)) { |
|
| 87 | 87 | unset($rows->$k); |
| 88 | 88 | } |
| 89 | 89 | } |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | } |
| 61 | 61 | ApiResponder::send($result, $posts, $this->ctrl); |
| 62 | 62 | } elseif (in_array($actionType, ['save_add', 'save_edit'])) { |
| 63 | - $rowAssign = array_filter($input_validator, function ($column) use ($table) { |
|
| 63 | + $rowAssign = array_filter($input_validator, function($column) use ($table) { |
|
| 64 | 64 | return Schema::hasColumn($table, $column); |
| 65 | 65 | }, ARRAY_FILTER_USE_KEY); |
| 66 | 66 | |
@@ -113,7 +113,7 @@ discard block |
||
| 113 | 113 | */ |
| 114 | 114 | private function filterRows($data, $parameters, $posts, $table, $typeExcept) |
| 115 | 115 | { |
| 116 | - $data->where(function ($w) use ($parameters, $posts, $table, $typeExcept) { |
|
| 116 | + $data->where(function($w) use ($parameters, $posts, $table, $typeExcept) { |
|
| 117 | 117 | foreach ($parameters as $param) { |
| 118 | 118 | $name = $param['name']; |
| 119 | 119 | $type = $param['type']; |
@@ -251,7 +251,7 @@ discard block |
||
| 251 | 251 | */ |
| 252 | 252 | private function applyLike($data, $search_in, $value) |
| 253 | 253 | { |
| 254 | - $data->where(function ($w) use ($search_in, $value) { |
|
| 254 | + $data->where(function($w) use ($search_in, $value) { |
|
| 255 | 255 | foreach ($search_in as $k => $field) { |
| 256 | 256 | $method = 'orWhere'; |
| 257 | 257 | if ($k == 0) { |
@@ -272,7 +272,7 @@ discard block |
||
| 272 | 272 | */ |
| 273 | 273 | private function joinRelatedTables($table, $responsesFields, $name, $data, $nameTmp) |
| 274 | 274 | { |
| 275 | - if (! DbInspector::isForeignKey($name)) { |
|
| 275 | + if (!DbInspector::isForeignKey($name)) { |
|
| 276 | 276 | return $nameTmp; |
| 277 | 277 | } |
| 278 | 278 | $joinTable = DbInspector::getRelatedTableName($name); |
@@ -297,7 +297,7 @@ discard block |
||
| 297 | 297 | private function doValidation($inputValidator, $dataValidation, $posts) |
| 298 | 298 | { |
| 299 | 299 | $validator = Validator::make($inputValidator, $dataValidation); |
| 300 | - if (! $validator->fails()) { |
|
| 300 | + if (!$validator->fails()) { |
|
| 301 | 301 | return true; |
| 302 | 302 | } |
| 303 | 303 | $message = $validator->errors()->all(); |
@@ -313,11 +313,11 @@ discard block |
||
| 313 | 313 | */ |
| 314 | 314 | private function filterRedundantResp($responses) |
| 315 | 315 | { |
| 316 | - $responses = array_filter($responses, function ($resp) { |
|
| 317 | - return ! ($resp['name'] == 'ref_id' || $resp['type'] == 'custom'); |
|
| 316 | + $responses = array_filter($responses, function($resp) { |
|
| 317 | + return !($resp['name'] == 'ref_id' || $resp['type'] == 'custom'); |
|
| 318 | 318 | }); |
| 319 | 319 | |
| 320 | - $responses = array_filter($responses, function ($resp) { |
|
| 320 | + $responses = array_filter($responses, function($resp) { |
|
| 321 | 321 | return (intval($resp['used']) != 0 || DbInspector::isForeignKey($resp['name'])); |
| 322 | 322 | }); |
| 323 | 323 | |
@@ -332,15 +332,15 @@ discard block |
||
| 332 | 332 | private function validateParams($parameters, $table) |
| 333 | 333 | { |
| 334 | 334 | $posts = request()->all(); |
| 335 | - if (! $parameters) { |
|
| 335 | + if (!$parameters) { |
|
| 336 | 336 | return ['', '']; |
| 337 | 337 | } |
| 338 | 338 | $typeExcept = ['password', 'ref', 'base64_file', 'custom', 'search']; |
| 339 | 339 | $inputValidator = []; |
| 340 | 340 | $dataValidation = []; |
| 341 | 341 | |
| 342 | - $parameters = array_filter($parameters, function ($param){ |
|
| 343 | - return !(is_string($param['config'])&& !starts_with($param['config'], '*')); |
|
| 342 | + $parameters = array_filter($parameters, function($param) { |
|
| 343 | + return !(is_string($param['config']) && !starts_with($param['config'], '*')); |
|
| 344 | 344 | }); |
| 345 | 345 | |
| 346 | 346 | foreach ($parameters as $param) { |
@@ -44,7 +44,7 @@ |
||
| 44 | 44 | { |
| 45 | 45 | $ctrl->hookValidate(); |
| 46 | 46 | |
| 47 | - if (! $ctrl->validate) { |
|
| 47 | + if (!$ctrl->validate) { |
|
| 48 | 48 | return true; |
| 49 | 49 | } // hook have to return true |
| 50 | 50 | //todo : translation |