harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix default cipher for comments and set it at the conversation level rather than the item level.

Browse Source
This commit is contained in:
friendica 2013-11-14 22:54:16 -08:00
parent fa79085bd5
commit 2fe6aef8bc
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/ConversationObject.php
View File

@ -23,7 +23,7 @@ class Conversation extends BaseObject {
private $profile_owner = 0; private $profile_owner = 0;
private $preview = false; private $preview = false;
private $prepared_item = ''; private $prepared_item = '';
private $cipher = 'aes256';
// $prepared_item is for use by alternate conversation structures such as photos // $prepared_item is for use by alternate conversation structures such as photos
// wherein we've already prepared a top level item which doesn't look anything like // wherein we've already prepared a top level item which doesn't look anything like
@ -33,6 +33,9 @@ class Conversation extends BaseObject {
$this->set_mode($mode); $this->set_mode($mode);
$this->preview = $preview; $this->preview = $preview;
$this->prepared_item = $prepared_item; $this->prepared_item = $prepared_item;
$c = ((local_user()) ? get_pconfig(local_user(),'system','default_cipher') : '');
if($c)
$this->cipher = $c;
} }
/** /**
@ -118,6 +121,10 @@ class Conversation extends BaseObject {
return $this->observer; return $this->observer;
} }
public function get_cipher() {
return $this->cipher;
}
/** /**
* Add a thread to the conversation * Add a thread to the conversation

9
include/ItemObject.php
View File

@ -27,7 +27,7 @@ class Item extends BaseObject {
private $threaded = false; private $threaded = false;
private $visiting = false; private $visiting = false;
private $channel = null; private $channel = null;
private $cipher = 'aes256';
public function __construct($data) { public function __construct($data) {
$a = $this->get_app(); $a = $this->get_app();
@ -35,11 +35,6 @@ class Item extends BaseObject {
$this->data = $data; $this->data = $data;
$this->toplevel = ($this->get_id() == $this->get_data_value('parent')); $this->toplevel = ($this->get_id() == $this->get_data_value('parent'));
$cipher = get_pconfig($x['profile_uid'],'system','default_cipher');
if($cipher)
$this->cipher = $cipher;
// Prepare the children // Prepare the children
if(count($data['children'])) { if(count($data['children'])) {
foreach($data['children'] as $item) { foreach($data['children'] as $item) {
@ -545,7 +540,7 @@ class Item extends BaseObject {
'$indent' => $indent, '$indent' => $indent,
'$feature_encrypt' => ((feature_enabled($conv->get_profile_owner(),'content_encrypt')) ? true : false), '$feature_encrypt' => ((feature_enabled($conv->get_profile_owner(),'content_encrypt')) ? true : false),
'$encrypt' => t('Encrypt text'), '$encrypt' => t('Encrypt text'),
'$cipher' => $this->cipher, '$cipher' => $conv->get_cipher(),
'$sourceapp' => get_app()->sourcename '$sourceapp' => get_app()->sourcename
)); ));

2
view/tpl/comment_item.tpl
View File

@ -43,7 +43,7 @@
{{if $feature_encrypt}} {{if $feature_encrypt}}
<li><i class="icon-key shadow comment-icon" <li><i class="icon-key shadow comment-icon"
style="cursor: pointer;" title="{{$encrypt}}" style="cursor: pointer;" title="{{$encrypt}}"
onclick="red_encrypt('{{$cipher}}','#comment-edit-text-' + {{$id}},''); return false;"></i></li> onclick="red_encrypt('{{$cipher}}','#comment-edit-text-' + '{{$id}}',''); return false;"></i></li>
{{/if}} {{/if}}
</ul> </ul>
<div class="comment-edit-bb-end"></div> <div class="comment-edit-bb-end"></div>