diff --git a/src/vitis/vas/rest/ws/vitis/Vitis.class.inc b/src/vitis/vas/rest/ws/vitis/Vitis.class.inc index 0a9b240a7269e3cf87c0d512b61541824b495e34..d0de0d77f818175f701a9fa7fd578608f558253a 100644 --- a/src/vitis/vas/rest/ws/vitis/Vitis.class.inc +++ b/src/vitis/vas/rest/ws/vitis/Vitis.class.inc @@ -159,7 +159,23 @@ class Vitis extends DbClass { // Remplace le nom du fichier par son url foreach ($aData as $key => $value) { if ($this->oFilesManager->oFileInterface->is_dir($sDataDir . "/" . $key)) { - $aData[$key] = $this->oFilesManager->oFileInterface->getProxyPassUrl($sDataDir . "/" . $key . "/" . $value); + $aFiles = explode('|', $value); + if (count($aFiles) > 1) { + $aData[$key] = []; + for ($i=0; $i < count($aFiles); $i++) { + if (!empty($aFiles[$i])) { + if (file_exists($sDataDir . "/" . $key . "/" . $aFiles[$i])) { + array_push($aData[$key], $this->oFilesManager->oFileInterface->getProxyPassUrl($sDataDir . "/" . $key . "/" . $aFiles[$i])); + } + } + } + } else { + if (!empty($value)) { + if (file_exists($sDataDir . "/" . $key . "/" . $value)) { + $aData[$key] = $this->oFilesManager->oFileInterface->getProxyPassUrl($sDataDir . "/" . $key . "/" . $value); + } + } + } } } } @@ -291,7 +307,23 @@ class Vitis extends DbClass { // Remplace le nom du fichier par son url foreach ($oObject->aFields as $key => $value) { if ($this->oFilesManager->oFileInterface->is_dir($sDataDir . "/" . $key)) { - $oObject->aFields[$key] = $this->oFilesManager->oFileInterface->getProxyPassUrl($sDataDir . "/" . $key . "/" . $value); + $aFiles = explode('|', $value); + if (count($aFiles) > 1) { + $oObject->aFields[$key] = []; + for ($i=0; $i < count($aFiles); $i++) { + if (!empty($aFiles[$i])) { + if (file_exists($sDataDir . "/" . $key . "/" . $aFiles[$i])) { + array_push($oObject->aFields[$key], $this->oFilesManager->oFileInterface->getProxyPassUrl($sDataDir . "/" . $key . "/" . $aFiles[$i])); + } + } + } + } else { + if (!empty($value)) { + if (file_exists($sDataDir . "/" . $key . "/" . $value)) { + $oObject->aFields[$key] = $this->oFilesManager->oFileInterface->getProxyPassUrl($sDataDir . "/" . $key . "/" . $value); + } + } + } } } }