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

Fix removing personal mounts

This commit is contained in:
Michael Gapczynski 2012-06-22 12:22:19 -04:00
parent b650f46698
commit 618a3c1d94
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/files_external/lib/config.php
View File

@ -157,12 +157,17 @@ class OC_Mount_Config {
*/ */
public static function removeMountPoint($mountPoint, $mountType, $applicable, $isPersonal = false) { public static function removeMountPoint($mountPoint, $mountType, $applicable, $isPersonal = false) {
// Verify that the mount point applies for the current user // Verify that the mount point applies for the current user
if ($isPersonal && $applicable != OCP\User::getUser()) { if ($isPersonal) {
return false; if ($applicable != OCP\User::getUser()) {
return false;
}
$mountPoint = '/'.$applicable.'/files/'.ltrim($mountPoint, '/');
} else {
$mountPoint = '/$user/files/'.ltrim($mountPoint, '/');
} }
$mountPoints = self::readData($isPersonal); $mountPoints = self::readData($isPersonal);
// Remove mount point // Remove mount point
unset($mountPoints[$mountType][$applicable]['/$user/files/'.$mountPoint]); unset($mountPoints[$mountType][$applicable][$mountPoint]);
// Unset parent arrays if empty // Unset parent arrays if empty
if (empty($mountPoints[$mountType][$applicable])) { if (empty($mountPoints[$mountType][$applicable])) {
unset($mountPoints[$mountType][$applicable]); unset($mountPoints[$mountType][$applicable]);