]> git.mxchange.org Git - friendica.git/blobdiff - include/poller.php
nets widget - allow all children of specified parent net regardless of network
[friendica.git] / include / poller.php
index d54c88e0533febdc3b38d70f25b93671c495aa34..89e4488b92c2239ae09ddb68a3f5c5563fead479 100644 (file)
@@ -1,45 +1,90 @@
 <?php
+
 require_once("boot.php");
 
+
 function poller_run($argv, $argc){
-  global $a, $db;
+       global $a, $db;
 
-  if(is_null($a)){
-    $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);
-  };
-
-       require_once('session.php');
-       require_once('datetime.php');
-       require_once('simplepie/simplepie.inc');
+       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);
+       };
+
+
+       require_once('include/session.php');
+       require_once('include/datetime.php');
+       require_once('library/simplepie/simplepie.inc');
        require_once('include/items.php');
        require_once('include/Contact.php');
+       require_once('include/email.php');
+       require_once('include/socgraph.php');
+
+       load_config('config');
+       load_config('system');
 
        $a->set_baseurl(get_config('system','url'));
 
+       load_hooks();
+
        logger('poller: start');
        
        // run queue delivery process in the background
 
        proc_run('php',"include/queue.php");
        
+       // expire any expired accounts
+
+       q("UPDATE user SET `account_expired` = 1 where `account_expired` = 0 
+               AND `account_expires_on` != '0000-00-00 00:00:00' 
+               AND `account_expires_on` < UTC_TIMESTAMP() ");
+  
+       $abandon_days = intval(get_config('system','account_abandon_days'));
+       if($abandon_days < 1)
+               $abandon_days = 0;
+
+       
+
+       // once daily run birthday_updates and then expire in background
+
+       $d1 = get_config('system','last_expire_day');
+       $d2 = intval(datetime_convert('UTC','UTC','now','d'));
+
+       if($d2 != intval($d1)) {
+
+               update_contact_birthdays();
+
+               update_suggestions();
+
+               set_config('system','last_expire_day',$d2);
+               proc_run('php','include/expire.php');
+       }
+
        // clear old cache
-       q("DELETE FROM `cache` WHERE `updated`<'%s'",
-               dbesc(datetime_convert('UTC','UTC',"now - 30 days")));
+       Cache::clear();
 
        $manual_id  = 0;
+       $generation = 0;
        $hub_update = false;
        $force      = false;
+       $restart    = false;
 
        if(($argc > 1) && ($argv[1] == 'force'))
                $force = true;
 
+       if(($argc > 1) && ($argv[1] == 'restart')) {
+               $restart = true;
+               $generation = intval($argv[2]);
+               if(! $generation)
+                       killme();               
+       }
+
        if(($argc > 1) && intval($argv[1])) {
                $manual_id = intval($argv[1]);
                $force     = true;
@@ -47,245 +92,468 @@ function poller_run($argv, $argc){
 
        $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 ( ( `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()");
+       reload_plugins();
+
+       $d = datetime_convert();
+
+       if(! $restart)
+               proc_run('php','include/cronhooks.php');
 
-       if(! count($contacts)){
+       // Only poll from those with suitable relationships,
+       // and which have a polling address and ignore Diaspora since 
+       // we are unable to match those posts with a Diaspora GUID and prevent duplicates.
+
+       $abandon_sql = (($abandon_days) 
+               ? sprintf(" AND `user`.`login_date` > UTC_TIMESTAMP() - INTERVAL %d DAY ", intval($abandon_days)) 
+               : '' 
+       );
+
+       $contacts = q("SELECT `contact`.`id` FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid` 
+               WHERE ( `rel` = %d OR `rel` = %d ) AND `poll` != ''
+               AND NOT `network` IN ( '%s', '%s' )
+               $sql_extra 
+               AND `self` = 0 AND `contact`.`blocked` = 0 AND `contact`.`readonly` = 0 
+               AND `user`.`account_expired` = 0 $abandon_sql ORDER BY RAND()",
+               intval(CONTACT_IS_SHARING),
+               intval(CONTACT_IS_FRIEND),
+               dbesc(NETWORK_DIASPORA),
+               dbesc(NETWORK_FACEBOOK)
+       );
+
+       if(! count($contacts)) {
                return;
        }
 
-       foreach($contacts as $contact) {
+       foreach($contacts as $c) {
 
-               if($manual_id)
-                       $contact['last-update'] = '0000-00-00 00:00:00';
+               $res = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
+                       intval($c['id'])
+               );
+
+               if((! $res) || (! count($res)))
+                       continue;
 
-               if($contact['priority'] || $contact['subhub']) {
+               foreach($res as $contact) {
 
-                       $hub_update = true;
-                       $update     = false;
+                       $xml = false;
 
-                       $t = $contact['last-update'];
+                       if($manual_id)
+                               $contact['last-update'] = '0000-00-00 00:00:00';
 
-                       // 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['network'] === NETWORK_DFRN || $contact['network'] === NETWORK_OSTATUS)
+                               $contact['priority'] = 2;
 
+                       if($contact['priority'] || $contact['subhub']) {
 
-                       if($contact['subhub']) {
-                               $interval = get_config('system','pushpoll_frequency');
-                               $contact['priority'] = (($interval !== false) ? intval($interval) : 3);
-                               $hub_update = false;
+                               $hub_update = true;
+                               $update     = false;
 
-                               if((datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 day")) || $force)
-                                               $hub_update = true;
-                       }
+                               $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'. 
 
-                       /**
-                        * 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($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;
+                               }
+                               else
+                                       $hub_update = false;
+
+                               /**
+                                * 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((! $update) && (! $force))
-                               continue;
-               }
 
-               $importer_uid = $contact['uid'];
+                       // Check to see if we are running out of memory - if so spawn a new process and kill this one
+
+                       $avail_memory = return_bytes(ini_get('memory_limit'));
+                       $memused = memory_get_peak_usage(true);
+                       if(intval($avail_memory)) {
+                               if(($memused / $avail_memory) > 0.95) {
+                                       if($generation + 1 > 10) {
+                                               logger('poller: maximum number of spawns exceeded. Terminating.');
+                                               killme();
+                                       }
+                                       logger('poller: memory exceeded. ' . $memused . ' bytes used. Spawning new poll.');
+                                       proc_run('php', 'include/poller.php', 'restart', (string) $generation + 1);
+                                       killme();
+                               }
+                       }
 
-               $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
-                       intval($importer_uid)
-               );
-               if(! count($r))
-                       continue;
+                       $importer_uid = $contact['uid'];
+               
+                       $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
+                               intval($importer_uid)
+                       );
+                       if(! count($r))
+                               continue;
 
-               $importer = $r[0];
+                       $importer = $r[0];
 
-               logger("poller: poll: IMPORTER: {$importer['name']}, CONTACT: {$contact['name']}");
+                       logger("poller: poll: ({$contact['id']}) 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)
-               );
+                       $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) {
 
-               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;            
+                               // 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 ;
+                               $url = $contact['poll'] . '?dfrn_id=' . $idtosend 
+                                       . '&dfrn_version=' . DFRN_PROTOCOL_VERSION 
+                                       . '&type=data&last_update=' . $last_update 
+                                       . '&perm=' . $perm ;
        
-                       $xml = fetch_url($url);
+                               $handshake_xml = fetch_url($url);
 
-                       logger('poller: handshake with url ' . $url . ' returns xml: ' . $xml, LOGGER_DATA);
+                               logger('poller: handshake with url ' . $url . ' returns xml: ' . $handshake_xml, LOGGER_DATA);
 
 
-                       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(! $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
+                                       // 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'])
-                               );
+                                       $r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d LIMIT 1",
+                                               dbesc(datetime_convert()),
+                                               intval($contact['id'])
+                                       );
 
-                               continue;
-                       }
+                                       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;
-                       }
+                               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 = simplexml_load_string($xml);
+                               $res = parse_xml_string($handshake_xml);
+       
+                               if(intval($res->status) == 1) {
+                                       logger("poller: $url replied status 1 - marking for death ");
 
-                       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
 
-                               // 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'])
+                                       );
 
-                               $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);
+                                       }
+                               }
 
-                               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((intval($res->status) != 0) || (! strlen($res->challenge)) || (! strlen($res->dfrn_id)))
+                                       continue;
+
+                               if(((float) $res->dfrn_version > 2.21) && ($contact['poco'] == '')) {
+                                       q("update contact set poco = '%s' where id = %d limit 1",
+                                               dbesc(str_replace('/profile/','/poco/', $contact['url'])),
+                                               intval($contact['id'])
+                                       );
                                }
-                       }
 
-                       if((intval($res->status) != 0) || (! strlen($res->challenge)) || (! strlen($res->dfrn_id)))
-                               continue;
+                               $postvars = array();
 
-                       $postvars = array();
+                               $sent_dfrn_id = hex2bin((string) $res->dfrn_id);
+                               $challenge    = hex2bin((string) $res->challenge);
 
-                       $sent_dfrn_id = hex2bin((string) $res->dfrn_id);
-                       $challenge    = hex2bin((string) $res->challenge);
+                               $final_dfrn_id = '';
 
-                       $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']);
+                               }
 
-                       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, '.'));
 
-                       $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(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;
+                               }
 
-                       if($final_dfrn_id != $orig_id) {
+                               $postvars['dfrn_id'] = $idtosend;
+                               $postvars['dfrn_version'] = DFRN_PROTOCOL_VERSION;
+                               $postvars['perm'] = 'rw';
 
-                               // did not decode properly - cannot trust this site 
-                               continue;
+                               $xml = post_url($contact['poll'],$postvars);
                        }
+                       elseif(($contact['network'] === NETWORK_OSTATUS) 
+                               || ($contact['network'] === NETWORK_DIASPORA)
+                               || ($contact['network'] === NETWORK_FEED) ) {
 
-                       $postvars['dfrn_id'] = $idtosend;
-                       $postvars['dfrn_version'] = DFRN_PROTOCOL_VERSION;
+                               // Upgrading DB fields from an older Friendika version
+                               // Will only do this once per notify-enabled OStatus contact
+                               // or if relationship changes
 
-                       $xml = post_url($contact['poll'],$postvars);
-               }
-               else {
+                               $stat_writeable = ((($contact['notify']) && ($contact['rel'] == CONTACT_IS_FOLLOWER || $contact['rel'] == CONTACT_IS_FRIEND)) ? 1 : 0);
 
-                       // $contact['network'] !== 'dfrn'
+                               if($stat_writeable != $contact['writable']) {
+                                       q("UPDATE `contact` SET `writable` = %d WHERE `id` = %d LIMIT 1",
+                                               intval($stat_writeable),
+                                               intval($contact['id'])
+                                       );
+                               }
 
-                       $xml = fetch_url($contact['poll']);
-               }
+                               // Are we allowed to import from this person?
 
-               logger('poller: received xml : ' . $xml, LOGGER_DATA);
+                               if($contact['rel'] == CONTACT_IS_FOLLOWER || $contact['blocked'] || $contact['readonly'])
+                                       continue;
 
-               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;
-               }
+                               $xml = fetch_url($contact['poll']);
+                       }
+                       elseif($contact['network'] === NETWORK_MAIL) {
 
-               consume_feed($xml,$importer,$contact,$hub,1);
+                               $mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
+                               if($mail_disabled)
+                                       continue;
 
-               // do it twice. Ensures that children of parents which may be later in the stream aren't tossed
+                               $mbox = null;
+                               $x = q("SELECT `prvkey` FROM `user` WHERE `uid` = %d LIMIT 1",
+                                       intval($importer_uid)
+                               );
+                               $mailconf = q("SELECT * FROM `mailacct` WHERE `server` != '' AND `uid` = %d LIMIT 1",
+                                       intval($importer_uid)
+                               );
+                               if(count($x) && count($mailconf)) {
+                                   $mailbox = construct_mailbox_name($mailconf[0]);
+                                       $password = '';
+                                       openssl_private_decrypt(hex2bin($mailconf[0]['pass']),$password,$x[0]['prvkey']);
+                                       $mbox = email_connect($mailbox,$mailconf[0]['user'],$password);
+                                       unset($password);
+                                       if($mbox) {
+                                               q("UPDATE `mailacct` SET `last_check` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1",
+                                                       dbesc(datetime_convert()),
+                                                       intval($mailconf[0]['id']),
+                                                       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);
+                                                       $headers = email_msg_headers($mbox,$msg_uid);
+
+                                                       // look for a 'references' header and try and match with a parent item we have locally.
+
+                                                       $raw_refs = ((x($headers,'references')) ? str_replace("\t",'',$headers['references']) : '');
+                                                       $datarray['uri'] = trim($meta->message_id,'<>');
+
+                                                       if($raw_refs) {
+                                                               $refs_arr = explode(' ', $raw_refs);
+                                                               if(count($refs_arr)) {
+                                                                       for($x = 0; $x < count($refs_arr); $x ++)
+                                                                               $refs_arr[$x] = "'" . str_replace(array('<','>',' '),array('','',''),dbesc($refs_arr[$x])) . "'";
+                                                               }
+                                                               $qstr = implode(',',$refs_arr);
+                                                               $r = q("SELECT `uri` , `parent-uri` FROM `item` WHERE `uri` IN ( $qstr ) AND `uid` = %d LIMIT 1",
+                                                                       intval($importer_uid)
+                                                               );
+                                                               if(count($r))
+                                                                       $datarray['parent-uri'] = $r[0]['uri'];
+                                                       }
+
+
+                                                       if(! x($datarray,'parent-uri'))
+                                                               $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)) {
+                                                               if($meta->deleted && ! $r[0]['deleted']) {
+                                                                       q("UPDATE `item` SET `deleted` = 1, `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']);
+
+                                                       // some mailing lists have the original author as 'from' - add this sender info to msg body. 
+                                                       // todo: adding a gravatar for the original author would be cool
+
+                                                       if(! stristr($meta->from,$contact['addr']))
+                                                               $datarray['body'] = t('From: ') . escape_tags($meta->from) . "\n\n" . $datarray['body'];
+
+                                                       $datarray['uid'] = $importer_uid;
+                                                       $datarray['contact-id'] = $contact['id'];
+                                                       if($datarray['parent-uri'] === $datarray['uri'])
+                                                               $datarray['private'] = 1;
+                                                       if(! get_pconfig($importer_uid,'system','allow_public_email_replies')) {
+                                                               $datarray['private'] = 1;
+                                                               $datarray['allow_cid'] = '<' . $contact['id'] . '>';
+                                                       }
+                                                       $datarray['author-name'] = $contact['name'];
+                                                       $datarray['author-link'] = 'mailbox';
+                                                       $datarray['author-avatar'] = $contact['photo'];
+                                               
+                                                       $stored_item = item_store($datarray);
+                                                       q("UPDATE `item` SET `last-child` = 0 WHERE `parent-uri` = '%s' AND `uid` = %d",
+                                                               dbesc($datarray['parent-uri']),
+                                                               intval($importer_uid)
+                                                       );
+                                                       q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d LIMIT 1",
+                                                               intval($stored_item)
+                                                       );
+                                               }
+                                       }
+
+                                       imap_close($mbox);
+                               }
+                       }
+                       elseif($contact['network'] === NETWORK_FACEBOOK) {
+                               // This is picked up by the Facebook plugin on a cron hook.
+                               // Ignored here.                        
+                       }
 
-               consume_feed($xml,$importer,$contact,$hub,1);
+                       if($xml) {
+                               logger('poller: received xml : ' . $xml, LOGGER_DATA);
 
+                               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;
+                               }
+
+
+                               consume_feed($xml,$importer,$contact,$hub,1,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);
+                               // 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,2);
+
+                               $hubmode = 'subscribe';
+                               if($contact['network'] === NETWORK_DFRN || $contact['blocked'] || $contact['readonly'])
+                                       $hubmode = 'unsubscribe';
+
+                               if((strlen($hub)) && ($hub_update) && ($contact['rel'] != CONTACT_IS_FOLLOWER)) {
+                                       logger('poller: hub ' . $hubmode . ' : ' . $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,$hubmode);
+                                               }
+                                       }
                                }
                        }
-               }
 
 
-               $updated = datetime_convert();
+                       $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'])
-               );
+                       $r = q("UPDATE `contact` SET `last-update` = '%s', `success_update` = '%s' WHERE `id` = %d LIMIT 1",
+                               dbesc($updated),
+                               dbesc($updated),
+                               intval($contact['id'])
+                       );
+
+
+                       // load current friends if possible.
+
+                       if($contact['poco']) {  
+                               $r = q("SELECT count(*) as total from glink 
+                                       where `cid` = %d and updated > UTC_TIMESTAMP() - INTERVAL 1 DAY",
+                                       intval($contact['id'])
+                               );
+                       }
+                       if(count($r)) {
+                               if(! $r[0]['total']) {
+                                       poco_load($contact['id'],$importer_uid,$contact['poco']);
+                               }
+                       }
+
+                       // loop - next contact
+               }
+       }
 
-               // loop - next contact
-       }  
                
        return;
 }