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

acl encoding issues

Browse Source
This commit is contained in:
zotlabs 2017-10-23 17:52:17 -07:00
parent e67ff5c122
commit 52c1f79f2e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Zotlabs/Daemon/Notifier.php
View File

@ -433,7 +433,7 @@ class Notifier {
$env_recips = (($private) ? array() : null); $env_recips = (($private) ? array() : null);
$details = q("select xchan_hash, xchan_instance_url, xchan_network, xchan_addr, xchan_guid, xchan_guid_sig from xchan where xchan_hash in (" . implode(',',$recipients) . ")"); $details = q("select xchan_hash, xchan_instance_url, xchan_network, xchan_addr, xchan_guid, xchan_guid_sig from xchan where xchan_hash in (" . protect_sprintf(implode(',',$recipients)) . ")");
$recip_list = array(); $recip_list = array();
@ -500,7 +500,7 @@ class Notifier {
// Now we have collected recipients (except for external mentions, FIXME) // Now we have collected recipients (except for external mentions, FIXME)
// Let's reduce this to a set of hubs; checking that the site is not dead. // Let's reduce this to a set of hubs; checking that the site is not dead.
$r = q("select hubloc.*, site.site_crypto, site.site_flags from hubloc left join site on site_url = hubloc_url where hubloc_hash in (" . implode(',',$recipients) . ") $r = q("select hubloc.*, site.site_crypto, site.site_flags from hubloc left join site on site_url = hubloc_url where hubloc_hash in (" . protect_sprintf(implode(',',$recipients)) . ")
and hubloc_error = 0 and hubloc_deleted = 0 and ( site_dead = 0 OR site_dead is null ) " and hubloc_error = 0 and hubloc_deleted = 0 and ( site_dead = 0 OR site_dead is null ) "
); );

2
include/text.php
View File

@ -2846,7 +2846,7 @@ function item_url_replace($channel,&$item,$old,$new,$oldnick = '') {
*/ */
function sanitise_acl(&$item) { function sanitise_acl(&$item) {
if (strlen($item)) if (strlen($item))
$item = '<' . notags(trim($item)) . '>'; $item = '<' . notags(trim(urldecode($item))) . '>';
else else
unset($item); unset($item);
} }