X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fostatus_subscribe.php;h=64774eead9fc5a4ede2f612baa200457667018be;hb=631095eefdd8cc9698190c60a26322a35b57fc1b;hp=f6d826e85a5b406cd785008018e326996ec8110a;hpb=c58dc357d4fb97fc7d22e5c2db03a4f22719185c;p=friendica.git
diff --git a/mod/ostatus_subscribe.php b/mod/ostatus_subscribe.php
index f6d826e85a..64774eead9 100644
--- a/mod/ostatus_subscribe.php
+++ b/mod/ostatus_subscribe.php
@@ -1,10 +1,25 @@
.
+ *
*/
use Friendica\App;
-use Friendica\Core\L10n;
use Friendica\Core\Protocol;
use Friendica\DI;
use Friendica\Model\Contact;
@@ -14,12 +29,12 @@ 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();
@@ -29,14 +44,13 @@ function ostatus_subscribe_content(App $a)
if ($_REQUEST['url'] == '') {
DI::pConfig()->delete($uid, 'ostatus', 'legacy_contact');
- return $o . L10n::t('No contact provided.');
+ return $o . DI::l10n()->t('No contact provided.');
}
$contact = Probe::uri($_REQUEST['url']);
-
if (!$contact) {
DI::pConfig()->delete($uid, 'ostatus', 'legacy_contact');
- return $o . L10n::t('Couldn\'t fetch information for contact.');
+ return $o . DI::l10n()->t('Couldn\'t fetch information for contact.');
}
$api = $contact['baseurl'] . '/api/';
@@ -46,7 +60,7 @@ function ostatus_subscribe_content(App $a)
if (!$curlResult->isSuccess()) {
DI::pConfig()->delete($uid, 'ostatus', 'legacy_contact');
- return $o . L10n::t('Couldn\'t fetch friends for contact.');
+ return $o . DI::l10n()->t('Couldn\'t fetch friends for contact.');
}
DI::pConfig()->set($uid, 'ostatus', 'legacy_friends', $curlResult->getBody());
@@ -64,7 +78,7 @@ function ostatus_subscribe_content(App $a)
DI::page()['htmlhead'] = '';
DI::pConfig()->delete($uid, 'ostatus', 'legacy_friends');
DI::pConfig()->delete($uid, 'ostatus', 'legacy_contact');
- $o .= L10n::t('Done');
+ $o .= DI::l10n()->t('Done');
return $o;
}
@@ -76,19 +90,19 @@ 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, $probed['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.') . '
';
DI::page()['htmlhead'] = '';