Fix various spelling mistakes

[friendica.git] / mod / ostatus_subscribe.php

diff --git a/mod/ostatus_subscribe.php b/mod/ostatus_subscribe.php
index bef50c2db378c3788e856fd3ac3c87dc182b55ee..7012ecd4bcc58f35e3cf9aba74050270e1eed1fd 100644 (file)
--- a/mod/ostatus_subscribe.php
+++ b/mod/ostatus_subscribe.php
@@ -5,19 +5,21 @@
 use Friendica\App;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Core\Protocol;
 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(L10n::t('Permission denied.') . EOL);
-               goaway($_SESSION['return_url']);
+               goaway('/ostatus_subscribe');
                // NOTREACHED
        }
 
-       $o = "<h2>".t("Subscribing to OStatus contacts")."</h2>";
+       $o = "<h2>".L10n::t("Subscribing to OStatus contacts")."</h2>";
 
        $uid = local_user();
 
@@ -28,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"));
@@ -67,21 +72,21 @@ function ostatus_subscribe_content(App $a) {
 
        $o .= "<p>".$counter."/".$total.": ".$url;
 
-       $data = Probe::uri($url);
-       if ($data["network"] == NETWORK_OSTATUS) {
-               $result = Contact::createFromProbe($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 .= "</p>";
 
-       $o .= "<p>".t("Keep this window open until done.")."</p>";
+       $o .= "<p>".L10n::t("Keep this window open until done.")."</p>";
 
        $a->page['htmlhead'] = '<meta http-equiv="refresh" content="0; URL='.System::baseUrl().'/ostatus_subscribe?counter='.$counter.'">';