X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fostatus_subscribe.php;h=7fce9d0b690c9d9dab224fcb18d4db5ae38419d5;hb=5e577ed1330425ec8da7966e27d24a9ea692e2b8;hp=ef4c3799cab98177f25494ce48024f40daf9c624;hpb=acb4630eed14175ef35f09e21609d6329f3f990c;p=friendica.git
diff --git a/mod/ostatus_subscribe.php b/mod/ostatus_subscribe.php
index ef4c3799ca..7fce9d0b69 100644
--- a/mod/ostatus_subscribe.php
+++ b/mod/ostatus_subscribe.php
@@ -1,21 +1,25 @@
internalRedirect('ostatus_subscribe');
// NOTREACHED
}
- $o = "
".t("Subscribing to OStatus contacts")."
";
+ $o = "".L10n::t("Subscribing to OStatus contacts")."
";
$uid = local_user();
@@ -26,25 +30,28 @@ 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"]);
+ $curlResult = Network::curl($api."statuses/friends.json?screen_name=".$contact["nick"]);
- if (!$data["success"]) {
- return $o.t("Couldn't fetch friends for contact.");
+ if (!$curlResult->isSuccess()) {
+ PConfig::delete($uid, "ostatus", "legacy_contact");
+ return $o.L10n::t("Couldn't fetch friends for contact.");
}
- PConfig::set($uid, "ostatus", "legacy_friends", $data["body"]);
+ PConfig::set($uid, "ostatus", "legacy_friends", $curlResult->getBody());
}
$friends = json_decode(PConfig::get($uid, "ostatus", "legacy_friends"));
@@ -53,9 +60,9 @@ function ostatus_subscribe_content(App $a) {
if ($counter >= $total) {
$a->page['htmlhead'] = '';
- del_pconfig($uid, "ostatus", "legacy_friends");
- del_pconfig($uid, "ostatus", "legacy_contact");
- $o .= t("Done");
+ PConfig::delete($uid, "ostatus", "legacy_friends");
+ PConfig::delete($uid, "ostatus", "legacy_contact");
+ $o .= L10n::t("Done");
return $o;
}
@@ -65,21 +72,21 @@ function ostatus_subscribe_content(App $a) {
$o .= "".$counter."/".$total.": ".$url;
- $data = Probe::uri($url);
- if ($data["network"] == NETWORK_OSTATUS) {
- $result = new_contact($uid, $url, true, NETWORK_OSTATUS);
+ $curlResult = Probe::uri($url);
+ if ($curlResult["network"] == Protocol::OSTATUS) {
+ $result = Contact::createFromProbe($uid, $url, true, Protocol::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'] = '';