Code styling: Remove deprecated $charset param for api_htmlentities() (2)

public/main/dashboard/block.class.php

@@ -25,10 +25,9 @@ class Block
         $closeLink = '<a class="btn btn-danger btn-xs" onclick="javascript:if(!confirm(\''.addslashes(
                 api_htmlentities(
                     get_lang('Please confirm your choice'),
-                    ENT_QUOTES,
-                    $charset
+                    ENT_QUOTES
                 )
-            ).'\')) return false;" href="index.php?action=disable_block&path='.$this->path.'"> 
+            ).'\')) return false;" href="index.php?action=disable_block&path='.$this->path.'">
                 <em class="fa fa-times"></em>
             </a>';
 

public/main/exercise/exercise.class.php

@@ -9085,8 +9085,7 @@ class Exercise
                                             addslashes(
                                                 api_htmlentities(
                                                     get_lang('Are you sure to delete results'),
-                                                    ENT_QUOTES,
-                                                    $charset
+                                                    ENT_QUOTES
                                                 )
                                             )." ".addslashes($title)."?"."')) return false;",
                                         'href' => 'exercise.php?'.api_get_cidreq(

public/main/inc/lib/display.lib.php

@@ -462,8 +462,7 @@ class Display
         if ($filter) {
             $message = api_htmlentities(
                 $message,
-                ENT_QUOTES,
-                api_is_xml_http_request() ? 'UTF-8' : api_get_system_encoding()
+                ENT_QUOTES
             );
         }
 

public/main/inc/lib/security.lib.php

@@ -459,7 +459,7 @@ class Security
                 if (!empty($list)) {
                     foreach ($list as $term) {
                         $term = str_replace(["\r\n", "\r", "\n", "\t"], '', $term);
-                        $html_entities_value = api_htmlentities($term, ENT_QUOTES, api_get_system_encoding());
+                        $html_entities_value = api_htmlentities($term, ENT_QUOTES);
                         $bad_terms[] = $term;
                         if ($term != $html_entities_value) {
                             $bad_terms[] = $html_entities_value;

public/main/lp/openoffice_presentation.class.php

@@ -40,7 +40,7 @@ class OpenofficePresentation extends OpenofficeDocument
             list($slide_name, $file_name, $slide_body) = explode('||', $file);
             // Filename is utf8 encoded, but when we decode, some chars are not translated (like quote ’).
             // so we remove these chars by translating it in htmlentities and the reconvert it in want charset.
-            $slide_name = api_htmlentities($slide_name, ENT_COMPAT, $this->original_charset);
+            $slide_name = api_htmlentities($slide_name, ENT_COMPAT);
             $slide_name = str_replace('’', '\'', $slide_name);
             $slide_name = api_convert_encoding($slide_name, api_get_system_encoding(), $this->original_charset);
             $slide_name = api_html_entity_decode($slide_name, ENT_COMPAT, api_get_system_encoding());
@@ -247,7 +247,7 @@ class OpenofficePresentation extends OpenofficeDocument
         foreach ($files as $file) {
             // '||' is used as separator between slide name (with accents) and file name (without accents).
             list($slide_name, $file_name) = explode('||', $file);
-            $slide_name = api_htmlentities($slide_name, ENT_COMPAT, $this->original_charset);
+            $slide_name = api_htmlentities($slide_name, ENT_COMPAT);
             $slide_name = str_replace('’', '\'', $slide_name);
             $slide_name = api_convert_encoding($slide_name, api_get_system_encoding(), $this->original_charset);
             $slide_name = api_html_entity_decode($slide_name, ENT_COMPAT, api_get_system_encoding());

public/main/lp/openoffice_text.class.php

@@ -57,7 +57,7 @@ class OpenofficeText extends OpenofficeDocument
         // The file is utf8 encoded and it seems to make problems with special quotes.
         // Then we htmlentities that, we replace these quotes and html_entity_decode that in good charset.
         $charset = api_get_system_encoding();
-        $content = api_htmlentities($content, ENT_COMPAT, $this->original_charset);
+        $content = api_htmlentities($content, ENT_COMPAT);
         $content = str_replace('’', '\'', $content);
         $content = api_convert_encoding($content, $charset, $this->original_charset);
         $content = str_replace($this->original_charset, $charset, $content);

public/main/lp/openoffice_text_document.class.php

@@ -56,7 +56,7 @@ class OpenOfficeTextDocument extends OpenofficeDocument
         // The file is utf8 encoded and it seems to make problems with special quotes.
         // then we htmlentities that, we replace these quotes and html_entity_decode that in good charset.
         $charset = api_get_system_encoding();
-        $content = api_htmlentities($content, ENT_COMPAT, $this->original_charset);
+        $content = api_htmlentities($content, ENT_COMPAT);
         $content = str_replace('’', '\'', $content);
         $content = api_convert_encoding($content, $charset, $this->original_charset);
         $content = str_replace($this->original_charset, $charset, $content);