diff --git a/core/Controllers/HistoryController.php b/core/Controllers/HistoryController.php index 28e8e563dca68f65e034f2da15c5ef72f4bc1820..02a20b02620eed4935604e095bac2b9fe921d33f 100644 --- a/core/Controllers/HistoryController.php +++ b/core/Controllers/HistoryController.php @@ -187,7 +187,7 @@ class HistoryController $formatter = new \functions(); $logLine = $formatter->wash_html($logLine, ''); - $logLine = self::wd_remove_accents($logLine); + $logLine = self::wd_remove_accents(['string' => $logLine]); HistoryModel::writeLog([ 'logger' => $logger, @@ -204,9 +204,14 @@ class HistoryController * * @return string $str */ - public static function wd_remove_accents($str, $charset ='utf-8') + public static function wd_remove_accents(array $aArgs = []) { - $str = htmlentities($str, ENT_NOQUOTES, "utf-8"); + if(empty($aArgs['charset'])){ + $aArgs['charset'] = 'utf-8'; + } + $charset = $aArgs['charset']; + + $str = htmlentities($aArgs['string'], ENT_NOQUOTES, $charset); $str = preg_replace( '#\&([A-za-z])(?:uml|circ|tilde|acute|grave|cedil|ring)\;#', diff --git a/sonar-project.properties b/sonar-project.properties index b85c16d9d7378e2a8c7f495d3abf5d62f16bc5ad..fb424016517e128bef02f5c5f66c46a042765ebb 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectVersion=1.0 # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows. # This property is optional if sonar.modules is set. -sonar.sources=core/Models , core/Controllers , apps/maarch_entreprise/Models , modules/visa/Models , modules/visa/Controllers , modules/attachments/Controllers , modules/attachments/Models , modules/basket/Models , modules/entities/Controllers , modules/entities/Models , modules/notes/Models +sonar.sources=core/Models , core/Controllers , apps/maarch_entreprise/Models , modules/visa/Models , modules/visa/Controllers , modules/attachments/Controllers , modules/attachments/Models , modules/basket/Models , modules/entities/Controllers , modules/entities/Models , modules/notes/Models , modules/notifications/Controllers , modules/notifications/Models # Encoding of the source code. Default is default system encoding #sonar.sourceEncoding=UTF-8