diff options
author | zotlabs <mike@macgirvin.com> | 2017-09-25 20:11:21 -0700 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2017-09-25 20:11:21 -0700 |
commit | d91a82430ad4ea9def4f0c033df4be34cb26d42e (patch) | |
tree | 1258b7f7c0483fc19234f62e6640c7efb6683a95 /include/zot.php | |
parent | 66334374af2a19fb76383028975724b9eda03cf2 (diff) | |
download | volse-hubzilla-d91a82430ad4ea9def4f0c033df4be34cb26d42e.tar.gz volse-hubzilla-d91a82430ad4ea9def4f0c033df4be34cb26d42e.tar.bz2 volse-hubzilla-d91a82430ad4ea9def4f0c033df4be34cb26d42e.zip |
more zot6 basic stuff
Diffstat (limited to 'include/zot.php')
-rw-r--r-- | include/zot.php | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/include/zot.php b/include/zot.php index a9ec95baa..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) @@ -4225,12 +4226,7 @@ function zot_site_info() { $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 |