Merge branch 'master' of git://github.com/friendica/red into dev_redswede

1 files changed, 9 insertions, 0 deletions

diff --git a/mod/filestorage.php b/mod/filestorage.php
index 0a25617f0..67abc2eab 100644
--- a/mod/filestorage.php
+++ b/mod/filestorage.php
@@ -22,6 +22,8 @@ function filestorage_post(&$a) {
 	$recurse = ((x($_POST, 'recurse')) ? intval($_POST['recurse']) : 0);
 	$resource = ((x($_POST, 'filehash')) ? notags($_POST['filehash']) : '');
 
+	$no_activity = ((x($_POST, 'no_activity')) ? intval($_POST['no_activity']) : 0);
+
 	if(! $resource) {
 		notice(t('Item not found.') . EOL);
 		return;
@@ -37,6 +39,12 @@ function filestorage_post(&$a) {
 	//Build directory tree and redirect
 	$channel = $a->get_channel();
 	$cloudPath = get_parent_cloudpath($channel_id, $channel['channel_address'], $resource);
+
+	$filename = find_filename_by_hash($channel_id, $resource);
+	$url = $cloudPath . $filename;
+
+	file_activity($channel_id, $resource, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny, $url, 'post', $no_activity);
+
 	goaway($cloudPath);
 }
 
@@ -150,6 +158,7 @@ function filestorage_content(&$a) {
 			'$submit' => t('Submit'),
 			'$attach_btn_title' => t('Attach this file to a new post'),
 			'$link_btn_title' => t('Show URL to this file'),
+			'$activity_btn_title' => t('Do not show in shared with me folder of your connections')
 		));
 
 		echo $o;