X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fostatus_subscribe.php;h=e8ba144a1633a7b2e5d30d4a35ffb502096eab73;hb=d071a5cdad76f657fe0527b45717068b53b14bae;hp=ba17e28b73992b47238fc14ab725a96582172224;hpb=b580c238445100e95b2b43343a82d0e5f7a14630;p=friendica.git
diff --git a/mod/ostatus_subscribe.php b/mod/ostatus_subscribe.php
index ba17e28b73..e8ba144a16 100644
--- a/mod/ostatus_subscribe.php
+++ b/mod/ostatus_subscribe.php
@@ -1,17 +1,24 @@
".t("Subscribing to OStatus contacts")."";
+ $o = "
".L10n::t("Subscribing to OStatus contacts")."
";
$uid = local_user();
@@ -19,36 +26,42 @@ function ostatus_subscribe_content(App &$a) {
$counter = intval($_REQUEST['counter']);
- if (get_pconfig($uid, "ostatus", "legacy_friends") == "") {
+ if (PConfig::get($uid, "ostatus", "legacy_friends") == "") {
- if ($_REQUEST["url"] == "")
- return $o.t("No contact provided.");
+ if ($_REQUEST["url"] == "") {
+ PConfig::delete($uid, "ostatus", "legacy_contact");
+ return $o.L10n::t("No contact provided.");
+ }
- $contact = probe_url($_REQUEST["url"]);
+ $contact = Probe::uri($_REQUEST["url"]);
- if (!$contact)
- return $o.t("Couldn't fetch information for contact.");
+ if (!$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.");
+ if (!$data["success"]) {
+ PConfig::delete($uid, "ostatus", "legacy_contact");
+ return $o.L10n::t("Couldn't fetch friends for contact.");
+ }
- set_pconfig($uid, "ostatus", "legacy_friends", $data["body"]);
+ PConfig::set($uid, "ostatus", "legacy_friends", $data["body"]);
}
- $friends = json_decode(get_pconfig($uid, "ostatus", "legacy_friends"));
+ $friends = json_decode(PConfig::get($uid, "ostatus", "legacy_friends"));
$total = sizeof($friends);
if ($counter >= $total) {
- $a->page['htmlhead'] = '';
- del_pconfig($uid, "ostatus", "legacy_friends");
- del_pconfig($uid, "ostatus", "legacy_contact");
- $o .= t("Done");
+ $a->page['htmlhead'] = '';
+ PConfig::delete($uid, "ostatus", "legacy_friends");
+ PConfig::delete($uid, "ostatus", "legacy_contact");
+ $o .= L10n::t("Done");
return $o;
}
@@ -58,21 +71,23 @@ function ostatus_subscribe_content(App &$a) {
$o .= "".$counter."/".$total.": ".$url;
- $data = probe_url($url);
+ $data = Probe::uri($url);
if ($data["network"] == NETWORK_OSTATUS) {
- $result = new_contact($uid,$url,true);
- if ($result["success"])
- $o .= " - ".t("success");
- else
- $o .= " - ".t("failed");
- } else
- $o .= " - ".t("ignored");
+ $result = Contact::createFromProbe($uid, $url, true, NETWORK_OSTATUS);
+ if ($result["success"]) {
+ $o .= " - ".L10n::t("success");
+ } else {
+ $o .= " - ".L10n::t("failed");
+ }
+ } else {
+ $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'] = '';
+ $a->page['htmlhead'] = '';
return $o;
}