From ca4103debef7ecf36d93842750667e70c2a1e42a Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 10 Nov 2013 23:19:44 -0800 Subject: e2ee --- include/conversation.php | 2 ++ include/features.php | 1 + 2 files changed, 3 insertions(+) (limited to 'include') diff --git a/include/conversation.php b/include/conversation.php index fc0ae98e6..88156ae63 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1134,6 +1134,8 @@ function status_editor($a,$x,$popup=false) { '$defexpire' => '', '$feature_expire' => ((feature_enabled($x['profile_uid'],'content_expire') && (! $webpage)) ? 'block' : 'none'), '$expires' => t('Set expiration date'), + '$feature_encrypt' => ((feature_enabled($x['profile_uid'],'content_encrypt') && (! $webpage)) ? 'block' : 'none'), + '$encrypt' => t('Encrypt text'), )); diff --git a/include/features.php b/include/features.php index bf3323b56..7146122b7 100644 --- a/include/features.php +++ b/include/features.php @@ -36,6 +36,7 @@ function get_features() { array('richtext', t('Richtext Editor'), t('Enable richtext editor')), array('preview', t('Post Preview'), t('Allow previewing posts and comments before publishing them')), array('channel_sources', t('Channel Sources'), t('Automatically import channel content from other channels or feeds')), + array('content_encrypt', t('Encrypt Content'), t('Allow encryption of content end-to-end with a shared secret key')), ), // Network Tools -- cgit v1.2.3