@@ -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 | |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | */ |
| 67 | 67 | public function validateForImport($file) |
| 68 | 68 | { |
| 69 | - return Validator::make(['extension' => $file->getClientOriginalExtension(),], ['extension' => 'in:xls,xlsx,csv']); |
|
| 69 | + return Validator::make(['extension' => $file->getClientOriginalExtension(), ], ['extension' => 'in:xls,xlsx,csv']); |
|
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | /** |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | |
| 82 | 82 | $file = base64_decode(request('file')); |
| 83 | 83 | $file = 'storage'.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.$file; |
| 84 | - $rows = Excel::load($file, function ($reader) { |
|
| 84 | + $rows = Excel::load($file, function($reader) { |
|
| 85 | 85 | })->get(); |
| 86 | 86 | |
| 87 | 87 | //$data_import_column = []; |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | foreach ($selectColumn as $sk => $s) { |
| 127 | 127 | $colname = $table_columns[$sk]; |
| 128 | 128 | |
| 129 | - if (! DbInspector::isForeignKey($colname) || intval($value->$s)) { |
|
| 129 | + if (!DbInspector::isForeignKey($colname) || intval($value->$s)) { |
|
| 130 | 130 | $a[$colname] = $value->$s; |
| 131 | 131 | continue; |
| 132 | 132 | } |
@@ -174,10 +174,10 @@ discard block |
||
| 174 | 174 | { |
| 175 | 175 | $module = DB::table('cms_moduls')->where('table_name', $table)->first(); |
| 176 | 176 | if (is_null($module)) { |
| 177 | - return ; |
|
| 177 | + return; |
|
| 178 | 178 | } |
| 179 | 179 | $relation_class = __NAMESPACE__.'\\'.$module->controller; |
| 180 | - if (! class_exists($relation_class)) { |
|
| 180 | + if (!class_exists($relation_class)) { |
|
| 181 | 181 | $relation_class = ctrlNamespace().'\\'.$module->controller; |
| 182 | 182 | } |
| 183 | 183 | |
@@ -4,7 +4,7 @@ |
||
| 4 | 4 | 'middleware' => ['web', \crocodicstudio\crudbooster\middlewares\CBSuperadmin::class], |
| 5 | 5 | 'prefix' => cbAdminPath(), |
| 6 | 6 | 'namespace' => cbModulesNS('StatisticModule'), |
| 7 | -], function () { |
|
| 7 | +], function() { |
|
| 8 | 8 | Route::get('statistic-builder/', 'AdminStatisticBuilderController@getIndex')->name('AdminStatisticBuilderControllerGetIndex'); |
| 9 | 9 | Route::get('statistic-builder/show-dashboard', 'AdminStatisticBuilderController@getShowDashboard')->name('AdminStatisticBuilderControllerGetShowDashboard'); |
| 10 | 10 | Route::get('statistic-builder/show', 'AdminStatisticBuilderController@getShow')->name('AdminStatisticBuilderControllerGetShow'); |
@@ -5,7 +5,7 @@ discard block |
||
| 5 | 5 | |
| 6 | 6 | $namespace = cbControllersNS(); |
| 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(); |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | 'middleware' => ['web', \crocodicstudio\crudbooster\middlewares\CBSuperadmin::class], |
| 32 | 32 | 'prefix' => cbAdminPath(), |
| 33 | 33 | 'namespace' => $namespace, |
| 34 | -], function () { |
|
| 34 | +], function() { |
|
| 35 | 35 | Route::post('{module}/do-upload-import-data', 'FileController@uploadImportData')->name('UploadImportData'); |
| 36 | 36 | Route::post('{module}/upload-summernote', 'FileController@uploadSummernote')->name('UploadImportData'); |
| 37 | 37 | Route::post('{module}/upload-file', 'FileController@uploadFile')->name('UploadImportData'); |
@@ -116,7 +116,7 @@ |
||
| 116 | 116 | */ |
| 117 | 117 | private function tokenMissMatchDevice($senderToken, $userAgent, $serverToken) |
| 118 | 118 | { |
| 119 | - if (! Cache::has($senderToken) || Cache::get($senderToken) == $userAgent) { |
|
| 119 | + if (!Cache::has($senderToken) || Cache::get($senderToken) == $userAgent) { |
|
| 120 | 120 | return; |
| 121 | 121 | } |
| 122 | 122 | $result = [ |
@@ -15,11 +15,11 @@ discard block |
||
| 15 | 15 | */ |
| 16 | 16 | public static function findPK(string $table): string |
| 17 | 17 | { |
| 18 | - if (! $table) { |
|
| 18 | + if (!$table) { |
|
| 19 | 19 | return 'id'; |
| 20 | 20 | } |
| 21 | 21 | |
| 22 | - return cache()->remember('CrudBooster_pk_'.$table, 10, function () use ($table) { |
|
| 22 | + return cache()->remember('CrudBooster_pk_'.$table, 10, function() use ($table) { |
|
| 23 | 23 | return self::findPKname($table) ?: 'id'; |
| 24 | 24 | }); |
| 25 | 25 | } |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | private static function findPKname($table) |
| 32 | 32 | { |
| 33 | 33 | $cols = \DB::getDoctrineSchemaManager()->listTableDetails($table)->getPrimaryKey()->getColumns(); |
| 34 | - if (! empty($cols)) { |
|
| 34 | + if (!empty($cols)) { |
|
| 35 | 35 | return $cols[0]; |
| 36 | 36 | } |
| 37 | 37 | } |
@@ -44,11 +44,11 @@ discard block |
||
| 44 | 44 | public static function isNullableColumn($table, $colName) |
| 45 | 45 | { |
| 46 | 46 | $colObj = \DB::getDoctrineSchemaManager()->listTableColumns($table)[$colName]; |
| 47 | - if (! $colObj) { |
|
| 47 | + if (!$colObj) { |
|
| 48 | 48 | return; |
| 49 | 49 | } |
| 50 | 50 | |
| 51 | - return ! $colObj->getNotnull(); |
|
| 51 | + return !$colObj->getNotnull(); |
|
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | /** |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | */ |
| 77 | 77 | public static function isForeignKey($fieldName) |
| 78 | 78 | { |
| 79 | - return Cache::rememberForever('crudbooster_isForeignKey_'.$fieldName, function () use ($fieldName) { |
|
| 79 | + return Cache::rememberForever('crudbooster_isForeignKey_'.$fieldName, function() use ($fieldName) { |
|
| 80 | 80 | $table = self::getTableForeignKey($fieldName); |
| 81 | 81 | return ($table && Schema::hasTable($table)); |
| 82 | 82 | }); |
@@ -94,11 +94,11 @@ discard block |
||
| 94 | 94 | $component_name = $component->component_name; |
| 95 | 95 | $area_name = $component->area_name; |
| 96 | 96 | $config = json_decode($component->config); |
| 97 | - if (! $config) { |
|
| 97 | + if (!$config) { |
|
| 98 | 98 | return response()->json(compact('componentID', 'layout')); |
| 99 | 99 | } |
| 100 | 100 | foreach ($config as $key => $value) { |
| 101 | - if (! $value) { |
|
| 101 | + if (!$value) { |
|
| 102 | 102 | continue; |
| 103 | 103 | } |
| 104 | 104 | $command = 'showFunction'; |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | 'name' => 'Untitled', |
| 127 | 127 | ]; |
| 128 | 128 | |
| 129 | - if (! $data['created_at'] && Schema::hasColumn('cms_statistic_components', 'created_at')) { |
|
| 129 | + if (!$data['created_at'] && Schema::hasColumn('cms_statistic_components', 'created_at')) { |
|
| 130 | 130 | $data['created_at'] = YmdHis(); |
| 131 | 131 | } |
| 132 | 132 | |
@@ -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,35 +74,35 @@ 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); |
| 102 | 102 | } |
| 103 | 103 | } |
| 104 | 104 | |
| 105 | -if (! function_exists('now')) { |
|
| 105 | +if (!function_exists('now')) { |
|
| 106 | 106 | function now() |
| 107 | 107 | { |
| 108 | 108 | return date('Y-m-d H:i:s'); |
@@ -116,14 +116,14 @@ discard block |
||
| 116 | 116 | | $name = name of input |
| 117 | 117 | | |
| 118 | 118 | */ |
| 119 | -if (! function_exists('g')) { |
|
| 119 | +if (!function_exists('g')) { |
|
| 120 | 120 | function g($name) |
| 121 | 121 | { |
| 122 | 122 | return Request::get($name); |
| 123 | 123 | } |
| 124 | 124 | } |
| 125 | 125 | |
| 126 | -if (! function_exists('cbTrans')) { |
|
| 126 | +if (!function_exists('cbTrans')) { |
|
| 127 | 127 | /** |
| 128 | 128 | * Translate the given message. |
| 129 | 129 | * |
@@ -137,34 +137,34 @@ discard block |
||
| 137 | 137 | } |
| 138 | 138 | } |
| 139 | 139 | |
| 140 | -if (! function_exists('cbAsset')) { |
|
| 140 | +if (!function_exists('cbAsset')) { |
|
| 141 | 141 | function cbAsset($key) |
| 142 | 142 | { |
| 143 | 143 | return asset('vendor/crudbooster/assets/'.$key); |
| 144 | 144 | } |
| 145 | 145 | } |
| 146 | 146 | |
| 147 | -if (! function_exists('cbScript')) { |
|
| 147 | +if (!function_exists('cbScript')) { |
|
| 148 | 148 | function cbScript($key) |
| 149 | 149 | { |
| 150 | 150 | return '<script src="'.cbAsset($key).'" type="text/javascript"></script>'; |
| 151 | 151 | } |
| 152 | 152 | } |
| 153 | 153 | |
| 154 | -if (! function_exists('cbStyleSheet')) { |
|
| 154 | +if (!function_exists('cbStyleSheet')) { |
|
| 155 | 155 | function cbStyleSheet($key) |
| 156 | 156 | { |
| 157 | 157 | return '<link rel="stylesheet" type="text/css" href="'.cbAsset($key).'"/>'; |
| 158 | 158 | } |
| 159 | 159 | } |
| 160 | 160 | |
| 161 | -if (! function_exists('cbConfig')) { |
|
| 161 | +if (!function_exists('cbConfig')) { |
|
| 162 | 162 | function cbConfig($key, $default = null) |
| 163 | 163 | { |
| 164 | 164 | return config('crudbooster.'.$key, $default); |
| 165 | 165 | } |
| 166 | 166 | } |
| 167 | -if (! function_exists('makeValidationForHTML')) { |
|
| 167 | +if (!function_exists('makeValidationForHTML')) { |
|
| 168 | 168 | function makeValidationForHTML($rules) |
| 169 | 169 | { |
| 170 | 170 | $validation = []; |
@@ -182,7 +182,7 @@ discard block |
||
| 182 | 182 | } |
| 183 | 183 | } |
| 184 | 184 | |
| 185 | -if (! function_exists('findSelected')) { |
|
| 185 | +if (!function_exists('findSelected')) { |
|
| 186 | 186 | /** |
| 187 | 187 | * @param $rawvalue |
| 188 | 188 | * @param $form |
@@ -191,7 +191,7 @@ discard block |
||
| 191 | 191 | */ |
| 192 | 192 | function findSelected($rawvalue, $form, $optionValue) |
| 193 | 193 | { |
| 194 | - if (! $rawvalue) { |
|
| 194 | + if (!$rawvalue) { |
|
| 195 | 195 | return ''; |
| 196 | 196 | } |
| 197 | 197 | $value = $rawvalue; |
@@ -213,7 +213,7 @@ discard block |
||
| 213 | 213 | return $selected; |
| 214 | 214 | } |
| 215 | 215 | } |
| 216 | -if (! function_exists('array_get_keys')) { |
|
| 216 | +if (!function_exists('array_get_keys')) { |
|
| 217 | 217 | |
| 218 | 218 | /** |
| 219 | 219 | * @param array $_array |
@@ -229,21 +229,21 @@ discard block |
||
| 229 | 229 | } |
| 230 | 230 | } |
| 231 | 231 | |
| 232 | -if (! function_exists('cbGetSetting')) { |
|
| 232 | +if (!function_exists('cbGetSetting')) { |
|
| 233 | 233 | function cbGetSetting($name) |
| 234 | 234 | { |
| 235 | 235 | return \crocodicstudio\crudbooster\Modules\SettingModule\SettingRepo::getSetting($name); |
| 236 | 236 | } |
| 237 | 237 | } |
| 238 | 238 | |
| 239 | -if (! function_exists('backWithMsg')) { |
|
| 239 | +if (!function_exists('backWithMsg')) { |
|
| 240 | 240 | function backWithMsg($msg, $type = 'success') |
| 241 | 241 | { |
| 242 | 242 | sendAndTerminate(redirect()->back()->with(['message_type' => $type, 'message' => $msg])); |
| 243 | 243 | } |
| 244 | 244 | } |
| 245 | 245 | |
| 246 | -if (! function_exists('underField')) { |
|
| 246 | +if (!function_exists('underField')) { |
|
| 247 | 247 | function underField($help, $error) |
| 248 | 248 | { |
| 249 | 249 | $error = $error ? "<i class='fa fa-info-circle'></i> $error" : ''; |
@@ -251,14 +251,14 @@ discard block |
||
| 251 | 251 | return "<div class='text-danger'>$error</div><p class='help-block'>$help</p>"; |
| 252 | 252 | } |
| 253 | 253 | } |
| 254 | -if (! function_exists('cbIcon')) { |
|
| 254 | +if (!function_exists('cbIcon')) { |
|
| 255 | 255 | function cbIcon($icon) |
| 256 | 256 | { |
| 257 | 257 | return '<i class=\'fa fa-'.$icon.'\'></i>'; |
| 258 | 258 | } |
| 259 | 259 | } |
| 260 | 260 | |
| 261 | -if (! function_exists('YmdHis')) { |
|
| 261 | +if (!function_exists('YmdHis')) { |
|
| 262 | 262 | function YmdHis() |
| 263 | 263 | { |
| 264 | 264 | return date('Y-m-d H:i:s'); |
@@ -23,7 +23,7 @@ |
||
| 23 | 23 | public static function getCurrentModule() |
| 24 | 24 | { |
| 25 | 25 | $modulepath = self::getModulePath(); |
| 26 | - return cache()->remember('crudbooster_modules_'.$modulepath, 2, function () use ($modulepath) { |
|
| 26 | + return cache()->remember('crudbooster_modules_'.$modulepath, 2, function() use ($modulepath) { |
|
| 27 | 27 | return DB::table('cms_moduls')->where('path', $modulepath)->first(); |
| 28 | 28 | }); |
| 29 | 29 | } |