X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fostatus_subscribe.php;h=7f9725b85359ca7163078ef1a0f9c03610c397f6;hb=51210af22157327376954721bfdca7161b66a7be;hp=2e09bfc0d6eacdbe93601457fa8db76871ec5fde;hpb=884f44ce94de8fdf26a40751dfd4b61b29765d29;p=friendica.git
diff --git a/mod/ostatus_subscribe.php b/mod/ostatus_subscribe.php
index 2e09bfc0d6..7f9725b853 100644
--- a/mod/ostatus_subscribe.php
+++ b/mod/ostatus_subscribe.php
@@ -1,54 +1,73 @@
internalRedirect('ostatus_subscribe');
// NOTREACHED
}
- $o = "
".t("Subscribing to OStatus contacts")."
";
+ $o = '' . L10n::t('Subscribing to OStatus contacts') . '
';
$uid = local_user();
- $a = get_app();
+ $a = \get_app();
$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/";
+ $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.');
+ }
- set_pconfig($uid, "ostatus", "legacy_friends", $data["body"]);
+ PConfig::set($uid, 'ostatus', 'legacy_friends', $curlResult->getBody());
}
- $friends = json_decode(get_pconfig($uid, "ostatus", "legacy_friends"));
+ $friends = json_decode(PConfig::get($uid, 'ostatus', 'legacy_friends'));
+
+ if (empty($friends)) {
+ $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;
}
@@ -56,23 +75,25 @@ function ostatus_subscribe_content(&$a) {
$url = $friend->statusnet_profile_url;
- $o .= "".$counter."/".$total.": ".$url;
-
- $data = probe_url($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");
+ $o .= '
' . $counter . '/' . $total . ': ' . $url;
+
+ $probed = Probe::uri($url);
+ if ($probed['network'] == Protocol::OSTATUS) {
+ $result = Contact::createFromProbe($uid, $url, true, Protocol::OSTATUS);
+ if ($result['success']) {
+ $o .= ' - ' . L10n::t('success');
+ } else {
+ $o .= ' - ' . L10n::t('failed');
+ }
+ } else {
+ $o .= ' - ' . L10n::t('ignored');
+ }
- $o .= "
";
+ $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;
}