diff options
| author | Friendika <info@friendika.com> | 2011-08-07 16:15:54 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-08-07 16:15:54 -0700 |
| commit | 48ffa880f099b19052f18e399bf6af50780a24b0 (patch) | |
| tree | 48f5e9b52b425af937b5ae2511aaaf6968e0b666 /include/poller.php | |
| parent | aa3a14ec36db5f9df9d0ec27c607a994451fc845 (diff) | |
| download | volse-hubzilla-48ffa880f099b19052f18e399bf6af50780a24b0.tar.gz volse-hubzilla-48ffa880f099b19052f18e399bf6af50780a24b0.tar.bz2 volse-hubzilla-48ffa880f099b19052f18e399bf6af50780a24b0.zip | |
cleanup
Diffstat (limited to 'include/poller.php')
| -rw-r--r-- | include/poller.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/poller.php b/include/poller.php index 569eb59d1..c88db6e6b 100644 --- a/include/poller.php +++ b/include/poller.php @@ -87,8 +87,8 @@ function poller_run($argv, $argc){ WHERE ( `rel` = %d OR `rel` = %d ) AND `poll` != '' $sql_extra AND `self` = 0 AND `blocked` = 0 AND `readonly` = 0 ORDER BY RAND()", - intval(REL_FAN), - intval(REL_BUD) + intval(CONTACT_IS_SHARING), + intval(CONTACT_IS_FRIEND) ); if(! count($contacts)) { @@ -312,7 +312,7 @@ function poller_run($argv, $argc){ // Will only do this once per notify-enabled OStatus contact // or if relationship changes - $stat_writeable = ((($contact['notify']) && ($contact['rel'] == REL_VIP || $contact['rel'] == REL_BUD)) ? 1 : 0); + $stat_writeable = ((($contact['notify']) && ($contact['rel'] == CONTACT_IS_FOLLOWER || $contact['rel'] == CONTACT_IS_FRIEND)) ? 1 : 0); if($stat_writeable != $contact['writable']) { q("UPDATE `contact` SET `writable` = %d WHERE `id` = %d LIMIT 1", @@ -323,7 +323,7 @@ function poller_run($argv, $argc){ // Are we allowed to import from this person? - if($contact['rel'] == REL_VIP || $contact['blocked'] || $contact['readonly']) + if($contact['rel'] == CONTACT_IS_FOLLOWER || $contact['blocked'] || $contact['readonly']) continue; $xml = fetch_url($contact['poll']); @@ -463,7 +463,7 @@ function poller_run($argv, $argc){ consume_feed($xml,$importer,$contact,$hub,1); - if((strlen($hub)) && ($hub_update) && (($contact['rel'] == REL_BUD) || (($contact['network'] === NETWORK_OSTATUS) && (! $contact['readonly'])))) { + if((strlen($hub)) && ($hub_update) && (($contact['rel'] == CONTACT_IS_FRIEND) || (($contact['network'] === NETWORK_OSTATUS) && (! $contact['readonly'])))) { logger('poller: subscribing to hub(s) : ' . $hub . ' contact name : ' . $contact['name'] . ' local user : ' . $importer['name']); $hubs = explode(',', $hub); if(count($hubs)) { |