From 271f85be3b36a4d4aac55a51cb7ff2580a95ce3e Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Sun, 24 Jul 2016 20:27:59 -0700
Subject: add acl selection to files upload via /cloud (still missing from
 directory creation)

---
 Zotlabs/Module/File_upload.php | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 Zotlabs/Module/File_upload.php

(limited to 'Zotlabs/Module/File_upload.php')

diff --git a/Zotlabs/Module/File_upload.php b/Zotlabs/Module/File_upload.php
new file mode 100644
index 000000000..45f820b7c
--- /dev/null
+++ b/Zotlabs/Module/File_upload.php
@@ -0,0 +1,38 @@
+<?php
+namespace Zotlabs\Module;
+
+require_once('include/attach.php');
+require_once('include/channel.php');
+require_once('include/photos.php');
+
+
+class File_upload extends \Zotlabs\Web\Controller {
+
+	function post() {
+	
+		$channel = (($_REQUEST['channick']) ? get_channel_by_nick($_REQUEST['channick']) : null);
+	
+		if(! $channel) {
+			logger('channel not found');
+			killme();
+		}
+	
+		$_REQUEST['source'] = 'file_upload';
+
+        if($channel['channel_id'] != local_channel()) {
+            $_REQUEST['contact_allow'] = expand_acl($channel['channel_allow_cid']);
+            $_REQUEST['group_allow']   = expand_acl($channel['channel_allow_gid']);
+            $_REQUEST['contact_deny']  = expand_acl($channel['channel_deny_cid']);
+            $_REQUEST['group_deny']    = expand_acl($channel['channel_deny_gid']);
+        }
+
+		if($_REQUEST['directory_name'])
+			$r = attach_mkdir($channel,get_observer_hash(),$_REQUEST);
+		else
+			$r = attach_store($channel,get_observer_hash(), '', $_REQUEST);
+
+		goaway(z_root() . '/' . $_REQUEST['return_url']);
+	
+	}
+	
+}
-- 
cgit v1.2.3


From 01338a76103a18d053413f1a8ad45870b2babf02 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Sun, 24 Jul 2016 22:58:26 -0700
Subject: make drag/drop work with acl, which bypassed the form

---
 Zotlabs/Module/File_upload.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'Zotlabs/Module/File_upload.php')

diff --git a/Zotlabs/Module/File_upload.php b/Zotlabs/Module/File_upload.php
index 45f820b7c..999b241f1 100644
--- a/Zotlabs/Module/File_upload.php
+++ b/Zotlabs/Module/File_upload.php
@@ -9,6 +9,8 @@ require_once('include/photos.php');
 class File_upload extends \Zotlabs\Web\Controller {
 
 	function post() {
+
+		// logger('file upload: ' . print_r($_REQUEST,true));
 	
 		$channel = (($_REQUEST['channick']) ? get_channel_by_nick($_REQUEST['channick']) : null);
 	
-- 
cgit v1.2.3