aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-11-13 23:10:29 -0800
committerfriendica <info@friendica.com>2013-11-13 23:10:29 -0800
commitee629534d5245443152797bae81768680b5dda85 (patch)
treef0a249c9d459ae809b714181090425023318430f /mod
parent412ebdade716d9c903a264916c53e15b2981042a (diff)
downloadvolse-hubzilla-ee629534d5245443152797bae81768680b5dda85.tar.gz
volse-hubzilla-ee629534d5245443152797bae81768680b5dda85.tar.bz2
volse-hubzilla-ee629534d5245443152797bae81768680b5dda85.zip
E2EE on private mail (also fixed autocomplete results dropdown for recipient which was positioned below the navbar instead of next to the recipient input box)
Diffstat (limited to 'mod')
-rw-r--r--mod/message.php15
1 files changed, 15 insertions, 0 deletions
diff --git a/mod/message.php b/mod/message.php
index c03875e24..f992a6fa1 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -212,6 +212,12 @@ function message_content(&$a) {
$channel = $a->get_channel();
head_set_icon($channel['xchan_photo_s']);
+ $cipher = get_pconfig(local_user(),'system','default_cipher');
+ if(! $cipher)
+ $cipher = 'aes256';
+
+
+
$tpl = get_markup_template('mail_head.tpl');
$header = replace_macros($tpl, array(
'$messages' => t('Messages'),
@@ -328,6 +334,11 @@ function message_content(&$a) {
'$defexpire' => '',
'$feature_expire' => ((feature_enabled(local_user(),'content_expire')) ? 'block' : 'none'),
'$expires' => t('Set expiration date'),
+ '$feature_encrypt' => ((feature_enabled(local_user(),'content_encrypt')) ? 'block' : 'none'),
+ '$encrypt' => t('Encrypt text'),
+ '$cipher' => $cipher,
+
+
));
return $o;
@@ -506,6 +517,10 @@ function message_content(&$a) {
'$defexpire' => '',
'$feature_expire' => ((feature_enabled(local_user(),'content_expire')) ? 'block' : 'none'),
'$expires' => t('Set expiration date'),
+ '$feature_encrypt' => ((feature_enabled(local_user(),'content_encrypt')) ? 'block' : 'none'),
+ '$encrypt' => t('Encrypt text'),
+ '$cipher' => $cipher,
+
));
return $o;