now we get to the heavy lifting with AccessList stuff

1 files changed, 7 insertions, 7 deletions

diff --git a/mod/filestorage.php b/mod/filestorage.php
index 9787c0380..7ba8c1801 100644
--- a/mod/filestorage.php
+++ b/mod/filestorage.php
@@ -28,20 +28,20 @@ function filestorage_post(&$a) {
 		return;
 	}
 
-	$str_group_allow   = perms2str($_REQUEST['group_allow']);
-	$str_contact_allow = perms2str($_REQUEST['contact_allow']);
-	$str_group_deny    = perms2str($_REQUEST['group_deny']);
-	$str_contact_deny  = perms2str($_REQUEST['contact_deny']);
-
 	$channel = $a->get_channel();
+
+	$acl = new AccessList($channel);
+	$acl->set_from_array($_REQUEST);
+	$x = $acl->get();
+
 	$cloudPath = get_parent_cloudpath($channel_id, $channel['channel_address'], $resource);
 
 	//get the object before permissions change so we can catch eventual former allowed members
 	$object = get_file_activity_object($channel_id, $resource, $cloudPath);
 
-	attach_change_permissions($channel_id, $resource, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny, $recurse);
+	attach_change_permissions($channel_id, $resource, $x['allow_cid'], $x['allow_gid'], $x['deny_cid'], $x['deny_gid'], $recurse);
 
-	file_activity($channel_id, $object, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny, 'post', $notify);
+	file_activity($channel_id, $object, $x['allow_cid'], $x['allow_gid'], $x['deny_cid'], $x['deny_gid'], 'post', $notify);
 
 	goaway($cloudPath);
 }