Skip to content
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.

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

move federated sharing settings to the federatedfilesharing app #24073

Merged
merged 1 commit into from
Apr 25, 2016

Conversation

schiessle
Copy link
Contributor

@schiessle schiessle commented Apr 18, 2016

move federated sharing settings to the "federated files sharing"-app, part of #22209

cc @rullzer

@mention-bot
Copy link

By analyzing the blame information on this pull request, we identified @jancborchardt, @LukasReschke and @DeepDiver1975 to be potential reviewers

@schiessle schiessle force-pushed the move_federated_sharing_settings_to_app branch from d0e92ef to e101054 Compare April 22, 2016 12:56
@rullzer
Copy link
Contributor

rullzer commented Apr 22, 2016

👍

@schiessle
Copy link
Contributor Author

second reviewer... maybe @nickvergessen or @ChristophWurst ? Thanks!

@@ -55,7 +55,9 @@

$server = $serverFactory->createServer($baseuri, $requestUri, $authBackend, function (\Sabre\DAV\Server $server) use ($authBackend, $linkCheckPlugin) {
$isAjax = (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] === 'XMLHttpRequest');
if (OCA\Files_Sharing\Helper::isOutgoingServer2serverShareEnabled() === false && !$isAjax) {
$federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application('federatedfilesharing');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

throws an exception when the app is not enabled, because autoloading from the path is not allowed...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know, but at the moment the app is always enabled. I also want to move the settings 1:1 with as few changes as possible. Maybe in a second step the shareManager should have a "getShareProvider($shareType)" method which we could query instead of the share provider directly. cc @rullzer

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mmmm lets think about that... because in general I think the abstraction of the share manager is pretty nice.. But I see the use case

@nickvergessen
Copy link
Contributor

But okay, lets do that in a second step

@schiessle schiessle merged commit 74de72e into master Apr 25, 2016
@schiessle schiessle deleted the move_federated_sharing_settings_to_app branch April 25, 2016 08:19
@lock
Copy link

lock bot commented Aug 6, 2019

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@lock lock bot locked as resolved and limited conversation to collaborators Aug 6, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants