@@ -463,7 +463,7 @@ private function getFileArr($fileOrFiles,$replaceIfExist, $idx = null): array {
463
463
$ errIdx = 'error ' ;
464
464
$ tempIdx = 'tmp_name ' ;
465
465
$ fileInfoArr = [];
466
- $ fileInfoArr [UploaderConst::NAME_INDEX ] = $ idx === null ? filter_var ($ fileOrFiles [UploaderConst::NAME_INDEX ], FILTER_SANITIZE_FULL_SPECIAL_CHARS ) : filter_var ($ fileOrFiles [UploaderConst::NAME_INDEX ][$ idx ], FILTER_SANITIZE_FULL_SPECIAL_CHARS );
466
+ $ fileInfoArr [UploaderConst::NAME_INDEX ] = $ idx === null ? filter_var ($ fileOrFiles [UploaderConst::NAME_INDEX ]) : filter_var ($ fileOrFiles [UploaderConst::NAME_INDEX ][$ idx ]);
467
467
$ fileInfoArr [UploaderConst::SIZE_INDEX ] = $ idx === null ? filter_var ($ fileOrFiles [UploaderConst::SIZE_INDEX ], FILTER_SANITIZE_NUMBER_INT ) : filter_var ($ fileOrFiles [UploaderConst::SIZE_INDEX ][$ idx ], FILTER_SANITIZE_NUMBER_INT );
468
468
$ fileInfoArr [UploaderConst::PATH_INDEX ] = $ this ->getUploadDir ();
469
469
$ fileInfoArr [UploaderConst::ERR_INDEX ] = '' ;
@@ -478,15 +478,17 @@ private function getFileArr($fileOrFiles,$replaceIfExist, $idx = null): array {
478
478
if (File::isDirectory ($ this ->getUploadDir ())) {
479
479
$ filePath = $ this ->getUploadDir ().'\\' .$ fileInfoArr [UploaderConst::NAME_INDEX ];
480
480
$ filePath = str_replace ('\\' , '/ ' , $ filePath );
481
-
481
+
482
+ //If in CLI, use copy (testing env)
483
+ $ moveFunc = http_response_code () === false ? 'copy ' : 'move_uploaded_file ' ;
484
+
482
485
if (!File::isFileExist ($ filePath )) {
483
486
$ fileInfoArr [UploaderConst::EXIST_INDEX ] = false ;
484
487
$ fileInfoArr [UploaderConst::REPLACE_INDEX ] = false ;
485
488
$ name = $ idx === null ? $ fileOrFiles [$ tempIdx ] : $ fileOrFiles [$ tempIdx ][$ idx ];
486
- $ sanitizedName = filter_var ($ name , FILTER_SANITIZE_FULL_SPECIAL_CHARS );
489
+ $ sanitizedName = filter_var ($ name );
490
+
487
491
488
- //If in CLI, use copy (testing env)
489
- $ moveFunc = http_response_code () === false ? 'copy ' : 'move_uploaded_file ' ;
490
492
491
493
if (!($ moveFunc ($ sanitizedName , $ filePath ))) {
492
494
$ fileInfoArr [UploaderConst::ERR_INDEX ] = UploaderConst::ERR_MOVE_TEMP ;
@@ -500,9 +502,9 @@ private function getFileArr($fileOrFiles,$replaceIfExist, $idx = null): array {
500
502
$ fileInfoArr [UploaderConst::REPLACE_INDEX ] = true ;
501
503
unlink ($ filePath );
502
504
$ name = $ idx === null ? $ fileOrFiles [$ tempIdx ] : $ fileOrFiles [$ tempIdx ][$ idx ];
503
- $ sanitizedName = $ sanitizedName = filter_var ($ name, FILTER_SANITIZE_FULL_SPECIAL_CHARS );
505
+ $ sanitizedName = $ sanitizedName = filter_var ($ name );
504
506
505
- if (move_uploaded_file ($ sanitizedName , $ filePath )) {
507
+ if ($ moveFunc ($ sanitizedName , $ filePath )) {
506
508
$ fileInfoArr [UploaderConst::UPLOADED_INDEX ] = true ;
507
509
} else {
508
510
$ fileInfoArr [UploaderConst::UPLOADED_INDEX ] = false ;
0 commit comments