diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php index c9be07346..015904dae 100644 --- a/Zotlabs/Lib/Apps.php +++ b/Zotlabs/Lib/Apps.php @@ -332,6 +332,7 @@ class Apps { 'Features' => t('Features'), 'Language' => t('Language'), 'Post' => t('Post'), + 'ZotPost' => t('ZotPost'), 'Profile Photo' => t('Profile Photo') ); diff --git a/images/zot-300.png b/images/zot-300.png new file mode 100644 index 000000000..55c2a7610 Binary files /dev/null and b/images/zot-300.png differ diff --git a/include/crypto.php b/include/crypto.php index 9bdfa777a..1bc40d634 100644 --- a/include/crypto.php +++ b/include/crypto.php @@ -453,12 +453,12 @@ function convert_salmon_key($key) { function z_obscure($s) { - return json_encode(crypto_encapsulate($s,get_config('system','pubkey'))); + $algs = crypto_methods(); + return json_encode(crypto_encapsulate($s,get_config('system','pubkey'), + (($algs) ? $algs[0] : ''))); } function z_unobscure($s) { -// if(strpos($s,"{\"") !== 0) -// return $s; return crypto_unencapsulate(json_decode($s,true),get_config('system','prvkey')); }