diff --git a/include/items.php b/include/items.php index a5184abde4..cc03a77646 100644 --- a/include/items.php +++ b/include/items.php @@ -2042,7 +2042,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) { $rino_remote_version = intval($res->rino); $page = (($owner['page-flags'] == PAGE_COMMUNITY) ? 1 : 0); - logger("Remote rino version: ".$rino_remote_version, LOGGER_DEBUG); + logger("Remote rino version: ".$rino_remote_version." for ".$contact["url"], LOGGER_DEBUG); if($owner['page-flags'] == PAGE_PRVGROUP) $page = 2; diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php index ba81e4712a..edf419e929 100644 --- a/mod/dfrn_notify.php +++ b/mod/dfrn_notify.php @@ -33,8 +33,6 @@ function dfrn_notify_post(&$a) { $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", dbesc($dfrn_id), dbesc($challenge) @@ -95,6 +93,8 @@ function dfrn_notify_post(&$a) { $importer = $r[0]; + logger("Remote rino version: ".$rino_remote." for ".$importer["url"], LOGGER_DEBUG); + if((($writable != (-1)) && ($writable != $importer['writable'])) || ($importer['forum'] != $forum) || ($importer['prv'] != $prv)) { q("UPDATE `contact` SET `writable` = %d, forum = %d, prv = %d WHERE `id` = %d", intval(($writable == (-1)) ? $importer['writable'] : $writable), @@ -228,8 +228,6 @@ function dfrn_notify_content(&$a) { logger('dfrn_notify: new notification dfrn_id=' . $dfrn_id); - logger("Remote rino version: ".$rino_remote, LOGGER_DEBUG); - $direction = (-1); if(strpos($dfrn_id,':') == 1) { $direction = intval(substr($dfrn_id,0,1)); @@ -281,6 +279,8 @@ function dfrn_notify_content(&$a) { if(! count($r)) $status = 1; + logger("Remote rino version: ".$rino_remote." for ".$r[0]["url"], LOGGER_DEBUG); + $challenge = ''; $encrypted_id = ''; $id_str = $my_id . '.' . mt_rand(1000,9999);