DE update to the strings

[friendica.git] / mod / receive.php

diff --git a/mod/receive.php b/mod/receive.php
index 72e2903483b0f6eb8806b3a96d4fda9b3cb5dfb1..95a51016757da46217f277e4b641799c43b1ec2c 100644 (file)
--- a/mod/receive.php
+++ b/mod/receive.php
@@ -9,9 +9,16 @@ require_once('include/salmon.php');
 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(($a->argc == 2) && ($a->argv[1] === 'public')) {
@@ -24,7 +31,7 @@ function receive_post(&$a) {
 
                $guid = $a->argv[2];
 
-               $r = q("SELECT * FROM `user` WHERE `guid` = '%s' LIMIT 1",
+               $r = q("SELECT * FROM `user` WHERE `guid` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
                        dbesc($guid)
                );
                if(! count($r))
@@ -35,6 +42,8 @@ function receive_post(&$a) {
 
        // It is an application/x-www-form-urlencoded
 
+       logger('mod-diaspora: receiving post', LOGGER_DEBUG);
+
        $xml = urldecode($_POST['xml']);
 
        logger('mod-diaspora: new salmon ' . $xml, LOGGER_DATA);
@@ -42,13 +51,19 @@ function receive_post(&$a) {
        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);