nextcloud / server

lib/public/Contacts/ContactsMenu/IEntry.php

Indentation +28 added lines, -28 removed lines

@@ -31,36 +31,36 @@
  */
 interface IEntry extends JsonSerializable {
 
-	/**
-	 * @since 12.0
-	 * @return string
-	 */
-	public function getFullName();
+    /**
+     * @since 12.0
+     * @return string
+     */
+    public function getFullName();
 
-	/**
-	 * @since 12.0
-	 * @return string[]
-	 */
-	public function getEMailAddresses();
+    /**
+     * @since 12.0
+     * @return string[]
+     */
+    public function getEMailAddresses();
 
-	/**
-	 * @since 12.0
-	 * @return string|null image URI
-	 */
-	public function getAvatar();
+    /**
+     * @since 12.0
+     * @return string|null image URI
+     */
+    public function getAvatar();
 
-	/**
-	 * @since 12.0
-	 * @param IAction $action an action to show in the contacts menu
-	 */
-	public function addAction(IAction $action);
+    /**
+     * @since 12.0
+     * @param IAction $action an action to show in the contacts menu
+     */
+    public function addAction(IAction $action);
 
-	/**
-	 * Get an arbitrary property from the contact
-	 *
-	 * @since 12.0
-	 * @param string $key
-	 * @return mixed the value of the property or null
-	 */
-	public function getProperty($key);
+    /**
+     * Get an arbitrary property from the contact
+     *
+     * @since 12.0
+     * @param string $key
+     * @return mixed the value of the property or null
+     */
+    public function getProperty($key);
 }

lib/private/DB/MDB2SchemaReader.php

Indentation +292 added lines, -292 removed lines

