diff options
-rw-r--r-- | include/onepoll.php | 9 | ||||
-rw-r--r-- | include/poller.php | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/include/onepoll.php b/include/onepoll.php index a225edfd8..50c2566be 100644 --- a/include/onepoll.php +++ b/include/onepoll.php @@ -69,7 +69,7 @@ function onepoll_run($argv, $argc){ $last_update = (($contact['abook_updated'] === '0000-00-00 00:00:00') ? datetime_convert('UTC','UTC','now - 7 days') - : datetime_convert('UTC','UTC',$contact['abook_updated']) + : datetime_convert('UTC','UTC',$contact['abook_updated'] . ' - 2 days') ); // update permissions @@ -98,11 +98,12 @@ function onepoll_run($argv, $argc){ return; if($contact['xchan_connurl']) { - $feedurl = str_replace('/poco/','/zotfeed/',$channel['xchan_connurl']); - - $x = z_fetch_url($feedurl . '?f=$mindate=' . $last_update); + $feedurl = str_replace('/poco/','/zotfeed/',$channel['xchan_connurl']); + $x = z_fetch_url($feedurl . '?f=&mindate=' . $last_update); if($x['success']) { $total = 0; + logger('onepoll: feed update ' . $contact['xchan_name']); + $j = json_decode($x['body'],true); if($j['success'] && $j['messages']) { foreach($j['messages'] as $message) { diff --git a/include/poller.php b/include/poller.php index 7a6aaeb22..bdb0388ac 100644 --- a/include/poller.php +++ b/include/poller.php @@ -224,7 +224,7 @@ function poller_run($argv, $argc){ $update = true; } } -dbg(0); + if((! $update) && (! $force)) continue; |