hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-24 02:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

PHRAS-2748_bad-chars-cterms_4.1

Browse Source 
fix : remove bad ascii chars (0...31 except tab; cr; lf) from cterms values
todo ? : also cleanup bad chars from prod/editing and api/editing ?
This commit is contained in:
Jean-Yves Gaulier
2019-11-05 17:59:03 +01:00
parent 28c55ddf7a
commit da532cc36a
2 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/Alchemy/Phrasea/SearchEngine/Elastic/StringUtils.php
View File

@@ -63,4 +63,26 @@ class StringUtils
return self::$transliterator->transliterate($string); return self::$transliterator->transliterate($string);
} }
/**
* replace bad chars (ascii 0...31 except 9,10,13)
*
* @param $s
* @param string $replace
* @return mixed
*/
public static function substituteCtrlCharacters($s, $replace = '_')
{
static $bad_chars = null;
if($bad_chars === null) {
$bad_chars = [];
for($i=0; $i<32; $i++) {
if($i != 9 && $i != 10 && $i != 13) {
$bad_chars[] = chr($i);
}
}
}
return str_replace($bad_chars, $replace, $s);
}
} }

1
lib/Alchemy/Phrasea/SearchEngine/Elastic/Thesaurus/CandidateTerms.php
View File

@@ -32,6 +32,7 @@ class CandidateTerms
public function insert($field, $value) public function insert($field, $value)
{ {
$value = StringUtils::substituteCtrlCharacters($value, '');
$this->ensureVisitorSetup(); $this->ensureVisitorSetup();
if (!$this->visitor->hasTerm($field, $value)) { if (!$this->visitor->hasTerm($field, $value)) {
$this->new_candidates[$value] = $field; $this->new_candidates[$value] = $field;