From 5ebccc313cf0bd57760e19f32a852eb605c439d2 Mon Sep 17 00:00:00 2001
From: Elorfin <penin.axel@gmail.com>
Date: Thu, 23 Mar 2023 14:43:50 +0100
Subject: [PATCH] [ClacoForm] strip HTML in export

---
 .../app/Resources/modules/intl/date/index.js  |   5 -
 .../Library/Normalizer/TextNormalizer.php     | 184 +++++++++++-------
 .../core/Library/Utilities/ClaroUtilities.php |  83 +-------
 src/main/core/Manager/LogManager.php          |  50 ++---
 src/main/core/Manager/ResourceManager.php     |  44 ++---
 .../Resources/config/services/manager.yml     |   2 -
 .../Administration/LogController.php          | 129 ------------
 .../Resource/DashboardController.php          |  45 +----
 .../Controller/Workspace/LogController.php    | 129 ------------
 .../Resources/config/services/controller.yml  |  18 --
 .../API/SectionCommentController.php          |  66 +------
 .../Resources/config/services/controller.yml  |   5 +-
 .../modules/files/audio/components/player.jsx |  10 +-
 .../Resources/translations/audio.en.json      |   1 -
 .../Resources/translations/audio.fr.json      |   1 -
 .../claco-form/Manager/ExportManager.php      |  29 +--
 .../AnswerableItemDefinitionInterface.php     |   2 +-
 src/plugin/exo/Manager/ExerciseManager.php    |  75 ++-----
 .../exo/Resources/config/services/manager.yml |   4 -
 19 files changed, 189 insertions(+), 693 deletions(-)
 delete mode 100644 src/plugin/analytics/Controller/Administration/LogController.php
 delete mode 100644 src/plugin/analytics/Controller/Workspace/LogController.php

diff --git a/src/main/app/Resources/modules/intl/date/index.js b/src/main/app/Resources/modules/intl/date/index.js
index 4396e641857..f552448b629 100644
--- a/src/main/app/Resources/modules/intl/date/index.js
+++ b/src/main/app/Resources/modules/intl/date/index.js
@@ -186,10 +186,6 @@ function getTimeDiff(startDate, endDate) {
   return moment.duration(diff).asSeconds()
 }
 
