Remove unused upubkey and uprvkey from queries

[friendica.git] / mod / receive.php

diff --git a/mod/receive.php b/mod/receive.php
index 68d304ae70111b93c4f85ed0afde3ba3eb80cf68..8241325bf99398941f8227da1725fda6778836a5 100644 (file)
--- a/mod/receive.php
+++ b/mod/receive.php
@@ -6,10 +6,11 @@
 
 use Friendica\App;
 use Friendica\Core\Config;
+use Friendica\Database\DBM;
+use Friendica\Protocol\Diaspora;
 
 require_once('include/salmon.php');
 require_once('include/crypto.php');
-require_once('include/diaspora.php');
 
 function receive_post(App $a) {
        $enabled = intval(Config::get('system', 'diaspora_enabled'));
@@ -30,7 +31,7 @@ function receive_post(App $a) {
                $guid = $a->argv[2];
 
                $importer = dba::select('user', array(), array('guid' => $guid, 'account_expired' => false, 'account_removed' => false), array('limit' => 1));
-               if (!dbm::is_result($importer)) {
+               if (!DBM::is_result($importer)) {
                        http_status_exit(500);
                }
        }
@@ -48,14 +49,14 @@ function receive_post(App $a) {
                }
 
                logger('mod-diaspora: message is in the new format', LOGGER_DEBUG);
-               $msg = Diaspora::decode_raw($importer, $postdata);
+               $msg = Diaspora::decodeRaw($importer, $postdata);
        } else {
                logger('mod-diaspora: decode message in the old format', LOGGER_DEBUG);
                $msg = Diaspora::decode($importer, $xml);
 
                if ($public && !$msg) {
                        logger('mod-diaspora: decode message in the new format', LOGGER_DEBUG);
-                       $msg = Diaspora::decode_raw($importer, $xml);
+                       $msg = Diaspora::decodeRaw($importer, $xml);
                }
        }
 
@@ -71,7 +72,7 @@ function receive_post(App $a) {
 
        $ret = true;
        if ($public) {
-               Diaspora::dispatch_public($msg);
+               Diaspora::dispatchPublic($msg);
        } else {
                $ret = Diaspora::dispatch($importer, $msg);
        }