Skip to content

fix: remove broken owncloud.com/federation link from federation settings #41608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DeepDiver1975 merged 4 commits into from
Jun 11, 2026
Merged

fix: remove broken owncloud.com/federation link from federation settings #41608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ab75aca
fix: remove broken owncloud.com/federation link from federation settings
DeepDiver1975 Jun 9, 2026
68af06a
chore(changelog): fix PR link in changelog entry for #40501
DeepDiver1975 Jun 9, 2026
17b8c41
test(federation): stub getCloudId() in GeneralPersonalPanelTest
DeepDiver1975 Jun 11, 2026
680989b
fix: use correct text when sharing via twitter
DeepDiver1975 Jun 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions apps/federatedfilesharing/lib/Panels/GeneralPersonalPanel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
17 changes: 7 additions & 10 deletions apps/federatedfilesharing/templates/settings-personal-general.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand 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
Expand Down
1 change: 1 addition & 0 deletions apps/federatedfilesharing/tests/Panels/GeneralPersonalPanelTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
8 changes: 8 additions & 0 deletions changelog/unreleased/40501
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
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/pull/41608