diff --git a/rest/index.php b/rest/index.php index e46ddaafa56661d68540fac8d1ba9a2d2c5453e2..5c424d0a68c7e27d2ad9ab6863872fee14068e28 100755 --- a/rest/index.php +++ b/rest/index.php @@ -418,6 +418,7 @@ $app->post('/resourcesList/users/{userId}/groups/{groupId}/baskets/{basketId}/ac $app->post('/resourcesList/users/{userId}/groups/{groupId}/baskets/{basketId}/actions/{actionId}/checkRejectVisa', \Action\controllers\PreProcessActionController::class . ':checkRejectVisa'); $app->post('/resourcesList/users/{userId}/groups/{groupId}/baskets/{basketId}/actions/{actionId}/checkInterruptResetVisa', \Action\controllers\PreProcessActionController::class . ':checkInterruptResetVisa'); $app->post('/resourcesList/users/{userId}/groups/{groupId}/baskets/{basketId}/actions/{actionId}/checkCloseWithFieldsAction', \Action\controllers\PreProcessActionController::class . ':checkCloseWithFieldsAction'); +$app->post('/resourcesList/users/{userId}/groups/{groupId}/baskets/{basketId}/actions/{actionId}/checkReconcile', \Action\controllers\PreProcessActionController::class . ':checkReconcile'); $app->post('/resourcesList/users/{userId}/groups/{groupId}/baskets/{basketId}/actions/{actionId}/checkSendAlfresco', \Action\controllers\PreProcessActionController::class . ':checkSendAlfresco'); //Search diff --git a/src/app/contentManagement/controllers/OnlyOfficeController.php b/src/app/contentManagement/controllers/OnlyOfficeController.php index 24c5e4a94347571c7507a2875c9f1b06be3b6eda..97fa04ac849c2d549f30ee17f9d8797485e72694 100644 --- a/src/app/contentManagement/controllers/OnlyOfficeController.php +++ b/src/app/contentManagement/controllers/OnlyOfficeController.php @@ -202,9 +202,12 @@ class OnlyOfficeController $checkUrl = str_replace('http://', '', $queryParams['url']); $checkUrl = str_replace('https://', '', $checkUrl); $uri = (string)$loadedXml->onlyoffice->server_uri; + $uriPaths = explode('/', $uri, 2); + $masterPath = $uriPaths[0]; + $lastPath = !empty($uriPaths[1]) ? "/{$uriPaths[1]}" : ''; $port = (string)$loadedXml->onlyoffice->server_port; - if (strpos($checkUrl, "{$uri}:{$port}/cache/files/") !== 0 && (($port != 80 && $port != 443) || strpos($checkUrl, "{$uri}/cache/files/") !== 0)) { + if (strpos($checkUrl, "{$masterPath}:{$port}{$lastPath}/cache/files/") !== 0 && (($port != 80 && $port != 443) || strpos($checkUrl, "{$masterPath}{$lastPath}/cache/files/") !== 0)) { return $response->withStatus(400)->withJson(['errors' => 'Query params url is not allowed']); } diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts index 772a7851c8c8fb1a53dea3b5a6bcd30030b918d1..64d47ddc9e9cace1fe3bc771fa0c5b43a1b9eb7d 100755 --- a/src/frontend/lang/lang-fr.ts +++ b/src/frontend/lang/lang-fr.ts @@ -116,7 +116,7 @@ export const LANG_FR = { "admissionDate": "Date d'admission", "adrPriority": "Priorité de séquence", "missingAlfrescoConfig" : "La configuration Alfresco est désactivée ou incomplète", - "alreadySentToAlfresco" : "Courrier deja envoyé à Alfresco", + "alreadySentToAlfresco" : "Courrier déjà envoyé à Alfresco", "notEnoughAlfrescoInformations" : "Des informations Alfresco sont manquantes pour l'entité primaire de l'utilisateur", "afterClickingSendLinkChangePassword": "Après avoir cliqué sur <b>Envoyer</b>, vous recevrez un courriel contenant un lien pour modifier votre mot de passe. Ce lien sera actif <b>1 heure</b>.", "alignCenter": "Centre",