We now use a central function for fetching the postdata
This commit is contained in:
parent
f8b8a5a52b
commit
b4c673a620
7 changed files with 21 additions and 6 deletions
|
@ -1267,7 +1267,7 @@ function api_media_metadata_create($type)
|
||||||
|
|
||||||
api_get_user($a);
|
api_get_user($a);
|
||||||
|
|
||||||
$postdata = file_get_contents('php://input');
|
$postdata = Network::postdata();
|
||||||
|
|
||||||
if (empty($postdata)) {
|
if (empty($postdata)) {
|
||||||
throw new BadRequestException("No post data");
|
throw new BadRequestException("No post data");
|
||||||
|
|
|
@ -16,11 +16,12 @@ use Friendica\Model\User;
|
||||||
use Friendica\Protocol\DFRN;
|
use Friendica\Protocol\DFRN;
|
||||||
use Friendica\Protocol\Diaspora;
|
use Friendica\Protocol\Diaspora;
|
||||||
use Friendica\Util\Strings;
|
use Friendica\Util\Strings;
|
||||||
|
use Friendica\Util\Network;
|
||||||
|
|
||||||
function dfrn_notify_post(App $a) {
|
function dfrn_notify_post(App $a) {
|
||||||
Logger::log(__function__, Logger::TRACE);
|
Logger::log(__function__, Logger::TRACE);
|
||||||
|
|
||||||
$postdata = file_get_contents('php://input');
|
$postdata = Network::postdata();
|
||||||
|
|
||||||
if (empty($_POST) || !empty($postdata)) {
|
if (empty($_POST) || !empty($postdata)) {
|
||||||
$data = json_decode($postdata);
|
$data = json_decode($postdata);
|
||||||
|
|
|
@ -7,6 +7,7 @@ use Friendica\Database\DBA;
|
||||||
use Friendica\Model\Contact;
|
use Friendica\Model\Contact;
|
||||||
use Friendica\Protocol\OStatus;
|
use Friendica\Protocol\OStatus;
|
||||||
use Friendica\Util\Strings;
|
use Friendica\Util\Strings;
|
||||||
|
use Friendica\Util\Network;
|
||||||
use Friendica\Core\System;
|
use Friendica\Core\System;
|
||||||
|
|
||||||
function hub_return($valid, $body)
|
function hub_return($valid, $body)
|
||||||
|
@ -83,7 +84,7 @@ function pubsub_init(App $a)
|
||||||
|
|
||||||
function pubsub_post(App $a)
|
function pubsub_post(App $a)
|
||||||
{
|
{
|
||||||
$xml = file_get_contents('php://input');
|
$xml = Network::postdata();
|
||||||
|
|
||||||
Logger::log('Feed arrived from ' . $_SERVER['REMOTE_ADDR'] . ' for ' . $a->cmd . ' with user-agent: ' . $_SERVER['HTTP_USER_AGENT']);
|
Logger::log('Feed arrived from ' . $_SERVER['REMOTE_ADDR'] . ' for ' . $a->cmd . ' with user-agent: ' . $_SERVER['HTTP_USER_AGENT']);
|
||||||
Logger::log('Data: ' . $xml, Logger::DATA);
|
Logger::log('Data: ' . $xml, Logger::DATA);
|
||||||
|
|
|
@ -10,6 +10,7 @@ use Friendica\Core\Logger;
|
||||||
use Friendica\Core\System;
|
use Friendica\Core\System;
|
||||||
use Friendica\Database\DBA;
|
use Friendica\Database\DBA;
|
||||||
use Friendica\Protocol\Diaspora;
|
use Friendica\Protocol\Diaspora;
|
||||||
|
use Friendica\Util\Network;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param App $a App
|
* @param App $a App
|
||||||
|
@ -47,7 +48,7 @@ function receive_post(App $a)
|
||||||
Logger::log('mod-diaspora: receiving post', Logger::DEBUG);
|
Logger::log('mod-diaspora: receiving post', Logger::DEBUG);
|
||||||
|
|
||||||
if (empty($_POST['xml'])) {
|
if (empty($_POST['xml'])) {
|
||||||
$postdata = file_get_contents("php://input");
|
$postdata = Network::postdata();
|
||||||
if ($postdata == '') {
|
if ($postdata == '') {
|
||||||
throw new \Friendica\Network\HTTPException\InternalServerErrorException();
|
throw new \Friendica\Network\HTTPException\InternalServerErrorException();
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,11 +13,12 @@ use Friendica\Protocol\OStatus;
|
||||||
use Friendica\Protocol\Salmon;
|
use Friendica\Protocol\Salmon;
|
||||||
use Friendica\Util\Crypto;
|
use Friendica\Util\Crypto;
|
||||||
use Friendica\Util\Strings;
|
use Friendica\Util\Strings;
|
||||||
|
use Friendica\Util\Network;
|
||||||
|
|
||||||
function salmon_post(App $a, $xml = '') {
|
function salmon_post(App $a, $xml = '') {
|
||||||
|
|
||||||
if (empty($xml)) {
|
if (empty($xml)) {
|
||||||
$xml = file_get_contents('php://input');
|
$xml = Network::postdata();
|
||||||
}
|
}
|
||||||
|
|
||||||
Logger::log('new salmon ' . $xml, Logger::DATA);
|
Logger::log('new salmon ' . $xml, Logger::DATA);
|
||||||
|
|
|
@ -12,6 +12,7 @@ use Friendica\Core\System;
|
||||||
use Friendica\Database\DBA;
|
use Friendica\Database\DBA;
|
||||||
use Friendica\Protocol\ActivityPub;
|
use Friendica\Protocol\ActivityPub;
|
||||||
use Friendica\Util\HTTPSignature;
|
use Friendica\Util\HTTPSignature;
|
||||||
|
use Friendica\Util\Network;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* ActivityPub Inbox
|
* ActivityPub Inbox
|
||||||
|
@ -22,7 +23,7 @@ class Inbox extends BaseModule
|
||||||
{
|
{
|
||||||
$a = self::getApp();
|
$a = self::getApp();
|
||||||
|
|
||||||
$postdata = file_get_contents('php://input');
|
$postdata = Network::postdata();
|
||||||
|
|
||||||
if (empty($postdata)) {
|
if (empty($postdata)) {
|
||||||
throw new \Friendica\Network\HTTPException\BadRequestException();
|
throw new \Friendica\Network\HTTPException\BadRequestException();
|
||||||
|
|
|
@ -342,6 +342,16 @@ class Network
|
||||||
return $curlResponse;
|
return $curlResponse;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return raw post data from a post request
|
||||||
|
*
|
||||||
|
* @return string post data
|
||||||
|
*/
|
||||||
|
public static function postdata()
|
||||||
|
{
|
||||||
|
return file_get_contents('php://input');
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Check URL to see if it's real
|
* @brief Check URL to see if it's real
|
||||||
*
|
*
|
||||||
|
|
Loading…
Reference in a new issue