X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsalmon.php;h=11e42d94364a36cc4eb6f155d4ccd49815e6dc87;hb=63f0177a64333b77ab949b9c4c3c8c31b9bca446;hp=1e16f9d14ba1d2e6b7b8fff8886b24adbcdef04d;hpb=0820865265a6600491b4bfe5d458c33d54ba1409;p=friendica.git

diff --git a/mod/salmon.php b/mod/salmon.php
index 1e16f9d14b..11e42d9436 100644
--- a/mod/salmon.php
+++ b/mod/salmon.php
@@ -15,7 +15,7 @@ function salmon_return($val) {
 	if($val >= 200 && $val < 300)
 		$err = 'OK';
 
-	logger('mod-salmon returns ' . $val);	
+	logger('mod-salmon returns ' . $val);
 	header($_SERVER["SERVER_PROTOCOL"] . ' ' . $val . ' ' . $err);
 	killme();
 
@@ -30,7 +30,7 @@ function salmon_post(&$a) {
 	$nick       = (($a->argc > 1) ? notags(trim($a->argv[1])) : '');
 	$mentions   = (($a->argc > 2 && $a->argv[2] === 'mention') ? true : false);
 
-	$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 LIMIT 1",
+	$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
 		dbesc($nick)
 	);
 	if(! count($r))
@@ -50,7 +50,7 @@ function salmon_post(&$a) {
 		$base = $dom->env;
 	elseif($dom->data)
 		$base = $dom;
-	
+
 	if(! $base) {
 		logger('mod-salmon: unable to locate salmon data in xml ');
 		http_status_exit(400);
@@ -92,7 +92,7 @@ function salmon_post(&$a) {
 	// Create a fake feed wrapper so simplepie doesn't choke
 
 	$tpl = get_markup_template('fake_feed.tpl');
-	
+
 	$base = substr($data,strpos($data,'<entry'));
 
 	$feedxml = $tpl . $base . '</feed>';
@@ -100,7 +100,7 @@ function salmon_post(&$a) {
 	logger('mod-salmon: Processed feed: ' . $feedxml);
 
 	// Now parse it like a normal atom feed to scrape out the author URI
-	
+
     $feed = new SimplePie();
     $feed->set_raw_data($feedxml);
     $feed->enable_order_by_date(false);
@@ -192,7 +192,7 @@ function salmon_post(&$a) {
 				);
 			}
 		}
-	}	
+	}
 
 	// is this a follower? Or have we ignored the person?
 	// If so we can not accept this post.
@@ -223,7 +223,3 @@ function salmon_post(&$a) {
 
 	http_status_exit(200);
 }
-
-
-
-