diff options
| author | Mario Vavti <mario@mariovavti.com> | 2022-11-02 10:38:40 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2022-11-02 10:38:40 +0100 |
| commit | 1cf659033b376026aecaec7951c743f78c2b0511 (patch) | |
| tree | 184de643558c6b445e1aa495378013f0493bfbbe | |
| parent | 3dc552769055d7c6cefd8f4779fff1c9f123bf16 (diff) | |
| download | volse-hubzilla-1cf659033b376026aecaec7951c743f78c2b0511.tar.gz volse-hubzilla-1cf659033b376026aecaec7951c743f78c2b0511.tar.bz2 volse-hubzilla-1cf659033b376026aecaec7951c743f78c2b0511.zip | |
set hubloc_connected in mod fhublocs otherwise the hublocs might be removed by prune_hub_reinstalls()
| -rw-r--r-- | Zotlabs/Module/Fhublocs.php | 29 | ||||
| -rw-r--r-- | Zotlabs/Widget/Messages.php | 2 |
2 files changed, 16 insertions, 15 deletions
diff --git a/Zotlabs/Module/Fhublocs.php b/Zotlabs/Module/Fhublocs.php index df847c835..a4d335a94 100644 --- a/Zotlabs/Module/Fhublocs.php +++ b/Zotlabs/Module/Fhublocs.php @@ -60,20 +60,21 @@ class Fhublocs extends \Zotlabs\Web\Controller { $h = hubloc_store_lowlevel( [ - 'hubloc_guid' => $rr['channel_guid'], - 'hubloc_guid_sig' => $rr['channel_guid_sig'], - 'hubloc_hash' => $rr['channel_hash'], - 'hubloc_id_url' => channel_url($rr), - 'hubloc_addr' => channel_reddress($rr), - 'hubloc_primary' => intval($primary), - 'hubloc_url' => z_root(), - 'hubloc_url_sig' => Libzot::sign(z_root(), $rr['channel_prvkey']), - 'hubloc_site_id' => Libzot::make_xchan_hash(z_root(), $sitekey), - 'hubloc_host' => \App::get_hostname(), - 'hubloc_callback' => z_root() . '/zot', - 'hubloc_sitekey' => $sitekey, - 'hubloc_network' => 'zot6', - 'hubloc_updated' => datetime_convert() + 'hubloc_guid' => $rr['channel_guid'], + 'hubloc_guid_sig' => $rr['channel_guid_sig'], + 'hubloc_hash' => $rr['channel_hash'], + 'hubloc_id_url' => channel_url($rr), + 'hubloc_addr' => channel_reddress($rr), + 'hubloc_primary' => intval($primary), + 'hubloc_url' => z_root(), + 'hubloc_url_sig' => Libzot::sign(z_root(), $rr['channel_prvkey']), + 'hubloc_site_id' => Libzot::make_xchan_hash(z_root(), $sitekey), + 'hubloc_host' => \App::get_hostname(), + 'hubloc_callback' => z_root() . '/zot', + 'hubloc_sitekey' => $sitekey, + 'hubloc_network' => 'zot6', + 'hubloc_updated' => datetime_convert(), + 'hubloc_connected' => datetime_convert() ] ); diff --git a/Zotlabs/Widget/Messages.php b/Zotlabs/Widget/Messages.php index 267467bb0..38c822502 100644 --- a/Zotlabs/Widget/Messages.php +++ b/Zotlabs/Widget/Messages.php @@ -148,7 +148,7 @@ class Messages { } $entries[$i]['author_name'] = $item['author']['xchan_name']; - $entries[$i]['author_addr'] = (($item['author']['xchan_addr']) ? $item['author']['xchan_addr'] : $item['author']['xchan_url']); + $entries[$i]['author_addr'] = $item['author']['xchan_addr'] ?? $item['author']['xchan_url']; $entries[$i]['info'] = $info; $entries[$i]['created'] = datetime_convert('UTC', date_default_timezone_get(), $item['created']); $entries[$i]['summary'] = $summary; |