Explicit is better than implicit

For consistency, lets close the opened user login session here
also.
pull/1/head
Pranav Kant 8 years ago
parent 45d76a1c68
commit be84ac71f8

@ -470,29 +470,32 @@ class DocumentController extends Controller {
//TODO: Support X-WOPIMaxExpectedSize header. //TODO: Support X-WOPIMaxExpectedSize header.
$res = $row->getPathForToken($fileId, $version, $token); $res = $row->getPathForToken($fileId, $version, $token);
$ownerid = $res['owner'];
// Login the user to see his mount locations // Login the user to see his mount locations
$this->loginUser($res['owner']); $this->loginUser($ownerid);
$filename = '';
// If some previous version is requested, fetch it from Files_Version app // If some previous version is requested, fetch it from Files_Version app
if ($version !== '0') { if ($version !== '0') {
\OCP\JSON::checkAppEnabled('files_versions'); \OCP\JSON::checkAppEnabled('files_versions');
$ownerid = $res['owner'];
// Setup the FS // Setup the FS
\OC_Util::tearDownFS(); \OC_Util::tearDownFS();
\OC_Util::setupFS($ownerid, '/' . $ownerid . '/files'); \OC_Util::setupFS($ownerid, '/' . $ownerid . '/files');
list($owner_uid, $filename) = \OCA\Files_Versions\Storage::getUidAndFilename($res['path']); list($ownerid, $filename) = \OCA\Files_Versions\Storage::getUidAndFilename($res['path']);
$versionName = '/files_versions/' . $filename . '.v' . $version; $filename = '/files_versions/' . $filename . '.v' . $version;
\OC_Util::tearDownFS(); \OC_Util::tearDownFS();
} else {
return new DownloadResponse($this->request, $owner_uid, $versionName); $filename = '/files' . $res['path'];
} }
return new DownloadResponse($this->request, $res['owner'], '/files' . $res['path']); // Close the session created for user login
\OC::$server->getSession()->close();
return new DownloadResponse($this->request, $ownerid, $filename);
} }
/** /**

Loading…
Cancel
Save