Commit 8bccb61c authored by Jérôme Chauveau's avatar Jérôme Chauveau
Browse files

image file extension check bugfix

parent 83884c9d
Loading
Loading
Loading
Loading
+1
Changes for README.md: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -33,4 +33,5 @@ Dans le second cas :
 - 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 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]
 
+5 −8
Changes for XML2HTMLPlugin.php: 5 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -161,7 +161,6 @@ class XML2HTMLPlugin extends GenericPlugin
        //$submission = $request->getContext(ASSOC_TYPE_SUBMISSION);
        /**@var $submissionFile SubmissionFile**/
        $submissionFile = $params[0];
        //var_dump($request);
        $path = $submissionFile->getData('path');
        $fileManager = new FileManager();
        $submissionFileExtension = $fileManager->parseFileExtension($path);
@@ -174,9 +173,7 @@ class XML2HTMLPlugin extends GenericPlugin
                $zipPathParts = pathinfo($zipPath);
                $archiveFolderName = NULL;
                if($zip->numFiles > 0) {//gets zip top folder name
                    $fileName = $zip->getNameIndex(0);
                    $fileInfo = pathinfo($fileName);
                    $archiveFolderName = $fileInfo["dirname"];
                    $archiveFolderName = $zip->getNameIndex(0);
                }
                else {
                    throw new \Exception("Bad zip Submission file.");
@@ -197,8 +194,7 @@ class XML2HTMLPlugin extends GenericPlugin
                            $basePath . $zipPathParts['filename'] . '.xml'
                            );
                    }
                    //var_dump($file);
                    //var_dump($extension);

                    //$submissionDir = Services::get('submissionFile')->getSubmissionDir($request->getContext()->getId(), $submission->getId());
                }

@@ -290,8 +286,9 @@ class XML2HTMLPlugin extends GenericPlugin
        $extractedZipPath = $pathInfo['dirname'];
        $files = scandir($extractedZipPath);
        foreach ($files as $file){
            $mt = mime_content_type($file);
            if($mt == 'image/jpeg' || $mt == 'image/png'){
            $info = pathinfo($file);

            if($info["extension"] == 'jpg' || $info["extension"] == 'png'){
                $request = $this->getRequest();
                $filePath = $request->url(
                    null, 'article',