@@ -19,12 +19,12 @@ |
||
| 19 | 19 | */ |
| 20 | 20 | private function validation() |
| 21 | 21 | { |
| 22 | - if(isset($this->data['validation'])) { |
|
| 22 | + if (isset($this->data['validation'])) { |
|
| 23 | 23 | $validator = Validator::make(request()->all(), @$this->data['validation'], @$this->data['validation_messages']); |
| 24 | 24 | if ($validator->fails()) { |
| 25 | 25 | $message = $validator->messages(); |
| 26 | 26 | $message_all = $message->all(); |
| 27 | - throw new CBValidationException(implode(', ',$message_all)); |
|
| 27 | + throw new CBValidationException(implode(', ', $message_all)); |
|
| 28 | 28 | } |
| 29 | 29 | } |
| 30 | 30 | } |
@@ -23,7 +23,7 @@ |
||
| 23 | 23 | |
| 24 | 24 | public function hasData($key) { |
| 25 | 25 | $data = $this->data; |
| 26 | - if(isset($data[$key])) return true; |
|
| 26 | + if (isset($data[$key])) return true; |
|
| 27 | 27 | else return false; |
| 28 | 28 | } |
| 29 | 29 | |
@@ -23,8 +23,11 @@ |
||
| 23 | 23 | |
| 24 | 24 | public function hasData($key) { |
| 25 | 25 | $data = $this->data; |
| 26 | - if(isset($data[$key])) return true; |
|
| 27 | - else return false; |
|
| 26 | + if(isset($data[$key])) { |
|
| 27 | + return true; |
|
| 28 | + } else { |
|
| 29 | + return false; |
|
| 30 | + } |
|
| 28 | 31 | } |
| 29 | 32 | |
| 30 | 33 | public function setData($key, $value): void |
@@ -16,6 +16,6 @@ |
||
| 16 | 16 | public static function hasColumn($table, $column) |
| 17 | 17 | { |
| 18 | 18 | $columns = cb()->listAllColumns($table); |
| 19 | - return in_array($column,$columns); |
|
| 19 | + return in_array($column, $columns); |
|
| 20 | 20 | } |
| 21 | 21 | } |
| 22 | 22 | \ No newline at end of file |
@@ -100,14 +100,14 @@ discard block |
||
| 100 | 100 | if($resize_width || $resize_height) { |
| 101 | 101 | $this->resizeImage($file, $file_path.'/'.$filename, $resize_width, $resize_height); |
| 102 | 102 | return $file_path.'/'.$filename; |
| 103 | - }else{ |
|
| 103 | + } else{ |
|
| 104 | 104 | if (Storage::putFileAs($file_path, $file, $filename, 'public')) { |
| 105 | 105 | return $file_path.'/'.$filename; |
| 106 | 106 | } else { |
| 107 | 107 | throw new \Exception("Something went wrong, file can't upload!"); |
| 108 | 108 | } |
| 109 | 109 | } |
| 110 | - }else{ |
|
| 110 | + } else{ |
|
| 111 | 111 | throw new \Exception("The file format is not allowed!"); |
| 112 | 112 | } |
| 113 | 113 | } |
@@ -129,10 +129,10 @@ discard block |
||
| 129 | 129 | if($filename && $ext) { |
| 130 | 130 | return $this->uploadFileProcess($filename, $ext, $fileData, $encrypt, $resize_width, $resize_height); |
| 131 | 131 | } |
| 132 | - }else { |
|
| 132 | + } else { |
|
| 133 | 133 | throw new \Exception("Mime type not found"); |
| 134 | 134 | } |
| 135 | - }else{ |
|
| 135 | + } else{ |
|
| 136 | 136 | throw new \Exception("Mime type not found"); |
| 137 | 137 | } |
| 138 | 138 | } |
@@ -209,7 +209,7 @@ discard block |
||
| 209 | 209 | } |
| 210 | 210 | |
| 211 | 211 | Storage::put($fullFilePath, $img, 'public'); |
| 212 | - }else{ |
|
| 212 | + } else{ |
|
| 213 | 213 | throw new \Exception("The file format is not allowed!"); |
| 214 | 214 | } |
| 215 | 215 | } |
@@ -233,7 +233,9 @@ discard block |
||
| 233 | 233 | { |
| 234 | 234 | if (is_array($id)) { |
| 235 | 235 | $idHash = md5("find".$table.serialize($id)); |
| 236 | - if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash); |
|
| 236 | + if(miscellanousSingleton()->hasData($idHash)) { |
|
| 237 | + return miscellanousSingleton()->getData($idHash); |
|
| 238 | + } |
|
| 237 | 239 | |
| 238 | 240 | $first = DB::table($table); |
| 239 | 241 | foreach ($id as $k => $v) { |
@@ -245,7 +247,9 @@ discard block |
||
| 245 | 247 | return $data; |
| 246 | 248 | } else { |
| 247 | 249 | $idHash = md5("find".$table.$id); |
| 248 | - if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash); |
|
| 250 | + if(miscellanousSingleton()->hasData($idHash)) { |
|
| 251 | + return miscellanousSingleton()->getData($idHash); |
|
| 252 | + } |
|
| 249 | 253 | |
| 250 | 254 | $pk = $this->pk($table); |
| 251 | 255 | $data = DB::table($table)->where($pk, $id)->first(); |
@@ -266,19 +270,25 @@ discard block |
||
| 266 | 270 | |
| 267 | 271 | if(is_array($conditionOrCallback)) { |
| 268 | 272 | $idHash = md5("findAll".$table.serialize($conditionOrCallback)); |
| 269 | - if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash); |
|
| 273 | + if(miscellanousSingleton()->hasData($idHash)) { |
|
| 274 | + return miscellanousSingleton()->getData($idHash); |
|
| 275 | + } |
|
| 270 | 276 | |
| 271 | 277 | $data = DB::table($table)->where($conditionOrCallback)->get(); |
| 272 | 278 | } elseif (is_callable($conditionOrCallback)) { |
| 273 | 279 | $idHash = "findAll".$table.spl_object_hash($conditionOrCallback); |
| 274 | - if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash); |
|
| 280 | + if(miscellanousSingleton()->hasData($idHash)) { |
|
| 281 | + return miscellanousSingleton()->getData($idHash); |
|
| 282 | + } |
|
| 275 | 283 | |
| 276 | 284 | $data = DB::table($table); |
| 277 | 285 | $data = call_user_func($conditionOrCallback, $data); |
| 278 | 286 | $data = $data->get(); |
| 279 | 287 | } else { |
| 280 | 288 | $idHash = md5("findAll".$table.$conditionOrCallback); |
| 281 | - if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash); |
|
| 289 | + if(miscellanousSingleton()->hasData($idHash)) { |
|
| 290 | + return miscellanousSingleton()->getData($idHash); |
|
| 291 | + } |
|
| 282 | 292 | |
| 283 | 293 | $data = DB::table($table); |
| 284 | 294 | if($conditionOrCallback) { |
@@ -297,7 +307,9 @@ discard block |
||
| 297 | 307 | public function listAllTable() |
| 298 | 308 | { |
| 299 | 309 | $idHash = md5("listAllTable"); |
| 300 | - if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash); |
|
| 310 | + if(miscellanousSingleton()->hasData($idHash)) { |
|
| 311 | + return miscellanousSingleton()->getData($idHash); |
|
| 312 | + } |
|
| 301 | 313 | $data = DB::connection()->getDoctrineSchemaManager()->listTableNames(); |
| 302 | 314 | miscellanousSingleton()->setData($idHash, $data); |
| 303 | 315 | return $data; |
@@ -306,7 +318,9 @@ discard block |
||
| 306 | 318 | public function listAllColumns($table) |
| 307 | 319 | { |
| 308 | 320 | $idHash = md5("listAllColumns".$table); |
| 309 | - if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash); |
|
| 321 | + if(miscellanousSingleton()->hasData($idHash)) { |
|
| 322 | + return miscellanousSingleton()->getData($idHash); |
|
| 323 | + } |
|
| 310 | 324 | $data = Schema::getColumnListing($table); |
| 311 | 325 | miscellanousSingleton()->setData($idHash, $data); |
| 312 | 326 | return $data; |
@@ -24,7 +24,7 @@ discard block |
||
| 24 | 24 | } |
| 25 | 25 | |
| 26 | 26 | public function getRoleByName($roleName) { |
| 27 | - return $this->find("cb_roles",['name'=>$roleName]); |
|
| 27 | + return $this->find("cb_roles", ['name'=>$roleName]); |
|
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | public function fcm() { |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | public function getDeveloperPath($path = null) { |
| 43 | - $path = ($path)?"/".trim($path,"/"):null; |
|
| 43 | + $path = ($path) ? "/".trim($path, "/") : null; |
|
| 44 | 44 | return "developer/".getSetting("developer_path").$path; |
| 45 | 45 | } |
| 46 | 46 | |
@@ -61,16 +61,16 @@ discard block |
||
| 61 | 61 | } |
| 62 | 62 | |
| 63 | 63 | public function getAdminPath() { |
| 64 | - return getSetting("ADMIN_PATH","admin"); |
|
| 64 | + return getSetting("ADMIN_PATH", "admin"); |
|
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | public function getAdminUrl($path = null) { |
| 68 | - $path = ($path)?"/".trim($path,"/"):null; |
|
| 68 | + $path = ($path) ? "/".trim($path, "/") : null; |
|
| 69 | 69 | return url($this->getAdminPath()).$path; |
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | public function getAppName() { |
| 73 | - return getSetting("APP_NAME", env("APP_NAME","CRUDBOOSTER")); |
|
| 73 | + return getSetting("APP_NAME", env("APP_NAME", "CRUDBOOSTER")); |
|
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | /** |
@@ -84,16 +84,16 @@ discard block |
||
| 84 | 84 | */ |
| 85 | 85 | private function uploadFileProcess($filename, $extension, $file, $encrypt = true, $resize_width = null, $resize_height = null) |
| 86 | 86 | { |
| 87 | - if(in_array($extension,cbConfig("UPLOAD_FILE_EXTENSION_ALLOWED"))) { |
|
| 87 | + if (in_array($extension, cbConfig("UPLOAD_FILE_EXTENSION_ALLOWED"))) { |
|
| 88 | 88 | $file_path = cbConfig("UPLOAD_PATH_FORMAT"); |
| 89 | - $file_path = str_replace("{Y}",date('Y'), $file_path); |
|
| 89 | + $file_path = str_replace("{Y}", date('Y'), $file_path); |
|
| 90 | 90 | $file_path = str_replace("{m}", date('m'), $file_path); |
| 91 | 91 | $file_path = str_replace("{d}", date("d"), $file_path); |
| 92 | 92 | |
| 93 | 93 | //Create Directory Base On Template |
| 94 | 94 | Storage::makeDirectory($file_path); |
| 95 | - Storage::put($file_path."/index.html"," ","public"); |
|
| 96 | - Storage::put($file_path."/.gitignore","!.gitignore","public"); |
|
| 95 | + Storage::put($file_path."/index.html", " ", "public"); |
|
| 96 | + Storage::put($file_path."/.gitignore", "!.gitignore", "public"); |
|
| 97 | 97 | |
| 98 | 98 | if ($encrypt == true) { |
| 99 | 99 | $filename = md5(strRandom(5)).'.'.$extension; |
@@ -101,17 +101,17 @@ discard block |
||
| 101 | 101 | $filename = slug($filename, '_').'.'.$extension; |
| 102 | 102 | } |
| 103 | 103 | |
| 104 | - if($resize_width || $resize_height) { |
|
| 104 | + if ($resize_width || $resize_height) { |
|
| 105 | 105 | $this->resizeImage($file, $file_path.'/'.$filename, $resize_width, $resize_height); |
| 106 | 106 | return $file_path.'/'.$filename; |
| 107 | - }else{ |
|
| 107 | + } else { |
|
| 108 | 108 | if (Storage::putFileAs($file_path, $file, $filename, 'public')) { |
| 109 | 109 | return $file_path.'/'.$filename; |
| 110 | 110 | } else { |
| 111 | 111 | throw new \Exception("Something went wrong, file can't upload!"); |
| 112 | 112 | } |
| 113 | 113 | } |
| 114 | - }else{ |
|
| 114 | + } else { |
|
| 115 | 115 | throw new \Exception("The file format is not allowed!"); |
| 116 | 116 | } |
| 117 | 117 | } |
@@ -127,16 +127,16 @@ discard block |
||
| 127 | 127 | { |
| 128 | 128 | $fileData = base64_decode($base64_value); |
| 129 | 129 | $mime_type = finfo_buffer(finfo_open(), $fileData, FILEINFO_MIME_TYPE); |
| 130 | - if($mime_type) { |
|
| 131 | - if($mime_type = explode('/', $mime_type)) { |
|
| 130 | + if ($mime_type) { |
|
| 131 | + if ($mime_type = explode('/', $mime_type)) { |
|
| 132 | 132 | $ext = $mime_type[1]; |
| 133 | - if($filename && $ext) { |
|
| 133 | + if ($filename && $ext) { |
|
| 134 | 134 | return $this->uploadFileProcess($filename, $ext, $fileData, $encrypt, $resize_width, $resize_height); |
| 135 | 135 | } |
| 136 | - }else { |
|
| 136 | + } else { |
|
| 137 | 137 | throw new \Exception("Mime type not found"); |
| 138 | 138 | } |
| 139 | - }else{ |
|
| 139 | + } else { |
|
| 140 | 140 | throw new \Exception("Mime type not found"); |
| 141 | 141 | } |
| 142 | 142 | } |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | $filename = $file->getClientOriginalName(); |
| 157 | 157 | $ext = strtolower($file->getClientOriginalExtension()); |
| 158 | 158 | |
| 159 | - if($filename && $ext) { |
|
| 159 | + if ($filename && $ext) { |
|
| 160 | 160 | return $this->uploadFileProcess($filename, $ext, $file, $encrypt, $resize_width, $resize_height); |
| 161 | 161 | } |
| 162 | 162 | |
@@ -191,29 +191,29 @@ discard block |
||
| 191 | 191 | if ($resize_width && $resize_height) { |
| 192 | 192 | $img->fit($resize_width, $resize_height); |
| 193 | 193 | |
| 194 | - } elseif ($resize_width && ! $resize_height) { |
|
| 194 | + } elseif ($resize_width && !$resize_height) { |
|
| 195 | 195 | |
| 196 | - $img->resize($resize_width, null, function ($constraint) { |
|
| 196 | + $img->resize($resize_width, null, function($constraint) { |
|
| 197 | 197 | $constraint->aspectRatio(); |
| 198 | 198 | }); |
| 199 | 199 | |
| 200 | - } elseif (! $resize_width && $resize_height) { |
|
| 200 | + } elseif (!$resize_width && $resize_height) { |
|
| 201 | 201 | |
| 202 | - $img->resize(null, $resize_height, function ($constraint) { |
|
| 202 | + $img->resize(null, $resize_height, function($constraint) { |
|
| 203 | 203 | $constraint->aspectRatio(); |
| 204 | 204 | }); |
| 205 | 205 | |
| 206 | 206 | } else { |
| 207 | 207 | |
| 208 | 208 | if ($img->width() > cbConfig("DEFAULT_IMAGE_MAX_WIDTH_RES")) { |
| 209 | - $img->resize(cbConfig("DEFAULT_IMAGE_MAX_WIDTH_RES"), null, function ($constraint) { |
|
| 209 | + $img->resize(cbConfig("DEFAULT_IMAGE_MAX_WIDTH_RES"), null, function($constraint) { |
|
| 210 | 210 | $constraint->aspectRatio(); |
| 211 | 211 | }); |
| 212 | 212 | } |
| 213 | 213 | } |
| 214 | 214 | |
| 215 | 215 | Storage::put($fullFilePath, $img, 'public'); |
| 216 | - }else{ |
|
| 216 | + } else { |
|
| 217 | 217 | throw new \Exception("The file format is not allowed!"); |
| 218 | 218 | } |
| 219 | 219 | } |
@@ -237,7 +237,7 @@ discard block |
||
| 237 | 237 | { |
| 238 | 238 | if (is_array($id)) { |
| 239 | 239 | $idHash = md5("find".$table.serialize($id)); |
| 240 | - if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash); |
|
| 240 | + if (miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash); |
|
| 241 | 241 | |
| 242 | 242 | $first = DB::table($table); |
| 243 | 243 | foreach ($id as $k => $v) { |
@@ -245,15 +245,15 @@ discard block |
||
| 245 | 245 | } |
| 246 | 246 | |
| 247 | 247 | $data = $first->first(); |
| 248 | - miscellanousSingleton()->setData($idHash,$data); |
|
| 248 | + miscellanousSingleton()->setData($idHash, $data); |
|
| 249 | 249 | return $data; |
| 250 | 250 | } else { |
| 251 | 251 | $idHash = md5("find".$table.$id); |
| 252 | - if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash); |
|
| 252 | + if (miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash); |
|
| 253 | 253 | |
| 254 | 254 | $pk = $this->pk($table); |
| 255 | 255 | $data = DB::table($table)->where($pk, $id)->first(); |
| 256 | - miscellanousSingleton()->setData($idHash,$data); |
|
| 256 | + miscellanousSingleton()->setData($idHash, $data); |
|
| 257 | 257 | return $data; |
| 258 | 258 | } |
| 259 | 259 | } |
@@ -268,30 +268,30 @@ discard block |
||
| 268 | 268 | $data = []; |
| 269 | 269 | $idHash = null; |
| 270 | 270 | |
| 271 | - if(is_array($conditionOrCallback)) { |
|
| 271 | + if (is_array($conditionOrCallback)) { |
|
| 272 | 272 | $idHash = md5("findAll".$table.serialize($conditionOrCallback)); |
| 273 | - if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash); |
|
| 273 | + if (miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash); |
|
| 274 | 274 | |
| 275 | 275 | $data = DB::table($table)->where($conditionOrCallback)->get(); |
| 276 | 276 | } elseif (is_callable($conditionOrCallback)) { |
| 277 | 277 | $idHash = "findAll".$table.spl_object_hash($conditionOrCallback); |
| 278 | - if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash); |
|
| 278 | + if (miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash); |
|
| 279 | 279 | |
| 280 | 280 | $data = DB::table($table); |
| 281 | 281 | $data = call_user_func($conditionOrCallback, $data); |
| 282 | 282 | $data = $data->get(); |
| 283 | 283 | } else { |
| 284 | 284 | $idHash = md5("findAll".$table.$conditionOrCallback); |
| 285 | - if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash); |
|
| 285 | + if (miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash); |
|
| 286 | 286 | |
| 287 | 287 | $data = DB::table($table); |
| 288 | - if($conditionOrCallback) { |
|
| 288 | + if ($conditionOrCallback) { |
|
| 289 | 289 | $data = $data->whereRaw($conditionOrCallback); |
| 290 | 290 | } |
| 291 | 291 | $data = $data->get(); |
| 292 | 292 | } |
| 293 | 293 | |
| 294 | - if($idHash && $data) { |
|
| 294 | + if ($idHash && $data) { |
|
| 295 | 295 | miscellanousSingleton()->setData($idHash, $data); |
| 296 | 296 | } |
| 297 | 297 | |
@@ -301,7 +301,7 @@ discard block |
||
| 301 | 301 | public function listAllTable() |
| 302 | 302 | { |
| 303 | 303 | $idHash = md5("listAllTable"); |
| 304 | - if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash); |
|
| 304 | + if (miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash); |
|
| 305 | 305 | $data = DB::connection()->getDoctrineSchemaManager()->listTableNames(); |
| 306 | 306 | miscellanousSingleton()->setData($idHash, $data); |
| 307 | 307 | return $data; |
@@ -310,7 +310,7 @@ discard block |
||
| 310 | 310 | public function listAllColumns($table) |
| 311 | 311 | { |
| 312 | 312 | $idHash = md5("listAllColumns".$table); |
| 313 | - if(miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash); |
|
| 313 | + if (miscellanousSingleton()->hasData($idHash)) return miscellanousSingleton()->getData($idHash); |
|
| 314 | 314 | $data = Schema::getColumnListing($table); |
| 315 | 315 | miscellanousSingleton()->setData($idHash, $data); |
| 316 | 316 | return $data; |
@@ -378,7 +378,7 @@ discard block |
||
| 378 | 378 | $validator = Validator::make($input_arr, $rules, $messages); |
| 379 | 379 | if ($validator->fails()) { |
| 380 | 380 | $message = $validator->errors()->all(); |
| 381 | - throw new CBValidationException(implode("; ",$message)); |
|
| 381 | + throw new CBValidationException(implode("; ", $message)); |
|
| 382 | 382 | } |
| 383 | 383 | } |
| 384 | 384 | |
@@ -390,7 +390,7 @@ discard block |
||
| 390 | 390 | public function findPrimaryKey($table) |
| 391 | 391 | { |
| 392 | 392 | $pk = DB::getDoctrineSchemaManager()->listTableDetails($table)->getPrimaryKey(); |
| 393 | - if(!$pk) { |
|
| 393 | + if (!$pk) { |
|
| 394 | 394 | return null; |
| 395 | 395 | } |
| 396 | 396 | return $pk->getColumns()[0]; |
@@ -439,7 +439,7 @@ discard block |
||
| 439 | 439 | $string_parameters_array = explode('&', $string_parameters); |
| 440 | 440 | foreach ($string_parameters_array as $s) { |
| 441 | 441 | $part = explode('=', $s); |
| 442 | - if(isset($part[0]) && isset($part[1])) { |
|
| 442 | + if (isset($part[0]) && isset($part[1])) { |
|
| 443 | 443 | $name = htmlspecialchars(urldecode($part[0])); |
| 444 | 444 | $name = strip_tags($name); |
| 445 | 445 | $value = htmlspecialchars(urldecode($part[1])); |
@@ -456,16 +456,16 @@ discard block |
||
| 456 | 456 | |
| 457 | 457 | |
| 458 | 458 | public function routeGet($prefix, $controller) { |
| 459 | - $alias = str_replace("@"," ", $controller); |
|
| 459 | + $alias = str_replace("@", " ", $controller); |
|
| 460 | 460 | $alias = ucwords($alias); |
| 461 | - $alias = str_replace(" ","",$alias); |
|
| 461 | + $alias = str_replace(" ", "", $alias); |
|
| 462 | 462 | Route::get($prefix, ['uses' => $controller, 'as' => $alias]); |
| 463 | 463 | } |
| 464 | 464 | |
| 465 | 465 | public function routePost($prefix, $controller) { |
| 466 | - $alias = str_replace("@"," ", $controller); |
|
| 466 | + $alias = str_replace("@", " ", $controller); |
|
| 467 | 467 | $alias = ucwords($alias); |
| 468 | - $alias = str_replace(" ","",$alias); |
|
| 468 | + $alias = str_replace(" ", "", $alias); |
|
| 469 | 469 | Route::post($prefix, ['uses' => $controller, 'as' => $alias]); |
| 470 | 470 | } |
| 471 | 471 | |
@@ -498,7 +498,7 @@ discard block |
||
| 498 | 498 | |
| 499 | 499 | $prefix = trim($prefix, '/').'/'; |
| 500 | 500 | |
| 501 | - if(substr($controller,0,1) != "\\") { |
|
| 501 | + if (substr($controller, 0, 1) != "\\") { |
|
| 502 | 502 | $controller = "\App\Http\Controllers\\".$controller; |
| 503 | 503 | } |
| 504 | 504 | |
@@ -15,10 +15,10 @@ discard block |
||
| 15 | 15 | { |
| 16 | 16 | public static function putInGroup($key, $value, $group, $duration) { |
| 17 | 17 | $key = md5($key); |
| 18 | - $exist = (Cache::get($group))?:[]; |
|
| 19 | - $exist[ $key ] = ['value'=>$value,'duration'=>$duration]; |
|
| 18 | + $exist = (Cache::get($group)) ?: []; |
|
| 19 | + $exist[$key] = ['value'=>$value, 'duration'=>$duration]; |
|
| 20 | 20 | |
| 21 | - if($duration == -1) { |
|
| 21 | + if ($duration == -1) { |
|
| 22 | 22 | Cache::forever($group, $exist); |
| 23 | 23 | } else { |
| 24 | 24 | Cache::put($group, $exist, $duration); |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | public static function getItemInGroup($key, $group) { |
| 29 | 29 | $groupdata = Cache::get($group); |
| 30 | 30 | $key = md5($key); |
| 31 | - if(isset($groupdata[$key])) { |
|
| 31 | + if (isset($groupdata[$key])) { |
|
| 32 | 32 | return $groupdata[$key]['value']; |
| 33 | 33 | } |
| 34 | 34 | return null; |
@@ -38,11 +38,11 @@ discard block |
||
| 38 | 38 | Cache::forget($group); |
| 39 | 39 | } |
| 40 | 40 | |
| 41 | - public static function forgetInGroup($key,$group) { |
|
| 41 | + public static function forgetInGroup($key, $group) { |
|
| 42 | 42 | $key = md5($key); |
| 43 | 43 | $data = Cache::get($group); |
| 44 | 44 | $duration = null; |
| 45 | - if(isset($data[$key])) { |
|
| 45 | + if (isset($data[$key])) { |
|
| 46 | 46 | $item = $data[$key]; |
| 47 | 47 | unset($data[$key]); |
| 48 | 48 | } |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | if(SchemaHelper::hasColumn($this->data['table'], $column->getField())) { |
| 48 | 48 | $query->addSelect($this->data['table'].'.'.$column->getField()); |
| 49 | 49 | } |
| 50 | - }else{ |
|
| 50 | + } else{ |
|
| 51 | 51 | $query->addSelect($column->getField()); |
| 52 | 52 | } |
| 53 | 53 | } |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | $keyword = sanitizeXSS(request("q")); |
| 61 | 61 | if(isset($this->data['hook_search_query'])) { |
| 62 | 62 | $query = call_user_func($this->data['hook_search_query'], $query); |
| 63 | - }else{ |
|
| 63 | + } else{ |
|
| 64 | 64 | $query->where(function ($where) use ($columns, $keyword) { |
| 65 | 65 | /** |
| 66 | 66 | * @var $where Builder |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | { |
| 70 | 70 | if(strpos($column->getField(),".") === false) { |
| 71 | 71 | $field = $this->data['table'].'.'.$column->getField(); |
| 72 | - }else{ |
|
| 72 | + } else{ |
|
| 73 | 73 | $field = $column->getField(); |
| 74 | 74 | } |
| 75 | 75 | $where->orWhere($field, 'like', '%'.$keyword.'%'); |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | $query->orderBy(request('order_by'), request('order_sort')); |
| 112 | 112 | } |
| 113 | 113 | } |
| 114 | - }else{ |
|
| 114 | + } else{ |
|
| 115 | 115 | /* |
| 116 | 116 | * For default, query will be order by primary key as descending |
| 117 | 117 | */ |
@@ -25,13 +25,13 @@ discard block |
||
| 25 | 25 | |
| 26 | 26 | $query->addSelect($this->data['table'].'.'.cb()->pk($this->data['table']).' as primary_key'); |
| 27 | 27 | |
| 28 | - $softDelete = isset($this->data['disable_soft_delete'])?$this->data['disable_soft_delete']:true; |
|
| 29 | - if($softDelete === true && SchemaHelper::hasColumn($this->data['table'],'deleted_at')) { |
|
| 28 | + $softDelete = isset($this->data['disable_soft_delete']) ? $this->data['disable_soft_delete'] : true; |
|
| 29 | + if ($softDelete === true && SchemaHelper::hasColumn($this->data['table'], 'deleted_at')) { |
|
| 30 | 30 | $query->whereNull($this->data['table'].'.deleted_at'); |
| 31 | 31 | } |
| 32 | 32 | |
| 33 | - if(isset($joins)) { |
|
| 34 | - foreach($joins as $join) |
|
| 33 | + if (isset($joins)) { |
|
| 34 | + foreach ($joins as $join) |
|
| 35 | 35 | { |
| 36 | 36 | $query->join($join['target_table'], |
| 37 | 37 | $join['target_table_primary'], |
@@ -41,14 +41,14 @@ discard block |
||
| 41 | 41 | } |
| 42 | 42 | } |
| 43 | 43 | |
| 44 | - foreach($columns as $column) { |
|
| 44 | + foreach ($columns as $column) { |
|
| 45 | 45 | /** @var ColumnModel $column */ |
| 46 | - if($column->getType() != "custom") { |
|
| 47 | - if(strpos($column->getField(),".") === false) { |
|
| 48 | - if(SchemaHelper::hasColumn($this->data['table'], $column->getField())) { |
|
| 46 | + if ($column->getType() != "custom") { |
|
| 47 | + if (strpos($column->getField(), ".") === false) { |
|
| 48 | + if (SchemaHelper::hasColumn($this->data['table'], $column->getField())) { |
|
| 49 | 49 | $query->addSelect($this->data['table'].'.'.$column->getField()); |
| 50 | 50 | } |
| 51 | - }else{ |
|
| 51 | + } else { |
|
| 52 | 52 | $query->addSelect($column->getField()); |
| 53 | 53 | } |
| 54 | 54 | } |
@@ -57,27 +57,27 @@ discard block |
||
| 57 | 57 | $query = getTypeHook($column->getType())->query($query, $column); |
| 58 | 58 | |
| 59 | 59 | // Filter Query From Type |
| 60 | - $filterValue = request("filter_".slug($column->getFilterColumn(),"_")); |
|
| 61 | - if(is_array($filterValue) || sanitizeXSS($filterValue)) { |
|
| 60 | + $filterValue = request("filter_".slug($column->getFilterColumn(), "_")); |
|
| 61 | + if (is_array($filterValue) || sanitizeXSS($filterValue)) { |
|
| 62 | 62 | $query = getTypeHook($column->getType())->filterQuery($query, $column, $filterValue); |
| 63 | 63 | } |
| 64 | 64 | } |
| 65 | 65 | |
| 66 | - if(request()->has('q')) |
|
| 66 | + if (request()->has('q')) |
|
| 67 | 67 | { |
| 68 | 68 | $keyword = sanitizeXSS(request("q")); |
| 69 | - if(isset($this->data['hook_search_query'])) { |
|
| 69 | + if (isset($this->data['hook_search_query'])) { |
|
| 70 | 70 | $query = call_user_func($this->data['hook_search_query'], $query); |
| 71 | - }else{ |
|
| 72 | - $query->where(function ($where) use ($columns, $keyword) { |
|
| 71 | + } else { |
|
| 72 | + $query->where(function($where) use ($columns, $keyword) { |
|
| 73 | 73 | /** |
| 74 | 74 | * @var $where Builder |
| 75 | 75 | */ |
| 76 | - foreach($columns as $column) |
|
| 76 | + foreach ($columns as $column) |
|
| 77 | 77 | { |
| 78 | - if(strpos($column->getField(),".") === false) { |
|
| 78 | + if (strpos($column->getField(), ".") === false) { |
|
| 79 | 79 | $field = $this->data['table'].'.'.$column->getField(); |
| 80 | - }else{ |
|
| 80 | + } else { |
|
| 81 | 81 | $field = $column->getField(); |
| 82 | 82 | } |
| 83 | 83 | $where->orWhere($field, 'like', '%'.$keyword.'%'); |
@@ -90,36 +90,36 @@ discard block |
||
| 90 | 90 | /* |
| 91 | 91 | * This script to hanlde the callback inputed on this query method |
| 92 | 92 | */ |
| 93 | - if(isset($callback) && is_callable($callback)) { |
|
| 93 | + if (isset($callback) && is_callable($callback)) { |
|
| 94 | 94 | $query = call_user_func($callback, $query); |
| 95 | 95 | } |
| 96 | 96 | |
| 97 | - if(isset($this->data['hook_index_query']) && is_callable($this->data['hook_index_query'])) { |
|
| 97 | + if (isset($this->data['hook_index_query']) && is_callable($this->data['hook_index_query'])) { |
|
| 98 | 98 | $query = call_user_func($this->data['hook_index_query'], $query); |
| 99 | 99 | } |
| 100 | 100 | |
| 101 | 101 | |
| 102 | - if(request()->has(['order_by','order_sort'])) |
|
| 102 | + if (request()->has(['order_by', 'order_sort'])) |
|
| 103 | 103 | { |
| 104 | - $sort = (request("order_sort")=="asc")?"asc":"desc"; |
|
| 104 | + $sort = (request("order_sort") == "asc") ? "asc" : "desc"; |
|
| 105 | 105 | /* |
| 106 | 106 | * Check if order by contain "." it means {table}.{column} we have to parsing that |
| 107 | 107 | */ |
| 108 | - if(strpos(request("order_by"), ".")!==false) { |
|
| 109 | - $orderByTable = explode(".",request("order_by"))[0]; |
|
| 110 | - $orderByColumn = explode(".",request("order_by"))[1]; |
|
| 111 | - if(SchemaHelper::hasColumn($orderByTable, $orderByColumn)) { |
|
| 108 | + if (strpos(request("order_by"), ".") !== false) { |
|
| 109 | + $orderByTable = explode(".", request("order_by"))[0]; |
|
| 110 | + $orderByColumn = explode(".", request("order_by"))[1]; |
|
| 111 | + if (SchemaHelper::hasColumn($orderByTable, $orderByColumn)) { |
|
| 112 | 112 | $query->orderBy($orderByTable.".".$orderByColumn, $sort); |
| 113 | 113 | } |
| 114 | 114 | } else { |
| 115 | 115 | /* |
| 116 | 116 | * Check if order_by column in registered columns |
| 117 | 117 | */ |
| 118 | - if(in_array(request('order_by'),columnSingleton()->getColumnNameOnly())) { |
|
| 118 | + if (in_array(request('order_by'), columnSingleton()->getColumnNameOnly())) { |
|
| 119 | 119 | $query->orderBy(request('order_by'), request('order_sort')); |
| 120 | 120 | } |
| 121 | 121 | } |
| 122 | - }else{ |
|
| 122 | + } else { |
|
| 123 | 123 | /* |
| 124 | 124 | * For default, query will be order by primary key as descending |
| 125 | 125 | */ |
@@ -24,12 +24,12 @@ discard block |
||
| 24 | 24 | |
| 25 | 25 | public function getIndex() { |
| 26 | 26 | $data = []; |
| 27 | - return view($this->view.".index",$data); |
|
| 27 | + return view($this->view.".index", $data); |
|
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | public function postSave() |
| 31 | 31 | { |
| 32 | - if(!isConfigCached()) { |
|
| 32 | + if (!isConfigCached()) { |
|
| 33 | 33 | setEnvironmentValue([ |
| 34 | 34 | "APP_DEBUG"=>request("APP_DEBUG") |
| 35 | 35 | ]); |
@@ -41,15 +41,15 @@ discard block |
||
| 41 | 41 | putSetting("AUTO_REDIRECT_TO_LOGIN", request("AUTO_REDIRECT_TO_LOGIN")); |
| 42 | 42 | putSetting("LOGIN_NOTIFICATION", request("LOGIN_NOTIFICATION")); |
| 43 | 43 | |
| 44 | - if(request("htaccess_ServerSignature")) { |
|
| 44 | + if (request("htaccess_ServerSignature")) { |
|
| 45 | 45 | putHtaccess("ServerSignature Off"); |
| 46 | 46 | } |
| 47 | 47 | |
| 48 | - if(request("htaccess_IndexIgnore")) { |
|
| 48 | + if (request("htaccess_IndexIgnore")) { |
|
| 49 | 49 | putHtaccess("IndexIgnore *"); |
| 50 | 50 | } |
| 51 | 51 | |
| 52 | - if(request("htaccess_dotAccess")) { |
|
| 52 | + if (request("htaccess_dotAccess")) { |
|
| 53 | 53 | putHtaccess(" |
| 54 | 54 | <FilesMatch \"^\.\"> |
| 55 | 55 | Order allow,deny |
@@ -57,11 +57,11 @@ discard block |
||
| 57 | 57 | </FilesMatch>"); |
| 58 | 58 | } |
| 59 | 59 | |
| 60 | - if(request("htaccess_preventVendor")) { |
|
| 60 | + if (request("htaccess_preventVendor")) { |
|
| 61 | 61 | putHtaccess("RewriteRule ^(.*)/vendor/.*\.(php|rb|py)$ - [F,L,NC]"); |
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | |
| 65 | - return cb()->redirectBack("Security has been updated!","success"); |
|
| 65 | + return cb()->redirectBack("Security has been updated!", "success"); |
|
| 66 | 66 | } |
| 67 | 67 | } |
| 68 | 68 | \ No newline at end of file |
@@ -26,13 +26,13 @@ discard block |
||
| 26 | 26 | // Register views |
| 27 | 27 | $this->loadViewsFrom(__DIR__.'/views', 'crudbooster'); |
| 28 | 28 | $this->loadViewsFrom(__DIR__.'/types', 'types'); |
| 29 | - $this->loadTranslationsFrom(__DIR__."/localization","cb"); |
|
| 29 | + $this->loadTranslationsFrom(__DIR__."/localization", "cb"); |
|
| 30 | 30 | |
| 31 | 31 | // Publish the files |
| 32 | - $this->publishes([__DIR__.'/configs/crudbooster.php' => config_path('crudbooster.php')],'cb_config'); |
|
| 33 | - $this->publishes([__DIR__.'/database' => base_path('database')],'cb_migration'); |
|
| 34 | - $this->publishes([__DIR__.'/templates/CBHook.stub'=> app_path('Http/CBHook.php')],'cb_hook'); |
|
| 35 | - $this->publishes([__DIR__ . '/assets' =>public_path('cb_asset')],'cb_asset'); |
|
| 32 | + $this->publishes([__DIR__.'/configs/crudbooster.php' => config_path('crudbooster.php')], 'cb_config'); |
|
| 33 | + $this->publishes([__DIR__.'/database' => base_path('database')], 'cb_migration'); |
|
| 34 | + $this->publishes([__DIR__.'/templates/CBHook.stub'=> app_path('Http/CBHook.php')], 'cb_hook'); |
|
| 35 | + $this->publishes([__DIR__.'/assets' =>public_path('cb_asset')], 'cb_asset'); |
|
| 36 | 36 | |
| 37 | 37 | // Override Local FileSystem |
| 38 | 38 | Config::set("filesystems.disks.local.root", cbConfig("LOCAL_FILESYSTEM_PATH", public_path("storage"))); |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | require __DIR__.'/helpers/Helper.php'; |
| 55 | 55 | |
| 56 | 56 | // Singletons |
| 57 | - $this->app->singleton('crudbooster', function () |
|
| 57 | + $this->app->singleton('crudbooster', function() |
|
| 58 | 58 | { |
| 59 | 59 | return true; |
| 60 | 60 | }); |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | // Merging configuration |
| 80 | - $this->mergeConfigFrom(__DIR__.'/configs/crudbooster.php','crudbooster'); |
|
| 80 | + $this->mergeConfigFrom(__DIR__.'/configs/crudbooster.php', 'crudbooster'); |
|
| 81 | 81 | |
| 82 | 82 | // Register additional library |
| 83 | 83 | $this->app->register('Intervention\Image\ImageServiceProvider'); |
@@ -88,13 +88,13 @@ discard block |
||
| 88 | 88 | |
| 89 | 89 | private function registerPlugin() |
| 90 | 90 | { |
| 91 | - if(file_exists(app_path("CBPlugins"))) { |
|
| 91 | + if (file_exists(app_path("CBPlugins"))) { |
|
| 92 | 92 | $views = scandir(app_path("CBPlugins")); |
| 93 | - foreach($views as $view) { |
|
| 94 | - if($view != "." && $view != "..") { |
|
| 93 | + foreach ($views as $view) { |
|
| 94 | + if ($view != "." && $view != "..") { |
|
| 95 | 95 | $basename = basename($view); |
| 96 | 96 | // register view |
| 97 | - $this->loadViewsFrom(app_path("CBPlugins".DIRECTORY_SEPARATOR.$basename.DIRECTORY_SEPARATOR."Views"),$basename); |
|
| 97 | + $this->loadViewsFrom(app_path("CBPlugins".DIRECTORY_SEPARATOR.$basename.DIRECTORY_SEPARATOR."Views"), $basename); |
|
| 98 | 98 | // register route |
| 99 | 99 | require app_path("CBPlugins".DIRECTORY_SEPARATOR.$basename.DIRECTORY_SEPARATOR."Routes".DIRECTORY_SEPARATOR."Route.php"); |
| 100 | 100 | } |
@@ -106,7 +106,7 @@ discard block |
||
| 106 | 106 | |
| 107 | 107 | private function registerTypeRoutes() { |
| 108 | 108 | $routes = rglob(__DIR__.DIRECTORY_SEPARATOR."types".DIRECTORY_SEPARATOR."Route.php"); |
| 109 | - foreach($routes as $route) { |
|
| 109 | + foreach ($routes as $route) { |
|
| 110 | 110 | require $route; |
| 111 | 111 | } |
| 112 | 112 | } |
@@ -20,9 +20,9 @@ discard block |
||
| 20 | 20 | /* |
| 21 | 21 | * For security reason we have limit the upload file formats bellow |
| 22 | 22 | */ |
| 23 | - 'UPLOAD_FILE_EXTENSION_ALLOWED' => ['jpg','jpeg','png','gif','pdf','xls','xlsx','doc','docx','txt','zip','rar','rtf'], |
|
| 23 | + 'UPLOAD_FILE_EXTENSION_ALLOWED' => ['jpg', 'jpeg', 'png', 'gif', 'pdf', 'xls', 'xlsx', 'doc', 'docx', 'txt', 'zip', 'rar', 'rtf'], |
|
| 24 | 24 | |
| 25 | - 'UPLOAD_IMAGE_EXTENSION_ALLOWED' => ['jpg','jpeg','png','gif'], |
|
| 25 | + 'UPLOAD_IMAGE_EXTENSION_ALLOWED' => ['jpg', 'jpeg', 'png', 'gif'], |
|
| 26 | 26 | |
| 27 | 27 | /* |
| 28 | 28 | * Override Local FileSystem From Storage To Another |
@@ -58,5 +58,5 @@ discard block |
||
| 58 | 58 | * You can define in this array what the tables you want to include in "php artisan crudbooster:data_migration" |
| 59 | 59 | * The default is all cb_ prefix will be include in data migration |
| 60 | 60 | */ |
| 61 | - 'ADDITIONAL_DATA_MIGRATION'=>['users','migrations'] |
|
| 61 | + 'ADDITIONAL_DATA_MIGRATION'=>['users', 'migrations'] |
|
| 62 | 62 | ]; |
| 63 | 63 | \ No newline at end of file |