X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fostatus_subscribe.php;h=70a36559e4483edf0ed4ca71e11619331f0fb870;hb=008c97c570ea62749a3f486b42c424365863d627;hp=b2f536e6df310a2f0962a3b2a66cb1215f200562;hpb=cbc32143d7c9a70fa89238e5a75a22c4b8eacc41;p=friendica.git

diff --git a/mod/ostatus_subscribe.php b/mod/ostatus_subscribe.php
index b2f536e6df..70a36559e4 100644
--- a/mod/ostatus_subscribe.php
+++ b/mod/ostatus_subscribe.php
@@ -1,9 +1,13 @@
 <?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;
 
-function ostatus_subscribe_content(App &$a) {
+require_once 'include/follow.php';
+
+function ostatus_subscribe_content(App $a) {
 
 	if (! local_user()) {
 		notice( t('Permission denied.') . EOL);
@@ -19,13 +23,13 @@ function ostatus_subscribe_content(App &$a) {
 
 	$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.");
 		}
 
-		$contact = probe_url($_REQUEST["url"]);
+		$contact = Probe::uri($_REQUEST["url"]);
 
 		if (!$contact) {
 			return $o.t("Couldn't fetch information for contact.");
@@ -40,17 +44,17 @@ function ostatus_subscribe_content(App &$a) {
 			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='.App::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;
 	}
@@ -61,9 +65,9 @@ function ostatus_subscribe_content(App &$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);
+		$result = new_contact($uid, $url, true, NETWORK_OSTATUS);
 		if ($result["success"]) {
 			$o .= " - ".t("success");
 		} else {
@@ -77,7 +81,7 @@ function ostatus_subscribe_content(App &$a) {
 
 	$o .= "<p>".t("Keep this window open until done.")."</p>";
 
-	$a->page['htmlhead'] = '<meta http-equiv="refresh" content="0; URL='.App::get_baseurl().'/ostatus_subscribe?counter='.$counter.'">';
+	$a->page['htmlhead'] = '<meta http-equiv="refresh" content="0; URL='.System::baseUrl().'/ostatus_subscribe?counter='.$counter.'">';
 
 	return $o;
 }