From ab75aca952eaaff59cd0968c996e8e7931d16dc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <1005065+DeepDiver1975@users.noreply.github.com>
Date: Tue, 9 Jun 2026 14:15:08 +0200
Subject: [PATCH 1/4] fix: remove broken owncloud.com/federation link from
 federation settings
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The "Add to your website" feature linked to https://owncloud.com/federation#
which stopped working after owncloud.com was restructured. Replace the
broken external link with the plain federation Cloud ID so the snippet
displayed to users is still useful.

Fixes #40501

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Signed-off-by: Thomas Müller <1005065+DeepDiver1975@users.noreply.github.com>
---
 .../lib/Panels/GeneralPersonalPanel.php       |  5 ++---
 .../templates/settings-personal-general.php   | 19 ++++++++-----------
 changelog/unreleased/40501                    |  8 ++++++++
 3 files changed, 18 insertions(+), 14 deletions(-)
 create mode 100644 changelog/unreleased/40501

diff --git a/apps/federatedfilesharing/lib/Panels/GeneralPersonalPanel.php b/apps/federatedfilesharing/lib/Panels/GeneralPersonalPanel.php
index 8a48dc24781e..68c35cf5b1d0 100644
--- a/apps/federatedfilesharing/lib/Panels/GeneralPersonalPanel.php
+++ b/apps/federatedfilesharing/lib/Panels/GeneralPersonalPanel.php
@@ -69,14 +69,13 @@ public function getPanel() {
 			$isIE8 = true;
 		}
 		$cloudID = $this->userSession->getUser()->getCloudId();
-		$url = 'https://owncloud.com/federation#' . $cloudID;
 		$ownCloudLogoPath = $this->urlGenerator->imagePath('core', 'logo-icon.svg');
 		$tmpl = new Template('federatedfilesharing', 'settings-personal-general');
 		$tmpl->assign('outgoingServer2serverShareEnabled', $this->shareProvider->isOutgoingServer2serverShareEnabled());
-		$tmpl->assign('message_with_URL', $this->l->t('Share with me through my #ownCloud Federated Cloud ID, see %s', [$url]));
+		$tmpl->assign('message_with_URL', $this->l->t('Share with me through my #ownCloud Federated Cloud ID, see %s', [$cloudID]));
 		$tmpl->assign('message_without_URL', $this->l->t('Share with me through my #ownCloud Federated Cloud ID', [$cloudID]));
 		$tmpl->assign('owncloud_logo_path', $ownCloudLogoPath);
-		$tmpl->assign('reference', $url);
+		$tmpl->assign('reference', $cloudID);
 		$tmpl->assign('cloudId', $cloudID);
 		$tmpl->assign('showShareIT', !$isIE8);
 		$tmpl->assign('urlGenerator', $this->urlGenerator);
diff --git a/apps/federatedfilesharing/templates/settings-personal-general.php b/apps/federatedfilesharing/templates/settings-personal-general.php
index 934d0bd85624..17a83dbdd100 100644
--- a/apps/federatedfilesharing/templates/settings-personal-general.php
+++ b/apps/federatedfilesharing/templates/settings-personal-general.php
@@ -36,7 +36,7 @@ class='js-gs-share social-gnu'>
 				Diaspora
 			</button>
 			<button class="social-twitter pop-up"
-				data-url='https://twitter.com/intent/tweet?text=<?php p(\urlencode($_['message_with_URL'])); ?>'>
+				data-url='https://twitter.com/intent/tweet?text=<?php p(\urlencode($_['message_without_URL'])); ?>'>
 				Twitter
 			</button>
 			<button class="social-facebook pop-up"
@@ -50,23 +50,20 @@ class='js-gs-share social-gnu'>
 
 		<div class="hidden" id="oca-files-sharing-add-to-your-website-expanded">
 		<p style="margin: 10px 0">
-			<a target="_blank" rel="noreferrer" href="<?php p($_['reference']); ?>"
-				style="padding:10px;background-color:#041e42;color:#fff;border-radius:3px;padding-left:4px;">
+			<span style="padding:10px;background-color:#041e42;color:#fff;border-radius:3px;padding-left:4px;">
 				<img src="<?php p($_['owncloud_logo_path']); ?>"
 					style="width:50px;position:relative;top:8px;">
-				<?php p($l->t('Share with me via ownCloud')); ?>
-			</a>
+				<?php p($l->t('Share with me via ownCloud')); ?>: <?php p($_['cloudId']); ?>
+			</span>
 		</p>
 
 		<p>
 			<?php p($l->t('HTML Code:')); ?>
-			<xmp><a target="_blank" rel="noreferrer" href="<?php p($_['reference']); ?>"
-	style="padding:10px;background-color:#041e42;color:#fff;border-radius:3px;padding-left:4px;">
-	<img src="<?php  p($_['urlGenerator']->getAbsoluteURL($_['owncloud_logo_path'])); ?>"
+			<xmp><span style="padding:10px;background-color:#041e42;color:#fff;border-radius:3px;padding-left:4px;">
+	<img src="<?php p($_['urlGenerator']->getAbsoluteURL($_['owncloud_logo_path'])); ?>"
 		style="width:50px;position:relative;top:8px;">
