aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-10-19 21:41:38 -0700
committerfriendica <info@friendica.com>2014-10-19 21:41:38 -0700
commitc909b8be060cb04479eba79232030e3da25410c6 (patch)
tree8824265f7c221797fdbe8b2ffdf8a4680bb45d19
parente414ed77824ed1a1bf0e927236e0ccd0c0e1082b (diff)
downloadvolse-hubzilla-c909b8be060cb04479eba79232030e3da25410c6.tar.gz
volse-hubzilla-c909b8be060cb04479eba79232030e3da25410c6.tar.bz2
volse-hubzilla-c909b8be060cb04479eba79232030e3da25410c6.zip
don't auto-archive connections we can't poll.
-rw-r--r--include/poller.php17
1 files changed, 11 insertions, 6 deletions
diff --git a/include/poller.php b/include/poller.php
index 2febaeb32..61298b0ab 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -254,7 +254,7 @@ function poller_run($argv, $argc){
);
- $contacts = q("SELECT abook_id, abook_flags, abook_updated, abook_connected, abook_closeness, abook_channel
+ $contacts = q("SELECT abook_id, abook_flags, abook_updated, abook_connected, abook_closeness, abook_xchan, abook_channel
FROM abook LEFT JOIN account on abook_account = account_id where 1
$sql_extra
AND (( abook_flags & %d ) OR ( abook_flags = %d ))
@@ -310,12 +310,17 @@ function poller_run($argv, $argc){
// He's dead, Jim
if(strcmp(datetime_convert('UTC','UTC', 'now'),datetime_convert('UTC','UTC', $c . " + 30 day")) > 0) {
- $r = q("update abook set abook_flags = (abook_flags | %d) where abook_id = %d limit 1",
- intval(ABOOK_FLAG_ARCHIVED),
- intval($contact['abook_id'])
+ $n = q("select xchan_network from xchan where xchan_hash = '%s' limit 1",
+ dbesc($contact['abook_xchan'])
);
- $update = false;
- continue;
+ if($n && $n[0]['xchan_network'] == 'zot') {
+ $r = q("update abook set abook_flags = (abook_flags | %d) where abook_id = %d limit 1",
+ intval(ABOOK_FLAG_ARCHIVED),
+ intval($contact['abook_id'])
+ );
+ $update = false;
+ continue;
+ }
}
if($contact['abook_flags'] & ABOOK_FLAG_ARCHIVED) {