From 03c5c7ca0a64c54483b17b1493001145390c12c0 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Thu, 22 Nov 2018 19:03:02 -0500
Subject: [PATCH 1/2] Fix formatting in mod/ostatus_subscribe

---
 mod/ostatus_subscribe.php | 61 ++++++++++++++++++++-------------------
 1 file changed, 31 insertions(+), 30 deletions(-)

diff --git a/mod/ostatus_subscribe.php b/mod/ostatus_subscribe.php
index 7fce9d0b6..fc1ed22ea 100644
--- a/mod/ostatus_subscribe.php
+++ b/mod/ostatus_subscribe.php
@@ -2,6 +2,7 @@
 /**
  * @file mod/ostatus_subscribe.php
  */
+
 use Friendica\App;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
@@ -11,15 +12,15 @@ use Friendica\Model\Contact;
 use Friendica\Network\Probe;
 use Friendica\Util\Network;
 
-function ostatus_subscribe_content(App $a) {
-
-	if (! local_user()) {
+function ostatus_subscribe_content(App $a)
+{
+	if (!local_user()) {
 		notice(L10n::t('Permission denied.') . EOL);
 		$a->internalRedirect('ostatus_subscribe');
 		// NOTREACHED
 	}
 
-	$o = "<h2>".L10n::t("Subscribing to OStatus contacts")."</h2>";
+	$o = '<h2>' . L10n::t('Subscribing to OStatus contacts') . '</h2>';
 
 	$uid = local_user();
 
@@ -27,42 +28,42 @@ function ostatus_subscribe_content(App $a) {
 
 	$counter = intval($_REQUEST['counter']);
 
-	if (PConfig::get($uid, "ostatus", "legacy_friends") == "") {
+	if (PConfig::get($uid, 'ostatus', 'legacy_friends') == '') {
 
-		if ($_REQUEST["url"] == "") {
-			PConfig::delete($uid, "ostatus", "legacy_contact");
-			return $o.L10n::t("No contact provided.");
+		if ($_REQUEST['url'] == '') {
+			PConfig::delete($uid, 'ostatus', 'legacy_contact');
+			return $o . L10n::t('No contact provided.');
 		}
 
-		$contact = Probe::uri($_REQUEST["url"]);
+		$contact = Probe::uri($_REQUEST['url']);
 
 		if (!$contact) {
-			PConfig::delete($uid, "ostatus", "legacy_contact");
-			return $o.L10n::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/";
+		$api = $contact['baseurl'] . '/api/';
 
 		// Fetching friends
-		$curlResult = Network::curl($api."statuses/friends.json?screen_name=".$contact["nick"]);
+		$curlResult = Network::curl($api . 'statuses/friends.json?screen_name=' . $contact['nick']);
 
 		if (!$curlResult->isSuccess()) {
-			PConfig::delete($uid, "ostatus", "legacy_contact");
-			return $o.L10n::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", $curlResult->getBody());
+		PConfig::set($uid, 'ostatus', 'legacy_friends', $curlResult->getBody());
 	}
 
-	$friends = json_decode(PConfig::get($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='.System::baseUrl().'/settings/connectors">';
-		PConfig::delete($uid, "ostatus", "legacy_friends");
-		PConfig::delete($uid, "ostatus", "legacy_contact");
-		$o .= L10n::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;
 	}
 
@@ -70,25 +71,25 @@ function ostatus_subscribe_content(App $a) {
 
 	$url = $friend->statusnet_profile_url;
 
-	$o .= "<p>".$counter."/".$total.": ".$url;
+	$o .= '<p>' . $counter . '/' . $total . ': ' . $url;
 
 	$curlResult = Probe::uri($url);
-	if ($curlResult["network"] == Protocol::OSTATUS) {
+	if ($curlResult['network'] == Protocol::OSTATUS) {
 		$result = Contact::createFromProbe($uid, $url, true, Protocol::OSTATUS);
-		if ($result["success"]) {
-			$o .= " - ".L10n::t("success");
+		if ($result['success']) {
+			$o .= ' - ' . L10n::t('success');
 		} else {
-			$o .= " - ".L10n::t("failed");
+			$o .= ' - ' . L10n::t('failed');
 		}
 	} else {
-		$o .= " - ".L10n::t("ignored");
+		$o .= ' - ' . L10n::t('ignored');
 	}
 
-	$o .= "</p>";
+	$o .= '</p>';
 
-	$o .= "<p>".L10n::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.'">';
+	$a->page['htmlhead'] = '<meta http-equiv="refresh" content="0; URL=' . System::baseUrl() . '/ostatus_subscribe?counter=' . $counter . '">';
 
 	return $o;
 }

From 8d7fb354638ed5256f994fe1bc0792b40d57060f Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Thu, 22 Nov 2018 19:03:24 -0500
Subject: [PATCH 2/2] Prevent fatal error when $friends isn't an array

---
 mod/ostatus_subscribe.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mod/ostatus_subscribe.php b/mod/ostatus_subscribe.php
index fc1ed22ea..567082062 100644
--- a/mod/ostatus_subscribe.php
+++ b/mod/ostatus_subscribe.php
@@ -57,6 +57,10 @@ function ostatus_subscribe_content(App $a)
 
 	$friends = json_decode(PConfig::get($uid, 'ostatus', 'legacy_friends'));
 
+	if (empty($friends)) {
+		$friends = [];
+	}
+
 	$total = sizeof($friends);
 
 	if ($counter >= $total) {