X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fpoller.php;h=024b9fbcd38c0c6144c8a4751224e7e0f286f003;hb=2fc89deaeae0341aa12b6b811927e793011055d1;hp=6b0719b92531b9a75959d25dfca091b4234c1176;hpb=34eedb503acad59d649f96d3250b40cc1c84047c;p=friendica.git

diff --git a/include/poller.php b/include/poller.php
index 6b0719b925..024b9fbcd3 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -14,15 +14,36 @@
 	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;
+
+	if(($argc > 1) && intval($argv[1])) {
+		$manual_id = intval($argv[1]);
+		$force = true;
+	}
+
+	$sql_extra = (($manual_id) ? " AND `id` = $manual_id " : "");
+
+	// '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` IN ( 'stat', 'feed' ) AND `poll` != '' ))
+		$sql_extra 
 		AND `self` = 0 AND `blocked` = 0 AND `readonly` = 0 ORDER BY RAND()");
 
 	if(! count($contacts))
@@ -30,35 +51,57 @@
 
 	foreach($contacts as $contact) {
 
-		if($contact['priority']) {
+		if($contact['priority'] || $contact['subhub']) {
+
+			$hub_update = true;
+			$update     = false;
 
-			$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"))
+					if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 month"))
 						$update = true;
 					break;					
 				case 4:
-					if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', t . " + 1 week"))
+					if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 week"))
 						$update = true;
 					break;
 				case 3:
-					if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', t . " + 1 day"))
+					if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 day"))
 						$update = true;
 					break;
 				case 2:
-					if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', t . " + 12 hour"))
+					if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 12 hour"))
 						$update = true;
 					break;
 				case 1:
 				default:
-					if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', t . " + 1 hour"))
+					if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 hour"))
 						$update = true;
 					break;
 			}
-			if(! $update)
+			if((! $update) && (! $force))
 				continue;
 		}
 
@@ -72,328 +115,155 @@
 
 		$importer = $r[0];
 
-		if($debugging)
-			echo "IMPORTER: {$importer['name']}";
+		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','Y-m-d\TH:i:s\Z')
-			: datetime_convert('UTC','UTC',$contact['last-update'],'Y-m-d\TH:i:s\Z'));
+			? datetime_convert('UTC','UTC','now - 30 days', ATOM_TIME)
+			: datetime_convert('UTC','UTC',$contact['last-update'], ATOM_TIME)
+		);
 
+		if($contact['network'] === 'dfrn') {
 
+			$idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']);
 
-		$idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']);
+			if(intval($contact['duplex']) && $contact['dfrn-id'])
+				$idtosend = '0:' . $orig_id;
+			if(intval($contact['duplex']) && $contact['issued-id'])
+				$idtosend = '1:' . $orig_id;		
 
-		if(intval($contact['duplex']) && $contact['dfrn-id'])
-			$idtosend = '0:' . $orig_id;
-		if(intval($contact['duplex']) && $contact['issued-id'])
-			$idtosend = '1:' . $orig_id;		
+			$url = $contact['poll'] . '?dfrn_id=' . $idtosend 
+				. '&dfrn_version=' . DFRN_PROTOCOL_VERSION 
+				. '&type=data&last_update=' . $last_update ;
+	
+			$xml = fetch_url($url);
 
-		$url = $contact['poll'] . '?dfrn_id=' . $idtosend . '&type=data&last_update=' . $last_update ;
-		$xml = fetch_url($url);
+			logger('poller: handshake with url ' . $url . ' returns xml: ' . $xml, LOGGER_DATA);
 
-		if($debugging) {
-			echo "URL: " . $url . "\r\n";
-			echo "XML: " . $xml . "\r\n";
-		}
 
-		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;
-		}
+			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);
 
+				// set the last-update so we don't keep polling
 
-		$res = simplexml_load_string($xml);
+				$r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d LIMIT 1",
+					dbesc(datetime_convert()),
+					intval($contact['id'])
+				);
 
