diff options
| author | friendica <info@friendica.com> | 2013-11-10 23:19:44 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-11-10 23:19:44 -0800 |
| commit | ca4103debef7ecf36d93842750667e70c2a1e42a (patch) | |
| tree | bbc416e54992236f36c98f6b04d56d899f68829e /include | |
| parent | c39200429046cdde16edbcb6e28c5cf3c7434d4a (diff) | |
| download | volse-hubzilla-ca4103debef7ecf36d93842750667e70c2a1e42a.tar.gz volse-hubzilla-ca4103debef7ecf36d93842750667e70c2a1e42a.tar.bz2 volse-hubzilla-ca4103debef7ecf36d93842750667e70c2a1e42a.zip | |
e2ee
Diffstat (limited to 'include')
| -rw-r--r-- | include/conversation.php | 2 | ||||
| -rw-r--r-- | include/features.php | 1 |
2 files changed, 3 insertions, 0 deletions
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 |