aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-11-11 18:42:49 -0800
committerfriendica <info@friendica.com>2013-11-11 18:42:49 -0800
commita7c53d470b9be467fc047130383095a569ba74e8 (patch)
treeaed189c54aa0ed07ec4b96bf3bfe0f514e7d0b66
parent58e0d58489472e78fc824b7654c59aa45b1c08ca (diff)
downloadvolse-hubzilla-a7c53d470b9be467fc047130383095a569ba74e8.tar.gz
volse-hubzilla-a7c53d470b9be467fc047130383095a569ba74e8.tar.bz2
volse-hubzilla-a7c53d470b9be467fc047130383095a569ba74e8.zip
ability to use other ciphers
-rw-r--r--include/conversation.php5
-rwxr-xr-xview/tpl/jot.tpl2
2 files changed, 6 insertions, 1 deletions
diff --git a/include/conversation.php b/include/conversation.php
index 88156ae63..59ca24d41 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1079,6 +1079,10 @@ function status_editor($a,$x,$popup=false) {
if(x($x,'nopreview'))
$preview = '';
+ $cipher = get_pconfig($x['profile_uid'],'system','default_cipher');
+ if(! $cipher)
+ $cipher = 'aes256';
+
call_hooks('jot_tool', $jotplugins);
call_hooks('jot_networks', $jotnets);
@@ -1136,6 +1140,7 @@ function status_editor($a,$x,$popup=false) {
'$expires' => t('Set expiration date'),
'$feature_encrypt' => ((feature_enabled($x['profile_uid'],'content_encrypt') && (! $webpage)) ? 'block' : 'none'),
'$encrypt' => t('Encrypt text'),
+ '$cipher' => $cipher,
));
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 0618e7491..924f7d9bc 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -55,7 +55,7 @@
<i id="profile-expires" class="icon-eraser jot-icons" title="{{$expires}}" onclick="jotGetExpiry();return false;"></i>
</div>
<div id="profile-encrypt-wrapper" style="display: {{$feature_encrypt}};" >
- <i id="profile-encrypt" class="icon-key jot-icons" title="{{$encrypt}}" onclick="red_encrypt('aes256','#profile-jot-text',$('#profile-jot-text').val());return false;"></i>
+ <i id="profile-encrypt" class="icon-key jot-icons" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;"></i>
</div>