nextcloud / server

lib/private/Files/Storage/Home.php

Indentation +76 added lines, -76 removed lines

@@ -33,89 +33,89 @@
  * Specialized version of Local storage for home directory usage
  */
 class Home extends Local implements \OCP\Files\IHomeStorage {
-	/**
-	 * @var string
-	 */
-	protected $id;
+    /**
+     * @var string
+     */
+    protected $id;
 
-	/**
-	 * @var \OC\User\User $user
-	 */
-	protected $user;
+    /**
+     * @var \OC\User\User $user
+     */
+    protected $user;
 
-	/**
-	 * Construct a Home storage instance
-	 *
-	 * @param array $arguments array with "user" containing the
-	 * storage owner
-	 */
-	public function __construct($arguments) {
-		$this->user = $arguments['user'];
-		$datadir = $this->user->getHome();
-		$this->id = 'home::' . $this->user->getUID();
+    /**
+     * Construct a Home storage instance
+     *
+     * @param array $arguments array with "user" containing the
+     * storage owner
+     */
+    public function __construct($arguments) {
+        $this->user = $arguments['user'];
+        $datadir = $this->user->getHome();
+        $this->id = 'home::' . $this->user->getUID();
 
-		try {
-			parent::__construct(array('datadir' => $datadir));
-		} catch (NotFoundException $e) {
-			if (file_exists(dirname($datadir))) {
-				mkdir($datadir);
-				parent::__construct(array('datadir' => $datadir));
-			} else {
-				throw $e;
-			}
-		}
-	}
+        try {
+            parent::__construct(array('datadir' => $datadir));
+        } catch (NotFoundException $e) {
+            if (file_exists(dirname($datadir))) {
+                mkdir($datadir);
+                parent::__construct(array('datadir' => $datadir));
+            } else {
+                throw $e;
+            }
+        }
+    }
 
-	public function getId() {
-		return $this->id;
-	}
+    public function getId() {
+        return $this->id;
+    }
 
-	/**
-	 * @return \OC\Files\Cache\HomeCache
-	 */
-	public function getCache($path = '', $storage = null) {
-		if (!$storage) {
-			$storage = $this;
-		}
-		if (!isset($this->cache)) {
-			$this->cache = new \OC\Files\Cache\HomeCache($storage);
-		}
-		return $this->cache;
-	}
+    /**
+     * @return \OC\Files\Cache\HomeCache
+     */
+    public function getCache($path = '', $storage = null) {
+        if (!$storage) {
+            $storage = $this;
+        }
+        if (!isset($this->cache)) {
+            $this->cache = new \OC\Files\Cache\HomeCache($storage);
+        }
+        return $this->cache;
+    }
 
-	/**
-	 * get a propagator instance for the cache
-	 *
-	 * @param \OC\Files\Storage\Storage (optional) the storage to pass to the watcher
-	 * @return \OC\Files\Cache\Propagator
-	 */
-	public function getPropagator($storage = null) {
-		if (!$storage) {
-			$storage = $this;
-		}
-		if (!isset($this->propagator)) {
-			$this->propagator = new HomePropagator($storage, \OC::$server->getDatabaseConnection());
-		}
-		return $this->propagator;
-	}
+    /**
+     * get a propagator instance for the cache
+     *
+     * @param \OC\Files\Storage\Storage (optional) the storage to pass to the watcher
+     * @return \OC\Files\Cache\Propagator
+     */
+    public function getPropagator($storage = null) {
+        if (!$storage) {
+            $storage = $this;
+        }
+        if (!isset($this->propagator)) {
+            $this->propagator = new HomePropagator($storage, \OC::$server->getDatabaseConnection());
+        }
+        return $this->propagator;
+    }
 
 
-	/**
-	 * Returns the owner of this home storage
-	 *
-	 * @return \OC\User\User owner of this home storage
-	 */
-	public function getUser() {
-		return $this->user;
-	}
+    /**
+     * Returns the owner of this home storage
+     *
+     * @return \OC\User\User owner of this home storage
+     */
+    public function getUser() {
+        return $this->user;
+    }
 
-	/**
-	 * get the owner of a path
-	 *
-	 * @param string $path The path to get the owner
-	 * @return string uid or false
-	 */
-	public function getOwner($path) {
-		return $this->user->getUID();
-	}
+    /**
+     * get the owner of a path
+     *
+     * @param string $path The path to get the owner
+     * @return string uid or false
+     */
+    public function getOwner($path) {
+        return $this->user->getUID();
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
 	public function __construct($arguments) {
 		$this->user = $arguments['user'];
 		$datadir = $this->user->getHome();
-		$this->id = 'home::' . $this->user->getUID();
+		$this->id = 'home::'.$this->user->getUID();
 
 		try {
 			parent::__construct(array('datadir' => $datadir));

lib/private/Files/Mount/MountPoint.php

Indentation +219 added lines, -219 removed lines

@@ -35,247 +35,247 @@
 use OCP\Files\Mount\IMountPoint;
 
 class MountPoint implements IMountPoint {
-	/**
-	 * @var \OC\Files\Storage\Storage $storage
-	 */
-	protected $storage = null;
-	protected $class;
-	protected $storageId;
-	protected $rootId = null;
+    /**
+     * @var \OC\Files\Storage\Storage $storage
+     */
+    protected $storage = null;
+    protected $class;
+    protected $storageId;
+    protected $rootId = null;
 
-	/**
-	 * Configuration options for the storage backend
-	 *
-	 * @var array
-	 */
-	protected $arguments = array();
-	protected $mountPoint;
+    /**
+     * Configuration options for the storage backend
+     *
+     * @var array
+     */
+    protected $arguments = array();
+    protected $mountPoint;
 
-	/**
-	 * Mount specific options
-	 *
-	 * @var array
-	 */
-	protected $mountOptions = array();
+    /**
+     * Mount specific options
+     *
+     * @var array
+     */
+    protected $mountOptions = array();
 
-	/**
-	 * @var \OC\Files\Storage\StorageFactory $loader
-	 */
-	private $loader;
+    /**
+     * @var \OC\Files\Storage\StorageFactory $loader
+     */
+    private $loader;
 
-	/**
-	 * Specified whether the storage is invalid after failing to
-	 * instantiate it.
-	 *
-	 * @var bool
-	 */
-	private $invalidStorage = false;
+    /**
+     * Specified whether the storage is invalid after failing to
+     * instantiate it.
+     *
+     * @var bool
+     */
+    private $invalidStorage = false;
 
-	/** @var int|null */
-	protected $mountId;
+    /** @var int|null */
+    protected $mountId;
 
-	/**
-	 * @param string|\OC\Files\Storage\Storage $storage
-	 * @param string $mountpoint
-	 * @param array $arguments (optional) configuration for the storage backend
-	 * @param \OCP\Files\Storage\IStorageFactory $loader
-	 * @param array $mountOptions mount specific options
-	 * @param int|null $mountId
-	 * @throws \Exception
-	 */
-	public function __construct($storage, $mountpoint, $arguments = null, $loader = null, $mountOptions = null, $mountId = null) {
-		if (is_null($arguments)) {
-			$arguments = array();
-		}
-		if (is_null($loader)) {
-			$this->loader = new StorageFactory();
-		} else {
-			$this->loader = $loader;
-		}
+    /**
+     * @param string|\OC\Files\Storage\Storage $storage
+     * @param string $mountpoint
+     * @param array $arguments (optional) configuration for the storage backend
+     * @param \OCP\Files\Storage\IStorageFactory $loader
+     * @param array $mountOptions mount specific options
+     * @param int|null $mountId
+     * @throws \Exception
+     */
+    public function __construct($storage, $mountpoint, $arguments = null, $loader = null, $mountOptions = null, $mountId = null) {
+        if (is_null($arguments)) {
+            $arguments = array();
+        }
+        if (is_null($loader)) {
+            $this->loader = new StorageFactory();
+        } else {
+            $this->loader = $loader;
+        }
 
-		if (!is_null($mountOptions)) {
-			$this->mountOptions = $mountOptions;
-		}
+        if (!is_null($mountOptions)) {
+            $this->mountOptions = $mountOptions;
+        }
 
-		$mountpoint = $this->formatPath($mountpoint);
-		$this->mountPoint = $mountpoint;
-		if ($storage instanceof Storage) {
-			$this->class = get_class($storage);
-			$this->storage = $this->loader->wrap($this, $storage);
-		} else {
-			// Update old classes to new namespace
-			if (strpos($storage, 'OC_Filestorage_') !== false) {
-				$storage = '\OC\Files\Storage\\' . substr($storage, 15);
-			}
-			$this->class = $storage;
-			$this->arguments = $arguments;
-		}
-		$this->mountId = $mountId;
-	}
+        $mountpoint = $this->formatPath($mountpoint);
+        $this->mountPoint = $mountpoint;
+        if ($storage instanceof Storage) {
+            $this->class = get_class($storage);
+            $this->storage = $this->loader->wrap($this, $storage);
+        } else {
+            // Update old classes to new namespace
+            if (strpos($storage, 'OC_Filestorage_') !== false) {
+                $storage = '\OC\Files\Storage\\' . substr($storage, 15);
+            }
+            $this->class = $storage;
+            $this->arguments = $arguments;
+        }
+        $this->mountId = $mountId;
+    }
 
-	/**
-	 * get complete path to the mount point, relative to data/
-	 *
-	 * @return string
-	 */
-	public function getMountPoint() {
-		return $this->mountPoint;
-	}
+    /**
+     * get complete path to the mount point, relative to data/
+     *
+     * @return string
+     */
+    public function getMountPoint() {
+        return $this->mountPoint;
+    }
 
-	/**
-	 * Sets the mount point path, relative to data/
-	 *
-	 * @param string $mountPoint new mount point
-	 */
-	public function setMountPoint($mountPoint) {
-		$this->mountPoint = $this->formatPath($mountPoint);
-	}
+    /**
+     * Sets the mount point path, relative to data/
+     *
+     * @param string $mountPoint new mount point
+     */
+    public function setMountPoint($mountPoint) {
+        $this->mountPoint = $this->formatPath($mountPoint);
+    }
 
-	/**
-	 * create the storage that is mounted
-	 */
-	private function createStorage() {
-		if ($this->invalidStorage) {
-			return;
-		}
+    /**
+     * create the storage that is mounted
+     */
+    private function createStorage() {
+        if ($this->invalidStorage) {
+            return;
+        }
 
-		if (class_exists($this->class)) {
-			try {
-				$class = $this->class;
-				// prevent recursion by setting the storage before applying wrappers
-				$this->storage = new $class($this->arguments);
-				$this->storage = $this->loader->wrap($this, $this->storage);
-			} catch (\Exception $exception) {
-				$this->storage = null;
-				$this->invalidStorage = true;
-				if ($this->mountPoint === '/') {
-					// the root storage could not be initialized, show the user!
-					throw new \Exception('The root storage could not be initialized. Please contact your local administrator.', $exception->getCode(), $exception);
-				} else {
-					\OC::$server->getLogger()->logException($exception, ['level' => \OCP\Util::ERROR]);
-				}
-				return;
-			}
-		} else {
-			\OCP\Util::writeLog('core', 'storage backend ' . $this->class . ' not found', \OCP\Util::ERROR);
-			$this->invalidStorage = true;
-			return;
-		}
-	}
+        if (class_exists($this->class)) {
+            try {
+                $class = $this->class;
+                // prevent recursion by setting the storage before applying wrappers
+                $this->storage = new $class($this->arguments);
+                $this->storage = $this->loader->wrap($this, $this->storage);
+            } catch (\Exception $exception) {
+                $this->storage = null;
+                $this->invalidStorage = true;
+                if ($this->mountPoint === '/') {
+                    // the root storage could not be initialized, show the user!
+                    throw new \Exception('The root storage could not be initialized. Please contact your local administrator.', $exception->getCode(), $exception);
+                } else {
+                    \OC::$server->getLogger()->logException($exception, ['level' => \OCP\Util::ERROR]);
+                }
+                return;
+            }
+        } else {
+            \OCP\Util::writeLog('core', 'storage backend ' . $this->class . ' not found', \OCP\Util::ERROR);
+            $this->invalidStorage = true;
+            return;
+        }
+    }
 
-	/**
-	 * @return \OC\Files\Storage\Storage
-	 */
-	public function getStorage() {
-		if (is_null($this->storage)) {
-			$this->createStorage();
-		}
-		return $this->storage;
-	}
+    /**
+     * @return \OC\Files\Storage\Storage
+     */
+    public function getStorage() {
+        if (is_null($this->storage)) {
+            $this->createStorage();
+        }
+        return $this->storage;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getStorageId() {
-		if (!$this->storageId) {
-			if (is_null($this->storage)) {
-				$storage = $this->createStorage(); //FIXME: start using exceptions
-				if (is_null($storage)) {
-					return null;
-				}
+    /**
+     * @return string
+     */
+    public function getStorageId() {
+        if (!$this->storageId) {
+            if (is_null($this->storage)) {
+                $storage = $this->createStorage(); //FIXME: start using exceptions
+                if (is_null($storage)) {
+                    return null;
+                }
 
-				$this->storage = $storage;
-			}
-			$this->storageId = $this->storage->getId();
-			if (strlen($this->storageId) > 64) {
-				$this->storageId = md5($this->storageId);
-			}
-		}
-		return $this->storageId;
-	}
+                $this->storage = $storage;
+            }
+            $this->storageId = $this->storage->getId();
+            if (strlen($this->storageId) > 64) {
+                $this->storageId = md5($this->storageId);
+            }
+        }
+        return $this->storageId;
+    }
 
-	/**
-	 * @return int
-	 */
-	public function getNumericStorageId() {
-		return $this->getStorage()->getStorageCache()->getNumericId();
-	}
+    /**
+     * @return int
+     */
+    public function getNumericStorageId() {
+        return $this->getStorage()->getStorageCache()->getNumericId();
+    }
 
-	/**
-	 * @param string $path
-	 * @return string
-	 */
-	public function getInternalPath($path) {
-		$path = Filesystem::normalizePath($path, true, false, true);
-		if ($this->mountPoint === $path or $this->mountPoint . '/' === $path) {
-			$internalPath = '';
-		} else {
-			$internalPath = substr($path, strlen($this->mountPoint));
-		}
-		// substr returns false instead of an empty string, we always want a string
-		return (string)$internalPath;
-	}
+    /**
+     * @param string $path
+     * @return string
+     */
+    public function getInternalPath($path) {
+        $path = Filesystem::normalizePath($path, true, false, true);
+        if ($this->mountPoint === $path or $this->mountPoint . '/' === $path) {
+            $internalPath = '';
+        } else {
+            $internalPath = substr($path, strlen($this->mountPoint));
+        }
+        // substr returns false instead of an empty string, we always want a string
+        return (string)$internalPath;
+    }
 
-	/**
-	 * @param string $path
-	 * @return string
-	 */
-	private function formatPath($path) {
-		$path = Filesystem::normalizePath($path);
-		if (strlen($path) > 1) {
-			$path .= '/';
-		}
-		return $path;
-	}
+    /**
+     * @param string $path
+     * @return string
+     */
+    private function formatPath($path) {
+        $path = Filesystem::normalizePath($path);
+        if (strlen($path) > 1) {
+            $path .= '/';
+        }
+        return $path;
+    }
 
-	/**
-	 * @param callable $wrapper
-	 */
-	public function wrapStorage($wrapper) {
-		$storage = $this->getStorage();
-		// storage can be null if it couldn't be initialized
-		if ($storage != null) {
-			$this->storage = $wrapper($this->mountPoint, $storage, $this);
-		}
-	}
+    /**
+     * @param callable $wrapper
+     */
+    public function wrapStorage($wrapper) {
+        $storage = $this->getStorage();
+        // storage can be null if it couldn't be initialized
+        if ($storage != null) {
+            $this->storage = $wrapper($this->mountPoint, $storage, $this);
+        }
+    }
 
-	/**
-	 * Get a mount option
-	 *
-	 * @param string $name Name of the mount option to get
-	 * @param mixed $default Default value for the mount option
-	 * @return mixed
-	 */
-	public function getOption($name, $default) {
-		return isset($this->mountOptions[$name]) ? $this->mountOptions[$name] : $default;
-	}
+    /**
+     * Get a mount option
+     *
+     * @param string $name Name of the mount option to get
+     * @param mixed $default Default value for the mount option
+     * @return mixed
+     */
+    public function getOption($name, $default) {
+        return isset($this->mountOptions[$name]) ? $this->mountOptions[$name] : $default;
+    }
 
-	/**
-	 * Get all options for the mount
-	 *
-	 * @return array
-	 */
-	public function getOptions() {
-		return $this->mountOptions;
-	}
+    /**
+     * Get all options for the mount
+     *
+     * @return array
+     */
+    public function getOptions() {
+        return $this->mountOptions;
+    }
 
-	/**
-	 * Get the file id of the root of the storage
-	 *
-	 * @return int
-	 */
-	public function getStorageRootId() {
-		if (is_null($this->rootId)) {
-			$this->rootId = (int)$this->getStorage()->getCache()->getId('');
-		}
-		return $this->rootId;
-	}
+    /**
+     * Get the file id of the root of the storage
+     *
+     * @return int
+     */
+    public function getStorageRootId() {
+        if (is_null($this->rootId)) {
+            $this->rootId = (int)$this->getStorage()->getCache()->getId('');
+        }
+        return $this->rootId;
+    }
 
-	public function getMountId() {
-		return $this->mountId;
-	}
+    public function getMountId() {
+        return $this->mountId;
+    }
 
-	public function getMountType() {
-		return '';
-	}
+    public function getMountType() {
+        return '';
+    }
 }

lib/private/App/CodeChecker/DeprecationCheck.php

Indentation +140 added lines, -140 removed lines

@@ -24,144 +24,144 @@
 namespace OC\App\CodeChecker;
 
 class DeprecationCheck extends AbstractCheck implements ICheck {
-	/**
-	 * @return string
-	 */
-	protected function getLocalDescription() {
-		return 'deprecated';
-	}
-
-	/**
-	 * @return array E.g.: `'ClassName' => 'oc version',`
-	 */
-	protected function getLocalClasses() {
-		return [
-			'OC_JSON' => '8.2.0',
-
-			'OCP\Contacts' => '8.1.0',
-			'OCP\DB' => '8.1.0',
-			'OCP\IHelper' => '8.1.0',
-			'OCP\JSON' => '8.1.0',
-			'OCP\Response' => '8.1.0',
-			'OCP\AppFramework\IApi' => '8.0.0',
-			'OCP\User' => '13.0.0',
-		];
-	}
-
-	/**
-	 * @return array E.g.: `'ClassName::CONSTANT_NAME' => 'oc version',`
-	 */
-	protected function getLocalConstants() {
-		return [
-			'OC_API::GUEST_AUTH' => '8.2.0',
-			'OC_API::USER_AUTH' => '8.2.0',
-			'OC_API::SUBADMIN_AUTH' => '8.2.0',
-			'OC_API::ADMIN_AUTH' => '8.2.0',
-			'OC_API::RESPOND_UNAUTHORISED' => '8.2.0',
-			'OC_API::RESPOND_SERVER_ERROR' => '8.2.0',
-			'OC_API::RESPOND_NOT_FOUND' => '8.2.0',
-			'OC_API::RESPOND_UNKNOWN_ERROR' => '8.2.0',
-
-			'OCP::PERMISSION_CREATE' => '8.0.0',
-			'OCP::PERMISSION_READ' => '8.0.0',
-			'OCP::PERMISSION_UPDATE' => '8.0.0',
-			'OCP::PERMISSION_DELETE' => '8.0.0',
-			'OCP::PERMISSION_SHARE' => '8.0.0',
-			'OCP::PERMISSION_ALL' => '8.0.0',
-			'OCP::FILENAME_INVALID_CHARS' => '8.0.0',
-		];
-	}
-
-	/**
-	 * @return array E.g.: `'functionName' => 'oc version',`
-	 */
-	protected function getLocalFunctions() {
-		return [
-			'OCP::image_path' => '8.0.0',
-			'OCP::mimetype_icon' => '8.0.0',
-			'OCP::preview_icon' => '8.0.0',
-			'OCP::publicPreview_icon' => '8.0.0',
-			'OCP::human_file_size' => '8.0.0',
-			'OCP::relative_modified_date' => '8.0.0',
-			'OCP::simple_file_size' => '8.0.0',
-			'OCP::html_select_options' => '8.0.0',
-		];
-	}
-
-	/**
-	 * @return array E.g.: `'ClassName::methodName' => 'oc version',`
-	 */
-	protected function getLocalMethods() {
-		return [
-			'OC_L10N::get' => '8.2.0',
-
-			'OCP\Activity\IManager::publishActivity' => '8.2.0',
-
-			'OCP\App::register' => '8.1.0',
-			'OCP\App::addNavigationEntry' => '8.1.0',
-			'OCP\App::getActiveNavigationEntry' => '8.2.0',
-			'OCP\App::setActiveNavigationEntry' => '8.1.0',
-
-			'OCP\AppFramework\Controller::params' => '7.0.0',
-			'OCP\AppFramework\Controller::getParams' => '7.0.0',
-			'OCP\AppFramework\Controller::method' => '7.0.0',
-			'OCP\AppFramework\Controller::getUploadedFile' => '7.0.0',
-			'OCP\AppFramework\Controller::env' => '7.0.0',
-			'OCP\AppFramework\Controller::cookie' => '7.0.0',
-			'OCP\AppFramework\Controller::render' => '7.0.0',
-
-			'OCP\AppFramework\IAppContainer::getCoreApi' => '8.0.0',
-			'OCP\AppFramework\IAppContainer::isLoggedIn' => '8.0.0',
-			'OCP\AppFramework\IAppContainer::isAdminUser' => '8.0.0',
-			'OCP\AppFramework\IAppContainer::log' => '8.0.0',
-
-			'OCP\BackgroundJob::registerJob' => '8.1.0',
-
-			'OCP\Files::tmpFile' => '8.1.0',
-			'OCP\Files::tmpFolder' => '8.1.0',
-
-			'OCP\IAppConfig::getValue' => '8.0.0',
-			'OCP\IAppConfig::deleteKey' => '8.0.0',
-			'OCP\IAppConfig::getKeys' => '8.0.0',
-			'OCP\IAppConfig::setValue' => '8.0.0',
-			'OCP\IAppConfig::deleteApp' => '8.0.0',
-
-			'OCP\IDBConnection::createQueryBuilder' => '8.2.0',
-			'OCP\IDBConnection::getExpressionBuilder' => '8.2.0',
-
-			'OCP\ISearch::search' => '8.0.0',
-
-			'OCP\IServerContainer::getCache' => '8.2.0',
-			'OCP\IServerContainer::getDb' => '8.1.0',
-			'OCP\IServerContainer::getHTTPHelper' => '8.1.0',
-
-			'OCP\User::getUser' => '8.0.0',
-			'OCP\User::getUsers' => '8.1.0',
-			'OCP\User::getDisplayName' => '8.1.0',
-			'OCP\User::getDisplayNames' => '8.1.0',
-			'OCP\User::userExists' => '8.1.0',
-			'OCP\User::logout' => '8.1.0',
-			'OCP\User::checkPassword' => '8.1.0',
-			'OCP\User::isLoggedIn' => '13.0.0',
-			'OCP\User::checkAdminUser' => '13.0.0',
-			'OCP\User::checkLoggedIn' => '13.0.0',
-
-			'OCP\Util::encryptedFiles' => '8.1.0',
-			'OCP\Util::formatDate' => '8.0.0',
-			'OCP\Util::generateRandomBytes' => '8.1.0',
-			'OCP\Util::getServerHost' => '8.1.0',
-			'OCP\Util::getServerProtocol' => '8.1.0',
-			'OCP\Util::getRequestUri' => '8.1.0',
-			'OCP\Util::getScriptName' => '8.1.0',
-			'OCP\Util::imagePath' => '8.1.0',
-			'OCP\Util::isValidFileName' => '8.1.0',
-			'OCP\Util::linkToRoute' => '8.1.0',
-			'OCP\Util::linkTo' => '8.1.0',
-			'OCP\Util::logException' => '8.2.0',
-			'OCP\Util::mb_str_replace' => '8.2.0',
-			'OCP\Util::mb_substr_replace' => '8.2.0',
-			'OCP\Util::sendMail' => '8.1.0',
-			'OCP\Util::writeLog' => '13.0.0',
-		];
-	}
+    /**
+     * @return string
+     */
+    protected function getLocalDescription() {
+        return 'deprecated';
+    }
+
+    /**
+     * @return array E.g.: `'ClassName' => 'oc version',`
+     */
+    protected function getLocalClasses() {
+        return [
+            'OC_JSON' => '8.2.0',
+
+            'OCP\Contacts' => '8.1.0',
+            'OCP\DB' => '8.1.0',
+            'OCP\IHelper' => '8.1.0',
+            'OCP\JSON' => '8.1.0',
+            'OCP\Response' => '8.1.0',
+            'OCP\AppFramework\IApi' => '8.0.0',
+            'OCP\User' => '13.0.0',
+        ];
+    }
+
+    /**
+     * @return array E.g.: `'ClassName::CONSTANT_NAME' => 'oc version',`
+     */
+    protected function getLocalConstants() {
+        return [
+            'OC_API::GUEST_AUTH' => '8.2.0',
+            'OC_API::USER_AUTH' => '8.2.0',
+            'OC_API::SUBADMIN_AUTH' => '8.2.0',
+            'OC_API::ADMIN_AUTH' => '8.2.0',
+            'OC_API::RESPOND_UNAUTHORISED' => '8.2.0',
+            'OC_API::RESPOND_SERVER_ERROR' => '8.2.0',
+            'OC_API::RESPOND_NOT_FOUND' => '8.2.0',
+            'OC_API::RESPOND_UNKNOWN_ERROR' => '8.2.0',
+
+            'OCP::PERMISSION_CREATE' => '8.0.0',
+            'OCP::PERMISSION_READ' => '8.0.0',
+            'OCP::PERMISSION_UPDATE' => '8.0.0',
+            'OCP::PERMISSION_DELETE' => '8.0.0',
+            'OCP::PERMISSION_SHARE' => '8.0.0',
+            'OCP::PERMISSION_ALL' => '8.0.0',
+            'OCP::FILENAME_INVALID_CHARS' => '8.0.0',
+        ];
+    }
+
+    /**
+     * @return array E.g.: `'functionName' => 'oc version',`
+     */
+    protected function getLocalFunctions() {
+        return [
+            'OCP::image_path' => '8.0.0',
+            'OCP::mimetype_icon' => '8.0.0',
+            'OCP::preview_icon' => '8.0.0',
+            'OCP::publicPreview_icon' => '8.0.0',
+            'OCP::human_file_size' => '8.0.0',
+            'OCP::relative_modified_date' => '8.0.0',
+            'OCP::simple_file_size' => '8.0.0',
+            'OCP::html_select_options' => '8.0.0',
+        ];
+    }
+
+    /**
+     * @return array E.g.: `'ClassName::methodName' => 'oc version',`
+     */
+    protected function getLocalMethods() {
+        return [
+            'OC_L10N::get' => '8.2.0',
+
+            'OCP\Activity\IManager::publishActivity' => '8.2.0',
+
+            'OCP\App::register' => '8.1.0',
+            'OCP\App::addNavigationEntry' => '8.1.0',
+            'OCP\App::getActiveNavigationEntry' => '8.2.0',
+            'OCP\App::setActiveNavigationEntry' => '8.1.0',
+
+            'OCP\AppFramework\Controller::params' => '7.0.0',
+            'OCP\AppFramework\Controller::getParams' => '7.0.0',
+            'OCP\AppFramework\Controller::method' => '7.0.0',
+            'OCP\AppFramework\Controller::getUploadedFile' => '7.0.0',
+            'OCP\AppFramework\Controller::env' => '7.0.0',
+            'OCP\AppFramework\Controller::cookie' => '7.0.0',
+            'OCP\AppFramework\Controller::render' => '7.0.0',
+
+            'OCP\AppFramework\IAppContainer::getCoreApi' => '8.0.0',
+            'OCP\AppFramework\IAppContainer::isLoggedIn' => '8.0.0',
+            'OCP\AppFramework\IAppContainer::isAdminUser' => '8.0.0',
+            'OCP\AppFramework\IAppContainer::log' => '8.0.0',
+
+            'OCP\BackgroundJob::registerJob' => '8.1.0',
+
+            'OCP\Files::tmpFile' => '8.1.0',
+            'OCP\Files::tmpFolder' => '8.1.0',
+
+            'OCP\IAppConfig::getValue' => '8.0.0',
+            'OCP\IAppConfig::deleteKey' => '8.0.0',
+            'OCP\IAppConfig::getKeys' => '8.0.0',
+            'OCP\IAppConfig::setValue' => '8.0.0',
+            'OCP\IAppConfig::deleteApp' => '8.0.0',
+
+            'OCP\IDBConnection::createQueryBuilder' => '8.2.0',
+            'OCP\IDBConnection::getExpressionBuilder' => '8.2.0',
+
+            'OCP\ISearch::search' => '8.0.0',
+
+            'OCP\IServerContainer::getCache' => '8.2.0',
+            'OCP\IServerContainer::getDb' => '8.1.0',
+            'OCP\IServerContainer::getHTTPHelper' => '8.1.0',
+
+            'OCP\User::getUser' => '8.0.0',
+            'OCP\User::getUsers' => '8.1.0',
+            'OCP\User::getDisplayName' => '8.1.0',
+            'OCP\User::getDisplayNames' => '8.1.0',
+            'OCP\User::userExists' => '8.1.0',
+            'OCP\User::logout' => '8.1.0',
+            'OCP\User::checkPassword' => '8.1.0',
+            'OCP\User::isLoggedIn' => '13.0.0',
+            'OCP\User::checkAdminUser' => '13.0.0',
+            'OCP\User::checkLoggedIn' => '13.0.0',
+
+            'OCP\Util::encryptedFiles' => '8.1.0',
+            'OCP\Util::formatDate' => '8.0.0',
+            'OCP\Util::generateRandomBytes' => '8.1.0',
+            'OCP\Util::getServerHost' => '8.1.0',
+            'OCP\Util::getServerProtocol' => '8.1.0',
+            'OCP\Util::getRequestUri' => '8.1.0',
+            'OCP\Util::getScriptName' => '8.1.0',
+            'OCP\Util::imagePath' => '8.1.0',
+            'OCP\Util::isValidFileName' => '8.1.0',
+            'OCP\Util::linkToRoute' => '8.1.0',
+            'OCP\Util::linkTo' => '8.1.0',
+            'OCP\Util::logException' => '8.2.0',
+            'OCP\Util::mb_str_replace' => '8.2.0',
+            'OCP\Util::mb_substr_replace' => '8.2.0',
+            'OCP\Util::sendMail' => '8.1.0',
+            'OCP\Util::writeLog' => '13.0.0',
+        ];
+    }
 }

lib/private/Files/Storage/Local.php

Indentation +417 added lines, -417 removed lines

@@ -48,421 +48,421 @@
  * for local filestore, we only have to map the paths
  */
 class Local extends \OC\Files\Storage\Common {
-	protected $datadir;
-
-	protected $dataDirLength;
-
-	protected $allowSymlinks = false;
-
-	protected $realDataDir;
-
-	public function __construct($arguments) {
-		if (!isset($arguments['datadir']) || !is_string($arguments['datadir'])) {
-			throw new \InvalidArgumentException('No data directory set for local storage');
-		}
-		$this->datadir = $arguments['datadir'];
-		// some crazy code uses a local storage on root...
-		if ($this->datadir === '/') {
-			$this->realDataDir = $this->datadir;
-		} else {
-			$realPath = realpath($this->datadir);
-			if (!$realPath) {
-				throw new NotFoundException('Data directory not found: ' . $this->datadir);
-			}
-			$this->realDataDir = rtrim($realPath, '/') . '/';
-		}
-		if (substr($this->datadir, -1) !== '/') {
-			$this->datadir .= '/';
-		}
-		$this->dataDirLength = strlen($this->realDataDir);
-	}
-
-	public function __destruct() {
-	}
-
-	public function getId() {
-		return 'local::' . $this->datadir;
-	}
-
-	public function mkdir($path) {
-		return @mkdir($this->getSourcePath($path), 0777, true);
-	}
-
-	public function rmdir($path) {
-		if (!$this->isDeletable($path)) {
-			return false;
-		}
-		try {
-			$it = new \RecursiveIteratorIterator(
-				new \RecursiveDirectoryIterator($this->getSourcePath($path)),
-				\RecursiveIteratorIterator::CHILD_FIRST
-			);
-			/**
-			 * RecursiveDirectoryIterator on an NFS path isn't iterable with foreach
-			 * This bug is fixed in PHP 5.5.9 or before
-			 * See #8376
-			 */
-			$it->rewind();
-			while ($it->valid()) {
-				/**
-				 * @var \SplFileInfo $file
-				 */
-				$file = $it->current();
-				if (in_array($file->getBasename(), array('.', '..'))) {
-					$it->next();
-					continue;
-				} elseif ($file->isDir()) {
-					rmdir($file->getPathname());
-				} elseif ($file->isFile() || $file->isLink()) {
-					unlink($file->getPathname());
-				}
-				$it->next();
-			}
-			return rmdir($this->getSourcePath($path));
-		} catch (\UnexpectedValueException $e) {
-			return false;
-		}
-	}
-
-	public function opendir($path) {
-		return opendir($this->getSourcePath($path));
-	}
-
-	public function is_dir($path) {
-		if (substr($path, -1) == '/') {
-			$path = substr($path, 0, -1);
-		}
-		return is_dir($this->getSourcePath($path));
-	}
-
-	public function is_file($path) {
-		return is_file($this->getSourcePath($path));
-	}
-
-	public function stat($path) {
-		clearstatcache();
-		$fullPath = $this->getSourcePath($path);
-		$statResult = stat($fullPath);
-		if (PHP_INT_SIZE === 4 && !$this->is_dir($path)) {
-			$filesize = $this->filesize($path);
-			$statResult['size'] = $filesize;
-			$statResult[7] = $filesize;
-		}
-		return $statResult;
-	}
-
-	public function filetype($path) {
-		$filetype = filetype($this->getSourcePath($path));
-		if ($filetype == 'link') {
-			$filetype = filetype(realpath($this->getSourcePath($path)));
-		}
-		return $filetype;
-	}
-
-	public function filesize($path) {
-		if ($this->is_dir($path)) {
-			return 0;
-		}
-		$fullPath = $this->getSourcePath($path);
-		if (PHP_INT_SIZE === 4) {
-			$helper = new \OC\LargeFileHelper;
-			return $helper->getFileSize($fullPath);
-		}
-		return filesize($fullPath);
-	}
-
-	public function isReadable($path) {
-		return is_readable($this->getSourcePath($path));
-	}
-
-	public function isUpdatable($path) {
-		return is_writable($this->getSourcePath($path));
-	}
-
-	public function file_exists($path) {
-		return file_exists($this->getSourcePath($path));
-	}
-
-	public function filemtime($path) {
-		$fullPath = $this->getSourcePath($path);
-		clearstatcache(true, $fullPath);
-		if (!$this->file_exists($path)) {
-			return false;
-		}
-		if (PHP_INT_SIZE === 4) {
-			$helper = new \OC\LargeFileHelper();
-			return $helper->getFileMtime($fullPath);
-		}
-		return filemtime($fullPath);
-	}
-
-	public function touch($path, $mtime = null) {
-		// sets the modification time of the file to the given value.
-		// If mtime is nil the current time is set.
-		// note that the access time of the file always changes to the current time.
-		if ($this->file_exists($path) and !$this->isUpdatable($path)) {
-			return false;
-		}
-		if (!is_null($mtime)) {
-			$result = touch($this->getSourcePath($path), $mtime);
-		} else {
-			$result = touch($this->getSourcePath($path));
-		}
-		if ($result) {
-			clearstatcache(true, $this->getSourcePath($path));
-		}
-
-		return $result;
-	}
-
-	public function file_get_contents($path) {
-		return file_get_contents($this->getSourcePath($path));
-	}
-
-	public function file_put_contents($path, $data) {
-		return file_put_contents($this->getSourcePath($path), $data);
-	}
-
-	public function unlink($path) {
-		if ($this->is_dir($path)) {
-			return $this->rmdir($path);
-		} else if ($this->is_file($path)) {
-			return unlink($this->getSourcePath($path));
-		} else {
-			return false;
-		}
-
-	}
-
-	public function rename($path1, $path2) {
-		$srcParent = dirname($path1);
-		$dstParent = dirname($path2);
-
-		if (!$this->isUpdatable($srcParent)) {
-			\OCP\Util::writeLog('core', 'unable to rename, source directory is not writable : ' . $srcParent, \OCP\Util::ERROR);
-			return false;
-		}
-
-		if (!$this->isUpdatable($dstParent)) {
-			\OCP\Util::writeLog('core', 'unable to rename, destination directory is not writable : ' . $dstParent, \OCP\Util::ERROR);
-			return false;
-		}
-
-		if (!$this->file_exists($path1)) {
-			\OCP\Util::writeLog('core', 'unable to rename, file does not exists : ' . $path1, \OCP\Util::ERROR);
-			return false;
-		}
-
-		if ($this->is_dir($path2)) {
-			$this->rmdir($path2);
-		} else if ($this->is_file($path2)) {
-			$this->unlink($path2);
-		}
-
-		if ($this->is_dir($path1)) {
-			// we can't move folders across devices, use copy instead
-			$stat1 = stat(dirname($this->getSourcePath($path1)));
-			$stat2 = stat(dirname($this->getSourcePath($path2)));
-			if ($stat1['dev'] !== $stat2['dev']) {
-				$result = $this->copy($path1, $path2);
-				if ($result) {
-					$result &= $this->rmdir($path1);
-				}
-				return $result;
-			}
-		}
-
-		return rename($this->getSourcePath($path1), $this->getSourcePath($path2));
-	}
-
-	public function copy($path1, $path2) {
-		if ($this->is_dir($path1)) {
-			return parent::copy($path1, $path2);
-		} else {
-			return copy($this->getSourcePath($path1), $this->getSourcePath($path2));
-		}
-	}
-
-	public function fopen($path, $mode) {
-		return fopen($this->getSourcePath($path), $mode);
-	}
-
-	public function hash($type, $path, $raw = false) {
-		return hash_file($type, $this->getSourcePath($path), $raw);
-	}
-
-	public function free_space($path) {
-		$sourcePath = $this->getSourcePath($path);
-		// using !is_dir because $sourcePath might be a part file or
-		// non-existing file, so we'd still want to use the parent dir
-		// in such cases
-		if (!is_dir($sourcePath)) {
-			// disk_free_space doesn't work on files
-			$sourcePath = dirname($sourcePath);
-		}
-		$space = @disk_free_space($sourcePath);
-		if ($space === false || is_null($space)) {
-			return \OCP\Files\FileInfo::SPACE_UNKNOWN;
-		}
-		return $space;
-	}
-
-	public function search($query) {
-		return $this->searchInDir($query);
-	}
-
-	public function getLocalFile($path) {
-		return $this->getSourcePath($path);
-	}
-
-	public function getLocalFolder($path) {
-		return $this->getSourcePath($path);
-	}
-
-	/**
-	 * @param string $query
-	 * @param string $dir
-	 * @return array
-	 */
-	protected function searchInDir($query, $dir = '') {
-		$files = array();
-		$physicalDir = $this->getSourcePath($dir);
-		foreach (scandir($physicalDir) as $item) {
-			if (\OC\Files\Filesystem::isIgnoredDir($item))
-				continue;
-			$physicalItem = $physicalDir . '/' . $item;
-
-			if (strstr(strtolower($item), strtolower($query)) !== false) {
-				$files[] = $dir . '/' . $item;
-			}
-			if (is_dir($physicalItem)) {
-				$files = array_merge($files, $this->searchInDir($query, $dir . '/' . $item));
-			}
-		}
-		return $files;
-	}
-
-	/**
-	 * check if a file or folder has been updated since $time
-	 *
-	 * @param string $path
-	 * @param int $time
-	 * @return bool
-	 */
-	public function hasUpdated($path, $time) {
-		if ($this->file_exists($path)) {
-			return $this->filemtime($path) > $time;
-		} else {
-			return true;
-		}
-	}
-
-	/**
-	 * Get the source path (on disk) of a given path
-	 *
-	 * @param string $path
-	 * @return string
-	 * @throws ForbiddenException
-	 */
-	public function getSourcePath($path) {
-		$fullPath = $this->datadir . $path;
-		$currentPath = $path;
-		if ($this->allowSymlinks || $currentPath === '') {
-			return $fullPath;
-		}
-		$pathToResolve = $fullPath;
-		$realPath = realpath($pathToResolve);
-		while ($realPath === false) { // for non existing files check the parent directory
-			$currentPath = dirname($currentPath);
-			if ($realPath === '' || $realPath === '.') {
-				return $fullPath;
-			}
-			$realPath = realpath($this->datadir . $currentPath);
-		}
-		if ($realPath) {
-			$realPath = $realPath . '/';
-		}
-		if (substr($realPath, 0, $this->dataDirLength) === $this->realDataDir) {
-			return $fullPath;
-		}
-
-		\OCP\Util::writeLog('core', "Following symlinks is not allowed ('$fullPath' -> '$realPath' not inside '{$this->realDataDir}')", \OCP\Util::ERROR);
-		throw new ForbiddenException('Following symlinks is not allowed', false);
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function isLocal() {
-		return true;
-	}
-
-	/**
-	 * get the ETag for a file or folder
-	 *
-	 * @param string $path
-	 * @return string
-	 */
-	public function getETag($path) {
-		if ($this->is_file($path)) {
-			$stat = $this->stat($path);
-			return md5(
-				$stat['mtime'] .
-				$stat['ino'] .
-				$stat['dev'] .
-				$stat['size']
-			);
-		} else {
-			return parent::getETag($path);
-		}
-	}
-
-	/**
-	 * @param IStorage $sourceStorage
-	 * @param string $sourceInternalPath
-	 * @param string $targetInternalPath
-	 * @param bool $preserveMtime
-	 * @return bool
-	 */
-	public function copyFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath, $preserveMtime = false) {
-		if ($sourceStorage->instanceOfStorage(Local::class)) {
-			if ($sourceStorage->instanceOfStorage(Jail::class)) {
-				/**
-				 * @var \OC\Files\Storage\Wrapper\Jail $sourceStorage
-				 */
-				$sourceInternalPath = $sourceStorage->getUnjailedPath($sourceInternalPath);
-			}
-			/**
-			 * @var \OC\Files\Storage\Local $sourceStorage
-			 */
-			$rootStorage = new Local(['datadir' => '/']);
-			return $rootStorage->copy($sourceStorage->getSourcePath($sourceInternalPath), $this->getSourcePath($targetInternalPath));
-		} else {
-			return parent::copyFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath);
-		}
-	}
-
-	/**
-	 * @param IStorage $sourceStorage
-	 * @param string $sourceInternalPath
-	 * @param string $targetInternalPath
-	 * @return bool
-	 */
-	public function moveFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath) {
-		if ($sourceStorage->instanceOfStorage(Local::class)) {
-			if ($sourceStorage->instanceOfStorage(Jail::class)) {
-				/**
-				 * @var \OC\Files\Storage\Wrapper\Jail $sourceStorage
-				 */
-				$sourceInternalPath = $sourceStorage->getUnjailedPath($sourceInternalPath);
-			}
-			/**
-			 * @var \OC\Files\Storage\Local $sourceStorage
-			 */
-			$rootStorage = new Local(['datadir' => '/']);
-			return $rootStorage->rename($sourceStorage->getSourcePath($sourceInternalPath), $this->getSourcePath($targetInternalPath));
-		} else {
-			return parent::moveFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath);
-		}
-	}
+    protected $datadir;
+
+    protected $dataDirLength;
+
+    protected $allowSymlinks = false;
+
+    protected $realDataDir;
+
+    public function __construct($arguments) {
+        if (!isset($arguments['datadir']) || !is_string($arguments['datadir'])) {
+            throw new \InvalidArgumentException('No data directory set for local storage');
+        }
+        $this->datadir = $arguments['datadir'];
+        // some crazy code uses a local storage on root...
+        if ($this->datadir === '/') {
+            $this->realDataDir = $this->datadir;
+        } else {
+            $realPath = realpath($this->datadir);
+            if (!$realPath) {
+                throw new NotFoundException('Data directory not found: ' . $this->datadir);
+            }
+            $this->realDataDir = rtrim($realPath, '/') . '/';
+        }
+        if (substr($this->datadir, -1) !== '/') {
+            $this->datadir .= '/';
+        }
+        $this->dataDirLength = strlen($this->realDataDir);
+    }
+
+    public function __destruct() {
+    }
+
+    public function getId() {
+        return 'local::' . $this->datadir;
+    }
+
+    public function mkdir($path) {
+        return @mkdir($this->getSourcePath($path), 0777, true);
+    }
+
+    public function rmdir($path) {
+        if (!$this->isDeletable($path)) {
+            return false;
+        }
+        try {
+            $it = new \RecursiveIteratorIterator(
+                new \RecursiveDirectoryIterator($this->getSourcePath($path)),
+                \RecursiveIteratorIterator::CHILD_FIRST
+            );
+            /**
+             * RecursiveDirectoryIterator on an NFS path isn't iterable with foreach
+             * This bug is fixed in PHP 5.5.9 or before
+             * See #8376
+             */
+            $it->rewind();
+            while ($it->valid()) {
+                /**
+                 * @var \SplFileInfo $file
+                 */
+                $file = $it->current();
+                if (in_array($file->getBasename(), array('.', '..'))) {
+                    $it->next();
+                    continue;
+                } elseif ($file->isDir()) {
+                    rmdir($file->getPathname());
+                } elseif ($file->isFile() || $file->isLink()) {
+                    unlink($file->getPathname());
+                }
+                $it->next();
+            }
+            return rmdir($this->getSourcePath($path));
+        } catch (\UnexpectedValueException $e) {
+            return false;
+        }
+    }
+
+    public function opendir($path) {
+        return opendir($this->getSourcePath($path));
+    }
+
+    public function is_dir($path) {
+        if (substr($path, -1) == '/') {
+            $path = substr($path, 0, -1);
+        }
+        return is_dir($this->getSourcePath($path));
+    }
+
+    public function is_file($path) {
+        return is_file($this->getSourcePath($path));
+    }
+
+    public function stat($path) {
+        clearstatcache();
+        $fullPath = $this->getSourcePath($path);
+        $statResult = stat($fullPath);
+        if (PHP_INT_SIZE === 4 && !$this->is_dir($path)) {
+            $filesize = $this->filesize($path);
+            $statResult['size'] = $filesize;
+            $statResult[7] = $filesize;
+        }
+        return $statResult;
+    }
+
+    public function filetype($path) {
+        $filetype = filetype($this->getSourcePath($path));
+        if ($filetype == 'link') {
+            $filetype = filetype(realpath($this->getSourcePath($path)));
+        }
+        return $filetype;
+    }
+
+    public function filesize($path) {
+        if ($this->is_dir($path)) {
+            return 0;
+        }
+        $fullPath = $this->getSourcePath($path);
+        if (PHP_INT_SIZE === 4) {
+            $helper = new \OC\LargeFileHelper;
+            return $helper->getFileSize($fullPath);
+        }
+        return filesize($fullPath);
+    }
+
+    public function isReadable($path) {
+        return is_readable($this->getSourcePath($path));
+    }
+
+    public function isUpdatable($path) {
+        return is_writable($this->getSourcePath($path));
+    }
+
+    public function file_exists($path) {
+        return file_exists($this->getSourcePath($path));
+    }
+
+    public function filemtime($path) {
+        $fullPath = $this->getSourcePath($path);
+        clearstatcache(true, $fullPath);
+        if (!$this->file_exists($path)) {
+            return false;
+        }
+        if (PHP_INT_SIZE === 4) {
+            $helper = new \OC\LargeFileHelper();
+            return $helper->getFileMtime($fullPath);
+        }
+        return filemtime($fullPath);
+    }
+
+    public function touch($path, $mtime = null) {
+        // sets the modification time of the file to the given value.
+        // If mtime is nil the current time is set.
+        // note that the access time of the file always changes to the current time.
+        if ($this->file_exists($path) and !$this->isUpdatable($path)) {
+            return false;
+        }
+        if (!is_null($mtime)) {
+            $result = touch($this->getSourcePath($path), $mtime);
+        } else {
+            $result = touch($this->getSourcePath($path));
+        }
+        if ($result) {
+            clearstatcache(true, $this->getSourcePath($path));
+        }
+
+        return $result;
+    }
+
+    public function file_get_contents($path) {
+        return file_get_contents($this->getSourcePath($path));
+    }
+
+    public function file_put_contents($path, $data) {
+        return file_put_contents($this->getSourcePath($path), $data);
+    }
+
+    public function unlink($path) {
+        if ($this->is_dir($path)) {
+            return $this->rmdir($path);
+        } else if ($this->is_file($path)) {
+            return unlink($this->getSourcePath($path));
+        } else {
+            return false;
+        }
+
+    }
+
+    public function rename($path1, $path2) {
+        $srcParent = dirname($path1);
+        $dstParent = dirname($path2);
+
+        if (!$this->isUpdatable($srcParent)) {
+            \OCP\Util::writeLog('core', 'unable to rename, source directory is not writable : ' . $srcParent, \OCP\Util::ERROR);
+            return false;
+        }
+
+        if (!$this->isUpdatable($dstParent)) {
+            \OCP\Util::writeLog('core', 'unable to rename, destination directory is not writable : ' . $dstParent, \OCP\Util::ERROR);
+            return false;
+        }
+
+        if (!$this->file_exists($path1)) {
+            \OCP\Util::writeLog('core', 'unable to rename, file does not exists : ' . $path1, \OCP\Util::ERROR);
+            return false;
+        }
+
+        if ($this->is_dir($path2)) {
+            $this->rmdir($path2);
+        } else if ($this->is_file($path2)) {
+            $this->unlink($path2);
+        }
+
+        if ($this->is_dir($path1)) {
+            // we can't move folders across devices, use copy instead
+            $stat1 = stat(dirname($this->getSourcePath($path1)));
+            $stat2 = stat(dirname($this->getSourcePath($path2)));
+            if ($stat1['dev'] !== $stat2['dev']) {
+                $result = $this->copy($path1, $path2);
+                if ($result) {
+                    $result &= $this->rmdir($path1);
+                }
+                return $result;
+            }
+        }
+
+        return rename($this->getSourcePath($path1), $this->getSourcePath($path2));
+    }
+
+    public function copy($path1, $path2) {
+        if ($this->is_dir($path1)) {
+            return parent::copy($path1, $path2);
+        } else {
+            return copy($this->getSourcePath($path1), $this->getSourcePath($path2));
+        }
+    }
+
+    public function fopen($path, $mode) {
+        return fopen($this->getSourcePath($path), $mode);
+    }
+
+    public function hash($type, $path, $raw = false) {
+        return hash_file($type, $this->getSourcePath($path), $raw);
+    }
+
+    public function free_space($path) {
+        $sourcePath = $this->getSourcePath($path);
+        // using !is_dir because $sourcePath might be a part file or
+        // non-existing file, so we'd still want to use the parent dir
+        // in such cases
+        if (!is_dir($sourcePath)) {
+            // disk_free_space doesn't work on files
+            $sourcePath = dirname($sourcePath);
+        }
+        $space = @disk_free_space($sourcePath);
+        if ($space === false || is_null($space)) {
+            return \OCP\Files\FileInfo::SPACE_UNKNOWN;
+        }
+        return $space;
+    }
+
+    public function search($query) {
+        return $this->searchInDir($query);
+    }
+
+    public function getLocalFile($path) {
+        return $this->getSourcePath($path);
+    }
+
+    public function getLocalFolder($path) {
+        return $this->getSourcePath($path);
+    }
+
+    /**
+     * @param string $query
+     * @param string $dir
+     * @return array
+     */
+    protected function searchInDir($query, $dir = '') {
+        $files = array();
+        $physicalDir = $this->getSourcePath($dir);
+        foreach (scandir($physicalDir) as $item) {
+            if (\OC\Files\Filesystem::isIgnoredDir($item))
+                continue;
+            $physicalItem = $physicalDir . '/' . $item;
+
+            if (strstr(strtolower($item), strtolower($query)) !== false) {
+                $files[] = $dir . '/' . $item;
+            }
+            if (is_dir($physicalItem)) {
+                $files = array_merge($files, $this->searchInDir($query, $dir . '/' . $item));
+            }
+        }
+        return $files;
+    }
+
+    /**
+     * check if a file or folder has been updated since $time
+     *
+     * @param string $path
+     * @param int $time
+     * @return bool
+     */
+    public function hasUpdated($path, $time) {
+        if ($this->file_exists($path)) {
+            return $this->filemtime($path) > $time;
+        } else {
+            return true;
+        }
+    }
+
+    /**
+     * Get the source path (on disk) of a given path
+     *
+     * @param string $path
+     * @return string
+     * @throws ForbiddenException
+     */
+    public function getSourcePath($path) {
+        $fullPath = $this->datadir . $path;
+        $currentPath = $path;
+        if ($this->allowSymlinks || $currentPath === '') {
+            return $fullPath;
+        }
+        $pathToResolve = $fullPath;
+        $realPath = realpath($pathToResolve);
+        while ($realPath === false) { // for non existing files check the parent directory
+            $currentPath = dirname($currentPath);
+            if ($realPath === '' || $realPath === '.') {
+                return $fullPath;
+            }
+            $realPath = realpath($this->datadir . $currentPath);
+        }
+        if ($realPath) {
+            $realPath = $realPath . '/';
+        }
+        if (substr($realPath, 0, $this->dataDirLength) === $this->realDataDir) {
+            return $fullPath;
+        }
+
+        \OCP\Util::writeLog('core', "Following symlinks is not allowed ('$fullPath' -> '$realPath' not inside '{$this->realDataDir}')", \OCP\Util::ERROR);
+        throw new ForbiddenException('Following symlinks is not allowed', false);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isLocal() {
+        return true;
+    }
+
+    /**
+     * get the ETag for a file or folder
+     *
+     * @param string $path
+     * @return string
+     */
+    public function getETag($path) {
+        if ($this->is_file($path)) {
+            $stat = $this->stat($path);
+            return md5(
+                $stat['mtime'] .
+                $stat['ino'] .
+                $stat['dev'] .
+                $stat['size']
+            );
+        } else {
+            return parent::getETag($path);
+        }
+    }
+
+    /**
+     * @param IStorage $sourceStorage
+     * @param string $sourceInternalPath
+     * @param string $targetInternalPath
+     * @param bool $preserveMtime
+     * @return bool
+     */
+    public function copyFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath, $preserveMtime = false) {
+        if ($sourceStorage->instanceOfStorage(Local::class)) {
+            if ($sourceStorage->instanceOfStorage(Jail::class)) {
+                /**
+                 * @var \OC\Files\Storage\Wrapper\Jail $sourceStorage
+                 */
+                $sourceInternalPath = $sourceStorage->getUnjailedPath($sourceInternalPath);
+            }
+            /**
+             * @var \OC\Files\Storage\Local $sourceStorage
+             */
+            $rootStorage = new Local(['datadir' => '/']);
+            return $rootStorage->copy($sourceStorage->getSourcePath($sourceInternalPath), $this->getSourcePath($targetInternalPath));
+        } else {
+            return parent::copyFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath);
+        }
+    }
+
+    /**
+     * @param IStorage $sourceStorage
+     * @param string $sourceInternalPath
+     * @param string $targetInternalPath
+     * @return bool
+     */
+    public function moveFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath) {
+        if ($sourceStorage->instanceOfStorage(Local::class)) {
+            if ($sourceStorage->instanceOfStorage(Jail::class)) {
+                /**
+                 * @var \OC\Files\Storage\Wrapper\Jail $sourceStorage
+                 */
+                $sourceInternalPath = $sourceStorage->getUnjailedPath($sourceInternalPath);
+            }
+            /**
+             * @var \OC\Files\Storage\Local $sourceStorage
+             */
+            $rootStorage = new Local(['datadir' => '/']);
+            return $rootStorage->rename($sourceStorage->getSourcePath($sourceInternalPath), $this->getSourcePath($targetInternalPath));
+        } else {
+            return parent::moveFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath);
+        }
+    }
 }

