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/onepoll.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/onepoll.php')
| -rw-r--r-- | include/onepoll.php | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/include/onepoll.php b/include/onepoll.php index 947e936ac..d64785f92 100644 --- a/include/onepoll.php +++ b/include/onepoll.php @@ -38,7 +38,7 @@ function onepoll_run($argv, $argc){ AND NOT ( abook_flags & %d ) AND (( account_flags = %d ) OR ( account_flags = %d )) limit 1", intval($contact_id), - 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(ABOOK_FLAG_ARCHIVED|ABOOK_FLAG_BLOCKED|ABOOK_FLAG_IGNORED), intval(ACCOUNT_OK), @@ -72,6 +72,19 @@ function onepoll_run($argv, $argc){ : datetime_convert('UTC','UTC',$contact['abook_updated'] . ' - 2 days') ); + if($contact['xchan_network'] === 'rss') { + logger('onepoll: processing feed ' . $contact['xchan_name'], LOGGER_DEBUG); + handle_feed($importer['channel_id'],$contact_id,$contact['xchan_hash']); + q("update abook set abook_connected = '%s' where abook_id = %d limit 1", + dbesc(datetime_convert()), + intval($contact['abook_id']) + ); + return; + } + + if($contact['xchan_network'] !== 'zot') + return; + // update permissions $x = zot_refresh($contact,$importer); @@ -130,11 +143,9 @@ function onepoll_run($argv, $argc){ } } - // fetch some items // set last updated timestamp - if($contact['xchan_connurl']) { $r = q("SELECT xlink_id from xlink where xlink_xchan = '%s' and xlink_updated > UTC_TIMESTAMP() - INTERVAL 1 DAY limit 1", |