nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Rino Bugfix: A variable was used that never was fetched

Browse source
This commit is contained in:
Michael Vogel 2015-08-29 11:38:40 +02:00
parent ba6741932a
commit 38c8431527
2 changed files with 30 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/items.php
View file

@ -1990,8 +1990,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
$rino = get_config('system','rino_encrypt'); $rino = get_config('system','rino_encrypt');
$rino = intval($rino); $rino = intval($rino);
logger("Local rino version: ". $rino, LOGGER_DEBUG);
$ssl_val = intval(get_config('system','ssl_policy')); $ssl_val = intval(get_config('system','ssl_policy'));
$ssl_policy = ''; $ssl_policy = '';
@ -2043,6 +2042,8 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
$rino_remote_version = intval($res->rino); $rino_remote_version = intval($res->rino);
$page = (($owner['page-flags'] == PAGE_COMMUNITY) ? 1 : 0); $page = (($owner['page-flags'] == PAGE_COMMUNITY) ? 1 : 0);
logger("Remote rino version: ".$rino_remote_version, LOGGER_DEBUG);
if($owner['page-flags'] == PAGE_PRVGROUP) if($owner['page-flags'] == PAGE_PRVGROUP)
$page = 2; $page = 2;

12
mod/dfrn_notify.php
View file

@ -33,6 +33,8 @@ function dfrn_notify_post(&$a) {
$dfrn_id = substr($dfrn_id,2); $dfrn_id = substr($dfrn_id,2);
} }
logger("Remote rino version: ".$rino_remote, LOGGER_DEBUG);
$r = q("SELECT * FROM `challenge` WHERE `dfrn-id` = '%s' AND `challenge` = '%s' LIMIT 1", $r = q("SELECT * FROM `challenge` WHERE `dfrn-id` = '%s' AND `challenge` = '%s' LIMIT 1",
dbesc($dfrn_id), dbesc($dfrn_id),
dbesc($challenge) dbesc($challenge)
@ -132,6 +134,10 @@ function dfrn_notify_post(&$a) {
if($importer['page-flags'] == PAGE_SOAPBOX) if($importer['page-flags'] == PAGE_SOAPBOX)
xml_status(0); xml_status(0);
$rino = get_config('system','rino_encrypt');
$rino = intval($rino);
logger("Local rino version: ". $rino, LOGGER_DEBUG);
if(strlen($key)) { if(strlen($key)) {
@ -222,6 +228,8 @@ function dfrn_notify_content(&$a) {
logger('dfrn_notify: new notification dfrn_id=' . $dfrn_id); logger('dfrn_notify: new notification dfrn_id=' . $dfrn_id);
logger("Remote rino version: ".$rino_remote, LOGGER_DEBUG);
$direction = (-1); $direction = (-1);
if(strpos($dfrn_id,':') == 1) { if(strpos($dfrn_id,':') == 1) {
$direction = intval(substr($dfrn_id,0,1)); $direction = intval(substr($dfrn_id,0,1));
@ -243,7 +251,7 @@ function dfrn_notify_content(&$a) {
dbesc($last_update) dbesc($last_update)
); );
logger('dfrn_notify: challenge=' . $hash, LOGGER_DEBUG ); logger('dfrn_notify: challenge=' . $hash, LOGGER_DEBUG);
$sql_extra = ''; $sql_extra = '';
switch($direction) { switch($direction) {
@ -299,6 +307,8 @@ function dfrn_notify_content(&$a) {
$rino = get_config('system','rino_encrypt'); $rino = get_config('system','rino_encrypt');
$rino = intval($rino); $rino = intval($rino);
logger("Local rino version: ". $rino, LOGGER_DEBUG);
// if requested rino is lower than enabled local rino, lower local rino version // if requested rino is lower than enabled local rino, lower local rino version
// if requested rino is higher than enabled local rino, reply with local rino // if requested rino is higher than enabled local rino, reply with local rino
if ($rino_remote < $rino) $rino = $rino_remote; if ($rino_remote < $rino) $rino = $rino_remote;