diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-09-26 19:55:18 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-09-26 19:55:18 +0200 |
| commit | cee41bb1e5cc9d7ea6d49183e78fcb2f5f0d1472 (patch) | |
| tree | 38383bb40e58ee85fb6296a69667411ee92b0da5 /include | |
| parent | 4a270d10d189471496438489a9b444bd12340aab (diff) | |
| parent | 86e888e5ebf4090dbab33a28a68fa67b93566417 (diff) | |
| download | volse-hubzilla-cee41bb1e5cc9d7ea6d49183e78fcb2f5f0d1472.tar.gz volse-hubzilla-cee41bb1e5cc9d7ea6d49183e78fcb2f5f0d1472.tar.bz2 volse-hubzilla-cee41bb1e5cc9d7ea6d49183e78fcb2f5f0d1472.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/zot.php | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/include/zot.php b/include/zot.php index 1a9692ae9..af7fbf8fd 100644 --- a/include/zot.php +++ b/include/zot.php @@ -124,7 +124,7 @@ function zot_build_packet($channel, $type = 'notify', $recipients = null, $remot 'sitekey' => get_config('system','pubkey') ], 'callback' => '/post', - 'version' => ZOT_REVISION, + 'version' => Zotlabs\Lib\System::get_zot_revision(), 'encryption' => crypto_methods(), 'signing' => signing_methods() ]; @@ -2894,8 +2894,9 @@ function import_site($arr, $pubkey) { $site_flags = $site_directory; - if(array_key_exists('zot',$arr) && ((float) $arr['zot']) >= 6.0) - $site_flags = ($site_flags & ZOT6_COMPLIANT); + if(array_key_exists('zot',$arr)) { + set_sconfig($arr['url'],'system','zot_version',$arr['zot']); + } if($exists) { if(($siterecord['site_flags'] != $site_flags) @@ -4183,7 +4184,7 @@ function zotinfo($arr) { if($x) $ret['locations'] = $x; - $ret['site'] = zot_site_info($e); + $ret['site'] = zot_site_info(); check_zotinfo($e,$x,$ret); @@ -4195,10 +4196,10 @@ function zotinfo($arr) { } -function zot_site_info($channel = null) { +function zot_site_info() { - $signing_key = (($channel) ? $channel['channel_prvkey'] : get_config('system','prvkey')); - $sig_method = get_config('system','signature_algorithm','sha256'); + $signing_key = get_config('system','prvkey'); + $sig_method = get_config('system','signature_algorithm','sha256'); $ret = []; $ret['site'] = []; @@ -4225,12 +4226,7 @@ function zot_site_info($channel = null) { $ret['site']['encryption'] = crypto_methods(); $ret['site']['signing'] = signing_methods(); - if(function_exists('zotvi_load')) { - $ret['site']['zot'] = '6.0'; - } - else { - $ret['site']['zot'] = ZOT_REVISION; - } + $ret['site']['zot'] = Zotlabs\Lib\System::get_zot_revision(); // hide detailed site information if you're off the grid |