Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
MaarchCourrier
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Redmine
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Harbor Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Maarch
MaarchCourrier
Commits
85d86b70
Commit
85d86b70
authored
7 years ago
by
Florian Azizian
Browse files
Options
Downloads
Patches
Plain Diff
FEAT #5661 status administration MVC => historique
parent
c9b71a3f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
core/Controllers/HistoryController.php
+8
-3
8 additions, 3 deletions
core/Controllers/HistoryController.php
sonar-project.properties
+1
-1
1 addition, 1 deletion
sonar-project.properties
with
9 additions
and
4 deletions
core/Controllers/HistoryController.php
+
8
−
3
View file @
85d86b70
...
@@ -187,7 +187,7 @@ class HistoryController
...
@@ -187,7 +187,7 @@ class HistoryController
$formatter
=
new
\functions
();
$formatter
=
new
\functions
();
$logLine
=
$formatter
->
wash_html
(
$logLine
,
''
);
$logLine
=
$formatter
->
wash_html
(
$logLine
,
''
);
$logLine
=
self
::
wd_remove_accents
(
$logLine
);
$logLine
=
self
::
wd_remove_accents
(
[
'string'
=>
$logLine
]
);
HistoryModel
::
writeLog
([
HistoryModel
::
writeLog
([
'logger'
=>
$logger
,
'logger'
=>
$logger
,
...
@@ -204,9 +204,14 @@ class HistoryController
...
@@ -204,9 +204,14 @@ class HistoryController
*
*
* @return string $str
* @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
(
$str
=
preg_replace
(
'#\&([A-za-z])(?:uml|circ|tilde|acute|grave|cedil|ring)\;#'
,
'#\&([A-za-z])(?:uml|circ|tilde|acute|grave|cedil|ring)\;#'
,
...
...
This diff is collapsed.
Click to expand it.
sonar-project.properties
+
1
−
1
View file @
85d86b70
...
@@ -6,7 +6,7 @@ sonar.projectVersion=1.0
...
@@ -6,7 +6,7 @@ sonar.projectVersion=1.0
# Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows.
# Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows.
# This property is optional if sonar.modules is set.
# 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
# Encoding of the source code. Default is default system encoding
#sonar.sourceEncoding=UTF-8
#sonar.sourceEncoding=UTF-8
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment