X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fpoller.php;h=28e421f5fe805443e4fe191f0cea1a2d20408605;hb=f3bb78906167dfd3fd4032514bfda9e68a309cdb;hp=ff141484bb37a02004991a431231419aa0578f02;hpb=f1977d420ea025e9d8b1f47fb41b25468d07218f;p=friendica.git

diff --git a/include/poller.php b/include/poller.php
index ff141484bb..28e421f5fe 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -14,15 +14,28 @@
 	require_once('datetime.php');
 	require_once('simplepie/simplepie.inc');
 	require_once('include/items.php');
-
 	require_once('include/Contact.php');
 
-	$debugging = get_config('system','debugging');
-
 	$a->set_baseurl(get_config('system','url'));
 
+	logger('poller: start');
+
+	// run queue delivery process in the background
+
+	$php_path = ((x($a->config,'php_path') && strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
+	proc_close(proc_open("\"$php_path\" \"include/queue.php\" &", array(), $foo));
+
+
+	$hub_update = false;
+	$force = false;
+
+	if(($argc > 1) && ($argv[1] == 'force'))
+		$force = true;
+
+	// 'stat' clause is a temporary measure until we have federation subscriptions working both directions
 	$contacts = q("SELECT * FROM `contact` 
-		WHERE ( `dfrn-id` != '' OR (`issued-id` != '' AND `duplex` = 1)) 
+		WHERE ( ( `network` = 'dfrn' AND ( `dfrn-id` != '' OR (`issued-id` != '' AND `duplex` = 1)))
+		OR ( `network` = 'stat' AND `poll` != '' ) ) 
 		AND `self` = 0 AND `blocked` = 0 AND `readonly` = 0 ORDER BY RAND()");
 
 	if(! count($contacts))
@@ -32,9 +45,31 @@
 
 		if($contact['priority'] || $contact['subhub']) {
 
-			$update = false;
+			$hub_update = true;
+			$update     = false;
+
 			$t = $contact['last-update'];
 
+			// We should be getting everything via a hub. But just to be sure, let's check once a day.
+			// (You can make this more or less frequent if desired by setting 'pushpoll_frequency' appropriately)
+			// This also lets us update our subscription to the hub, and add or replace hubs in case it
+			// changed. We will only update hubs once a day, regardless of 'pushpoll_frequency'. 
+
+
+			if($contact['subhub']) {
+				$interval = get_config('system','pushpoll_frequency');
+				$contact['priority'] = (($interval !== false) ? intval($interval) : 3);
+				$hub_update = false;
+
+				if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 day"))
+						$hub_update = true;
+			}
+
+
+			/**
+			 * Based on $contact['priority'], should we poll this site now? Or later?
+			 */			
+
 			switch ($contact['priority']) {
 				case 5:
 					if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 month"))
@@ -54,18 +89,11 @@
 					break;
 				case 1:
 				default:
-
-							// if pubsub delivery is in effect, poll no more than once every hour.
-							// We shouldn't need to poll at all with pubsub, but the hub isn't 
-							// always the most reliable postmaster... This way we still get the 
-							// messages when the hub goes flaky, just perhaps a bit slower. 
-							// At least it doesn't hurt to get them twice. 
-
 					if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 hour"))
 						$update = true;
 					break;
 			}
-			if(! $update)
+			if((! $update) && (! $force))
 				continue;
 		}
 
@@ -79,99 +107,145 @@
 
 		$importer = $r[0];
 
-		if($debugging)
-			echo "IMPORTER: {$importer['name']}\n";
+		logger("poller: poll: IMPORTER: {$importer['name']}, CONTACT: {$contact['name']}");
 
 		$last_update = (($contact['last-update'] === '0000-00-00 00:00:00') 
 			? datetime_convert('UTC','UTC','now - 30 days', ATOM_TIME)
 			: datetime_convert('UTC','UTC',$contact['last-update'], ATOM_TIME)
 		);
 
-		$idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']);
+		if($contact['network'] === 'dfrn') {
 
-		if(intval($contact['duplex']) && $contact['dfrn-id'])
-			$idtosend = '0:' . $orig_id;
-		if(intval($contact['duplex']) && $contact['issued-id'])
-			$idtosend = '1:' . $orig_id;		
+			$idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']);
 
-		$url = $contact['poll'] . '?dfrn_id=' . $idtosend . '&type=data&last_update=' . $last_update ;
-		$xml = fetch_url($url);
+			if(intval($contact['duplex']) && $contact['dfrn-id'])
+				$idtosend = '0:' . $orig_id;
+			if(intval($contact['duplex']) && $contact['issued-id'])
+				$idtosend = '1:' . $orig_id;		
 
-		if($debugging) {
-			echo "URL: " . $url . "\r\n";
-			echo "XML: " . $xml . "\r\n";
-		}
+			$url = $contact['poll'] . '?dfrn_id=' . $idtosend 
+				. '&dfrn_version=' . DFRN_PROTOCOL_VERSION 
+				. '&type=data&last_update=' . $last_update ;
+	
+			$xml = fetch_url($url);
 
-		if(! $xml) {
-			// dead connection - might be a transient event, or this might
-			// mean the software was uninstalled or the domain expired. 
-			// Will keep trying for one month.
-			mark_for_death($contact);
-			continue;
-		}
+			logger('poller: handshake with url ' . $url . ' returns xml: ' . $xml, LOGGER_DATA);
 
 
-		$res = simplexml_load_string($xml);
+			if(! $xml) {
+				logger("poller: $url appears to be dead - marking for death ");
+				// dead connection - might be a transient event, or this might
+				// mean the software was uninstalled or the domain expired. 
+				// Will keep trying for one month.
+				mark_for_death($contact);
 
-		if(intval($res->status) == 1) {
-			// we may not be friends anymore. Will keep trying for one month.
-			mark_for_death($contact);
-		}
-		else {
-			if($contact['term-date'] != '0000-00-00 00:00:00')
-				unmark_for_death($contact);
-		}
+				// set the last-update so we don't keep polling
 
-		if((intval($res->status) != 0) || (! strlen($res->challenge)) || (! strlen($res->dfrn_id)))
-			continue;
+				$r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d LIMIT 1",
+					dbesc(datetime_convert()),
+					intval($contact['id'])
+				);
 
-		$postvars = array();
+				continue;
+			}
 
-		$sent_dfrn_id = hex2bin($res->dfrn_id);
-		$challenge    = hex2bin($res->challenge);
+			if(! strstr($xml,'<?xml')) {
+				logger('poller: response from ' . $url . ' did not contain XML.');
+				$r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d LIMIT 1",
+					dbesc(datetime_convert()),
+					intval($contact['id'])
+				);
+				continue;
+			}
 
-		$final_dfrn_id = '';
 
-		if(($contact['duplex']) && strlen($contact['prvkey'])) {
-			openssl_private_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['prvkey']);
-			openssl_private_decrypt($challenge,$postvars['challenge'],$contact['prvkey']);
+			$res = simplexml_load_string($xml);
 
-		}
-		else {
-			openssl_public_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['pubkey']);
-			openssl_public_decrypt($challenge,$postvars['challenge'],$contact['pubkey']);
-		}
+			if(intval($res->status) == 1) {
+				logger("poller: $url replied status 1 - marking for death ");
 
-		$final_dfrn_id = substr($final_dfrn_id, 0, strpos($final_dfrn_id, '.'));
+				// we may not be friends anymore. Will keep trying for one month.
+				// set the last-update so we don't keep polling
 
-		if(strpos($final_dfrn_id,':') == 1)
-			$final_dfrn_id = substr($final_dfrn_id,2);
+				$r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d LIMIT 1",
+					dbesc(datetime_convert()),
+					intval($contact['id'])
+				);
 