Spacing +15 added lines, -15 removed lines

@@ -67,9 +67,9 @@ 
 		} else {
 			$realPath = realpath($this->datadir);
 			if (!$realPath) {
-				throw new NotFoundException('Data directory not found: ' . $this->datadir);
+				throw new NotFoundException('Data directory not found: '.$this->datadir);
 			}
-			$this->realDataDir = rtrim($realPath, '/') . '/';
+			$this->realDataDir = rtrim($realPath, '/').'/';
 		}
 		if (substr($this->datadir, -1) !== '/') {
 			$this->datadir .= '/';
@@ -81,7 +81,7 @@ 
 	}
 
 	public function getId() {
-		return 'local::' . $this->datadir;
+		return 'local::'.$this->datadir;
 	}
 
 	public function mkdir($path) {
@@ -239,17 +239,17 @@ 
 		$dstParent = dirname($path2);
 
 		if (!$this->isUpdatable($srcParent)) {
-			\OCP\Util::writeLog('core', 'unable to rename, source directory is not writable : ' . $srcParent, \OCP\Util::ERROR);
+			\OCP\Util::writeLog('core', 'unable to rename, source directory is not writable : '.$srcParent, \OCP\Util::ERROR);
 			return false;
 		}
 
 		if (!$this->isUpdatable($dstParent)) {
-			\OCP\Util::writeLog('core', 'unable to rename, destination directory is not writable : ' . $dstParent, \OCP\Util::ERROR);
+			\OCP\Util::writeLog('core', 'unable to rename, destination directory is not writable : '.$dstParent, \OCP\Util::ERROR);
 			return false;
 		}
 
 		if (!$this->file_exists($path1)) {
-			\OCP\Util::writeLog('core', 'unable to rename, file does not exists : ' . $path1, \OCP\Util::ERROR);
+			\OCP\Util::writeLog('core', 'unable to rename, file does not exists : '.$path1, \OCP\Util::ERROR);
 			return false;
 		}
 
@@ -330,13 +330,13 @@ 
 		foreach (scandir($physicalDir) as $item) {
 			if (\OC\Files\Filesystem::isIgnoredDir($item))
 				continue;
-			$physicalItem = $physicalDir . '/' . $item;
+			$physicalItem = $physicalDir.'/'.$item;
 
 			if (strstr(strtolower($item), strtolower($query)) !== false) {
-				$files[] = $dir . '/' . $item;
+				$files[] = $dir.'/'.$item;
 			}
 			if (is_dir($physicalItem)) {
-				$files = array_merge($files, $this->searchInDir($query, $dir . '/' . $item));
+				$files = array_merge($files, $this->searchInDir($query, $dir.'/'.$item));
 			}
 		}
 		return $files;
@@ -365,7 +365,7 @@ 
 	 * @throws ForbiddenException
 	 */
 	public function getSourcePath($path) {
-		$fullPath = $this->datadir . $path;
+		$fullPath = $this->datadir.$path;
 		$currentPath = $path;
 		if ($this->allowSymlinks || $currentPath === '') {
 			return $fullPath;
@@ -377,10 +377,10 @@ 
 			if ($realPath === '' || $realPath === '.') {
 				return $fullPath;
 			}
-			$realPath = realpath($this->datadir . $currentPath);
+			$realPath = realpath($this->datadir.$currentPath);
 		}
 		if ($realPath) {
-			$realPath = $realPath . '/';
+			$realPath = $realPath.'/';
 		}
 		if (substr($realPath, 0, $this->dataDirLength) === $this->realDataDir) {
 			return $fullPath;
@@ -407,9 +407,9 @@ 
 		if ($this->is_file($path)) {
 			$stat = $this->stat($path);
 			return md5(
-				$stat['mtime'] .
-				$stat['ino'] .
-				$stat['dev'] .
+				$stat['mtime'].
+				$stat['ino'].
+				$stat['dev'].
 				$stat['size']
 			);
 		} else {