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

Merge pull request #15244 from owncloud/use_default_share_folder 

always fall back to default share folder
This commit is contained in:
Morris Jobke 2015-03-26 22:39:04 +01:00
parent c2909355bf a3592534ef
commit d082e37270
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apps/files_sharing/lib/helper.php
View File

@ -283,8 +283,21 @@ class Helper {
*/ */
public static function getShareFolder() { public static function getShareFolder() {
$shareFolder = \OC::$server->getConfig()->getSystemValue('share_folder', '/'); $shareFolder = \OC::$server->getConfig()->getSystemValue('share_folder', '/');
$shareFolder = \OC\Files\Filesystem::normalizePath($shareFolder);
if (!\OC\Files\Filesystem::file_exists($shareFolder)) {
$dir = '';
$subdirs = explode('/', $shareFolder);
foreach ($subdirs as $subdir) {
$dir = $dir . '/' . $subdir;
if (!\OC\Files\Filesystem::is_dir($dir)) {
\OC\Files\Filesystem::mkdir($dir);
}
}
}
return $shareFolder;
return \OC\Files\Filesystem::normalizePath($shareFolder);
} }
/** /**

4
apps/files_sharing/lib/sharedmount.php
View File

@ -50,8 +50,8 @@ class SharedMount extends MountPoint implements MoveableMount {
$mountPoint = basename($share['file_target']); $mountPoint = basename($share['file_target']);
$parent = dirname($share['file_target']); $parent = dirname($share['file_target']);
while (!\OC\Files\Filesystem::is_dir($parent)) { if (!\OC\Files\Filesystem::is_dir($parent)) {
$parent = dirname($parent); $parent = Helper::getShareFolder();
} }
$newMountPoint = \OCA\Files_Sharing\Helper::generateUniqueTarget( $newMountPoint = \OCA\Files_Sharing\Helper::generateUniqueTarget(

6
apps/files_sharing/tests/helper.php
View File

@ -52,9 +52,11 @@ class Test_Files_Sharing_Helper extends TestCase {
function testSetGetShareFolder() { function testSetGetShareFolder() {
$this->assertSame('/', \OCA\Files_Sharing\Helper::getShareFolder()); $this->assertSame('/', \OCA\Files_Sharing\Helper::getShareFolder());
\OCA\Files_Sharing\Helper::setShareFolder('/Shared'); \OCA\Files_Sharing\Helper::setShareFolder('/Shared/Folder');
$this->assertSame('/Shared', \OCA\Files_Sharing\Helper::getShareFolder()); $sharedFolder = \OCA\Files_Sharing\Helper::getShareFolder();
$this->assertSame('/Shared/Folder', \OCA\Files_Sharing\Helper::getShareFolder());
$this->assertTrue(\OC\Files\Filesystem::is_dir($sharedFolder));
// cleanup // cleanup
\OC::$server->getConfig()->deleteSystemValue('share_folder'); \OC::$server->getConfig()->deleteSystemValue('share_folder');