@@ -39,313 +39,313 @@
 
 class MDB2SchemaReader {
 
-	/**
-	 * @var string $DBTABLEPREFIX
-	 */
-	protected $DBTABLEPREFIX;
+    /**
+     * @var string $DBTABLEPREFIX
+     */
+    protected $DBTABLEPREFIX;
 
-	/**
-	 * @var \Doctrine\DBAL\Platforms\AbstractPlatform $platform
-	 */
-	protected $platform;
+    /**
+     * @var \Doctrine\DBAL\Platforms\AbstractPlatform $platform
+     */
+    protected $platform;
 
-	/** @var IConfig */
-	protected $config;
+    /** @var IConfig */
+    protected $config;
 
-	/**
-	 * @param \OCP\IConfig $config
-	 * @param \Doctrine\DBAL\Platforms\AbstractPlatform $platform
-	 */
-	public function __construct(IConfig $config, AbstractPlatform $platform) {
-		$this->platform = $platform;
-		$this->config = $config;
-		$this->DBTABLEPREFIX = $config->getSystemValue('dbtableprefix', 'oc_');
-	}
+    /**
+     * @param \OCP\IConfig $config
+     * @param \Doctrine\DBAL\Platforms\AbstractPlatform $platform
+     */
+    public function __construct(IConfig $config, AbstractPlatform $platform) {
+        $this->platform = $platform;
+        $this->config = $config;
+        $this->DBTABLEPREFIX = $config->getSystemValue('dbtableprefix', 'oc_');
+    }
 
-	/**
-	 * @param string $file
-	 * @param Schema $schema
-	 * @return Schema
-	 * @throws \DomainException
-	 */
-	public function loadSchemaFromFile($file, Schema $schema) {
-		$loadEntities = libxml_disable_entity_loader(false);
-		$xml = simplexml_load_file($file);
-		libxml_disable_entity_loader($loadEntities);
-		foreach ($xml->children() as $child) {
-			/**
-			 * @var \SimpleXMLElement $child
-			 */
-			switch ($child->getName()) {
-				case 'name':
-				case 'create':
-				case 'overwrite':
-				case 'charset':
-					break;
-				case 'table':
-					$this->loadTable($schema, $child);
-					break;
-				default:
-					throw new \DomainException('Unknown element: ' . $child->getName());
+    /**
+     * @param string $file
+     * @param Schema $schema
+     * @return Schema
+     * @throws \DomainException
+     */
+    public function loadSchemaFromFile($file, Schema $schema) {
+        $loadEntities = libxml_disable_entity_loader(false);
+        $xml = simplexml_load_file($file);
+        libxml_disable_entity_loader($loadEntities);
+        foreach ($xml->children() as $child) {
+            /**
+             * @var \SimpleXMLElement $child
+             */
+            switch ($child->getName()) {
+                case 'name':
+                case 'create':
+                case 'overwrite':
+                case 'charset':
+                    break;
+                case 'table':
+                    $this->loadTable($schema, $child);
+                    break;
+                default:
+                    throw new \DomainException('Unknown element: ' . $child->getName());
 
-			}
-		}
-		return $schema;
-	}
+            }
+        }
+        return $schema;
+    }
 
-	/**
-	 * @param \Doctrine\DBAL\Schema\Schema $schema
-	 * @param \SimpleXMLElement $xml
-	 * @throws \DomainException
-	 */
-	private function loadTable($schema, $xml) {
-		$table = null;
-		foreach ($xml->children() as $child) {
-			/**
-			 * @var \SimpleXMLElement $child
-			 */
-			switch ($child->getName()) {
-				case 'name':
-					$name = (string)$child;
-					$name = str_replace('*dbprefix*', $this->DBTABLEPREFIX, $name);
-					$name = $this->platform->quoteIdentifier($name);
-					$table = $schema->createTable($name);
-					break;
-				case 'create':
-				case 'overwrite':
-				case 'charset':
-					break;
-				case 'declaration':
-					if (is_null($table)) {
-						throw new \DomainException('Table declaration before table name');
-					}
-					$this->loadDeclaration($table, $child);
-					break;
-				default:
-					throw new \DomainException('Unknown element: ' . $child->getName());
+    /**
+     * @param \Doctrine\DBAL\Schema\Schema $schema
+     * @param \SimpleXMLElement $xml
+     * @throws \DomainException
+     */
+    private function loadTable($schema, $xml) {
+        $table = null;
+        foreach ($xml->children() as $child) {
+            /**
+             * @var \SimpleXMLElement $child
+             */
+            switch ($child->getName()) {
+                case 'name':
+                    $name = (string)$child;
+                    $name = str_replace('*dbprefix*', $this->DBTABLEPREFIX, $name);
+                    $name = $this->platform->quoteIdentifier($name);
+                    $table = $schema->createTable($name);
+                    break;
+                case 'create':
+                case 'overwrite':
+                case 'charset':
+                    break;
+                case 'declaration':
+                    if (is_null($table)) {
+                        throw new \DomainException('Table declaration before table name');
+                    }
+                    $this->loadDeclaration($table, $child);
+                    break;
+                default:
+                    throw new \DomainException('Unknown element: ' . $child->getName());
 
-			}
-		}
-	}
+            }
+        }
+    }
 
-	/**
-	 * @param \Doctrine\DBAL\Schema\Table $table
-	 * @param \SimpleXMLElement $xml
-	 * @throws \DomainException
-	 */
-	private function loadDeclaration($table, $xml) {
-		foreach ($xml->children() as $child) {
-			/**
-			 * @var \SimpleXMLElement $child
-			 */
-			switch ($child->getName()) {
-				case 'field':
-					$this->loadField($table, $child);
-					break;
-				case 'index':
-					$this->loadIndex($table, $child);
-					break;
-				default:
-					throw new \DomainException('Unknown element: ' . $child->getName());
+    /**
+     * @param \Doctrine\DBAL\Schema\Table $table
+     * @param \SimpleXMLElement $xml
+     * @throws \DomainException
+     */
+    private function loadDeclaration($table, $xml) {
+        foreach ($xml->children() as $child) {
+            /**
+             * @var \SimpleXMLElement $child
+             */
+            switch ($child->getName()) {
+                case 'field':
+                    $this->loadField($table, $child);
+                    break;
+                case 'index':
+                    $this->loadIndex($table, $child);
+                    break;
+                default:
+                    throw new \DomainException('Unknown element: ' . $child->getName());
 
-			}
-		}
-	}
+            }
+        }
+    }
 
-	/**
-	 * @param \Doctrine\DBAL\Schema\Table $table
-	 * @param \SimpleXMLElement $xml
-	 * @throws \DomainException
-	 */
-	private function loadField($table, $xml) {
-		$options = array( 'notnull' => false );
-		foreach ($xml->children() as $child) {
-			/**
-			 * @var \SimpleXMLElement $child
-			 */
-			switch ($child->getName()) {
-				case 'name':
-					$name = (string)$child;
-					$name = $this->platform->quoteIdentifier($name);
-					break;
-				case 'type':
-					$type = (string)$child;
-					switch ($type) {
-						case 'text':
-							$type = 'string';
-							break;
-						case 'clob':
-							$type = 'text';
-							break;
-						case 'timestamp':
-							$type = 'datetime';
-							break;
-						case 'numeric':
-							$type = 'decimal';
-							break;
-					}
-					break;
-				case 'length':
-					$length = (string)$child;
-					$options['length'] = $length;
-					break;
-				case 'unsigned':
-					$unsigned = $this->asBool($child);
-					$options['unsigned'] = $unsigned;
-					break;
-				case 'notnull':
-					$notnull = $this->asBool($child);
-					$options['notnull'] = $notnull;
-					break;
-				case 'autoincrement':
-					$autoincrement = $this->asBool($child);
-					$options['autoincrement'] = $autoincrement;
-					break;
-				case 'default':
-					$default = (string)$child;
-					$options['default'] = $default;
-					break;
-				case 'comments':
-					$comment = (string)$child;
-					$options['comment'] = $comment;
-					break;
-				case 'primary':
-					$primary = $this->asBool($child);
-					$options['primary'] = $primary;
-					break;
-				case 'precision':
-					$precision = (string)$child;
-					$options['precision'] = $precision;
-					break;
-				case 'scale':
-					$scale = (string)$child;
-					$options['scale'] = $scale;
-					break;
-				default:
-					throw new \DomainException('Unknown element: ' . $child->getName());
+    /**
+     * @param \Doctrine\DBAL\Schema\Table $table
+     * @param \SimpleXMLElement $xml
+     * @throws \DomainException
+     */
+    private function loadField($table, $xml) {
+        $options = array( 'notnull' => false );
+        foreach ($xml->children() as $child) {
+            /**
+             * @var \SimpleXMLElement $child
+             */
+            switch ($child->getName()) {
+                case 'name':
+                    $name = (string)$child;
+                    $name = $this->platform->quoteIdentifier($name);
+                    break;
+                case 'type':
+                    $type = (string)$child;
+                    switch ($type) {
+                        case 'text':
+                            $type = 'string';
+                            break;
+                        case 'clob':
+                            $type = 'text';
+                            break;
+                        case 'timestamp':
+                            $type = 'datetime';
+                            break;
+                        case 'numeric':
+                            $type = 'decimal';
+                            break;
+                    }
+                    break;
+                case 'length':
+                    $length = (string)$child;
+                    $options['length'] = $length;
+                    break;
+                case 'unsigned':
+                    $unsigned = $this->asBool($child);
+                    $options['unsigned'] = $unsigned;
+                    break;
+                case 'notnull':
+                    $notnull = $this->asBool($child);
+                    $options['notnull'] = $notnull;
+                    break;
+                case 'autoincrement':
+                    $autoincrement = $this->asBool($child);
+                    $options['autoincrement'] = $autoincrement;
+                    break;
+                case 'default':
+                    $default = (string)$child;
+                    $options['default'] = $default;
+                    break;
+                case 'comments':
+                    $comment = (string)$child;
+                    $options['comment'] = $comment;
+                    break;
+                case 'primary':
+                    $primary = $this->asBool($child);
+                    $options['primary'] = $primary;
+                    break;
+                case 'precision':
+                    $precision = (string)$child;
+                    $options['precision'] = $precision;
+                    break;
+                case 'scale':
+                    $scale = (string)$child;
+                    $options['scale'] = $scale;
+                    break;
+                default:
+                    throw new \DomainException('Unknown element: ' . $child->getName());
 
-			}
-		}
-		if (isset($name) && isset($type)) {
-			if (isset($options['default']) && empty($options['default'])) {
-				if (empty($options['notnull']) || !$options['notnull']) {
-					unset($options['default']);
-					$options['notnull'] = false;
-				} else {
-					$options['default'] = '';
-				}
-				if ($type == 'integer' || $type == 'decimal') {
-					$options['default'] = 0;
-				} elseif ($type == 'boolean') {
-					$options['default'] = false;
-				}
-				if (!empty($options['autoincrement']) && $options['autoincrement']) {
-					unset($options['default']);
-				}
-			}
-			if ($type === 'integer' && isset($options['default'])) {
-				$options['default'] = (int)$options['default'];
-			}
-			if ($type === 'integer' && isset($options['length'])) {
-				$length = $options['length'];
-				if ($length < 4) {
-					$type = 'smallint';
-				} else if ($length > 4) {
-					$type = 'bigint';
-				}
-			}
-			if ($type === 'boolean' && isset($options['default'])) {
-				$options['default'] = $this->asBool($options['default']);
-			}
-			if (!empty($options['autoincrement'])
-				&& !empty($options['notnull'])
-			) {
-				$options['primary'] = true;
-			}
+            }
+        }
+        if (isset($name) && isset($type)) {
+            if (isset($options['default']) && empty($options['default'])) {
+                if (empty($options['notnull']) || !$options['notnull']) {
+                    unset($options['default']);
+                    $options['notnull'] = false;
+                } else {
+                    $options['default'] = '';
+                }
+                if ($type == 'integer' || $type == 'decimal') {
+                    $options['default'] = 0;
+                } elseif ($type == 'boolean') {
+                    $options['default'] = false;
+                }
+                if (!empty($options['autoincrement']) && $options['autoincrement']) {
+                    unset($options['default']);
+                }
+            }
+            if ($type === 'integer' && isset($options['default'])) {
+                $options['default'] = (int)$options['default'];
+            }
+            if ($type === 'integer' && isset($options['length'])) {
+                $length = $options['length'];
+                if ($length < 4) {
+                    $type = 'smallint';
+                } else if ($length > 4) {
+                    $type = 'bigint';
+                }
+            }
+            if ($type === 'boolean' && isset($options['default'])) {
+                $options['default'] = $this->asBool($options['default']);
+            }
+            if (!empty($options['autoincrement'])
+                && !empty($options['notnull'])
+            ) {
+                $options['primary'] = true;
+            }
 
-			$table->addColumn($name, $type, $options);
-			if (!empty($options['primary']) && $options['primary']) {
-				$table->setPrimaryKey(array($name));
-			}
-		}
-	}
+            $table->addColumn($name, $type, $options);
+            if (!empty($options['primary']) && $options['primary']) {
+                $table->setPrimaryKey(array($name));
+            }
+        }
+    }
 
-	/**
-	 * @param \Doctrine\DBAL\Schema\Table $table
-	 * @param \SimpleXMLElement $xml
-	 * @throws \DomainException
-	 */
-	private function loadIndex($table, $xml) {
-		$name = null;
-		$fields = array();
-		foreach ($xml->children() as $child) {
-			/**
-			 * @var \SimpleXMLElement $child
-			 */
-			switch ($child->getName()) {
-				case 'name':
-					$name = (string)$child;
-					break;
-				case 'primary':
-					$primary = $this->asBool($child);
-					break;
-				case 'unique':
-					$unique = $this->asBool($child);
-					break;
-				case 'field':
-					foreach ($child->children() as $field) {
-						/**
-						 * @var \SimpleXMLElement $field
-						 */
-						switch ($field->getName()) {
-							case 'name':
-								$field_name = (string)$field;
-								$field_name = $this->platform->quoteIdentifier($field_name);
-								$fields[] = $field_name;
-								break;
-							case 'sorting':
-								break;
-							default:
-								throw new \DomainException('Unknown element: ' . $field->getName());
+    /**
+     * @param \Doctrine\DBAL\Schema\Table $table
+     * @param \SimpleXMLElement $xml
+     * @throws \DomainException
+     */
+    private function loadIndex($table, $xml) {
+        $name = null;
+        $fields = array();
+        foreach ($xml->children() as $child) {
+            /**
+             * @var \SimpleXMLElement $child
+             */
+            switch ($child->getName()) {
+                case 'name':
+                    $name = (string)$child;
+                    break;
+                case 'primary':
+                    $primary = $this->asBool($child);
+                    break;
+                case 'unique':
+                    $unique = $this->asBool($child);
+                    break;
+                case 'field':
+                    foreach ($child->children() as $field) {
+                        /**
+                         * @var \SimpleXMLElement $field
+                         */
+                        switch ($field->getName()) {
+                            case 'name':
+                                $field_name = (string)$field;
+                                $field_name = $this->platform->quoteIdentifier($field_name);
+                                $fields[] = $field_name;
+                                break;
+                            case 'sorting':
+                                break;
+                            default:
+                                throw new \DomainException('Unknown element: ' . $field->getName());
 
-						}
-					}
-					break;
-				default:
-					throw new \DomainException('Unknown element: ' . $child->getName());
+                        }
+                    }
+                    break;
+                default:
+                    throw new \DomainException('Unknown element: ' . $child->getName());
 
-			}
-		}
-		if (!empty($fields)) {
-			if (isset($primary) && $primary) {
-				if ($table->hasPrimaryKey()) {
-					return;
-				}
-				$table->setPrimaryKey($fields, $name);
-			} else {
-				if (isset($unique) && $unique) {
-					$table->addUniqueIndex($fields, $name);
-				} else {
-					$table->addIndex($fields, $name);
-				}
-			}
-		} else {
-			throw new \DomainException('Empty index definition: ' . $name . ' options:' . print_r($fields, true));
-		}
-	}
+            }
+        }
+        if (!empty($fields)) {
+            if (isset($primary) && $primary) {
+                if ($table->hasPrimaryKey()) {
+                    return;
+                }
+                $table->setPrimaryKey($fields, $name);
+            } else {
+                if (isset($unique) && $unique) {
+                    $table->addUniqueIndex($fields, $name);
+                } else {
+                    $table->addIndex($fields, $name);
+                }
+            }
+        } else {
+            throw new \DomainException('Empty index definition: ' . $name . ' options:' . print_r($fields, true));
+        }
+    }
 
-	/**
-	 * @param \SimpleXMLElement|string $xml
-	 * @return bool
-	 */
-	private function asBool($xml) {
-		$result = (string)$xml;
-		if ($result == 'true') {
-			$result = true;
-		} elseif ($result == 'false') {
-			$result = false;
-		}
-		return (bool)$result;
-	}
+    /**
+     * @param \SimpleXMLElement|string $xml
+     * @return bool
+     */
+    private function asBool($xml) {
+        $result = (string)$xml;
+        if ($result == 'true') {
+            $result = true;
+        } elseif ($result == 'false') {
+            $result = false;
+        }
+        return (bool)$result;
+    }
 
 }

lib/public/IContainer.php

Indentation +50 added lines, -50 removed lines

@@ -47,58 +47,58 @@
  */
 interface IContainer {
 
-	/**
-	 * If a parameter is not registered in the container try to instantiate it
-	 * by using reflection to find out how to build the class
-	 * @param string $name the class name to resolve
-	 * @return \stdClass
-	 * @since 8.2.0
-	 * @throws QueryException if the class could not be found or instantiated
-	 */
-	public function resolve($name);
+    /**
+     * If a parameter is not registered in the container try to instantiate it
+     * by using reflection to find out how to build the class
+     * @param string $name the class name to resolve
+     * @return \stdClass
+     * @since 8.2.0
+     * @throws QueryException if the class could not be found or instantiated
+     */
+    public function resolve($name);
 
-	/**
-	 * Look up a service for a given name in the container.
-	 *
-	 * @param string $name
-	 * @return mixed
-	 * @throws QueryException if the query could not be resolved
-	 * @since 6.0.0
-	 */
-	public function query($name);
+    /**
+     * Look up a service for a given name in the container.
+     *
+     * @param string $name
+     * @return mixed
+     * @throws QueryException if the query could not be resolved
+     * @since 6.0.0
+     */
+    public function query($name);
 
-	/**
-	 * A value is stored in the container with it's corresponding name
-	 *
-	 * @param string $name
-	 * @param mixed $value
-	 * @return void
-	 * @since 6.0.0
-	 */
-	public function registerParameter($name, $value);
+    /**
+     * A value is stored in the container with it's corresponding name
+     *
+     * @param string $name
+     * @param mixed $value
+     * @return void
+     * @since 6.0.0
+     */
+    public function registerParameter($name, $value);
 
-	/**
-	 * A service is registered in the container where a closure is passed in which will actually
-	 * create the service on demand.
-	 * In case the parameter $shared is set to true (the default usage) the once created service will remain in
-	 * memory and be reused on subsequent calls.
-	 * In case the parameter is false the service will be recreated on every call.
-	 *
-	 * @param string $name
-	 * @param \Closure $closure
-	 * @param bool $shared
-	 * @return void
-	 * @since 6.0.0
-	 */
-	public function registerService($name, Closure $closure, $shared = true);
+    /**
+     * A service is registered in the container where a closure is passed in which will actually
+     * create the service on demand.
+     * In case the parameter $shared is set to true (the default usage) the once created service will remain in
+     * memory and be reused on subsequent calls.
+     * In case the parameter is false the service will be recreated on every call.
+     *
+     * @param string $name
+     * @param \Closure $closure
+     * @param bool $shared
+     * @return void
+     * @since 6.0.0
+     */
+    public function registerService($name, Closure $closure, $shared = true);
 
-	/**
-	 * Shortcut for returning a service from a service under a different key,
-	 * e.g. to tell the container to return a class when queried for an
-	 * interface
-	 * @param string $alias the alias that should be registered
-	 * @param string $target the target that should be resolved instead
-	 * @since 8.2.0
-	 */
-	public function registerAlias($alias, $target);
+    /**
+     * Shortcut for returning a service from a service under a different key,
+     * e.g. to tell the container to return a class when queried for an
+     * interface
+     * @param string $alias the alias that should be registered
+     * @param string $target the target that should be resolved instead
+     * @since 8.2.0
+     */
+    public function registerAlias($alias, $target);
 }

lib/private/Files/Config/MountProviderCollection.php

Indentation +140 added lines, -140 removed lines

@@ -35,144 +35,144 @@
 use OCP\IUser;
 
 class MountProviderCollection implements IMountProviderCollection, Emitter {
-	use EmitterTrait;
-
-	/**
-	 * @var \OCP\Files\Config\IHomeMountProvider[]
-	 */
-	private $homeProviders = [];
-
-	/**
-	 * @var \OCP\Files\Config\IMountProvider[]
-	 */
-	private $providers = array();
-
-	/**
-	 * @var \OCP\Files\Storage\IStorageFactory
-	 */
-	private $loader;
-
-	/**
-	 * @var \OCP\Files\Config\IUserMountCache
-	 */
-	private $mountCache;
-
-	/**
-	 * @param \OCP\Files\Storage\IStorageFactory $loader
-	 * @param IUserMountCache $mountCache
-	 */
-	public function __construct(IStorageFactory $loader, IUserMountCache $mountCache) {
-		$this->loader = $loader;
-		$this->mountCache = $mountCache;
-	}
-
-	/**
-	 * Get all configured mount points for the user
-	 *
-	 * @param \OCP\IUser $user
-	 * @return \OCP\Files\Mount\IMountPoint[]
-	 */
-	public function getMountsForUser(IUser $user) {
-		$loader = $this->loader;
-		$mounts = array_map(function (IMountProvider $provider) use ($user, $loader) {
-			return $provider->getMountsForUser($user, $loader);
-		}, $this->providers);
-		$mounts = array_filter($mounts, function ($result) {
-			return is_array($result);
-		});
-		return array_reduce($mounts, function (array $mounts, array $providerMounts) {
-			return array_merge($mounts, $providerMounts);
-		}, array());
-	}
-
-	public function addMountForUser(IUser $user, IMountManager $mountManager) {
-		// shared mount provider gets to go last since it needs to know existing files
-		// to check for name collisions
-		$firstMounts = [];
-		$firstProviders = array_filter($this->providers, function (IMountProvider $provider) {
-			return (get_class($provider) !== 'OCA\Files_Sharing\MountProvider');
-		});
-		$lastProviders = array_filter($this->providers, function (IMountProvider $provider) {
-			return (get_class($provider) === 'OCA\Files_Sharing\MountProvider');
-		});
-		foreach ($firstProviders as $provider) {
-			$mounts = $provider->getMountsForUser($user, $this->loader);
-			if (is_array($mounts)) {
-				$firstMounts = array_merge($firstMounts, $mounts);
-			}
-		}
-		array_walk($firstMounts, [$mountManager, 'addMount']);
-
-		$lateMounts = [];
-		foreach ($lastProviders as $provider) {
-			$mounts = $provider->getMountsForUser($user, $this->loader);
-			if (is_array($mounts)) {
-				$lateMounts = array_merge($lateMounts, $mounts);
-			}
-		}
-
-		array_walk($lateMounts, [$mountManager, 'addMount']);
-
-		return array_merge($lateMounts, $firstMounts);
-	}
-
-	/**
-	 * Get the configured home mount for this user
-	 *
-	 * @param \OCP\IUser $user
-	 * @return \OCP\Files\Mount\IMountPoint
-	 * @since 9.1.0
-	 */
-	public function getHomeMountForUser(IUser $user) {
-		/** @var \OCP\Files\Config\IHomeMountProvider[] $providers */
-		$providers = array_reverse($this->homeProviders); // call the latest registered provider first to give apps an opportunity to overwrite builtin
-		foreach ($providers as $homeProvider) {
-			if ($mount = $homeProvider->getHomeMountForUser($user, $this->loader)) {
-				$mount->setMountPoint('/' . $user->getUID()); //make sure the mountpoint is what we expect
-				return $mount;
-			}
-		}
-		throw new \Exception('No home storage configured for user ' . $user);
-	}
-
-	/**
-	 * Add a provider for mount points
-	 *
-	 * @param \OCP\Files\Config\IMountProvider $provider
-	 */
-	public function registerProvider(IMountProvider $provider) {
-		$this->providers[] = $provider;
-
-		$this->emit('\OC\Files\Config', 'registerMountProvider', [$provider]);
-	}
-
-	/**
-	 * Add a provider for home mount points
-	 *
-	 * @param \OCP\Files\Config\IHomeMountProvider $provider
-	 * @since 9.1.0
-	 */
-	public function registerHomeProvider(IHomeMountProvider $provider) {
-		$this->homeProviders[] = $provider;
-		$this->emit('\OC\Files\Config', 'registerHomeMountProvider', [$provider]);
-	}
-
-	/**
-	 * Cache mounts for user
-	 *
-	 * @param IUser $user
-	 * @param IMountPoint[] $mountPoints
-	 */
-	public function registerMounts(IUser $user, array $mountPoints) {
-		$this->mountCache->registerMounts($user, $mountPoints);
-	}
-
-	/**
-	 * Get the mount cache which can be used to search for mounts without setting up the filesystem
-	 *
-	 * @return IUserMountCache
-	 */
-	public function getMountCache() {
-		return $this->mountCache;
-	}
+    use EmitterTrait;
+
+    /**
+     * @var \OCP\Files\Config\IHomeMountProvider[]
+     */
+    private $homeProviders = [];
+
+    /**
+     * @var \OCP\Files\Config\IMountProvider[]
+     */
+    private $providers = array();
+
+    /**
+     * @var \OCP\Files\Storage\IStorageFactory
+     */
+    private $loader;
+
+    /**
+     * @var \OCP\Files\Config\IUserMountCache
+     */
+    private $mountCache;
+
+    /**
+     * @param \OCP\Files\Storage\IStorageFactory $loader
+     * @param IUserMountCache $mountCache
+     */
+    public function __construct(IStorageFactory $loader, IUserMountCache $mountCache) {
+        $this->loader = $loader;
+        $this->mountCache = $mountCache;
+    }
+
+    /**
+     * Get all configured mount points for the user
+     *
+     * @param \OCP\IUser $user
+     * @return \OCP\Files\Mount\IMountPoint[]
+     */
+    public function getMountsForUser(IUser $user) {
+        $loader = $this->loader;
+        $mounts = array_map(function (IMountProvider $provider) use ($user, $loader) {
+            return $provider->getMountsForUser($user, $loader);
+        }, $this->providers);
+        $mounts = array_filter($mounts, function ($result) {
+            return is_array($result);
+        });
+        return array_reduce($mounts, function (array $mounts, array $providerMounts) {
+            return array_merge($mounts, $providerMounts);
+        }, array());
+    }
+
+    public function addMountForUser(IUser $user, IMountManager $mountManager) {
+        // shared mount provider gets to go last since it needs to know existing files
+        // to check for name collisions
+        $firstMounts = [];
+        $firstProviders = array_filter($this->providers, function (IMountProvider $provider) {
+            return (get_class($provider) !== 'OCA\Files_Sharing\MountProvider');
+        });
+        $lastProviders = array_filter($this->providers, function (IMountProvider $provider) {
+            return (get_class($provider) === 'OCA\Files_Sharing\MountProvider');
+        });
+        foreach ($firstProviders as $provider) {
+            $mounts = $provider->getMountsForUser($user, $this->loader);
+            if (is_array($mounts)) {
+                $firstMounts = array_merge($firstMounts, $mounts);
+            }
+        }
+        array_walk($firstMounts, [$mountManager, 'addMount']);
+
+        $lateMounts = [];
+        foreach ($lastProviders as $provider) {
+            $mounts = $provider->getMountsForUser($user, $this->loader);
+            if (is_array($mounts)) {
+                $lateMounts = array_merge($lateMounts, $mounts);
+            }
+        }
+
+        array_walk($lateMounts, [$mountManager, 'addMount']);
+
+        return array_merge($lateMounts, $firstMounts);
+    }
+
+    /**
+     * Get the configured home mount for this user
+     *
+     * @param \OCP\IUser $user
+     * @return \OCP\Files\Mount\IMountPoint
+     * @since 9.1.0
+     */
+    public function getHomeMountForUser(IUser $user) {
+        /** @var \OCP\Files\Config\IHomeMountProvider[] $providers */
+        $providers = array_reverse($this->homeProviders); // call the latest registered provider first to give apps an opportunity to overwrite builtin
+        foreach ($providers as $homeProvider) {
+            if ($mount = $homeProvider->getHomeMountForUser($user, $this->loader)) {
+                $mount->setMountPoint('/' . $user->getUID()); //make sure the mountpoint is what we expect
+                return $mount;
+            }
+        }
+        throw new \Exception('No home storage configured for user ' . $user);
+    }
+
+    /**
+     * Add a provider for mount points
+     *
+     * @param \OCP\Files\Config\IMountProvider $provider
+     */
+    public function registerProvider(IMountProvider $provider) {
+        $this->providers[] = $provider;
+
+        $this->emit('\OC\Files\Config', 'registerMountProvider', [$provider]);
+    }
+
+    /**
+     * Add a provider for home mount points
+     *
+     * @param \OCP\Files\Config\IHomeMountProvider $provider
+     * @since 9.1.0
+     */
+    public function registerHomeProvider(IHomeMountProvider $provider) {
+        $this->homeProviders[] = $provider;
+        $this->emit('\OC\Files\Config', 'registerHomeMountProvider', [$provider]);
+    }
+
+    /**
+     * Cache mounts for user
+     *
+     * @param IUser $user
+     * @param IMountPoint[] $mountPoints
+     */
+    public function registerMounts(IUser $user, array $mountPoints) {
+        $this->mountCache->registerMounts($user, $mountPoints);
+    }
+
+    /**
+     * Get the mount cache which can be used to search for mounts without setting up the filesystem
+     *
+     * @return IUserMountCache
+     */
+    public function getMountCache() {
+        return $this->mountCache;
+    }
 }

