@@ -45,13 +45,13 @@ |
||
| 45 | 45 | { |
| 46 | 46 | $path = request('path') ? base64_decode(request('path')) : 'uploads'; |
| 47 | 47 | $file = Request::file('userfile'); |
| 48 | - if (! $file) { |
|
| 48 | + if (!$file) { |
|
| 49 | 49 | return null; |
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | $fileName = $file->getClientOriginalName(); |
| 53 | 53 | |
| 54 | - if (! FieldDetector::isUploadField($file->getClientOriginalExtension())) { |
|
| 54 | + if (!FieldDetector::isUploadField($file->getClientOriginalExtension())) { |
|
| 55 | 55 | backWithMsg('The file '.$fileName.' type is not allowed!', 'warning'); |
| 56 | 56 | } |
| 57 | 57 | |
@@ -25,8 +25,8 @@ discard block |
||
| 25 | 25 | $this->checkLaravelVersion(); |
| 26 | 26 | $this->checkPHPversion(); |
| 27 | 27 | |
| 28 | - $extensions = ['mbstring', 'openssl', 'pdo', 'tokenizer', 'xml', 'gd', 'fileinfo',]; |
|
| 29 | - array_walk($extensions, function ($ext){ |
|
| 28 | + $extensions = ['mbstring', 'openssl', 'pdo', 'tokenizer', 'xml', 'gd', 'fileinfo', ]; |
|
| 29 | + array_walk($extensions, function($ext) { |
|
| 30 | 30 | $this->chechExtension($ext); |
| 31 | 31 | }); |
| 32 | 32 | |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | */ |
| 75 | 75 | private function chechExtension($extension) |
| 76 | 76 | { |
| 77 | - if (! extension_loaded($extension)) { |
|
| 77 | + if (!extension_loaded($extension)) { |
|
| 78 | 78 | $this->console->info($extension.' extension: [Bad]'); |
| 79 | 79 | return $this->requirements = false; |
| 80 | 80 | } |
@@ -183,7 +183,7 @@ discard block |
||
| 183 | 183 | |
| 184 | 184 | $json = []; |
| 185 | 185 | for ($i = 0, $_count = count($params_name); $i <= $_count; $i++) { |
| 186 | - if (! $params_name[$i]) { |
|
| 186 | + if (!$params_name[$i]) { |
|
| 187 | 187 | continue; |
| 188 | 188 | } |
| 189 | 189 | $json[] = [ |
@@ -210,7 +210,7 @@ discard block |
||
| 210 | 210 | |
| 211 | 211 | $json = []; |
| 212 | 212 | for ($i = 0, $_count = count($responses_name); $i <= $_count; $i++) { |
| 213 | - if (! $responses_name[$i]) { |
|
| 213 | + if (!$responses_name[$i]) { |
|
| 214 | 214 | continue; |
| 215 | 215 | } |
| 216 | 216 | $json[] = [ |
@@ -84,7 +84,7 @@ |
||
| 84 | 84 | $parameters = unserialize($parameters); |
| 85 | 85 | $formdata = []; |
| 86 | 86 | $httpbuilder = []; |
| 87 | - if (! $parameters) { |
|
| 87 | + if (!$parameters) { |
|
| 88 | 88 | return [$httpbuilder, $formdata]; |
| 89 | 89 | } |
| 90 | 90 | foreach ($parameters as $p) { |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | |
| 63 | 63 | $data = compact('controllerName', 'table', 'pk', 'coloms', 'cols', 'formArrayString', 'joinList'); |
| 64 | 64 | |
| 65 | - return '<?php ' . view('CbModulesGen::controller_stub', $data)->render(); |
|
| 65 | + return '<?php '.view('CbModulesGen::controller_stub', $data)->render(); |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | /** |
@@ -73,8 +73,8 @@ discard block |
||
| 73 | 73 | */ |
| 74 | 74 | private static function addCol($table, $coloms, $pk) |
| 75 | 75 | { |
| 76 | - $coloms_col = array_filter($coloms, function ($field) { |
|
| 77 | - return (! FieldDetector::isExceptional($field) && ! FieldDetector::isPassword($field)); |
|
| 76 | + $coloms_col = array_filter($coloms, function($field) { |
|
| 77 | + return (!FieldDetector::isExceptional($field) && !FieldDetector::isPassword($field)); |
|
| 78 | 78 | }); |
| 79 | 79 | $coloms_col = array_slice($coloms_col, 0, 10); |
| 80 | 80 | |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | { |
| 110 | 110 | $jointable = str_replace(['id_', '_id'], '', $field); |
| 111 | 111 | |
| 112 | - if (! Schema::hasTable($jointable)) { |
|
| 112 | + if (!Schema::hasTable($jointable)) { |
|
| 113 | 113 | return [$cols, $joinList]; |
| 114 | 114 | } |
| 115 | 115 | $joincols = \Schema::getColumnListing($jointable); |
@@ -8,42 +8,42 @@ 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('cbStartMarker')) { |
|
| 18 | +if (!function_exists('cbStartMarker')) { |
|
| 19 | 19 | function cbStartMarker($section) |
| 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($section) |
| 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() |
| 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() |
| 41 | 41 | { |
| 42 | 42 | return \crocodicstudio\crudbooster\helpers\CbStructure::ctrlNamespace(); |
| 43 | 43 | } |
| 44 | 44 | } |
| 45 | 45 | |
| 46 | -if (! function_exists('is_checked')) { |
|
| 46 | +if (!function_exists('is_checked')) { |
|
| 47 | 47 | /** |
| 48 | 48 | * @param $format |
| 49 | 49 | * @param $value |
@@ -67,35 +67,35 @@ discard block |
||
| 67 | 67 | } |
| 68 | 68 | } |
| 69 | 69 | |
| 70 | -if (! function_exists('CbComponentsPath')) { |
|
| 70 | +if (!function_exists('CbComponentsPath')) { |
|
| 71 | 71 | function CbComponentsPath($type = '') |
| 72 | 72 | { |
| 73 | 73 | return \crocodicstudio\crudbooster\helpers\CbStructure::componentsPath($type); |
| 74 | 74 | } |
| 75 | 75 | } |
| 76 | 76 | |
| 77 | -if (! function_exists('CbPublishedComponentsPath')) { |
|
| 77 | +if (!function_exists('CbPublishedComponentsPath')) { |
|
| 78 | 78 | function CbPublishedComponentsPath($type = '') |
| 79 | 79 | { |
| 80 | 80 | return \crocodicstudio\crudbooster\helpers\CbStructure::publishedComponentsPath($type); |
| 81 | 81 | } |
| 82 | 82 | } |
| 83 | 83 | |
| 84 | -if (! function_exists('controllers_dir')) { |
|
| 84 | +if (!function_exists('controllers_dir')) { |
|
| 85 | 85 | function controllers_dir() |
| 86 | 86 | { |
| 87 | 87 | return \crocodicstudio\crudbooster\helpers\CbStructure::controllersDir(); |
| 88 | 88 | } |
| 89 | 89 | } |
| 90 | 90 | |
| 91 | -if (! function_exists('controller_path')) { |
|
| 91 | +if (!function_exists('controller_path')) { |
|
| 92 | 92 | function controller_path($controller) |
| 93 | 93 | { |
| 94 | 94 | return \crocodicstudio\crudbooster\helpers\CbStructure::controllerPath($controller); |
| 95 | 95 | } |
| 96 | 96 | } |
| 97 | 97 | |
| 98 | -if (! function_exists('now')) { |
|
| 98 | +if (!function_exists('now')) { |
|
| 99 | 99 | function now() |
| 100 | 100 | { |
| 101 | 101 | return date('Y-m-d H:i:s'); |
@@ -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,34 +130,34 @@ 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 = []; |
@@ -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,28 +222,28 @@ 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 | 235 | sendAndTerminate(redirect()->back()->with(['message_type' => $type, 'message' => $msg])); |
| 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 | - $error = $error ? "<i class='fa fa-info-circle'></i> $error":'' ; |
|
| 242 | + $error = $error ? "<i class='fa fa-info-circle'></i> $error" : ''; |
|
| 243 | 243 | return "<div class='text-danger'>$error</div><p class='help-block'>$help</p>"; |
| 244 | 244 | } |
| 245 | 245 | } |
| 246 | -if (! function_exists('cbIcon')) { |
|
| 246 | +if (!function_exists('cbIcon')) { |
|
| 247 | 247 | function cbIcon($icon) |
| 248 | 248 | { |
| 249 | 249 | return '<i class=\'fa fa-'.$icon.'\'></i>'; |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | |
| 51 | 51 | $props = array_get(DefaultFormConfigs::defaultConfigForFields($table), FieldDetector::detect($colName), null); |
| 52 | 52 | |
| 53 | - if($props !== null){ |
|
| 53 | + if ($props !== null) { |
|
| 54 | 54 | $input = array_merge($input, $props); |
| 55 | 55 | } |
| 56 | 56 | |
@@ -92,8 +92,8 @@ discard block |
||
| 92 | 92 | $arr = array_get([ |
| 93 | 93 | 'string' => $default, |
| 94 | 94 | 'text' => ['textarea', "string|min:5", []], |
| 95 | - 'date' => ['date', "date", ['php_format' => 'M, d Y', 'datepicker_format' => 'M, dd YYYY',]], |
|
| 96 | - 'datetime' => ['datetime', "date_format:Y-m-d H:i:s", ['php_format' => 'M, d Y H:i',]], |
|
| 95 | + 'date' => ['date', "date", ['php_format' => 'M, d Y', 'datepicker_format' => 'M, dd YYYY', ]], |
|
| 96 | + 'datetime' => ['datetime', "date_format:Y-m-d H:i:s", ['php_format' => 'M, d Y H:i', ]], |
|
| 97 | 97 | 'time' => ['time', 'date_format:H:i:s', []], |
| 98 | 98 | 'double' => ['money', "integer|min:0", []], |
| 99 | 99 | 'int' => ['number', 'integer|min:0', []], |
@@ -113,7 +113,7 @@ discard block |
||
| 113 | 113 | private static function handleForeignKey($field) |
| 114 | 114 | { |
| 115 | 115 | $jointable = str_replace(['id_', '_id'], '', $field); |
| 116 | - if (! Schema::hasTable($jointable)) { |
|
| 116 | + if (!Schema::hasTable($jointable)) { |
|
| 117 | 117 | return ['', '']; |
| 118 | 118 | } |
| 119 | 119 | $options = [ |
@@ -5,7 +5,7 @@ discard block |
||
| 5 | 5 | |
| 6 | 6 | $namespace = '\crocodicstudio\crudbooster\controllers'; |
| 7 | 7 | /* ROUTER FOR UPLOADS */ |
| 8 | -Route::group(['middleware' => ['web'], 'namespace' => $namespace], function () { |
|
| 8 | +Route::group(['middleware' => ['web'], 'namespace' => $namespace], function() { |
|
| 9 | 9 | Route::get('uploads/{one?}/{two?}/{three?}/{four?}/{five?}', ['uses' => 'FileController@getPreview', 'as' => 'fileControllerPreview']); |
| 10 | 10 | }); |
| 11 | 11 | |
@@ -14,7 +14,7 @@ discard block |
||
| 14 | 14 | 'middleware' => ['web', CBBackend::class], |
| 15 | 15 | 'prefix' => cbAdminPath(), |
| 16 | 16 | 'namespace' => ctrlNamespace(), |
| 17 | -], function () { |
|
| 17 | +], function() { |
|
| 18 | 18 | CbRouter::routeController('users', 'AdminUsersController'); |
| 19 | 19 | try { |
| 20 | 20 | $modules = DB::table('cms_moduls')->where('path', '!=', '')->where('controller', '!=', '')->where('is_protected', 0)->get(); |
@@ -30,10 +30,10 @@ discard block |
||
| 30 | 30 | 'middleware' => ['web', \crocodicstudio\crudbooster\middlewares\CBSuperadmin::class], |
| 31 | 31 | 'prefix' => cbAdminPath(), |
| 32 | 32 | 'namespace' => $namespace, |
| 33 | -], function () { |
|
| 34 | - Route::post('{module}/do-upload-import-data', ['uses' => 'FileController@uploadImportData', 'as' => 'UploadImportData',]); |
|
| 35 | - Route::post('{module}/upload-summernote', ['uses' => 'FileController@uploadSummernote', 'as' => 'UploadImportData',]); |
|
| 36 | - Route::post('{module}/upload-file', ['uses' => 'FileController@uploadFile', 'as' => 'UploadImportData',]); |
|
| 37 | - Route::post('{module}/done-import', ['uses' => 'FileController@doneImport', 'as' => 'doneImportData',]); |
|
| 33 | +], function() { |
|
| 34 | + Route::post('{module}/do-upload-import-data', ['uses' => 'FileController@uploadImportData', 'as' => 'UploadImportData', ]); |
|
| 35 | + Route::post('{module}/upload-summernote', ['uses' => 'FileController@uploadSummernote', 'as' => 'UploadImportData', ]); |
|
| 36 | + Route::post('{module}/upload-file', ['uses' => 'FileController@uploadFile', 'as' => 'UploadImportData', ]); |
|
| 37 | + Route::post('{module}/done-import', ['uses' => 'FileController@doneImport', 'as' => 'doneImportData', ]); |
|
| 38 | 38 | }); |
| 39 | 39 | |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | public function uploadImportData($file) |
| 51 | 51 | { |
| 52 | 52 | $dir = 'uploads/'.date('Y-m'); |
| 53 | - $filename = md5(str_random(5)).'.'. $file->getClientOriginalExtension(); |
|
| 53 | + $filename = md5(str_random(5)).'.'.$file->getClientOriginalExtension(); |
|
| 54 | 54 | |
| 55 | 55 | //Create Directory Monthly |
| 56 | 56 | Storage::makeDirectory($dir); |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | */ |
| 68 | 68 | public function validateForImport($file) |
| 69 | 69 | { |
| 70 | - return Validator::make(['extension' => $file->getClientOriginalExtension(),], ['extension' => 'in:xls,xlsx,csv']); |
|
| 70 | + return Validator::make(['extension' => $file->getClientOriginalExtension(), ], ['extension' => 'in:xls,xlsx,csv']); |
|
| 71 | 71 | } |
| 72 | 72 | |
| 73 | 73 | |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | |
| 84 | 84 | $file = base64_decode(request('file')); |
| 85 | 85 | $file = 'storage'.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.$file; |
| 86 | - $rows = Excel::load($file, function ($reader) { |
|
| 86 | + $rows = Excel::load($file, function($reader) { |
|
| 87 | 87 | })->get(); |
| 88 | 88 | |
| 89 | 89 | //$data_import_column = []; |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | foreach ($select_column as $sk => $s) { |
| 129 | 129 | $colname = $table_columns[$sk]; |
| 130 | 130 | |
| 131 | - if (! DbInspector::isForeignKey($colname) || intval($value->$s)) { |
|
| 131 | + if (!DbInspector::isForeignKey($colname) || intval($value->$s)) { |
|
| 132 | 132 | $a[$colname] = $value->$s; |
| 133 | 133 | continue; |
| 134 | 134 | } |
@@ -178,7 +178,7 @@ discard block |
||
| 178 | 178 | $relation_moduls = DB::table('cms_moduls')->where('table_name', $relation_table)->first(); |
| 179 | 179 | |
| 180 | 180 | $relation_class = __NAMESPACE__.'\\'.$relation_moduls->controller; |
| 181 | - if (! class_exists($relation_class)) { |
|
| 181 | + if (!class_exists($relation_class)) { |
|
| 182 | 182 | $relation_class = ctrlNamespace().'\\'.$relation_moduls->controller; |
| 183 | 183 | } |
| 184 | 184 | |