Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-22 03:50:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove deprecated App::getBaseURL() - process methods to DI::baseUrl()->get()

Browse source
This commit is contained in:
nupplaPhil 2019-12-16 01:05:15 +01:00
parent e57a87f224
commit e944d7bed6
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
43 changed files with 76 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/Module/WellKnown/HostMeta.php
View file

@ -16,7 +16,6 @@ class HostMeta extends BaseModule
{
public static function rawContent(array $parameters = [])
{
$app = DI::app();
$config = DI::config();
header('Content-type: text/xml');
@ -31,8 +30,8 @@ class HostMeta extends BaseModule
$tpl = Renderer::getMarkupTemplate('xrd_host.tpl');
echo Renderer::replaceMacros($tpl, [
'$zhost' => DI::baseUrl()->getHostname()(),
'$zroot' => $app->getBaseURL(),
'$domain' => $app->getBaseURL(),
'$zroot' => DI::baseUrl()->get(),
'$domain' => DI::baseUrl()->get(),
'$bigkey' => Salmon::salmonKey($config->get('system', 'site_pubkey'))
]);

13
src/Module/WellKnown/NodeInfo.php
View file

@ -2,7 +2,6 @@
namespace Friendica\Module\WellKnown;
use Friendica\App;
use Friendica\BaseModule;
use Friendica\DI;
@ -14,26 +13,22 @@ class NodeInfo extends BaseModule
{
public static function rawContent(array $parameters = [])
{
$app = DI::app();
self::printWellKnown($app);
self::printWellKnown();
}
/**
* Prints the well-known nodeinfo redirect
*
* @param App $app
*
* @throws \Friendica\Network\HTTPException\NotFoundException
*/
private static function printWellKnown(App $app)
private static function printWellKnown()
{
$nodeinfo = [
'links' => [
['rel' => 'http://nodeinfo.diaspora.software/ns/schema/1.0',
'href' => $app->getBaseURL() . '/nodeinfo/1.0'],
'href' => DI::baseUrl()->get() . '/nodeinfo/1.0'],
['rel' => 'http://nodeinfo.diaspora.software/ns/schema/2.0',
'href' => $app->getBaseURL() . '/nodeinfo/2.0'],
'href' => DI::baseUrl()->get() . '/nodeinfo/2.0'],
]
];

5
src/Module/WellKnown/XSocialRelay.php
View file

@ -14,7 +14,6 @@ class XSocialRelay extends BaseModule
{
public static function rawContent(array $parameters = [])
{
$app = DI::app();
$config = DI::config();
$subscribe = $config->get('system', 'relay_subscribe', false);
@ -50,10 +49,10 @@ class XSocialRelay extends BaseModule
'tags' => $tagList,
'protocols' => [
'diaspora' => [
'receive' => $app->getBaseURL() . '/receive/public'
'receive' => DI::baseUrl()->get() . '/receive/public'
],
'dfrn' => [
'receive' => $app->getBaseURL() . '/dfrn_notify'
'receive' => DI::baseUrl()->get() . '/dfrn_notify'
]
]
];