apps/files_trashbin/lib/Helper.php

Indentation +86 added lines, -86 removed lines

@@ -30,97 +30,97 @@
 use OCP\Files\Cache\ICacheEntry;
 
 class Helper {
-	/**
-	 * Retrieves the contents of a trash bin directory.
-	 *
-	 * @param string $dir path to the directory inside the trashbin
-	 * or empty to retrieve the root of the trashbin
-	 * @param string $user
-	 * @param string $sortAttribute attribute to sort on or empty to disable sorting
-	 * @param bool $sortDescending true for descending sort, false otherwise
-	 * @return \OCP\Files\FileInfo[]
-	 */
-	public static function getTrashFiles($dir, $user, $sortAttribute = '', $sortDescending = false) {
-		$result = array();
-		$timestamp = null;
+    /**
+     * Retrieves the contents of a trash bin directory.
+     *
+     * @param string $dir path to the directory inside the trashbin
+     * or empty to retrieve the root of the trashbin
+     * @param string $user
+     * @param string $sortAttribute attribute to sort on or empty to disable sorting
+     * @param bool $sortDescending true for descending sort, false otherwise
+     * @return \OCP\Files\FileInfo[]
+     */
+    public static function getTrashFiles($dir, $user, $sortAttribute = '', $sortDescending = false) {
+        $result = array();
+        $timestamp = null;
 
-		$view = new \OC\Files\View('/' . $user . '/files_trashbin/files');
+        $view = new \OC\Files\View('/' . $user . '/files_trashbin/files');
 
-		if (ltrim($dir, '/') !== '' && !$view->is_dir($dir)) {
-			throw new \Exception('Directory does not exists');
-		}
+        if (ltrim($dir, '/') !== '' && !$view->is_dir($dir)) {
+            throw new \Exception('Directory does not exists');
+        }
 
-		$mount = $view->getMount($dir);
-		$storage = $mount->getStorage();
-		$absoluteDir = $view->getAbsolutePath($dir);
-		$internalPath = $mount->getInternalPath($absoluteDir);
+        $mount = $view->getMount($dir);
+        $storage = $mount->getStorage();
+        $absoluteDir = $view->getAbsolutePath($dir);
+        $internalPath = $mount->getInternalPath($absoluteDir);
 
-		$originalLocations = \OCA\Files_Trashbin\Trashbin::getLocations($user);
-		$dirContent = $storage->getCache()->getFolderContents($mount->getInternalPath($view->getAbsolutePath($dir)));
-		foreach ($dirContent as $entry) {
-			$entryName = $entry->getName();
-			$id = $entry->getId();
-			$name = $entryName;
-			if ($dir === '' || $dir === '/') {
-				$pathparts = pathinfo($entryName);
-				$timestamp = substr($pathparts['extension'], 1);
-				$name = $pathparts['filename'];
+        $originalLocations = \OCA\Files_Trashbin\Trashbin::getLocations($user);
+        $dirContent = $storage->getCache()->getFolderContents($mount->getInternalPath($view->getAbsolutePath($dir)));
+        foreach ($dirContent as $entry) {
+            $entryName = $entry->getName();
+            $id = $entry->getId();
+            $name = $entryName;
+            if ($dir === '' || $dir === '/') {
+                $pathparts = pathinfo($entryName);
+                $timestamp = substr($pathparts['extension'], 1);
+                $name = $pathparts['filename'];
 
-			} else if ($timestamp === null) {
-				// for subfolders we need to calculate the timestamp only once
-				$parts = explode('/', ltrim($dir, '/'));
-				$timestamp = substr(pathinfo($parts[0], PATHINFO_EXTENSION), 1);
-			}
-			$originalPath = '';
-			$originalName = substr($entryName, 0, -strlen($timestamp)-2);
-			if (isset($originalLocations[$originalName][$timestamp])) {
-				$originalPath = $originalLocations[$originalName][$timestamp];
-				if (substr($originalPath, -1) === '/') {
-					$originalPath = substr($originalPath, 0, -1);
-				}
-			}
-			$type = $entry->getMimeType() === ICacheEntry::DIRECTORY_MIMETYPE ? 'dir' : 'file';
-			$i = array(
-				'name' => $name,
-				'mtime' => $timestamp,
-				'mimetype' => $type === 'dir' ? 'httpd/unix-directory' : \OC::$server->getMimeTypeDetector()->detectPath($name),
-				'type' => $type,
-				'directory' => ($dir === '/') ? '' : $dir,
-				'size' => $entry->getSize(),
-				'etag' => '',
-				'permissions' => Constants::PERMISSION_ALL - Constants::PERMISSION_SHARE
-			);
-			if ($originalPath) {
-				if ($originalPath !== '.') {
-					$i['extraData'] = $originalPath . '/' . $originalName;
-				} else {
-					$i['extraData'] = $originalName;
-				}
-			}
-			$result[] = new FileInfo($absoluteDir . '/' . $i['name'], $storage, $internalPath . '/' . $i['name'], $i, $mount);
-		}
+            } else if ($timestamp === null) {
+                // for subfolders we need to calculate the timestamp only once
+                $parts = explode('/', ltrim($dir, '/'));
+                $timestamp = substr(pathinfo($parts[0], PATHINFO_EXTENSION), 1);
+            }
+            $originalPath = '';
+            $originalName = substr($entryName, 0, -strlen($timestamp)-2);
+            if (isset($originalLocations[$originalName][$timestamp])) {
+                $originalPath = $originalLocations[$originalName][$timestamp];
+                if (substr($originalPath, -1) === '/') {
+                    $originalPath = substr($originalPath, 0, -1);
+                }
+            }
+            $type = $entry->getMimeType() === ICacheEntry::DIRECTORY_MIMETYPE ? 'dir' : 'file';
+            $i = array(
+                'name' => $name,
+                'mtime' => $timestamp,
+                'mimetype' => $type === 'dir' ? 'httpd/unix-directory' : \OC::$server->getMimeTypeDetector()->detectPath($name),
+                'type' => $type,
+                'directory' => ($dir === '/') ? '' : $dir,
+                'size' => $entry->getSize(),
+                'etag' => '',
+                'permissions' => Constants::PERMISSION_ALL - Constants::PERMISSION_SHARE
+            );
+            if ($originalPath) {
+                if ($originalPath !== '.') {
+                    $i['extraData'] = $originalPath . '/' . $originalName;
+                } else {
+                    $i['extraData'] = $originalName;
+                }
+            }
+            $result[] = new FileInfo($absoluteDir . '/' . $i['name'], $storage, $internalPath . '/' . $i['name'], $i, $mount);
+        }
 
-		if ($sortAttribute !== '') {
-			return \OCA\Files\Helper::sortFiles($result, $sortAttribute, $sortDescending);
-		}
-		return $result;
-	}
+        if ($sortAttribute !== '') {
+            return \OCA\Files\Helper::sortFiles($result, $sortAttribute, $sortDescending);
+        }
+        return $result;
+    }
 
-	/**
-	 * Format file infos for JSON
-	 *
-	 * @param \OCP\Files\FileInfo[] $fileInfos file infos
-	 */
-	public static function formatFileInfos($fileInfos) {
-		$files = array();
-		$id = 0;
-		foreach ($fileInfos as $i) {
-			$entry = \OCA\Files\Helper::formatFileInfo($i);
-			$entry['id'] = $id++;
-			$entry['etag'] = $entry['mtime']; // add fake etag, it is only needed to identify the preview image
-			$entry['permissions'] = \OCP\Constants::PERMISSION_READ;
-			$files[] = $entry;
-		}
-		return $files;
-	}
+    /**
+     * Format file infos for JSON
+     *
+     * @param \OCP\Files\FileInfo[] $fileInfos file infos
+     */
+    public static function formatFileInfos($fileInfos) {
+        $files = array();
+        $id = 0;
+        foreach ($fileInfos as $i) {
+            $entry = \OCA\Files\Helper::formatFileInfo($i);
+            $entry['id'] = $id++;
+            $entry['etag'] = $entry['mtime']; // add fake etag, it is only needed to identify the preview image
+            $entry['permissions'] = \OCP\Constants::PERMISSION_READ;
+            $files[] = $entry;
+        }
+        return $files;
+    }
 }

