X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fpoller.php;h=b8bd0b7081b5a7a6a8193ea57cd743d27b9ac054;hb=863ddf1676be3837da4219ed7883e61e4d493b1c;hp=62bfdf8e30a8fbb1e4da7f33170906e767024fec;hpb=e8c39ff49fdb12461b375db8ab6591ced646f613;p=friendica.git

diff --git a/include/poller.php b/include/poller.php
index 62bfdf8e30..b8bd0b7081 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -1,348 +1,407 @@
 <?php
 
-	$debugging = true;
+require_once("boot.php");
 
-	require_once('boot.php');
+function poller_run($argv, $argc){
+	global $a, $db;
 
-	$a = new App;
+	if(is_null($a)) {
+		$a = new App;
+	}
+  
+	if(is_null($db)) {
+	    @include(".htconfig.php");
+    	require_once("dba.php");
+	    $db = new dba($db_host, $db_user, $db_pass, $db_data);
+    	unset($db_host, $db_user, $db_pass, $db_data);
+  	};
 
-	@include('.htconfig.php');
-	require_once('dba.php');
-	$db = new dba($db_host, $db_user, $db_pass, $db_data);
-		unset($db_host, $db_user, $db_pass, $db_data);
+	$mbox = null;
 
 	require_once('session.php');
 	require_once('datetime.php');
 	require_once('simplepie/simplepie.inc');
 	require_once('include/items.php');
-
 	require_once('include/Contact.php');
+	require_once('include/email.php');
 
 	$a->set_baseurl(get_config('system','url'));
 
-	$contacts = q("SELECT * FROM `contact` 
-		WHERE ( `dfrn-id` != '' OR (`issued-id` != '' AND `duplex` = 1)) 
-		AND `self` = 0 AND `blocked` = 0 AND `readonly` = 0 ORDER BY RAND()");
-
-	if(! count($contacts))
-		killme();
-
-	foreach($contacts as $contact) {
-
-		if($contact['priority']) {
-
-			$update = false;
-			$t = $contact['last-update'];
-
-			switch ($contact['priority']) {
-				case 5:
-					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"))
-						$update = true;
-					break;
-				case 3:
-					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"))
-						$update = true;
-					break;
-				case 1:
-				default:
-					if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', t . " + 1 hour"))
-						$update = true;
-					break;
-			}
-			if(! $update)
-				continue;
-		}
+	logger('poller: start');
+	
+	// run queue delivery process in the background
 
+	proc_run('php',"include/queue.php");
+	
+	// once daily run expire in background
 
-		$importer_uid = $contact['uid'];
+	$d1 = get_config('system','last_expire_day');
+	$d2 = intval(datetime_convert('UTC','UTC','now','d'));
+
+	if($d2 != intval($d1)) {
+		set_config('system','last_expire_day',$d2);
+		proc_run('php','include/expire.php');
+	}
 
-		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
-			intval($importer_uid)
-		);
-		if(! count($r))
-			continue;
 
-		$importer = $r[0];
+	// clear old cache
+	q("DELETE FROM `cache` WHERE `updated` < '%s'",
+		dbesc(datetime_convert('UTC','UTC',"now - 30 days")));
 
-echo "IMPORTER: {$importer['name']}";
+	$manual_id  = 0;
+	$hub_update = false;
+	$force      = false;
 
-		$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'));
+	if(($argc > 1) && ($argv[1] == 'force'))
+		$force = true;
 
-		$idtosend = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']);
+	if(($argc > 1) && intval($argv[1])) {
+		$manual_id = intval($argv[1]);
+		$force     = true;
+	}
 
-		$url = $contact['poll'] . '?dfrn_id=' . $idtosend . '&type=data&last_update=' . $last_update ;
+	$sql_extra = (($manual_id) ? " AND `id` = $manual_id " : "");
 
-		$xml = fetch_url($url);
+	$d = datetime_convert();
+	call_hooks('cron', $d);
 
-echo "URL: " . $url;
-echo "XML: " . $xml;
+	reload_plugins();
 
-		if(! $xml)
-			continue;
+	$contacts = q("SELECT `id` FROM `contact` 
+		WHERE ( `rel` = %d OR `rel` = %d ) AND `poll` != ''
+		$sql_extra 
+		AND `self` = 0 AND `blocked` = 0 AND `readonly` = 0 ORDER BY RAND()",
+		intval(REL_FAN),
+		intval(REL_BUD)
+	);
+
+	if(! count($contacts)) {
+		return;
+	}
 
-		$res = simplexml_load_string($xml);
+	foreach($contacts as $c) {
 
-		if(intval($res->status) == 1)
-			mark_for_death($contact);
+		$res = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
+			intval($c['id'])
+		);
 
-		if((intval($res->status) != 0) || (! strlen($res->challenge)) || (! strlen($res->dfrn_id)))
+		if(! count($res))
 			continue;
 
-		if($contact['term-date'] != '0000-00-00 00:00:00')
-			unmark_for_death($contact);
+		foreach($res as $contact) {
 
-		$postvars = array();
+			$xml = false;
 
-		$sent_dfrn_id = hex2bin($res->dfrn_id);
-		$challenge    = hex2bin($res->challenge);
+			if($manual_id)
+				$contact['last-update'] = '0000-00-00 00:00:00';
 
-		$final_dfrn_id = '';
+			if($contact['priority'] || $contact['subhub']) {
 
-		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']);
+				$hub_update = true;
+				$update     = false;
 
-		}
-		else {
-			openssl_public_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['pubkey']);
-			openssl_public_decrypt($challenge,$postvars['challenge'],$contact['pubkey']);
-		}
+				$t = $contact['last-update'];
 
-		$final_dfrn_id = substr($final_dfrn_id, 0, strpos($final_dfrn_id, '.'));
-		if($final_dfrn_id != $idtosend) {
-			// did not decode properly - cannot trust this site 
-			continue;
-		}
+				// 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'. 
 
-		$postvars['dfrn_id'] = $idtosend;
 
-		$xml = post_url($contact['poll'],$postvars);
+				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")) || $force)
+							$hub_update = true;
+				}
 
-echo "XML response:" . $xml . "\r\n";
-echo "Length:" . strlen($xml) . "\r\n";
+				/**
+				 * 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"))
+							$update = true;
+						break;					
+					case 4:
+						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"))
+							$update = true;
+						break;
+					case 2:
+						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"))
+							$update = true;
+						break;
+				}
+				if((! $update) && (! $force))
+					continue;
+			}
 
-		if(! strlen($xml)) {
-			// an empty response may mean there's nothing new - record the fact that we checked
-			$r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d LIMIT 1",
-				dbesc(datetime_convert()),
-				intval($contact['id'])
+			$importer_uid = $contact['uid'];
+		
+			$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
+				intval($importer_uid)
 			);
-			continue;
-		}
+			if(! count($r))
+				continue;
 
-		$feed = new SimplePie();
-		$feed->set_raw_data($xml);
-		$feed->enable_order_by_date(false);
-		$feed->init();
-
-		$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(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'])
-							);
+			$importer = $r[0];
+
+			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)
+			);
+
+			if($contact['network'] === NETWORK_DFRN) {
+
+				$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;
+
+				// they have permission to write to us. We already filtered this in the contact query.
+				$perm = 'rw';
+
+				$url = $contact['poll'] . '?dfrn_id=' . $idtosend 
+					. '&dfrn_version=' . DFRN_PROTOCOL_VERSION 
+					. '&type=data&last_update=' . $last_update 
+					. '&perm=' . $perm ;
+	
+				$handshake_xml = fetch_url($url);
+
+				logger('poller: handshake with url ' . $url . ' returns xml: ' . $handshake_xml, LOGGER_DATA);
+
+
+				if(! $handshake_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
+
+					$r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d LIMIT 1",
+						dbesc(datetime_convert()),
+						intval($contact['id'])
+					);
+
+					continue;
+				}
+
+				if(! strstr($handshake_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;
+				}
+
+
+				$res = parse_xml_string($handshake_xml);
+	
+				if(intval($res->status) == 1) {
+					logger("poller: $url replied status 1 - marking for death ");
+
+					// we may not be friends anymore. Will keep trying for one month.
+					// set the last-update so we don't keep polling
+
+					$r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d LIMIT 1",
+						dbesc(datetime_convert()),
+						intval($contact['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);
 					}
 				}
-			}
-		}
 
-		
-		foreach($feed->get_items() as $item) {
+				if((intval($res->status) != 0) || (! strlen($res->challenge)) || (! strlen($res->dfrn_id)))
+					continue;
+
+				$postvars = array();
+
+				$sent_dfrn_id = hex2bin((string) $res->dfrn_id);
+				$challenge    = hex2bin((string) $res->challenge);
+
+				$final_dfrn_id = '';
 
-			$deleted = false;
+				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, '.'));
+
+				if(strpos($final_dfrn_id,':') == 1)
+					$final_dfrn_id = substr($final_dfrn_id,2);
+
+				if($final_dfrn_id != $orig_id) {
+					logger('poller: ID did not decode: ' . $contact['id'] . ' orig: ' . $orig_id . ' final: ' . $final_dfrn_id);	
+					// did not decode properly - cannot trust this site 
+					continue;
+				}
+
+				$postvars['dfrn_id'] = $idtosend;
+				$postvars['dfrn_version'] = DFRN_PROTOCOL_VERSION;
+				$postvars['perm'] = 'rw';
+
+				$xml = post_url($contact['poll'],$postvars);
+			}
+			elseif(($contact['network'] === NETWORK_OSTATUS) 
+				|| ($contact['network'] === NETWORK_DIASPORA)
+				|| ($contact['network'] === NETWORK_FEED) ) {
+
+				// Upgrading DB fields from an older Friendika version
+				// Will only do this once per notify-enabled OStatus contact
 
-			$rawdelete = $item->get_item_tags("http://purl.org/atompub/tombstones/1.0", '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');
+				if(($contact['notify']) && (! $contact['writable'])) {
+					q("UPDATE `contact` SET `writable` = 1 WHERE `id` = %d LIMIT 1",
+						intval($contact['id'])
+					);
 				}
-				else
-					$when = datetime_convert('UTC','UTC','now','Y-m-d H:i:s');
+
+				$xml = fetch_url($contact['poll']);
 			}
-			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'])
-						);
+			elseif($contact['network'] === NETWORK_MAIL) {
+				if(! $mbox) {
+					$x = q("SELECT `prvkey` FROM `user` WHERE `uid` = %d LIMIT 1",
+						intval($importer_uid)
+					);
+					$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
+						intval($importer_uid)
+					);
+					if(count($x) && count($r)) {
+					    $mailbox = construct_mailbox_name($r[0]);
+						$password = '';
+						openssl_private_decrypt(hex2bin($r[0]['pass']),$password,$x[0]['prvkey']);
+						$mbox = email_connect($mailbox,$r[0]['user'],$password);
+						unset($password);
 					}
-					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($mbox) {
+					$msgs = email_poll($mbox,$contact['addr']);
+					if(count($msgs)) {
+						foreach($msgs as $msg_uid) {
+							$datarray = array();
+							$meta = email_msg_meta($mbox,$msg_uid);
+							$datarray['uri'] = trim($meta->message_id,'<>');
+//FIXME
+							$datarray['parent-uri'] = $datarray['uri'];
+							// Have we seen it before?
+							$r = q("SELECT * FROM `item` WHERE `uid` = %d AND `uri` = '%s' LIMIT 1",
+								intval($importer_uid),
+								dbesc($datarray['uri'])
 							);
 							if(count($r)) {
-								q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d LIMIT 1",
-									intval($r[0]['id'])
-								);
+								if($meta->deleted && ! $r[0]['deleted']) {
+									q("UPDATE `item` SET `deleted` = `, `changed` = '%s' WHERE `id` = %d LIMIT 1",
+										dbesc(datetime_convert()),
+										intval($r[0]['id'])
+									);
+								}		
+								continue;
 							}
-						}	
+							$datarray['title'] = notags(trim($meta->subject));
+							$datarray['created'] = datetime_convert('UTC','UTC',$meta->date);
+	
+							$r = email_get_msg($mbox,$msg_uid);
+							if(! $r)
+								continue;
+							$datarray['body'] = escape_tags($r['body']);
+							$datarray['uid'] = $importer_uid;
+							$datarray['contact-id'] = $contact['id'];
+							$datarray['private'] = 1;
+							$datarray['author-name'] = $contact['name'];
+							$datarray['author-link'] = 'mailbox';
+							$datarray['author-avatar'] = $contact['photo'];
+						
+							item_store($datarray);
+						}
 					}
-				}	
-				continue;
+				}
 			}
-
-
-			$is_reply = false;		
-			$item_id = $item->get_id();
-			$rawthread = $item->get_item_tags("http://purl.org/syndication/thread/1.0",'in-reply-to');
-			if(isset($rawthread[0]['attribs']['']['ref'])) {
-				$is_reply = true;
-				$parent_uri = $rawthread[0]['attribs']['']['ref'];
+			elseif($contact['network'] === NETWORK_FACEBOOK) {
+				// TODO: work in progress			
 			}
 
+			if($xml) {
+				logger('poller: received xml : ' . $xml, LOGGER_DATA);
 
-			if($is_reply) {
+				if(! strstr($xml,'<?xml')) {
+					logger('poller: post_handshake: 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;
+				}
 
-				// Have we seen it? If not, import it.
 
-				$item_id = $item->get_id();
+				consume_feed($xml,$importer,$contact,$hub,1, true);
 
-				$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'])
-						);
+				// do it twice. Ensures that children of parents which may be later in the stream aren't tossed
+	
+				consume_feed($xml,$importer,$contact,$hub,1);
 
 
+				if((strlen($hub)) && ($hub_update) && (($contact['rel'] == REL_BUD) || (($contact['network'] === NETWORK_OSTATUS) && (! $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);
+						}
 					}
-					continue;
 				}
-				$datarray = get_atom_elements($item);
-				$datarray['parent-uri'] = $parent_uri;
-				$datarray['uid'] = $importer['uid'];
-				$datarray['contact-id'] = $contact['id'];
-				$r = post_remote($a,$datarray);
-				continue;
 			}
 
-			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'])
-						);
-					}
-					continue;
-				}
-
-				$datarray = get_atom_elements($item);
-				$datarray['parent-uri'] = $item_id;
-				$datarray['uid'] = $importer['uid'];
-				$datarray['contact-id'] = $contact['id'];
-				$r = post_remote($a,$datarray);
-				continue;
+			$updated = datetime_convert();
 
-			}
+			$r = q("UPDATE `contact` SET `last-update` = '%s', `success_update` = '%s' WHERE `id` = %d LIMIT 1",
+				dbesc($updated),
+				dbesc($updated),
+				intval($contact['id'])
+			);
 
+			// loop - next contact
 		}
-
-		$r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d LIMIT 1",
-			dbesc(datetime_convert()),
-			intval($contact['id'])
-		);
-
 	}
-		
-	killme();
-
 
+	if($mbox && function_exists('imap_close'))
+		imap_close($mbox);
+		
+	return;
+}
 
+if (array_search(__file__,get_included_files())===0){
+  poller_run($argv,$argc);
+  killme();
+}