Merge branch 'master' of https://github.com/friendica/friendica

[friendica.git] / mod / receive.php

diff --git a/mod/receive.php b/mod/receive.php
index 72e2903483b0f6eb8806b3a96d4fda9b3cb5dfb1..2bd3cc65bcda1b5ae273d9903184981805b8d33a 100644 (file)
--- a/mod/receive.php
+++ b/mod/receive.php
@@ -12,6 +12,13 @@ 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 LIMIT 1",
                        dbesc($guid)
                );
                if(! count($r))