apps/files/lib/Command/TransferOwnership.php

Indentation +244 added lines, -244 removed lines

@@ -42,248 +42,248 @@
 
 class TransferOwnership extends Command {
 
-	/** @var IUserManager $userManager */
-	private $userManager;
-
-	/** @var IManager */
-	private $shareManager;
-
-	/** @var IMountManager */
-	private $mountManager;
-
-	/** @var FileInfo[] */
-	private $allFiles = [];
-
-	/** @var FileInfo[] */
-	private $encryptedFiles = [];
-
-	/** @var IShare[] */
-	private $shares = [];
-
-	/** @var string */
-	private $sourceUser;
-
-	/** @var string */
-	private $destinationUser;
-
-	/** @var string */
-	private $sourcePath;
-
-	/** @var string */
-	private $finalTarget;
-
-	public function __construct(IUserManager $userManager, IManager $shareManager, IMountManager $mountManager) {
-		$this->userManager = $userManager;
-		$this->shareManager = $shareManager;
-		$this->mountManager = $mountManager;
-		parent::__construct();
-	}
-
-	protected function configure() {
-		$this
-			->setName('files:transfer-ownership')
-			->setDescription('All files and folders are moved to another user - shares are moved as well.')
-			->addArgument(
-				'source-user',
-				InputArgument::REQUIRED,
-				'owner of files which shall be moved'
-			)
-			->addArgument(
-				'destination-user',
-				InputArgument::REQUIRED,
-				'user who will be the new owner of the files'
-			)
-			->addOption(
-				'path',
-				null,
-				InputOption::VALUE_REQUIRED,
-				'selectively provide the path to transfer. For example --path="folder_name"',
-				''
-			);
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$sourceUserObject = $this->userManager->get($input->getArgument('source-user'));
-		$destinationUserObject = $this->userManager->get($input->getArgument('destination-user'));
-
-		if (!$sourceUserObject instanceof IUser) {
-			$output->writeln("<error>Unknown source user $this->sourceUser</error>");
-			return 1;
-		}
-
-		if (!$destinationUserObject instanceof IUser) {
-			$output->writeln("<error>Unknown destination user $this->destinationUser</error>");
-			return 1;
-		}
-
-		$this->sourceUser = $sourceUserObject->getUID();
-		$this->destinationUser = $destinationUserObject->getUID();
-		$sourcePathOption = ltrim($input->getOption('path'), '/');
-		$this->sourcePath = rtrim($this->sourceUser . '/files/' . $sourcePathOption, '/');
-
-		// target user has to be ready
-		if (!\OC::$server->getEncryptionManager()->isReadyForUser($this->destinationUser)) {
-			$output->writeln("<error>The target user is not ready to accept files. The user has at least to be logged in once.</error>");
-			return 2;
-		}
-
-		$date = date('Y-m-d H-i-s');
-		$this->finalTarget = "$this->destinationUser/files/transferred from $this->sourceUser on $date";
-
-		// setup filesystem
-		Filesystem::initMountPoints($this->sourceUser);
-		Filesystem::initMountPoints($this->destinationUser);
-
-		$view = new View();
-		if (!$view->is_dir($this->sourcePath)) {
-			$output->writeln("<error>Unknown path provided: $sourcePathOption</error>");
-			return 1;
-		}
-
-		// analyse source folder
-		$this->analyse($output);
-
-		// collect all the shares
-		$this->collectUsersShares($output);
-
-		// transfer the files
-		$this->transfer($output);
-
-		// restore the shares
-		$this->restoreShares($output);
-	}
-
-	private function walkFiles(View $view, $path, \Closure $callBack) {
-		foreach ($view->getDirectoryContent($path) as $fileInfo) {
-			if (!$callBack($fileInfo)) {
-				return;
-			}
-			if ($fileInfo->getType() === FileInfo::TYPE_FOLDER) {
-				$this->walkFiles($view, $fileInfo->getPath(), $callBack);
-			}
-		}
-	}
-
-	/**
-	 * @param OutputInterface $output
-	 * @throws \Exception
-	 */
-	protected function analyse(OutputInterface $output) {
-		$view = new View();
-		$output->writeln("Analysing files of $this->sourceUser ...");
-		$progress = new ProgressBar($output);
-		$progress->start();
-		$self = $this;
-
-		$this->walkFiles($view, $this->sourcePath,
-				function (FileInfo $fileInfo) use ($progress, $self) {
-					if ($fileInfo->getType() === FileInfo::TYPE_FOLDER) {
-						// only analyze into folders from main storage,
-						if (!$fileInfo->getStorage()->instanceOfStorage(IHomeStorage::class)) {
-							return false;
-						}
-						return true;
-					}
-					$progress->advance();
-					$this->allFiles[] = $fileInfo;
-					if ($fileInfo->isEncrypted()) {
-						$this->encryptedFiles[] = $fileInfo;
-					}
-					return true;
-				});
-		$progress->finish();
-		$output->writeln('');
-
-		// no file is allowed to be encrypted
-		if (!empty($this->encryptedFiles)) {
-			$output->writeln("<error>Some files are encrypted - please decrypt them first</error>");
-			foreach($this->encryptedFiles as $encryptedFile) {
-				/** @var FileInfo $encryptedFile */
-				$output->writeln("  " . $encryptedFile->getPath());
-			}
-			throw new \Exception('Execution terminated.');
-		}
-
-	}
-
-	/**
-	 * @param OutputInterface $output
-	 */
-	private function collectUsersShares(OutputInterface $output) {
-		$output->writeln("Collecting all share information for files and folder of $this->sourceUser ...");
-
-		$progress = new ProgressBar($output, count($this->shares));
-		foreach([\OCP\Share::SHARE_TYPE_GROUP, \OCP\Share::SHARE_TYPE_USER, \OCP\Share::SHARE_TYPE_LINK, \OCP\Share::SHARE_TYPE_REMOTE] as $shareType) {
-		$offset = 0;
-			while (true) {
-				$sharePage = $this->shareManager->getSharesBy($this->sourceUser, $shareType, null, true, 50, $offset);
-				$progress->advance(count($sharePage));
-				if (empty($sharePage)) {
-					break;
-				}
-				$this->shares = array_merge($this->shares, $sharePage);
-				$offset += 50;
-			}
-		}
-
-		$progress->finish();
-		$output->writeln('');
-	}
-
-	/**
-	 * @param OutputInterface $output
-	 */
-	protected function transfer(OutputInterface $output) {
-		$view = new View();
-		$output->writeln("Transferring files to $this->finalTarget ...");
-
-		// This change will help user to transfer the folder specified using --path option.
-		// Else only the content inside folder is transferred which is not correct.
-		if($this->sourcePath !== "$this->sourceUser/files") {
-			$view->mkdir($this->finalTarget);
-			$this->finalTarget = $this->finalTarget . '/' . basename($this->sourcePath);
-		}
-		$view->rename($this->sourcePath, $this->finalTarget);
-		if (!is_dir("$this->sourceUser/files")) {
-			// because the files folder is moved away we need to recreate it
-			$view->mkdir("$this->sourceUser/files");
-		}
-	}
-
-	/**
-	 * @param OutputInterface $output
-	 */
-	private function restoreShares(OutputInterface $output) {
-		$output->writeln("Restoring shares ...");
-		$progress = new ProgressBar($output, count($this->shares));
-
-		foreach($this->shares as $share) {
-			try {
-				if ($share->getSharedWith() === $this->destinationUser) {
-					// Unmount the shares before deleting, so we don't try to get the storage later on.
-					$shareMountPoint = $this->mountManager->find('/' . $this->destinationUser . '/files' . $share->getTarget());
-					if ($shareMountPoint) {
-						$this->mountManager->removeMount($shareMountPoint->getMountPoint());
-					}
-					$this->shareManager->deleteShare($share);
-				} else {
-					if ($share->getShareOwner() === $this->sourceUser) {
-						$share->setShareOwner($this->destinationUser);
-					}
-					if ($share->getSharedBy() === $this->sourceUser) {
-						$share->setSharedBy($this->destinationUser);
-					}
-
-					$this->shareManager->updateShare($share);
-				}
-			} catch (\OCP\Files\NotFoundException $e) {
-				$output->writeln('<error>Share with id ' . $share->getId() . ' points at deleted file, skipping</error>');
-			} catch (\Exception $e) {
-				$output->writeln('<error>Could not restore share with id ' . $share->getId() . ':' . $e->getTraceAsString() . '</error>');
-			}
-			$progress->advance();
-		}
-		$progress->finish();
-		$output->writeln('');
-	}
+    /** @var IUserManager $userManager */
+    private $userManager;
+
+    /** @var IManager */
+    private $shareManager;
+
+    /** @var IMountManager */
+    private $mountManager;
+
+    /** @var FileInfo[] */
+    private $allFiles = [];
+
+    /** @var FileInfo[] */
+    private $encryptedFiles = [];
+
+    /** @var IShare[] */
+    private $shares = [];
+
+    /** @var string */
+    private $sourceUser;
+
+    /** @var string */
+    private $destinationUser;
+
+    /** @var string */
+    private $sourcePath;
+
+    /** @var string */
+    private $finalTarget;
+
+    public function __construct(IUserManager $userManager, IManager $shareManager, IMountManager $mountManager) {
+        $this->userManager = $userManager;
+        $this->shareManager = $shareManager;
+        $this->mountManager = $mountManager;
+        parent::__construct();
+    }
+
+    protected function configure() {
+        $this
+            ->setName('files:transfer-ownership')
+            ->setDescription('All files and folders are moved to another user - shares are moved as well.')
+            ->addArgument(
+                'source-user',
+                InputArgument::REQUIRED,
+                'owner of files which shall be moved'
+            )
+            ->addArgument(
+                'destination-user',
+                InputArgument::REQUIRED,
+                'user who will be the new owner of the files'
+            )
+            ->addOption(
+                'path',
+                null,
+                InputOption::VALUE_REQUIRED,
+                'selectively provide the path to transfer. For example --path="folder_name"',
+                ''
+            );
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $sourceUserObject = $this->userManager->get($input->getArgument('source-user'));
+        $destinationUserObject = $this->userManager->get($input->getArgument('destination-user'));
+
+        if (!$sourceUserObject instanceof IUser) {
+            $output->writeln("<error>Unknown source user $this->sourceUser</error>");
+            return 1;
+        }
+
+        if (!$destinationUserObject instanceof IUser) {
+            $output->writeln("<error>Unknown destination user $this->destinationUser</error>");
+            return 1;
+        }
+
+        $this->sourceUser = $sourceUserObject->getUID();
+        $this->destinationUser = $destinationUserObject->getUID();
+        $sourcePathOption = ltrim($input->getOption('path'), '/');
+        $this->sourcePath = rtrim($this->sourceUser . '/files/' . $sourcePathOption, '/');
+
+        // target user has to be ready
+        if (!\OC::$server->getEncryptionManager()->isReadyForUser($this->destinationUser)) {
+            $output->writeln("<error>The target user is not ready to accept files. The user has at least to be logged in once.</error>");
+            return 2;
+        }
+
+        $date = date('Y-m-d H-i-s');
+        $this->finalTarget = "$this->destinationUser/files/transferred from $this->sourceUser on $date";
+
+        // setup filesystem
+        Filesystem::initMountPoints($this->sourceUser);
+        Filesystem::initMountPoints($this->destinationUser);
+
+        $view = new View();
+        if (!$view->is_dir($this->sourcePath)) {
+            $output->writeln("<error>Unknown path provided: $sourcePathOption</error>");
+            return 1;
+        }
+
+        // analyse source folder
+        $this->analyse($output);
+
+        // collect all the shares
+        $this->collectUsersShares($output);
+
+        // transfer the files
+        $this->transfer($output);
+
+        // restore the shares
+        $this->restoreShares($output);
+    }
+
+    private function walkFiles(View $view, $path, \Closure $callBack) {
+        foreach ($view->getDirectoryContent($path) as $fileInfo) {
+            if (!$callBack($fileInfo)) {
+                return;
+            }
+            if ($fileInfo->getType() === FileInfo::TYPE_FOLDER) {
+                $this->walkFiles($view, $fileInfo->getPath(), $callBack);
+            }
+        }
+    }
+
+    /**
+     * @param OutputInterface $output
+     * @throws \Exception
+     */
+    protected function analyse(OutputInterface $output) {
+        $view = new View();
+        $output->writeln("Analysing files of $this->sourceUser ...");
+        $progress = new ProgressBar($output);
+        $progress->start();
+        $self = $this;
+
+        $this->walkFiles($view, $this->sourcePath,
+                function (FileInfo $fileInfo) use ($progress, $self) {
+                    if ($fileInfo->getType() === FileInfo::TYPE_FOLDER) {
+                        // only analyze into folders from main storage,
+                        if (!$fileInfo->getStorage()->instanceOfStorage(IHomeStorage::class)) {
+                            return false;
+                        }
+                        return true;
+                    }
+                    $progress->advance();
+                    $this->allFiles[] = $fileInfo;
+                    if ($fileInfo->isEncrypted()) {
+                        $this->encryptedFiles[] = $fileInfo;
+                    }
+                    return true;
+                });
+        $progress->finish();
+        $output->writeln('');
+
+        // no file is allowed to be encrypted
+        if (!empty($this->encryptedFiles)) {
+            $output->writeln("<error>Some files are encrypted - please decrypt them first</error>");
+            foreach($this->encryptedFiles as $encryptedFile) {
+                /** @var FileInfo $encryptedFile */
+                $output->writeln("  " . $encryptedFile->getPath());
+            }
+            throw new \Exception('Execution terminated.');
+        }
+
+    }
+
+    /**
+     * @param OutputInterface $output
+     */
+    private function collectUsersShares(OutputInterface $output) {
+        $output->writeln("Collecting all share information for files and folder of $this->sourceUser ...");
+
+        $progress = new ProgressBar($output, count($this->shares));
+        foreach([\OCP\Share::SHARE_TYPE_GROUP, \OCP\Share::SHARE_TYPE_USER, \OCP\Share::SHARE_TYPE_LINK, \OCP\Share::SHARE_TYPE_REMOTE] as $shareType) {
+        $offset = 0;
+            while (true) {
+                $sharePage = $this->shareManager->getSharesBy($this->sourceUser, $shareType, null, true, 50, $offset);
+                $progress->advance(count($sharePage));
+                if (empty($sharePage)) {
+                    break;
+                }
+                $this->shares = array_merge($this->shares, $sharePage);
+                $offset += 50;
+            }
+        }
+
+        $progress->finish();
+        $output->writeln('');
+    }
+
+    /**
+     * @param OutputInterface $output
+     */
+    protected function transfer(OutputInterface $output) {
+        $view = new View();
+        $output->writeln("Transferring files to $this->finalTarget ...");
+
+        // This change will help user to transfer the folder specified using --path option.
+        // Else only the content inside folder is transferred which is not correct.
+        if($this->sourcePath !== "$this->sourceUser/files") {
+            $view->mkdir($this->finalTarget);
+            $this->finalTarget = $this->finalTarget . '/' . basename($this->sourcePath);
+        }
+        $view->rename($this->sourcePath, $this->finalTarget);
+        if (!is_dir("$this->sourceUser/files")) {
+            // because the files folder is moved away we need to recreate it
+            $view->mkdir("$this->sourceUser/files");
+        }
+    }
+
+    /**
+     * @param OutputInterface $output
+     */
+    private function restoreShares(OutputInterface $output) {
+        $output->writeln("Restoring shares ...");
+        $progress = new ProgressBar($output, count($this->shares));
+
+        foreach($this->shares as $share) {
+            try {
+                if ($share->getSharedWith() === $this->destinationUser) {
+                    // Unmount the shares before deleting, so we don't try to get the storage later on.
+                    $shareMountPoint = $this->mountManager->find('/' . $this->destinationUser . '/files' . $share->getTarget());
+                    if ($shareMountPoint) {
+                        $this->mountManager->removeMount($shareMountPoint->getMountPoint());
+                    }
+                    $this->shareManager->deleteShare($share);
+                } else {
+                    if ($share->getShareOwner() === $this->sourceUser) {
+                        $share->setShareOwner($this->destinationUser);
+                    }
+                    if ($share->getSharedBy() === $this->sourceUser) {
+                        $share->setSharedBy($this->destinationUser);
+                    }
+
+                    $this->shareManager->updateShare($share);
+                }
+            } catch (\OCP\Files\NotFoundException $e) {
+                $output->writeln('<error>Share with id ' . $share->getId() . ' points at deleted file, skipping</error>');
+            } catch (\Exception $e) {
+                $output->writeln('<error>Could not restore share with id ' . $share->getId() . ':' . $e->getTraceAsString() . '</error>');
+            }
+            $progress->advance();
+        }
+        $progress->finish();
+        $output->writeln('');
+    }
 }

