X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_poll.php;h=3d073dc8ead9cf1fa1cc4d5ea856299d74c43d39;hb=a7d75702cc43b13b6100d993df6d8d409e5e2351;hp=001202d5e564e639d9f464d9ac4937db230a2112;hpb=6510df410d45c9e442c6981db40f07cc600df725;p=friendica.git diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php index 001202d5e5..3d073dc8ea 100644 --- a/mod/dfrn_poll.php +++ b/mod/dfrn_poll.php @@ -1,45 +1,55 @@ . + * */ use Friendica\App; -use Friendica\Core\Config; -use Friendica\Core\L10n; use Friendica\Core\Logger; +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; -require_once 'include/items.php'; - 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); - $perm = defaults($_GET, 'perm' , 'r'); + 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"); echo OStatus::feed($nickname, $last_update, 10); - killme(); + exit(); } $direction = -1; @@ -52,8 +62,8 @@ function dfrn_poll_init(App $a) $hidewall = false; if (($dfrn_id === '') && empty($_POST['dfrn_id'])) { - if (Config::get('system', 'block_public') && !local_user() && !remote_user()) { - System::httpExit(403); + if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) { + throw new \Friendica\Network\HTTPException\ForbiddenException(); } $user = ''; @@ -62,7 +72,7 @@ function dfrn_poll_init(App $a) DBA::escape($a->argv[1]) ); if (!$r) { - System::httpExit(404); + throw new \Friendica\Network\HTTPException\NotFoundException(); } $hidewall = ($r[0]['hidewall'] && !local_user()); @@ -73,7 +83,7 @@ function dfrn_poll_init(App $a) Logger::log('dfrn_poll: public feed request from ' . $_SERVER['REMOTE_ADDR'] . ' for ' . $user); header("Content-type: application/atom+xml"); echo DFRN::feed('', $user, $last_update, 0, $hidewall); - killme(); + exit(); } if (($type === 'profile') && (!strlen($sec))) { @@ -92,7 +102,7 @@ function dfrn_poll_init(App $a) $my_id = '0:' . $dfrn_id; break; default: - $a->internalRedirect(); + DI::baseUrl()->redirect(); break; // NOTREACHED } @@ -104,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); @@ -113,19 +123,16 @@ function dfrn_poll_init(App $a) if ((int)$xml->status === 1) { $_SESSION['authenticated'] = 1; - if (empty($_SESSION['remote'])) { - $_SESSION['remote'] = []; - } - - $_SESSION['remote'][] = ['cid' => $r[0]['id'], 'uid' => $r[0]['uid'], 'url' => $r[0]['url']]; - $_SESSION['visitor_id'] = $r[0]['id']; $_SESSION['visitor_home'] = $r[0]['url']; $_SESSION['visitor_handle'] = $r[0]['addr']; $_SESSION['visitor_visiting'] = $r[0]['uid']; $_SESSION['my_url'] = $r[0]['url']; + + 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. @@ -142,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) { @@ -200,7 +207,7 @@ function dfrn_poll_init(App $a) header("Content-type: text/xml"); echo "0$decoded_challenge$sec"; - killme(); + exit(); // NOTREACHED } else { // old protocol @@ -230,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)) { @@ -292,7 +299,7 @@ function dfrn_poll_post(App $a) header("Content-type: text/xml"); echo "0$decoded_challenge$sec"; - killme(); + exit(); // NOTREACHED } } @@ -309,7 +316,7 @@ function dfrn_poll_post(App $a) ); if (!DBA::isResult($r)) { - killme(); + exit(); } $type = $r[0]['type']; @@ -321,24 +328,21 @@ function dfrn_poll_post(App $a) switch ($direction) { case -1: $sql_extra = sprintf(" AND `issued-id` = '%s' ", DBA::escape($dfrn_id)); - $my_id = $dfrn_id; break; case 0: $sql_extra = sprintf(" AND `issued-id` = '%s' AND `duplex` = 1 ", DBA::escape($dfrn_id)); - $my_id = '1:' . $dfrn_id; break; case 1: $sql_extra = sprintf(" AND `dfrn-id` = '%s' AND `duplex` = 1 ", DBA::escape($dfrn_id)); - $my_id = '0:' . $dfrn_id; break; default: - $a->internalRedirect(); + DI::baseUrl()->redirect(); break; // NOTREACHED } $r = q("SELECT * FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 $sql_extra LIMIT 1"); if (!DBA::isResult($r)) { - killme(); + exit(); } $contact = $r[0]; @@ -370,11 +374,11 @@ function dfrn_poll_post(App $a) $text "; - killme(); + exit(); // 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; @@ -393,18 +397,18 @@ function dfrn_poll_post(App $a) header("Content-type: application/atom+xml"); $o = DFRN::feed($dfrn_id, $a->argv[1], $last_update, $direction); echo $o; - killme(); + exit(); } } 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; @@ -422,7 +426,7 @@ function dfrn_poll_content(App $a) DBA::delete('challenge', ["`expire` < ?", time()]); if ($type !== 'profile') { - $r = q("INSERT INTO `challenge` ( `challenge`, `dfrn-id`, `expire` , `type`, `last_update` ) + q("INSERT INTO `challenge` ( `challenge`, `dfrn-id`, `expire` , `type`, `last_update` ) VALUES( '%s', '%s', '%s', '%s', '%s' ) ", DBA::escape($hash), DBA::escape($dfrn_id), @@ -436,7 +440,7 @@ function dfrn_poll_content(App $a) switch ($direction) { case -1: if ($type === 'profile') { - $sql_extra = sprintf(" AND ( `dfrn-id` = '%s' OR `issued-id` = '%s' ) ", DBA::escape($dfrn_id), DBA::escape($dfrn_id)); + $sql_extra = sprintf(" AND (`dfrn-id` = '%s' OR `issued-id` = '%s') ", DBA::escape($dfrn_id), DBA::escape($dfrn_id)); } else { $sql_extra = sprintf(" AND `issued-id` = '%s' ", DBA::escape($dfrn_id)); } @@ -452,7 +456,7 @@ function dfrn_poll_content(App $a) $my_id = '0:' . $dfrn_id; break; default: - $a->internalRedirect(); + DI::baseUrl()->redirect(); break; // NOTREACHED } @@ -489,25 +493,25 @@ function dfrn_poll_content(App $a) // heluecht: I don't know why we don't fail immediately when the user or contact hadn't been found. // Since it doesn't make sense to continue from this point on, we now fail here. This should be safe. if (!DBA::isResult($r)) { - System::httpExit(404, ["title" => L10n::t('Page not found.')]); + throw new \Friendica\Network\HTTPException\NotFoundException(); } // 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(); } @@ -516,24 +520,22 @@ 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); if (((int) $xml->status == 0) && ($xml->challenge == $hash) && ($xml->sec == $sec)) { $_SESSION['authenticated'] = 1; - if (empty($_SESSION['remote'])) { - $_SESSION['remote'] = []; - } - - $_SESSION['remote'][] = ['cid' => $r[0]['id'], 'uid' => $r[0]['uid'], 'url' => $r[0]['url']]; $_SESSION['visitor_id'] = $r[0]['id']; $_SESSION['visitor_home'] = $r[0]['url']; $_SESSION['visitor_visiting'] = $r[0]['uid']; $_SESSION['my_url'] = $r[0]['url']; + + 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. @@ -550,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 @@ -575,7 +577,7 @@ function dfrn_poll_content(App $a) . "\t" . '' . $encrypted_id . '' . "\r\n" . "\t" . '' . $challenge . '' . "\r\n" . '' . "\r\n"; - killme(); + exit(); // NOTREACHED } }