MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #601 from fermionic/20130204-100-percent-CPU-usage-on-xmlify

Browse source 
move mb_strlen call out of for loop definition
This commit is contained in:
fermionic 2013-02-06 21:38:15 -08:00
parent b00426c9fb c886927a52
commit a0e18a0ff8
1 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
include/text.php
View file

@ -173,10 +173,11 @@ function autoname($len) {
if(! function_exists('xmlify')) { if(! function_exists('xmlify')) {
function xmlify($str) { function xmlify($str) {
$buffer = ''; /* $buffer = '';
for($x = 0; $x < mb_strlen($str); $x ++) { $len = mb_strlen($str);
$char = $str[$x]; for($x = 0; $x < $len; $x ++) {
$char = mb_substr($str,$x,1);
switch( $char ) { switch( $char ) {
@ -204,7 +205,14 @@ function xmlify($str) {
$buffer .= $char; $buffer .= $char;
break; break;
} }
} }*/
$buffer = mb_ereg_replace("&", "&amp;", $str);
$buffer = mb_ereg_replace("'", "&apos;", $buffer);
$buffer = mb_ereg_replace("\"", "&quot;", $buffer);
$buffer = mb_ereg_replace("<", "&lt;", $buffer);
$buffer = mb_ereg_replace(">", "&gt;", $buffer);
$buffer = trim($buffer); $buffer = trim($buffer);
return($buffer); return($buffer);
}} }}
@ -214,8 +222,13 @@ function xmlify($str) {
if(! function_exists('unxmlify')) { if(! function_exists('unxmlify')) {
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);
$ret = mb_ereg_replace('&amp;', '&', $s);
$ret = mb_ereg_replace('&apos;', "'", $ret);
$ret = mb_ereg_replace('&quot;', '"', $ret);
$ret = mb_ereg_replace('&lt;', "<", $ret);
$ret = mb_ereg_replace('&gt;', ">", $ret);
return $ret; return $ret;
}} }}