Commit 3389df77 authored by Zot's avatar Zot Committed by Mario
Browse files

give the item_obscured flag a new lease on life by using it to designate third...

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.
parent 97732f70
......@@ -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']);
}
}
......
......@@ -1562,7 +1562,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);
......@@ -1625,6 +1630,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.
*
......
<p>
<center><a class="zrl" href="{{$url}}"><button class="btn btn-warning fakelink">{{$download}}</button></a></center>
</p>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment