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

Merge pull request #2438 from nextcloud/stable10-dont-allow-subfolders-for-write-only-shares 

[stable10] On write-only shares do not allow to specify subfolders
This commit is contained in:
Roeland Jago Douma 2016-12-01 20:19:52 +01:00 committed by GitHub
parent d012965053 4045c7be73
commit c0f5f0a029
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apps/files/ajax/upload.php
View File

@ -56,13 +56,22 @@ if (empty($_POST['dirToken'])) {
die();
}
} else {
$shareManager = \OC::$server->getShareManager();
$share = $shareManager->getShareByToken((string)$_POST['dirToken']);
// TODO: ideally this code should be in files_sharing/ajax/upload.php
// and the upload/file transfer code needs to be refactored into a utility method
// that could be used there
\OC_User::setIncognitoMode(true);
$publicDirectory = !empty($_POST['subdir']) ? (string)$_POST['subdir'] : '/';
// If it is a write-only folder no subdirectory can be specified
$publicDirectory = '';
if ($share->getPermissions() & \OCP\Constants::PERMISSION_READ) {
$publicDirectory = !empty($_POST['subdir']) ? (string)$_POST['subdir'] : '/';
} else {
$_POST['file_directory'] = '';
}
$linkItem = OCP\Share::getShareByToken((string)$_POST['dirToken']);
if ($linkItem === false) {
@ -165,8 +174,6 @@ if (\OC\Files\Filesystem::isValidPath($dir) === true) {
if(isset($_POST['dirToken'])) {
// If it is a read only share the resolution will always be autorename
$shareManager = \OC::$server->getShareManager();
$share = $shareManager->getShareByToken((string)$_POST['dirToken']);
if (!($share->getPermissions() & \OCP\Constants::PERMISSION_READ)) {
$resolution = 'autorename';
}