Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 00:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixes to clone import

Browse source
This commit is contained in:
zotlabs 2018-07-26 19:37:04 -07:00
parent 993e39b192
commit 07d0921aef
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
include/import.php
View file

@ -29,7 +29,7 @@ function import_channel($channel, $account_id, $seize, $newname = '') {
// Ignore the hash provided and re-calculate
$channel['channel_hash'] = Libzot::make_xchan_hash($channel['channel_guid'],$channel['channel_guid_sig']);
$channel['channel_hash'] = Libzot::make_xchan_hash($channel['channel_guid'],$channel['channel_pubkey']);
if($newname) {
$channel['channel_address'] = $newname;
@ -203,11 +203,12 @@ function import_hublocs($channel, $hublocs, $seize, $moving = false) {
if($channel && $hublocs) {
foreach($hublocs as $hubloc) {
$hash = Libzot::make_xchan_hash($hubloc['hubloc_guid'],$hubloc['hubloc_guid_sig']);
if($hubloc['hubloc_network'] === 'zot' && $hash !== $hubloc['hubloc_hash']) {
logger('forged hubloc: ' . print_r($hubloc,true));
continue;
}
// make sure to check this, but we have to fetch a key from somewhere
// $hash = Libzot::make_xchan_hash($hubloc['hubloc_guid'],/* PUBKEY */$hubloc['hubloc_guid_sig']);
// if($hubloc['hubloc_network'] === 'zot' && $hash !== $hubloc['hubloc_hash']) {
// logger('forged hubloc: ' . print_r($hubloc,true));
// continue;
// }
if(! array_key_exists('hubloc_primary',$hubloc)) {
$hubloc['hubloc_primary'] = (($hubloc['hubloc_flags'] & 0x0001) ? 1 : 0);