X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fpubsub.php;h=3d8bfca48e39a5db21e6384b2897cf5c31877530;hb=6b8585d48d67d109102e33a32311d76a45762667;hp=0c506db008b8511300b4770955093d2831ce440e;hpb=07b09300a9aa6f10941b07dd289539b675d1e6ec;p=friendica.git

diff --git a/mod/pubsub.php b/mod/pubsub.php
index 0c506db008..3d8bfca48e 100644
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
@@ -44,40 +44,53 @@ function pubsub_init(&$a) {
 
 		$subscribe = (($hub_mode === 'subscribe') ? 1 : 0);
 
-		$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))
+		if(! count($r)) {
+			logger('pubsub: local account not found: ' . $nick);
 			hub_return(false, '');
+		}
 
 
 		$owner = $r[0];
 
 		$sql_extra = ((strlen($hub_verify)) ? sprintf(" AND `hub-verify` = '%s' ", dbesc($hub_verify)) : '');
 
-		$r = q("SELECT * FROM `contact` WHERE `poll` = '%s' AND `id` = %d AND `uid` = %d 
+		$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d 
 			AND `blocked` = 0 AND `pending` = 0 $sql_extra LIMIT 1",
-			dbesc($hub_topic),
 			intval($contact_id),
 			intval($owner['uid'])
 		);
-		if(! count($r))
+		if(! count($r)) {
+			logger('pubsub: contact not found.');
 			hub_return(false, '');
+		}
+
+		if(! link_compare($hub_topic,$r[0]['poll'])) {
+			logger('pubsub: hub topic ' . $hub_topic . ' != ' . $r[0]['poll']);
+			// should abort but let's humour them. 			
+		}
 
 		$contact = $r[0];
 
 		// We must initiate an unsubscribe request with a verify_token. 
 		// Don't allow outsiders to unsubscribe us.
 
-		if(($hub_mode === 'unsubscribe') && (! strlen($hub_verify))) 
-			hub_return(false, '');
+		if($hub_mode === 'unsubscribe') {
+			if(! strlen($hub_verify)) {
+				logger('pubsub: bogus unsubscribe');
+				hub_return(false, '');
+			}
+			logger('pubsub: unsubscribe success');
+		}
 
-		$r = q("UPDATE `contact` SET `subhub` = %d WHERE `id` = %d LIMIT 1",
+		$r = q("UPDATE `contact` SET `subhub` = %d WHERE `id` = %d",
 			intval($subscribe),
 			intval($contact['id'])
 		);
 
- 		hub_return(true, $hub_challenge);		
+ 		hub_return(true, $hub_challenge);
 	}
 }
 
@@ -99,7 +112,7 @@ function pubsub_post(&$a) {
 	$nick       = (($a->argc > 1) ? notags(trim($a->argv[1])) : '');
 	$contact_id = (($a->argc > 2) ? intval($a->argv[2])       : 0 );
 
-	$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))
@@ -108,11 +121,12 @@ function pubsub_post(&$a) {
 	$importer = $r[0];
 
 	$r = q("SELECT * FROM `contact` WHERE `subhub` = 1 AND `id` = %d AND `uid` = %d 
-		AND ( `rel` = %d OR `rel` = %d ) AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
+		AND ( `rel` = %d OR `rel` = %d OR network = '%s' ) AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
 		intval($contact_id),
 		intval($importer['uid']),
 		intval(CONTACT_IS_SHARING),
-		intval(CONTACT_IS_FRIEND)	
+		intval(CONTACT_IS_FRIEND),
+		dbesc(NETWORK_FEED)
 	);
 
 	if(! count($r)) {