X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fostatus_subscribe.php;h=751afcc7315a085408ec859fb6b5623d7bb1fdae;hb=ca9f8e7420d925fb316f8841f338a4583d94fe51;hp=7fce9d0b690c9d9dab224fcb18d4db5ae38419d5;hpb=d00ddc01afdef3e626ae0e711e52f830cbdf923a;p=friendica.git

diff --git a/mod/ostatus_subscribe.php b/mod/ostatus_subscribe.php
index 7fce9d0b69..751afcc731 100644
--- a/mod/ostatus_subscribe.php
+++ b/mod/ostatus_subscribe.php
@@ -1,68 +1,83 @@
 <?php
 /**
- * @file mod/ostatus_subscribe.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
+
 use Friendica\App;
-use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
-use Friendica\Core\System;
+use Friendica\DI;
 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');
+function ostatus_subscribe_content(App $a)
+{
+	if (!local_user()) {
+		notice(DI::l10n()->t('Permission denied.') . EOL);
+		DI::baseUrl()->redirect('ostatus_subscribe');
 		// NOTREACHED
 	}
 
-	$o = "<h2>".L10n::t("Subscribing to OStatus contacts")."</h2>";
+	$o = '<h2>' . DI::l10n()->t('Subscribing to OStatus contacts') . '</h2>';
 
 	$uid = local_user();
 
-	$a = get_app();
-
 	$counter = intval($_REQUEST['counter']);
 
-	if (PConfig::get($uid, "ostatus", "legacy_friends") == "") {
+	if (DI::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'] == '') {
+			DI::pConfig()->delete($uid, 'ostatus', 'legacy_contact');
+			return $o . DI::l10n()->t('No contact provided.');
 		}
 
-		$contact = Probe::uri($_REQUEST["url"]);
-
+		$contact = Contact::getByURL($_REQUEST['url']);
 		if (!$contact) {
-			PConfig::delete($uid, "ostatus", "legacy_contact");
-			return $o.L10n::t("Couldn't fetch information for contact.");
+			DI::pConfig()->delete($uid, 'ostatus', 'legacy_contact');
+			return $o . DI::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.");
+			DI::pConfig()->delete($uid, 'ostatus', 'legacy_contact');
+			return $o . DI::l10n()->t('Couldn\'t fetch friends for contact.');
 		}
 
-		PConfig::set($uid, "ostatus", "legacy_friends", $curlResult->getBody());
+		DI::pConfig()->set($uid, 'ostatus', 'legacy_friends', $curlResult->getBody());
 	}
 
-	$friends = json_decode(PConfig::get($uid, "ostatus", "legacy_friends"));
+	$friends = json_decode(DI::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='.System::baseUrl().'/settings/connectors">';
-		PConfig::delete($uid, "ostatus", "legacy_friends");
-		PConfig::delete($uid, "ostatus", "legacy_contact");
-		$o .= L10n::t("Done");
+		DI::page()['htmlhead'] = '<meta http-equiv="refresh" content="0; URL=' . DI::baseUrl() . '/settings/connectors">';
+		DI::pConfig()->delete($uid, 'ostatus', 'legacy_friends');
+		DI::pConfig()->delete($uid, 'ostatus', 'legacy_contact');
+		$o .= DI::l10n()->t('Done');
 		return $o;
 	}
 
@@ -70,25 +85,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) {
-		$result = Contact::createFromProbe($uid, $url, true, Protocol::OSTATUS);
-		if ($result["success"]) {
-			$o .= " - ".L10n::t("success");
+	$probed = Contact::getByURL($url);
+	if ($probed['network'] == Protocol::OSTATUS) {
+		$result = Contact::createFromProbe($a->user, $probed['url'], true, Protocol::OSTATUS);
+		if ($result['success']) {
+			$o .= ' - ' . DI::l10n()->t('success');
 		} else {
-			$o .= " - ".L10n::t("failed");
+			$o .= ' - ' . DI::l10n()->t('failed');
 		}
 	} else {
-		$o .= " - ".L10n::t("ignored");
+		$o .= ' - ' . DI::l10n()->t('ignored');
 	}
 
-	$o .= "</p>";
+	$o .= '</p>';
 
-	$o .= "<p>".L10n::t("Keep this window open until done.")."</p>";
+	$o .= '<p>' . DI::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.'">';
+	DI::page()['htmlhead'] = '<meta http-equiv="refresh" content="0; URL=' . DI::baseUrl() . '/ostatus_subscribe?counter=' . $counter . '">';
 
 	return $o;
 }