Skip to content

Commit

Permalink
Merge pull request #12 from tomolimo/9.4/bugfixes
Browse files Browse the repository at this point in the history
Fixes typo
  • Loading branch information
tomolimo authored Jul 3, 2019
2 parents b02004c + 934709f commit 68f00f8
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 7 deletions.
11 changes: 10 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
6 changes: 4 additions & 2 deletions hook.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 );
Expand Down
2 changes: 1 addition & 1 deletion setup.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions ticketcleaner.xml
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,15 @@ This plugin adds the possibility to translate it 'inline', see wiki.]]></en>
<compatibility>9.1</compatibility>
</version>
<version>
<num>2.3.3</num>
<num>2.3.4</num>
<compatibility>9.2</compatibility>
</version>
<version>
<num>2.4.0</num>
<num>2.4.1</num>
<compatibility>9.3</compatibility>
</version>
<version>
<num>2.5.0</num>
<num>2.5.1</num>
<compatibility>9.4</compatibility>
</version>
</versions>
Expand Down

0 comments on commit 68f00f8

Please sign in to comment.