-		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);
-		}
+				continue;
+			}
 
-		if((intval($res->status) != 0) || (! strlen($res->challenge)) || (! strlen($res->dfrn_id)))
-			continue;
+			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;
+			}
 
-		$postvars = array();
 
-		$sent_dfrn_id = hex2bin($res->dfrn_id);
-		$challenge    = hex2bin($res->challenge);
+			$res = simplexml_load_string($xml);
 
-		$final_dfrn_id = '';
+			if(intval($res->status) == 1) {
+				logger("poller: $url replied status 1 - marking for death ");
 
-		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']);
+				// we may not be friends anymore. Will keep trying for one month.
+				// set the last-update so we don't keep polling
 
-		}
-		else {
-			openssl_public_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['pubkey']);
-			openssl_public_decrypt($challenge,$postvars['challenge'],$contact['pubkey']);
-		}
+				$r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d LIMIT 1",
+					dbesc(datetime_convert()),
+					intval($contact['id'])
+				);
 
-		$final_dfrn_id = substr($final_dfrn_id, 0, strpos($final_dfrn_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);
+				}
+			}
 
-		if(strpos($final_dfrn_id,':') == 1)
-			$final_dfrn_id = substr($final_dfrn_id,2);
+			if((intval($res->status) != 0) || (! strlen($res->challenge)) || (! strlen($res->dfrn_id)))
+				continue;
 
-		if($final_dfrn_id != $orig_id) {
+			$postvars = array();
 
-			// did not decode properly - cannot trust this site 
-			continue;
-		}
+			$sent_dfrn_id = hex2bin((string) $res->dfrn_id);
+			$challenge    = hex2bin((string) $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']);
+			}
 
-		$xml = post_url($contact['poll'],$postvars);
+			$final_dfrn_id = substr($final_dfrn_id, 0, strpos($final_dfrn_id, '.'));
 
-		if($debugging) {
-			echo "XML response:" . $xml . "\r\n";
-			echo "Length:" . strlen($xml) . "\r\n";
-		}
+			if(strpos($final_dfrn_id,':') == 1)
+				$final_dfrn_id = substr($final_dfrn_id,2);
 
