Merge branch 'dev' into toggle-context-help

1 files changed, 55 insertions, 0 deletions

diff --git a/Zotlabs/Module/Wall_attach.php b/Zotlabs/Module/Wall_attach.php
new file mode 100644
index 000000000..5bdecfa75
--- /dev/null
+++ b/Zotlabs/Module/Wall_attach.php
@@ -0,0 +1,55 @@
+<?php
+namespace Zotlabs\Module;
+
+require_once('include/attach.php');
+require_once('include/identity.php');
+require_once('include/photos.php');
+
+
+class Wall_attach extends \Zotlabs\Web\Controller {
+
+	function post() {
+	
+		$using_api = false;
+	
+		if(\App::$data['api_info'] && array_key_exists('media',$_FILES)) {
+			$using_api = true;
+			$user_info = \App::$data['api_info'];
+			$nick = $user_info['screen_name'];
+			$channel = get_channel_by_nick($user_info['screen_name']);
+		}
+		elseif(argc() > 1)
+			$channel = get_channel_by_nick(argv(1));
+	
+		if(! $channel)
+			killme();
+	
+		$observer = \App::get_observer();
+	
+	
+		$def_album  = get_pconfig($channel['channel_id'],'system','photo_path');
+		$def_attach = get_pconfig($channel['channel_id'],'system','attach_path');
+	
+		$r = attach_store($channel,(($observer) ? $observer['xchan_hash'] : ''),'', array('source' => 'editor', 'visible' => 0, 'album' => $def_album, 'directory' => $def_attach, 'allow_cid' => '<' . $channel['channel_hash'] . '>'));
+	
+		if(! $r['success']) {
+			notice( $r['message'] . EOL);
+			killme();
+		}
+	
+		if(intval($r['data']['is_photo'])) {
+			$s = "\n\n" . $r['body'] . "\n\n";
+		}
+		else {
+			$s =  "\n\n" . '[attachment]' . $r['data']['hash'] . ',' . $r['data']['revision'] . '[/attachment]' . "\n";
+		}
+	
+		if($using_api)
+			return $s;
+	
+		echo $s;
+		killme();
+	
+	}
+	
+}