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

hubzilla issue #1020 - PM using unicode domain for recipient. May require further testing

Browse Source
This commit is contained in:
zotlabs 2018-03-30 15:18:33 -07:00
parent f54aa4f21e
commit 43249bd4be
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Module/Acl.php
View File

@ -95,7 +95,7 @@ class Acl extends \Zotlabs\Web\Controller {
. "' IN xchan_name) else position('" . protect_sprintf(dbesc(punify($search))) . "' IN xchan_addr) end, "; . "' IN xchan_name) else position('" . protect_sprintf(dbesc(punify($search))) . "' IN xchan_addr) end, ";
$col = ((strpos($search,'@') !== false) ? 'xchan_addr' : 'xchan_name' ); $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 { else {

4
Zotlabs/Module/Mail.php
View File

@ -67,14 +67,14 @@ class Mail extends \Zotlabs\Web\Controller {
if(! $recipient) { if(! $recipient) {
$channel = \App::get_channel(); $channel = \App::get_channel();
$j = \Zotlabs\Zot\Finger::run($rstr,$channel); $j = \Zotlabs\Zot\Finger::run(punify($rstr),$channel);
if(! $j['success']) { if(! $j['success']) {
notice( t('Unable to lookup recipient.') . EOL); notice( t('Unable to lookup recipient.') . EOL);
return; return;
} }
logger('message_post: lookup: ' . $url . ' ' . print_r($j,true)); logger('message_post: lookup: ' . $rstr . ' ' . print_r($j,true));
if(! $j['guid']) { if(! $j['guid']) {
notice( t('Unable to communicate with requested channel.')); notice( t('Unable to communicate with requested channel.'));