harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'xmlify' into 'dev'

Browse Source 
address xmlify/unxmlify performance issue

See merge request hubzilla/core!1616
This commit is contained in:
Max Kostikov 2019-05-01 16:41:19 +02:00
commit fa2f3d136f
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/text.php
View File

@ -409,7 +409,8 @@ function autoname($len) {
* @return string Escaped text. * @return string Escaped text.
*/ */
function xmlify($str) { function xmlify($str) {
$buffer = '';
//$buffer = '';
if(is_array($str)) { if(is_array($str)) {
@ -418,7 +419,7 @@ function xmlify($str) {
btlogger('xmlify called with array: ' . print_r($str,true), LOGGER_NORMAL, LOG_WARNING); btlogger('xmlify called with array: ' . print_r($str,true), LOGGER_NORMAL, LOG_WARNING);
} }
/*
$len = mb_strlen($str); $len = mb_strlen($str);
for($x = 0; $x < $len; $x ++) { for($x = 0; $x < $len; $x ++) {
$char = mb_substr($str,$x,1); $char = mb_substr($str,$x,1);
@ -452,6 +453,11 @@ function xmlify($str) {
$buffer = trim($buffer); $buffer = trim($buffer);
return($buffer); return($buffer);
*/
$buffer = htmlspecialchars($str, ENT_QUOTES, "UTF-8");
$buffer = trim($buffer);
return $buffer;
} }
/** /**
@ -464,9 +470,13 @@ function xmlify($str) {
* @return string * @return string
*/ */
function unxmlify($s) { function unxmlify($s) {
/*
$ret = str_replace('&amp;', '&', $s); $ret = str_replace('&amp;', '&', $s);
$ret = str_replace(array('&lt;', '&gt;', '&quot;', '&apos;'), array('<', '>', '"', "'"), $ret); $ret = str_replace(array('&lt;', '&gt;', '&quot;', '&apos;'), array('<', '>', '"', "'"), $ret);
return $ret;
*/
$ret = htmlspecialchars_decode($s, ENT_QUOTES);
return $ret; return $ret;
} }