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

Resolving 9969 resubmitting to fix rebase issue.

This commit is contained in:
Clark Tomlinson 2014-07-31 08:53:42 -04:00
parent 4eb2b4e1b0
commit 222b9fd22b
2 changed files with 9 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/private/files/storage/local.php
View File

@ -208,22 +208,7 @@ if (\OC_Util::runningOnWindows()) {
}
public function fopen($path, $mode) {
if ($return = fopen($this->datadir . $path, $mode)) {
switch ($mode) {
case 'r':
break;
case 'r+':
case 'w+':
case 'x+':
case 'a+':
break;
case 'w':
case 'x':
case 'a':
break;
}
}
return $return;
return fopen($this->datadir . $path, $mode);
}
public function hash($type, $path, $raw = false) {

29
lib/private/files/storage/mappedlocal.php
View File

@ -79,7 +79,7 @@ class MappedLocal extends \OC\Files\Storage\Common {
$logicalPath = $this->mapper->physicalToLogic($physicalPath);
$dh = opendir($physicalPath);
if(is_resource($dh)) {
if (is_resource($dh)) {
while (($file = readdir($dh)) !== false) {
if ($file === '.' or $file === '..') {
continue;
@ -87,9 +87,9 @@ class MappedLocal extends \OC\Files\Storage\Common {
$logicalFilePath = $this->mapper->physicalToLogic($physicalPath . '/' . $file);
$file= $this->mapper->stripRootFolder($logicalFilePath, $logicalPath);
$file = $this->mapper->stripRootFolder($logicalFilePath, $logicalPath);
$file = $this->stripLeading($file);
$files[]= $file;
$files[] = $file;
}
}
@ -245,28 +245,15 @@ class MappedLocal extends \OC\Files\Storage\Common {
}
public function fopen($path, $mode) {
if ($return = fopen($this->buildPath($path), $mode)) {
switch ($mode) {
case 'r':
break;
case 'r+':
case 'w+':
case 'x+':
case 'a+':
break;
case 'w':
case 'x':
case 'a':
break;
}
}
return $return;
return fopen($this->buildPath($path), $mode);
}
/**
* @param string $dir
* @param bool $isLogicPath
* @return bool
*/
private function delTree($dir, $isLogicPath=true) {
private function delTree($dir, $isLogicPath = true) {
$dirRelative = $dir;
if ($isLogicPath) {
$dir = $this->buildPath($dir);
@ -380,7 +367,7 @@ class MappedLocal extends \OC\Files\Storage\Common {
/**
* @param string $path
*/
private function cleanMapper($path, $isLogicPath = true, $recursive=true) {
private function cleanMapper($path, $isLogicPath = true, $recursive = true) {
$fullPath = $path;
if ($isLogicPath) {
$fullPath = $this->datadir . $path;