X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fostatus_subscribe.php;h=e8ba144a1633a7b2e5d30d4a35ffb502096eab73;hb=d071a5cdad76f657fe0527b45717068b53b14bae;hp=9ec58e6f113695c136003bd5533f63127fa2bc94;hpb=b007f586dd14c0c2ea57a0996c580b6cab61f579;p=friendica.git
diff --git a/mod/ostatus_subscribe.php b/mod/ostatus_subscribe.php
index 9ec58e6f11..e8ba144a16 100644
--- a/mod/ostatus_subscribe.php
+++ b/mod/ostatus_subscribe.php
@@ -3,20 +3,22 @@
* @file mod/ostatus_subscribe.php
*/
use Friendica\App;
+use Friendica\Core\L10n;
use Friendica\Core\PConfig;
use Friendica\Core\System;
use Friendica\Model\Contact;
use Friendica\Network\Probe;
+use Friendica\Util\Network;
function ostatus_subscribe_content(App $a) {
if (! local_user()) {
- notice( t('Permission denied.') . EOL);
+ notice(L10n::t('Permission denied.') . EOL);
goaway($_SESSION['return_url']);
// NOTREACHED
}
- $o = "
".t("Subscribing to OStatus contacts")."
";
+ $o = "".L10n::t("Subscribing to OStatus contacts")."
";
$uid = local_user();
@@ -27,22 +29,25 @@ function ostatus_subscribe_content(App $a) {
if (PConfig::get($uid, "ostatus", "legacy_friends") == "") {
if ($_REQUEST["url"] == "") {
- return $o.t("No contact provided.");
+ PConfig::delete($uid, "ostatus", "legacy_contact");
+ return $o.L10n::t("No contact provided.");
}
$contact = Probe::uri($_REQUEST["url"]);
if (!$contact) {
- return $o.t("Couldn't fetch information for contact.");
+ PConfig::delete($uid, "ostatus", "legacy_contact");
+ return $o.L10n::t("Couldn't fetch information for contact.");
}
$api = $contact["baseurl"]."/api/";
// Fetching friends
- $data = z_fetch_url($api."statuses/friends.json?screen_name=".$contact["nick"]);
+ $data = Network::curl($api."statuses/friends.json?screen_name=".$contact["nick"]);
if (!$data["success"]) {
- return $o.t("Couldn't fetch friends for contact.");
+ PConfig::delete($uid, "ostatus", "legacy_contact");
+ return $o.L10n::t("Couldn't fetch friends for contact.");
}
PConfig::set($uid, "ostatus", "legacy_friends", $data["body"]);
@@ -56,7 +61,7 @@ function ostatus_subscribe_content(App $a) {
$a->page['htmlhead'] = '';
PConfig::delete($uid, "ostatus", "legacy_friends");
PConfig::delete($uid, "ostatus", "legacy_contact");
- $o .= t("Done");
+ $o .= L10n::t("Done");
return $o;
}
@@ -70,17 +75,17 @@ function ostatus_subscribe_content(App $a) {
if ($data["network"] == NETWORK_OSTATUS) {
$result = Contact::createFromProbe($uid, $url, true, NETWORK_OSTATUS);
if ($result["success"]) {
- $o .= " - ".t("success");
+ $o .= " - ".L10n::t("success");
} else {
- $o .= " - ".t("failed");
+ $o .= " - ".L10n::t("failed");
}
} else {
- $o .= " - ".t("ignored");
+ $o .= " - ".L10n::t("ignored");
}
$o .= "";
- $o .= "".t("Keep this window open until done.")."
";
+ $o .= "".L10n::t("Keep this window open until done.")."
";
$a->page['htmlhead'] = '';