From 1cb311cef9848178780e3fd52814bf3a64ed0556 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sat, 21 May 2016 18:18:33 -0700 Subject: finish updating zot_finger instances --- include/socgraph.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'include/socgraph.php') diff --git a/include/socgraph.php b/include/socgraph.php index 1b1bccf20..dffaa8923 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -152,11 +152,9 @@ function poco_load($xchan = '', $url = null) { if(($x !== false) && (! count($x))) { if($address) { if($network === 'zot') { - $z = zot_finger($address,null); - if($z['success']) { - $j = json_decode($z['body'],true); - if($j) - import_xchan($j); + $j = Zotlabs\Zot\Finger::run($address,null); + if($j['success']) { + import_xchan($j); } $x = q("select xchan_hash from xchan where xchan_hash = '%s' limit 1", dbesc($hash) -- cgit v1.2.3 From 5e0698ba8731e7e4659a24c0ab4fa9c4a1aef173 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sun, 22 May 2016 17:52:30 -0700 Subject: turn the oft-repeated block_public ... check into a function observer_prohibited() --- include/socgraph.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/socgraph.php') diff --git a/include/socgraph.php b/include/socgraph.php index dffaa8923..4cb5600ec 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -402,7 +402,7 @@ function poco($a,$extended = false) { $system_mode = false; - if(intval(get_config('system','block_public')) && (! local_channel()) && (! remote_channel())) { + if(observer_prohibited()) { logger('mod_poco: block_public'); http_status_exit(401); } -- cgit v1.2.3