diff --git a/apps/maarch_entreprise/class/class_indexing_searching_app_Abstract.php b/apps/maarch_entreprise/class/class_indexing_searching_app_Abstract.php index cca5a43d9b0526f6f9e666145f2a8c9668ec2b37..92b35e62e3ba6d8bd77176cf0d3a3a4e0d672939 100755 --- a/apps/maarch_entreprise/class/class_indexing_searching_app_Abstract.php +++ b/apps/maarch_entreprise/class/class_indexing_searching_app_Abstract.php @@ -59,7 +59,7 @@ abstract class indexing_searching_app_Abstract extends Database $xmlconfig = simplexml_load_file($path); foreach ($xmlconfig->FORMAT as $FORMAT) { if (strtoupper($ext) == (string) $FORMAT->name) { - if ($FORMAT->index_frame_show == 'true') { + if ($FORMAT->canConvert == 'true') { return true; } else { return false; @@ -80,7 +80,7 @@ abstract class indexing_searching_app_Abstract extends Database $xmlconfig = simplexml_load_file($path); $ext_list = array(); foreach ($xmlconfig->FORMAT as $FORMAT) { - if ((string) $FORMAT->index_frame_show == 'true') { + if ((string) $FORMAT->canConvert == 'true') { array_push($ext_list, (string) $FORMAT->name); } } diff --git a/apps/maarch_entreprise/xml/extensions.xml b/apps/maarch_entreprise/xml/extensions.xml index 89a3a101d81976798836ce2f5ed9742de0835a26..4e725f68f0c8cf1a618e666d0aa64b376a889506 100755 --- a/apps/maarch_entreprise/xml/extensions.xml +++ b/apps/maarch_entreprise/xml/extensions.xml @@ -3,326 +3,326 @@ <FORMAT> <name>PDF</name> <mime>application/pdf</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>TIFF</name> <mime>image/tiff</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>TIF</name> <mime>image/tiff</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>DOC</name> <mime>application/msword</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>XLS</name> <mime>application/msexcel</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>XLS</name> <mime>application/vnd.ms-excel</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>XLS</name> <mime>application/vnd.ms-office</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>XLSM</name> <mime>application/vnd.openxmlformats-officedocument.spreadsheetml.sheet</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>PPT</name> <mime>application/vnd.ms-powerpoint</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>PPS</name> <mime>application/vnd.ms-powerpoint</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>PPS</name> <mime>application/vnd.ms-office</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>PPSM</name> <mime>application/vnd.openxmlformats-officedocument.presentationml.presentation</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>PPTM</name> <mime>application/vnd.openxmlformats-officedocument.presentationml.presentation</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>DOCX</name> <mime>application/octet-stream</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>DOCX</name> <mime>application/vnd.openxmlformats-officedocument.wordprocessingml.document</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>DOCX</name> <mime>application/msword</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>DOCX</name> <mime>application/zip</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>XLSX</name> <mime>application/vnd.openxmlformats-officedocument.spreadsheetml.sheet</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>XLSX</name> <mime>application/vnd.ms-excel</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>XLSX</name> <mime>application/zip</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>PPTX</name> <mime>application/vnd.openxmlformats-officedocument.presentationml.presentation</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>PPTX</name> <mime>application/zip</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>PPTX</name> <mime>application/vnd.ms-powerpoint</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>PPSX</name> <mime>application/vnd.openxmlformats-officedocument.presentationml.slideshow</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>PPSX</name> <mime>application/vnd.openxmlformats-officedocument.presentationml.presentation</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>ODT</name> <mime>application/vnd.oasis.opendocument.text</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>ODT</name> <mime>application/octet-stream</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>ODS</name> <mime>application/vnd.oasis.opendocument.spreadsheet</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>ODS</name> <mime>application/octet-stream</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>ODP</name> <mime>application/vnd.oasis.opendocument.presentation</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>ODP</name> <mime>application/octet-stream</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>XML</name> <mime>application/xml</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>TXT</name> <mime>text/plain</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>TXT</name> <mime>application/xml</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>TXT</name> <mime>application/octet-stream</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>TXT</name> <mime>text/html</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>TXT</name> <mime>text/html</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>TXT</name> <mime>text/x-fortran</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>TXT</name> <mime>text/x-pascal</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>EML</name> <mime>message/rfc822</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>MSG</name> <mime>application/CDFV2-corrupt</mime> - <index_frame_show>false</index_frame_show> + <canConvert>false</canConvert> </FORMAT> <FORMAT> <name>MHT</name> <mime>text/plain</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>MAARCH</name> <mime>text/plain</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>JPG</name> <mime>image/jpeg</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>JPEG</name> <mime>image/jpeg</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>JPE</name> <mime>image/jpeg</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>GIF</name> <mime>image/gif</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>PNG</name> <mime>image/png</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>RTF</name> <mime>text/rtf</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>HTM</name> <mime>text/rtf</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>HTM</name> <mime>text/html</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>HTML</name> <mime>text/html</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>HTML</name> <mime>text/plain</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>HTML</name> <mime>text/rtf</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>HTML</name> <mime>application/octet-stream</mime> - <index_frame_show>true</index_frame_show> + <canConvert>true</canConvert> </FORMAT> <FORMAT> <name>CSS</name> <mime>text/css</mime> - <index_frame_show>false</index_frame_show> + <canConvert>false</canConvert> </FORMAT> <FORMAT> <name>CSV</name> <mime>text/comma-separated-values</mime> - <index_frame_show>false</index_frame_show> + <canConvert>false</canConvert> </FORMAT> <FORMAT> <name>DWG</name> <mime>application/acad</mime> - <index_frame_show>false</index_frame_show> + <canConvert>false</canConvert> </FORMAT> <FORMAT> <name>ZIP</name> <mime>application/zip</mime> - <index_frame_show>false</index_frame_show> + <canConvert>false</canConvert> </FORMAT> <FORMAT> <name>RAR</name> <mime>application/rar</mime> - <index_frame_show>false</index_frame_show> + <canConvert>false</canConvert> </FORMAT> <FORMAT> <name>TGZ</name> <mime>application/x-gzip</mime> - <index_frame_show>false</index_frame_show> + <canConvert>false</canConvert> </FORMAT> <FORMAT> <name>TAR</name> <mime>application/x-tar</mime> - <index_frame_show>false</index_frame_show> + <canConvert>false</canConvert> </FORMAT> <FORMAT> <name>MOV</name> <mime>video/quicktime</mime> - <index_frame_show>false</index_frame_show> + <canConvert>false</canConvert> </FORMAT> <FORMAT> <name>AVI</name> <mime>video/msvideo</mime> - <index_frame_show>false</index_frame_show> + <canConvert>false</canConvert> </FORMAT> <FORMAT> <name>AVI</name> <mime>video/x-msvideo</mime> - <index_frame_show>false</index_frame_show> + <canConvert>false</canConvert> </FORMAT> </ROOT> diff --git a/src/app/convert/controllers/ConvertPdfController.php b/src/app/convert/controllers/ConvertPdfController.php index 67909e8c32aae1682b8461d7e0279a25110a9a2a..070ada7f624a73e823286dba5748796ee3291edb 100755 --- a/src/app/convert/controllers/ConvertPdfController.php +++ b/src/app/convert/controllers/ConvertPdfController.php @@ -200,7 +200,7 @@ class ConvertPdfController $loadedXml = CoreConfigModel::getXmlLoaded(['path' => 'apps/maarch_entreprise/xml/extensions.xml']); if ($loadedXml) { foreach ($loadedXml->FORMAT as $value) { - if (strtoupper((string)$value->name) == strtoupper($args['extension']) && (string)$value->index_frame_show == 'true') { + if (strtoupper((string)$value->name) == strtoupper($args['extension']) && (string)$value->canConvert == 'true') { $canConvert = true; } } diff --git a/src/app/resource/controllers/IndexingController.php b/src/app/resource/controllers/IndexingController.php index 2df989ad491f4015bc80bc116cc9badf09a9c3ca..68b697e1fba1996561c32fb11f38de086fef567f 100755 --- a/src/app/resource/controllers/IndexingController.php +++ b/src/app/resource/controllers/IndexingController.php @@ -150,7 +150,7 @@ class IndexingController public function getFileInformations(Request $request, Response $response) { - $allowedFiles = StoreController::getAllowedFiles(); + $allowedFiles = StoreController::getAllowedFiles(); $uploadMaxFilesize = ini_get('upload_max_filesize'); $uploadMaxFilesize = StoreController::getOctetSizeFromPhpIni(['size' => $uploadMaxFilesize]); @@ -161,7 +161,6 @@ class IndexingController $maximumSize = min($uploadMaxFilesize, $postMaxSize, $memoryLimit); - return $response->withJson(['informations' => ['maximumSize' => $maximumSize, 'allowedFiles' => $allowedFiles]]); } diff --git a/src/app/resource/controllers/StoreController.php b/src/app/resource/controllers/StoreController.php index c2e8ed4b6cbc7233248797f9cfbf1d2e4737be6d..db1abe84a6a638b7535375faf24bc545bf03c65b 100755 --- a/src/app/resource/controllers/StoreController.php +++ b/src/app/resource/controllers/StoreController.php @@ -308,8 +308,9 @@ class StoreController if ($loadedXml) { foreach ($loadedXml->FORMAT as $value) { $allowedFiles[] = [ - 'extension' => (string)$value->name, - 'mimeType' => (string)$value->mime, + 'extension' => (string)$value->name, + 'mimeType' => (string)$value->mime, + 'canConvert' => filter_var((string)$value->canConvert, FILTER_VALIDATE_BOOLEAN) ]; } }