From 491250320a6b19f9a7d546598e97eac1e90f78f7 Mon Sep 17 00:00:00 2001
From: Martin <martin.mattel@diemattels.at>
Date: Mon, 21 Sep 2015 14:09:28 +0200
Subject: [PATCH] Replaces if ($file === '.' || $file === '..') by
if(\OC\Files\Filesystem::isIgnoredDir($file)). Eases to find where this
operation is used.
---
apps/files_external/lib/amazons3.php | 2 +-
apps/files_external/lib/swift.php | 4 ++--
apps/files_trashbin/lib/trashbin.php | 2 +-
lib/private/files/storage/common.php | 4 ++--
lib/private/files/storage/local.php | 2 +-
lib/private/files/storage/polyfill/copydirectory.php | 2 +-
lib/private/files/view.php | 2 +-
lib/private/util.php | 2 +-
tests/lib/files/storage/wrapper/jail.php | 2 +-
tests/lib/testcase.php | 2 +-
10 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
index 34e8974a6d..24a0346df6 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -517,7 +517,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
$dh = $this->opendir($path1);
if (is_resource($dh)) {
while (($file = readdir($dh)) !== false) {
- if ($file === '.' || $file === '..') {
+ if (\OC\Files\Filesystem::isIgnoredDir($file)) {
continue;
}
diff --git a/apps/files_external/lib/swift.php b/apps/files_external/lib/swift.php
index 6f93f3c84c..20d2b8f498 100644
--- a/apps/files_external/lib/swift.php
+++ b/apps/files_external/lib/swift.php
@@ -175,7 +175,7 @@ class Swift extends \OC\Files\Storage\Common {
$dh = $this->opendir($path);
while ($file = readdir($dh)) {
- if ($file === '.' || $file === '..') {
+ if (\OC\Files\Filesystem::isIgnoredDir($file)) {
continue;
}
@@ -429,7 +429,7 @@ class Swift extends \OC\Files\Storage\Common {
$dh = $this->opendir($path1);
while ($file = readdir($dh)) {
- if ($file === '.' || $file === '..') {
+ if (\OC\Files\Filesystem::isIgnoredDir($file)) {
continue;
}
diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php
index 3b2d4cf592..2a9df94988 100644
--- a/apps/files_trashbin/lib/trashbin.php
+++ b/apps/files_trashbin/lib/trashbin.php
@@ -895,7 +895,7 @@ class Trashbin {
$view = new \OC\Files\View('/' . $user . '/files_trashbin');
if ($view->is_dir('/files') && $dh = $view->opendir('/files')) {
while ($file = readdir($dh)) {
- if ($file !== '.' and $file !== '..') {
+ if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
return false;
}
}
diff --git a/lib/private/files/storage/common.php b/lib/private/files/storage/common.php
index a5ed5fd399..2d579fa2b6 100644
--- a/lib/private/files/storage/common.php
+++ b/lib/private/files/storage/common.php
@@ -260,7 +260,7 @@ abstract class Common implements Storage {
$dh = $this->opendir($path);
if (is_resource($dh)) {
while (($file = readdir($dh)) !== false) {
- if ($file !== '.' and $file !== '..') {
+ if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
if ($this->is_dir($path . '/' . $file)) {
mkdir($target . '/' . $file);
$this->addLocalFolder($path . '/' . $file, $target . '/' . $file);
@@ -283,7 +283,7 @@ abstract class Common implements Storage {
$dh = $this->opendir($dir);
if (is_resource($dh)) {
while (($item = readdir($dh)) !== false) {
- if ($item == '.' || $item == '..') continue;
+ if (\OC\Files\Filesystem::isIgnoredDir($item)) continue;
if (strstr(strtolower($item), strtolower($query)) !== false) {
$files[] = $dir . '/' . $item;
}
diff --git a/lib/private/files/storage/local.php b/lib/private/files/storage/local.php
index 3676fe6913..4b6b08a16f 100644
--- a/lib/private/files/storage/local.php
+++ b/lib/private/files/storage/local.php
@@ -283,7 +283,7 @@ class Local extends \OC\Files\Storage\Common {
$files = array();
$physicalDir = $this->getSourcePath($dir);
foreach (scandir($physicalDir) as $item) {
- if ($item == '.' || $item == '..')
+ if (\OC\Files\Filesystem::isIgnoredDir($item))
continue;
$physicalItem = $physicalDir . '/' . $item;
diff --git a/lib/private/files/storage/polyfill/copydirectory.php b/lib/private/files/storage/polyfill/copydirectory.php
index 1b4873a3a7..73c6d3d543 100644
--- a/lib/private/files/storage/polyfill/copydirectory.php
+++ b/lib/private/files/storage/polyfill/copydirectory.php
@@ -72,7 +72,7 @@ trait CopyDirectory {
$dh = $this->opendir($source);
$result = true;
while ($file = readdir($dh)) {
- if ($file !== '.' and $file !== '..') {
+ if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
if ($this->is_dir($source . '/' . $file)) {
$this->mkdir($target . '/' . $file);
$result = $this->copyRecursive($source . '/' . $file, $target . '/' . $file);
diff --git a/lib/private/files/view.php b/lib/private/files/view.php
index 9afa9d40b2..d7119cf030 100644
--- a/lib/private/files/view.php
+++ b/lib/private/files/view.php
@@ -1656,7 +1656,7 @@ class View {
if ($trimmed === '') {
throw new InvalidPathException($l10n->t('Empty filename is not allowed'));
}
- if ($trimmed === '.' || $trimmed === '..') {
+ if (\OC\Files\Filesystem::isIgnoredDir($trimmed)) {
throw new InvalidPathException($l10n->t('Dot files are not allowed'));
}
diff --git a/lib/private/util.php b/lib/private/util.php
index eb1de5be5a..667d358655 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -1433,7 +1433,7 @@ class OC_Util {
if ($trimmed === '') {
return false;
}
- if ($trimmed === '.' || $trimmed === '..') {
+ if (\OC\Files\Filesystem::isIgnoredDir($trimmed)) {
return false;
}
foreach (str_split($trimmed) as $char) {
diff --git a/tests/lib/files/storage/wrapper/jail.php b/tests/lib/files/storage/wrapper/jail.php
index a7bd684df4..9b16bc5a32 100644
--- a/tests/lib/files/storage/wrapper/jail.php
+++ b/tests/lib/files/storage/wrapper/jail.php
@@ -30,7 +30,7 @@ class Jail extends \Test\Files\Storage\Storage {
$contents = array();
$dh = $this->sourceStorage->opendir('');
while ($file = readdir($dh)) {
- if ($file !== '.' and $file !== '..') {
+ if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
$contents[] = $file;
}
}
diff --git a/tests/lib/testcase.php b/tests/lib/testcase.php
index 854d5f4f65..7e4890a46c 100644
--- a/tests/lib/testcase.php
+++ b/tests/lib/testcase.php
@@ -193,7 +193,7 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase {
static protected function tearDownAfterClassCleanStrayDataUnlinkDir($dir) {
if ($dh = @opendir($dir)) {
while (($file = readdir($dh)) !== false) {
- if ($file === '..' || $file === '.') {
+ if (\OC\Files\Filesystem::isIgnoredDir($file)) {
continue;
}
$path = $dir . '/' . $file;
--
GitLab