From 85d86b70113a36f72dafba8b60618a15847d3b21 Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Wed, 5 Jul 2017 17:01:57 +0100
Subject: [PATCH] FEAT #5661 status administration MVC => historique
---
core/Controllers/HistoryController.php | 11 ++++++++---
sonar-project.properties | 2 +-
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/core/Controllers/HistoryController.php b/core/Controllers/HistoryController.php
index 28e8e563dca..02a20b02620 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 b85c16d9d73..fb424016517 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
--
GitLab