diff options
| author | nobody <nobody@zotlabs.com> | 2021-02-17 16:37:19 -0800 |
|---|---|---|
| committer | nobody <nobody@zotlabs.com> | 2021-02-17 16:37:19 -0800 |
| commit | e7c7f91a3fec224ca32459b950caaa25f73c3b1f (patch) | |
| tree | abd6c740ed7d2d89cbcd048fa79fe5d4566e1f70 /Zotlabs | |
| parent | 8a65fc8a43116fcdce12bcbccd452b82a70d8da1 (diff) | |
| parent | c3ec5d4d6ac48988b70d17b0b08b35da92cfa24f (diff) | |
| download | volse-hubzilla-e7c7f91a3fec224ca32459b950caaa25f73c3b1f.tar.gz volse-hubzilla-e7c7f91a3fec224ca32459b950caaa25f73c3b1f.tar.bz2 volse-hubzilla-e7c7f91a3fec224ca32459b950caaa25f73c3b1f.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Daemon/Onepoll.php | 5 | ||||
| -rw-r--r-- | Zotlabs/Lib/Crypto.php | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Zotlabs/Daemon/Onepoll.php b/Zotlabs/Daemon/Onepoll.php index 2200276e0..85394c8d0 100644 --- a/Zotlabs/Daemon/Onepoll.php +++ b/Zotlabs/Daemon/Onepoll.php @@ -24,7 +24,7 @@ class Onepoll { } $contacts = q("SELECT abook.*, xchan.*, account.* - FROM abook LEFT JOIN account on abook_account = account_id left join xchan on xchan_hash = abook_xchan + FROM abook LEFT JOIN account on abook_account = account_id left join xchan on xchan_hash = abook_xchan where abook_id = %d and abook_pending = 0 and abook_archived = 0 and abook_blocked = 0 and abook_ignored = 0 AND (( account_flags = %d ) OR ( account_flags = %d )) limit 1", @@ -52,7 +52,6 @@ class Onepoll { logger("onepoll: poll: ({$contact['id']}) IMPORTER: {$importer['xchan_name']}, CONTACT: {$contact['xchan_name']}"); - // TODO: unused $last_update = ((($contact['abook_updated'] === $contact['abook_created']) || ($contact['abook_updated'] <= NULL_DATE)) ? datetime_convert('UTC', 'UTC', 'now - 7 days') : datetime_convert('UTC', 'UTC', $contact['abook_updated'] . ' - 2 days') @@ -120,7 +119,7 @@ class Onepoll { if (!$can_send_stream) $fetch_feed = false; - if ($fetch_feed) { + if ($fetch_feed && $contact['xchan_network'] !== 'zot') { $max = intval(get_config('system', 'max_imported_posts', 30)); diff --git a/Zotlabs/Lib/Crypto.php b/Zotlabs/Lib/Crypto.php index 7c4654ec0..f1794ae64 100644 --- a/Zotlabs/Lib/Crypto.php +++ b/Zotlabs/Lib/Crypto.php @@ -12,7 +12,8 @@ class Crypto { ['aes256ctr', 'aes-256-ctr', 32, 16], ['camellia256cfb', 'camellia-256-cfb', 32, 16], - ['cast5cfb', 'cast5-cfb', 16, 8] + ['cast5cfb', 'cast5-cfb', 16, 8], + ['aes256cbc', 'aes-256-cbc', 32, 16] // remove after legacy zot has been sunset ]; |