port latest pwa work from zap

2 files changed, 119 insertions, 0 deletions

diff --git a/Zotlabs/Module/Manifest.php b/Zotlabs/Module/Manifest.php
new file mode 100644
index 000000000..5297245d3
--- /dev/null
+++ b/Zotlabs/Module/Manifest.php
@@ -0,0 +1,52 @@
+<?php
+namespace Zotlabs\Module;
+
+use App;
+use Zotlabs\Web\Controller;
+use Zotlabs\Lib\System;
+
+class Manifest extends Controller {
+
+	function init() {
+
+		$ret = [
+			'name' => ucfirst(System::get_platform_name()),
+			'short_name' => ucfirst(System::get_platform_name()),
+			'icons' => [
+				[ 'src' => '/images/app/hz-72.png', 'sizes' => '72x72', 'type' => 'image/png' ],
+				[ 'src' => '/images/app/hz-96.png', 'sizes' => '96x96', 'type' => 'image/png' ],
+				[ 'src' => '/images/app/hz-128.png', 'sizes' => '128x128', 'type' => 'image/png' ],
+				[ 'src' => '/images/app/hz-144.png', 'sizes' => '144x144', 'type' => 'image/png' ],
+				[ 'src' => '/images/app/hz-152.png', 'sizes' => '152x152', 'type' => 'image/png' ],
+				[ 'src' => '/images/app/hz-192.png', 'sizes' => '192x192', 'type' => 'image/png' ],
+				[ 'src' => '/images/app/hz-348.png', 'sizes' => '384x384', 'type' => 'image/png' ],
+				[ 'src' => '/images/app/hz-512.png', 'sizes' => '512x512', 'type' => 'image/png' ],
+				[ 'src' => '/images/app/hz.svg', 'sizes' => '64x64', 'type' => 'image/xml+svg' ]
+			],
+			'scope' => '/',
+			'start_url' => z_root(),
+			'display' => 'standalone',
+			'orientation' => 'any',
+			'theme_color' => '#343a40',
+			'background_color' => 'white',
+			'share_target' => [
+				'action' => '/rpost',
+				'method' => 'POST',
+				'enctype' => 'multipart/form-data',
+				'params' => [
+					'title' => 'title',
+					'text' => 'body',
+					'url' => 'url',
+					'files' => [
+						[ 'name' => 'userfile',
+							'accept' => [ 'image/*', 'audio/*', 'video/*', 'text/*', 'application/*' ]
+						]
+					]
+				]
+			]
+		];
+
+		json_return_and_die($ret,'application/manifest+json');
+	}
+
+}
diff --git a/Zotlabs/Module/Rpost.php b/Zotlabs/Module/Rpost.php
index 80ad289b2..013817597 100644
--- a/Zotlabs/Module/Rpost.php
+++ b/Zotlabs/Module/Rpost.php
@@ -66,6 +66,73 @@ class Rpost extends \Zotlabs\Web\Controller {
 
 		nav_set_selected('Post');
 
+		if (local_channel() && array_key_exists('userfile',$_FILES)) {
+
+			$channel = App::get_channel();
+			$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'] : ''), '', [
+				'source'    => 'editor',
+				'visible'   => 0,
+				'album'     => $def_album,
+				'directory' => $def_attach,
+				'flags'     => 1, // indicates temporary permissions are created
+				'allow_cid' => '<' . $channel['channel_hash'] . '>'
+			]);
+
+			if (! $r['success']) {
+				notice( $r['message'] . EOL);
+			}
+
+			$s = EMPTY_STR;
+
+			if (intval($r['data']['is_photo'])) {
+				$s .= "\n\n" . $r['body'] . "\n\n";
+			}
+
+			$url = z_root() . '/cloud/' . $channel['channel_address'] . '/' . $r['data']['display_path'];
+
+			if (strpos($r['data']['filetype'],'video') === 0) {
+				$s .= "\n\n" . '[zvideo]' . $url . '[/zvideo]' . "\n\n";
+			}
+
+			if (strpos($r['data']['filetype'],'audio') === 0) {
+				$s .= "\n\n" . '[zaudio]' . $url . '[/zaudio]' . "\n\n";
+			}
+
+			if ($r['data']['filetype'] === 'image/svg+xml') {
+				$x = @file_get_contents('store/' . $channel['channel_address'] . '/' . $r['data']['os_path']);
+				if ($x) {
+					$bb = svg2bb($x);
+					if ($bb) {
+						$s .= "\n\n" . $bb;
+					}
+					else {
+						logger('empty return from svgbb');
+					}
+				}
+				else {
+					logger('unable to read svg data file: ' . 'store/' . $channel['channel_address'] . '/' . $r['data']['os_path']);
+				}
+			}
+
+			if ($r['data']['filetype'] === 'text/calendar') {
+				$content = @file_get_contents('store/' . $channel['channel_address'] . '/' . $r['data']['os_path']);
+				if ($content) {
+					$ev = ical_to_ev($content);
+					if ($ev) {
+						$s .= "\n\n" . format_event_bbcode($ev[0]) . "\n\n";
+					}
+				}
+			}
+
+			$s .=  "\n\n" . '[attachment]' . $r['data']['hash'] . ',' . $r['data']['revision'] . '[/attachment]' . "\n";
+			$_REQUEST['body'] = ((array_key_exists('body',$_REQUEST)) ? $_REQUEST['body'] . $s : $s);
+		}
+
 		// If we have saved rpost session variables, but nothing in the current $_REQUEST, recover the saved variables
 
 		if((! array_key_exists('body',$_REQUEST)) && (array_key_exists('rpost',$_SESSION))) {