Merge pull request #466 from pixelroot/master

[friendica.git] / include / onepoll.php

diff --git a/include/onepoll.php b/include/onepoll.php
index 02763cf4bad070765e56e25bbb47ff19c18b15a8..09e7bb7638d85885f1f64ab87984f2ac0abb455f 100644 (file)
--- a/include/onepoll.php
+++ b/include/onepoll.php
@@ -36,11 +36,6 @@ function onepoll_run($argv, $argc){
 
        logger('onepoll: start');
        
-       $abandon_days = intval(get_config('system','account_abandon_days'));
-       if($abandon_days < 1)
-               $abandon_days = 0;
-
-
        $manual_id  = 0;
        $generation = 0;
        $hub_update = false;
@@ -54,9 +49,7 @@ function onepoll_run($argv, $argc){
                logger('onepoll: no contact');
                return;
        }
-
-       if(was_recently_delayed($contact_id))
-               return;
+       
 
        $d = datetime_convert();
 
@@ -64,11 +57,6 @@ function onepoll_run($argv, $argc){
        // 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`.* FROM `contact` 
                WHERE ( `rel` = %d OR `rel` = %d ) AND `poll` != ''
                AND NOT `network` IN ( '%s', '%s' )
@@ -88,7 +76,6 @@ function onepoll_run($argv, $argc){
 
        $contact = $contacts[0];
 
-
        $xml = false;
 
        $t = $contact['last-update'];
@@ -139,15 +126,18 @@ function onepoll_run($argv, $argc){
                        . '&perm=' . $perm ;
 
                $handshake_xml = fetch_url($url);
+               $html_code = $a->get_curl_code();
 
                logger('onepoll: handshake with url ' . $url . ' returns xml: ' . $handshake_xml, LOGGER_DATA);
 
 
-               if(! $handshake_xml) {
+               if((! strlen($handshake_xml)) || ($html_code >= 400) || (! $html_code)) {
                        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
@@ -161,6 +151,9 @@ function onepoll_run($argv, $argc){
 
                if(! strstr($handshake_xml,'<?xml')) {
                        logger('poller: response from ' . $url . ' did not contain XML.');
+
+                       mark_for_death($contact);
+
                        $r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d LIMIT 1",
                                dbesc(datetime_convert()),
                                intval($contact['id'])
@@ -456,7 +449,7 @@ function onepoll_run($argv, $argc){
 
        if($xml) {
                logger('poller: received xml : ' . $xml, LOGGER_DATA);
-                       if((! strstr($xml,'<?xml')) && (! strstr($xml,'<rss'))) {
+               if((! strstr($xml,'<?xml')) && (! strstr($xml,'<rss'))) {
                        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()),