Skip to content
Snippets Groups Projects
Commit 8bccb61c authored by Jerome Chauveau's avatar Jerome Chauveau
Browse files

image file extension check bugfix

parent 83884c9d
No related branches found
No related tags found
No related merge requests found
...@@ -33,4 +33,5 @@ Dans le second cas : ...@@ -33,4 +33,5 @@ Dans le second cas :
- l'archive est dézippée dans le dossier du zip - l'archive est dézippée dans le dossier du zip
- le dossier décompressé est renommé avec l'id unique généré par ojs - le dossier décompressé est renommé avec l'id unique généré par ojs
- le fichier xml est rennomé avec ce même identifiant : `[id]/[id].xml` - le fichier xml est rennomé avec ce même identifiant : `[id]/[id].xml`
- les urls des images sont de la forme [idarticle]/zimage/[nom_image].[extension]
...@@ -161,7 +161,6 @@ class XML2HTMLPlugin extends GenericPlugin ...@@ -161,7 +161,6 @@ class XML2HTMLPlugin extends GenericPlugin
//$submission = $request->getContext(ASSOC_TYPE_SUBMISSION); //$submission = $request->getContext(ASSOC_TYPE_SUBMISSION);
/**@var $submissionFile SubmissionFile**/ /**@var $submissionFile SubmissionFile**/
$submissionFile = $params[0]; $submissionFile = $params[0];
//var_dump($request);
$path = $submissionFile->getData('path'); $path = $submissionFile->getData('path');
$fileManager = new FileManager(); $fileManager = new FileManager();
$submissionFileExtension = $fileManager->parseFileExtension($path); $submissionFileExtension = $fileManager->parseFileExtension($path);
...@@ -174,9 +173,7 @@ class XML2HTMLPlugin extends GenericPlugin ...@@ -174,9 +173,7 @@ class XML2HTMLPlugin extends GenericPlugin
$zipPathParts = pathinfo($zipPath); $zipPathParts = pathinfo($zipPath);
$archiveFolderName = NULL; $archiveFolderName = NULL;
if($zip->numFiles > 0) {//gets zip top folder name if($zip->numFiles > 0) {//gets zip top folder name
$fileName = $zip->getNameIndex(0); $archiveFolderName = $zip->getNameIndex(0);
$fileInfo = pathinfo($fileName);
$archiveFolderName = $fileInfo["dirname"];
} }
else { else {
throw new \Exception("Bad zip Submission file."); throw new \Exception("Bad zip Submission file.");
...@@ -197,8 +194,7 @@ class XML2HTMLPlugin extends GenericPlugin ...@@ -197,8 +194,7 @@ class XML2HTMLPlugin extends GenericPlugin
$basePath . $zipPathParts['filename'] . '.xml' $basePath . $zipPathParts['filename'] . '.xml'
); );
} }
//var_dump($file);
//var_dump($extension);
//$submissionDir = Services::get('submissionFile')->getSubmissionDir($request->getContext()->getId(), $submission->getId()); //$submissionDir = Services::get('submissionFile')->getSubmissionDir($request->getContext()->getId(), $submission->getId());
} }
...@@ -290,8 +286,9 @@ class XML2HTMLPlugin extends GenericPlugin ...@@ -290,8 +286,9 @@ class XML2HTMLPlugin extends GenericPlugin
$extractedZipPath = $pathInfo['dirname']; $extractedZipPath = $pathInfo['dirname'];
$files = scandir($extractedZipPath); $files = scandir($extractedZipPath);
foreach ($files as $file){ foreach ($files as $file){
$mt = mime_content_type($file); $info = pathinfo($file);
if($mt == 'image/jpeg' || $mt == 'image/png'){
if($info["extension"] == 'jpg' || $info["extension"] == 'png'){
$request = $this->getRequest(); $request = $this->getRequest();
$filePath = $request->url( $filePath = $request->url(
null, 'article', null, 'article',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment