Merge remote-tracking branch 'upstream/develop' into 1508-vier-popup-menu

Conflicts:
	mod/dfrn_notify.php

include/items.php

@@ -1990,8 +1990,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
 	$rino = get_config('system','rino_encrypt');
 	$rino = intval($rino);
 
-   
-
+	logger("Local rino version: ". $rino, LOGGER_DEBUG);
 
 	$ssl_val = intval(get_config('system','ssl_policy'));
 	$ssl_policy = '';
@@ -2043,6 +2042,8 @@ 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." for ".$contact["url"], LOGGER_DEBUG);
+
 	if($owner['page-flags'] == PAGE_PRVGROUP)
 		$page = 2;
 

mod/dfrn_notify.php

@@ -93,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),
@@ -132,6 +134,10 @@ function dfrn_notify_post(&$a) {
 	if($importer['page-flags'] == PAGE_SOAPBOX)
 		xml_status(0);
 
+	$rino = get_config('system','rino_encrypt');
+	$rino = intval($rino);
+
+	logger("Local rino version: ". $rino, LOGGER_DEBUG);
 
 	if(strlen($key)) {
 
@@ -273,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);
@@ -299,6 +307,8 @@ function dfrn_notify_content(&$a) {
 		$rino = get_config('system','rino_encrypt');
 		$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 higher than enabled local rino, reply with local rino
 		if ($rino_remote < $rino) $rino = $rino_remote;