X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fostatus_subscribe.php;h=70a36559e4483edf0ed4ca71e11619331f0fb870;hb=a5e91175243a41c77a56e73efc3672f20a7e6d23;hp=a21436db49f32e9418d4657ad59da9b8979e688e;hpb=db949bb802448184bfe5164d8d3dd86ddf51b187;p=friendica.git

diff --git a/mod/ostatus_subscribe.php b/mod/ostatus_subscribe.php
index a21436db49..70a36559e4 100644
--- a/mod/ostatus_subscribe.php
+++ b/mod/ostatus_subscribe.php
@@ -1,12 +1,15 @@
 <?php
 
-require_once('include/Scrape.php');
-require_once('include/follow.php');
+use Friendica\App;
+use Friendica\Core\PConfig;
+use Friendica\Core\System;
+use Friendica\Network\Probe;
 
-if(! function_exists('ostatus_subscribe_content')) {
-function ostatus_subscribe_content(&$a) {
+require_once 'include/follow.php';
 
-	if(! local_user()) {
+function ostatus_subscribe_content(App $a) {
+
+	if (! local_user()) {
 		notice( t('Permission denied.') . EOL);
 		goaway($_SESSION['return_url']);
 		// NOTREACHED
@@ -20,35 +23,38 @@ function ostatus_subscribe_content(&$a) {
 
 	$counter = intval($_REQUEST['counter']);
 
-	if (get_pconfig($uid, "ostatus", "legacy_friends") == "") {
+	if (PConfig::get($uid, "ostatus", "legacy_friends") == "") {
 
-		if ($_REQUEST["url"] == "")
+		if ($_REQUEST["url"] == "") {
 			return $o.t("No contact provided.");
+		}
 
-		$contact = probe_url($_REQUEST["url"]);
+		$contact = Probe::uri($_REQUEST["url"]);
 
-		if (!$contact)
+		if (!$contact) {
 			return $o.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"]);
 
-		if (!$data["success"])
+		if (!$data["success"]) {
 			return $o.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'] = '<meta http-equiv="refresh" content="0; URL='.$a->get_baseurl().'/settings/connectors">';
-		del_pconfig($uid, "ostatus", "legacy_friends");
-		del_pconfig($uid, "ostatus", "legacy_contact");
+		$a->page['htmlhead'] = '<meta http-equiv="refresh" content="0; URL='.System::baseUrl().'/settings/connectors">';
+		PConfig::delete($uid, "ostatus", "legacy_friends");
+		PConfig::delete($uid, "ostatus", "legacy_contact");
 		$o .= t("Done");
 		return $o;
 	}
@@ -59,22 +65,23 @@ function ostatus_subscribe_content(&$a) {
 
 	$o .= "<p>".$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"])
+		$result = new_contact($uid, $url, true, NETWORK_OSTATUS);
+		if ($result["success"]) {
 			$o .= " - ".t("success");
-		else
+		} else {
 			$o .= " - ".t("failed");
-	} else
+		}
+	} else {
 		$o .= " - ".t("ignored");
+	}
 
 	$o .= "</p>";
 
 	$o .= "<p>".t("Keep this window open until done.")."</p>";
 
-	$a->page['htmlhead'] = '<meta http-equiv="refresh" content="0; URL='.$a->get_baseurl().'/ostatus_subscribe?counter='.$counter.'">';
+	$a->page['htmlhead'] = '<meta http-equiv="refresh" content="0; URL='.System::baseUrl().'/ostatus_subscribe?counter='.$counter.'">';
 
 	return $o;
 }
-}