Merge remote-tracking branch 'upstream/dev' into dev

2 files changed, 42 insertions, 2 deletions

diff --git a/Zotlabs/Module/File_upload.php b/Zotlabs/Module/File_upload.php
new file mode 100644
index 000000000..999b241f1
--- /dev/null
+++ b/Zotlabs/Module/File_upload.php
@@ -0,0 +1,40 @@
+<?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() {
+
+		// logger('file upload: ' . print_r($_REQUEST,true));
+	
+		$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']);
+	
+	}
+	
+}
diff --git a/Zotlabs/Module/Openid.php b/Zotlabs/Module/Openid.php
index 8cbc6d2fd..31c249f85 100644
--- a/Zotlabs/Module/Openid.php
+++ b/Zotlabs/Module/Openid.php
@@ -82,8 +82,8 @@ class Openid extends \Zotlabs\Web\Controller {
 	
 				// no xchan...
 				// create one.
-				// We should probably probe the openid url and figure out if they have any kind of social presence we might be able to 
-				// scrape some identifying info from. 
+				// We should probably probe the openid url and figure out if they have any kind of
+				// social presence we might be able to scrape some identifying info from. 
 	
 				$name = $authid;
 				$url = trim($_REQUEST['openid_identity'],'/');