-		if($final_dfrn_id != $orig_id) {
+				mark_for_death($contact);
+			}
+			else {
+				if($contact['term-date'] != '0000-00-00 00:00:00') {
+					logger("poller: $url back from the dead - removing mark for death");
+					unmark_for_death($contact);
+				}
+			}
 
-			// did not decode properly - cannot trust this site 
-			continue;
-		}
+			if((intval($res->status) != 0) || (! strlen($res->challenge)) || (! strlen($res->dfrn_id)))
+				continue;
+
+			$postvars = array();
+
+			$sent_dfrn_id = hex2bin($res->dfrn_id);
+			$challenge    = hex2bin($res->challenge);
 
-		$postvars['dfrn_id'] = $idtosend;
+			$final_dfrn_id = '';
+
+			if(($contact['duplex']) && strlen($contact['prvkey'])) {
+				openssl_private_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['prvkey']);
+				openssl_private_decrypt($challenge,$postvars['challenge'],$contact['prvkey']);
+			}
+			else {
+				openssl_public_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['pubkey']);
+				openssl_public_decrypt($challenge,$postvars['challenge'],$contact['pubkey']);
+			}
 
+			$final_dfrn_id = substr($final_dfrn_id, 0, strpos($final_dfrn_id, '.'));
 
-		$xml = post_url($contact['poll'],$postvars);
+			if(strpos($final_dfrn_id,':') == 1)
+				$final_dfrn_id = substr($final_dfrn_id,2);
 
-		if($debugging) {
-			echo "XML response:" . $xml . "\n";
-			echo "Length:" . strlen($xml) . "\n";
+			if($final_dfrn_id != $orig_id) {
+
+				// did not decode properly - cannot trust this site 
+				continue;
+			}
+
+			$postvars['dfrn_id'] = $idtosend;
+			$postvars['dfrn_version'] = DFRN_PROTOCOL_VERSION;
+
+			$xml = post_url($contact['poll'],$postvars);
 		}
+		else {
+			// $contact['network'] !== 'dfrn'
+
+			$xml = fetch_url($contact['poll']);
+		}
+
+		logger('poller: received xml : ' . $xml, LOGGER_DATA);
 
 		if(! strlen($xml))
 			continue;
 
+		consume_feed($xml,$importer,$contact,$hub,1);
 
-		consume_feed($xml,$importer,$contact,$hub);
-		
+		// do it twice. Ensures that children of parents which may be later in the stream aren't tossed
 
-		if((strlen($hub)) && ($contact['rel'] == REL_BUD) && ($contact['priority'] == 0)) {
-			subscribe_to_hub($hub,$importer,$contact);
+		consume_feed($xml,$importer,$contact,$hub,1);
+
+
+		if((strlen($hub)) && ($hub_update) 
+			&& (($contact['rel'] == REL_BUD) || (($contact['network'] === 'stat') && (! $contact['readonly'])))) {
+			logger('poller: subscribing to hub(s) : ' . $hub . ' contact name : ' . $contact['name'] . ' local user : ' . $importer['name']);
+			$hubs = explode(',', $hub);
+			if(count($hubs)) {
+				foreach($hubs as $h) {
+					$h = trim($h);
+					if(! strlen($h))
+						continue;
+					subscribe_to_hub($h,$importer,$contact);
+				}
+			}
 		}
 
 
@@ -180,7 +254,8 @@
 			intval($contact['id'])
 		);
 
-	}
+		// loop - next contact
+	}  
 		
 	killme();