From 5d6155a9685202b055744549a2cb84e3d8195fd2 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 15 Aug 2011 05:27:24 -0700
Subject: [PATCH] fixes share from diaspora

---
 include/Scrape.php   | 2 +-
 include/diaspora.php | 9 ++++++---
 mod/receive.php      | 4 ++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/include/Scrape.php b/include/Scrape.php
index b32d7283e5..bfe795e19d 100644
--- a/include/Scrape.php
+++ b/include/Scrape.php
@@ -494,7 +494,7 @@ function probe_url($url) {
 
 		if($check_feed) {
 
-			$feedret = scrape_feed($url);
+			$feedret = scrape_feed(($poll) ? $poll : $url);
 			logger('probe_url: scrape_feed returns: ' . print_r($feedret,true), LOGGER_DATA);
 			if(count($feedret) && ($feedret['feed_atom'] || $feedret['feed_rss'])) {
 				$poll = ((x($feedret,'feed_atom')) ? unamp($feedret['feed_atom']) : unamp($feedret['feed_rss']));
diff --git a/include/diaspora.php b/include/diaspora.php
index 38ee8c1e53..edb273d3cf 100644
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -116,6 +116,8 @@ EOT;
 
 function diaspora_decode($importer,$xml) {
 
+
+
 	$basedom = parse_xml_string($xml);
 
 	$atom = $basedom->children(NAMESPACE_ATOM1);
@@ -129,7 +131,7 @@ function diaspora_decode($importer,$xml) {
 	openssl_private_decrypt($encrypted_aes_key_bundle,$outer_key_bundle,$importer['prvkey']);
 
 	$j_outer_key_bundle = json_decode($outer_key_bundle);
-
+logger('outer: ' . $j_outer_key_bundle);
 	$outer_iv = base64_decode($j_outer_key_bundle->iv);
 	$outer_key = base64_decode($j_outer_key_bundle->key);
 
@@ -150,6 +152,7 @@ function diaspora_decode($importer,$xml) {
 	 *  </decrypted_header>
 	 */
 
+	logger('decrypted: ' . $decrypted);
 	$idom = parse_xml_string($decrypted,false);
 
 	$inner_iv = base64_decode($idom->iv);
@@ -301,8 +304,8 @@ function diaspora_request($importer,$contact,$xml) {
 	$hash = random_string() . (string) time();   // Generate a confirm_key
 	
 	if(is_array($contact_record)) {
-		$ret = q("INSERT INTO `intro` ( `uid`, `contact-id`, `blocked`, `knowyou`, `note`, `hash`, `datetime`)
-			VALUES ( %d, %d, 1, %d, '%s', '%s', '%s' )",
+		$ret = q("INSERT INTO `intro` ( `uid`, `contact-id`, `blocked`, `knowyou`, `note`, `hash`, `datetime`,`blocked`)
+			VALUES ( %d, %d, 1, %d, '%s', '%s', '%s', 0 )",
 			intval($importer['uid']),
 			intval($contact_record['id']),
 			0,
diff --git a/mod/receive.php b/mod/receive.php
index 72d528093b..43f8c7bbcd 100644
--- a/mod/receive.php
+++ b/mod/receive.php
@@ -26,7 +26,7 @@ function receive_post(&$a) {
 
 	$importer = $r[0];
 
-	$xml = $_POST['xml'];
+	$xml = urldecode($_POST['xml']);
 
 	logger('mod-diaspora: new salmon ' . $xml, LOGGER_DATA);
 
@@ -38,7 +38,7 @@ function receive_post(&$a) {
 		http_status_exit(500);
 
 
-	$parsed_xml = parse_xml_string($msg);
+	$parsed_xml = parse_xml_string($msg,false);
 
 	$xmlbase = $parsed_xml->post;