Merge remote-tracking branch 'upstream/master'

1 files changed, 0 insertions, 76 deletions

diff --git a/mod/receive.php b/mod/receive.php
deleted file mode 100644
index 571f736ed..000000000
--- a/mod/receive.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-/**
- * Diaspora endpoint
- */
-
-require_once('include/crypto.php');
-require_once('include/diaspora.php');
-
-	
-function receive_post(&$a) {
-
-
-	$enabled = intval(get_config('system','diaspora_enabled'));
-	if(! $enabled) {
-		logger('mod-diaspora: disabled');
-		http_status_exit(500);
-	}
-
-	$public = false;
-
-	if((argc() == 2) && (argv(1) === 'public')) {
-		$public = true;
-	}
-	else {
-
-		if(argc() != 3 || argv(1) !== 'users')
-			http_status_exit(500);
-
-		$guid = argv(2);
-
-		// Diaspora sites *may* provide a truncated guid. 
-
-		$r = q("SELECT * FROM channel left join xchan on channel_hash = xchan_hash WHERE channel_guid like '%s' AND channel_removed = 0 LIMIT 1",
-			dbesc($guid . '%')
-		);
-		if(! $r)
-			http_status_exit(500);
-
-		$importer = $r[0];
-	}
-
-	// It is an application/x-www-form-urlencoded that has been urlencoded twice.
-
-	logger('mod-diaspora: receiving post', LOGGER_DEBUG);
-
-	$xml = urldecode($_POST['xml']);
-
-	logger('mod-diaspora: new salmon ' . $xml, LOGGER_DATA);
-
-	if(! $xml)
-		http_status_exit(500);
-
-	logger('mod-diaspora: message is okay', LOGGER_DEBUG);
-
-	$msg = diaspora_decode($importer,$xml);
-
-	logger('mod-diaspora: decoded', LOGGER_DEBUG);
-
-	logger('mod-diaspora: decoded msg: ' . print_r($msg,true), LOGGER_DATA);
-
-	if(! is_array($msg))
-		http_status_exit(500);
-
-	logger('mod-diaspora: dispatching', LOGGER_DEBUG);
-
-	$ret = 0;
-	if($public)
-		diaspora_dispatch_public($msg);
-	else
-		$ret = diaspora_dispatch($importer,$msg);
-
-	http_status_exit(($ret) ? $ret : 200);
-	// NOTREACHED
-}
-