Show share settings only if incoming federated shares are allowed

Fixes #15802

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

diff --git a/apps/federatedfilesharing/lib/Settings/Personal.php b/apps/federatedfilesharing/lib/Settings/Personal.php
index d50fa7202f3c640eb208d898adc4dbab727d2f9d..b4a863931b0fa9ed32d86c48d07f1990a2213427 100644 (file)
--- a/apps/federatedfilesharing/lib/Settings/Personal.php
+++ b/apps/federatedfilesharing/lib/Settings/Personal.php
@@ -63,7 +63,6 @@ class Personal implements ISettings {
                $url = 'https://nextcloud.com/sharing#' . $cloudID;
 
                $parameters = [
-                       'outgoingServer2serverShareEnabled' => $this->federatedShareProvider->isOutgoingServer2serverShareEnabled(),
                        'message_with_URL' => $this->l->t('Share with me through my #Nextcloud Federated Cloud ID, see %s', [$url]),
                        'message_without_URL' => $this->l->t('Share with me through my #Nextcloud Federated Cloud ID', [$cloudID]),
                        'logoPath' => $this->defaults->getLogo(),
@@ -80,10 +79,11 @@ class Personal implements ISettings {
         * @since 9.1
         */
        public function getSection() {
-               if (!$this->federatedShareProvider->isOutgoingServer2serverShareEnabled()) {
-                       return null;
+               if ($this->federatedShareProvider->isIncomingServer2serverShareEnabled() ||
+                       $this->federatedShareProvider->isIncomingServer2serverGroupShareEnabled()) {
+                       return 'sharing';
                }
-               return 'sharing';
+               return null;
        }
 
        /**

diff --git a/apps/federatedfilesharing/templates/settings-personal.php b/apps/federatedfilesharing/templates/settings-personal.php
index d11c186374ed45aa2c8e966ddc03b68e1b83e1e3..38ca4e69e8cd3b8bbc0ee2e84721eb92a27200c4 100644 (file)
--- a/apps/federatedfilesharing/templates/settings-personal.php
+++ b/apps/federatedfilesharing/templates/settings-personal.php
@@ -5,57 +5,56 @@ script('federatedfilesharing', 'settings-personal');
 style('federatedfilesharing', 'settings-personal');
 ?>
 
-<?php if ($_['outgoingServer2serverShareEnabled']): ?>
-       <div id="fileSharingSettings" class="section">
-               <h2 data-anchor-name="federated-cloud"><?php p($l->t('Federated Cloud')); ?></h2>
-               <a target="_blank" rel="noreferrer noopener" class="icon-info svg"
-               title="<?php p($l->t('Open documentation'));?>"
-               href="<?php p(link_to_docs('user-sharing-federated')); ?>"></a>
-               <p class="settings-hint"><?php p($l->t('You can share with anyone who uses a Nextcloud server or other Open Cloud Mesh (OCM) compatible servers and services! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com')); ?></p>
-
-               <p>
-                       <?php p($l->t('Your Federated Cloud ID:')); ?>
-                       <strong id="cloudid"><?php p($_['cloudId']); ?></strong>
-                       <a class="clipboardButton icon icon-clippy" data-clipboard-target="#cloudid"></a>
-               </p>
-
-               <br>
-
-               <p>
-                       <?php p($l->t('Share it so your friends can share files with you:')); ?><br>
-                       <button class="social-facebook pop-up"
-                                       data-url='https://www.facebook.com/sharer/sharer.php?u=<?php p(urlencode($_['reference'])); ?>'>
-                               Facebook
-                       </button>
-                       <button class="social-twitter pop-up"
-                               data-url='https://twitter.com/intent/tweet?text=<?php p(urlencode($_['message_with_URL'])); ?>'>
-                               Twitter
-                       </button>
-                       <button class="social-diaspora pop-up"
-                                       data-url='https://sharetodiaspora.github.io/?title=<?php p($_['message_without_URL']); ?>&url=<?php p(urlencode($_['reference'])); ?>'>
-                               Diaspora
-                       </button>
-                       <button id="oca-files-sharing-add-to-your-website">
-                               <?php p($l->t('Add to your website')) ?>
-                       </button>
-               </p>
-
-               <div class="hidden" id="oca-files-sharing-add-to-your-website-expanded">
-               <p style="margin: 10px 0">
-                       <a target="_blank" rel="noreferrer noopener" href="<?php p($_['reference']); ?>"
-                               style="padding:10px;background-color:<?php p($_['color']); ?>;color:<?php p($_['textColor']); ?>;border-radius:3px;padding-left:4px;">
-                               <span style="background-image:url(<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL($_['logoPath'])); ?>);width:50px;height:30px;position:relative;top:8px;background-size:contain;display:inline-block;background-repeat:no-repeat; background-position: center center;"></span>
-                               <?php p($l->t('Share with me via Nextcloud')); ?>
-                       </a>
-               </p>
-
-               <p>
-                       <?php p($l->t('HTML Code:')); ?>
-                       <xmp><a target="_blank" rel="noreferrer noopener" href="<?php p($_['reference']); ?>" style="padding:10px;background-color:<?php p($_['color']); ?>;color:<?php p($_['textColor']); ?>;border-radius:3px;padding-left:4px;">
+<div id="fileSharingSettings" class="section">
+       <h2 data-anchor-name="federated-cloud"><?php p($l->t('Federated Cloud')); ?></h2>
+       <a target="_blank" rel="noreferrer noopener" class="icon-info svg"
+       title="<?php p($l->t('Open documentation'));?>"
+       href="<?php p(link_to_docs('user-sharing-federated')); ?>"></a>
+       <p class="settings-hint"><?php p($l->t('You can share with anyone who uses a Nextcloud server or other Open Cloud Mesh (OCM) compatible servers and services! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com')); ?></p>
+
+       <p>
+               <?php p($l->t('Your Federated Cloud ID:')); ?>
+               <strong id="cloudid"><?php p($_['cloudId']); ?></strong>
+               <a class="clipboardButton icon icon-clippy" data-clipboard-target="#cloudid"></a>
+       </p>
+
+       <br>
+
+       <p>
+               <?php p($l->t('Share it so your friends can share files with you:')); ?><br>
+               <button class="social-facebook pop-up"
+                               data-url='https://www.facebook.com/sharer/sharer.php?u=<?php p(urlencode($_['reference'])); ?>'>
+                       Facebook
+               </button>
+               <button class="social-twitter pop-up"
+                       data-url='https://twitter.com/intent/tweet?text=<?php p(urlencode($_['message_with_URL'])); ?>'>
+                       Twitter
+               </button>
+               <button class="social-diaspora pop-up"
+                               data-url='https://sharetodiaspora.github.io/?title=<?php p($_['message_without_URL']); ?>&url=<?php p(urlencode($_['reference'])); ?>'>
+                       Diaspora
+               </button>
+               <button id="oca-files-sharing-add-to-your-website">
+                       <?php p($l->t('Add to your website')) ?>
+               </button>
+       </p>
+
+       <div class="hidden" id="oca-files-sharing-add-to-your-website-expanded">
+       <p style="margin: 10px 0">
+               <a target="_blank" rel="noreferrer noopener" href="<?php p($_['reference']); ?>"
+                       style="padding:10px;background-color:<?php p($_['color']); ?>;color:<?php p($_['textColor']); ?>;border-radius:3px;padding-left:4px;">
+                       <span style="background-image:url(<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL($_['logoPath'])); ?>);width:50px;height:30px;position:relative;top:8px;background-size:contain;display:inline-block;background-repeat:no-repeat; background-position: center center;"></span>
+                       <?php p($l->t('Share with me via Nextcloud')); ?>
+               </a>
+       </p>
+
+       <p>
+               <?php p($l->t('HTML Code:')); ?>
+               <xmp><a target="_blank" rel="noreferrer noopener" href="<?php p($_['reference']); ?>" style="padding:10px;background-color:<?php p($_['color']); ?>;color:<?php p($_['textColor']); ?>;border-radius:3px;padding-left:4px;">
 <span style="background-image:url(<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL($_['logoPath'])); ?>);width:50px;height:30px;position:relative;top:8px;background-size:contain;display:inline-block;background-repeat:no-repeat; background-position: center center;"></span>
 <?php p($l->t('Share with me via Nextcloud')); ?></a></xmp>
-               </p>
-               </div>
-
+       </p>
        </div>
-<?php endif; ?>
+
+</div>
+