Bugfix

[friendica.git] / include / poller.php

diff --git a/include/poller.php b/include/poller.php
old mode 100644 (file)
new mode 100755 (executable)
index 9259456..3e7a1e9
--- a/include/poller.php
+++ b/include/poller.php
@@ -60,6 +60,8 @@ function poller_run($argv, $argc){
 
                update_contact_birthdays();
 
+               update_suggestions();
+
                set_config('system','last_expire_day',$d2);
                proc_run('php','include/expire.php');
        }
@@ -108,13 +110,14 @@ function poller_run($argv, $argc){
 
        $contacts = q("SELECT `contact`.`id` FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid` 
                WHERE ( `rel` = %d OR `rel` = %d ) AND `poll` != ''
-               AND `network` != '%s'
+               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_DIASPORA),
+               dbesc(NETWORK_FACEBOOK)
        );
 
        if(! count($contacts)) {
@@ -137,6 +140,9 @@ function poller_run($argv, $argc){
                        if($manual_id)
                                $contact['last-update'] = '0000-00-00 00:00:00';
 
+                       if($contact['network'] === NETWORK_DFRN || $contact['network'] === NETWORK_OSTATUS)
+                               $contact['priority'] = 2;
+
                        if($contact['priority'] || $contact['subhub']) {
 
                                $hub_update = true;
@@ -218,7 +224,7 @@ function poller_run($argv, $argc){
 
                        $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)
@@ -343,7 +349,7 @@ function poller_run($argv, $argc){
                                || ($contact['network'] === NETWORK_DIASPORA)
                                || ($contact['network'] === NETWORK_FEED) ) {
 
-                               // Upgrading DB fields from an older Friendika version
+                               // Upgrading DB fields from an older Friendica version
                                // Will only do this once per notify-enabled OStatus contact
                                // or if relationship changes
 
@@ -363,12 +369,16 @@ function poller_run($argv, $argc){
 
                                $xml = fetch_url($contact['poll']);
                        }
-                       elseif($contact['network'] === NETWORK_MAIL) {
+                       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)
@@ -382,6 +392,7 @@ function poller_run($argv, $argc){
                                        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()),
@@ -391,11 +402,16 @@ function poller_run($argv, $argc){
                                        }
                                }
                                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);
@@ -430,23 +446,28 @@ function poller_run($argv, $argc){
                                                        );
 
                                                        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'])
                                                                        );
-                                                               }               
+                                                               }
                                                                continue;
                                                        }
                                                        $datarray['title'] = notags(trim($meta->subject));
                                                        $datarray['created'] = datetime_convert('UTC','UTC',$meta->date);
-       
+
                                                        $r = email_get_msg($mbox,$msg_uid);
-                                                       if(! $r)
+                                                       if(! $r) {
+                                                               logger("Mail: can't fetch msg ".$msg_uid);
                                                                continue;
+                                                       }
                                                        $datarray['body'] = escape_tags($r['body']);
 
-                                                       // some mailing lists have the original author as 'from' - add this sender info to msg 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']))
@@ -456,14 +477,14 @@ function poller_run($argv, $argc){
                                                        $datarray['contact-id'] = $contact['id'];
                                                        if($datarray['parent-uri'] === $datarray['uri'])
                                                                $datarray['private'] = 1;
-                                                       if(! get_pconfig($importer_uid,'system','allow_public_email_replies')) {
+                                                       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']),
@@ -539,8 +560,9 @@ function poller_run($argv, $argc){
                                );
                        }
                        if(count($r)) {
-                               if(! $r[0]['total'])
+                               if(! $r[0]['total']) {
                                        poco_load($contact['id'],$importer_uid,$contact['poco']);
+                               }
                        }
 
                        // loop - next contact