<?php
-
/**
- * @file mod/dfrn_poll.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\BaseObject;
-use Friendica\App\Authentication;
-use Friendica\Core\Config;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
-use Friendica\Core\System;
use Friendica\Core\Session;
+use Friendica\Core\System;
use Friendica\Database\DBA;
-use Friendica\Module\Login;
+use Friendica\DI;
use Friendica\Protocol\DFRN;
use Friendica\Protocol\OStatus;
-use Friendica\Util\Network;
use Friendica\Util\Strings;
use Friendica\Util\XML;
function dfrn_poll_init(App $a)
{
- /** @var Authentication $authentication */
- $authentication = BaseObject::getClass(Authentication::class);
- $authentication->withSession($a);
+ DI::auth()->withSession($a);
$dfrn_id = $_GET['dfrn_id'] ?? '';
$type = ($_GET['type'] ?? '') ?: 'data';
$hidewall = false;
if (($dfrn_id === '') && empty($_POST['dfrn_id'])) {
- if (Config::get('system', 'block_public') && !Session::isAuthenticated()) {
+ if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) {
throw new \Friendica\Network\HTTPException\ForbiddenException();
}
$my_id = '0:' . $dfrn_id;
break;
default:
- $a->internalRedirect();
+ DI::baseUrl()->redirect();
break; // NOTREACHED
}
);
if (DBA::isResult($r)) {
- $s = Network::fetchUrl($r[0]['poll'] . '?dfrn_id=' . $my_id . '&type=profile-check');
+ $s = DI::httpRequest()->fetch($r[0]['poll'] . '?dfrn_id=' . $my_id . '&type=profile-check');
Logger::log("dfrn_poll: old profile returns " . $s, Logger::DATA);
Session::setVisitorsContacts();
if (!$quiet) {
- info(L10n::t('%1$s welcomes %2$s', $r[0]['username'], $r[0]['name']) . EOL);
+ info(DI::l10n()->t('%1$s welcomes %2$s', $r[0]['username'], $r[0]['name']));
}
// Visitors get 1 day session.
if (!empty($destination_url)) {
System::externalRedirect($destination_url);
} else {
- $a->internalRedirect('profile/' . $profile);
+ DI::baseUrl()->redirect('profile/' . $profile);
}
}
- $a->internalRedirect();
+ DI::baseUrl()->redirect();
}
if ($type === 'profile-check' && $dfrn_version < 2.2) {
$sql_extra = sprintf(" AND `dfrn-id` = '%s' AND `duplex` = 1 ", DBA::escape($dfrn_id));
break;
default:
- $a->internalRedirect();
+ DI::baseUrl()->redirect();
break; // NOTREACHED
}
// NOTREACHED
} else {
// Update the writable flag if it changed
- Logger::log('dfrn_poll: post request feed: ' . print_r($_POST, true), Logger::DATA);
+ Logger::debug('post request feed', ['post' => $_POST]);
if ($dfrn_version >= 2.21) {
if ($perm === 'rw') {
$writable = 1;
$my_id = '0:' . $dfrn_id;
break;
default:
- $a->internalRedirect();
+ DI::baseUrl()->redirect();
break; // NOTREACHED
}
// URL reply
if ($dfrn_version < 2.2) {
- $s = Network::fetchUrl($r[0]['poll']
- . '?dfrn_id=' . $encrypted_id
- . '&type=profile-check'
- . '&dfrn_version=' . DFRN_PROTOCOL_VERSION
- . '&challenge=' . $challenge
- . '&sec=' . $sec
+ $s = DI::httpRequest()->fetch($r[0]['poll']
+ . '?dfrn_id=' . $encrypted_id
+ . '&type=profile-check'
+ . '&dfrn_version=' . DFRN_PROTOCOL_VERSION
+ . '&challenge=' . $challenge
+ . '&sec=' . $sec
);
} else {
- $s = Network::post($r[0]['poll'], [
- 'dfrn_id' => $encrypted_id,
- 'type' => 'profile-check',
+ $s = DI::httpRequest()->post($r[0]['poll'], [
+ 'dfrn_id' => $encrypted_id,
+ 'type' => 'profile-check',
'dfrn_version' => DFRN_PROTOCOL_VERSION,
- 'challenge' => $challenge,
- 'sec' => $sec
+ 'challenge' => $challenge,
+ 'sec' => $sec
])->getBody();
}
if (strlen($s) && strstr($s, '<?xml')) {
$xml = XML::parseString($s);
- Logger::log('dfrn_poll: profile: parsed xml: ' . print_r($xml, true), Logger::DATA);
+ Logger::debug(' profile: parsed', ['xml' => $xml]);
Logger::log('dfrn_poll: secure profile: challenge: ' . $xml->challenge . ' expecting ' . $hash);
Logger::log('dfrn_poll: secure profile: sec: ' . $xml->sec . ' expecting ' . $sec);
Session::setVisitorsContacts();
if (!$quiet) {
- info(L10n::t('%1$s welcomes %2$s', $r[0]['username'], $r[0]['name']) . EOL);
+ info(DI::l10n()->t('%1$s welcomes %2$s', $r[0]['username'], $r[0]['name']));
}
// Visitors get 1 day session.
switch ($destination_url) {
case 'profile':
- $a->internalRedirect('profile/' . $profile . '?f=&tab=profile');
+ DI::baseUrl()->redirect('profile/' . $profile . '/profile');
break;
case 'photos':
- $a->internalRedirect('photos/' . $profile);
+ DI::baseUrl()->redirect('photos/' . $profile);
break;
case 'status':
case '':
- $a->internalRedirect('profile/' . $profile);
+ DI::baseUrl()->redirect('profile/' . $profile);
break;
default:
- $appendix = (strstr($destination_url, '?') ? '&f=&redir=1' : '?f=&redir=1');
- $a->redirect($destination_url . $appendix);
+ $appendix = (strstr($destination_url, '?') ? '&redir=1' : '?redir=1');
+ DI::baseUrl()->redirect($destination_url . $appendix);
break;
}
// NOTREACHED
projects / friendica.git / blobdiff