GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Janrain OpenID extlib updated

Browse Source 
From their tree on a4090d0b30f850044413630333341cd327cbb55a
Source: https://github.com/openid/php-openid
This commit is contained in:
Mikael Nordfeldth
2015-07-05 23:07:41 +02:00
parent 3b6a424c9f
commit ed3022adc1
10 changed files with 42 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
extlib/Auth/Yadis/ParseHTML.php
View File

@@ -65,29 +65,6 @@ class Auth_Yadis_ParseHTML {
$this->_entity_replacements));
}
/**
* Replace HTML entities (amp, lt, gt, and quot) as well as
* numeric entities (e.g. #x9f;) with their actual values and
* return the new string.
*
* @access private
* @param string $str The string in which to look for entities
* @return string $new_str The new string entities decoded
*/
function replaceEntities($str)
{
foreach ($this->_entity_replacements as $old => $new) {
$str = preg_replace(sprintf("/&%s;/", $old), $new, $str);
}
// Replace numeric entities because html_entity_decode doesn't
// do it for us.
$str = preg_replace('~&#x([0-9a-f]+);~ei', 'chr(hexdec("\\1"))', $str);
$str = preg_replace('~&#([0-9]+);~e', 'chr(\\1)', $str);
return $str;
}
/**
* Strip single and double quotes off of a string, if they are
* present.
@@ -216,7 +193,7 @@ class Auth_Yadis_ParseHTML {
$link_attrs = array();
foreach ($attr_matches[0] as $index => $full_match) {
$name = $attr_matches[1][$index];
$value = $this->replaceEntities(
$value = html_entity_decode(
$this->removeQuotes($attr_matches[2][$index]));
$link_attrs[strtolower($name)] = $value;