X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_poll.php;h=3d073dc8ead9cf1fa1cc4d5ea856299d74c43d39;hb=fd1da749808cdfccf05a4fa9ba8ba6aeafd35a9b;hp=c6134bb45d48ee636606a0059377d0776c376a84;hpb=185f1fc6877ba4913db09509d36fedea3a6327b2;p=friendica.git diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php index c6134bb45d..3d073dc8ea 100644 --- a/mod/dfrn_poll.php +++ b/mod/dfrn_poll.php @@ -1,38 +1,50 @@ . + * */ use Friendica\App; -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) { - Login::sessionAuth(); - - $dfrn_id = defaults($_GET, 'dfrn_id' , ''); - $type = defaults($_GET, 'type' , 'data'); - $last_update = defaults($_GET, 'last_update' , ''); - $destination_url = defaults($_GET, 'destination_url', ''); - $challenge = defaults($_GET, 'challenge' , ''); - $sec = defaults($_GET, 'sec' , ''); - $dfrn_version = (float) defaults($_GET, 'dfrn_version' , 2.0); + DI::auth()->withSession($a); + + $dfrn_id = $_GET['dfrn_id'] ?? ''; + $type = ($_GET['type'] ?? '') ?: 'data'; + $last_update = $_GET['last_update'] ?? ''; + $destination_url = $_GET['destination_url'] ?? ''; + $challenge = $_GET['challenge'] ?? ''; + $sec = $_GET['sec'] ?? ''; + $dfrn_version = floatval(($_GET['dfrn_version'] ?? 0.0) ?: 2.0); $quiet = !empty($_GET['quiet']); // Possibly it is an OStatus compatible server that requests a user feed - $user_agent = defaults($_SERVER, 'HTTP_USER_AGENT', ''); + $user_agent = $_SERVER['HTTP_USER_AGENT'] ?? ''; if (($a->argc > 1) && ($dfrn_id == '') && !strstr($user_agent, 'Friendica')) { $nickname = $a->argv[1]; header("Content-type: application/atom+xml"); @@ -50,7 +62,7 @@ function dfrn_poll_init(App $a) $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(); } @@ -90,7 +102,7 @@ function dfrn_poll_init(App $a) $my_id = '0:' . $dfrn_id; break; default: - $a->internalRedirect(); + DI::baseUrl()->redirect(); break; // NOTREACHED } @@ -102,7 +114,7 @@ function dfrn_poll_init(App $a) ); 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); @@ -120,7 +132,7 @@ function dfrn_poll_init(App $a) 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. @@ -137,10 +149,10 @@ function dfrn_poll_init(App $a) 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) { @@ -225,13 +237,13 @@ function dfrn_poll_init(App $a) function dfrn_poll_post(App $a) { - $dfrn_id = defaults($_POST, 'dfrn_id' , ''); - $challenge = defaults($_POST, 'challenge', ''); - $url = defaults($_POST, 'url' , ''); - $sec = defaults($_POST, 'sec' , ''); - $ptype = defaults($_POST, 'type' , ''); - $perm = defaults($_POST, 'perm' , 'r'); - $dfrn_version = !empty($_POST['dfrn_version']) ? (float) $_POST['dfrn_version'] : 2.0; + $dfrn_id = $_POST['dfrn_id'] ?? ''; + $challenge = $_POST['challenge'] ?? ''; + $url = $_POST['url'] ?? ''; + $sec = $_POST['sec'] ?? ''; + $ptype = $_POST['type'] ?? ''; + $perm = ($_POST['perm'] ?? '') ?: 'r'; + $dfrn_version = floatval(($_GET['dfrn_version'] ?? 0.0) ?: 2.0); if ($ptype === 'profile-check') { if (strlen($challenge) && strlen($sec)) { @@ -324,7 +336,7 @@ function dfrn_poll_post(App $a) $sql_extra = sprintf(" AND `dfrn-id` = '%s' AND `duplex` = 1 ", DBA::escape($dfrn_id)); break; default: - $a->internalRedirect(); + DI::baseUrl()->redirect(); break; // NOTREACHED } @@ -366,7 +378,7 @@ function dfrn_poll_post(App $a) // 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; @@ -391,12 +403,12 @@ function dfrn_poll_post(App $a) function dfrn_poll_content(App $a) { - $dfrn_id = defaults($_GET, 'dfrn_id' , ''); - $type = defaults($_GET, 'type' , 'data'); - $last_update = defaults($_GET, 'last_update' , ''); - $destination_url = defaults($_GET, 'destination_url', ''); - $sec = defaults($_GET, 'sec' , ''); - $dfrn_version = !empty($_GET['dfrn_version']) ? (float) $_GET['dfrn_version'] : 2.0; + $dfrn_id = $_GET['dfrn_id'] ?? ''; + $type = ($_GET['type'] ?? '') ?: 'data'; + $last_update = $_GET['last_update'] ?? ''; + $destination_url = $_GET['destination_url'] ?? ''; + $sec = $_GET['sec'] ?? ''; + $dfrn_version = floatval(($_GET['dfrn_version'] ?? 0.0) ?: 2.0); $quiet = !empty($_GET['quiet']); $direction = -1; @@ -444,7 +456,7 @@ function dfrn_poll_content(App $a) $my_id = '0:' . $dfrn_id; break; default: - $a->internalRedirect(); + DI::baseUrl()->redirect(); break; // NOTREACHED } @@ -486,20 +498,20 @@ function dfrn_poll_content(App $a) // 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(); } @@ -508,7 +520,7 @@ function dfrn_poll_content(App $a) if (strlen($s) && strstr($s, ' $xml]); Logger::log('dfrn_poll: secure profile: challenge: ' . $xml->challenge . ' expecting ' . $hash); Logger::log('dfrn_poll: secure profile: sec: ' . $xml->sec . ' expecting ' . $sec); @@ -523,7 +535,7 @@ function dfrn_poll_content(App $a) 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. @@ -540,18 +552,18 @@ function dfrn_poll_content(App $a) 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