From 4ff71fc0c7d28b8a843cc67eac1d9463afe575ee Mon Sep 17 00:00:00 2001 From: marijus Date: Thu, 22 Jan 2015 02:34:38 +0100 Subject: change mod/sharedwithme backend to use activity object - this is not backwards compatible --- mod/filestorage.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'mod/filestorage.php') diff --git a/mod/filestorage.php b/mod/filestorage.php index 67abc2eab..9852f4e73 100644 --- a/mod/filestorage.php +++ b/mod/filestorage.php @@ -21,7 +21,6 @@ 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) { @@ -40,10 +39,7 @@ function filestorage_post(&$a) { $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); + file_activity($channel_id, $resource, $cloudPath, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny, 'post', $no_activity); goaway($cloudPath); } -- cgit v1.2.3 From 8789c96e78734cbc5420404eff149e514fe17ee7 Mon Sep 17 00:00:00 2001 From: marijus Date: Fri, 23 Jan 2015 14:50:39 +0100 Subject: some code restructure --- mod/filestorage.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mod/filestorage.php') diff --git a/mod/filestorage.php b/mod/filestorage.php index 9852f4e73..05f6a79e6 100644 --- a/mod/filestorage.php +++ b/mod/filestorage.php @@ -38,8 +38,9 @@ function filestorage_post(&$a) { //Build directory tree and redirect $channel = $a->get_channel(); $cloudPath = get_parent_cloudpath($channel_id, $channel['channel_address'], $resource); + $object = get_file_activity_object($channel_id, $resource, $cloudPath); - file_activity($channel_id, $resource, $cloudPath, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny, 'post', $no_activity); + file_activity($channel_id, $object, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny, 'post', $no_activity); goaway($cloudPath); } -- cgit v1.2.3