diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2014-09-03 20:58:47 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2014-09-03 20:58:47 +0200 |
| commit | a9a2397c1cae3dab12d3d85f3bfe18cb9e00f502 (patch) | |
| tree | e29a721a0624fb445d60d19f199860caec818ba2 | |
| parent | 7d4317e9fbf1db4e2443344dfed1d25ecc6f1a9a (diff) | |
| parent | 27de0e5621c78bc8e70d060ad217cbf9ec61df83 (diff) | |
| download | nextcloud-server-a9a2397c1cae3dab12d3d85f3bfe18cb9e00f502.tar.gz nextcloud-server-a9a2397c1cae3dab12d3d85f3bfe18cb9e00f502.zip | |
Merge pull request #10842 from owncloud/remove-add-to-your-owncloud-if-disabled
Hiding add to your own cloud if server2server sharing is not enabled
| -rw-r--r-- | apps/files_sharing/public.php | 3 | ||||
| -rw-r--r-- | apps/files_sharing/templates/public.php | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php index bcf99d01edb..63938201eb2 100644 --- a/apps/files_sharing/public.php +++ b/apps/files_sharing/public.php @@ -1,5 +1,7 @@ <?php // Load other apps for file previews +use OCA\Files_Sharing\Helper; + OC_App::loadApps(); $appConfig = \OC::$server->getAppConfig(); @@ -132,6 +134,7 @@ if (isset($path)) { $tmpl->assign('mimetype', \OC\Files\Filesystem::getMimeType($path)); $tmpl->assign('dirToken', $linkItem['token']); $tmpl->assign('sharingToken', $token); + $tmpl->assign('server2serversharing', Helper::isOutgoingServer2serverShareEnabled()); $tmpl->assign('protected', isset($linkItem['share_with']) ? 'true' : 'false'); $urlLinkIdentifiers= (isset($token)?'&t='.$token:'') diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index 42103296d87..a4b3289d4c6 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -23,13 +23,18 @@ <div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div> <div class="header-right"> <span id="details"> - <span id="save" data-protected="<?php p($_['protected'])?>" data-owner="<?php p($_['displayName'])?>" data-name="<?php p($_['filename'])?>"> + <?php + if ($_['server2serversharing']) { + ?> + <span id="save" data-protected="<?php p($_['protected']) ?>" + data-owner="<?php p($_['displayName']) ?>" data-name="<?php p($_['filename']) ?>"> <button id="save-button"><?php p($l->t('Add to your ownCloud')) ?></button> <form class="save-form hidden" action="#"> <input type="text" id="remote_address" placeholder="example.com/owncloud"/> <button id="save-button-confirm" class="icon-confirm svg"></button> </form> </span> + <?php } ?> <a href="<?php p($_['downloadURL']); ?>" id="download" class="button"> <img class="svg" alt="" src="<?php print_unescaped(OCP\image_path("core", "actions/download.svg")); ?>"/> <span id="download-text"><?php p($l->t('Download'))?></span> |