-	<?php p($l->t('Share with me via ownCloud')); ?>
-
-</a></xmp>
+	<?php p($l->t('Share with me via ownCloud')); ?>: <?php p($_['cloudId']); ?>
+</span></xmp>
 		</p>
 		</div>
 		<?php
diff --git a/changelog/unreleased/40501 b/changelog/unreleased/40501
new file mode 100644
index 000000000000..0ca3904dd212
--- /dev/null
+++ b/changelog/unreleased/40501
@@ -0,0 +1,8 @@
+Bugfix: Remove broken owncloud.com/federation link from federated cloud sharing settings
+
+The "Add to your website" feature in the personal federation settings was generating
+a link to https://owncloud.com/federation# which no longer works after owncloud.com
+was restructured. The federation Cloud ID is now displayed directly without linking
+to the defunct external page.
+
+https://github.com/owncloud/core/issues/40501

From 68af06ad3c1bf76e91ba81e29879e11851ab0ffd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <1005065+DeepDiver1975@users.noreply.github.com>
Date: Tue, 9 Jun 2026 14:23:55 +0200
Subject: [PATCH 2/4] chore(changelog): fix PR link in changelog entry for
 #40501
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Müller <1005065+DeepDiver1975@users.noreply.github.com>
---
 changelog/unreleased/40501 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/changelog/unreleased/40501 b/changelog/unreleased/40501
index 0ca3904dd212..1ae23fdfbf4d 100644
--- a/changelog/unreleased/40501
+++ b/changelog/unreleased/40501
@@ -1,8 +1,8 @@
-Bugfix: Remove broken owncloud.com/federation link from federated cloud sharing settings
+Bugfix: Remove owncloud.com/federation link from federated cloud settings
 
 The "Add to your website" feature in the personal federation settings was generating
 a link to https://owncloud.com/federation# which no longer works after owncloud.com
 was restructured. The federation Cloud ID is now displayed directly without linking
 to the defunct external page.
 
-https://github.com/owncloud/core/issues/40501
+https://github.com/owncloud/core/pull/41608

From 17b8c415340644adc61598846b6fd9bb9d165a18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <1005065+DeepDiver1975@users.noreply.github.com>
Date: Thu, 11 Jun 2026 14:34:07 +0200
Subject: [PATCH 3/4] test(federation): stub getCloudId() in
 GeneralPersonalPanelTest
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The test's IUser mock never returned a value for getCloudId(), which
was previously harmless because the panel concatenated it into a URL
string (null → ""). After removing the broken owncloud.com/federation
link, cloudId is passed directly as the 'reference' template variable,
causing urlencode(null) to throw an ErrorException on PHP 8.3.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Signed-off-by: Thomas Müller <1005065+DeepDiver1975@users.noreply.github.com>
---
 .../tests/Panels/GeneralPersonalPanelTest.php                    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/federatedfilesharing/tests/Panels/GeneralPersonalPanelTest.php b/apps/federatedfilesharing/tests/Panels/GeneralPersonalPanelTest.php
index d5e6e5c92671..929e750ccc70 100644
--- a/apps/federatedfilesharing/tests/Panels/GeneralPersonalPanelTest.php
+++ b/apps/federatedfilesharing/tests/Panels/GeneralPersonalPanelTest.php
@@ -79,6 +79,7 @@ public function testGetPriority() {
 
 	public function testGetPanel() {
 		$mockUser = $this->getMockBuilder(IUser::class)->getMock();
+		$mockUser->method('getCloudId')->willReturn('user@cloud.example.com');
 		$agent = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_2) AppleWebKit/602.3.12 (KHTML, like Gecko) Version/10.0.2 Safari/602.3.12';
 		$this->request->expects($this->once())->method('getHeader')->with('User-Agent')->willReturn($agent);
 		$this->userSession->expects($this->once())->method('getUser')->willReturn($mockUser);

From 680989bdfee1f425410cbf8af6f128a790320b82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <1005065+DeepDiver1975@users.noreply.github.com>
Date: Thu, 11 Jun 2026 21:34:06 +0200
Subject: [PATCH 4/4] fix: use correct text when sharing via twitter

---
 .../templates/settings-personal-general.php                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/federatedfilesharing/templates/settings-personal-general.php b/apps/federatedfilesharing/templates/settings-personal-general.php
index 17a83dbdd100..e308276d9f8d 100644
--- a/apps/federatedfilesharing/templates/settings-personal-general.php
+++ b/apps/federatedfilesharing/templates/settings-personal-general.php
@@ -36,7 +36,7 @@ class='js-gs-share social-gnu'>
 				Diaspora
 			</button>
 			<button class="social-twitter pop-up"
-				data-url='https://twitter.com/intent/tweet?text=<?php p(\urlencode($_['message_without_URL'])); ?>'>
+				data-url='https://twitter.com/intent/tweet?text=<?php p(\urlencode($_['message_with_URL'])); ?>'>
 				Twitter
 			</button>
 			<button class="social-facebook pop-up"