-		if(! strlen($xml))
-			continue;
+			if($final_dfrn_id != $orig_id) {
 
-		$feed = new SimplePie();
-		$feed->set_raw_data($xml);
-		$feed->enable_order_by_date(false);
-		$feed->init();
-
-		// Check at the feed level for updated contact name and/or photo
-
-		$name_updated  = '';
-		$new_name = '';
-		$photo_timestamp = '';
-		$photo_url = '';
-
-		$rawtags = $feed->get_feed_tags( SIMPLEPIE_NAMESPACE_ATOM_10, author);
-		if($rawtags) {
-			$elems = $rawtags[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10];
-			if($elems['name'][0]['attribs'][NAMESPACE_DFRN]['updated']) {
-				$name_updated = $elems['name'][0]['attribs'][NAMESPACE_DFRN]['updated'];
-				$new_name = $elems['name'][0]['data'];
-			} 
-			if(($elems['link'][0]['attribs']['']['rel'] === 'photo') && ($elems['link'][0]['attribs'][NAMESPACE_DFRN]['updated'])) {
-				$photo_timestamp = datetime_convert('UTC','UTC',$elems['link'][0]['attribs'][NAMESPACE_DFRN]['updated']);
-				$photo_url = $elems['link'][0]['attribs']['']['href'];
-			}
-		}
-		if(! $photo_timestamp) {
-			$photo_rawupdate = $feed->get_feed_tags(NAMESPACE_DFRN,'icon-updated');
-			if($photo_rawupdate) {
-				$photo_timestamp = datetime_convert('UTC','UTC',$photo_rawupdate[0]['data']);
-				$photo_url = $feed->get_image_url();
-			}
-		}
-		if(($photo_timestamp) && (strlen($photo_url)) && ($photo_timestamp > $contact['avatar-date'])) {
-
-			require_once("Photo.php");
-			$photo_failure = false;
-
-			$r = q("SELECT `resource-id` FROM `photo` WHERE `contact-id` = %d AND `uid` = %d LIMIT 1",
-				intval($contact['id']),
-				intval($contact['uid'])
-			);
-			if(count($r)) {
-				$resource_id = $r[0]['resource-id'];
-				$img_str = fetch_url($photo_url,true);
-				$img = new Photo($img_str);
-				if($img) {
-					q("DELETE FROM `photo` WHERE `resource-id` = '%s' AND contact-id` = %d AND `uid` = %d",
-						dbesc($resource_id),
-						intval($contact['id']),
-						intval($contact['uid'])
-					);
-
-					$img->scaleImageSquare(175);
-				
-					$hash = $resource_id;
-					$r = $img->store($contact['uid'], $contact['id'], $hash, basename($photo_url), t('Contact Photos') , 4);
-					
-					$img->scaleImage(80);
-					$r = $img->store($contact['uid'], $contact['id'], $hash, basename($photo_url), t('Contact Photos') , 5);
-					if($r)
-						q("UPDATE `contact` SET `avatar-date` = '%s' WHERE `uid` = %d AND `id` = %d LIMIT 1",
-							dbesc(datetime_convert()),
-							intval($contact['uid']),
-							intval($contact['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'
 
-		if(($name_updated) && (strlen($new_name)) && ($name_updated > $contact['name-date'])) {
-			q("UPDATE `contact` SET `name` = '%s', `name-date` = '%s' WHERE `uid` = %d AND `id` = %d LIMIT 1",
-				dbesc(notags(trim($new_name))),
-				dbesc(datetime_convert()),
-				intval($contact['uid']),
-				intval($contact['id'])
-			);
+			$xml = fetch_url($contact['poll']);
 		}
 
-		// Now process the feed
-		if($feed->get_item_quantity()) {		
-			foreach($feed->get_items() as $item) {
-
-				$deleted = false;
-
-				$rawdelete = $item->get_item_tags( NAMESPACE_TOMB, 'deleted-entry');
-				if(isset($rawdelete[0]['attribs']['']['ref'])) {
-					$uri = $rawthread[0]['attribs']['']['ref'];
-					$deleted = true;
-					if(isset($rawdelete[0]['attribs']['']['when'])) {
-						$when = $rawthread[0]['attribs']['']['when'];
-						$when = datetime_convert('UTC','UTC', $when, 'Y-m-d H:i:s');
-					}
-					else
-						$when = datetime_convert('UTC','UTC','now','Y-m-d H:i:s');
-				}
-				if($deleted) {
-					$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
-						dbesc($uri),
-						intval($importer['uid'])
-					);
-					if(count($r)) {
-						$item = $r[0];
-						if($item['uri'] == $item['parent-uri']) {
-							$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s',
-								`body` = '', `title` = ''
-								WHERE `parent-uri` = '%s' AND `uid` = %d",
-								dbesc($when),
-								dbesc(datetime_convert()),
-								dbesc($item['uri']),
-								intval($importer['uid'])
-							);
-						}
-						else {
-							$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s',
-								`body` = '', `title` = '' 
-								WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
-								dbesc($when),
-								dbesc(datetime_convert()),
-								dbesc($uri),
-								intval($importer['uid'])
-							);
-							if($item['last-child']) {
-								// ensure that last-child is set in case the comment that had it just got wiped.
-								$q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d ",
-									dbesc(datetime_convert()),
-									dbesc($item['parent-uri']),
-									intval($item['uid'])
-								);
-								// who is the last child now? 
-								$r = q("SELECT `id` FROM `item` WHERE `parent-uri` = '%s' AND `type` != 'activity' AND `deleted` = 0 AND `uid` = %d 
-									ORDER BY `edited` DESC LIMIT 1",
-										dbesc($item['parent-uri']),
-										intval($importer['uid'])
-								);
-								if(count($r)) {
-									q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d LIMIT 1",
-										intval($r[0]['id'])
-									);
-								}
-							}	
-						}
-					}	
-					continue;
-				}
+		logger('poller: received xml : ' . $xml, LOGGER_DATA);
 
+		if(! strlen($xml))
+			continue;
 
-				$is_reply = false;		
-				$item_id = $item->get_id();
-				$rawthread = $item->get_item_tags( NAMESPACE_THREAD,'in-reply-to');
-				if(isset($rawthread[0]['attribs']['']['ref'])) {
-					$is_reply = true;
-					$parent_uri = $rawthread[0]['attribs']['']['ref'];
-				}
+		consume_feed($xml,$importer,$contact,$hub,1);
 
+		// do it twice. Ensures that children of parents which may be later in the stream aren't tossed
 
-				if($is_reply) {
-	
-					// Have we seen it? If not, import it.
-	
-					$item_id = $item->get_id();
-	
-					$r = q("SELECT `uid`, `last-child`, `edited` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
-						dbesc($item_id),
-						intval($importer['uid'])
-					);
-					// FIXME update content if 'updated' changes
-					if(count($r)) {
-						$allow = $item->get_item_tags( NAMESPACE_DFRN, 'comment-allow');
-						if($allow && $allow[0]['data'] != $r[0]['last-child']) {
-							$r = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d",
-								dbesc(datetime_convert()),
-								dbesc($parent_uri),
-								intval($importer['uid'])
-							);
-							$r = q("UPDATE `item` SET `last-child` = %d , `changed` = '%s'  WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
-								intval($allow[0]['data']),
-								dbesc(datetime_convert()),
-								dbesc($item_id),
-								intval($importer['uid'])
-							);
-
-
-						}
-						continue;
-					}
-					$datarray = get_atom_elements($item);
-					$datarray['parent-uri'] = $parent_uri;
-					$datarray['uid'] = $importer['uid'];
-					$datarray['contact-id'] = $contact['id'];
-					if(($datarray['verb'] == ACTIVITY_LIKE) || ($datarray['verb'] == ACTIVITY_DISLIKE)) {
-						$datarray['type'] = 'activity';
-						$datarray['gravity'] = GRAVITY_LIKE;
-					}
-	
-					$r = item_store($datarray);
-					continue;
-				}
+		consume_feed($xml,$importer,$contact,$hub,1);
 
-				else {
-					// Head post of a conversation. Have we seen it? If not, import it.
-	
-					$item_id = $item->get_id();
-					$r = q("SELECT `uid`, `last-child`, `edited` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
-						dbesc($item_id),
-						intval($importer['uid'])
-					);
-					if(count($r)) {
-						$allow = $item->get_item_tags( NAMESPACE_DFRN, 'comment-allow');
-						if($allow && $allow[0]['data'] != $r[0]['last-child']) {
-							$r = q("UPDATE `item` SET `last-child` = %d , `changed` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
-								intval($allow[0]['data']),
-								dbesc(datetime_convert()),
-								dbesc($item_id),
-								intval($importer['uid'])
-							);
-						}
+
+		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;
-					}
-
-					$datarray = get_atom_elements($item);
-					$datarray['parent-uri'] = $item_id;
-					$datarray['uid'] = $importer['uid'];
-					$datarray['contact-id'] = $contact['id'];
-					$r = item_store($datarray);
-					continue;
-	
+					subscribe_to_hub($h,$importer,$contact);
 				}
 			}
 		}
+
+
 		$r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d LIMIT 1",
 			dbesc(datetime_convert()),
 			intval($contact['id'])
 		);
 
-	}
+		// loop - next contact
+	}  
 		
 	killme();