diff options
| author | Friendika <info@friendika.com> | 2011-09-19 01:17:12 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-09-19 01:17:12 -0700 |
| commit | 2aef98f71d95ba5c2caae7637002daef0bce6de5 (patch) | |
| tree | ffc8b84eedfdfed720b6e4ec14244f3a4bff44ef /include | |
| parent | 672ecc7f7d2e17b0d35eccc94e6fa1b5eef0d108 (diff) | |
| download | volse-hubzilla-2aef98f71d95ba5c2caae7637002daef0bce6de5.tar.gz volse-hubzilla-2aef98f71d95ba5c2caae7637002daef0bce6de5.tar.bz2 volse-hubzilla-2aef98f71d95ba5c2caae7637002daef0bce6de5.zip | |
cripple account when expired
Diffstat (limited to 'include')
| -rw-r--r-- | include/diaspora.php | 2 | ||||
| -rw-r--r-- | include/poller.php | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/diaspora.php b/include/diaspora.php index a6f3002b9..3c28373ea 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -8,7 +8,7 @@ require_once('include/contact_selectors.php'); function diaspora_dispatch_public($msg) { - $r = q("SELECT `user`.* FROM `user` WHERE `user`.`uid` IN ( SELECT `contact`.`uid` FROM `contact` WHERE `contact`.`network` = '%s' AND `contact`.`addr` = '%s' ) ", + $r = q("SELECT `user`.* FROM `user` WHERE `user`.`uid` IN ( SELECT `contact`.`uid` FROM `contact` WHERE `contact`.`network` = '%s' AND `contact`.`addr` = '%s' ) AND `account_expired` = 0 ", dbesc(NETWORK_DIASPORA), dbesc($msg['author']) ); diff --git a/include/poller.php b/include/poller.php index e80b696bf..dbae1deec 100644 --- a/include/poller.php +++ b/include/poller.php @@ -86,11 +86,12 @@ function poller_run($argv, $argc){ // and which have a polling address and ignore Diaspora since // we are unable to match those posts with a Diaspora GUID and prevent duplicates. - $contacts = q("SELECT `id` FROM `contact` + $contacts = q("SELECT `contact`.`id` FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid` WHERE ( `rel` = %d OR `rel` = %d ) AND `poll` != '' AND `network` != '%s' $sql_extra - AND `self` = 0 AND `blocked` = 0 AND `readonly` = 0 ORDER BY RAND()", + AND `self` = 0 AND `contact`.`blocked` = 0 AND `contact`.`readonly` = 0 + AND `user`.`account_expired` = 0 ORDER BY RAND()", intval(CONTACT_IS_SHARING), intval(CONTACT_IS_FRIEND), dbesc(NETWORK_DIASPORA) |