3 files changed, 40 insertions, 20 deletions

diff --git a/apps/files_sharing/lib/Capabilities.php b/apps/files_sharing/lib/Capabilities.php
index b4fe5a1bb73..06aa1271c8f 100644
--- a/apps/files_sharing/lib/Capabilities.php
+++ b/apps/files_sharing/lib/Capabilities.php
@@ -7,8 +7,11 @@
  */
 namespace OCA\Files_Sharing;
 
+use OC\Core\AppInfo\ConfigLexicon;
+use OCP\App\IAppManager;
 use OCP\Capabilities\ICapability;
 use OCP\Constants;
+use OCP\IAppConfig;
 use OCP\IConfig;
 use OCP\Share\IManager;
 
@@ -18,10 +21,11 @@ use OCP\Share\IManager;
  * @package OCA\Files_Sharing
  */
 class Capabilities implements ICapability {
-
 	public function __construct(
 		private IConfig $config,
+		private readonly IAppConfig $appConfig,
 		private IManager $shareManager,
+		private IAppManager $appManager,
 	) {
 	}
 
@@ -110,7 +114,7 @@ class Capabilities implements ICapability {
 				if ($public['password']['enforced']) {
 					$public['password']['askForOptionalPassword'] = false;
 				} else {
-					$public['password']['askForOptionalPassword'] = ($this->config->getAppValue('core', 'shareapi_enable_link_password_by_default', 'no') === 'yes');
+					$public['password']['askForOptionalPassword'] = $this->appConfig->getValueBool('core', ConfigLexicon::SHARE_LINK_PASSWORD_DEFAULT);
 				}
 
 				$public['expire_date'] = [];
@@ -158,14 +162,23 @@ class Capabilities implements ICapability {
 		}
 
 		//Federated sharing
-		$res['federation'] = [
-			'outgoing' => $this->shareManager->outgoingServer2ServerSharesAllowed(),
-			'incoming' => $this->config->getAppValue('files_sharing', 'incoming_server2server_share_enabled', 'yes') === 'yes',
-			// old bogus one, expire_date was not working before, keeping for compatibility
-			'expire_date' => ['enabled' => true],
-			// the real deal, signifies that expiration date can be set on federated shares
-			'expire_date_supported' => ['enabled' => true],
-		];
+		if ($this->appManager->isEnabledForAnyone('federation')) {
+			$res['federation'] = [
+				'outgoing' => $this->shareManager->outgoingServer2ServerSharesAllowed(),
+				'incoming' => $this->config->getAppValue('files_sharing', 'incoming_server2server_share_enabled', 'yes') === 'yes',
+				// old bogus one, expire_date was not working before, keeping for compatibility
+				'expire_date' => ['enabled' => true],
+				// the real deal, signifies that expiration date can be set on federated shares
+				'expire_date_supported' => ['enabled' => true],
+			];
+		} else {
+			$res['federation'] = [
+				'outgoing' => false,
+				'incoming' => false,
+				'expire_date' => ['enabled' => false],
+				'expire_date_supported' => ['enabled' => false],
+			];
+		}
 
 		// Sharee searches
 		$res['sharee'] = [
diff --git a/apps/files_sharing/lib/Listener/LoadSidebarListener.php b/apps/files_sharing/lib/Listener/LoadSidebarListener.php
index 88c39f38545..17fee71978f 100644
--- a/apps/files_sharing/lib/Listener/LoadSidebarListener.php
+++ b/apps/files_sharing/lib/Listener/LoadSidebarListener.php
@@ -15,6 +15,7 @@ use OCA\Files_Sharing\Config\ConfigLexicon;
 use OCP\AppFramework\Services\IInitialState;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
+use OCP\GlobalScale\IConfig;
 use OCP\IAppConfig;
 use OCP\Server;
 use OCP\Share\IManager;
@@ -35,10 +36,15 @@ class LoadSidebarListener implements IEventListener {
 		if (!($event instanceof LoadSidebar)) {
 			return;
 		}
+		Util::addScript(Application::APP_ID, 'files_sharing_tab', 'files');
 
 		$appConfig = Server::get(IAppConfig::class);
-		$this->initialState->provideInitialState('showFederatedSharesAsInternal', $appConfig->getValueBool('files_sharing', ConfigLexicon::SHOW_FEDERATED_AS_INTERNAL));
-		$this->initialState->provideInitialState('showFederatedSharesToTrustedServersAsInternal', $appConfig->getValueBool('files_sharing', ConfigLexicon::SHOW_FEDERATED_TO_TRUSTED_AS_INTERNAL));
-		Util::addScript(Application::APP_ID, 'files_sharing_tab', 'files');
+		$gsConfig = Server::get(IConfig::class);
+		$showFederatedToTrustedAsInternal = $gsConfig->isGlobalScaleEnabled() || $appConfig->getValueBool('files_sharing', ConfigLexicon::SHOW_FEDERATED_TO_TRUSTED_AS_INTERNAL);
+		$showFederatedAsInternal = ($gsConfig->isGlobalScaleEnabled() && $gsConfig->onlyInternalFederation())
+			|| $appConfig->getValueBool('files_sharing', ConfigLexicon::SHOW_FEDERATED_AS_INTERNAL);
+
+		$this->initialState->provideInitialState('showFederatedSharesAsInternal', $showFederatedAsInternal);
+		$this->initialState->provideInitialState('showFederatedSharesToTrustedServersAsInternal', $showFederatedToTrustedAsInternal);
 	}
 }
diff --git a/apps/files_sharing/lib/MountProvider.php b/apps/files_sharing/lib/MountProvider.php
index 7a0b1f135a6..b7b0582493e 100644
--- a/apps/files_sharing/lib/MountProvider.php
+++ b/apps/files_sharing/lib/MountProvider.php
@@ -46,13 +46,14 @@ class MountProvider implements IMountProvider {
 	 * @return IMountPoint[]
 	 */
 	public function getMountsForUser(IUser $user, IStorageFactory $loader) {
-		$shares = $this->shareManager->getSharedWith($user->getUID(), IShare::TYPE_USER, null, -1);
-		$shares = array_merge($shares, $this->shareManager->getSharedWith($user->getUID(), IShare::TYPE_GROUP, null, -1));
-		$shares = array_merge($shares, $this->shareManager->getSharedWith($user->getUID(), IShare::TYPE_CIRCLE, null, -1));
-		$shares = array_merge($shares, $this->shareManager->getSharedWith($user->getUID(), IShare::TYPE_ROOM, null, -1));
-		$shares = array_merge($shares, $this->shareManager->getSharedWith($user->getUID(), IShare::TYPE_DECK, null, -1));
-		$shares = array_merge($shares, $this->shareManager->getSharedWith($user->getUID(), IShare::TYPE_SCIENCEMESH, null, -1));
-
+		$shares = array_merge(
+			$this->shareManager->getSharedWith($user->getUID(), IShare::TYPE_USER, null, -1),
+			$this->shareManager->getSharedWith($user->getUID(), IShare::TYPE_GROUP, null, -1),
+			$this->shareManager->getSharedWith($user->getUID(), IShare::TYPE_CIRCLE, null, -1),
+			$this->shareManager->getSharedWith($user->getUID(), IShare::TYPE_ROOM, null, -1),
+			$this->shareManager->getSharedWith($user->getUID(), IShare::TYPE_DECK, null, -1),
+			$this->shareManager->getSharedWith($user->getUID(), IShare::TYPE_SCIENCEMESH, null, -1),
+		);
 
 		// filter out excluded shares and group shares that includes self
 		$shares = array_filter($shares, function (IShare $share) use ($user) {