apps/workflowengine/lib/Check/FileMimeType.php

Indentation +155 added lines, -155 removed lines

@@ -29,159 +29,159 @@
 
 class FileMimeType extends AbstractStringCheck {
 
-	/** @var array */
-	protected $mimeType;
-
-	/** @var IRequest */
-	protected $request;
-
-	/** @var IMimeTypeDetector */
-	protected $mimeTypeDetector;
-
-	/** @var IStorage */
-	protected $storage;
-
-	/** @var string */
-	protected $path;
-
-	/**
-	 * @param IL10N $l
-	 * @param IRequest $request
-	 * @param IMimeTypeDetector $mimeTypeDetector
-	 */
-	public function __construct(IL10N $l, IRequest $request, IMimeTypeDetector $mimeTypeDetector) {
-		parent::__construct($l);
-		$this->request = $request;
-		$this->mimeTypeDetector = $mimeTypeDetector;
-	}
-
-	/**
-	 * @param IStorage $storage
-	 * @param string $path
-	 */
-	public function setFileInfo(IStorage $storage, $path) {
-		$this->storage = $storage;
-		$this->path = $path;
-		if (!isset($this->mimeType[$this->storage->getId()][$this->path])
-			|| $this->mimeType[$this->storage->getId()][$this->path] === '') {
-			$this->mimeType[$this->storage->getId()][$this->path] = null;
-		}
-	}
-
-	/**
-	 * @return string
-	 */
-	protected function getActualValue() {
-		if ($this->mimeType[$this->storage->getId()][$this->path] !== null) {
-			return $this->mimeType[$this->storage->getId()][$this->path];
-		}
-
-		if ($this->isWebDAVRequest()) {
-			// Creating a folder
-			if ($this->request->getMethod() === 'MKCOL') {
-				$this->mimeType[$this->storage->getId()][$this->path] = 'httpd/unix-directory';
-				return $this->mimeType[$this->storage->getId()][$this->path];
-			}
-
-			if ($this->request->getMethod() === 'PUT') {
-				$path = $this->request->getPathInfo();
-				$this->mimeType[$this->storage->getId()][$this->path] = $this->mimeTypeDetector->detectPath($path);
-				return $this->mimeType[$this->storage->getId()][$this->path];
-			}
-		} else if ($this->isPublicWebDAVRequest()) {
-			if ($this->request->getMethod() === 'PUT') {
-				$path = $this->request->getPathInfo();
-				if (strpos($path, '/webdav/') === 0) {
-					$path = substr($path, strlen('/webdav'));
-				}
-				$path = $this->path . $path;
-				$this->mimeType[$this->storage->getId()][$path] = $this->mimeTypeDetector->detectPath($path);
-				return $this->mimeType[$this->storage->getId()][$path];
-			}
-		}
-
-		if (in_array($this->request->getMethod(), ['POST', 'PUT'])) {
-			$files = $this->request->getUploadedFile('files');
-			if (isset($files['type'][0])) {
-				$mimeType = $files['type'][0];
-				if ($this->mimeType === 'application/octet-stream') {
-					// Maybe not...
-					$mimeTypeTest = $this->mimeTypeDetector->detectPath($files['name'][0]);
-					if ($mimeTypeTest !== 'application/octet-stream' && $mimeTypeTest !== false) {
-						$mimeType = $mimeTypeTest;
-					} else {
-						$mimeTypeTest = $this->mimeTypeDetector->detect($files['tmp_name'][0]);
-						if ($mimeTypeTest !== 'application/octet-stream' && $mimeTypeTest !== false) {
-							$mimeType = $mimeTypeTest;
-						}
-					}
-				}
-				$this->mimeType[$this->storage->getId()][$this->path] = $mimeType;
-				return $mimeType;
-			}
-		}
-
-		$this->mimeType[$this->storage->getId()][$this->path] = $this->storage->getMimeType($this->path);
-		if ($this->mimeType[$this->storage->getId()][$this->path] === 'application/octet-stream') {
-			$this->mimeType[$this->storage->getId()][$this->path] = $this->detectMimetypeFromPath();
-		}
-
-		return $this->mimeType[$this->storage->getId()][$this->path];
-	}
-
-	/**
-	 * @return string
-	 */
-	protected function detectMimetypeFromPath() {
-		$mimeType = $this->mimeTypeDetector->detectPath($this->path);
-		if ($mimeType !== 'application/octet-stream' && $mimeType !== false) {
-			return $mimeType;
-		}
-
-		if ($this->storage->instanceOfStorage('\OC\Files\Storage\Local')
-			|| $this->storage->instanceOfStorage('\OC\Files\Storage\Home')
-			|| $this->storage->instanceOfStorage('\OC\Files\ObjectStore\HomeObjectStoreStorage')) {
-			$localFile = $this->storage->getLocalFile($this->path);
-			if ($localFile !== false) {
-				$mimeType = $this->mimeTypeDetector->detect($localFile);
-				if ($mimeType !== false) {
-					return $mimeType;
-				}
-			}
-
-			return 'application/octet-stream';
-		} else {
-			$handle = $this->storage->fopen($this->path, 'r');
-			$data = fread($handle, 8024);
-			fclose($handle);
-			$mimeType = $this->mimeTypeDetector->detectString($data);
-			if ($mimeType !== false) {
-				return $mimeType;
-			}
-
-			return 'application/octet-stream';
-		}
-	}
-
-	/**
-	 * @return bool
-	 */
-	protected function isWebDAVRequest() {
-		return substr($this->request->getScriptName(), 0 - strlen('/remote.php')) === '/remote.php' && (
-			$this->request->getPathInfo() === '/webdav' ||
-			strpos($this->request->getPathInfo(), '/webdav/') === 0 ||
-			$this->request->getPathInfo() === '/dav/files' ||
-			strpos($this->request->getPathInfo(), '/dav/files/') === 0
-		);
-	}
-
-	/**
-	 * @return bool
-	 */
-	protected function isPublicWebDAVRequest() {
-		return substr($this->request->getScriptName(), 0 - strlen('/public.php')) === '/public.php' && (
-			$this->request->getPathInfo() === '/webdav' ||
-			strpos($this->request->getPathInfo(), '/webdav/') === 0
-		);
-	}
+    /** @var array */
+    protected $mimeType;
+
+    /** @var IRequest */
+    protected $request;
+
+    /** @var IMimeTypeDetector */
+    protected $mimeTypeDetector;
+
+    /** @var IStorage */
+    protected $storage;
+
+    /** @var string */
+    protected $path;
+
+    /**
+     * @param IL10N $l
+     * @param IRequest $request
+     * @param IMimeTypeDetector $mimeTypeDetector
+     */
+    public function __construct(IL10N $l, IRequest $request, IMimeTypeDetector $mimeTypeDetector) {
+        parent::__construct($l);
+        $this->request = $request;
+        $this->mimeTypeDetector = $mimeTypeDetector;
+    }
+
+    /**
+     * @param IStorage $storage
+     * @param string $path
+     */
+    public function setFileInfo(IStorage $storage, $path) {
+        $this->storage = $storage;
+        $this->path = $path;
+        if (!isset($this->mimeType[$this->storage->getId()][$this->path])
+            || $this->mimeType[$this->storage->getId()][$this->path] === '') {
+            $this->mimeType[$this->storage->getId()][$this->path] = null;
+        }
+    }
+
+    /**
+     * @return string
+     */
+    protected function getActualValue() {
+        if ($this->mimeType[$this->storage->getId()][$this->path] !== null) {
+            return $this->mimeType[$this->storage->getId()][$this->path];
+        }
+
+        if ($this->isWebDAVRequest()) {
+            // Creating a folder
+            if ($this->request->getMethod() === 'MKCOL') {
+                $this->mimeType[$this->storage->getId()][$this->path] = 'httpd/unix-directory';
+                return $this->mimeType[$this->storage->getId()][$this->path];
+            }
+
+            if ($this->request->getMethod() === 'PUT') {
+                $path = $this->request->getPathInfo();
+                $this->mimeType[$this->storage->getId()][$this->path] = $this->mimeTypeDetector->detectPath($path);
+                return $this->mimeType[$this->storage->getId()][$this->path];
+            }
+        } else if ($this->isPublicWebDAVRequest()) {
+            if ($this->request->getMethod() === 'PUT') {
+                $path = $this->request->getPathInfo();
+                if (strpos($path, '/webdav/') === 0) {
+                    $path = substr($path, strlen('/webdav'));
+                }
+                $path = $this->path . $path;
+                $this->mimeType[$this->storage->getId()][$path] = $this->mimeTypeDetector->detectPath($path);
+                return $this->mimeType[$this->storage->getId()][$path];
+            }
+        }
+
+        if (in_array($this->request->getMethod(), ['POST', 'PUT'])) {
+            $files = $this->request->getUploadedFile('files');
+            if (isset($files['type'][0])) {
+                $mimeType = $files['type'][0];
+                if ($this->mimeType === 'application/octet-stream') {
+                    // Maybe not...
+                    $mimeTypeTest = $this->mimeTypeDetector->detectPath($files['name'][0]);
+                    if ($mimeTypeTest !== 'application/octet-stream' && $mimeTypeTest !== false) {
+                        $mimeType = $mimeTypeTest;
+                    } else {
+                        $mimeTypeTest = $this->mimeTypeDetector->detect($files['tmp_name'][0]);
+                        if ($mimeTypeTest !== 'application/octet-stream' && $mimeTypeTest !== false) {
+                            $mimeType = $mimeTypeTest;
+                        }
+                    }
+                }
+                $this->mimeType[$this->storage->getId()][$this->path] = $mimeType;
+                return $mimeType;
+            }
+        }
+
+        $this->mimeType[$this->storage->getId()][$this->path] = $this->storage->getMimeType($this->path);
+        if ($this->mimeType[$this->storage->getId()][$this->path] === 'application/octet-stream') {
+            $this->mimeType[$this->storage->getId()][$this->path] = $this->detectMimetypeFromPath();
+        }
+
+        return $this->mimeType[$this->storage->getId()][$this->path];
+    }
+
+    /**
+     * @return string
+     */
+    protected function detectMimetypeFromPath() {
+        $mimeType = $this->mimeTypeDetector->detectPath($this->path);
+        if ($mimeType !== 'application/octet-stream' && $mimeType !== false) {
+            return $mimeType;
+        }
+
+        if ($this->storage->instanceOfStorage('\OC\Files\Storage\Local')
+            || $this->storage->instanceOfStorage('\OC\Files\Storage\Home')
+            || $this->storage->instanceOfStorage('\OC\Files\ObjectStore\HomeObjectStoreStorage')) {
+            $localFile = $this->storage->getLocalFile($this->path);
+            if ($localFile !== false) {
+                $mimeType = $this->mimeTypeDetector->detect($localFile);
+                if ($mimeType !== false) {
+                    return $mimeType;
+                }
+            }
+
+            return 'application/octet-stream';
+        } else {
+            $handle = $this->storage->fopen($this->path, 'r');
+            $data = fread($handle, 8024);
+            fclose($handle);
+            $mimeType = $this->mimeTypeDetector->detectString($data);
+            if ($mimeType !== false) {
+                return $mimeType;
+            }
+
+            return 'application/octet-stream';
+        }
+    }
+
+    /**
+     * @return bool
+     */
+    protected function isWebDAVRequest() {
+        return substr($this->request->getScriptName(), 0 - strlen('/remote.php')) === '/remote.php' && (
+            $this->request->getPathInfo() === '/webdav' ||
+            strpos($this->request->getPathInfo(), '/webdav/') === 0 ||
+            $this->request->getPathInfo() === '/dav/files' ||
+            strpos($this->request->getPathInfo(), '/dav/files/') === 0
+        );
+    }
+
+    /**
+     * @return bool
+     */
+    protected function isPublicWebDAVRequest() {
+        return substr($this->request->getScriptName(), 0 - strlen('/public.php')) === '/public.php' && (
+            $this->request->getPathInfo() === '/webdav' ||
+            strpos($this->request->getPathInfo(), '/webdav/') === 0
+        );
+    }
 }

