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

fixes share from diaspora

Browse source
This commit is contained in:
Friendika 2011-08-15 05:27:24 -07:00
parent 9cd77b56ab
commit 5d6155a968
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/Scrape.php
View file

@ -494,7 +494,7 @@ function probe_url($url) {
if($check_feed) { 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); logger('probe_url: scrape_feed returns: ' . print_r($feedret,true), LOGGER_DATA);
if(count($feedret) && ($feedret['feed_atom'] || $feedret['feed_rss'])) { if(count($feedret) && ($feedret['feed_atom'] || $feedret['feed_rss'])) {
$poll = ((x($feedret,'feed_atom')) ? unamp($feedret['feed_atom']) : unamp($feedret['feed_rss'])); $poll = ((x($feedret,'feed_atom')) ? unamp($feedret['feed_atom']) : unamp($feedret['feed_rss']));

9
include/diaspora.php
View file

@ -116,6 +116,8 @@ EOT;
function diaspora_decode($importer,$xml) { function diaspora_decode($importer,$xml) {
$basedom = parse_xml_string($xml); $basedom = parse_xml_string($xml);
$atom = $basedom->children(NAMESPACE_ATOM1); $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']); openssl_private_decrypt($encrypted_aes_key_bundle,$outer_key_bundle,$importer['prvkey']);
$j_outer_key_bundle = json_decode($outer_key_bundle); $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_iv = base64_decode($j_outer_key_bundle->iv);
$outer_key = base64_decode($j_outer_key_bundle->key); $outer_key = base64_decode($j_outer_key_bundle->key);
@ -150,6 +152,7 @@ function diaspora_decode($importer,$xml) {
* </decrypted_header> * </decrypted_header>
*/ */
logger('decrypted: ' . $decrypted);
$idom = parse_xml_string($decrypted,false); $idom = parse_xml_string($decrypted,false);
$inner_iv = base64_decode($idom->iv); $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 $hash = random_string() . (string) time(); // Generate a confirm_key
if(is_array($contact_record)) { if(is_array($contact_record)) {
$ret = q("INSERT INTO `intro` ( `uid`, `contact-id`, `blocked`, `knowyou`, `note`, `hash`, `datetime`) $ret = q("INSERT INTO `intro` ( `uid`, `contact-id`, `blocked`, `knowyou`, `note`, `hash`, `datetime`,`blocked`)
VALUES ( %d, %d, 1, %d, '%s', '%s', '%s' )", VALUES ( %d, %d, 1, %d, '%s', '%s', '%s', 0 )",
intval($importer['uid']), intval($importer['uid']),
intval($contact_record['id']), intval($contact_record['id']),
0, 0,

4
mod/receive.php
View file

@ -26,7 +26,7 @@ function receive_post(&$a) {
$importer = $r[0]; $importer = $r[0];
$xml = $_POST['xml']; $xml = urldecode($_POST['xml']);
logger('mod-diaspora: new salmon ' . $xml, LOGGER_DATA); logger('mod-diaspora: new salmon ' . $xml, LOGGER_DATA);
@ -38,7 +38,7 @@ function receive_post(&$a) {
http_status_exit(500); http_status_exit(500);
$parsed_xml = parse_xml_string($msg); $parsed_xml = parse_xml_string($msg,false);
$xmlbase = $parsed_xml->post; $xmlbase = $parsed_xml->post;