diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-01-24 07:33:56 +0100 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-01-24 07:33:56 +0100 |
| commit | 4198efe03570606b35f3aba6cdf7f80de20384f4 (patch) | |
| tree | 5a59cf3b29a70f22728e25d7c46ab8648bcda407 /include/poller.php | |
| parent | 2319bc43bf3f837c22daa5067dcf538e8b5a792d (diff) | |
| parent | 205a2b8930c9d519c06f106d5d37702f8f69d013 (diff) | |
| download | volse-hubzilla-4198efe03570606b35f3aba6cdf7f80de20384f4.tar.gz volse-hubzilla-4198efe03570606b35f3aba6cdf7f80de20384f4.tar.bz2 volse-hubzilla-4198efe03570606b35f3aba6cdf7f80de20384f4.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'include/poller.php')
| -rw-r--r-- | include/poller.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/include/poller.php b/include/poller.php index 8234becbb..024b9fbcd 100644 --- a/include/poller.php +++ b/include/poller.php @@ -32,10 +32,18 @@ if(($argc > 1) && ($argv[1] == 'force')) $force = true; + if(($argc > 1) && intval($argv[1])) { + $manual_id = intval($argv[1]); + $force = true; + } + + $sql_extra = (($manual_id) ? " AND `id` = $manual_id " : ""); + // 'stat' clause is a temporary measure until we have federation subscriptions working both directions $contacts = q("SELECT * FROM `contact` WHERE ( ( `network` = 'dfrn' AND ( `dfrn-id` != '' OR (`issued-id` != '' AND `duplex` = 1))) - OR ( `network` IN ( 'stat', 'feed' ) AND `poll` != '' )) + OR ( `network` IN ( 'stat', 'feed' ) AND `poll` != '' )) + $sql_extra AND `self` = 0 AND `blocked` = 0 AND `readonly` = 0 ORDER BY RAND()"); if(! count($contacts)) |