lib/private/RedisFactory.php

Indentation +72 added lines, -72 removed lines

@@ -23,86 +23,86 @@
 namespace OC;
 
 class RedisFactory {
-	/** @var  \Redis */
-	private $instance;
+    /** @var  \Redis */
+    private $instance;
 
-	/** @var  SystemConfig */
-	private $config;
+    /** @var  SystemConfig */
+    private $config;
 
-	/**
-	 * RedisFactory constructor.
-	 *
-	 * @param SystemConfig $config
-	 */
-	public function __construct(SystemConfig $config) {
-		$this->config = $config;
-	}
+    /**
+     * RedisFactory constructor.
+     *
+     * @param SystemConfig $config
+     */
+    public function __construct(SystemConfig $config) {
+        $this->config = $config;
+    }
 
-	private function create() {
-		if ($config = $this->config->getValue('redis.cluster', [])) {
-			if (!class_exists('RedisCluster')) {
-				throw new \Exception('Redis Cluster support is not available');
-			}
-			// cluster config
-			if (isset($config['timeout'])) {
-				$timeout = $config['timeout'];
-			} else {
-				$timeout = null;
-			}
-			if (isset($config['read_timeout'])) {
-				$readTimeout = $config['read_timeout'];
-			} else {
-				$readTimeout = null;
-			}
-			$this->instance = new \RedisCluster(null, $config['seeds'], $timeout, $readTimeout);
+    private function create() {
+        if ($config = $this->config->getValue('redis.cluster', [])) {
+            if (!class_exists('RedisCluster')) {
+                throw new \Exception('Redis Cluster support is not available');
+            }
+            // cluster config
+            if (isset($config['timeout'])) {
+                $timeout = $config['timeout'];
+            } else {
+                $timeout = null;
+            }
+            if (isset($config['read_timeout'])) {
+                $readTimeout = $config['read_timeout'];
+            } else {
+                $readTimeout = null;
+            }
+            $this->instance = new \RedisCluster(null, $config['seeds'], $timeout, $readTimeout);
 
-			if (isset($config['failover_mode'])) {
-				$this->instance->setOption(\RedisCluster::OPT_SLAVE_FAILOVER, $config['failover_mode']);
-			}
-		} else {
+            if (isset($config['failover_mode'])) {
+                $this->instance->setOption(\RedisCluster::OPT_SLAVE_FAILOVER, $config['failover_mode']);
+            }
+        } else {
 
-			$this->instance = new \Redis();
-			$config = $this->config->getValue('redis', []);
-			if (isset($config['host'])) {
-				$host = $config['host'];
-			} else {
-				$host = '127.0.0.1';
-			}
-			if (isset($config['port'])) {
-				$port = $config['port'];
-			} else {
-				$port = 6379;
-			}
-			if (isset($config['timeout'])) {
-				$timeout = $config['timeout'];
-			} else {
-				$timeout = 0.0; // unlimited
-			}
+            $this->instance = new \Redis();
+            $config = $this->config->getValue('redis', []);
+            if (isset($config['host'])) {
+                $host = $config['host'];
+            } else {
+                $host = '127.0.0.1';
+            }
+            if (isset($config['port'])) {
+                $port = $config['port'];
+            } else {
+                $port = 6379;
+            }
+            if (isset($config['timeout'])) {
+                $timeout = $config['timeout'];
+            } else {
+                $timeout = 0.0; // unlimited
+            }
 
-			$this->instance->connect($host, $port, $timeout);
-			if (isset($config['password']) && $config['password'] !== '') {
-				$this->instance->auth($config['password']);
-			}
+            $this->instance->connect($host, $port, $timeout);
+            if (isset($config['password']) && $config['password'] !== '') {
+                $this->instance->auth($config['password']);
+            }
 
-			if (isset($config['dbindex'])) {
-				$this->instance->select($config['dbindex']);
-			}
-		}
-	}
+            if (isset($config['dbindex'])) {
+                $this->instance->select($config['dbindex']);
+            }
+        }
+    }
 
-	public function getInstance() {
-		if (!$this->isAvailable()) {
-			throw new \Exception('Redis support is not available');
-		}
-		if (!$this->instance instanceof \Redis) {
-			$this->create();
-		}
+    public function getInstance() {
+        if (!$this->isAvailable()) {
+            throw new \Exception('Redis support is not available');
+        }
+        if (!$this->instance instanceof \Redis) {
+            $this->create();
+        }
 
-		return $this->instance;
-	}
+        return $this->instance;
+    }
 
-	public function isAvailable() {
-		return extension_loaded('redis')
-		&& version_compare(phpversion('redis'), '2.2.5', '>=');
-	}
+    public function isAvailable() {
+        return extension_loaded('redis')
+        && version_compare(phpversion('redis'), '2.2.5', '>=');
+    }
 }

