X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fdfrn_poll.php;h=5b72c0bf940cec4fa7d4ac0c643430c9b1e4c425;hb=4a47425bfd64f5ba04139899880fce21ddcc0623;hp=ecca0adf7c3eade53825611dea2134120e9b8a18;hpb=22fedc9a1ae1f97ee3de18e531c3fe20122a84d2;p=friendica.git
diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index ecca0adf7c..5b72c0bf94 100644
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -17,8 +17,6 @@ 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();
@@ -30,8 +28,7 @@ function dfrn_poll_init(App $a)
$challenge = defaults($_GET, 'challenge' , '');
$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', '');
@@ -39,7 +36,7 @@ function dfrn_poll_init(App $a)
$nickname = $a->argv[1];
header("Content-type: application/atom+xml");
echo OStatus::feed($nickname, $last_update, 10);
- killme();
+ exit();
}
$direction = -1;
@@ -51,7 +48,7 @@ function dfrn_poll_init(App $a)
$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);
}
@@ -73,7 +70,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))) {
@@ -113,7 +110,7 @@ function dfrn_poll_init(App $a)
if ((int)$xml->status === 1) {
$_SESSION['authenticated'] = 1;
- if (!x($_SESSION, 'remote')) {
+ if (empty($_SESSION['remote'])) {
$_SESSION['remote'] = [];
}
@@ -200,7 +197,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 +227,13 @@ function dfrn_poll_init(App $a)
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)) {
@@ -292,7 +289,7 @@ function dfrn_poll_post(App $a)
header("Content-type: text/xml");
echo "0$decoded_challenge$sec";
- killme();
+ exit();
// NOTREACHED
}
}
@@ -309,7 +306,7 @@ function dfrn_poll_post(App $a)
);
if (!DBA::isResult($r)) {
- killme();
+ exit();
}
$type = $r[0]['type'];
@@ -321,15 +318,12 @@ 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();
@@ -338,7 +332,7 @@ function dfrn_poll_post(App $a)
$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,7 +364,7 @@ function dfrn_poll_post(App $a)
$text
";
- killme();
+ exit();
// NOTREACHED
} else {
// Update the writable flag if it changed
@@ -393,20 +387,19 @@ 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 = 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) {
@@ -423,7 +416,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),
@@ -437,7 +430,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));
}
@@ -524,7 +517,7 @@ function dfrn_poll_content(App $a)
if (((int) $xml->status == 0) && ($xml->challenge == $hash) && ($xml->sec == $sec)) {
$_SESSION['authenticated'] = 1;
- if (!x($_SESSION, 'remote')) {
+ if (empty($_SESSION['remote'])) {
$_SESSION['remote'] = [];
}
@@ -562,11 +555,7 @@ function dfrn_poll_content(App $a)
break;
default:
$appendix = (strstr($destination_url, '?') ? '&f=&redir=1' : '?f=&redir=1');
- if (filter_var($url, FILTER_VALIDATE_URL)) {
- System::externalRedirect($destination_url . $appendix);
- } else {
- $a->internalRedirect($destination_url . $appendix);
- }
+ $a->redirect($destination_url . $appendix);
break;
}
// NOTREACHED
@@ -580,7 +569,7 @@ function dfrn_poll_content(App $a)
. "\t" . '' . $encrypted_id . '' . "\r\n"
. "\t" . '' . $challenge . '' . "\r\n"
. '' . "\r\n";
- killme();
+ exit();
// NOTREACHED
}
}