keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #899 from fabrixxm/issue_898

Browse source 
use htmlspecialchars in xmlify and htmlspecialchars_decode in unxmlify
This commit is contained in:
fabrixxm 2014-01-21 23:42:04 -08:00
commit e312b734ca
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/text.php
View file

@ -218,14 +218,16 @@ function xmlify($str) {
break; break;
} }
}*/ }*/
/*
$buffer = mb_ereg_replace("&", "&", $str); $buffer = mb_ereg_replace("&", "&", $str);
$buffer = mb_ereg_replace("'", "'", $buffer); $buffer = mb_ereg_replace("'", "'", $buffer);
$buffer = mb_ereg_replace("\"", """, $buffer); $buffer = mb_ereg_replace('"', """, $buffer);
$buffer = mb_ereg_replace("<", "&lt;", $buffer); $buffer = mb_ereg_replace("<", "&lt;", $buffer);
$buffer = mb_ereg_replace(">", "&gt;", $buffer); $buffer = mb_ereg_replace(">", "&gt;", $buffer);
*/
$buffer = htmlspecialchars($str, ENT_QUOTES);
$buffer = trim($buffer); $buffer = trim($buffer);
return($buffer); return($buffer);
}} }}
@ -238,11 +240,13 @@ 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('&amp;', '&', $s);
$ret = mb_ereg_replace('&apos;', "'", $ret); $ret = mb_ereg_replace('&apos;', "'", $ret);
$ret = mb_ereg_replace('&quot;', '"', $ret); $ret = mb_ereg_replace('&quot;', '"', $ret);
$ret = mb_ereg_replace('&lt;', "<", $ret); $ret = mb_ereg_replace('&lt;', "<", $ret);
$ret = mb_ereg_replace('&gt;', ">", $ret); $ret = mb_ereg_replace('&gt;', ">", $ret);
*/
$ret = htmlspecialchars_decode($s, ENT_QUOTES);
return $ret; return $ret;
}} }}