From 222b9fd22b2d446a6bccfbb8acd219ecb9661708 Mon Sep 17 00:00:00 2001
From: Clark Tomlinson <fallen013@gmail.com>
Date: Thu, 31 Jul 2014 08:53:42 -0400
Subject: [PATCH] Resolving 9969 resubmitting to fix rebase issue.
---
lib/private/files/storage/local.php | 17 +------------
lib/private/files/storage/mappedlocal.php | 29 +++++++----------------
2 files changed, 9 insertions(+), 37 deletions(-)
diff --git a/lib/private/files/storage/local.php b/lib/private/files/storage/local.php
index 63570d70cf..a8b420e978 100644
--- a/lib/private/files/storage/local.php
+++ b/lib/private/files/storage/local.php
@@ -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) {
diff --git a/lib/private/files/storage/mappedlocal.php b/lib/private/files/storage/mappedlocal.php
index c4a8dc1961..0760d842ea 100644
--- a/lib/private/files/storage/mappedlocal.php
+++ b/lib/private/files/storage/mappedlocal.php
@@ -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;
--
GitLab