diff options
| author | Mario Vavti <mario@mariovavti.com> | 2020-09-26 15:05:16 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2020-09-26 15:05:16 +0200 |
| commit | 3f784a974a1ccc15f69865f8015b0c36fd7bc1d7 (patch) | |
| tree | 4eb9aa05fd00be89fafe943a846042b64b750c65 /include/dir_fns.php | |
| parent | b25054e891fdb1eb88474a289025cf6d9d1d534c (diff) | |
| download | volse-hubzilla-3f784a974a1ccc15f69865f8015b0c36fd7bc1d7.tar.gz volse-hubzilla-3f784a974a1ccc15f69865f8015b0c36fd7bc1d7.tar.bz2 volse-hubzilla-3f784a974a1ccc15f69865f8015b0c36fd7bc1d7.zip | |
deprecate \Zotlabs\Zot\Finger where apropriate
Diffstat (limited to 'include/dir_fns.php')
| -rw-r--r-- | include/dir_fns.php | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/include/dir_fns.php b/include/dir_fns.php index 34a6f13cd..f477b35dd 100644 --- a/include/dir_fns.php +++ b/include/dir_fns.php @@ -3,6 +3,10 @@ * @file include/dir_fns.php */ +use Zotlabs\Lib\Libzot; +use Zotlabs\Lib\Webfinger; +use Zotlabs\Lib\Zotfinger; + require_once('include/permissions.php'); /** @@ -67,15 +71,10 @@ function check_upstream_directory() { $isadir = true; if ($directory) { - $h = parse_url($directory); - if ($h) { - $j = Zotlabs\Zot\Finger::run('[system]@' . $h['host']); - if ($j['success']) { - if (array_key_exists('site', $j) && array_key_exists('directory_mode', $j['site'])) { - if ($j['site']['directory_mode'] === 'normal') { - $isadir = false; - } - } + $j = Zotfinger::exec($directory); + if (array_path_exists('data/directory_mode',$j)) { + if ($j['data']['directory_mode'] === 'normal') { + $isadir = false; } } } @@ -341,9 +340,9 @@ function update_directory_entry($ud) { // Hubzilla channels running traditional zot which have not upgraded can or will be dropped from the directory or // "not found" at the end of the transition period as the directory will only serve zot6 entries at that time. - $uri = \Zotlabs\Lib\Webfinger::zot_url($ud['ud_addr']); + $uri = Webfinger::zot_url($ud['ud_addr']); if($uri) { - $record = \Zotlabs\Lib\Zotfinger::exec($uri); + $record = Zotfinger::exec($uri); // Check the HTTP signature |