X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fostatus_subscribe.php;h=e5c4fa7b0161016ded2e621e58b1c0d63fa8fd47;hb=f10062dfdbacb48910482678d919ad37de57015f;hp=f112a2ef916b848b88823a042e0e73c5c43844e8;hpb=8e6973b774efeff5dd381e8984c22171c6a14c31;p=friendica.git
diff --git a/mod/ostatus_subscribe.php b/mod/ostatus_subscribe.php
index f112a2ef91..e5c4fa7b01 100644
--- a/mod/ostatus_subscribe.php
+++ b/mod/ostatus_subscribe.php
@@ -1,13 +1,26 @@
.
+ *
*/
use Friendica\App;
-use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
use Friendica\Core\Protocol;
-use Friendica\Core\System;
use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Network\Probe;
@@ -16,31 +29,29 @@ use Friendica\Util\Network;
function ostatus_subscribe_content(App $a)
{
if (!local_user()) {
- notice(L10n::t('Permission denied.') . EOL);
+ notice(DI::l10n()->t('Permission denied.') . EOL);
DI::baseUrl()->redirect('ostatus_subscribe');
// NOTREACHED
}
- $o = '
' . L10n::t('Subscribing to OStatus contacts') . '
';
+ $o = '' . DI::l10n()->t('Subscribing to OStatus contacts') . '
';
$uid = local_user();
- $a = \get_app();
-
$counter = intval($_REQUEST['counter']);
- if (PConfig::get($uid, 'ostatus', 'legacy_friends') == '') {
+ if (DI::pConfig()->get($uid, 'ostatus', 'legacy_friends') == '') {
if ($_REQUEST['url'] == '') {
- PConfig::delete($uid, 'ostatus', 'legacy_contact');
- return $o . L10n::t('No contact provided.');
+ DI::pConfig()->delete($uid, 'ostatus', 'legacy_contact');
+ return $o . DI::l10n()->t('No contact provided.');
}
$contact = Probe::uri($_REQUEST['url']);
if (!$contact) {
- PConfig::delete($uid, 'ostatus', 'legacy_contact');
- return $o . L10n::t('Couldn\'t fetch information for contact.');
+ DI::pConfig()->delete($uid, 'ostatus', 'legacy_contact');
+ return $o . DI::l10n()->t('Couldn\'t fetch information for contact.');
}
$api = $contact['baseurl'] . '/api/';
@@ -49,14 +60,14 @@ function ostatus_subscribe_content(App $a)
$curlResult = Network::curl($api . 'statuses/friends.json?screen_name=' . $contact['nick']);
if (!$curlResult->isSuccess()) {
- PConfig::delete($uid, 'ostatus', 'legacy_contact');
- return $o . L10n::t('Couldn\'t fetch friends for contact.');
+ DI::pConfig()->delete($uid, 'ostatus', 'legacy_contact');
+ return $o . DI::l10n()->t('Couldn\'t fetch friends for contact.');
}
- PConfig::set($uid, 'ostatus', 'legacy_friends', $curlResult->getBody());
+ DI::pConfig()->set($uid, 'ostatus', 'legacy_friends', $curlResult->getBody());
}
- $friends = json_decode(PConfig::get($uid, 'ostatus', 'legacy_friends'));
+ $friends = json_decode(DI::pConfig()->get($uid, 'ostatus', 'legacy_friends'));
if (empty($friends)) {
$friends = [];
@@ -65,10 +76,10 @@ function ostatus_subscribe_content(App $a)
$total = sizeof($friends);
if ($counter >= $total) {
- $a->page['htmlhead'] = '';
- PConfig::delete($uid, 'ostatus', 'legacy_friends');
- PConfig::delete($uid, 'ostatus', 'legacy_contact');
- $o .= L10n::t('Done');
+ DI::page()['htmlhead'] = '';
+ DI::pConfig()->delete($uid, 'ostatus', 'legacy_friends');
+ DI::pConfig()->delete($uid, 'ostatus', 'legacy_contact');
+ $o .= DI::l10n()->t('Done');
return $o;
}
@@ -80,21 +91,21 @@ function ostatus_subscribe_content(App $a)
$probed = Probe::uri($url);
if ($probed['network'] == Protocol::OSTATUS) {
- $result = Contact::createFromProbe($uid, $url, true, Protocol::OSTATUS);
+ $result = Contact::createFromProbe($a->user, $url, true, Protocol::OSTATUS);
if ($result['success']) {
- $o .= ' - ' . L10n::t('success');
+ $o .= ' - ' . DI::l10n()->t('success');
} else {
- $o .= ' - ' . L10n::t('failed');
+ $o .= ' - ' . DI::l10n()->t('failed');
}
} else {
- $o .= ' - ' . L10n::t('ignored');
+ $o .= ' - ' . DI::l10n()->t('ignored');
}
$o .= '';
- $o .= '' . L10n::t('Keep this window open until done.') . '
';
+ $o .= '' . DI::l10n()->t('Keep this window open until done.') . '
';
- $a->page['htmlhead'] = '';
+ DI::page()['htmlhead'] = '';
return $o;
}