X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fpubsub.php;h=93d50ef90e0efb794f2a5a92299190acc670827a;hb=e5992003e88545ffe5df0acc57c850733facdd5e;hp=df27c6bc2b72d141c3b8e92117a442aeccb1698a;hpb=53dff2204bf2cbe46b6cbdb7174fa0cf1a7162b1;p=friendica.git

diff --git a/mod/pubsub.php b/mod/pubsub.php
index df27c6bc2b..93d50ef90e 100644
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
@@ -44,7 +44,7 @@ function pubsub_init(&$a) {
 
 		$subscribe = (($hub_mode === 'subscribe') ? 1 : 0);
 
-		$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' LIMIT 1",
+		$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 LIMIT 1",
 			dbesc($nick)
 		);
 		if(! count($r))
@@ -55,7 +55,8 @@ function pubsub_init(&$a) {
 
 		$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 AND `blocked` = 0 $sql_extra LIMIT 1",
+		$r = q("SELECT * FROM `contact` WHERE `poll` = '%s' AND `id` = %d AND `uid` = %d 
+			AND `blocked` = 0 AND `pending` = 0 $sql_extra LIMIT 1",
 			dbesc($hub_topic),
 			intval($contact_id),
 			intval($owner['uid'])
@@ -68,8 +69,13 @@ function pubsub_init(&$a) {
 		// 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",
 			intval($subscribe),
@@ -90,10 +96,15 @@ function pubsub_post(&$a) {
 	logger('pubsub: user-agent: ' . $_SERVER['HTTP_USER_AGENT'] );
 	logger('pubsub: data: ' . $xml, LOGGER_DATA);
 
+//	if(! stristr($xml,'<?xml')) {
+//		logger('pubsub_post: bad xml');
+//		hub_post_return();
+//	}
+
 	$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' LIMIT 1",
+	$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 LIMIT 1",
 		dbesc($nick)
 	);
 	if(! count($r))
@@ -101,10 +112,14 @@ function pubsub_post(&$a) {
 
 	$importer = $r[0];
 
-	$r = q("SELECT * FROM `contact` WHERE `subhub` = 1 AND `id` = %d AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
+	$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",
 		intval($contact_id),
-		intval($importer['uid'])
+		intval($importer['uid']),
+		intval(CONTACT_IS_SHARING),
+		intval(CONTACT_IS_FRIEND)	
 	);
+
 	if(! count($r)) {
 		logger('pubsub: no contact record - ignored');
 		hub_post_return();
@@ -112,15 +127,21 @@ function pubsub_post(&$a) {
 
 	$contact = $r[0];
 
+	// we have no way to match Diaspora guid's with atom post id's and could get duplicates.
+	// we'll assume that direct delivery is robust (and this is a bad assumption, but the duplicates are messy).
+
+	if($r[0]['network'] === NETWORK_DIASPORA)
+		hub_post_return();
+
 	$feedhub = '';
 
 	require_once('include/items.php');
 
-	consume_feed($xml,$importer,$contact,$feedhub,1);
+	consume_feed($xml,$importer,$contact,$feedhub,1,1);
 
 	// do it a second time so that any children find their parents.
 
-	consume_feed($xml,$importer,$contact,$feedhub,1);
+	consume_feed($xml,$importer,$contact,$feedhub,1,2);
 
 	hub_post_return();