@@ -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 | CB::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 | CB::redirect(Request::server('HTTP_REFERER'), cbTrans('alert_delete_data_success'), 'success'); |
| 73 | 73 | } |
@@ -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\Modules\\'.$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 'App\Http\Controllers'; |
| 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,7 +53,7 @@ discard block |
||
| 53 | 53 | } |
| 54 | 54 | } |
| 55 | 55 | |
| 56 | -if (! function_exists('controllers_dir')) { |
|
| 56 | +if (!function_exists('controllers_dir')) { |
|
| 57 | 57 | function controllers_dir() |
| 58 | 58 | { |
| 59 | 59 | $_ = DIRECTORY_SEPARATOR; |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | } |
| 62 | 62 | } |
| 63 | 63 | |
| 64 | -if (! function_exists('controller_path')) { |
|
| 64 | +if (!function_exists('controller_path')) { |
|
| 65 | 65 | function controller_path($controller) |
| 66 | 66 | { |
| 67 | 67 | $_ = DIRECTORY_SEPARATOR; |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | } |
| 70 | 70 | } |
| 71 | 71 | |
| 72 | -if (! function_exists('extract_unit')) { |
|
| 72 | +if (!function_exists('extract_unit')) { |
|
| 73 | 73 | /* |
| 74 | 74 | Credits: Bit Repository |
| 75 | 75 | URL: http://www.bitrepository.com/extract-content-between-two-delimiters-with-php.html |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | } |
| 88 | 88 | } |
| 89 | 89 | |
| 90 | -if (! function_exists('now')) { |
|
| 90 | +if (!function_exists('now')) { |
|
| 91 | 91 | function now() |
| 92 | 92 | { |
| 93 | 93 | return date('Y-m-d H:i:s'); |
@@ -101,17 +101,17 @@ discard block |
||
| 101 | 101 | | $name = name of input |
| 102 | 102 | | |
| 103 | 103 | */ |
| 104 | -if (! function_exists('g')) { |
|
| 104 | +if (!function_exists('g')) { |
|
| 105 | 105 | function g($name) |
| 106 | 106 | { |
| 107 | 107 | return Request::get($name); |
| 108 | 108 | } |
| 109 | 109 | } |
| 110 | 110 | |
| 111 | -if (! function_exists('min_var_export')) { |
|
| 111 | +if (!function_exists('min_var_export')) { |
|
| 112 | 112 | function min_var_export($input, $indent = "") |
| 113 | 113 | { |
| 114 | - if (! is_array($input)) { |
|
| 114 | + if (!is_array($input)) { |
|
| 115 | 115 | return var_export($input, true); |
| 116 | 116 | } |
| 117 | 117 | $buffer = []; |
@@ -126,41 +126,41 @@ discard block |
||
| 126 | 126 | } |
| 127 | 127 | } |
| 128 | 128 | |
| 129 | -if (! function_exists('cbTrans')) { |
|
| 129 | +if (!function_exists('cbTrans')) { |
|
| 130 | 130 | function cbTrans($key, $params = []) |
| 131 | 131 | { |
| 132 | 132 | return trans('crudbooster.'.$key, $params); |
| 133 | 133 | } |
| 134 | 134 | } |
| 135 | 135 | |
| 136 | -if (! function_exists('cbAsset')) { |
|
| 136 | +if (!function_exists('cbAsset')) { |
|
| 137 | 137 | function cbAsset($key) |
| 138 | 138 | { |
| 139 | 139 | return asset('vendor/crudbooster/assets/'.$key); |
| 140 | 140 | } |
| 141 | 141 | } |
| 142 | 142 | |
| 143 | -if (! function_exists('cbScript')) { |
|
| 143 | +if (!function_exists('cbScript')) { |
|
| 144 | 144 | function cbScript($key) |
| 145 | 145 | { |
| 146 | 146 | return '<script src="'.cbAsset($key).'" type="text/javascript"></script>'; |
| 147 | 147 | } |
| 148 | 148 | } |
| 149 | 149 | |
| 150 | -if (! function_exists('cbStyleSheet')) { |
|
| 150 | +if (!function_exists('cbStyleSheet')) { |
|
| 151 | 151 | function cbStyleSheet($key) |
| 152 | 152 | { |
| 153 | 153 | return '<link rel="stylesheet" type="text/css" href="'.cbAsset($key).'"/>'; |
| 154 | 154 | } |
| 155 | 155 | } |
| 156 | 156 | |
| 157 | -if (! function_exists('cbConfig')) { |
|
| 157 | +if (!function_exists('cbConfig')) { |
|
| 158 | 158 | function cbConfig($key, $default = null) |
| 159 | 159 | { |
| 160 | 160 | return config('crudbooster.'.$key, $default); |
| 161 | 161 | } |
| 162 | 162 | } |
| 163 | -if (! function_exists('makeValidationForHTML')) { |
|
| 163 | +if (!function_exists('makeValidationForHTML')) { |
|
| 164 | 164 | function makeValidationForHTML($rules) |
| 165 | 165 | { |
| 166 | 166 | $validation = []; |
@@ -178,7 +178,7 @@ discard block |
||
| 178 | 178 | } |
| 179 | 179 | } |
| 180 | 180 | |
| 181 | -if (! function_exists('findSelected')) { |
|
| 181 | +if (!function_exists('findSelected')) { |
|
| 182 | 182 | /** |
| 183 | 183 | * @param $rawvalue |
| 184 | 184 | * @param $form |
@@ -187,7 +187,7 @@ discard block |
||
| 187 | 187 | */ |
| 188 | 188 | function findSelected($rawvalue, $form, $optionValue) |
| 189 | 189 | { |
| 190 | - if (! $rawvalue) { |
|
| 190 | + if (!$rawvalue) { |
|
| 191 | 191 | return ''; |
| 192 | 192 | } |
| 193 | 193 | $value = $rawvalue; |
@@ -209,7 +209,7 @@ discard block |
||
| 209 | 209 | return $selected; |
| 210 | 210 | } |
| 211 | 211 | } |
| 212 | -if (! function_exists('array_get_keys')) { |
|
| 212 | +if (!function_exists('array_get_keys')) { |
|
| 213 | 213 | |
| 214 | 214 | /** |
| 215 | 215 | * @param array $_array |
@@ -225,24 +225,24 @@ discard block |
||
| 225 | 225 | } |
| 226 | 226 | } |
| 227 | 227 | |
| 228 | -if (! function_exists('cbGetSetting')) { |
|
| 228 | +if (!function_exists('cbGetSetting')) { |
|
| 229 | 229 | function cbGetSetting($name) |
| 230 | 230 | { |
| 231 | 231 | return \crocodicstudio\crudbooster\Modules\SettingModule\SettingRepo::getSetting($name); |
| 232 | 232 | } |
| 233 | 233 | } |
| 234 | 234 | |
| 235 | -if (! function_exists('backWithMsg')) { |
|
| 235 | +if (!function_exists('backWithMsg')) { |
|
| 236 | 236 | function backWithMsg($msg, $type = 'success') |
| 237 | 237 | { |
| 238 | 238 | sendAndTerminate(redirect()->back()->with(['message_type' => $type, 'message' => $msg])); |
| 239 | 239 | } |
| 240 | 240 | } |
| 241 | 241 | |
| 242 | -if (! function_exists('underField')) { |
|
| 242 | +if (!function_exists('underField')) { |
|
| 243 | 243 | function underField($help, $error) |
| 244 | 244 | { |
| 245 | - $error = $error ? "<i class='fa fa-info-circle'></i> $error":'' ; |
|
| 245 | + $error = $error ? "<i class='fa fa-info-circle'></i> $error" : ''; |
|
| 246 | 246 | return "<div class='text-danger'>$error</div><p class='help-block'>$help</p>"; |
| 247 | 247 | } |
| 248 | 248 | } |
@@ -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 | $primary_key = self::findPKname($table); |
| 33 | 33 | |
| 34 | - if (! $primary_key) { |
|
| 34 | + if (!$primary_key) { |
|
| 35 | 35 | return 'id'; |
| 36 | 36 | } |
| 37 | 37 | CbCache::put('table_'.$table, 'primary_key', $primary_key); |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | $cols = collect(DB::select('SELECT * FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = :database AND TABLE_NAME = :table', [ |
| 102 | 102 | 'database' => $table['database'], |
| 103 | 103 | 'table' => $table['table'], |
| 104 | - ]))->map(function ($x) { |
|
| 104 | + ]))->map(function($x) { |
|
| 105 | 105 | return (array) $x; |
| 106 | 106 | })->toArray(); |
| 107 | 107 | |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | { |
| 118 | 118 | $field = 'field_type_'.$table.'_'.$field; |
| 119 | 119 | |
| 120 | - return Cache::rememberForever($field, function () use ($table, $field) { |
|
| 120 | + return Cache::rememberForever($field, function() use ($table, $field) { |
|
| 121 | 121 | try { |
| 122 | 122 | //MySQL & SQL Server |
| 123 | 123 | $typedata = DB::select(DB::raw("select DATA_TYPE from INFORMATION_SCHEMA.COLUMNS where TABLE_NAME='$table' and COLUMN_NAME = '$field'"))[0]->DATA_TYPE; |
@@ -142,7 +142,7 @@ discard block |
||
| 142 | 142 | } |
| 143 | 143 | |
| 144 | 144 | $table = CRUDBooster::getTableForeignKey($fieldName); |
| 145 | - if (! $table) { |
|
| 145 | + if (!$table) { |
|
| 146 | 146 | return false; |
| 147 | 147 | } |
| 148 | 148 | |
@@ -132,8 +132,8 @@ |
||
| 132 | 132 | $default = ["text", "min:1|max:255", []]; |
| 133 | 133 | return array_get([ |
| 134 | 134 | 'text' => ['textarea', "string|min:5", []], |
| 135 | - 'date' => ['date', "date", ['php_format' => 'M, d Y', 'datepicker_format' => 'M, dd YYYY',]], |
|
| 136 | - 'datetime' => ['datetime', "date_format:Y-m-d H:i:s", ['php_format' => 'M, d Y H:i',]], |
|
| 135 | + 'date' => ['date', "date", ['php_format' => 'M, d Y', 'datepicker_format' => 'M, dd YYYY', ]], |
|
| 136 | + 'datetime' => ['datetime', "date_format:Y-m-d H:i:s", ['php_format' => 'M, d Y H:i', ]], |
|
| 137 | 137 | 'time' => ['time', 'date_format:H:i:s', []], |
| 138 | 138 | 'double' => ['money', "integer|min:0", []], |
| 139 | 139 | 'int' => ['number', 'integer|min:0', []], |
@@ -14,7 +14,7 @@ |
||
| 14 | 14 | public function boot() |
| 15 | 15 | { |
| 16 | 16 | $this->app['view']->addNamespace('CbEmailTpl', __DIR__.'/views'); |
| 17 | - $this->loadRoutesFrom( __DIR__.'/email_templates_routes.php'); |
|
| 17 | + $this->loadRoutesFrom(__DIR__.'/email_templates_routes.php'); |
|
| 18 | 18 | } |
| 19 | 19 | |
| 20 | 20 | /** |