diff --git a/src/app/attachment/controllers/AttachmentController.php b/src/app/attachment/controllers/AttachmentController.php
index 0b6cb1cc5027dfe49ad6c48d2ee965ae7a8776bd..078e4071ccb2c20061534598761aad3b65783c57 100755
--- a/src/app/attachment/controllers/AttachmentController.php
+++ b/src/app/attachment/controllers/AttachmentController.php
@@ -843,7 +843,7 @@ class AttachmentController
                 }
                 $customId = CoreConfigModel::getCustomId();
                 $customId = empty($customId) ? 'null' : $customId;
-                $coreUrl = str_replace('rest/', '', UrlController::getCoreUrl());
+                $coreUrl  = str_replace('rest/', '', UrlController::getCoreUrl());
 
                 exec("php src/app/convert/scripts/ConvertPdfScript.php --customId {$customId} --resId {$id} --type attachment --userId {$GLOBALS['id']} --coreUrl {$coreUrl} > /dev/null &");
             }
diff --git a/src/app/contentManagement/controllers/CollaboraOnlineController.php b/src/app/contentManagement/controllers/CollaboraOnlineController.php
index e380cd97a4d63de5b3fa2f8deec03de5b502cf73..ec7c5e79833ea18a230028ac0805c87da48938d8 100644
--- a/src/app/contentManagement/controllers/CollaboraOnlineController.php
+++ b/src/app/contentManagement/controllers/CollaboraOnlineController.php
@@ -83,7 +83,7 @@ class CollaboraOnlineController
             if (empty($convertedDocument) && empty($document['fingerprint']) && $tokenCheckResult['type'] == 'resourceModification') {
                 ResModel::update(['set' => ['fingerprint' => $fingerprint], 'where' => ['res_id = ?'], 'data' => [$args['id']]]);
                 $document['fingerprint'] = $fingerprint;
-            } else if (empty($convertedDocument) && empty($document['fingerprint']) && $tokenCheckResult['type'] == 'attachmentModification') {
+            } elseif (empty($convertedDocument) && empty($document['fingerprint']) && $tokenCheckResult['type'] == 'attachmentModification') {
                 AttachmentModel::update(['set' => ['fingerprint' => $fingerprint], 'where' => ['res_id = ?'], 'data' => [$args['id']]]);
                 $document['fingerprint'] = $fingerprint;
             }
@@ -347,7 +347,7 @@ class CollaboraOnlineController
 
         $url = (string)$loadedXml->collaboraonline->server_uri . ':' . (string)$loadedXml->collaboraonline->server_port;
 
