mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #19643 from owncloud/public-download-spinner 

Set download cookie on public download
This commit is contained in:
Thomas Müller 2015-10-09 14:10:29 +02:00
parent a42dd117e2 ececa90709
commit 8cbf76755e
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
apps/files_sharing/lib/controllers/sharecontroller.php
View File

@ -233,9 +233,10 @@ class ShareController extends Controller {
* @param string $token * @param string $token
* @param string $files * @param string $files
* @param string $path * @param string $path
* @param string $downloadStartSecret
* @return void|RedirectResponse * @return void|RedirectResponse
*/ */
public function downloadShare($token, $files = null, $path = '') { public function downloadShare($token, $files = null, $path = '', $downloadStartSecret = '') {
\OC_User::setIncognitoMode(true); \OC_User::setIncognitoMode(true);
$linkItem = OCP\Share::getShareByToken($token, false); $linkItem = OCP\Share::getShareByToken($token, false);
@ -288,6 +289,19 @@ class ShareController extends Controller {
} }
} }
/**
* this sets a cookie to be able to recognize the start of the download
* the content must not be longer than 32 characters and must only contain
* alphanumeric characters
*/
if (!empty($downloadStartSecret)
&& !isset($downloadStartSecret[32])
&& preg_match('!^[a-zA-Z0-9]+$!', $downloadStartSecret) === 1) {
// FIXME: set on the response once we use an actual app framework response
setcookie('ocDownloadStarted', $downloadStartSecret, time() + 20, '/');
}
// download selected files // download selected files
if (!is_null($files)) { if (!is_null($files)) {
// FIXME: The exit is required here because otherwise the AppFramework is trying to add headers as well // FIXME: The exit is required here because otherwise the AppFramework is trying to add headers as well