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

Merge pull request #1680 from annando/issue-1642-again

Browse source 
Just some more fixing for issue 1642
This commit is contained in:
fabrixxm 2015-06-23 09:09:29 +02:00
commit 2076b95179
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/text.php
View file

@ -220,7 +220,7 @@ function xmlify($str) {
$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 = htmlspecialchars($str, ENT_QUOTES, "UTF-8");
$buffer = trim($buffer); $buffer = trim($buffer);
return($buffer); return($buffer);

6
mod/ping.php
View file

@ -167,6 +167,9 @@ function ping_init(&$a) {
require_once("mod/proxy.php"); require_once("mod/proxy.php");
$photo = proxy_url($photo); $photo = proxy_url($photo);
$message = html_entity_decode($message, ENT_COMPAT | ENT_HTML401, "UTF-8");
$name = html_entity_decode($name, ENT_COMPAT | ENT_HTML401, "UTF-8");
// Are the nofications calles from the regular process or via the friendica app? // Are the nofications calles from the regular process or via the friendica app?
$regularnotifications = (intval($_GET['uid']) AND intval($_GET['_'])); $regularnotifications = (intval($_GET['uid']) AND intval($_GET['_']));
@ -175,10 +178,9 @@ function ping_init(&$a) {
if ($a->is_friendica_app() OR !$regularnotifications) if ($a->is_friendica_app() OR !$regularnotifications)
$message = str_replace("{0}", $name, $message); $message = str_replace("{0}", $name, $message);
$data = array('href' => &$href, 'name' => &$name, 'url'=>&$url, 'photo'=>&$photo, 'date'=>&$date, 'seen'=>&$seen, 'messsage'=>&$message); $data = array('href' => &$href, 'name' => &$name, 'url'=>&$url, 'photo'=>&$photo, 'date'=>&$date, 'seen'=>&$seen, 'messsage'=>&$message);
call_hooks('ping_xmlize', $data); call_hooks('ping_xmlize', $data);
$notsxml = '<note href="%s" name="%s" url="%s" photo="%s" date="%s" seen="%s" >%s</note>'; $notsxml = '<note href="%s" name="%s" url="%s" photo="%s" date="%s" seen="%s" >%s</note>'."\n";
return sprintf ( $notsxml, return sprintf ( $notsxml,
xmlify($href), xmlify($name), xmlify($url), xmlify($photo), xmlify($date), xmlify($seen), xmlify($message) xmlify($href), xmlify($name), xmlify($url), xmlify($photo), xmlify($date), xmlify($seen), xmlify($message)
); );