]> git.mxchange.org Git - friendica.git/blobdiff - include/poller.php
The poller can now be called even inside the "include" directory.
[friendica.git] / include / poller.php
index 499483d007dea6ecaffde1d9c4d0fffb420e79e3..f95d3b180787209720373ef8d102f9b41ba4f3cf 100644 (file)
@@ -1,18 +1,29 @@
 <?php
+if (sizeof($_SERVER["argv"]) == 0)
+       die();
+
+$directory = dirname($_SERVER["argv"][0]);
+
+if (substr($directory, 0, 1) != "/")
+       $directory = $_SERVER["PWD"]."/".$directory;
+
+$directory = realpath($directory."/..");
+
+chdir($directory);
 
 require_once("boot.php");
 
 
-function poller_run($argv, $argc){
+function poller_run(&$argv, &$argc){
        global $a, $db;
 
        if(is_null($a)) {
                $a = new App;
        }
-  
+
        if(is_null($db)) {
            @include(".htconfig.php");
-       require_once("dba.php");
+       require_once("include/dba.php");
            $db = new dba($db_host, $db_user, $db_pass, $db_data);
        unset($db_host, $db_user, $db_pass, $db_data);
        };
@@ -30,36 +41,73 @@ function poller_run($argv, $argc){
        load_config('config');
        load_config('system');
 
-       $lockpath = get_config('system','lockpath');
+       $maxsysload = intval(get_config('system','maxloadavg'));
+       if($maxsysload < 1)
+               $maxsysload = 50;
+       if(function_exists('sys_getloadavg')) {
+               $load = sys_getloadavg();
+               if(intval($load[0]) > $maxsysload) {
+                       logger('system: load ' . $load . ' too high. Poller deferred to next scheduled run.');
+                       return;
+               }
+       }
+
+       $lockpath = get_lockpath();
        if ($lockpath != '') {
-               $pidfile = new pidfile($lockpath, 'poller.lck');
+               $pidfile = new pidfile($lockpath, 'poller');
                if($pidfile->is_already_running()) {
                        logger("poller: Already running");
+                       if ($pidfile->running_time() > 9*60) {
+                                $pidfile->kill();
+                                logger("poller: killed stale process");
+                                // Calling a new instance
+                                proc_run('php','include/poller.php');
+                        }
                        exit;
                }
        }
 
+
+
        $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");
-       
+
+       // run diaspora photo queue process in the background
+
+       proc_run('php',"include/dsprphotoq.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() ");
-  
+
+       // delete user and contact records for recently removed accounts
+
+       $r = q("SELECT * FROM `user` WHERE `account_removed` = 1 AND `account_expires_on` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
+       if ($r) {
+               foreach($r as $user) {
+                       q("DELETE FROM `contact` WHERE `uid` = %d", intval($user['uid']));
+                       q("DELETE FROM `user` WHERE `uid` = %d", intval($user['uid']));
+               }
+       }
+
        $abandon_days = intval(get_config('system','account_abandon_days'));
        if($abandon_days < 1)
                $abandon_days = 0;
 
-       
+       // Check OStatus conversations
+       check_conversations();
+
+       // To-Do: Regenerate usage statistics
+       // q("ANALYZE TABLE `item`");
 
        // once daily run birthday_updates and then expire in background
 
@@ -76,20 +124,38 @@ function poller_run($argv, $argc){
                proc_run('php','include/expire.php');
        }
 
-       // clear old cache
-       Cache::clear();
-
-       // clear item cache files if they are older than one day
-       $cache = get_config('system','itemcache');
-       if (($cache != '') and is_dir($cache)) {
-               if ($dh = opendir($cache)) {
-                       while (($file = readdir($dh)) !== false) {
-                               $fullpath = $cache."/".$file;
-                               if ((filetype($fullpath) == "file") and filectime($fullpath) < (time() - 86400))
-                                       unlink($fullpath);
-                       }
-                       closedir($dh);
+       $last = get_config('system','cache_last_cleared');
+
+       if($last) {
+               $next = $last + (3600); // Once per hour
+               $clear_cache = ($next <= time());
+        } else
+               $clear_cache = true;
+
+       if ($clear_cache) {
+               // clear old cache
+               Cache::clear();
+
+               // clear old item cache files
+               clear_cache();
+
+               // clear cache for photos
+               clear_cache($a->get_basepath(), $a->get_basepath()."/photo");
+
+               // clear smarty cache
+               clear_cache($a->get_basepath()."/view/smarty3/compiled", $a->get_basepath()."/view/smarty3/compiled");
+
+               // clear cache for image proxy
+               if (!get_config("system", "proxy_disabled")) {
+                       clear_cache($a->get_basepath(), $a->get_basepath()."/proxy");
+
+                       $cachetime = get_config('system','proxy_cache_time');
+                       if (!$cachetime) $cachetime = PROXY_DEFAULT_TIME;
+
+                       q('DELETE FROM `photo` WHERE `uid` = 0 AND `resource-id` LIKE "pic:%%" AND `created` < NOW() - INTERVAL %d SECOND', $cachetime);
                }
+
+               set_config('system','cache_last_cleared', time());
        }
 
        $manual_id  = 0;
@@ -105,7 +171,7 @@ function poller_run($argv, $argc){
                $restart = true;
                $generation = intval($argv[2]);
                if(! $generation)
-                       killme();               
+                       killme();
        }
 
        if(($argc > 1) && intval($argv[1])) {
@@ -113,6 +179,10 @@ function poller_run($argv, $argc){
                $force     = true;
        }
 
+       $interval = intval(get_config('system','poll_interval'));
+       if(! $interval) 
+               $interval = ((get_config('system','delivery_interval') === false) ? 3 : intval(get_config('system','delivery_interval')));
+
        $sql_extra = (($manual_id) ? " AND `id` = $manual_id " : "");
 
        reload_plugins();
@@ -131,16 +201,18 @@ function poller_run($argv, $argc){
                : '' 
        );
 
-       $contacts = q("SELECT `contact`.`id` FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid` 
+       $contacts = q("SELECT `contact`.`id` FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid` 
                WHERE ( `rel` = %d OR `rel` = %d ) AND `poll` != ''
-               AND NOT `network` IN ( '%s', '%s' )
+               AND NOT `network` IN ( '%s', '%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()",
+               AND `contact`.`archive` = 0 
+               AND `user`.`account_expired` = 0 AND `user`.`account_removed` = 0 $abandon_sql ORDER BY RAND()",
                intval(CONTACT_IS_SHARING),
                intval(CONTACT_IS_FRIEND),
                dbesc(NETWORK_DIASPORA),
-               dbesc(NETWORK_FACEBOOK)
+               dbesc(NETWORK_FACEBOOK),
+               dbesc(NETWORK_PUMPIO)
        );
 
        if(! count($contacts)) {
@@ -179,14 +251,14 @@ function poller_run($argv, $argc){
                                // 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'. 
+                               // 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);
+                                       $poll_interval = get_config('system','pushpoll_frequency');
+                                       $contact['priority'] = (($poll_interval !== false) ? intval($poll_interval) : 3);
                                        $hub_update = false;
-       
+
                                        if((datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 day")) || $force)
                                                        $hub_update = true;
                                }
@@ -195,13 +267,13 @@ function poller_run($argv, $argc){
 
                                /**
                                 * 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;                                  
+                                               break;
                                        case 4:
                                                if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 week"))
                                                        $update = true;
@@ -224,444 +296,22 @@ function poller_run($argv, $argc){
                                        continue;
                        }
 
-                       // 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();
-                               }
-                       }
-
-                       $importer_uid = $contact['uid'];
-               
-                       $r = q("SELECT `contact`.*, `user`.`page-flags` FROM `contact` LEFT JOIN `user` on `contact`.`uid` = `user`.`uid` WHERE `user`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1",
-                               intval($importer_uid)
-                       );
-                       if(! count($r))
-                               continue;
-
-                       $importer = $r[0];
-
-                       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)
-                       );
-
-                       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);
-                                       }
-                               }
-
-                               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'])
-                                       );
-                               }
-
-                               $postvars = array();
-
-                               $sent_dfrn_id = hex2bin((string) $res->dfrn_id);
-                               $challenge    = hex2bin((string) $res->challenge);
-
-                               $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, '.'));
-
-                               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 Friendica version
-                               // Will only do this once per notify-enabled OStatus contact
-                               // or if relationship changes
-
-                               $stat_writeable = ((($contact['notify']) && ($contact['rel'] == CONTACT_IS_FOLLOWER || $contact['rel'] == CONTACT_IS_FRIEND)) ? 1 : 0);
-
-                               if($stat_writeable != $contact['writable']) {
-                                       q("UPDATE `contact` SET `writable` = %d WHERE `id` = %d LIMIT 1",
-                                               intval($stat_writeable),
-                                               intval($contact['id'])
-                                       );
-                               }
-
-                               // Are we allowed to import from this person?
-
-                               if($contact['rel'] == CONTACT_IS_FOLLOWER || $contact['blocked'] || $contact['readonly'])
-                                       continue;
-
-                               $xml = fetch_url($contact['poll']);
-                       }
-                       elseif($contact['network'] === NETWORK_MAIL || $contact['network'] === NETWORK_MAIL2) {
-
-                               logger("Mail: Fetching");
-
-                               $mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
-                               if($mail_disabled)
-                                       continue;
-
-                               logger("Mail: Enabled");
-
-                               $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);
-                                       logger("Mail: Connect");
-                                       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) {
-                                       logger("Mail: mbox");
-
-                                       $msgs = email_poll($mbox,$contact['addr']);
-
-                                       if(count($msgs)) {
-                                               logger("Mail: Parsing ".count($msgs)." mails.");
-
-                                               foreach($msgs as $msg_uid) {
-                                                       logger("Mail: Parsing mail ".$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'] = msgid2iri(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] = "'" . msgid2iri(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)) {
-                                                               logger("Mail: Seen before ".$msg_uid);
-                                                               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'])
-                                                                       );
-                                                               }
-                                                               switch ($mailconf[0]['action']) {
-                                                                       case 0:
-                                                                               break;
-                                                                       case 1:
-                                                                               logger("Mail: Deleting ".$msg_uid);
-                                                                               imap_delete($mbox, $msg_uid, FT_UID);
-                                                                               break;
-                                                                       case 2:
-                                                                               logger("Mail: Mark as seen ".$msg_uid);
-                                                                               imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID);
-                                                                               break;
-                                                                       case 3:
-                                                                               logger("Mail: Moving ".$msg_uid." to ".$mailconf[0]['movetofolder']);
-                                                                               imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID);
-                                                                               if ($mailconf[0]['movetofolder'] != "")
-                                                                                       imap_mail_move($mbox, $msg_uid, $mailconf[0]['movetofolder'], FT_UID);
-                                                                               break;
-                                                               }
-                                                               continue;
-                                                       }
-
-                                                       // Decoding the header
-                                                       $subject = imap_mime_header_decode($meta->subject);
-                                                       $datarray['title'] = "";
-                                                       foreach($subject as $subpart)
-                                                               if ($subpart->charset != "default")
-                                                                       $datarray['title'] .= iconv($subpart->charset, 'UTF-8//IGNORE', $subpart->text);
-                                                               else
-                                                                       $datarray['title'] .= $subpart->text;
-
-                                                       $datarray['title'] = notags(trim($datarray['title']));
-
-                                                       //$datarray['title'] = notags(trim($meta->subject));
-                                                       $datarray['created'] = datetime_convert('UTC','UTC',$meta->date);
-
-                                                       // Is it  reply?
-                                                       $reply = ((substr(strtolower($datarray['title']), 0, 3) == "re:") or
-                                                               (substr(strtolower($datarray['title']), 0, 3) == "re-") or
-                                                               (raw_refs != ""));
-
-                                                       $r = email_get_msg($mbox,$msg_uid, $reply);
-                                                       if(! $r) {
-                                                               logger("Mail: can't fetch msg ".$msg_uid);
-                                                               continue;
-                                                       }
-                                                       $datarray['body'] = escape_tags($r['body']);
-
-                                                       logger("Mail: Importing ".$msg_uid);
-
-                                                       // 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'])) {
-                                                               $from = imap_mime_header_decode($meta->from);
-                                                               $fromdecoded = "";
-                                                               foreach($from as $frompart)
-                                                                       if ($frompart->charset != "default")
-                                                                               $fromdecoded .= iconv($frompart->charset, 'UTF-8//IGNORE', $frompart->text);
-                                                                       else
-                                                                               $fromdecoded .= $frompart->text;
-
-                                                               $datarray['body'] = "[b]".t('From: ') . escape_tags($fromdecoded) . "[/b]\n\n" . $datarray['body'];
-                                                       }
-
-                                                       $datarray['uid'] = $importer_uid;
-                                                       $datarray['contact-id'] = $contact['id'];
-                                                       if($datarray['parent-uri'] === $datarray['uri'])
-                                                               $datarray['private'] = 1;
-                                                       if(($contact['network'] === NETWORK_MAIL) && (! 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)
-                                                       );
-                                                       switch ($mailconf[0]['action']) {
-                                                               case 0:
-                                                                       break;
-                                                               case 1:
-                                                                       logger("Mail: Deleting ".$msg_uid);
-                                                                       imap_delete($mbox, $msg_uid, FT_UID);
-                                                                       break;
-                                                               case 2:
-                                                                       logger("Mail: Mark as seen ".$msg_uid);
-                                                                       imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID);
-                                                                       break;
-                                                               case 3:
-                                                                       logger("Mail: Moving ".$msg_uid." to ".$mailconf[0]['movetofolder']);
-                                                                       imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID);
-                                                                       if ($mailconf[0]['movetofolder'] != "")
-                                                                               imap_mail_move($mbox, $msg_uid, $mailconf[0]['movetofolder'], FT_UID);
-                                                                       break;
-                                                       }
-                                               }
-                                       }
-
-                                       imap_close($mbox);
-                               }
-                       }
-                       elseif($contact['network'] === NETWORK_FACEBOOK) {
-                               // This is picked up by the Facebook plugin on a cron hook.
-                               // Ignored here.
-                       }
-
-                       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);
-
-                               // 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();
-
-                       $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']);
-                               }
-                       }
+                       // Don't run onepoll.php if the contact isn't pollable
+                       // This check also is inside the onepoll.php - but this will reduce the load
+                       if (in_array($contact["rel"], array(CONTACT_IS_SHARING, CONTACT_IS_FRIEND)) AND ($contact["poll"] != "")
+                               AND !in_array($contact['network'], array(NETWORK_DIASPORA, NETWORK_FACEBOOK, NETWORK_PUMPIO, NETWORK_TWITTER, NETWORK_APPNET))
+                               AND !$contact["self"] AND !$contact["blocked"] AND !$contact["readonly"] AND !$contact["archive"])
+                               proc_run('php','include/onepoll.php',$contact['id']);
 
-                       // loop - next contact
+                       if($interval)
+                               @time_sleep_until(microtime(true) + (float) $interval);
                }
        }
 
-               
        return;
 }
 
 if (array_search(__file__,get_included_files())===0){
-  poller_run($argv,$argc);
+  poller_run($_SERVER["argv"],$_SERVER["argc"]);
   killme();
 }