diff options
| author | zotlabs <mike@macgirvin.com> | 2017-09-25 23:14:02 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-09-25 23:14:02 -0700 |
| commit | 9d7a88b40dff8ea49e7185d71e7bad4139b1d289 (patch) | |
| tree | 5eabc9cb3aea017d2cec8d4a7641bf0540f26dae /Zotlabs/Web | |
| parent | be8061b64b47d96ae67e672bf2835e8cec73d979 (diff) | |
| download | volse-hubzilla-9d7a88b40dff8ea49e7185d71e7bad4139b1d289.tar.gz volse-hubzilla-9d7a88b40dff8ea49e7185d71e7bad4139b1d289.tar.bz2 volse-hubzilla-9d7a88b40dff8ea49e7185d71e7bad4139b1d289.zip | |
move the Link header initialisation from Router (where it does not really belong) to Webserver, where we do similar module specific initialisations prior to calling Router->Dispatch()
Diffstat (limited to 'Zotlabs/Web')
| -rw-r--r-- | Zotlabs/Web/Router.php | 18 | ||||
| -rw-r--r-- | Zotlabs/Web/WebServer.php | 28 |
2 files changed, 28 insertions, 18 deletions
diff --git a/Zotlabs/Web/Router.php b/Zotlabs/Web/Router.php index b0193652b..9486130cb 100644 --- a/Zotlabs/Web/Router.php +++ b/Zotlabs/Web/Router.php @@ -178,24 +178,6 @@ class Router { */ if(\App::$module_loaded) { - if (( \App::$module === 'channel' ) && argc() > 1) { - \App::$channel_links = [ - [ - 'rel' => 'lrdd', - 'type' => 'application/xrd+xml', - 'url' => z_root() . '/xrd?f=&uri=acct%3A' . argv(1) . '%40' . \App::get_hostname() - ], - [ - 'rel' => 'jrd', - 'type' => 'application/jrd+json', - 'url' => z_root() . '/.well-known/webfinger?f=&resource=acct%3A' . argv(1) . '%40' . \App::get_hostname() - ], - ]; - $x = [ 'channel_address' => argv(1), 'channel_links' => \App::$channel_links ]; - call_hooks('channel_links', $x ); - \App::$channel_links = $x['channel_links']; - header('Link: ' . \App::get_channel_links()); - } \App::$page['page_title'] = \App::$module; $placeholder = ''; diff --git a/Zotlabs/Web/WebServer.php b/Zotlabs/Web/WebServer.php index 8431a2e0e..65b772fee 100644 --- a/Zotlabs/Web/WebServer.php +++ b/Zotlabs/Web/WebServer.php @@ -107,6 +107,34 @@ class WebServer { $Router = new Router($a); + /* Initialise the Link: response header if this is a channel page. + * This cannot be done inside the channel module because some protocol + * addons over-ride the module functions and these links are common + * to all protocol drivers; thus doing it here avoids duplication. + */ + + if (( \App::$module === 'channel' ) && argc() > 1) { + \App::$channel_links = [ + [ + 'rel' => 'lrdd', + 'type' => 'application/xrd+xml', + 'url' => z_root() . '/xrd?f=&uri=acct%3A' . argv(1) . '%40' . \App::get_hostname() + ], + [ + 'rel' => 'jrd', + 'type' => 'application/jrd+json', + 'url' => z_root() . '/.well-known/webfinger?f=&resource=acct%3A' . argv(1) . '%40' . \App::get_hostname() + ], + ]; + $x = [ 'channel_address' => argv(1), 'channel_links' => \App::$channel_links ]; + call_hooks('channel_links', $x ); + \App::$channel_links = $x['channel_links']; + header('Link: ' . \App::get_channel_links()); + } + + + + /* initialise content region */ if(! x(\App::$page, 'content')) |