-        $coreUrl = str_replace('rest/', '', UrlController::getCoreUrl());
+        $coreUrl   = str_replace('rest/', '', UrlController::getCoreUrl());
         $serverSsl = filter_var((string)$loadedXml->collaboraonline->server_ssl, FILTER_VALIDATE_BOOLEAN);
         if (!empty($serverSsl)) {
             if (strpos($coreUrl, 'https') === false) {
@@ -521,7 +521,7 @@ class CollaboraOnlineController
 
             $document['modification_date'] = new \DateTime('now');
             $document['modification_date'] = $document['modification_date']->format(\DateTime::ISO8601);
-        } else if ($args['type'] == 'resourceModification') {
+        } elseif ($args['type'] == 'resourceModification') {
             if (!ResController::hasRightByResId(['resId' => [$args['id']], 'userId' => $GLOBALS['id']])) {
                 return ['code' => 403, 'errors' => 'Document out of perimeter'];
             }
@@ -538,7 +538,7 @@ class CollaboraOnlineController
             if (!empty($convertedDocument[0])) {
                 return ['code' => 400, 'errors' => 'Document was signed : it cannot be edited'];
             }
-        } else if ($args['type'] == 'attachmentModification') {
+        } elseif ($args['type'] == 'attachmentModification') {
             $document = AttachmentModel::getById([
                 'select' => ['res_id_master', 'filename', 'filesize', 'modification_date', 'docserver_id', 'path', 'fingerprint', 'status'],
                 'id' => $args['id']
@@ -554,7 +554,7 @@ class CollaboraOnlineController
             if ($document['status'] == 'SIGN') {
                 return ['code' => 400, 'errors' => 'Document was signed : it cannot be edited'];
             }
-        } else if ($args['type'] == 'templateModification') {
+        } elseif ($args['type'] == 'templateModification') {
             if (!PrivilegeController::hasPrivilege(['privilegeId' => 'admin_templates', 'userId' => $GLOBALS['id']])) {
                 return ['code' => 403, 'errors' => 'Service forbidden'];
             }
@@ -570,7 +570,7 @@ class CollaboraOnlineController
 
             $document['modification_date'] = new \DateTime('now');
             $document['modification_date'] = $document['modification_date']->format(\DateTime::ISO8601);
-        } else if ($args['type'] == 'templateEncoded') {
+        } elseif ($args['type'] == 'templateEncoded') {
             if (!PrivilegeController::hasPrivilege(['privilegeId' => 'admin_templates', 'userId' => $GLOBALS['id']])) {
                 return ['code' => 403, 'errors' => 'Service forbidden'];
             }
@@ -581,7 +581,7 @@ class CollaboraOnlineController
 
             $document['modification_date'] = new \DateTime('now');
             $document['modification_date'] = $document['modification_date']->format(\DateTime::ISO8601);
-        } else if ($args['type'] == 'templateCreation') {
+        } elseif ($args['type'] == 'templateCreation') {
             if (!PrivilegeController::hasPrivilege(['privilegeId' => 'admin_templates', 'userId' => $GLOBALS['id']])) {
                 return ['code' => 403, 'errors' => 'Service forbidden'];
             }
diff --git a/src/app/contentManagement/controllers/JnlpController.php b/src/app/contentManagement/controllers/JnlpController.php
index ae27b9422cee4f819f9e1cc24778aad2a8656782..63961d417e6629ad5e918dbe0e03bfcac09c76d6 100755
--- a/src/app/contentManagement/controllers/JnlpController.php
+++ b/src/app/contentManagement/controllers/JnlpController.php
@@ -33,10 +33,10 @@ class JnlpController
     {
         $body = $request->getParsedBody();
 
-        $coreUrl = str_replace('rest/', '', UrlController::getCoreUrl());
-        $tmpPath = CoreConfigModel::getTmpPath();
-        $jnlpUniqueId = CoreConfigModel::uniqueId();
-        $jnlpFileName = $GLOBALS['id'] . '_maarchCM_' . $jnlpUniqueId;
+        $coreUrl         = str_replace('rest/', '', UrlController::getCoreUrl());
+        $tmpPath         = CoreConfigModel::getTmpPath();
+        $jnlpUniqueId    = CoreConfigModel::uniqueId();
+        $jnlpFileName    = $GLOBALS['id'] . '_maarchCM_' . $jnlpUniqueId;
         $jnlpFileNameExt = $jnlpFileName . '.jnlp';
 
         $allCookies = '';
diff --git a/src/app/resource/controllers/ExportController.php b/src/app/resource/controllers/ExportController.php
index cf51f588c9c873b0162ab44374b4b5e68728ce86..e64960eb0fc03a75d3f0b3a0b966a285f8dbf73b 100755
--- a/src/app/resource/controllers/ExportController.php
+++ b/src/app/resource/controllers/ExportController.php
@@ -217,7 +217,7 @@ class ExportController
                         $copies       = ExportController::getCopies(['chunkedResIds' => $aArgs['chunkedResIds']]);
                         $csvContent[] = empty($copies[$resource['res_id']]) ? '' : $copies[$resource['res_id']];
                     } elseif ($value['value'] == 'getDetailLink') {
-                        $csvContent[] = str_replace('rest/', "apps/maarch_entreprise/index.php#/resources/{$resource['res_id']}", UrlController::getCoreUrl());
+                        $csvContent[] = trim(UrlController::getCoreUrl(), '/') . '/dist/index.html#/resources/'.$resource['res_id'];
                     } elseif ($value['value'] == 'getParentFolder') {
                         $csvContent[] = ExportController::getParentFolderLabel(['res_id' => $resource['res_id']]);
                     } elseif ($value['value'] == 'getFolder') {
@@ -343,7 +343,7 @@ class ExportController
                         $copies    = ExportController::getCopies(['chunkedResIds' => $aArgs['chunkedResIds']]);
                         $content[] = empty($copies[$resource['res_id']]) ? '' : $copies[$resource['res_id']];
                     } elseif ($value['value'] == 'getDetailLink') {
-                        $content[] = str_replace('rest/', "apps/maarch_entreprise/index.php#/resources/{$resource['res_id']}", UrlController::getCoreUrl());
+                        $content[] = trim(UrlController::getCoreUrl(), '/') . '/dist/index.html#/resources/'.$resource['res_id'];
                     } elseif ($value['value'] == 'getParentFolder') {
                         $content[] = ExportController::getParentFolderLabel(['res_id' => $resource['res_id']]);
                     } elseif ($value['value'] == 'getFolder') {