try to sort out walltowall translation for diaspora recipients

3 files changed, 7 insertions, 15 deletions

diff --git a/include/diaspora.php b/include/diaspora.php
index 3b6321643..b0943b7ec 100755
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -58,7 +58,7 @@ function diaspora_dispatch($importer,$msg,$attempt=1) {
 
 	$xmlbase = $parsed_xml->post;
 
-	logger('diaspora_dispatch: ' . print_r($xmlbase,true), LOGGER_DEBUG);
+	logger('diaspora_dispatch: ' . print_r($xmlbase,true), LOGGER_DATA);
 
 
 	if($xmlbase->request) {
@@ -545,7 +545,7 @@ function diaspora_decode($importer,$xml) {
 		 *  </decrypted_header>
 		 */
 
-		logger('decrypted: ' . $decrypted, LOGGER_DEBUG);
+		logger('decrypted: ' . $decrypted, LOGGER_DATA);
 		$idom = parse_xml_string($decrypted,false);
 
 		$inner_iv = base64_decode($idom->iv);
@@ -912,7 +912,7 @@ function diaspora_post($importer,$xml,$msg) {
 
 function diaspora_reshare($importer,$xml,$msg) {
 
-	logger('diaspora_reshare: init: ' . print_r($xml,true));
+	logger('diaspora_reshare: init: ' . print_r($xml,true), LOGGER_DATA);
 
 	$a = get_app();
 	$guid = notags(unxmlify($xml->guid));
@@ -955,7 +955,7 @@ function diaspora_reshare($importer,$xml,$msg) {
 		logger('diaspora_reshare: unable to fetch source url ' . $source_url);
 		return;
 	}
-	logger('diaspora_reshare: source: ' . $x['body']);
+	logger('diaspora_reshare: source: ' . $x['body'], LOGGER_DATA);
 
 	$source_xml = parse_xml_string($x['body'],false);
 
diff --git a/include/items.php b/include/items.php
index 1fa833eb2..840c92982 100755
--- a/include/items.php
+++ b/include/items.php
@@ -2469,18 +2469,10 @@ function store_diaspora_comment_sig($datarray, $channel, $parent_item, $post_id)
 		return;
 	}
 
-	$body = $datarray['body'];
-	if(array_key_exists('item_flags',$datarray) && ($datarray['item_flags'] & ITEM_OBSCURED)) {
-		$key = get_config('system','prvkey');
-		if($datarray['body'])
-			$body = crypto_unencapsulate(json_decode($datarray['body'],true),$key);
-	}
-
-	logger('mod_item: storing diaspora comment signature',LOGGER_DEBUG);
-
 	require_once('include/bb2diaspora.php');
+	$signed_body = bb2diaspora_itembody($datarray);
 
-	$signed_body = html_entity_decode(bb2diaspora($body));
+	logger('mod_item: storing diaspora comment signature',LOGGER_DEBUG);
 
 	$diaspora_handle = $channel['channel_address'] . '@' . get_app()->get_hostname();
 
diff --git a/include/onepoll.php b/include/onepoll.php
index 1f28852e9..98d52db93 100644
--- a/include/onepoll.php
+++ b/include/onepoll.php
@@ -135,7 +135,7 @@ function onepoll_run($argv, $argc){
 				foreach($j['messages'] as $message) {
 					$results = process_delivery(array('hash' => $contact['xchan_hash']), get_item_elements($message),
 						array(array('hash' => $importer['xchan_hash'])), false);
-					logger('onepoll: feed_update: process_delivery: ' . print_r($results,true));
+					logger('onepoll: feed_update: process_delivery: ' . print_r($results,true), LOGGER_DATA);
 					$total ++;
 				}
 				logger("onepoll: $total messages processed");