apps/dav/lib/Avatars/RootCollection.php

Indentation +17 added lines, -17 removed lines

@@ -7,23 +7,23 @@
 
 class RootCollection extends AbstractPrincipalCollection {
 
-	/**
-	 * This method returns a node for a principal.
-	 *
-	 * The passed array contains principal information, and is guaranteed to
-	 * at least contain a uri item. Other properties may or may not be
-	 * supplied by the authentication backend.
-	 *
-	 * @param array $principalInfo
-	 * @return AvatarHome
-	 */
-	public function getChildForPrincipal(array $principalInfo) {
-		$avatarManager = \OC::$server->getAvatarManager();
-		return new AvatarHome($principalInfo, $avatarManager);
-	}
+    /**
+     * This method returns a node for a principal.
+     *
+     * The passed array contains principal information, and is guaranteed to
+     * at least contain a uri item. Other properties may or may not be
+     * supplied by the authentication backend.
+     *
+     * @param array $principalInfo
+     * @return AvatarHome
+     */
+    public function getChildForPrincipal(array $principalInfo) {
+        $avatarManager = \OC::$server->getAvatarManager();
+        return new AvatarHome($principalInfo, $avatarManager);
+    }
 
-	public function getName() {
-		return 'avatars';
-	}
+    public function getName() {
+        return 'avatars';
+    }
 
 }