<?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/>.
+ *
+ */
namespace Friendica\Module;
use Friendica\Core\Renderer;
use Friendica\Core\Search;
use Friendica\Core\System;
+use Friendica\Model\Contact;
use Friendica\Model\Profile;
use Friendica\Network\Probe;
return;
}
- $url = trim($_POST['dfrn_url']);
+ $url = Probe::cleanURI($_POST['dfrn_url']);
if (!strlen($url)) {
notice(DI::l10n()->t("Invalid locator"));
return;
}
// Detect the network, make sure the provided URL is valid
- $data = Probe::uri($url);
- if ($data['network'] == Protocol::PHANTOM) {
+ $data = Contact::getByURL($url);
+ if (!$data) {
notice(DI::l10n()->t("The provided profile link doesn't seem to be valid"));
return;
}
- // Fetch link for the "remote follow" functionality of the given profile
- $follow_link_template = Probe::getRemoteFollowLink($url);
-
- if (empty($follow_link_template)) {
+ if (empty($data['subscribe'])) {
notice(DI::l10n()->t("Remote subscription can't be done for your network. Please subscribe directly on your system."));
return;
}
- Logger::notice('Remote request', ['url' => $url, 'follow' => $a->profile['url'], 'remote' => $follow_link_template]);
+ Logger::notice('Remote request', ['url' => $url, 'follow' => $a->profile['url'], 'remote' => $data['subscribe']]);
- // Substitute our user's feed URL into $follow_link_template
+ // Substitute our user's feed URL into $data['subscribe']
// Send the subscriber home to subscribe
// Diaspora needs the uri in the format user@domain.tld
if ($data['network'] == Protocol::DIASPORA) {
$uri = urlencode($a->profile['url']);
}
- $follow_link = str_replace('{uri}', $uri, $follow_link_template);
+ $follow_link = str_replace('{uri}', $uri, $data['subscribe']);
System::externalRedirect($follow_link);
}