1 files changed, 46 insertions, 6 deletions

diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php
index ce89c5c23ff..0daa863e79d 100644
--- a/lib/files/filesystem.php
+++ b/lib/files/filesystem.php
@@ -158,6 +158,9 @@ class Filesystem {
 	 * @return string
 	 */
 	static public function getMountPoint($path) {
+		if (!self::$mounts) {
+			\OC_Util::setupFS();
+		}
 		$mount = self::$mounts->find($path);
 		if ($mount) {
 			return $mount->getMountPoint();
@@ -173,6 +176,9 @@ class Filesystem {
 	 * @return string[]
 	 */
 	static public function getMountPoints($path) {
+		if (!self::$mounts) {
+			\OC_Util::setupFS();
+		}
 		$result = array();
 		$mounts = self::$mounts->findIn($path);
 		foreach ($mounts as $mount) {
@@ -188,6 +194,9 @@ class Filesystem {
 	 * @return \OC\Files\Storage\Storage
 	 */
 	public static function getStorage($mountPoint) {
+		if (!self::$mounts) {
+			\OC_Util::setupFS();
+		}
 		$mount = self::$mounts->find($mountPoint);
 		return $mount->getStorage();
 	}
@@ -197,6 +206,9 @@ class Filesystem {
 	 * @return Mount\Mount[]
 	 */
 	public static function getMountByStorageId($id) {
+		if (!self::$mounts) {
+			\OC_Util::setupFS();
+		}
 		return self::$mounts->findByStorageId($id);
 	}
 
@@ -205,6 +217,9 @@ class Filesystem {
 	 * @return Mount\Mount[]
 	 */
 	public static function getMountByNumericId($id) {
+		if (!self::$mounts) {
+			\OC_Util::setupFS();
+		}
 		return self::$mounts->findByNumericId($id);
 	}
 
@@ -215,6 +230,9 @@ class Filesystem {
 	 * @return array consisting of the storage and the internal path
 	 */
 	static public function resolvePath($path) {
+		if (!self::$mounts) {
+			\OC_Util::setupFS();
+		}
 		$mount = self::$mounts->find($path);
 		if ($mount) {
 			return array($mount->getStorage(), $mount->getInternalPath($path));
@@ -229,7 +247,10 @@ class Filesystem {
 		}
 		self::$loader = new Loader();
 		self::$defaultInstance = new View($root);
-		self::$mounts = new Mount\Manager();
+
+		if (!self::$mounts) {
+			self::$mounts = new Mount\Manager();
+		}
 
 		//load custom mount config
 		self::initMountPoints($user);
@@ -240,7 +261,9 @@ class Filesystem {
 	}
 
 	static public function initMounts() {
-		self::$mounts = new Mount\Manager();
+		if (!self::$mounts) {
+			self::$mounts = new Mount\Manager();
+		}
 	}
 
 	/**
@@ -361,7 +384,9 @@ class Filesystem {
 	 * clear all mounts and storage backends
 	 */
 	public static function clearMounts() {
-		self::$mounts->clear();
+		if (self::$mounts) {
+			self::$mounts->clear();
+		}
 	}
 
 	/**
@@ -372,6 +397,9 @@ class Filesystem {
 	 * @param string $mountpoint
 	 */
 	static public function mount($class, $arguments, $mountpoint) {
+		if (!self::$mounts) {
+			\OC_Util::setupFS();
+		}
 		$mount = new Mount\Mount($class, $mountpoint, $arguments, self::$loader);
 		self::$mounts->addMount($mount);
 	}
@@ -458,6 +486,19 @@ class Filesystem {
 	}
 
 	/**
+	 * @brief check if the directory should be ignored when scanning
+	 * NOTE: the special directories . and .. would cause never ending recursion
+	 * @param String $dir
+	 * @return boolean
+	 */
+	static public function isIgnoredDir($dir) {
+		if ($dir === '.' || $dir === '..') {
+			return true;
+		}
+		return false;
+	}
+
+	/**
 	 * following functions are equivalent to their php builtin equivalents for arguments/return values.
 	 */
 	static public function mkdir($path) {
@@ -620,9 +661,8 @@ class Filesystem {
 			$path = substr($path, 0, -1);
 		}
 		//normalize unicode if possible
-		if (class_exists('Normalizer')) {
-			$path = \Normalizer::normalize($path);
-		}
+		$path = \OC_Util::normalizeUnicode($path);
+
 		return $path;
 	}