Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Clean EXIF data
  • Loading branch information
remdex committed Mar 31, 2022
1 parent 6538d6d commit 56d8e51
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 3 deletions.
10 changes: 7 additions & 3 deletions lhc_web/lib/core/lhcore/lhimageconverter.php
Expand Up @@ -432,16 +432,20 @@ public static function upload( $file, $upload_name = 'SlideFile', $save_path = '
$saveDir = $save_path;

if (!@move_uploaded_file($file[$upload_name]["tmp_name"], $saveDir.$fileNameNew)) {
$errors[] = "File could not be saved.";
return $return = array( 'errors' => $errors );
}
$errors[] = "File could not be saved.";
return $return = array( 'errors' => $errors );
}

// Clean SVG
if ($fileSuffix == '.svg') {
$sanitizer = new \enshrined\svgSanitize\Sanitizer();
$dirtySVG = file_get_contents($saveDir . $fileNameNew);
$cleanSVG = $sanitizer->sanitize($dirtySVG);
file_put_contents($saveDir . $fileNameNew, $cleanSVG);
} else {
erLhcoreClassFileUploadAdmin::removeExif($saveDir . $fileNameNew, $saveDir . $fileNameNew . '_exif');
unlink($saveDir . $fileNameNew);
rename($saveDir . $fileNameNew . '_exif', $saveDir . $fileNameNew);
}

$data = array( 'filename' => $fileNameNew,
Expand Down
10 changes: 10 additions & 0 deletions lhc_web/lib/core/lhcore/lhsearchhandler.php
Expand Up @@ -609,6 +609,11 @@ public static function moveUploadedFile($fileName, $destination_dir, $extensionS
$dirtySVG = file_get_contents($destination_dir . $fileNamePhysic);
$cleanSVG = $sanitizer->sanitize($dirtySVG);
file_put_contents($destination_dir . $fileNamePhysic, $cleanSVG);
} elseif (in_array($extension,['jpg','jpeg','png','gif'])){
erLhcoreClassFileUploadAdmin::removeExif($destination_dir . $fileNamePhysic, $destination_dir . $fileNamePhysic . '_exif');
unlink($destination_dir . $fileNamePhysic);
rename($destination_dir . $fileNamePhysic . '_exif', $destination_dir . $fileNamePhysic);
chmod($destination_dir . $fileNamePhysic, 0644);
}

return $fileNamePhysic;
Expand All @@ -631,6 +636,11 @@ public static function moveLocalFile($fileName, $destination_dir, $extensionSepa
$dirtySVG = file_get_contents($destination_dir . $fileNamePhysic);
$cleanSVG = $sanitizer->sanitize($dirtySVG);
file_put_contents($destination_dir . $fileNamePhysic, $cleanSVG);
} elseif (in_array($extension,['jpg','jpeg','png','gif'])) {
erLhcoreClassFileUploadAdmin::removeExif($destination_dir . $fileNamePhysic, $destination_dir . $fileNamePhysic . '_exif');
unlink($destination_dir . $fileNamePhysic);
rename($destination_dir . $fileNamePhysic . '_exif', $destination_dir . $fileNamePhysic);
chmod($destination_dir . $fileNamePhysic, 0644);
}

return $fileNamePhysic;
Expand Down

0 comments on commit 56d8e51

Please sign in to comment.