diff options
| author | zotlabs <mike@macgirvin.com> | 2018-03-30 15:18:33 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-03-30 15:18:33 -0700 |
| commit | 43249bd4be8495dadaae859bf42f14a90af7b574 (patch) | |
| tree | edd1ea44b2be554143a4487271b41b081e2ab61b /Zotlabs | |
| parent | f54aa4f21e63e2d0be94ee92f681ddec641da441 (diff) | |
| download | volse-hubzilla-43249bd4be8495dadaae859bf42f14a90af7b574.tar.gz volse-hubzilla-43249bd4be8495dadaae859bf42f14a90af7b574.tar.bz2 volse-hubzilla-43249bd4be8495dadaae859bf42f14a90af7b574.zip | |
hubzilla issue #1020 - PM using unicode domain for recipient. May require further testing
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Acl.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Mail.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Zotlabs/Module/Acl.php b/Zotlabs/Module/Acl.php index 245b0a9b7..ef901aef1 100644 --- a/Zotlabs/Module/Acl.php +++ b/Zotlabs/Module/Acl.php @@ -95,7 +95,7 @@ class Acl extends \Zotlabs\Web\Controller { . "' IN xchan_name) else position('" . protect_sprintf(dbesc(punify($search))) . "' IN xchan_addr) end, "; $col = ((strpos($search,'@') !== false) ? 'xchan_addr' : 'xchan_name' ); - $sql_extra3 = "AND $col like " . protect_sprintf( "'%" . dbesc($search) . "%'" ) . " "; + $sql_extra3 = "AND $col like " . protect_sprintf( "'%" . dbesc(($col === 'xchan_addr') ? punify($search) : $search) . "%'" ) . " "; } else { diff --git a/Zotlabs/Module/Mail.php b/Zotlabs/Module/Mail.php index b58b169d0..ca183f644 100644 --- a/Zotlabs/Module/Mail.php +++ b/Zotlabs/Module/Mail.php @@ -67,14 +67,14 @@ class Mail extends \Zotlabs\Web\Controller { if(! $recipient) { $channel = \App::get_channel(); - $j = \Zotlabs\Zot\Finger::run($rstr,$channel); + $j = \Zotlabs\Zot\Finger::run(punify($rstr),$channel); if(! $j['success']) { notice( t('Unable to lookup recipient.') . EOL); return; } - logger('message_post: lookup: ' . $url . ' ' . print_r($j,true)); + logger('message_post: lookup: ' . $rstr . ' ' . print_r($j,true)); if(! $j['guid']) { notice( t('Unable to communicate with requested channel.')); |