X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fostatus_subscribe.php;h=5d493db32c74b2fce0a7e7eeb5ac5c52face3a21;hb=c06f7ad11e3040e9cb7b2a09682a33cbdd5d5ccd;hp=c950e9700e4a5fc74b1738480f8827d8f50caff7;hpb=d20dbedddd4bf6ebb511f82e41026896b8026d6e;p=friendica.git

diff --git a/mod/ostatus_subscribe.php b/mod/ostatus_subscribe.php
index c950e9700e..5d493db32c 100644
--- a/mod/ostatus_subscribe.php
+++ b/mod/ostatus_subscribe.php
@@ -1,17 +1,26 @@
 <?php
-
-require_once('include/Scrape.php');
-require_once('include/follow.php');
-
-function ostatus_subscribe_content(&$a) {
-
-	if(! local_user()) {
-		notice( t('Permission denied.') . EOL);
-		goaway($_SESSION['return_url']);
+/**
+ * @file mod/ostatus_subscribe.php
+ */
+
+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);
+		$a->internalRedirect('ostatus_subscribe');
 		// NOTREACHED
 	}
 
-	$o = "<h2>".t("Subsribing to OStatus contacts")."</h2>";
+	$o = '<h2>' . L10n::t('Subscribing to OStatus contacts') . '</h2>';
 
 	$uid = local_user();
 
@@ -19,36 +28,46 @@ 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"] == "")
-			return $o.t("No contact provided.");
+		if ($_REQUEST['url'] == '') {
+			PConfig::delete($uid, 'ostatus', 'legacy_contact');
+			return $o . L10n::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.");
+		if (!$contact) {
+			PConfig::delete($uid, 'ostatus', 'legacy_contact');
+			return $o . L10n::t('Couldn\'t fetch information for contact.');
+		}
 
-		$api = $contact["baseurl"]."/api/";
+		$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.');
+		}
 
-		set_pconfig($uid, "ostatus", "legacy_friends", $data["body"]);
+		PConfig::set($uid, 'ostatus', 'legacy_friends', $curlResult->getBody());
 	}
 
-	$friends = json_decode(get_pconfig($uid, "ostatus", "legacy_friends"));
+	$friends = json_decode(PConfig::get($uid, 'ostatus', 'legacy_friends'));
+
+	if (empty($friends)) {
+		$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");
-		$o .= t("Done");
+		$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 .= L10n::t('Done');
 		return $o;
 	}
 
@@ -56,23 +75,25 @@ function ostatus_subscribe_content(&$a) {
 
 	$url = $friend->statusnet_profile_url;
 
-	$o .= "<p>".$counter."/".$total.": ".$url;
-
-	$data = probe_url($url);
-	if ($data["network"] == NETWORK_OSTATUS) {
-		$result = new_contact($uid,$url,true);
-		if ($result["success"])
-			$o .= " - ".t("success");
-		else
-			$o .= " - ".t("failed");
-	} else
-		$o .= " - ".t("ignored");
+	$o .= '<p>' . $counter . '/' . $total . ': ' . $url;
+
+	$probed = Probe::uri($url);
+	if ($probed['network'] == Protocol::OSTATUS) {
+		$result = Contact::createFromProbe($uid, $url, true, Protocol::OSTATUS);
+		if ($result['success']) {
+			$o .= ' - ' . L10n::t('success');
+		} else {
+			$o .= ' - ' . L10n::t('failed');
+		}
+	} else {
+		$o .= ' - ' . L10n::t('ignored');
+	}
 
-	$o .= "</p>";
+	$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='.$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;
 }