use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\L10n;
+use Friendica\Core\Logger;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\Module\Login;
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();
$sec = defaults($_GET, 'sec' , '');
$dfrn_version = (float) defaults($_GET, 'dfrn_version' , 2.0);
$perm = defaults($_GET, 'perm' , 'r');
- $quiet = x($_GET, 'quiet');
+ $quiet = !empty($_GET['quiet']);
// Possibly it is an OStatus compatible server that requests a user feed
$user_agent = defaults($_SERVER, 'HTTP_USER_AGENT', '');
$hidewall = false;
- if (($dfrn_id === '') && (!x($_POST, 'dfrn_id'))) {
+ if (($dfrn_id === '') && empty($_POST['dfrn_id'])) {
if (Config::get('system', 'block_public') && !local_user() && !remote_user()) {
System::httpExit(403);
}
$user = $r[0]['nickname'];
}
- logger('dfrn_poll: public feed request from ' . $_SERVER['REMOTE_ADDR'] . ' for ' . $user);
+ 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();
if (DBA::isResult($r)) {
$s = Network::fetchUrl($r[0]['poll'] . '?dfrn_id=' . $my_id . '&type=profile-check');
- logger("dfrn_poll: old profile returns " . $s, LOGGER_DATA);
+ Logger::log("dfrn_poll: old profile returns " . $s, Logger::DATA);
if (strlen($s)) {
$xml = XML::parseString($s);
if ((int)$xml->status === 1) {
$_SESSION['authenticated'] = 1;
- if (!x($_SESSION, 'remote')) {
+ if (empty($_SESSION['remote'])) {
$_SESSION['remote'] = [];
}
}
if ($final_dfrn_id != $orig_id) {
- logger('profile_check: ' . $final_dfrn_id . ' != ' . $orig_id, LOGGER_DEBUG);
+ Logger::log('profile_check: ' . $final_dfrn_id . ' != ' . $orig_id, Logger::DEBUG);
// did not decode properly - cannot trust this site
System::xmlExit(3, 'Bad decryption');
}
function dfrn_poll_post(App $a)
{
- $dfrn_id = x($_POST,'dfrn_id') ? $_POST['dfrn_id'] : '';
- $challenge = x($_POST,'challenge') ? $_POST['challenge'] : '';
- $url = x($_POST,'url') ? $_POST['url'] : '';
- $sec = x($_POST,'sec') ? $_POST['sec'] : '';
- $ptype = x($_POST,'type') ? $_POST['type'] : '';
- $dfrn_version = x($_POST,'dfrn_version') ? (float) $_POST['dfrn_version'] : 2.0;
- $perm = x($_POST,'perm') ? $_POST['perm'] : 'r';
+ $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;
if ($ptype === 'profile-check') {
if (strlen($challenge) && strlen($sec)) {
- logger('dfrn_poll: POST: profile-check');
+ Logger::log('dfrn_poll: POST: profile-check');
DBA::delete('profile_check', ["`expire` < ?", time()]);
$r = q("SELECT * FROM `profile_check` WHERE `sec` = '%s' ORDER BY `expire` DESC LIMIT 1",
}
if ($final_dfrn_id != $orig_id) {
- logger('profile_check: ' . $final_dfrn_id . ' != ' . $orig_id, LOGGER_DEBUG);
+ Logger::log('profile_check: ' . $final_dfrn_id . ' != ' . $orig_id, Logger::DEBUG);
// did not decode properly - cannot trust this site
System::xmlExit(3, 'Bad decryption');
}
// NOTREACHED
} else {
// Update the writable flag if it changed
- logger('dfrn_poll: post request feed: ' . print_r($_POST, true), LOGGER_DATA);
+ Logger::log('dfrn_poll: post request feed: ' . print_r($_POST, true), Logger::DATA);
if ($dfrn_version >= 2.21) {
if ($perm === 'rw') {
$writable = 1;
function dfrn_poll_content(App $a)
{
- $dfrn_id = x($_GET,'dfrn_id') ? $_GET['dfrn_id'] : '';
- $type = x($_GET,'type') ? $_GET['type'] : 'data';
- $last_update = x($_GET,'last_update') ? $_GET['last_update'] : '';
- $destination_url = x($_GET,'destination_url') ? $_GET['destination_url'] : '';
- $sec = x($_GET,'sec') ? $_GET['sec'] : '';
- $dfrn_version = x($_GET,'dfrn_version') ? (float) $_GET['dfrn_version'] : 2.0;
- $perm = x($_GET,'perm') ? $_GET['perm'] : 'r';
- $quiet = x($_GET,'quiet') ? true : false;
+ $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;
+ $quiet = !empty($_GET['quiet']);
$direction = -1;
if (strpos($dfrn_id, ':') == 1) {
if ($dfrn_id != '') {
// initial communication from external contact
- $hash = random_string();
+ $hash = Strings::getRandomHex();
$status = 0;
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));
}
])->getBody();
}
- logger("dfrn_poll: sec profile: " . $s, LOGGER_DATA);
+ Logger::log("dfrn_poll: sec profile: " . $s, Logger::DATA);
if (strlen($s) && strstr($s, '<?xml')) {
$xml = XML::parseString($s);
- logger('dfrn_poll: profile: parsed xml: ' . print_r($xml, true), LOGGER_DATA);
+ Logger::log('dfrn_poll: profile: parsed xml: ' . print_r($xml, true), Logger::DATA);
- logger('dfrn_poll: secure profile: challenge: ' . $xml->challenge . ' expecting ' . $hash);
- logger('dfrn_poll: secure profile: sec: ' . $xml->sec . ' expecting ' . $sec);
+ 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 (!x($_SESSION, 'remote')) {
+ if (empty($_SESSION['remote'])) {
$_SESSION['remote'] = [];
}
switch ($destination_url) {
case 'profile':
- $a->internalRedirect('profile/' . $profile . '?f=&tab=profile';
+ $a->internalRedirect('profile/' . $profile . '?f=&tab=profile');
break;
case 'photos':
- $a->internalRedirect('photos/' . $profile;
+ $a->internalRedirect('photos/' . $profile);
break;
case 'status':
case '':
- $a->internalRedirect('profile/' . $profile;
+ $a->internalRedirect('profile/' . $profile);
break;
default:
$appendix = (strstr($destination_url, '?') ? '&f=&redir=1' : '?f=&redir=1');
- System::externalRedirect($destination_url . $appendix);
+ $a->redirect($destination_url . $appendix);
break;
}
// NOTREACHED
projects / friendica.git / blobdiff