-function nowAdd(addition, local = true) {
-  return local ? moment().utc().local().add(addition).format(getApiFormat()) : moment().utc().add(addition).format(getApiFormat())
-}
-
 export {
   getApiFormat,
   getDisplayFormat,
@@ -201,7 +197,6 @@ export {
   dateToDisplayFormat,
   computeElapsedTime,
   getTimeDiff,
-  nowAdd,
   displayDuration,
   displayTime,
   displayDateRange
diff --git a/src/main/core/Library/Normalizer/TextNormalizer.php b/src/main/core/Library/Normalizer/TextNormalizer.php
index 007456533d8..6e08478c5ef 100644
--- a/src/main/core/Library/Normalizer/TextNormalizer.php
+++ b/src/main/core/Library/Normalizer/TextNormalizer.php
@@ -4,15 +4,8 @@
 
 class TextNormalizer
 {
-    /**
-     * @param $string
-     *
-     * @return string
-     */
-    public static function stripDiacritics($string)
+    public static function stripDiacritics(string $string): string
     {
-        $string = (string) $string;
-
         if (!preg_match('/[\x80-\xff]/', $string)) {
             return $string;
         }
@@ -82,9 +75,8 @@ public static function stripDiacritics($string)
             // grave accent
             'Ǜ' => 'U', 'ǜ' => 'u',
         ];
-        $string = str_replace(array_keys($transliteration), array_values($transliteration), $string);
 
-        return $string;
+        return str_replace(array_keys($transliteration), array_values($transliteration), $string);
     }
 
     public static function toKey($string, int $length = null)
@@ -118,6 +110,9 @@ public static function toUtf8(string $string): string
         return $string;
     }
 
+    /**
+     * Converts a string into UTF-8 and replaces EOL by PHP ones.
+     */
     public static function sanitize(string $string): string
     {
         // If encoding not UTF-8 then convert it to UTF-8
@@ -126,6 +121,7 @@ public static function sanitize(string $string): string
         // normalize end of lines
         $string = str_replace("\r\n", PHP_EOL, $string);
         $string = str_replace("\r", PHP_EOL, $string);
+        $string = str_replace("\n", PHP_EOL, $string);
 
         return $string;
     }
@@ -135,87 +131,127 @@ public static function sanitize(string $string): string
      */
     public static function resumeHtml(string $text, int $nbCharacter, ?string $readMoreText = ''): string
     {
-        if (is_numeric($nbCharacter)) {
-            $lengthBeforeWithoutHtml = strlen(trim(strip_tags($text)));
-            $htmlSplitMask = '#</?([a-zA-Z1-6]+)(?: +[a-zA-Z]+="[^"]*")*( ?/)?>#';
-            $htmlMatchMask = '#<(?:/([a-zA-Z1-6]+)|([a-zA-Z1-6]+)(?: +[a-zA-Z]+="[^"]*")*( ?/)?)>#';
+        $lengthBeforeWithoutHtml = strlen(trim(strip_tags($text)));
+        $htmlSplitMask = '#</?([a-zA-Z1-6]+)(?: +[a-zA-Z]+="[^"]*")*( ?/)?>#';
+        $htmlMatchMask = '#<(?:/([a-zA-Z1-6]+)|([a-zA-Z1-6]+)(?: +[a-zA-Z]+="[^"]*")*( ?/)?)>#';
+        $text .= ' ';
+        $textPieces = preg_split($htmlSplitMask, $text, -1, PREG_SPLIT_OFFSET_CAPTURE | PREG_SPLIT_NO_EMPTY);
+        $pieceNumber = count($textPieces);
+
+        if (1 === $pieceNumber) {
             $text .= ' ';
-            $textPieces = preg_split($htmlSplitMask, $text, -1, PREG_SPLIT_OFFSET_CAPTURE | PREG_SPLIT_NO_EMPTY);
-            $pieceNumber = count($textPieces);
+            $lengthBefore = strlen($text);
+            $text = substr($text, 0, strpos($text, ' ', $lengthBefore > $nbCharacter ? $nbCharacter : $lengthBefore));
 
-            if (1 === $pieceNumber) {
-                $text .= ' ';
-                $lengthBefore = strlen($text);
-                $text = substr($text, 0, strpos($text, ' ', $lengthBefore > $nbCharacter ? $nbCharacter : $lengthBefore));
+            if ('' != $readMoreText && $lengthBefore > $nbCharacter) {
+                $text .= $readMoreText;
+            }
+        } else {
+            $length = 0;
+            $indexLastPiece = $pieceNumber - 1;
+            $position = $textPieces[$indexLastPiece][1] + strlen($textPieces[$indexLastPiece][0]) - 1;
+            $indexPiece = $indexLastPiece;
+            $searchSpace = true;
 
-                if ('' != $readMoreText && $lengthBefore > $nbCharacter) {
-                    $text .= $readMoreText;
-                }
-            } else {
-                $length = 0;
-                $indexLastPiece = $pieceNumber - 1;
-                $position = $textPieces[$indexLastPiece][1] + strlen($textPieces[$indexLastPiece][0]) - 1;
-                $indexPiece = $indexLastPiece;
-                $searchSpace = true;
-
-                foreach ($textPieces as $index => $bout) {
-                    $length += strlen($bout[0]);
-                    if ($length >= $nbCharacter) {
-                        $positionEndPiece = $bout[1] + strlen($bout[0]) - 1;
-                        $position = $positionEndPiece - ($length - $nbCharacter);
-
-                        $positionSpace = strpos($bout[0], ' ', $position - $bout[1]);
-                        if (false !== $positionSpace) {
-                            $position = $bout[1] + $positionSpace;
-                            $searchSpace = false;
-                        }
-                        if ($index != $indexLastPiece) {
-                            $indexPiece = $index + 1;
-                        }
-                        break;
+            foreach ($textPieces as $index => $bout) {
+                $length += strlen($bout[0]);
+                if ($length >= $nbCharacter) {
+                    $positionEndPiece = $bout[1] + strlen($bout[0]) - 1;
+                    $position = $positionEndPiece - ($length - $nbCharacter);
+
+                    $positionSpace = strpos($bout[0], ' ', $position - $bout[1]);
+                    if (false !== $positionSpace) {
+                        $position = $bout[1] + $positionSpace;
+                        $searchSpace = false;
                     }
+                    if ($index != $indexLastPiece) {
+                        $indexPiece = $index + 1;
+                    }
+                    break;
                 }
+            }
 
-                if (true === $searchSpace) {
-                    for ($i = $indexPiece; $i <= $indexLastPiece; ++$i) {
-                        $position = $textPieces[$i][1];
-                        $positionSpace = strpos($textPieces[$i][0], ' ');
-                        if (false !== $positionSpace) {
-                            $position += $positionSpace;
-                            break;
-                        }
+            if (true === $searchSpace) {
+                for ($i = $indexPiece; $i <= $indexLastPiece; ++$i) {
+                    $position = $textPieces[$i][1];
+                    $positionSpace = strpos($textPieces[$i][0], ' ');
+                    if (false !== $positionSpace) {
+                        $position += $positionSpace;
+                        break;
                     }
                 }
+            }
 
-                $text = substr($text, 0, $position);
-                preg_match_all($htmlMatchMask, $text, $return, PREG_OFFSET_CAPTURE);
-                $tagPieces = [];
+            $text = substr($text, 0, $position);
+            preg_match_all($htmlMatchMask, $text, $return, PREG_OFFSET_CAPTURE);
+            $tagPieces = [];
 
-                foreach ($return[0] as $index => $tag) {
-                    if (isset($return[3][$index][0])) {
-                        continue;
-                    }
-                    if ('/' != $return[0][$index][0][1]) {
-                        array_unshift($tagPieces, $return[2][$index][0]);
-                    } else {
-                        array_shift($tagPieces);
-                    }
+            foreach ($return[0] as $index => $tag) {
+                if (isset($return[3][$index][0])) {
+                    continue;
                 }
-
-                if (!empty($tagPieces)) {
-                    foreach ($tagPieces as $tag) {
-                        $text .= '</'.$tag.'>';
-                    }
+                if ('/' != $return[0][$index][0][1]) {
+                    array_unshift($tagPieces, $return[2][$index][0]);
+                } else {
+                    array_shift($tagPieces);
                 }
+            }
 
-                if ('' != $readMoreText && $lengthBeforeWithoutHtml > $nbCharacter) {
-                    $text .= 'SuspensionPoint';
-                    $pattern = '#((</[^>]*>[\n\t\r ]*)?(</[^>]*>[\n\t\r ]*)?(</[^>]*>[\n\t\r ]*)?(</[^>]*>[\n\t\r ]*)?(</[^>]*>)[\n\t\r ]*SuspensionPoint)#i';
-                    $text = preg_replace($pattern, $readMoreText.'${2}${3}${4}${5}${6}', $text);
+            if (!empty($tagPieces)) {
+                foreach ($tagPieces as $tag) {
+                    $text .= '</'.$tag.'>';
                 }
             }
+
+            if ('' != $readMoreText && $lengthBeforeWithoutHtml > $nbCharacter) {
+                $text .= 'SuspensionPoint';
+                $pattern = '#((</[^>]*>[\n\t\r ]*)?(</[^>]*>[\n\t\r ]*)?(</[^>]*>[\n\t\r ]*)?(</[^>]*>[\n\t\r ]*)?(</[^>]*>)[\n\t\r ]*SuspensionPoint)#i';
+                $text = preg_replace($pattern, $readMoreText.'${2}${3}${4}${5}${6}', $text);
+            }
         }
 
         return $text;
     }
+
+    public static function stripHtml(string $htmlStr, ?bool $preserveMedia = false): string
+    {
+        $csvStr = self::sanitize($htmlStr);
+        if ($preserveMedia) {
+            $csvStr = strip_tags($csvStr, '<img><embed><video><audio><source>');
+            // On Image and Embed objects, keep src
+            $csvStr = preg_replace(
+                '/<(img|embed)([^>]+src=[\'"]([^\'"]+)[\'"])*[^\/>]*\/?>/i',
+                '[$1 src="$3"]',
+                $csvStr
+            );
+            // On Video and Audio keep sources
+            $csvStr = preg_replace_callback(
+                '/<(video|audio)([^>]+src=[\'"]([^\'"]+)[\'"])*[^\/>]*\/?>([\s\S]*)<\/\1>/i',
+                function ($matches) {
+                    return self::mediaSrcExtractor($matches);
+                },
+                $csvStr
+            );
+        }
+        // Strip any remaining tags
+        $csvStr = strip_tags($csvStr);
+
+        // Trim spaces
+        return trim(preg_replace('/\s+/', ' ', $csvStr));
+    }
+
+    private static function mediaSrcExtractor(array $matches): string
+    {
+        $ret = '['.$matches[1].(empty($matches[3]) ? '' : ' src="'.$matches[3].'"');
+        if (!empty($matches[4])) {
+            $srcs = [];
+            preg_match_all('/src=[\'"]([^\'"]+)[\'"]/', $matches[4], $srcs);
+            foreach ($srcs[1] as $src) {
+                $ret .= ' src="'.$src.'"';
+            }
+        }
+        $ret .= ']';
+
+        return $ret;
+    }
 }
diff --git a/src/main/core/Library/Utilities/ClaroUtilities.php b/src/main/core/Library/Utilities/ClaroUtilities.php
index ea446c80a13..12008b972fa 100644
--- a/src/main/core/Library/Utilities/ClaroUtilities.php
+++ b/src/main/core/Library/Utilities/ClaroUtilities.php
@@ -1,60 +1,14 @@
 <?php
 
-/*
- * This file is part of the Claroline Connect package.
- *
- * (c) Claroline Consortium <consortium@claroline.net>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
 namespace Claroline\CoreBundle\Library\Utilities;
 
+use Claroline\CoreBundle\Library\Normalizer\TextNormalizer;
+
 class ClaroUtilities
 {
-    private $hasIntl;
-
-    public function __construct()
+    public function html2Csv(string $htmlStr, ?bool $preserveMedia = false): string
     {
-        $this->hasIntl = extension_loaded('intl');
-    }
-
-    /**
-     * Detect if encoding is UTF-8, ASCII, ISO-8859-1 or Windows-1252.
-     *
-     * @param $string
-     *
-     * @return bool|string
-     */
-    public function detectEncoding($string)
-    {
-        static $enclist = ['UTF-8', 'ASCII', 'ISO-8859-1', 'Windows-1252'];
-
-        if (function_exists('mb_detect_encoding')) {
-            return mb_detect_encoding($string, $enclist, true);
-        }
-
-        $result = false;
-
-        foreach ($enclist as $item) {
-            try {
-                $sample = iconv($item, $item, $string);
-                if (md5($sample) === md5($string)) {
-                    $result = $item;
-                    break;
-                }
-            } catch (\Exception $e) {
-                unset($e);
-            }
-        }
-
-        return $result;
-    }
-
-    public function html2Csv($htmlStr, $preserveMedia = false)
-    {
-        $csvStr = $this->formatCsvOutput($htmlStr);
+        $csvStr = TextNormalizer::sanitize($htmlStr);
         if ($preserveMedia) {
             $csvStr = strip_tags($csvStr, '<img><embed><video><audio><source>');
             // On Image and Embed objects, keep src
@@ -74,13 +28,12 @@ function ($matches) {
         }
         // Strip any remaining tags
         $csvStr = strip_tags($csvStr);
-        // Trim spaces
-        $csvStr = trim(preg_replace('/\s+/', ' ', $csvStr));
 
-        return $csvStr;
+        // Trim spaces
+        return trim(preg_replace('/\s+/', ' ', $csvStr));
     }
 
-    private function mediaSrcExtractor($matches)
+    private function mediaSrcExtractor(array $matches): string
     {
         $ret = '['.$matches[1].(empty($matches[3]) ? '' : ' src="'.$matches[3].'"');
         if (!empty($matches[4])) {
@@ -94,26 +47,4 @@ private function mediaSrcExtractor($matches)
 
         return $ret;
     }
-
-    private function formatCsvOutput($data)
-    {
-        // If encoding not UTF-8 then convert it to UTF-8
-        $data = $this->stringToUtf8($data);
-        $data = str_replace("\r\n", PHP_EOL, $data);
-        $data = str_replace("\r", PHP_EOL, $data);
-        $data = str_replace("\n", PHP_EOL, $data);
-
-        return $data;
-    }
-
-    private function stringToUtf8($string)
-    {
-        // If encoding not UTF-8 then convert it to UTF-8
-        $encoding = $this->detectEncoding($string);
-        if ($encoding && 'UTF-8' !== $encoding) {
-            $string = iconv($encoding, 'UTF-8', $string);
-        }
-
-        return $string;
-    }
 }
diff --git a/src/main/core/Manager/LogManager.php b/src/main/core/Manager/LogManager.php
index d21993bb4a1..267cb973271 100644
--- a/src/main/core/Manager/LogManager.php
+++ b/src/main/core/Manager/LogManager.php
@@ -16,7 +16,7 @@
 use Claroline\CoreBundle\Entity\Log\Log;
 use Claroline\CoreBundle\Event\Log\LogCreateDelegateViewEvent;
 use Claroline\CoreBundle\Library\Normalizer\DateNormalizer;
-use Claroline\CoreBundle\Library\Utilities\ClaroUtilities;
+use Claroline\CoreBundle\Library\Normalizer\TextNormalizer;
 use Claroline\CoreBundle\Repository\Log\LogRepository;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
@@ -25,55 +25,26 @@ class LogManager
 {
     const CSV_LOG_BATCH = 1000;
 
-    /** @var ObjectManager */
-    private $om;
+    private ObjectManager $om;
+    private LogRepository $logRepository;
+    private FinderProvider $finder;
+    private TranslatorInterface $translator;
+    private EventDispatcherInterface $dispatcher;
 
-    /** @var LogRepository */
-    private $logRepository;
-
-    /** @var FinderProvider */
-    private $finder;
-
-    /** @var TranslatorInterface */
-    private $translator;
-
-    /** @var ClaroUtilities */
-    private $ut;
-
-    /** @var EventDispatcherInterface */
-    private $dispatcher;
-
-    /**
-     * LogManager constructor.
-     */
     public function __construct(
         ObjectManager $objectManager,
         FinderProvider $finder,
         TranslatorInterface $translator,
-        ClaroUtilities $ut,
         EventDispatcherInterface $dispatcher
     ) {
         $this->translator = $translator;
         $this->om = $objectManager;
         $this->finder = $finder;
-        $this->ut = $ut;
         $this->dispatcher = $dispatcher;
 
         $this->logRepository = $objectManager->getRepository(Log::class);
     }
 
-    /**
-     * Get log by id.
-     *
-     * @param $id
-     *
-     * @return object|null
-     */
-    public function getLog($id)
-    {
-        return $this->logRepository->findOneBy(['id' => $id]);
-    }
-
     public function getData(array $finderParams = [])
     {
         // get filters
@@ -114,6 +85,8 @@ public function getChartData(array $finderParams = [])
      * @param $query
      *
      * @return bool|resource
+     *
+     * @deprecated
      */
     public function exportLogsToCsv($query, $fileName = null)
     {
@@ -156,7 +129,7 @@ public function exportLogsToCsv($query, $fileName = null)
                     DateNormalizer::normalize($log->getDateLog()),
                     $this->translator->trans('log_'.$log->getAction().'_shortname', [], 'log'),
                     $log->getDoer() ? $log->getDoer()->getUsername() : '',
-                    $this->ut->html2Csv($description, true),
+                    TextNormalizer::stripHtml($description, true),
                 ], ';', '"');
             }
 
@@ -172,6 +145,8 @@ public function exportLogsToCsv($query, $fileName = null)
      * Exports users' actions for a given query.
      *
      * @return bool|resource
+     *
+     * @deprecated
      */
     public function exportUserActionToCsv(array $finderParams = [])
     {
@@ -241,6 +216,9 @@ private function formatDataForChart(array $data, \DateTime $minDate = null, \Dat
         return $chartData;
     }
 
+    /**
+     * @deprecated
+     */
     public function getDetails(Log $log)
     {
         $details = $log->getDetails();
diff --git a/src/main/core/Manager/ResourceManager.php b/src/main/core/Manager/ResourceManager.php
index 5151c63d5d3..774f5962016 100644
--- a/src/main/core/Manager/ResourceManager.php
+++ b/src/main/core/Manager/ResourceManager.php
@@ -28,7 +28,7 @@
 use Claroline\CoreBundle\Event\Resource\EmbedResourceEvent;
 use Claroline\CoreBundle\Event\Resource\LoadResourceEvent;
 use Claroline\CoreBundle\Exception\ResourceNotFoundException;
-use Claroline\CoreBundle\Library\Utilities\ClaroUtilities;
+use Claroline\CoreBundle\Library\Normalizer\TextNormalizer;
 use Claroline\CoreBundle\Manager\Resource\RightsManager;
 use Claroline\CoreBundle\Repository\Resource\ResourceNodeRepository;
 use Claroline\CoreBundle\Repository\Resource\ResourceTypeRepository;
@@ -41,36 +41,23 @@ class ResourceManager implements LoggerAwareInterface
 {
     use LoggableTrait;
 
-    /** @var AuthorizationCheckerInterface */
-    private $authorization;
-    /** @var StrictDispatcher */
-    private $dispatcher;
-    /** @var ObjectManager */
-    private $om;
-    /** @var ClaroUtilities */
-    private $ut;
-    /** @var Crud */
-    private $crud;
-    /** @var RightsManager */
-    private $rightsManager;
-    /** @var TempFileManager */
-    private $tempManager;
-    /** @var Security */
-    private $security;
-
-    /** @var ResourceTypeRepository */
-    private $resourceTypeRepo;
-    /** @var ResourceNodeRepository */
-    private $resourceNodeRepo;
-    /** @var RoleRepository */
-    private $roleRepo;
+    private AuthorizationCheckerInterface $authorization;
+    private StrictDispatcher $dispatcher;
+    private ObjectManager $om;
+    private Crud $crud;
+    private RightsManager $rightsManager;
+    private TempFileManager $tempManager;
+    private Security $security;
+
+    private ResourceTypeRepository $resourceTypeRepo;
+    private ResourceNodeRepository $resourceNodeRepo;
+    private RoleRepository $roleRepo;
 
     public function __construct(
         AuthorizationCheckerInterface $authorization,
         RightsManager $rightsManager,
         StrictDispatcher $dispatcher,
         ObjectManager $om,
-        ClaroUtilities $ut,
         Crud $crud,
         TempFileManager $tempManager,
         Security $security
@@ -79,7 +66,6 @@ public function __construct(
         $this->om = $om;
         $this->rightsManager = $rightsManager;
         $this->dispatcher = $dispatcher;
-        $this->ut = $ut;
         $this->crud = $crud;
         $this->tempManager = $tempManager;
         $this->security = $security;
@@ -298,12 +284,12 @@ public function download(array $elements, ?bool $forceArchive = false): array
                         $obj = $event->getItem();
 
                         if (null !== $obj) {
-                            $archive->addFile($obj, iconv($this->ut->detectEncoding($filename), 'UTF-8//TRANSLIT', $filename));
+                            $archive->addFile($obj, TextNormalizer::toUtf8($filename));
                         } else {
-                            $archive->addFromString(iconv($this->ut->detectEncoding($filename), 'UTF-8//TRANSLIT', $filename), '');
+                            $archive->addFromString(TextNormalizer::toUtf8($filename), '');
                         }
                     } else {
-                        $archive->addEmptyDir(iconv($this->ut->detectEncoding($filename), 'UTF-8//TRANSLIT', $filename));
+                        $archive->addEmptyDir(TextNormalizer::toUtf8($filename));
                     }
 
                     $this->dispatcher->dispatch('log', 'Log\LogResourceExport', [$node]);
diff --git a/src/main/core/Resources/config/services/manager.yml b/src/main/core/Resources/config/services/manager.yml
index ea3a6c2b3fa..f1905602e1e 100644
--- a/src/main/core/Resources/config/services/manager.yml
+++ b/src/main/core/Resources/config/services/manager.yml
@@ -68,7 +68,6 @@ services:
             - '@Claroline\CoreBundle\Manager\Resource\RightsManager'
             - '@Claroline\AppBundle\Event\StrictDispatcher'
             - '@Claroline\AppBundle\Persistence\ObjectManager'
-            - '@Claroline\CoreBundle\Library\Utilities\ClaroUtilities'
             - '@Claroline\AppBundle\API\Crud'
             - '@Claroline\AppBundle\Manager\File\TempFileManager'
             - '@security.helper'
@@ -100,7 +99,6 @@ services:
             - '@Claroline\AppBundle\Persistence\ObjectManager'
             - '@Claroline\AppBundle\API\FinderProvider'
             - '@translator'
-            - '@Claroline\CoreBundle\Library\Utilities\ClaroUtilities'
             - '@event_dispatcher'
 
     Claroline\CoreBundle\Manager\LogConnectManager:
diff --git a/src/plugin/analytics/Controller/Administration/LogController.php b/src/plugin/analytics/Controller/Administration/LogController.php
deleted file mode 100644
index a2b74c02af7..00000000000
--- a/src/plugin/analytics/Controller/Administration/LogController.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-
-namespace Claroline\AnalyticsBundle\Controller\Administration;
-
-use Claroline\AppBundle\API\FinderProvider;
-use Claroline\AppBundle\API\SerializerProvider;
-use Claroline\AppBundle\Controller\AbstractSecurityController;
-use Claroline\CoreBundle\Entity\Log\Log;
-use Claroline\CoreBundle\Entity\User;
-use Claroline\CoreBundle\Manager\LogManager;
-use Symfony\Component\HttpFoundation\JsonResponse;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\StreamedResponse;
-use Symfony\Component\Routing\Annotation\Route;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-
-/**
- * @Route("/tools/admin/logs")
- */
-class LogController extends AbstractSecurityController
-{
-    /** @var FinderProvider */
-    private $finder;
-
-    /** @var SerializerProvider */
-    private $serializer;
-
-    /** @var LogManager */
-    private $logManager;
-
-    /** @var User */
-    private $loggedUser;
-
-    /**
-     * LogController constructor.
-     */
-    public function __construct(
-        TokenStorageInterface $tokenStorage,
-        FinderProvider $finder,
-        SerializerProvider $serializer,
-        LogManager $logManager
-    ) {
-        $this->loggedUser = $tokenStorage->getToken()->getUser();
-        $this->finder = $finder;
-        $this->serializer = $serializer;
-        $this->logManager = $logManager;
-    }
-
-    /**
-     * Get the name of the managed entity.
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'log';
-    }
-
-    public function getClass()
-    {
-        return Log::class;
-    }
-
-    /**
-     * @Route("/", name="apiv2_admin_tool_logs_list", methods={"GET"})
-     *
-     * @return JsonResponse
-     */
-    public function listAction(Request $request)
-    {
-        $this->canOpenAdminTool('dashboard');
-        $query = $this->addOrganizationFilter($request->query->all());
-
-        return new JsonResponse($this->finder->search(
-            Log::class,
-            $query,
-            []
-        ));
-    }
-
-    /**
-     * @Route("/csv", name="apiv2_admin_tool_logs_list_csv", methods={"GET"})
-     *
-     * @return StreamedResponse
-     */
-    public function listCsvAction(Request $request)
-    {
-        $this->canOpenAdminTool('dashboard');
-        // Filter data, but return all of them
-        $query = $this->addOrganizationFilter($request->query->all());
-        $dateStr = date('YmdHis');
-
-        return new StreamedResponse(function () use ($query) {
-            $this->logManager->exportLogsToCsv($query);
-        }, 200, [
-            'Content-Type' => 'application/force-download',
-            'Content-Disposition' => 'attachment; filename="actions_'.$dateStr.'.csv"',
-        ]);
-    }
-
-    /**
-     * @Route("/users/csv", name="apiv2_admin_tool_logs_list_users_csv", methods={"GET"})
-     *
-     * @return StreamedResponse
-     */
-    public function userActionsListCsvAction(Request $request)
-    {
-        $this->canOpenAdminTool('dashboard');
-        // Filter data, but return all of them
-        $query = $this->addOrganizationFilter($request->query->all());
-        $dateStr = date('YmdHis');
-
-        return new StreamedResponse(function () use ($query) {
-            $this->logManager->exportUserActionToCsv($query);
-        }, 200, [
-            'Content-Type' => 'application/force-download',
-            'Content-Disposition' => 'attachment; filename="user_actions_'.$dateStr.'.csv"',
-        ]);
-    }
-
-    private function addOrganizationFilter($query)
-    {
-        if (!$this->loggedUser->hasRole('ROLE_ADMIN')) {
-            $query['hiddenFilters']['organization'] = $this->loggedUser->getAdministratedOrganizations();
-        }
-
-        return $query;
-    }
-}
diff --git a/src/plugin/analytics/Controller/Resource/DashboardController.php b/src/plugin/analytics/Controller/Resource/DashboardController.php
index 4e598265985..5887e06d7eb 100644
--- a/src/plugin/analytics/Controller/Resource/DashboardController.php
+++ b/src/plugin/analytics/Controller/Resource/DashboardController.php
@@ -3,9 +3,7 @@
 namespace Claroline\AnalyticsBundle\Controller\Resource;
 
 use Claroline\AnalyticsBundle\Manager\AnalyticsManager;
-use Claroline\AppBundle\API\FinderProvider;
 use Claroline\CoreBundle\Entity\Resource\ResourceNode;
-use Claroline\CoreBundle\Entity\User;
 use Claroline\CoreBundle\Event\Log\LogGenericEvent;
 use Claroline\CoreBundle\Event\Log\LogResourceReadEvent;
 use Claroline\CoreBundle\Manager\EventManager;
@@ -14,7 +12,6 @@
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 
@@ -23,30 +20,18 @@
  */
 class DashboardController
 {
-    /** @var AuthorizationCheckerInterface */
-    private $authorization;
-    /** @var TokenStorageInterface */
-    private $tokenStorage;
-    /** @var FinderProvider */
-    private $finder;
-    /** @var AnalyticsManager */
-    private $analyticsManager;
-    /** @var EventManager */
-    private $eventManager;
-    /** @var LogManager */
-    private $logManager;
+    private AuthorizationCheckerInterface $authorization;
+    private AnalyticsManager $analyticsManager;
+    private EventManager $eventManager;
+    private LogManager $logManager;
 
     public function __construct(
         AuthorizationCheckerInterface $authorization,
-        TokenStorageInterface $tokenStorage,
-        FinderProvider $finder,
         AnalyticsManager $analyticsManager,
         EventManager $eventManager,
         LogManager $logManager
     ) {
         $this->authorization = $authorization;
-        $this->tokenStorage = $tokenStorage;
-        $this->finder = $finder;
         $this->analyticsManager = $analyticsManager;
         $this->eventManager = $eventManager;
         $this->logManager = $logManager;
@@ -111,28 +96,6 @@ public function connectionTimeAction(ResourceNode $resourceNode): JsonResponse
         ]);
     }
 
-    /**
-     * @Route("/{resource}/users/top", name="apiv2_resource_analytics_top_users", methods={"GET"})
-     * @EXT\ParamConverter("resourceNode", class="Claroline\CoreBundle\Entity\Resource\ResourceNode", options={"mapping": {"resource": "uuid"}})
-     */
-    public function topUsersAction(ResourceNode $resourceNode): JsonResponse
-    {
-        $this->checkDashboardAccess($resourceNode);
-
-        $options = [
-            'page' => 0,
-            'limit' => 10,
-            'sortBy' => '-created',
-            'hiddenFilters' => [
-                'workspace' => $resourceNode->getUuid(),
-            ],
-        ];
-
-        return new JsonResponse(
-            $this->finder->search(User::class, $options)['data']
-        );
-    }
-
     /**
      * Checks user rights to access logs tool.
      */
diff --git a/src/plugin/analytics/Controller/Workspace/LogController.php b/src/plugin/analytics/Controller/Workspace/LogController.php
deleted file mode 100644
index 0cc7c2b76ad..00000000000
--- a/src/plugin/analytics/Controller/Workspace/LogController.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-
-/*
- * This file is part of the Claroline Connect package.
- *
- * (c) Claroline Consortium <consortium@claroline.net>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Claroline\AnalyticsBundle\Controller\Workspace;
-
-use Claroline\AppBundle\API\FinderProvider;
-use Claroline\CoreBundle\API\Serializer\Log\LogSerializer;
-use Claroline\CoreBundle\Entity\Log\Log;
-use Claroline\CoreBundle\Entity\Workspace\Workspace;
-use Claroline\CoreBundle\Manager\LogManager;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration as EXT;
-use Symfony\Component\HttpFoundation\JsonResponse;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\StreamedResponse;
-use Symfony\Component\Routing\Annotation\Route;
-use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Symfony\Component\Security\Core\Exception\AccessDeniedException;
-
-/**
- * @Route("/workspace/{workspaceId}/logs")
- * @EXT\ParamConverter("workspace", class="Claroline\CoreBundle\Entity\Workspace\Workspace", options={"mapping": {"workspaceId": "uuid"}})
- */
-class LogController
-{
-    /** @var AuthorizationCheckerInterface */
-    private $authorizationChecker;
-
-    /** @var FinderProvider */
-    private $finder;
-
-    /** @var LogSerializer */
-    private $serializer;
-
-    /** @var LogManager */
-    private $logManager;
-
-    public function __construct(
-        AuthorizationCheckerInterface $authorizationChecker,
-        FinderProvider $finder,
-        LogSerializer $serializer,
-        LogManager $logManager
-    ) {
-        $this->authorizationChecker = $authorizationChecker;
-        $this->finder = $finder;
-        $this->serializer = $serializer;
-        $this->logManager = $logManager;
-    }
-
-    /**
-     * @Route("/", name="apiv2_workspace_tool_logs_list", methods={"GET"})
-     */
-    public function listAction(Request $request, Workspace $workspace): JsonResponse
-    {
-        $this->checkLogToolAccess($workspace);
-
-        return new JsonResponse($this->finder->search(
-            Log::class,
-            $this->getWorkspaceFilteredQuery($request, $workspace)
-        ));
-    }
-
-    /**
-     * @Route("/csv", name="apiv2_workspace_tool_logs_list_csv", methods={"GET"})
-     */
-    public function listCsvAction(Request $request, Workspace $workspace): StreamedResponse
-    {
-        $this->checkLogToolAccess($workspace);
-
-        // Filter data, but return all of them
-        $query = $this->getWorkspaceFilteredQuery($request, $workspace);
-        $dateStr = date('YmdHis');
-
-        return new StreamedResponse(function () use ($query) {
-            $this->logManager->exportLogsToCsv($query);
-        }, 200, [
-            'Content-Type' => 'application/force-download',
-            'Content-Disposition' => 'attachment; filename="actions_'.$dateStr.'.csv"',
-        ]);
-    }
-
-    /**
-     * @Route("/users/csv", name="apiv2_workspace_tool_logs_list_users_csv", methods={"GET"})
-     */
-    public function userActionsListCsvAction(Request $request, Workspace $workspace): StreamedResponse
-    {
-        $this->checkLogToolAccess($workspace);
-
-        // Filter data, but return all of them
-        $query = $this->getWorkspaceFilteredQuery($request, $workspace);
-        $dateStr = date('YmdHis');
-
-        return new StreamedResponse(function () use ($query) {
-            $this->logManager->exportUserActionToCsv($query);
-        }, 200, [
-            'Content-Type' => 'application/force-download',
-            'Content-Disposition' => 'attachment; filename="user_actions_'.$dateStr.'.csv"',
-        ]);
-    }
-
-    /**
-     * Add workspace filter to request.
-     */
-    private function getWorkspaceFilteredQuery(Request $request, Workspace $workspace): array
-    {
-        $query = $request->query->all();
-        $hiddenFilters = isset($query['hiddenFilters']) ? $query['hiddenFilters'] : [];
-        $query['hiddenFilters'] = array_merge($hiddenFilters, ['workspace' => $workspace]);
-
-        return $query;
-    }
-
-    /**
-     * Checks user rights to access logs tool.
-     */
-    private function checkLogToolAccess(Workspace $workspace)
-    {
-        if (!$this->authorizationChecker->isGranted('dashboard', $workspace)) {
-            throw new AccessDeniedException();
-        }
-    }
-}
diff --git a/src/plugin/analytics/Resources/config/services/controller.yml b/src/plugin/analytics/Resources/config/services/controller.yml
index 552bf553980..07a2a582c43 100644
--- a/src/plugin/analytics/Resources/config/services/controller.yml
+++ b/src/plugin/analytics/Resources/config/services/controller.yml
@@ -2,20 +2,9 @@ services:
     _defaults:
         public: true # required by controllers
 
-    Claroline\AnalyticsBundle\Controller\Administration\LogController:
-        parent: Claroline\AppBundle\Controller\AbstractSecurityController
-        public: true
-        arguments:
-            - '@security.token_storage'
-            - '@Claroline\AppBundle\API\FinderProvider'
-            - '@Claroline\AppBundle\API\SerializerProvider'
-            - '@Claroline\CoreBundle\Manager\LogManager'
-
     Claroline\AnalyticsBundle\Controller\Resource\DashboardController:
         arguments:
             - '@security.authorization_checker'
-            - '@security.token_storage'
-            - '@Claroline\AppBundle\API\FinderProvider'
             - '@Claroline\AnalyticsBundle\Manager\AnalyticsManager'
             - '@Claroline\CoreBundle\Manager\EventManager'
             - '@Claroline\CoreBundle\Manager\LogManager'
@@ -25,10 +14,3 @@ services:
             - '@security.authorization_checker'
             - '@Claroline\AppBundle\API\FinderProvider'
             - '@Claroline\CoreBundle\Manager\LogManager'
-
-    Claroline\AnalyticsBundle\Controller\Workspace\LogController:
-        arguments:
-            - '@security.authorization_checker'
-            - '@Claroline\AppBundle\API\FinderProvider'
-            - '@Claroline\CoreBundle\API\Serializer\Log\LogSerializer'
-            - '@Claroline\CoreBundle\Manager\LogManager'
diff --git a/src/plugin/audio-player/Controller/API/SectionCommentController.php b/src/plugin/audio-player/Controller/API/SectionCommentController.php
index 1142ecf398f..3db2a9168cc 100644
--- a/src/plugin/audio-player/Controller/API/SectionCommentController.php
+++ b/src/plugin/audio-player/Controller/API/SectionCommentController.php
@@ -14,31 +14,16 @@
 use Claroline\AppBundle\Controller\AbstractCrudController;
 use Claroline\AudioPlayerBundle\Entity\Resource\SectionComment;
 use Claroline\CoreBundle\Entity\Resource\ResourceNode;
-use Claroline\CoreBundle\Library\Utilities\ClaroUtilities;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration as EXT;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\StreamedResponse;
 use Symfony\Component\Routing\Annotation\Route;
-use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * @Route("/audioresourcesectioncomment")
  */
 class SectionCommentController extends AbstractCrudController
 {
-    /** @var ClaroUtilities */
-    private $claroUtils;
-
-    /** @var TranslatorInterface */
-    private $translator;
-
-    public function __construct(ClaroUtilities $claroUtils, TranslatorInterface $translator)
-    {
-        $this->claroUtils = $claroUtils;
-        $this->translator = $translator;
-    }
-
     public function getName(): string
     {
         return 'audioresourcesectioncomment';
@@ -60,12 +45,8 @@ public function getIgnore(): array
      *     name="apiv2_audioresourcesectioncomment_list_comments"
      * )
      * @EXT\ParamConverter("user", converter="current_user", options={"allowAnonymous"=false})
-     *
-     * @param string $type
-     *
-     * @return JsonResponse
      */
-    public function sectionsCommentsListAction(ResourceNode $resourceNode, $type, Request $request)
+    public function sectionsCommentsListAction(ResourceNode $resourceNode, string $type, Request $request): JsonResponse
     {
         $params = $request->query->all();
 
@@ -79,49 +60,4 @@ public function sectionsCommentsListAction(ResourceNode $resourceNode, $type, Re
             $this->finder->search(SectionComment::class, $params)
         );
     }
-
-    /**
-     * @Route(
-     *     "/{resourceNode}/comments/csv",
-     *     name="apiv2_audioresourcesectioncomment_list_comments_csv"
-     * )
-     * @EXT\ParamConverter("user", converter="current_user", options={"allowAnonymous"=false})
-     *
-     * @return StreamedResponse
-     */
-    public function sectionsCommentsCsvExportAction(ResourceNode $resourceNode)
-    {
-        /** @var SectionComment[] $comments */
-        $comments = $this->finder->fetch(SectionComment::class, ['resourceNode' => $resourceNode->getUuid()]);
-        $dateStr = date('YmdHis');
-
-        return new StreamedResponse(function () use ($comments) {
-            $handle = fopen('php://output', 'w+');
-            fputcsv($handle, [
-                $this->translator->trans('user', [], 'platform'),
-                $this->translator->trans('section_start', [], 'audio'),
-                $this->translator->trans('section_end', [], 'audio'),
-                $this->translator->trans('creation_date', [], 'platform'),
-                $this->translator->trans('comment', [], 'platform'),
-            ], ';', '"');
-
-            foreach ($comments as $comment) {
-                fputcsv($handle, [
-                    $comment->getUser() ?
-                        $comment->getUser()->getFirstName().' '.$comment->getUser()->getLastName() :
-                        $this->translator->trans('anonymous', [], 'platform'),
-                    $comment->getSection()->getStart(),
-                    $comment->getSection()->getEnd(),
-                    $comment->getCreationDate()->format('Y-m-d h:i:s'),
-                    $this->claroUtils->html2Csv($comment->getContent(), true),
-                ], ';', '"');
-            }
-            fclose($handle);
-
-            return $handle;
-        }, 200, [
-            'Content-Type' => 'application/force-download',
-            'Content-Disposition' => 'attachment; filename="'.$resourceNode->getName().'_'.$dateStr.'.csv"',
-        ]);
-    }
 }
diff --git a/src/plugin/audio-player/Resources/config/services/controller.yml b/src/plugin/audio-player/Resources/config/services/controller.yml
index 79b482ed73f..e230347cd96 100644
--- a/src/plugin/audio-player/Resources/config/services/controller.yml
+++ b/src/plugin/audio-player/Resources/config/services/controller.yml
@@ -1,13 +1,10 @@
 services:
     _defaults:
-        public: true #because controller
+        public: true # because controller
 
     Claroline\AudioPlayerBundle\Controller\API\SectionCommentController:
         parent: Claroline\AppBundle\Controller\AbstractCrudController
         public: true
-        arguments:
-            - '@Claroline\CoreBundle\Library\Utilities\ClaroUtilities'
-            - '@translator'
 
     Claroline\AudioPlayerBundle\Controller\API\SectionController:
         parent: Claroline\AppBundle\Controller\AbstractCrudController
diff --git a/src/plugin/audio-player/Resources/modules/files/audio/components/player.jsx b/src/plugin/audio-player/Resources/modules/files/audio/components/player.jsx
index 426569b5696..010ae74d249 100644
--- a/src/plugin/audio-player/Resources/modules/files/audio/components/player.jsx
+++ b/src/plugin/audio-player/Resources/modules/files/audio/components/player.jsx
@@ -10,7 +10,7 @@ import {asset} from '#/main/app/config/asset'
 import {trans} from '#/main/app/intl/translation'
 import {actions as modalActions} from '#/main/app/overlays/modal/store'
 import {MODAL_CONFIRM} from '#/main/app/modals/confirm'
-import {CALLBACK_BUTTON, CallbackButton, DownloadButton} from '#/main/app/buttons'
+import {CALLBACK_BUTTON, CallbackButton} from '#/main/app/buttons'
 import {selectors as securitySelectors} from '#/main/app/security/store'
 import {makeId} from '#/main/core/scaffolding/id'
 import {selectors as fileSelect} from '#/main/core/resources/file/store'
@@ -249,14 +249,6 @@ class Audio extends Component {
                 {trans(this.state.displayAllComments ? 'display_my_comments' : 'display_all_comments', {}, 'audio')}
               </CallbackButton>
             }
-            <DownloadButton
-              className="btn"
-              file={{
-                url: ['apiv2_audioresourcesectioncomment_list_comments_csv', {resourceNode: this.props.resourceNodeId}]
-              }}
-            >
-              {trans('export_comments_to_csv', {}, 'audio')}
-            </DownloadButton>
           </div>
         }
 
diff --git a/src/plugin/audio-player/Resources/translations/audio.en.json b/src/plugin/audio-player/Resources/translations/audio.en.json
index 75264f03e4c..91ee17c4131 100644
--- a/src/plugin/audio-player/Resources/translations/audio.en.json
+++ b/src/plugin/audio-player/Resources/translations/audio.en.json
@@ -6,7 +6,6 @@
     "display_sections": "Display sections",
     "end": "End",
     "end_tolerance": "End tolerance",
-    "export_comments_to_csv": "Export comments (CSV)",
     "pause": "Pause",
     "play": "Play",
     "section_deletion": "Delete section",
diff --git a/src/plugin/audio-player/Resources/translations/audio.fr.json b/src/plugin/audio-player/Resources/translations/audio.fr.json
index 69386e5e87e..29e9de17452 100644
--- a/src/plugin/audio-player/Resources/translations/audio.fr.json
+++ b/src/plugin/audio-player/Resources/translations/audio.fr.json
@@ -6,7 +6,6 @@
     "display_sections": "Afficher les sections",
     "end": "Fin",
     "end_tolerance": "Tolérance de fin",
-    "export_comments_to_csv": "Exporter les commentaires (.csv)",
     "pause": "Pause",
     "play": "Play",
     "section_deletion": "Suppression de la section",
diff --git a/src/plugin/claco-form/Manager/ExportManager.php b/src/plugin/claco-form/Manager/ExportManager.php
index 3eec8d7f0ac..32b8862bdfc 100644
--- a/src/plugin/claco-form/Manager/ExportManager.php
+++ b/src/plugin/claco-form/Manager/ExportManager.php
@@ -151,7 +151,7 @@ public function exportEntries(ClacoForm $clacoForm)
                 $field = $fieldValue->getField();
                 $fieldFacetValue = $fieldValue->getFieldFacetValue();
 
-                $data[$field->getId()] = $this->formatFieldValue($entry, $field, $fieldFacetValue->getValue());
+                $data[$field->getId()] = $this->formatFieldValue($entry, $field, $fieldFacetValue->getValue(), true);
             }
 
             $entriesData[] = $data;
@@ -171,7 +171,7 @@ public function zipEntries($content, ClacoForm $clacoForm)
         $archive = new \ZipArchive();
         $pathArch = $this->tempManager->generate();
         $archive->open($pathArch, \ZipArchive::CREATE);
-        $archive->addFromString($clacoForm->getResourceNode()->getName().'.xls', $content);
+        $archive->addFromString(TextNormalizer::toKey($clacoForm->getResourceNode()->getName()).'.xls', $content);
 
         $entries = $this->clacoFormManager->getAllEntries($clacoForm);
 
@@ -191,7 +191,7 @@ public function zipEntries($content, ClacoForm $clacoForm)
                         $filePath = $this->filesDir.DIRECTORY_SEPARATOR.$fileUrl;
 
                         $ext = pathinfo($filePath, PATHINFO_EXTENSION);
-                        $fileName = TextNormalizer::toKey($entry->getTitle()).'-'.TextNormalizer::toKey($field->getLabel()).'.'.$ext;
+                        $fileName = TextNormalizer::toKey($entry->getTitle().'-'.$field->getLabel()).'.'.$ext;
 
                         $archive->addFile(
                             $filePath,
@@ -206,7 +206,7 @@ public function zipEntries($content, ClacoForm $clacoForm)
         return $pathArch;
     }
 
-    private function formatFieldValue(Entry $entry, Field $field, $value)
+    private function formatFieldValue(Entry $entry, Field $field, $value, ?bool $stripHtml = false)
     {
         if (is_null($value)) {
             return '';
@@ -232,16 +232,19 @@ private function formatFieldValue(Entry $entry, Field $field, $value)
                 break;
 
             case FieldFacet::HTML_TYPE:
-                // when present, those tags completely broke the pdf generation
-                $illegalTags = [
-                    '<o:p>',
-                    '</o:p>',
-                ];
-
-                foreach ($illegalTags as $illegalTag) {
-                    $value = str_replace($illegalTag, '', $value);
+                if ($stripHtml) {
+                    $value = TextNormalizer::stripHtml($value, true);
+                } else {
+                    // when present, those tags completely broke the pdf generation
+                    $illegalTags = [
+                        '<o:p>',
+                        '</o:p>',
+                    ];
+
+                    foreach ($illegalTags as $illegalTag) {
+                        $value = str_replace($illegalTag, '', $value);
+                    }
                 }
-
                 break;
 
             case FieldFacet::CASCADE_TYPE:
diff --git a/src/plugin/exo/Library/Item/Definition/AnswerableItemDefinitionInterface.php b/src/plugin/exo/Library/Item/Definition/AnswerableItemDefinitionInterface.php
index 34068ec6b5d..e15b0a79aea 100644
--- a/src/plugin/exo/Library/Item/Definition/AnswerableItemDefinitionInterface.php
+++ b/src/plugin/exo/Library/Item/Definition/AnswerableItemDefinitionInterface.php
@@ -40,7 +40,7 @@ public function correctAnswer(AbstractItem $question, $answer);
     public function expectAnswer(AbstractItem $question);
 
     /**
-     * Returns all the defined answers of a the question.
+     * Returns all the defined answers of the question.
      *
      * @return AnswerPartInterface[]
      */
diff --git a/src/plugin/exo/Manager/ExerciseManager.php b/src/plugin/exo/Manager/ExerciseManager.php
index 5621c08a4b6..128102cbdf7 100644
--- a/src/plugin/exo/Manager/ExerciseManager.php
+++ b/src/plugin/exo/Manager/ExerciseManager.php
@@ -3,8 +3,7 @@
 namespace UJM\ExoBundle\Manager;
 
 use Claroline\AppBundle\Persistence\ObjectManager;
-use Claroline\CoreBundle\Library\Utilities\ClaroUtilities;
-use Claroline\CoreBundle\Manager\ResourceManager;
+use Claroline\CoreBundle\Library\Normalizer\TextNormalizer;
 use Claroline\CoreBundle\Validator\Exception\InvalidDataException;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use UJM\ExoBundle\Entity\Attempt\Paper;
@@ -24,47 +23,21 @@
 
 class ExerciseManager
 {
-    /** @var ObjectManager */
-    private $om;
+    private ObjectManager $om;
+    private ExerciseRepository $repository;
+    private ExerciseValidator $validator;
+    private ExerciseSerializer $serializer;
+    private ItemManager $itemManager;
+    private PaperManager $paperManager;
+    private ItemDefinitionsCollection $definitions;
+    private EventDispatcherInterface $eventDispatcher;
 
-    /** @var ExerciseRepository */
-    private $repository;
-
-    /** @var ExerciseValidator */
-    private $validator;
-
-    /** @var ExerciseSerializer */
-    private $serializer;
-
-    /** @var ResourceManager */
-    private $resourceManager;
-
-    /** @var ItemManager */
-    private $itemManager;
-
-    /** @var PaperManager */
-    private $paperManager;
-
-    /** @var ClaroUtilities */
-    private $utils;
-
-    /** @var ItemDefinitionsCollection */
-    private $definitions;
-
-    /** @var EventDispatcherInterface */
-    private $eventDispatcher;
-
-    /**
-     * ExerciseManager constructor.
-     */
     public function __construct(
         ObjectManager $om,
         ExerciseValidator $validator,
         ExerciseSerializer $serializer,
-        ResourceManager $resourceManager,
         ItemManager $itemManager,
         PaperManager $paperManager,
-        ClaroUtilities $utils,
         ItemDefinitionsCollection $definitions,
         EventDispatcherInterface $eventDispatcher
     ) {
@@ -72,22 +45,16 @@ public function __construct(
         $this->repository = $this->om->getRepository(Exercise::class);
         $this->validator = $validator;
         $this->serializer = $serializer;
-        $this->resourceManager = $resourceManager;
         $this->itemManager = $itemManager;
         $this->paperManager = $paperManager;
         $this->definitions = $definitions;
-        $this->utils = $utils;
         $this->eventDispatcher = $eventDispatcher;
     }
 
     /**
      * Validates and updates an Exercise entity with raw data.
-     *
-     * @return Exercise
-     *
-     * @throws InvalidDataException
      */
-    public function update(Exercise $exercise, array $data)
+    public function update(Exercise $exercise, array $data): Exercise
     {
         // Validate received data
         $validationOptions = [];
@@ -114,7 +81,7 @@ public function update(Exercise $exercise, array $data)
         $this->repository->invalidatePapers($exercise);
 
         // Log exercise update
-        $event = new LogExerciseUpdateEvent($exercise, (array) $this->serializer->serialize($exercise));
+        $event = new LogExerciseUpdateEvent($exercise, $this->serializer->serialize($exercise));
         $this->eventDispatcher->dispatch($event, 'log');
 
         return $exercise;
@@ -122,10 +89,8 @@ public function update(Exercise $exercise, array $data)
 
     /**
      * Serializes an Exercise.
-     *
-     * @return array
      */
-    public function serialize(Exercise $exercise, array $options = [])
+    public function serialize(Exercise $exercise, array $options = []): array
     {
         return $this->serializer->serialize($exercise, $options);
     }
@@ -133,10 +98,8 @@ public function serialize(Exercise $exercise, array $options = [])
     /**
      * Checks if an Exercise can be deleted.
      * The exercise needs to be unpublished or have no paper to be safely removed.
-     *
-     * @return bool
      */
-    public function isDeletable(Exercise $exercise)
+    public function isDeletable(Exercise $exercise): bool
     {
         return ExerciseType::CERTIFICATION !== $exercise->getType()
             || !$exercise->getResourceNode()->isPublished()
@@ -161,7 +124,7 @@ public function exportPapersToCsv(Exercise $exercise)
             foreach ($papers as $paper) {
                 $user = $paper->getUser();
                 // maybe use stored score to speed up things
-                // problem is we don't have it for non finished papers
+                // problem is we don't have it for non-finished papers
                 $score = $this->paperManager->calculateScore($paper);
 
                 fputcsv($handle, [
@@ -176,7 +139,7 @@ public function exportPapersToCsv(Exercise $exercise)
                 ], ';');
             }
 
-            $this->om->clear(Paper::class);
+            $this->om->clear();
         }
 
         fclose($handle);
@@ -216,7 +179,7 @@ public function exportResultsToCsv(Exercise $exercise, $output = null)
 
         foreach ($titles as $title) {
             foreach ($title as $subTitle) {
-                $flattenedTitles[] = $this->utils->html2Csv($subTitle);
+                $flattenedTitles[] = TextNormalizer::stripHtml($subTitle);
             }
         }
 
@@ -282,7 +245,7 @@ public function exportResultsToCsv(Exercise $exercise, $output = null)
                         }
                     }
 
-                    // question has no answer, we need to add place holders
+                    // question has no answer, we need to add placeholders
                     if (!$found) {
                         $countBlank = count($itemDefinition->getCsvTitles($item->getInteraction()));
                         $csv[$item->getUuid()] = array_pad([], $countBlank, '');
@@ -300,14 +263,14 @@ public function exportResultsToCsv(Exercise $exercise, $output = null)
                 foreach ($paper as $paperItem) {
                     if (is_array($paperItem)) {
                         foreach ($paperItem as $paperEl) {
-                            $flattenedAnswers[] = $this->utils->html2Csv($paperEl, true);
+                            $flattenedAnswers[] = TextNormalizer::stripHtml($paperEl, true);
                         }
                     }
                 }
                 $flattenedData[] = $flattenedAnswers;
             }
 
-            $this->om->clear(Paper::class);
+            $this->om->clear();
 
             foreach ($flattenedData as $item) {
                 fputcsv($fp, $item, ';');
diff --git a/src/plugin/exo/Resources/config/services/manager.yml b/src/plugin/exo/Resources/config/services/manager.yml
index c9ed91a1500..339f445a164 100644
--- a/src/plugin/exo/Resources/config/services/manager.yml
+++ b/src/plugin/exo/Resources/config/services/manager.yml
@@ -1,7 +1,5 @@
 services:
     _defaults:
-        autowire: false #change to true
-        autoconfigure: false
         public: true
 
     UJM\ExoBundle\Manager\Attempt\AnswerManager:
@@ -65,9 +63,7 @@ services:
             - '@Claroline\AppBundle\Persistence\ObjectManager'
             - '@UJM\ExoBundle\Validator\JsonSchema\ExerciseValidator'
             - '@ujm_exo.serializer.exercise'
-            - '@Claroline\CoreBundle\Manager\ResourceManager'
             - '@UJM\ExoBundle\Manager\Item\ItemManager'
             - '@UJM\ExoBundle\Manager\Attempt\PaperManager'
-            - '@Claroline\CoreBundle\Library\Utilities\ClaroUtilities'
             - '@ujm_exo.collection.item_definitions'
             - '@event_dispatcher'