diff options
author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-02-28 17:08:25 +0100 |
---|---|---|
committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-02-28 17:08:25 +0100 |
commit | a0641e43dc0db58bd31bc097b15c19784e09f50b (patch) | |
tree | 2bc0ade5f9e42fd2ed36bf0fc9fe384dfbee2836 | |
parent | fb890807c0c17549566690512549c8d4ae5813e3 (diff) | |
download | nextcloud-server-a0641e43dc0db58bd31bc097b15c19784e09f50b.tar.gz nextcloud-server-a0641e43dc0db58bd31bc097b15c19784e09f50b.zip |
fixup! Sharing: redirect to download after authentification if requested
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
-rw-r--r-- | apps/files_sharing/lib/Controller/ShareController.php | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/apps/files_sharing/lib/Controller/ShareController.php b/apps/files_sharing/lib/Controller/ShareController.php index 856f001bbb4..f793d35e3ae 100644 --- a/apps/files_sharing/lib/Controller/ShareController.php +++ b/apps/files_sharing/lib/Controller/ShareController.php @@ -185,10 +185,17 @@ class ShareController extends Controller { $authenticate = $this->linkShareAuth($share, $password); + // if download was requested before auth, redirect to download if ($authenticate === true && $redirect === 'download') { - return new RedirectResponse($this->urlGenerator->linkToRoute('files_sharing.sharecontroller.downloadShare', array('token' => $token))); + return new RedirectResponse($this->urlGenerator->linkToRoute( + 'files_sharing.sharecontroller.downloadShare', + array('token' => $token)) + ); } else if ($authenticate === true) { - return new RedirectResponse($this->urlGenerator->linkToRoute('files_sharing.sharecontroller.showShare', array('token' => $token))); + return new RedirectResponse($this->urlGenerator->linkToRoute( + 'files_sharing.sharecontroller.showShare', + array('token' => $token)) + ); } $response = new TemplateResponse($this->appName, 'authenticate', array('wrongpw' => true), 'guest'); |