aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-03-30 04:20:40 -0700
committerFriendika <info@friendika.com>2011-03-30 04:20:40 -0700
commit04cd865cc94c1c3647beb567baf1bb64af269c4e (patch)
tree31d81f30eefda5a0dfb7e350ec275e9064fd538a
parentf198c5cff8932bc1d42c34869afecec6dcab2f46 (diff)
downloadvolse-hubzilla-04cd865cc94c1c3647beb567baf1bb64af269c4e.tar.gz
volse-hubzilla-04cd865cc94c1c3647beb567baf1bb64af269c4e.tar.bz2
volse-hubzilla-04cd865cc94c1c3647beb567baf1bb64af269c4e.zip
placeholder arg in dfrn conversations
-rw-r--r--include/items.php2
-rw-r--r--include/poller.php2
-rw-r--r--mod/dfrn_poll.php4
-rw-r--r--mod/dfrn_request.php2
4 files changed, 5 insertions, 5 deletions
diff --git a/include/items.php b/include/items.php
index 58fad9927..4a740e55b 100644
--- a/include/items.php
+++ b/include/items.php
@@ -762,7 +762,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
if(! $rino_enable)
$rino = 0;
- $url = $contact['notify'] . '&dfrn_id=' . $idtosend . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . (($rino) ? '&rino=1' : '');
+ $url = $contact['notify'] . '?f=&dfrn_id=' . $idtosend . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . (($rino) ? '&rino=1' : '');
logger('dfrn_deliver: ' . $url);
diff --git a/include/poller.php b/include/poller.php
index 8619697d9..98c55a2a9 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -167,7 +167,7 @@ function poller_run($argv, $argc){
if(intval($contact['duplex']) && $contact['issued-id'])
$idtosend = '1:' . $orig_id;
- $url = $contact['poll'] . '?dfrn_id=' . $idtosend
+ $url = $contact['poll'] . '?f=&dfrn_id=' . $idtosend
. '&dfrn_version=' . DFRN_PROTOCOL_VERSION
. '&type=data&last_update=' . $last_update ;
diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index eb499fbd1..686a42d08 100644
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -63,7 +63,7 @@ function dfrn_poll_init(&$a) {
if(count($r)) {
- $s = fetch_url($r[0]['poll'] . '&dfrn_id=' . $my_id . '&type=profile-check');
+ $s = fetch_url($r[0]['poll'] . '?f=&dfrn_id=' . $my_id . '&type=profile-check');
logger("dfrn_poll: old profile returns " . $s, LOGGER_DATA);
@@ -366,7 +366,7 @@ function dfrn_poll_content(&$a) {
// URL reply
$s = fetch_url($r[0]['poll']
- . '&dfrn_id=' . $encrypted_id
+ . '?f=&dfrn_id=' . $encrypted_id
. '&type=profile-check'
. '&dfrn_version=' . DFRN_PROTOCOL_VERSION
. '&challenge=' . $challenge
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index f1af1ce4c..cc6355078 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -172,7 +172,7 @@ function dfrn_request_post(&$a) {
$dfrn_request = $contact_record['request'];
if(strlen($dfrn_request) && strlen($confirm_key))
- $s = fetch_url($dfrn_request . '&confirm_key=' . $confirm_key);
+ $s = fetch_url($dfrn_request . '?f=&confirm_key=' . $confirm_key);
// (ignore reply, nothing we can do it failed)