aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files_sharing/lib
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2018-02-27 13:33:19 +0100
committerGitHub <noreply@github.com>2018-02-27 13:33:19 +0100
commit01f420c7ac38128c03975d7de7dd20190c4afcc1 (patch)
treeca9c599c93d8bd7c90237b9b90fe2fcb80808eae /apps/files_sharing/lib
parent017e1325f14d3cdbf8d16326f47d1aefa7eac4ea (diff)
parent36563d4a4b98cbd491b3832c29fee77e9f8b7118 (diff)
downloadnextcloud-server-01f420c7ac38128c03975d7de7dd20190c4afcc1.tar.gz
nextcloud-server-01f420c7ac38128c03975d7de7dd20190c4afcc1.zip
Merge pull request #8051 from nextcloud/public-template
Public page template response
Diffstat (limited to 'apps/files_sharing/lib')
-rw-r--r--apps/files_sharing/lib/Controller/ShareController.php16
-rw-r--r--apps/files_sharing/lib/Template/ExternalShareMenuAction.php68
-rw-r--r--apps/files_sharing/lib/Template/LinkMenuAction.php54
3 files changed, 137 insertions, 1 deletions
diff --git a/apps/files_sharing/lib/Controller/ShareController.php b/apps/files_sharing/lib/Controller/ShareController.php
index 795d069c1b8..1f8864fc5f3 100644
--- a/apps/files_sharing/lib/Controller/ShareController.php
+++ b/apps/files_sharing/lib/Controller/ShareController.php
@@ -38,6 +38,10 @@ namespace OCA\Files_Sharing\Controller;
use OC_Files;
use OC_Util;
use OCA\FederatedFileSharing\FederatedShareProvider;
+use OCA\Files_Sharing\Template\ExternalShareMenuAction;
+use OCA\Files_Sharing\Template\LinkMenuAction;
+use OCP\AppFramework\Http\Template\SimpleMenuAction;
+use OCP\AppFramework\Http\Template\PublicTemplateResponse;
use OCP\Defaults;
use OCP\IL10N;
use OCP\Template;
@@ -435,7 +439,17 @@ class ShareController extends Controller {
$csp = new \OCP\AppFramework\Http\ContentSecurityPolicy();
$csp->addAllowedFrameDomain('\'self\'');
- $response = new TemplateResponse($this->appName, 'public', $shareTmpl, 'base');
+
+ $response = new PublicTemplateResponse($this->appName, 'public', $shareTmpl);
+ $response->setHeaderTitle($shareTmpl['filename']);
+ $response->setHeaderDetails($this->l10n->t('shared by %s', [$shareTmpl['displayName']]));
+ $response->setHeaderActions([
+ new SimpleMenuAction('download', $this->l10n->t('Download'), 'icon-download-white', $shareTmpl['downloadURL'], 0),
+ new SimpleMenuAction('download', $this->l10n->t('Download'), 'icon-download', $shareTmpl['downloadURL'], 10, $shareTmpl['fileSize']),
+ new LinkMenuAction($this->l10n->t('Direct link'), 'icon-public', $shareTmpl['previewURL']),
+ new ExternalShareMenuAction($this->l10n->t('Add to your Nextcloud'), 'icon-external', $shareTmpl['owner'], $shareTmpl['displayName'], $shareTmpl['filename']),
+ ]);
+
$response->setContentSecurityPolicy($csp);
$this->emitAccessShareHook($share);
diff --git a/apps/files_sharing/lib/Template/ExternalShareMenuAction.php b/apps/files_sharing/lib/Template/ExternalShareMenuAction.php
new file mode 100644
index 00000000000..f548a3bc6f1
--- /dev/null
+++ b/apps/files_sharing/lib/Template/ExternalShareMenuAction.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * @copyright Copyright (c) 2018 Julius Härtl <jus@bitgrid.net>
+ *
+ * @author Julius Härtl <jus@bitgrid.net>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Files_Sharing\Template;
+
+use OCP\AppFramework\Http\Template\SimpleMenuAction;
+use OCP\Util;
+
+class ExternalShareMenuAction extends SimpleMenuAction {
+
+ /** @var string */
+ private $owner;
+
+ /** @var string */
+ private $displayname;
+
+ /** @var string */
+ private $shareName;
+
+ /**
+ * ExternalShareMenuAction constructor.
+ *
+ * @param string $label
+ * @param string $icon
+ * @param string $owner
+ * @param string $displayname
+ * @param string $shareName
+ */
+ public function __construct(string $label, string $icon, string $owner, string $displayname, string $shareName) {
+ parent::__construct('save', $label, $icon);
+ $this->owner = $owner;
+ $this->displayname = $displayname;
+ $this->shareName = $shareName;
+ }
+
+ public function render(): string {
+ return '<li>' .
+ '<a id="save" data-protected="false" data-owner-display-name="' . Util::sanitizeHTML($this->displayname) . '" data-owner="' . Util::sanitizeHTML($this->owner) . '" data-name="' . Util::sanitizeHTML($this->shareName) . '">' .
+ '<span class="icon ' . Util::sanitizeHTML($this->getIcon()) . '"></span>' .
+ '<span id="save-button">' . Util::sanitizeHTML($this->getLabel()) . '</span>' .
+ '<form class="save-form hidden" action="#">' .
+ '<input type="text" id="remote_address" placeholder="user@yourNextcloud.org">' .
+ '<button id="save-button-confirm" class="icon-confirm svg" disabled=""></button>' .
+ '</form>' .
+ '</a>' .
+ '</li>';
+ }
+} \ No newline at end of file
diff --git a/apps/files_sharing/lib/Template/LinkMenuAction.php b/apps/files_sharing/lib/Template/LinkMenuAction.php
new file mode 100644
index 00000000000..2fdf83e7026
--- /dev/null
+++ b/apps/files_sharing/lib/Template/LinkMenuAction.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * @copyright Copyright (c) 2018 Julius Härtl <jus@bitgrid.net>
+ *
+ * @author Julius Härtl <jus@bitgrid.net>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Files_Sharing\Template;
+
+use OCP\AppFramework\Http\Template\SimpleMenuAction;
+use OCP\Util;
+
+class LinkMenuAction extends SimpleMenuAction {
+
+ /**
+ * LinkMenuAction constructor.
+ *
+ * @param string $label
+ * @param string $icon
+ * @param string $link
+ */
+ public function __construct(string $label, string $icon, string $link) {
+ parent::__construct('directLink-container', $label, $icon, $link);
+ }
+
+ /**
+ * @return string
+ */
+ public function render(): string {
+ return '<li>' .
+ '<a id="directLink-container">' .
+ '<span class="icon ' . Util::sanitizeHTML($this->getIcon()) . '"></span>' .
+ '<label for="directLink">' . Util::sanitizeHTML($this->getLabel()) . '</label>' .
+ '<input id="directLink" type="text" readonly="" value="' . Util::sanitizeHTML($this->getLink()) . '">' .
+ '</a>' .
+ '</li>';
+ }
+} \ No newline at end of file