diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/ItemObject.php | 9 | ||||
| -rw-r--r-- | include/conversation.php | 3 |
2 files changed, 9 insertions, 3 deletions
diff --git a/include/ItemObject.php b/include/ItemObject.php index 818f8c0b2..6dbb38564 100644 --- a/include/ItemObject.php +++ b/include/ItemObject.php @@ -27,6 +27,7 @@ class Item extends BaseObject { private $threaded = false; private $visiting = false; private $channel = null; + private $cipher = 'aes256'; public function __construct($data) { $a = $this->get_app(); @@ -34,6 +35,10 @@ class Item extends BaseObject { $this->data = $data; $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 if(count($data['children'])) { @@ -538,7 +543,11 @@ class Item extends BaseObject { '$edvideo' => t('Video'), '$preview' => ((feature_enabled($conv->get_profile_owner(),'preview')) ? t('Preview') : ''), '$indent' => $indent, + '$feature_encrypt' => ((feature_enabled($conv->get_profile_owner(),'content_encrypt')) ? true : false), + '$encrypt' => t('Encrypt text'), + '$cipher' => $this->cipher, '$sourceapp' => get_app()->sourcename + )); return $comment_box; diff --git a/include/conversation.php b/include/conversation.php index 59ca24d41..e2a4a0723 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -532,9 +532,6 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $ $items = $cb['items']; - $cmnt_tpl = get_markup_template('comment_item.tpl'); - $hide_comments_tpl = get_markup_template('hide_comments.tpl'); - $alike = array(); $dlike = array(); |