X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fostatus_subscribe.php;h=e8ba144a1633a7b2e5d30d4a35ffb502096eab73;hb=0e8fa341561c7fafb962564d4d46988298b84671;hp=bef50c2db378c3788e856fd3ac3c87dc182b55ee;hpb=ead9d8623683f8ecdbe9b75bb7fd031d89d54ebe;p=friendica.git

diff --git a/mod/ostatus_subscribe.php b/mod/ostatus_subscribe.php
index bef50c2db3..e8ba144a16 100644
--- a/mod/ostatus_subscribe.php
+++ b/mod/ostatus_subscribe.php
@@ -8,6 +8,7 @@ use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Model\Contact;
 use Friendica\Network\Probe;
+use Friendica\Util\Network;
 
 function ostatus_subscribe_content(App $a) {
 
@@ -17,7 +18,7 @@ function ostatus_subscribe_content(App $a) {
 		// NOTREACHED
 	}
 
-	$o = "<h2>".t("Subscribing to OStatus contacts")."</h2>";
+	$o = "<h2>".L10n::t("Subscribing to OStatus contacts")."</h2>";
 
 	$uid = local_user();
 
@@ -28,22 +29,25 @@ 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"]);
+		$data = Network::curl($api."statuses/friends.json?screen_name=".$contact["nick"]);
 
 		if (!$data["success"]) {
-			return $o.t("Couldn't fetch friends for contact.");
+			PConfig::delete($uid, "ostatus", "legacy_contact");
+			return $o.L10n::t("Couldn't fetch friends for contact.");
 		}
 
 		PConfig::set($uid, "ostatus", "legacy_friends", $data["body"]);
@@ -71,17 +75,17 @@ function ostatus_subscribe_content(App $a) {
 	if ($data["network"] == NETWORK_OSTATUS) {
 		$result = Contact::createFromProbe($uid, $url, true, NETWORK_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.'">';