summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2018-03-05 11:11:43 +0100
committerGitHub <noreply@github.com>2018-03-05 11:11:43 +0100
commit05ef2d70e7258ff8ba25eac32526a9e982980e3d (patch)
treef809bbc5d4fe504bc1d1d46b9ceed7bf67877788 /core
parent36d89a922386adbf6c80e3bb6581776512956f0f (diff)
parent3824e6f631e3345401ac5720d35ec53e8983dcaa (diff)
downloadnextcloud-server-05ef2d70e7258ff8ba25eac32526a9e982980e3d.tar.gz
nextcloud-server-05ef2d70e7258ff8ba25eac32526a9e982980e3d.zip
Merge pull request #8590 from nextcloud/redirect-to-download-after-share
Sharing: redirect to download after authentification if requested
Diffstat (limited to 'core')
-rw-r--r--core/routes.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/routes.php b/core/routes.php
index 97a8621fc39..d357fd45f96 100644
--- a/core/routes.php
+++ b/core/routes.php
@@ -116,7 +116,7 @@ $this->create('files_sharing.sharecontroller.showShare', '/s/{token}')->action(f
throw new \OC\HintException('App file sharing is not enabled');
}
});
-$this->create('files_sharing.sharecontroller.authenticate', '/s/{token}/authenticate')->post()->action(function($urlParams) {
+$this->create('files_sharing.sharecontroller.authenticate', '/s/{token}/authenticate/{redirect}')->post()->action(function($urlParams) {
if (class_exists(\OCA\Files_Sharing\AppInfo\Application::class, false)) {
$app = new \OCA\Files_Sharing\AppInfo\Application($urlParams);
$app->dispatch('ShareController', 'authenticate');
@@ -124,7 +124,7 @@ $this->create('files_sharing.sharecontroller.authenticate', '/s/{token}/authenti
throw new \OC\HintException('App file sharing is not enabled');
}
});
-$this->create('files_sharing.sharecontroller.showAuthenticate', '/s/{token}/authenticate')->get()->action(function($urlParams) {
+$this->create('files_sharing.sharecontroller.showAuthenticate', '/s/{token}/authenticate/{redirect}')->get()->action(function($urlParams) {
if (class_exists(\OCA\Files_Sharing\AppInfo\Application::class, false)) {
$app = new \OCA\Files_Sharing\AppInfo\Application($urlParams);
$app->dispatch('ShareController', 'showAuthenticate');