X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fostatus_subscribe.php;h=7012ecd4bcc58f35e3cf9aba74050270e1eed1fd;hb=7f143c3159615b4a10539447bcf250a5fca793a5;hp=295ccfee61ebc5072484df6b9880ae133018c89a;hpb=f0725ae3845ea133a145a3fcc2599fa21c888bae;p=friendica.git

diff --git a/mod/ostatus_subscribe.php b/mod/ostatus_subscribe.php
index 295ccfee61..7012ecd4bc 100644
--- a/mod/ostatus_subscribe.php
+++ b/mod/ostatus_subscribe.php
@@ -5,15 +5,17 @@
 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
 	}
 
@@ -28,25 +30,28 @@ function ostatus_subscribe_content(App $a) {
 	if (PConfig::get($uid, "ostatus", "legacy_friends") == "") {
 
 		if ($_REQUEST["url"] == "") {
+			PConfig::delete($uid, "ostatus", "legacy_contact");
 			return $o.L10n::t("No contact provided.");
 		}
 
 		$contact = Probe::uri($_REQUEST["url"]);
 
 		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"]);
+		$curlResult = Network::curl($api."statuses/friends.json?screen_name=".$contact["nick"]);
 
-		if (!$data["success"]) {
+		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,9 +72,9 @@ 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 .= " - ".L10n::t("success");
 		} else {