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

finish updating zot_finger instances

Browse Source
This commit is contained in:
redmatrix
2016-05-21 18:18:33 -07:00
parent ed56b6e67b
commit 1cb311cef9
10 changed files with 29 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Zotlabs/Module/Chanview.php
View File

@@ -62,18 +62,15 @@ class Chanview extends \Zotlabs\Web\Controller {
}
if($_REQUEST['address']) {
$ret = zot_finger($_REQUEST['address'],null);
if($ret['success']) {
$j = json_decode($ret['body'],true);
if($j)
import_xchan($j);
$j = \Zotlabs\Zot\Finger::run($_REQUEST['address'],null);
if($j['success']) {
import_xchan($j);
$r = q("select * from xchan where xchan_addr = '%s' limit 1",
dbesc($_REQUEST['address'])
);
if($r)
\App::$poi = $r[0];
}
}
}

8
Zotlabs/Module/Magic.php
View File

@@ -47,11 +47,9 @@ class Magic extends \Zotlabs\Web\Controller {
*
*/
$ret = zot_finger((($addr) ? $addr : '[system]@' . $parsed['host']),null);
if($ret['success']) {
$j = json_decode($ret['body'],true);
if($j)
import_xchan($j);
$j = \Zotlabs\Zot\Finger::run((($addr) ? $addr : '[system]@' . $parsed['host']),null);
if($j['success']) {
import_xchan($j);
// Now try again

7
Zotlabs/Module/Mail.php
View File

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

13
Zotlabs/Module/Regdir.php
View File

@@ -60,14 +60,11 @@ class Regdir extends \Zotlabs\Web\Controller {
json_return_and_die($result);
}
$f = zot_finger('[system]@' . $m['host']);
if($f['success']) {
$j = json_decode($f['body'],true);
if($j['success'] && $j['guid']) {
$x = import_xchan($j);
if($x['success']) {
$result['success'] = true;
}
$j = \Zotlabs\Zot\Finger::run('[system]@' . $m['host']);
if($j['success'] && $j['guid']) {
$x = import_xchan($j);
if($x['success']) {
$result['success'] = true;
}
}