diff options
| author | zotlabs <mike@macgirvin.com> | 2017-10-23 17:52:17 -0700 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2017-10-24 10:26:23 +0200 |
| commit | ccc8ff107e61de0fb86961f406bebd67348119b6 (patch) | |
| tree | 7744aa6fa2e3ab95783dbe117744906df9da8219 | |
| parent | 2c07a92ad7961e345a93d8c18043c6213c3e974c (diff) | |
| download | volse-hubzilla-ccc8ff107e61de0fb86961f406bebd67348119b6.tar.gz volse-hubzilla-ccc8ff107e61de0fb86961f406bebd67348119b6.tar.bz2 volse-hubzilla-ccc8ff107e61de0fb86961f406bebd67348119b6.zip | |
acl encoding issues
| -rw-r--r-- | Zotlabs/Daemon/Notifier.php | 4 | ||||
| -rw-r--r-- | include/text.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php index 84212270f..d0175549b 100644 --- a/Zotlabs/Daemon/Notifier.php +++ b/Zotlabs/Daemon/Notifier.php @@ -433,7 +433,7 @@ class Notifier { $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(); @@ -500,7 +500,7 @@ class Notifier { // 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. - $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 ) " ); diff --git a/include/text.php b/include/text.php index 8a65be0d5..d81b59d75 100644 --- a/include/text.php +++ b/include/text.php @@ -2846,7 +2846,7 @@ function item_url_replace($channel,&$item,$old,$new,$oldnick = '') { */ function sanitise_acl(&$item) { if (strlen($item)) - $item = '<' . notags(trim($item)) . '>'; + $item = '<' . notags(trim(urldecode($item))) . '>'; else unset($item); } |