From 934709fdc5afd5e21b2c4755a944d90c0ade5724 Mon Sep 17 00:00:00 2001 From: tomolimo Date: Wed, 3 Jul 2019 08:56:20 +0200 Subject: [PATCH] Fixes typo --- README.md | 11 ++++++++++- hook.php | 6 ++++-- setup.php | 2 +- ticketcleaner.xml | 6 +++--- 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index cd358a3..4652284 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ New home for Ticket Cleaner GLPi plugin Currently mirrors https://forge.glpi-project.org/projects/ticketcleaner -# Release 2.1.0 +## 2.1.0 Beware that, when upgrading from a version lower than 2.0.0, this new release will not keep your existing filters. You'll have to input them again with the new interface that permits to edit them directly into GLPi. Your former filters will be copied into a backup table that you may edit via your preferred mySQL query editor (table name is `backup_glpi_plugin_ticketcleaner_filters`). You'll have to combine your former filters to get the new ones that will be entered into the new table, or to create new one from scratch. @@ -37,8 +37,17 @@ Remove functions for 9.1 compatibility Compatibility with GLPI 9.2 Fixed issue with the \r\n +## 2.3.4 +Typo fix + ## 2.4.0 Compatibility with GLPI 9.3 +## 2.4.1 +Typo fix + ## 2.5.0 Compatibility with GLPI 9.4 + +## 2.5.1 +Typo fix diff --git a/hook.php b/hook.php index 3d6b31b..0b3379d 100644 --- a/hook.php +++ b/hook.php @@ -220,7 +220,9 @@ public static function cleanText($parm) { if ($is_content && isset($filters[ PluginTicketcleanerFilter::DESCRIPTION_TYPE ])) { $temp_content = $parm->input['content']; - + if (isset($_SESSION['glpi_use_mode']) && ($_SESSION['glpi_use_mode'] == Session::DEBUG_MODE)) { + Toolbox::logInFile('TicketCleaner', "\tInitial text content: " . $temp_content . "\n" ); + } //////////////////// // GLPI fixes // cases of the " that are converted into '; instead of " in GLPI 9.2, 9.3 and 9.4 @@ -232,7 +234,7 @@ public static function cleanText($parm) { $temp_content = Toolbox::unclean_cross_side_scripting_deep($temp_content); $temp_content = Toolbox::stripslashes_deep($temp_content); if (isset($_SESSION['glpi_use_mode']) && ($_SESSION['glpi_use_mode'] == Session::DEBUG_MODE)) { - Toolbox::logInFile('TicketCleaner', "\tInitial text content: " . $temp_content . "\n" ); + Toolbox::logInFile('TicketCleaner', "\tText content after un-sanitize: " . $temp_content . "\n" ); } foreach ($filters[ PluginTicketcleanerFilter::DESCRIPTION_TYPE ] as $ptn) { $temp_content = preg_replace( $ptn['regex'], $ptn['replacement'], $temp_content ); diff --git a/setup.php b/setup.php index e2de581..a05faae 100644 --- a/setup.php +++ b/setup.php @@ -8,7 +8,7 @@ // and it cleans attached pictures to emails // It has been succesfully tested with plain TEXT and HTML emails // ---------------------------------------------------------------------- -define ("PLUGIN_TICKETCLEANER_VERSION", "2.5.0"); +define ("PLUGIN_TICKETCLEANER_VERSION", "2.5.1"); /** * Summary of plugin_init_ticketcleaner diff --git a/ticketcleaner.xml b/ticketcleaner.xml index 90a9ced..806b3f3 100644 --- a/ticketcleaner.xml +++ b/ticketcleaner.xml @@ -53,15 +53,15 @@ This plugin adds the possibility to translate it 'inline', see wiki.]]> 9.1 - 2.3.3 + 2.3.4 9.2 - 2.4.0 + 2.4.1 9.3 - 2.5.0 + 2.5.1 9.4