aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2020-04-05 15:00:08 +0000
committerMario <mario@mariovavti.com>2020-04-05 15:00:08 +0000
commitcb2996a40cf86d727bfda2df86bdcc8d643b46da (patch)
tree6c802ff7ce8badd61b798abcc059417d65a04fc9
parentea237a97a16c35cc808d3f5a39139c94cc17cbaa (diff)
downloadvolse-hubzilla-cb2996a40cf86d727bfda2df86bdcc8d643b46da.tar.gz
volse-hubzilla-cb2996a40cf86d727bfda2df86bdcc8d643b46da.tar.bz2
volse-hubzilla-cb2996a40cf86d727bfda2df86bdcc8d643b46da.zip
another import fix and do not allow importing channels < version 4.7.4 for zot6 compatibility reasons
-rw-r--r--Zotlabs/Module/Import.php7
-rw-r--r--include/import.php3
2 files changed, 8 insertions, 2 deletions
diff --git a/Zotlabs/Module/Import.php b/Zotlabs/Module/Import.php
index ef11e1778..2c6e09fa7 100644
--- a/Zotlabs/Module/Import.php
+++ b/Zotlabs/Module/Import.php
@@ -137,6 +137,11 @@ class Import extends \Zotlabs\Web\Controller {
return;
}
+ if(version_compare($data['compatibility']['version'], '4.7.3', '<=')) {
+ // zot6 transition: cloning is not compatible with older versions
+ notice('Data export format is not compatible with this software (not a zot6 channel)');
+ return;
+ }
if($moving)
$seize = 1;
@@ -344,7 +349,7 @@ class Import extends \Zotlabs\Web\Controller {
}
if($xchan['xchan_network'] === 'zot6') {
- $zhash = \Zotlabs\Lib\Libzot::make_xchan_hash($xchan['xchan_guid'],$xchan['xchan_pubkey']);
+ $zhash = Libzot::make_xchan_hash($xchan['xchan_guid'],$xchan['xchan_pubkey']);
if($zhash !== $xchan['xchan_hash']) {
logger('forged xchan: ' . print_r($xchan,true));
continue;
diff --git a/include/import.php b/include/import.php
index bfe71963f..910cb8be7 100644
--- a/include/import.php
+++ b/include/import.php
@@ -1,6 +1,7 @@
<?php
use Zotlabs\Lib\IConfig;
+use Zotlabs\Lib\Libzot;
use Zotlabs\Web\HTTPSig;
@@ -31,7 +32,7 @@ function import_channel($channel, $account_id, $seize, $newname = '') {
// Ignore the hash provided and re-calculate
- $channel['channel_hash'] = 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;