From 397fef519c7929c70636c50015f7a0389062bab5 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 18 Apr 2017 21:18:49 -0700
Subject: give the item_obscured flag a new lease on life by using it to
 designate third party client-side e2ee or binary content which can only be
 downloaded and not viewed directly on the web (as a side effect this also
 allows binary files to be submitted as activities/content). The content
 display is suppressed and replaced with a download button. This is unfinished
 but harmless to backport while work is in progress unless told otherwise.
 Future development will take care of the remaining loose ends.

---
 include/conversation.php |  8 --------
 include/text.php         | 18 +++++++++++++++++-
 2 files changed, 17 insertions(+), 9 deletions(-)

(limited to 'include')

diff --git a/include/conversation.php b/include/conversation.php
index 5b2d60583..93a6d7406 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -353,14 +353,6 @@ function localize_item(&$item){
 	}
 */
 
-	// if item body was obscured and we changed it, re-obscure it
-	// FIXME - we need a better filter than just the string 'data'; try and
-	// match the fact that it's json encoded
-
-	if(intval($item['item_obscured'])
-		&& strlen($item['body']) && (! strpos($item['body'],'data'))) {
-		$item['body']  = z_obscure($item['body']);
-	}
 
 }
 
diff --git a/include/text.php b/include/text.php
index bbf0b5b98..d276595ae 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1570,7 +1570,12 @@ function prepare_body(&$item,$attach = false) {
 		}
 	}
 
-	$s .= prepare_text($item['body'],$item['mimetype'], false);
+	if($item['item_obscured']) {
+		$s .= prepare_binary($item);
+	}
+	else {
+		$s .= prepare_text($item['body'],$item['mimetype'], false);
+	}
 
 	$event = (($item['obj_type'] === ACTIVITY_OBJ_EVENT) ? format_event_obj($item['obj']) : false);
 
@@ -1633,6 +1638,17 @@ function prepare_body(&$item,$attach = false) {
 	return $prep_arr;
 }
 
+
+function prepare_binary($item) {
+	return replace_macros(get_markup_template('item_binary.tpl'), [
+		'$download'  => t('Download binary/encrypted content'),
+		'$url'       => z_root() . '/viewsrc/' . $item['id'] . '/download'
+	]);
+}
+
+
+
+
 /**
  * @brief Given a text string, convert from bbcode to html and add smilie icons.
  *
-- 
cgit v1.2.3