aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2013-08-19 12:04:53 +0200
committerRobin Appelman <icewind@owncloud.com>2013-08-19 12:04:53 +0200
commitc5402f457530577999d1adc1715c76e742ad8aa9 (patch)
tree85b40240d914a51513940c14179fdecdcb78ad4c /lib
parenta1d5aba5fd3795a6ee4a87c96abf0d35d3f8116d (diff)
downloadnextcloud-server-c5402f457530577999d1adc1715c76e742ad8aa9.tar.gz
nextcloud-server-c5402f457530577999d1adc1715c76e742ad8aa9.zip
use strict equals in readdir loops to prevent issues with '0' files
Diffstat (limited to 'lib')
-rw-r--r--lib/app.php2
-rw-r--r--lib/archive.php2
-rw-r--r--lib/cache/file.php4
-rw-r--r--lib/cache/fileglobal.php4
-rw-r--r--lib/connector/sabre/objecttree.php2
-rw-r--r--lib/files/cache/scanner.php2
-rw-r--r--lib/files/storage/common.php6
-rw-r--r--lib/files/view.php2
-rw-r--r--lib/installer.php2
9 files changed, 13 insertions, 13 deletions
diff --git a/lib/app.php b/lib/app.php
index 5fa650044f3..f76b92cde1b 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -666,7 +666,7 @@ class OC_App{
}
$dh = opendir( $apps_dir['path'] );
- while( $file = readdir( $dh ) ) {
+ while (($file = readdir($dh)) !== false) {
if ($file[0] != '.' and is_file($apps_dir['path'].'/'.$file.'/appinfo/app.php')) {
diff --git a/lib/archive.php b/lib/archive.php
index 70615db714e..364cd5a74a1 100644
--- a/lib/archive.php
+++ b/lib/archive.php
@@ -121,7 +121,7 @@ abstract class OC_Archive{
function addRecursive($path, $source) {
if($dh=opendir($source)) {
$this->addFolder($path);
- while($file=readdir($dh)) {
+ while (($file = readdir($dh)) !== false) {
if($file=='.' or $file=='..') {
continue;
}
diff --git a/lib/cache/file.php b/lib/cache/file.php
index ba3dedaf8f3..9fee6034a71 100644
--- a/lib/cache/file.php
+++ b/lib/cache/file.php
@@ -80,7 +80,7 @@ class OC_Cache_File{
$storage = $this->getStorage();
if($storage and $storage->is_dir('/')) {
$dh=$storage->opendir('/');
- while($file=readdir($dh)) {
+ while (($file = readdir($dh)) !== false) {
if($file!='.' and $file!='..' and ($prefix==='' || strpos($file, $prefix) === 0)) {
$storage->unlink('/'.$file);
}
@@ -94,7 +94,7 @@ class OC_Cache_File{
if($storage and $storage->is_dir('/')) {
$now = time();
$dh=$storage->opendir('/');
- while($file=readdir($dh)) {
+ while (($file = readdir($dh)) !== false) {
if($file!='.' and $file!='..') {
$mtime = $storage->filemtime('/'.$file);
if ($mtime < $now) {
diff --git a/lib/cache/fileglobal.php b/lib/cache/fileglobal.php
index 6d01964e185..2fbd8ca3edb 100644
--- a/lib/cache/fileglobal.php
+++ b/lib/cache/fileglobal.php
@@ -69,7 +69,7 @@ class OC_Cache_FileGlobal{
$prefix = $this->fixKey($prefix);
if($cache_dir and is_dir($cache_dir)) {
$dh=opendir($cache_dir);
- while($file=readdir($dh)) {
+ while (($file = readdir($dh)) !== false) {
if($file!='.' and $file!='..' and ($prefix==='' || strpos($file, $prefix) === 0)) {
unlink($cache_dir.$file);
}
@@ -88,7 +88,7 @@ class OC_Cache_FileGlobal{
$cache_dir = self::getCacheDir();
if($cache_dir and is_dir($cache_dir)) {
$dh=opendir($cache_dir);
- while($file=readdir($dh)) {
+ while (($file = readdir($dh)) !== false) {
if($file!='.' and $file!='..') {
$mtime = filemtime($cache_dir.$file);
if ($mtime < $now) {
diff --git a/lib/connector/sabre/objecttree.php b/lib/connector/sabre/objecttree.php
index c4ddcbecbb8..b298813a202 100644
--- a/lib/connector/sabre/objecttree.php
+++ b/lib/connector/sabre/objecttree.php
@@ -88,7 +88,7 @@ class ObjectTree extends \Sabre_DAV_ObjectTree {
} else {
Filesystem::mkdir($destination);
$dh = Filesystem::opendir($source);
- while ($subnode = readdir($dh)) {
+ while (($subnode = readdir($dh)) !== false) {
if ($subnode == '.' || $subnode == '..') continue;
$this->copy($source . '/' . $subnode, $destination . '/' . $subnode);
diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php
index 597eabecf54..87fa7c1365a 100644
--- a/lib/files/cache/scanner.php
+++ b/lib/files/cache/scanner.php
@@ -159,7 +159,7 @@ class Scanner extends BasicEmitter {
$newChildren = array();
if ($this->storage->is_dir($path) && ($dh = $this->storage->opendir($path))) {
\OC_DB::beginTransaction();
- while ($file = readdir($dh)) {
+ while (($file = readdir($dh)) !== false) {
$child = ($path) ? $path . '/' . $file : $file;
if (!Filesystem::isIgnoredDir($file)) {
$newChildren[] = $file;
diff --git a/lib/files/storage/common.php b/lib/files/storage/common.php
index 3da13ac4df0..1a273240eeb 100644
--- a/lib/files/storage/common.php
+++ b/lib/files/storage/common.php
@@ -142,7 +142,7 @@ abstract class Common implements \OC\Files\Storage\Storage {
return false;
} else {
$directoryHandle = $this->opendir($directory);
- while ($contents = readdir($directoryHandle)) {
+ while (($contents = readdir($directoryHandle)) !== false) {
if (!\OC\Files\Filesystem::isIgnoredDir($contents)) {
$path = $directory . '/' . $contents;
if ($this->is_dir($path)) {
@@ -225,7 +225,7 @@ abstract class Common implements \OC\Files\Storage\Storage {
private function addLocalFolder($path, $target) {
if ($dh = $this->opendir($path)) {
- while ($file = readdir($dh)) {
+ while (($file = readdir($dh)) !== false) {
if ($file !== '.' and $file !== '..') {
if ($this->is_dir($path . '/' . $file)) {
mkdir($target . '/' . $file);
@@ -243,7 +243,7 @@ abstract class Common implements \OC\Files\Storage\Storage {
$files = array();
$dh = $this->opendir($dir);
if ($dh) {
- while ($item = readdir($dh)) {
+ while (($item = readdir($dh)) !== false) {
if ($item == '.' || $item == '..') continue;
if (strstr(strtolower($item), strtolower($query)) !== false) {
$files[] = $dir . '/' . $item;
diff --git a/lib/files/view.php b/lib/files/view.php
index c9727fe4984..bb737f19ef8 100644
--- a/lib/files/view.php
+++ b/lib/files/view.php
@@ -499,7 +499,7 @@ class View {
} else {
if ($this->is_dir($path1) && ($dh = $this->opendir($path1))) {
$result = $this->mkdir($path2);
- while ($file = readdir($dh)) {
+ while (($file = readdir($dh)) !== false) {
if (!Filesystem::isIgnoredDir($file)) {
$result = $this->copy($path1 . '/' . $file, $path2 . '/' . $file);
}
diff --git a/lib/installer.php b/lib/installer.php
index dcd29f9e1ad..c29f9ec8982 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -109,7 +109,7 @@ class OC_Installer{
if(!is_file($extractDir.'/appinfo/info.xml')) {
//try to find it in a subdir
$dh=opendir($extractDir);
- while($folder=readdir($dh)) {
+ while (($folder = readdir($dh)) !== false) {
if($folder[0]!='.' and is_dir($extractDir.'/'.$folder)) {
if(is_file($extractDir.'/'.$folder.'/appinfo/info.xml')) {
$extractDir.='/'.$folder;