diff options
author | Thomas Willingham <beardyunixer@beardyunixer.com> | 2014-09-02 01:57:30 +0100 |
---|---|---|
committer | Thomas Willingham <beardyunixer@beardyunixer.com> | 2014-09-02 01:57:30 +0100 |
commit | 1c0be3994382ca355db16a2ab9f54dd99a37f1ec (patch) | |
tree | 725c7b2e3ec9f5970fc3b932d7cf3d29e6845717 /include/poller.php | |
parent | 473e582d1f3e5067c1aecee9c9f2f579864db3ef (diff) | |
parent | d507484cc52840e90fbe88568a56e61a183ef455 (diff) | |
download | volse-hubzilla-1c0be3994382ca355db16a2ab9f54dd99a37f1ec.tar.gz volse-hubzilla-1c0be3994382ca355db16a2ab9f54dd99a37f1ec.tar.bz2 volse-hubzilla-1c0be3994382ca355db16a2ab9f54dd99a37f1ec.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/poller.php')
-rw-r--r-- | include/poller.php | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/include/poller.php b/include/poller.php index b9d728e8d..2ba86dc0b 100644 --- a/include/poller.php +++ b/include/poller.php @@ -247,7 +247,7 @@ function poller_run($argv, $argc){ $sql_extra AND (( abook_flags & %d ) OR ( abook_flags = %d )) AND (( account_flags = %d ) OR ( account_flags = %d )) $abandon_sql ORDER BY RAND()", - intval(ABOOK_FLAG_HIDDEN|ABOOK_FLAG_PENDING|ABOOK_FLAG_UNCONNECTED), + intval(ABOOK_FLAG_HIDDEN|ABOOK_FLAG_PENDING|ABOOK_FLAG_UNCONNECTED|ABOOK_FLAG_FEED), intval(0), intval(ACCOUNT_OK), intval(ACCOUNT_UNVERIFIED) // FIXME @@ -263,6 +263,19 @@ function poller_run($argv, $argc){ $t = $contact['abook_updated']; $c = $contact['abook_connected']; + if($contact['abook_flags'] & ABOOK_FLAG_FEED) { + $min = intval(get_config('system','minimum_feedcheck_minutes')); + if(! $min) + $min = 60; + $x = datetime_convert('UTC','UTC',"now - $min minutes"); + if($c < $x) { + proc_run('php','include/onepoll.php',$contact['abook_id']); + if($interval) + @time_sleep_until(microtime(true) + (float) $interval); + } + continue; + } + if($c == $t) { if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 day")) |