friendica/friendica-addons
8
3
Fork 14
Code Issues 3 Pull requests 2 Releases 16 Wiki Activity

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

Browse source
This commit is contained in:
Philipp Holzer 2019-12-16 00:47:24 +01:00
parent 99db3452e3
commit 0775c28854
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
7 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
diaspora/diaspora.php
View file

@ -18,6 +18,7 @@ use Friendica\Core\PConfig;
use Friendica\Core\Protocol; use Friendica\Core\Protocol;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\DI;
function diaspora_install() function diaspora_install()
{ {
@ -231,7 +232,7 @@ function diaspora_post_local(App $a, array &$b)
function diaspora_send(App $a, array &$b) function diaspora_send(App $a, array &$b)
{ {
$hostname = $a->getHostName(); $hostname = DI::baseUrl()->getHostname();
Logger::log('diaspora_send: invoked'); Logger::log('diaspora_send: invoked');

2
notifyall/notifyall.php
View file

@ -57,7 +57,7 @@ function notifyall_post(App $a)
} }
if (!Config::get('config', 'sender_email')) { if (!Config::get('config', 'sender_email')) {
$sender_email = 'noreply@' . $a->getHostName(); $sender_email = 'noreply@' . DI::baseUrl()->getHostname();
} else { } else {
$sender_email = Config::get('config', 'sender_email'); $sender_email = Config::get('config', 'sender_email');
} }

5
pumpio/pumpio.php
View file

@ -17,6 +17,7 @@ use Friendica\Core\PConfig;
use Friendica\Core\Protocol; use Friendica\Core\Protocol;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\Group; use Friendica\Model\Group;
use Friendica\Model\Item; use Friendica\Model\Item;
@ -105,7 +106,7 @@ function pumpio_registerclient(App $a, $host)
$application_name = Config::get('pumpio', 'application_name'); $application_name = Config::get('pumpio', 'application_name');
if ($application_name == "") { if ($application_name == "") {
$application_name = $a->getHostName(); $application_name = DI::baseUrl()->getHostname();
} }
$adminlist = explode(",", str_replace(" ", "", Config::get('config', 'admin_email'))); $adminlist = explode(",", str_replace(" ", "", Config::get('config', 'admin_email')));
@ -772,7 +773,7 @@ function pumpio_fetchtimeline(App $a, $uid)
$application_name = Config::get('pumpio', 'application_name'); $application_name = Config::get('pumpio', 'application_name');
} }
if ($application_name == "") { if ($application_name == "") {
$application_name = $a->getHostName(); $application_name = DI::baseUrl()->getHostname();
} }
$first_time = ($lastdate == ""); $first_time = ($lastdate == "");

3
securemail/securemail.php
View file

@ -13,6 +13,7 @@ use Friendica\Core\L10n;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\DI;
use Friendica\Util\Emailer; use Friendica\Util\Emailer;
require_once __DIR__ . '/vendor/autoload.php'; require_once __DIR__ . '/vendor/autoload.php';
@ -92,7 +93,7 @@ function securemail_settings_post(App &$a, array &$b)
if ($_POST['securemail-submit'] == L10n::t('Save and send test')) { if ($_POST['securemail-submit'] == L10n::t('Save and send test')) {
$sitename = Config::get('config', 'sitename'); $sitename = Config::get('config', 'sitename');
$hostname = $a->getHostName(); $hostname = DI::baseUrl()->getHostname();
if (strpos($hostname, ':')) { if (strpos($hostname, ':')) {
$hostname = substr($hostname, 0, strpos($hostname, ':')); $hostname = substr($hostname, 0, strpos($hostname, ':'));
} }

2
statusnet/statusnet.php
View file

@ -838,7 +838,7 @@ function statusnet_fetchtimeline(App $a, $uid)
$application_name = Config::get('statusnet', 'application_name'); $application_name = Config::get('statusnet', 'application_name');
} }
if ($application_name == "") { if ($application_name == "") {
$application_name = $a->getHostName(); $application_name = DI::baseUrl()->getHostname();
} }
$connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret); $connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret);

4
twitter/twitter.php
View file

@ -940,7 +940,7 @@ function twitter_fetchtimeline(App $a, $uid)
$application_name = Config::get('twitter', 'application_name'); $application_name = Config::get('twitter', 'application_name');
if ($application_name == "") { if ($application_name == "") {
$application_name = $a->getHostName(); $application_name = DI::baseUrl()->getHostname();
} }
$has_picture = false; $has_picture = false;
@ -1633,7 +1633,7 @@ function twitter_fetchhometimeline(App $a, $uid)
$application_name = Config::get('twitter', 'application_name'); $application_name = Config::get('twitter', 'application_name');
if ($application_name == "") { if ($application_name == "") {
$application_name = $a->getHostName(); $application_name = DI::baseUrl()->getHostname();
} }
$connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret); $connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);

3
xmpp/xmpp.php
View file

@ -13,6 +13,7 @@ use Friendica\Core\Hook;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\DI;
use Friendica\Util\Strings; use Friendica\Util\Strings;
function xmpp_install() function xmpp_install()
@ -167,7 +168,7 @@ function xmpp_converse(App $a)
PConfig::set(local_user(), "xmpp", "password", $password); PConfig::set(local_user(), "xmpp", "password", $password);
} }
$jid = $a->user["nickname"] . "@" . $a->getHostName() . "/converse-" . Strings::getRandomHex(5); $jid = $a->user["nickname"] . "@" . DI::baseUrl()->getHostname() . "/converse-" . Strings::getRandomHex(5);
$auto_login = "auto_login: true, $auto_login = "auto_login: true,
authentication: 'login', authentication: 'login',