nextcloud / server

lib/public/Settings/IIconSection.php

Doc Comments +1 added lines

@@ -33,6 +33,7 @@
 	 *
 	 * @returns string
 	 * @since 12
+	 * @return string
 	 */
 	public function getIcon();
 }

Indentation +8 added lines, -8 removed lines

@@ -27,12 +27,12 @@
  * @since 12
  */
 interface IIconSection extends ISection {
-	/**
-	 * returns the relative path to an 16*16 icon describing the section.
-	 * e.g. '/core/img/places/files.svg'
-	 *
-	 * @returns string
-	 * @since 12
-	 */
-	public function getIcon();
+    /**
+     * returns the relative path to an 16*16 icon describing the section.
+     * e.g. '/core/img/places/files.svg'
+     *
+     * @returns string
+     * @since 12
+     */
+    public function getIcon();
 }

apps/dav/lib/CalDAV/Publishing/Xml/Publisher.php

Unused Use Statements -1 removed lines

@@ -20,7 +20,6 @@
  */
 namespace OCA\DAV\CalDAV\Publishing\Xml;
 
-use OCA\DAV\CalDAV\Publishing\PublishPlugin as Plugin;
 use Sabre\Xml\Writer;
 use Sabre\Xml\XmlSerializable;
 

Indentation +50 added lines, -50 removed lines

@@ -26,58 +26,58 @@
 
 class Publisher implements XmlSerializable {
 
-	/**
-	 * @var string $publishUrl
-	 */
-	protected $publishUrl;
+    /**
+     * @var string $publishUrl
+     */
+    protected $publishUrl;
 
-	/**
-	 * @var boolean $isPublished
-	 */
-	protected $isPublished;
+    /**
+     * @var boolean $isPublished
+     */
+    protected $isPublished;
 
-	/**
-	 * @param string $publishUrl
-	 * @param boolean $isPublished
-	 */
-	function __construct($publishUrl, $isPublished) {
-		$this->publishUrl = $publishUrl;
-		$this->isPublished = $isPublished;
-	}
+    /**
+     * @param string $publishUrl
+     * @param boolean $isPublished
+     */
+    function __construct($publishUrl, $isPublished) {
+        $this->publishUrl = $publishUrl;
+        $this->isPublished = $isPublished;
+    }
 
-	/**
-	 * @return string
-	 */
-	function getValue() {
-		return $this->publishUrl;
-	}
+    /**
+     * @return string
+     */
+    function getValue() {
+        return $this->publishUrl;
+    }
 
-	/**
-	 * The xmlSerialize metod is called during xml writing.
-	 *
-	 * Use the $writer argument to write its own xml serialization.
-	 *
-	 * An important note: do _not_ create a parent element. Any element
-	 * implementing XmlSerializble should only ever write what's considered
-	 * its 'inner xml'.
-	 *
-	 * The parent of the current element is responsible for writing a
-	 * containing element.
-	 *
-	 * This allows serializers to be re-used for different element names.
-	 *
-	 * If you are opening new elements, you must also close them again.
-	 *
-	 * @param Writer $writer
-	 * @return void
-	 */
-	function xmlSerialize(Writer $writer) {
-		if (!$this->isPublished) {
-			// for pre-publish-url
-			$writer->write($this->publishUrl);
-		} else {
-			// for publish-url
-			$writer->writeElement('{DAV:}href', $this->publishUrl);
-		}
-	}
+    /**
+     * The xmlSerialize metod is called during xml writing.
+     *
+     * Use the $writer argument to write its own xml serialization.
+     *
+     * An important note: do _not_ create a parent element. Any element
+     * implementing XmlSerializble should only ever write what's considered
+     * its 'inner xml'.
+     *
+     * The parent of the current element is responsible for writing a
+     * containing element.
+     *
+     * This allows serializers to be re-used for different element names.
+     *
+     * If you are opening new elements, you must also close them again.
+     *
+     * @param Writer $writer
+     * @return void
+     */
+    function xmlSerialize(Writer $writer) {
+        if (!$this->isPublished) {
+            // for pre-publish-url
+            $writer->write($this->publishUrl);
+        } else {
+            // for publish-url
+            $writer->writeElement('{DAV:}href', $this->publishUrl);
+        }
+    }
 }

apps/dav/lib/Connector/Sabre/FilesPlugin.php

Unused Use Statements -1 removed lines

@@ -31,7 +31,6 @@
 namespace OCA\DAV\Connector\Sabre;
 
 use OC\Files\View;
-use OCA\DAV\Upload\FutureFile;
 use OCP\Files\ForbiddenException;
 use OCP\IPreview;
 use Sabre\DAV\Exception\Forbidden;

Braces +3 added lines, -1 removed lines

@@ -245,7 +245,9 @@
 	function httpGet(RequestInterface $request, ResponseInterface $response) {
 		// Only handle valid files
 		$node = $this->tree->getNodeForPath($request->getPath());
-		if (!($node instanceof IFile)) return;
+		if (!($node instanceof IFile)) {
+		    return;
+		}
 
 		// adds a 'Content-Disposition: attachment' header in case no disposition
 		// header has been set before

Indentation +391 added lines, -391 removed lines

@@ -51,395 +51,395 @@
 
 class FilesPlugin extends ServerPlugin {
 
-	// namespace
-	const NS_OWNCLOUD = 'http://owncloud.org/ns';
-	const NS_NEXTCLOUD = 'http://nextcloud.org/ns';
-	const FILEID_PROPERTYNAME = '{http://owncloud.org/ns}id';
-	const INTERNAL_FILEID_PROPERTYNAME = '{http://owncloud.org/ns}fileid';
-	const PERMISSIONS_PROPERTYNAME = '{http://owncloud.org/ns}permissions';
-	const SHARE_PERMISSIONS_PROPERTYNAME = '{http://open-collaboration-services.org/ns}share-permissions';
-	const DOWNLOADURL_PROPERTYNAME = '{http://owncloud.org/ns}downloadURL';
-	const SIZE_PROPERTYNAME = '{http://owncloud.org/ns}size';
-	const GETETAG_PROPERTYNAME = '{DAV:}getetag';
-	const LASTMODIFIED_PROPERTYNAME = '{DAV:}lastmodified';
-	const OWNER_ID_PROPERTYNAME = '{http://owncloud.org/ns}owner-id';
-	const OWNER_DISPLAY_NAME_PROPERTYNAME = '{http://owncloud.org/ns}owner-display-name';
-	const CHECKSUMS_PROPERTYNAME = '{http://owncloud.org/ns}checksums';
-	const DATA_FINGERPRINT_PROPERTYNAME = '{http://owncloud.org/ns}data-fingerprint';
-	const HAS_PREVIEW_PROPERTYNAME = '{http://nextcloud.org/ns}has-preview';
-
-	/**
-	 * Reference to main server object
-	 *
-	 * @var \Sabre\DAV\Server
-	 */
-	private $server;
-
-	/**
-	 * @var Tree
-	 */
-	private $tree;
-
-	/**
-	 * Whether this is public webdav.
-	 * If true, some returned information will be stripped off.
-	 *
-	 * @var bool
-	 */
-	private $isPublic;
-
-	/**
-	 * @var View
-	 */
-	private $fileView;
-
-	/**
-	 * @var bool
-	 */
-	private $downloadAttachment;
-
-	/**
-	 * @var IConfig
-	 */
-	private $config;
-
-	/**
-	 * @var IRequest
-	 */
-	private $request;
-
-	/**
-	 * @var IPreview
-	 */
-	private $previewManager;
-
-	/**
-	 * @param Tree $tree
-	 * @param IConfig $config
-	 * @param IRequest $request
-	 * @param IPreview $previewManager
-	 * @param bool $isPublic
-	 * @param bool $downloadAttachment
-	 */
-	public function __construct(Tree $tree,
-								IConfig $config,
-								IRequest $request,
-								IPreview $previewManager,
-								$isPublic = false,
-								$downloadAttachment = true) {
-		$this->tree = $tree;
-		$this->config = $config;
-		$this->request = $request;
-		$this->isPublic = $isPublic;
-		$this->downloadAttachment = $downloadAttachment;
-		$this->previewManager = $previewManager;
-	}
-
-	/**
-	 * This initializes the plugin.
-	 *
-	 * This function is called by \Sabre\DAV\Server, after
-	 * addPlugin is called.
-	 *
-	 * This method should set up the required event subscriptions.
-	 *
-	 * @param \Sabre\DAV\Server $server
-	 * @return void
-	 */
-	public function initialize(\Sabre\DAV\Server $server) {
-
-		$server->xml->namespaceMap[self::NS_OWNCLOUD] = 'oc';
-		$server->xml->namespaceMap[self::NS_NEXTCLOUD] = 'nc';
-		$server->protectedProperties[] = self::FILEID_PROPERTYNAME;
-		$server->protectedProperties[] = self::INTERNAL_FILEID_PROPERTYNAME;
-		$server->protectedProperties[] = self::PERMISSIONS_PROPERTYNAME;
-		$server->protectedProperties[] = self::SHARE_PERMISSIONS_PROPERTYNAME;
-		$server->protectedProperties[] = self::SIZE_PROPERTYNAME;
-		$server->protectedProperties[] = self::DOWNLOADURL_PROPERTYNAME;
-		$server->protectedProperties[] = self::OWNER_ID_PROPERTYNAME;
-		$server->protectedProperties[] = self::OWNER_DISPLAY_NAME_PROPERTYNAME;
-		$server->protectedProperties[] = self::CHECKSUMS_PROPERTYNAME;
-		$server->protectedProperties[] = self::DATA_FINGERPRINT_PROPERTYNAME;
-		$server->protectedProperties[] = self::HAS_PREVIEW_PROPERTYNAME;
-
-		// normally these cannot be changed (RFC4918), but we want them modifiable through PROPPATCH
-		$allowedProperties = ['{DAV:}getetag'];
-		$server->protectedProperties = array_diff($server->protectedProperties, $allowedProperties);
-
-		$this->server = $server;
-		$this->server->on('propFind', array($this, 'handleGetProperties'));
-		$this->server->on('propPatch', array($this, 'handleUpdateProperties'));
-		$this->server->on('afterBind', array($this, 'sendFileIdHeader'));
-		$this->server->on('afterWriteContent', array($this, 'sendFileIdHeader'));
-		$this->server->on('afterMethod:GET', [$this,'httpGet']);
-		$this->server->on('afterMethod:GET', array($this, 'handleDownloadToken'));
-		$this->server->on('afterResponse', function($request, ResponseInterface $response) {
-			$body = $response->getBody();
-			if (is_resource($body)) {
-				fclose($body);
-			}
-		});
-		$this->server->on('beforeMove', [$this, 'checkMove']);
-	}
-
-	/**
-	 * Plugin that checks if a move can actually be performed.
-	 *
-	 * @param string $source source path
-	 * @param string $destination destination path
-	 * @throws Forbidden
-	 * @throws NotFound
-	 */
-	function checkMove($source, $destination) {
-		$sourceNode = $this->tree->getNodeForPath($source);
-		if (!$sourceNode instanceof Node) {
-			return;
-		}
-		list($sourceDir,) = \Sabre\HTTP\URLUtil::splitPath($source);
-		list($destinationDir,) = \Sabre\HTTP\URLUtil::splitPath($destination);
-
-		if ($sourceDir !== $destinationDir) {
-			$sourceNodeFileInfo = $sourceNode->getFileInfo();
-			if (is_null($sourceNodeFileInfo)) {
-				throw new NotFound($source . ' does not exist');
-			}
-
-			if (!$sourceNodeFileInfo->isDeletable()) {
-				throw new Forbidden($source . " cannot be deleted");
-			}
-		}
-	}
-
-	/**
-	 * This sets a cookie to be able to recognize the start of the download
-	 * the content must not be longer than 32 characters and must only contain
-	 * alphanumeric characters
-	 *
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 */
-	function handleDownloadToken(RequestInterface $request, ResponseInterface $response) {
-		$queryParams = $request->getQueryParameters();
-
-		/**
-		 * this sets a cookie to be able to recognize the start of the download
-		 * the content must not be longer than 32 characters and must only contain
-		 * alphanumeric characters
-		 */
-		if (isset($queryParams['downloadStartSecret'])) {
-			$token = $queryParams['downloadStartSecret'];
-			if (!isset($token[32])
-				&& preg_match('!^[a-zA-Z0-9]+$!', $token) === 1) {
-				// FIXME: use $response->setHeader() instead
-				setcookie('ocDownloadStarted', $token, time() + 20, '/');
-			}
-		}
-	}
-
-	/**
-	 * Add headers to file download
-	 *
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 */
-	function httpGet(RequestInterface $request, ResponseInterface $response) {
-		// Only handle valid files
-		$node = $this->tree->getNodeForPath($request->getPath());
-		if (!($node instanceof IFile)) return;
-
-		// adds a 'Content-Disposition: attachment' header in case no disposition
-		// header has been set before
-		if ($this->downloadAttachment &&
-			$response->getHeader('Content-Disposition') === null) {
-			$filename = $node->getName();
-			if ($this->request->isUserAgent(
-				[
-					\OC\AppFramework\Http\Request::USER_AGENT_IE,
-					\OC\AppFramework\Http\Request::USER_AGENT_ANDROID_MOBILE_CHROME,
-					\OC\AppFramework\Http\Request::USER_AGENT_FREEBOX,
-				])) {
-				$response->addHeader('Content-Disposition', 'attachment; filename="' . rawurlencode($filename) . '"');
-			} else {
-				$response->addHeader('Content-Disposition', 'attachment; filename*=UTF-8\'\'' . rawurlencode($filename)
-													 . '; filename="' . rawurlencode($filename) . '"');
-			}
-		}
-
-		if ($node instanceof \OCA\DAV\Connector\Sabre\File) {
-			//Add OC-Checksum header
-			/** @var $node File */
-			$checksum = $node->getChecksum();
-			if ($checksum !== null && $checksum !== '') {
-				$response->addHeader('OC-Checksum', $checksum);
-			}
-		}
-	}
-
-	/**
-	 * Adds all ownCloud-specific properties
-	 *
-	 * @param PropFind $propFind
-	 * @param \Sabre\DAV\INode $node
-	 * @return void
-	 */
-	public function handleGetProperties(PropFind $propFind, \Sabre\DAV\INode $node) {
-
-		$httpRequest = $this->server->httpRequest;
-
-		if ($node instanceof \OCA\DAV\Connector\Sabre\Node) {
-
-			$propFind->handle(self::FILEID_PROPERTYNAME, function() use ($node) {
-				return $node->getFileId();
-			});
-
-			$propFind->handle(self::INTERNAL_FILEID_PROPERTYNAME, function() use ($node) {
-				return $node->getInternalFileId();
-			});
-
-			$propFind->handle(self::PERMISSIONS_PROPERTYNAME, function() use ($node) {
-				$perms = $node->getDavPermissions();
-				if ($this->isPublic) {
-					// remove mount information
-					$perms = str_replace(['S', 'M'], '', $perms);
-				}
-				return $perms;
-			});
-
-			$propFind->handle(self::SHARE_PERMISSIONS_PROPERTYNAME, function() use ($node, $httpRequest) {
-				return $node->getSharePermissions(
-					$httpRequest->getRawServerValue('PHP_AUTH_USER')
-				);
-			});
-
-			$propFind->handle(self::GETETAG_PROPERTYNAME, function() use ($node) {
-				return $node->getETag();
-			});
-
-			$propFind->handle(self::OWNER_ID_PROPERTYNAME, function() use ($node) {
-				$owner = $node->getOwner();
-				if (!$owner) {
-					return null;
-				} else {
-					return $owner->getUID();
-				}
-			});
-			$propFind->handle(self::OWNER_DISPLAY_NAME_PROPERTYNAME, function() use ($node) {
-				$owner = $node->getOwner();
-				if (!$owner) {
-					return null;
-				} else {
-					return $owner->getDisplayName();
-				}
-			});
-
-			$propFind->handle(self::HAS_PREVIEW_PROPERTYNAME, function () use ($node) {
-				return json_encode($this->previewManager->isAvailable($node->getFileInfo()));
-			});
-			$propFind->handle(self::SIZE_PROPERTYNAME, function() use ($node) {
-				return $node->getSize();
-			});
-		}
-
-		if ($node instanceof \OCA\DAV\Connector\Sabre\Node) {
-			$propFind->handle(self::DATA_FINGERPRINT_PROPERTYNAME, function() use ($node) {
-				return $this->config->getSystemValue('data-fingerprint', '');
-			});
-		}
-
-		if ($node instanceof \OCA\DAV\Connector\Sabre\File) {
-			$propFind->handle(self::DOWNLOADURL_PROPERTYNAME, function() use ($node) {
-				/** @var $node \OCA\DAV\Connector\Sabre\File */
-				try {
-					$directDownloadUrl = $node->getDirectDownload();
-					if (isset($directDownloadUrl['url'])) {
-						return $directDownloadUrl['url'];
-					}
-				} catch (StorageNotAvailableException $e) {
-					return false;
-				} catch (ForbiddenException $e) {
-					return false;
-				}
-				return false;
-			});
-
-			$propFind->handle(self::CHECKSUMS_PROPERTYNAME, function() use ($node) {
-				$checksum = $node->getChecksum();
-				if ($checksum === NULL || $checksum === '') {
-					return null;
-				}
-
-				return new ChecksumList($checksum);
-			});
-
-		}
-
-		if ($node instanceof \OCA\DAV\Connector\Sabre\Directory) {
-			$propFind->handle(self::SIZE_PROPERTYNAME, function() use ($node) {
-				return $node->getSize();
-			});
-		}
-	}
-
-	/**
-	 * Update ownCloud-specific properties
-	 *
-	 * @param string $path
-	 * @param PropPatch $propPatch
-	 *
-	 * @return void
-	 */
-	public function handleUpdateProperties($path, PropPatch $propPatch) {
-		$propPatch->handle(self::LASTMODIFIED_PROPERTYNAME, function($time) use ($path) {
-			if (empty($time)) {
-				return false;
-			}
-			$node = $this->tree->getNodeForPath($path);
-			if (is_null($node)) {
-				return 404;
-			}
-			$node->touch($time);
-			return true;
-		});
-		$propPatch->handle(self::GETETAG_PROPERTYNAME, function($etag) use ($path) {
-			if (empty($etag)) {
-				return false;
-			}
-			$node = $this->tree->getNodeForPath($path);
-			if (is_null($node)) {
-				return 404;
-			}
-			if ($node->setEtag($etag) !== -1) {
-				return true;
-			}
-			return false;
-		});
-	}
-
-	/**
-	 * @param string $filePath
-	 * @param \Sabre\DAV\INode $node
-	 * @throws \Sabre\DAV\Exception\BadRequest
-	 */
-	public function sendFileIdHeader($filePath, \Sabre\DAV\INode $node = null) {
-		// chunked upload handling
-		if (isset($_SERVER['HTTP_OC_CHUNKED'])) {
-			list($path, $name) = \Sabre\HTTP\URLUtil::splitPath($filePath);
-			$info = \OC_FileChunking::decodeName($name);
-			if (!empty($info)) {
-				$filePath = $path . '/' . $info['name'];
-			}
-		}
-
-		// we get the node for the given $filePath here because in case of afterCreateFile $node is the parent folder
-		if (!$this->server->tree->nodeExists($filePath)) {
-			return;
-		}
-		$node = $this->server->tree->getNodeForPath($filePath);
-		if ($node instanceof \OCA\DAV\Connector\Sabre\Node) {
-			$fileId = $node->getFileId();
-			if (!is_null($fileId)) {
-				$this->server->httpResponse->setHeader('OC-FileId', $fileId);
-			}
-		}
-	}
+    // namespace
+    const NS_OWNCLOUD = 'http://owncloud.org/ns';
+    const NS_NEXTCLOUD = 'http://nextcloud.org/ns';
+    const FILEID_PROPERTYNAME = '{http://owncloud.org/ns}id';
+    const INTERNAL_FILEID_PROPERTYNAME = '{http://owncloud.org/ns}fileid';
+    const PERMISSIONS_PROPERTYNAME = '{http://owncloud.org/ns}permissions';
+    const SHARE_PERMISSIONS_PROPERTYNAME = '{http://open-collaboration-services.org/ns}share-permissions';
+    const DOWNLOADURL_PROPERTYNAME = '{http://owncloud.org/ns}downloadURL';
+    const SIZE_PROPERTYNAME = '{http://owncloud.org/ns}size';
+    const GETETAG_PROPERTYNAME = '{DAV:}getetag';
+    const LASTMODIFIED_PROPERTYNAME = '{DAV:}lastmodified';
+    const OWNER_ID_PROPERTYNAME = '{http://owncloud.org/ns}owner-id';
+    const OWNER_DISPLAY_NAME_PROPERTYNAME = '{http://owncloud.org/ns}owner-display-name';
+    const CHECKSUMS_PROPERTYNAME = '{http://owncloud.org/ns}checksums';
+    const DATA_FINGERPRINT_PROPERTYNAME = '{http://owncloud.org/ns}data-fingerprint';
+    const HAS_PREVIEW_PROPERTYNAME = '{http://nextcloud.org/ns}has-preview';
+
+    /**
+     * Reference to main server object
+     *
+     * @var \Sabre\DAV\Server
+     */
+    private $server;
+
+    /**
+     * @var Tree
+     */
+    private $tree;
+
+    /**
+     * Whether this is public webdav.
+     * If true, some returned information will be stripped off.
+     *
+     * @var bool
+     */
+    private $isPublic;
+
+    /**
+     * @var View
+     */
+    private $fileView;
+
+    /**
+     * @var bool
+     */
+    private $downloadAttachment;
+
+    /**
+     * @var IConfig
+     */
+    private $config;
+
+    /**
+     * @var IRequest
+     */
+    private $request;
+
+    /**
+     * @var IPreview
+     */
+    private $previewManager;
+
+    /**
+     * @param Tree $tree
+     * @param IConfig $config
+     * @param IRequest $request
+     * @param IPreview $previewManager
+     * @param bool $isPublic
+     * @param bool $downloadAttachment
+     */
+    public function __construct(Tree $tree,
+                                IConfig $config,
+                                IRequest $request,
+                                IPreview $previewManager,
+                                $isPublic = false,
+                                $downloadAttachment = true) {
+        $this->tree = $tree;
+        $this->config = $config;
+        $this->request = $request;
+        $this->isPublic = $isPublic;
+        $this->downloadAttachment = $downloadAttachment;
+        $this->previewManager = $previewManager;
+    }
+
+    /**
+     * This initializes the plugin.
+     *
+     * This function is called by \Sabre\DAV\Server, after
+     * addPlugin is called.
+     *
+     * This method should set up the required event subscriptions.
+     *
+     * @param \Sabre\DAV\Server $server
+     * @return void
+     */
+    public function initialize(\Sabre\DAV\Server $server) {
+
+        $server->xml->namespaceMap[self::NS_OWNCLOUD] = 'oc';
+        $server->xml->namespaceMap[self::NS_NEXTCLOUD] = 'nc';
+        $server->protectedProperties[] = self::FILEID_PROPERTYNAME;
+        $server->protectedProperties[] = self::INTERNAL_FILEID_PROPERTYNAME;
+        $server->protectedProperties[] = self::PERMISSIONS_PROPERTYNAME;
+        $server->protectedProperties[] = self::SHARE_PERMISSIONS_PROPERTYNAME;
+        $server->protectedProperties[] = self::SIZE_PROPERTYNAME;
+        $server->protectedProperties[] = self::DOWNLOADURL_PROPERTYNAME;
+        $server->protectedProperties[] = self::OWNER_ID_PROPERTYNAME;
+        $server->protectedProperties[] = self::OWNER_DISPLAY_NAME_PROPERTYNAME;
+        $server->protectedProperties[] = self::CHECKSUMS_PROPERTYNAME;
+        $server->protectedProperties[] = self::DATA_FINGERPRINT_PROPERTYNAME;
+        $server->protectedProperties[] = self::HAS_PREVIEW_PROPERTYNAME;
+
+        // normally these cannot be changed (RFC4918), but we want them modifiable through PROPPATCH
+        $allowedProperties = ['{DAV:}getetag'];
+        $server->protectedProperties = array_diff($server->protectedProperties, $allowedProperties);
+
+        $this->server = $server;
+        $this->server->on('propFind', array($this, 'handleGetProperties'));
+        $this->server->on('propPatch', array($this, 'handleUpdateProperties'));
+        $this->server->on('afterBind', array($this, 'sendFileIdHeader'));
+        $this->server->on('afterWriteContent', array($this, 'sendFileIdHeader'));
+        $this->server->on('afterMethod:GET', [$this,'httpGet']);
+        $this->server->on('afterMethod:GET', array($this, 'handleDownloadToken'));
+        $this->server->on('afterResponse', function($request, ResponseInterface $response) {
+            $body = $response->getBody();
+            if (is_resource($body)) {
+                fclose($body);
+            }
+        });
+        $this->server->on('beforeMove', [$this, 'checkMove']);
+    }
+
+    /**
+     * Plugin that checks if a move can actually be performed.
+     *
+     * @param string $source source path
+     * @param string $destination destination path
+     * @throws Forbidden
+     * @throws NotFound
+     */
+    function checkMove($source, $destination) {
+        $sourceNode = $this->tree->getNodeForPath($source);
+        if (!$sourceNode instanceof Node) {
+            return;
+        }
+        list($sourceDir,) = \Sabre\HTTP\URLUtil::splitPath($source);
+        list($destinationDir,) = \Sabre\HTTP\URLUtil::splitPath($destination);
+
+        if ($sourceDir !== $destinationDir) {
+            $sourceNodeFileInfo = $sourceNode->getFileInfo();
+            if (is_null($sourceNodeFileInfo)) {
+                throw new NotFound($source . ' does not exist');
+            }
+
+            if (!$sourceNodeFileInfo->isDeletable()) {
+                throw new Forbidden($source . " cannot be deleted");
+            }
+        }
+    }
+
+    /**
+     * This sets a cookie to be able to recognize the start of the download
+     * the content must not be longer than 32 characters and must only contain
+     * alphanumeric characters
+     *
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     */
+    function handleDownloadToken(RequestInterface $request, ResponseInterface $response) {
+        $queryParams = $request->getQueryParameters();
+
+        /**
+         * this sets a cookie to be able to recognize the start of the download
+         * the content must not be longer than 32 characters and must only contain
+         * alphanumeric characters
+         */
+        if (isset($queryParams['downloadStartSecret'])) {
+            $token = $queryParams['downloadStartSecret'];
+            if (!isset($token[32])
+                && preg_match('!^[a-zA-Z0-9]+$!', $token) === 1) {
+                // FIXME: use $response->setHeader() instead
+                setcookie('ocDownloadStarted', $token, time() + 20, '/');
+            }
+        }
+    }
+
+    /**
+     * Add headers to file download
+     *
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     */
+    function httpGet(RequestInterface $request, ResponseInterface $response) {
+        // Only handle valid files
+        $node = $this->tree->getNodeForPath($request->getPath());
+        if (!($node instanceof IFile)) return;
+
+        // adds a 'Content-Disposition: attachment' header in case no disposition
+        // header has been set before
+        if ($this->downloadAttachment &&
+            $response->getHeader('Content-Disposition') === null) {
+            $filename = $node->getName();
+            if ($this->request->isUserAgent(
+                [
+                    \OC\AppFramework\Http\Request::USER_AGENT_IE,
+                    \OC\AppFramework\Http\Request::USER_AGENT_ANDROID_MOBILE_CHROME,
+                    \OC\AppFramework\Http\Request::USER_AGENT_FREEBOX,
+                ])) {
+                $response->addHeader('Content-Disposition', 'attachment; filename="' . rawurlencode($filename) . '"');
+            } else {
+                $response->addHeader('Content-Disposition', 'attachment; filename*=UTF-8\'\'' . rawurlencode($filename)
+                                                        . '; filename="' . rawurlencode($filename) . '"');
+            }
+        }
+
+        if ($node instanceof \OCA\DAV\Connector\Sabre\File) {
+            //Add OC-Checksum header
+            /** @var $node File */
+            $checksum = $node->getChecksum();
+            if ($checksum !== null && $checksum !== '') {
+                $response->addHeader('OC-Checksum', $checksum);
+            }
+        }
+    }
+
+    /**
+     * Adds all ownCloud-specific properties
+     *
+     * @param PropFind $propFind
+     * @param \Sabre\DAV\INode $node
+     * @return void
+     */
+    public function handleGetProperties(PropFind $propFind, \Sabre\DAV\INode $node) {
+
+        $httpRequest = $this->server->httpRequest;
+
+        if ($node instanceof \OCA\DAV\Connector\Sabre\Node) {
+
+            $propFind->handle(self::FILEID_PROPERTYNAME, function() use ($node) {
+                return $node->getFileId();
+            });
+
+            $propFind->handle(self::INTERNAL_FILEID_PROPERTYNAME, function() use ($node) {
+                return $node->getInternalFileId();
+            });
+
+            $propFind->handle(self::PERMISSIONS_PROPERTYNAME, function() use ($node) {
+                $perms = $node->getDavPermissions();
+                if ($this->isPublic) {
+                    // remove mount information
+                    $perms = str_replace(['S', 'M'], '', $perms);
+                }
+                return $perms;
+            });
+
+            $propFind->handle(self::SHARE_PERMISSIONS_PROPERTYNAME, function() use ($node, $httpRequest) {
+                return $node->getSharePermissions(
+                    $httpRequest->getRawServerValue('PHP_AUTH_USER')
+                );
+            });
+
+            $propFind->handle(self::GETETAG_PROPERTYNAME, function() use ($node) {
+                return $node->getETag();
+            });
+
+            $propFind->handle(self::OWNER_ID_PROPERTYNAME, function() use ($node) {
+                $owner = $node->getOwner();
+                if (!$owner) {
+                    return null;
+                } else {
+                    return $owner->getUID();
+                }
+            });
+            $propFind->handle(self::OWNER_DISPLAY_NAME_PROPERTYNAME, function() use ($node) {
+                $owner = $node->getOwner();
+                if (!$owner) {
+                    return null;
+                } else {
+                    return $owner->getDisplayName();
+                }
+            });
+
+            $propFind->handle(self::HAS_PREVIEW_PROPERTYNAME, function () use ($node) {
+                return json_encode($this->previewManager->isAvailable($node->getFileInfo()));
+            });
+            $propFind->handle(self::SIZE_PROPERTYNAME, function() use ($node) {
+                return $node->getSize();
+            });
+        }
+
+        if ($node instanceof \OCA\DAV\Connector\Sabre\Node) {
+            $propFind->handle(self::DATA_FINGERPRINT_PROPERTYNAME, function() use ($node) {
+                return $this->config->getSystemValue('data-fingerprint', '');
+            });
+        }
+
+        if ($node instanceof \OCA\DAV\Connector\Sabre\File) {
+            $propFind->handle(self::DOWNLOADURL_PROPERTYNAME, function() use ($node) {
+                /** @var $node \OCA\DAV\Connector\Sabre\File */
+                try {
+                    $directDownloadUrl = $node->getDirectDownload();
+                    if (isset($directDownloadUrl['url'])) {
+                        return $directDownloadUrl['url'];
+                    }
+                } catch (StorageNotAvailableException $e) {
+                    return false;
+                } catch (ForbiddenException $e) {
+                    return false;
+                }
+                return false;
+            });
+
+            $propFind->handle(self::CHECKSUMS_PROPERTYNAME, function() use ($node) {
+                $checksum = $node->getChecksum();
+                if ($checksum === NULL || $checksum === '') {
+                    return null;
+                }
+
+                return new ChecksumList($checksum);
+            });
+
+        }
+
+        if ($node instanceof \OCA\DAV\Connector\Sabre\Directory) {
+            $propFind->handle(self::SIZE_PROPERTYNAME, function() use ($node) {
+                return $node->getSize();
+            });
+        }
+    }
+
+    /**
+     * Update ownCloud-specific properties
+     *
+     * @param string $path
+     * @param PropPatch $propPatch
+     *
+     * @return void
+     */
+    public function handleUpdateProperties($path, PropPatch $propPatch) {
+        $propPatch->handle(self::LASTMODIFIED_PROPERTYNAME, function($time) use ($path) {
+            if (empty($time)) {
+                return false;
+            }
+            $node = $this->tree->getNodeForPath($path);
+            if (is_null($node)) {
+                return 404;
+            }
+            $node->touch($time);
+            return true;
+        });
+        $propPatch->handle(self::GETETAG_PROPERTYNAME, function($etag) use ($path) {
+            if (empty($etag)) {
+                return false;
+            }
+            $node = $this->tree->getNodeForPath($path);
+            if (is_null($node)) {
+                return 404;
+            }
+            if ($node->setEtag($etag) !== -1) {
+                return true;
+            }
+            return false;
+        });
+    }
+
+    /**
+     * @param string $filePath
+     * @param \Sabre\DAV\INode $node
+     * @throws \Sabre\DAV\Exception\BadRequest
+     */
+    public function sendFileIdHeader($filePath, \Sabre\DAV\INode $node = null) {
+        // chunked upload handling
+        if (isset($_SERVER['HTTP_OC_CHUNKED'])) {
+            list($path, $name) = \Sabre\HTTP\URLUtil::splitPath($filePath);
+            $info = \OC_FileChunking::decodeName($name);
+            if (!empty($info)) {
+                $filePath = $path . '/' . $info['name'];
+            }
+        }
+
+        // we get the node for the given $filePath here because in case of afterCreateFile $node is the parent folder
+        if (!$this->server->tree->nodeExists($filePath)) {
+            return;
+        }
+        $node = $this->server->tree->getNodeForPath($filePath);
+        if ($node instanceof \OCA\DAV\Connector\Sabre\Node) {
+            $fileId = $node->getFileId();
+            if (!is_null($fileId)) {
+                $this->server->httpResponse->setHeader('OC-FileId', $fileId);
+            }
+        }
+    }
 }

Spacing +8 added lines, -8 removed lines

@@ -171,7 +171,7 @@ 
 		$this->server->on('propPatch', array($this, 'handleUpdateProperties'));
 		$this->server->on('afterBind', array($this, 'sendFileIdHeader'));
 		$this->server->on('afterWriteContent', array($this, 'sendFileIdHeader'));
-		$this->server->on('afterMethod:GET', [$this,'httpGet']);
+		$this->server->on('afterMethod:GET', [$this, 'httpGet']);
 		$this->server->on('afterMethod:GET', array($this, 'handleDownloadToken'));
 		$this->server->on('afterResponse', function($request, ResponseInterface $response) {
 			$body = $response->getBody();
@@ -201,11 +201,11 @@ 
 		if ($sourceDir !== $destinationDir) {
 			$sourceNodeFileInfo = $sourceNode->getFileInfo();
 			if (is_null($sourceNodeFileInfo)) {
-				throw new NotFound($source . ' does not exist');
+				throw new NotFound($source.' does not exist');
 			}
 
 			if (!$sourceNodeFileInfo->isDeletable()) {
-				throw new Forbidden($source . " cannot be deleted");
+				throw new Forbidden($source." cannot be deleted");
 			}
 		}
 	}
@@ -258,10 +258,10 @@ 
 					\OC\AppFramework\Http\Request::USER_AGENT_ANDROID_MOBILE_CHROME,
 					\OC\AppFramework\Http\Request::USER_AGENT_FREEBOX,
 				])) {
-				$response->addHeader('Content-Disposition', 'attachment; filename="' . rawurlencode($filename) . '"');
+				$response->addHeader('Content-Disposition', 'attachment; filename="'.rawurlencode($filename).'"');
 			} else {
-				$response->addHeader('Content-Disposition', 'attachment; filename*=UTF-8\'\'' . rawurlencode($filename)
-													 . '; filename="' . rawurlencode($filename) . '"');
+				$response->addHeader('Content-Disposition', 'attachment; filename*=UTF-8\'\''.rawurlencode($filename)
+													 . '; filename="'.rawurlencode($filename).'"');
 			}
 		}
 
@@ -332,7 +332,7 @@ 
 				}
 			});
 
-			$propFind->handle(self::HAS_PREVIEW_PROPERTYNAME, function () use ($node) {
+			$propFind->handle(self::HAS_PREVIEW_PROPERTYNAME, function() use ($node) {
 				return json_encode($this->previewManager->isAvailable($node->getFileInfo()));
 			});
 			$propFind->handle(self::SIZE_PROPERTYNAME, function() use ($node) {
@@ -426,7 +426,7 @@ 
 			list($path, $name) = \Sabre\HTTP\URLUtil::splitPath($filePath);
 			$info = \OC_FileChunking::decodeName($name);
 			if (!empty($info)) {
-				$filePath = $path . '/' . $info['name'];
+				$filePath = $path.'/'.$info['name'];
 			}
 		}
 

apps/files_external/lib/Lib/Storage/FTP.php

Doc Comments +3 added lines

@@ -139,6 +139,9 @@
 		return false;
 	}
 
+	/**
+	 * @param string $path
+	 */
 	public function writeBack($tmpFile, $path) {
 		$this->uploadFile($tmpFile, $path);
 		unlink($tmpFile);

Indentation +109 added lines, -109 removed lines

@@ -37,122 +37,122 @@
 use Icewind\Streams\RetryWrapper;
 
 class FTP extends StreamWrapper{
-	private $password;
-	private $user;
-	private $host;
-	private $secure;
-	private $root;
+    private $password;
+    private $user;
+    private $host;
+    private $secure;
+    private $root;
 
-	private static $tempFiles=array();
+    private static $tempFiles=array();
 
-	public function __construct($params) {
-		if (isset($params['host']) && isset($params['user']) && isset($params['password'])) {
-			$this->host=$params['host'];
-			$this->user=$params['user'];
-			$this->password=$params['password'];
-			if (isset($params['secure'])) {
-				$this->secure = $params['secure'];
-			} else {
-				$this->secure = false;
-			}
-			$this->root=isset($params['root'])?$params['root']:'/';
-			if ( ! $this->root || $this->root[0]!='/') {
-				$this->root='/'.$this->root;
-			}
-			if (substr($this->root, -1) !== '/') {
-				$this->root .= '/';
-			}
-		} else {
-			throw new \Exception('Creating FTP storage failed');
-		}
+    public function __construct($params) {
+        if (isset($params['host']) && isset($params['user']) && isset($params['password'])) {
+            $this->host=$params['host'];
+            $this->user=$params['user'];
+            $this->password=$params['password'];
+            if (isset($params['secure'])) {
+                $this->secure = $params['secure'];
+            } else {
+                $this->secure = false;
+            }
+            $this->root=isset($params['root'])?$params['root']:'/';
+            if ( ! $this->root || $this->root[0]!='/') {
+                $this->root='/'.$this->root;
+            }
+            if (substr($this->root, -1) !== '/') {
+                $this->root .= '/';
+            }
+        } else {
+            throw new \Exception('Creating FTP storage failed');
+        }
 		
-	}
+    }
 
-	public function getId(){
-		return 'ftp::' . $this->user . '@' . $this->host . '/' . $this->root;
-	}
+    public function getId(){
+        return 'ftp::' . $this->user . '@' . $this->host . '/' . $this->root;
+    }
 
-	/**
-	 * construct the ftp url
-	 * @param string $path
-	 * @return string
-	 */
-	public function constructUrl($path) {
-		$url='ftp';
-		if ($this->secure) {
-			$url.='s';
-		}
-		$url.='://'.urlencode($this->user).':'.urlencode($this->password).'@'.$this->host.$this->root.$path;
-		return $url;
-	}
+    /**
+     * construct the ftp url
+     * @param string $path
+     * @return string
+     */
+    public function constructUrl($path) {
+        $url='ftp';
+        if ($this->secure) {
+            $url.='s';
+        }
+        $url.='://'.urlencode($this->user).':'.urlencode($this->password).'@'.$this->host.$this->root.$path;
+        return $url;
+    }
 
-	/**
-	 * Unlinks file or directory
-	 * @param string $path
-	 */
-	public function unlink($path) {
-		if ($this->is_dir($path)) {
-			return $this->rmdir($path);
-		}
-		else {
-			$url = $this->constructUrl($path);
-			$result = unlink($url);
-			clearstatcache(true, $url);
-			return $result;
-		}
-	}
-	public function fopen($path,$mode) {
-		switch($mode) {
-			case 'r':
-			case 'rb':
-			case 'w':
-			case 'wb':
-			case 'a':
-			case 'ab':
-				//these are supported by the wrapper
-				$context = stream_context_create(array('ftp' => array('overwrite' => true)));
-				$handle = fopen($this->constructUrl($path), $mode, false, $context);
-				return RetryWrapper::wrap($handle);
-			case 'r+':
-			case 'w+':
-			case 'wb+':
-			case 'a+':
-			case 'x':
-			case 'x+':
-			case 'c':
-			case 'c+':
-				//emulate these
-				if (strrpos($path, '.')!==false) {
-					$ext=substr($path, strrpos($path, '.'));
-				} else {
-					$ext='';
-				}
-				$tmpFile=\OCP\Files::tmpFile($ext);
-				if ($this->file_exists($path)) {
-					$this->getFile($path, $tmpFile);
-				}
-				$handle = fopen($tmpFile, $mode);
-				return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
-					$this->writeBack($tmpFile, $path);
-				});
-		}
-		return false;
-	}
+    /**
+     * Unlinks file or directory
+     * @param string $path
+     */
+    public function unlink($path) {
+        if ($this->is_dir($path)) {
+            return $this->rmdir($path);
+        }
+        else {
+            $url = $this->constructUrl($path);
+            $result = unlink($url);
+            clearstatcache(true, $url);
+            return $result;
+        }
+    }
+    public function fopen($path,$mode) {
+        switch($mode) {
+            case 'r':
+            case 'rb':
+            case 'w':
+            case 'wb':
+            case 'a':
+            case 'ab':
+                //these are supported by the wrapper
+                $context = stream_context_create(array('ftp' => array('overwrite' => true)));
+                $handle = fopen($this->constructUrl($path), $mode, false, $context);
+                return RetryWrapper::wrap($handle);
+            case 'r+':
+            case 'w+':
+            case 'wb+':
+            case 'a+':
+            case 'x':
+            case 'x+':
+            case 'c':
+            case 'c+':
+                //emulate these
+                if (strrpos($path, '.')!==false) {
+                    $ext=substr($path, strrpos($path, '.'));
+                } else {
+                    $ext='';
+                }
+                $tmpFile=\OCP\Files::tmpFile($ext);
+                if ($this->file_exists($path)) {
+                    $this->getFile($path, $tmpFile);
+                }
+                $handle = fopen($tmpFile, $mode);
+                return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
+                    $this->writeBack($tmpFile, $path);
+                });
+        }
+        return false;
+    }
 
-	public function writeBack($tmpFile, $path) {
-		$this->uploadFile($tmpFile, $path);
-		unlink($tmpFile);
-	}
+    public function writeBack($tmpFile, $path) {
+        $this->uploadFile($tmpFile, $path);
+        unlink($tmpFile);
+    }
 
-	/**
-	 * check if php-ftp is installed
-	 */
-	public static function checkDependencies() {
-		if (function_exists('ftp_login')) {
-			return(true);
-		} else {
-			return array('ftp');
-		}
-	}
+    /**
+     * check if php-ftp is installed
+     */
+    public static function checkDependencies() {
+        if (function_exists('ftp_login')) {
+            return(true);
+        } else {
+            return array('ftp');
+        }
+    }
 
 }

Spacing +20 added lines, -20 removed lines

@@ -36,28 +36,28 @@ 
 use Icewind\Streams\CallbackWrapper;
 use Icewind\Streams\RetryWrapper;
 
-class FTP extends StreamWrapper{
+class FTP extends StreamWrapper {
 	private $password;
 	private $user;
 	private $host;
 	private $secure;
 	private $root;
 
-	private static $tempFiles=array();
+	private static $tempFiles = array();
 
 	public function __construct($params) {
 		if (isset($params['host']) && isset($params['user']) && isset($params['password'])) {
-			$this->host=$params['host'];
-			$this->user=$params['user'];
-			$this->password=$params['password'];
+			$this->host = $params['host'];
+			$this->user = $params['user'];
+			$this->password = $params['password'];
 			if (isset($params['secure'])) {
 				$this->secure = $params['secure'];
 			} else {
 				$this->secure = false;
 			}
-			$this->root=isset($params['root'])?$params['root']:'/';
-			if ( ! $this->root || $this->root[0]!='/') {
-				$this->root='/'.$this->root;
+			$this->root = isset($params['root']) ? $params['root'] : '/';
+			if (!$this->root || $this->root[0] != '/') {
+				$this->root = '/'.$this->root;
 			}
 			if (substr($this->root, -1) !== '/') {
 				$this->root .= '/';
@@ -68,8 +68,8 @@ 
 		
 	}
 
-	public function getId(){
-		return 'ftp::' . $this->user . '@' . $this->host . '/' . $this->root;
+	public function getId() {
+		return 'ftp::'.$this->user.'@'.$this->host.'/'.$this->root;
 	}
 
 	/**
@@ -78,11 +78,11 @@ 
 	 * @return string
 	 */
 	public function constructUrl($path) {
-		$url='ftp';
+		$url = 'ftp';
 		if ($this->secure) {
-			$url.='s';
+			$url .= 's';
 		}
-		$url.='://'.urlencode($this->user).':'.urlencode($this->password).'@'.$this->host.$this->root.$path;
+		$url .= '://'.urlencode($this->user).':'.urlencode($this->password).'@'.$this->host.$this->root.$path;
 		return $url;
 	}
 
@@ -101,8 +101,8 @@ 
 			return $result;
 		}
 	}
-	public function fopen($path,$mode) {
-		switch($mode) {
+	public function fopen($path, $mode) {
+		switch ($mode) {
 			case 'r':
 			case 'rb':
 			case 'w':
@@ -122,17 +122,17 @@ 
 			case 'c':
 			case 'c+':
 				//emulate these
-				if (strrpos($path, '.')!==false) {
-					$ext=substr($path, strrpos($path, '.'));
+				if (strrpos($path, '.') !== false) {
+					$ext = substr($path, strrpos($path, '.'));
 				} else {
-					$ext='';
+					$ext = '';
 				}
-				$tmpFile=\OCP\Files::tmpFile($ext);
+				$tmpFile = \OCP\Files::tmpFile($ext);
 				if ($this->file_exists($path)) {
 					$this->getFile($path, $tmpFile);
 				}
 				$handle = fopen($tmpFile, $mode);
-				return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
+				return CallbackWrapper::wrap($handle, null, null, function() use ($path, $tmpFile) {
 					$this->writeBack($tmpFile, $path);
 				});
 		}

Braces +1 added lines, -2 removed lines

@@ -93,8 +93,7 @@
 	public function unlink($path) {
 		if ($this->is_dir($path)) {
 			return $this->rmdir($path);
-		}
-		else {
+		} else {
 			$url = $this->constructUrl($path);
 			$result = unlink($url);
 			clearstatcache(true, $url);

apps/files_external/lib/Lib/Storage/Swift.php

Doc Comments +3 added lines

@@ -616,6 +616,9 @@
 		return $this->container;
 	}
 
+	/**
+	 * @param string $path
+	 */
 	public function writeBack($tmpFile, $path) {
 		$fileData = fopen($tmpFile, 'r');
 		$this->getContainer()->uploadObject($path, $fileData);

Indentation +601 added lines, -601 removed lines

@@ -48,606 +48,606 @@
 
 class Swift extends \OC\Files\Storage\Common {
 
-	/**
-	 * @var \OpenCloud\ObjectStore\Service
-	 */
-	private $connection;
-	/**
-	 * @var \OpenCloud\ObjectStore\Resource\Container
-	 */
-	private $container;
-	/**
-	 * @var \OpenCloud\OpenStack
-	 */
-	private $anchor;
-	/**
-	 * @var string
-	 */
-	private $bucket;
-	/**
-	 * Connection parameters
-	 *
-	 * @var array
-	 */
-	private $params;
-
-	/** @var string  */
-	private $id;
-
-	/**
-	 * @var array
-	 */
-	private static $tmpFiles = array();
-
-	/**
-	 * Key value cache mapping path to data object. Maps path to
-	 * \OpenCloud\OpenStack\ObjectStorage\Resource\DataObject for existing
-	 * paths and path to false for not existing paths.
-	 * @var \OCP\ICache
-	 */
-	private $objectCache;
-
-	/**
-	 * @param string $path
-	 */
-	private function normalizePath($path) {
-		$path = trim($path, '/');
-
-		if (!$path) {
-			$path = '.';
-		}
-
-		$path = str_replace('#', '%23', $path);
-
-		return $path;
-	}
-
-	const SUBCONTAINER_FILE = '.subcontainers';
-
-	/**
-	 * translate directory path to container name
-	 *
-	 * @param string $path
-	 * @return string
-	 */
-
-	/**
-	 * Fetches an object from the API.
-	 * If the object is cached already or a
-	 * failed "doesn't exist" response was cached,
-	 * that one will be returned.
-	 *
-	 * @param string $path
-	 * @return \OpenCloud\OpenStack\ObjectStorage\Resource\DataObject|bool object
-	 * or false if the object did not exist
-	 */
-	private function fetchObject($path) {
-		if ($this->objectCache->hasKey($path)) {
-			// might be "false" if object did not exist from last check
-			return $this->objectCache->get($path);
-		}
-		try {
-			$object = $this->getContainer()->getPartialObject($path);
-			$this->objectCache->set($path, $object);
-			return $object;
-		} catch (ClientErrorResponseException $e) {
-			// this exception happens when the object does not exist, which
-			// is expected in most cases
-			$this->objectCache->set($path, false);
-			return false;
-		} catch (ClientErrorResponseException $e) {
-			// Expected response is "404 Not Found", so only log if it isn't
-			if ($e->getResponse()->getStatusCode() !== 404) {
-				\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
-			}
-			return false;
-		}
-	}
-
-	/**
-	 * Returns whether the given path exists.
-	 *
-	 * @param string $path
-	 *
-	 * @return bool true if the object exist, false otherwise
-	 */
-	private function doesObjectExist($path) {
-		return $this->fetchObject($path) !== false;
-	}
-
-	public function __construct($params) {
-		if ((empty($params['key']) and empty($params['password']))
-			or empty($params['user']) or empty($params['bucket'])
-			or empty($params['region'])
-		) {
-			throw new \Exception("API Key or password, Username, Bucket and Region have to be configured.");
-		}
-
-		$this->id = 'swift::' . $params['user'] . md5($params['bucket']);
-
-		$bucketUrl = Url::factory($params['bucket']);
-		if ($bucketUrl->isAbsolute()) {
-			$this->bucket = end(($bucketUrl->getPathSegments()));
-			$params['endpoint_url'] = $bucketUrl->addPath('..')->normalizePath();
-		} else {
-			$this->bucket = $params['bucket'];
-		}
-
-		if (empty($params['url'])) {
-			$params['url'] = 'https://identity.api.rackspacecloud.com/v2.0/';
-		}
-
-		if (empty($params['service_name'])) {
-			$params['service_name'] = 'cloudFiles';
-		}
-
-		$this->params = $params;
-		// FIXME: private class...
-		$this->objectCache = new \OC\Cache\CappedMemoryCache();
-	}
-
-	public function mkdir($path) {
-		$path = $this->normalizePath($path);
-
-		if ($this->is_dir($path)) {
-			return false;
-		}
-
-		if ($path !== '.') {
-			$path .= '/';
-		}
-
-		try {
-			$customHeaders = array('content-type' => 'httpd/unix-directory');
-			$metadataHeaders = DataObject::stockHeaders(array());
-			$allHeaders = $customHeaders + $metadataHeaders;
-			$this->getContainer()->uploadObject($path, '', $allHeaders);
-			// invalidate so that the next access gets the real object
-			// with all properties
-			$this->objectCache->remove($path);
-		} catch (Exceptions\CreateUpdateError $e) {
-			\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
-			return false;
-		}
-
-		return true;
-	}
-
-	public function file_exists($path) {
-		$path = $this->normalizePath($path);
-
-		if ($path !== '.' && $this->is_dir($path)) {
-			$path .= '/';
-		}
-
-		return $this->doesObjectExist($path);
-	}
-
-	public function rmdir($path) {
-		$path = $this->normalizePath($path);
-
-		if (!$this->is_dir($path) || !$this->isDeletable($path)) {
-			return false;
-		}
-
-		$dh = $this->opendir($path);
-		while ($file = readdir($dh)) {
-			if (\OC\Files\Filesystem::isIgnoredDir($file)) {
-				continue;
-			}
-
-			if ($this->is_dir($path . '/' . $file)) {
-				$this->rmdir($path . '/' . $file);
-			} else {
-				$this->unlink($path . '/' . $file);
-			}
-		}
-
-		try {
-			$this->getContainer()->dataObject()->setName($path . '/')->delete();
-			$this->objectCache->remove($path . '/');
-		} catch (Exceptions\DeleteError $e) {
-			\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
-			return false;
-		}
-
-		return true;
-	}
-
-	public function opendir($path) {
-		$path = $this->normalizePath($path);
-
-		if ($path === '.') {
-			$path = '';
-		} else {
-			$path .= '/';
-		}
-
-		$path = str_replace('%23', '#', $path); // the prefix is sent as a query param, so revert the encoding of #
-
-		try {
-			$files = array();
-			/** @var OpenCloud\Common\Collection $objects */
-			$objects = $this->getContainer()->objectList(array(
-				'prefix' => $path,
-				'delimiter' => '/'
-			));
-
-			/** @var OpenCloud\ObjectStore\Resource\DataObject $object */
-			foreach ($objects as $object) {
-				$file = basename($object->getName());
-				if ($file !== basename($path)) {
-					$files[] = $file;
-				}
-			}
-
-			return IteratorDirectory::wrap($files);
-		} catch (\Exception $e) {
-			\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
-			return false;
-		}
-
-	}
-
-	public function stat($path) {
-		$path = $this->normalizePath($path);
-
-		if ($path === '.') {
-			$path = '';
-		} else if ($this->is_dir($path)) {
-			$path .= '/';
-		}
-
-		try {
-			/** @var DataObject $object */
-			$object = $this->fetchObject($path);
-			if (!$object) {
-				return false;
-			}
-		} catch (ClientErrorResponseException $e) {
-			\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
-			return false;
-		}
-
-		$dateTime = \DateTime::createFromFormat(\DateTime::RFC1123, $object->getLastModified());
-		if ($dateTime !== false) {
-			$mtime = $dateTime->getTimestamp();
-		} else {
-			$mtime = null;
-		}
-		$objectMetadata = $object->getMetadata();
-		$metaTimestamp = $objectMetadata->getProperty('timestamp');
-		if (isset($metaTimestamp)) {
-			$mtime = $metaTimestamp;
-		}
-
-		if (!empty($mtime)) {
-			$mtime = floor($mtime);
-		}
-
-		$stat = array();
-		$stat['size'] = (int)$object->getContentLength();
-		$stat['mtime'] = $mtime;
-		$stat['atime'] = time();
-		return $stat;
-	}
-
-	public function filetype($path) {
-		$path = $this->normalizePath($path);
-
-		if ($path !== '.' && $this->doesObjectExist($path)) {
-			return 'file';
-		}
-
-		if ($path !== '.') {
-			$path .= '/';
-		}
-
-		if ($this->doesObjectExist($path)) {
-			return 'dir';
-		}
-	}
-
-	public function unlink($path) {
-		$path = $this->normalizePath($path);
-
-		if ($this->is_dir($path)) {
-			return $this->rmdir($path);
-		}
-
-		try {
-			$this->getContainer()->dataObject()->setName($path)->delete();
-			$this->objectCache->remove($path);
-			$this->objectCache->remove($path . '/');
-		} catch (ClientErrorResponseException $e) {
-			if ($e->getResponse()->getStatusCode() !== 404) {
-				\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
-			}
-			return false;
-		}
-
-		return true;
-	}
-
-	public function fopen($path, $mode) {
-		$path = $this->normalizePath($path);
-
-		switch ($mode) {
-			case 'a':
-			case 'ab':
-			case 'a+':
-				return false;
-			case 'r':
-			case 'rb':
-				try {
-					$c = $this->getContainer();
-					$streamFactory = new \Guzzle\Stream\PhpStreamRequestFactory();
-					$streamInterface = $streamFactory->fromRequest(
-						$c->getClient()
-							->get($c->getUrl($path)));
-					$streamInterface->rewind();
-					$stream = $streamInterface->getStream();
-					stream_context_set_option($stream, 'swift','content', $streamInterface);
-					if(!strrpos($streamInterface
-						->getMetaData('wrapper_data')[0], '404 Not Found')) {
-						return $stream;
-					}
-					return false;
-				} catch (\Guzzle\Http\Exception\BadResponseException $e) {
-					\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
-					return false;
-				}
-			case 'w':
-			case 'wb':
-			case 'r+':
-			case 'w+':
-			case 'wb+':
-			case 'x':
-			case 'x+':
-			case 'c':
-			case 'c+':
-				if (strrpos($path, '.') !== false) {
-					$ext = substr($path, strrpos($path, '.'));
-				} else {
-					$ext = '';
-				}
-				$tmpFile = \OCP\Files::tmpFile($ext);
-				// Fetch existing file if required
-				if ($mode[0] !== 'w' && $this->file_exists($path)) {
-					if ($mode[0] === 'x') {
-						// File cannot already exist
-						return false;
-					}
-					$source = $this->fopen($path, 'r');
-					file_put_contents($tmpFile, $source);
-				}
-				$handle = fopen($tmpFile, $mode);
-				return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
-					$this->writeBack($tmpFile, $path);
-				});
-		}
-	}
-
-	public function touch($path, $mtime = null) {
-		$path = $this->normalizePath($path);
-		if (is_null($mtime)) {
-			$mtime = time();
-		}
-		$metadata = array('timestamp' => $mtime);
-		if ($this->file_exists($path)) {
-			if ($this->is_dir($path) && $path != '.') {
-				$path .= '/';
-			}
-
-			$object = $this->fetchObject($path);
-			if ($object->saveMetadata($metadata)) {
-				// invalidate target object to force repopulation on fetch
-				$this->objectCache->remove($path);
-			}
-			return true;
-		} else {
-			$mimeType = \OC::$server->getMimeTypeDetector()->detectPath($path);
-			$customHeaders = array('content-type' => $mimeType);
-			$metadataHeaders = DataObject::stockHeaders($metadata);
-			$allHeaders = $customHeaders + $metadataHeaders;
-			$this->getContainer()->uploadObject($path, '', $allHeaders);
-			// invalidate target object to force repopulation on fetch
-			$this->objectCache->remove($path);
-			return true;
-		}
-	}
-
-	public function copy($path1, $path2) {
-		$path1 = $this->normalizePath($path1);
-		$path2 = $this->normalizePath($path2);
-
-		$fileType = $this->filetype($path1);
-		if ($fileType === 'file') {
-
-			// make way
-			$this->unlink($path2);
-
-			try {
-				$source = $this->fetchObject($path1);
-				$source->copy($this->bucket . '/' . $path2);
-				// invalidate target object to force repopulation on fetch
-				$this->objectCache->remove($path2);
-				$this->objectCache->remove($path2 . '/');
-			} catch (ClientErrorResponseException $e) {
-				\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
-				return false;
-			}
-
-		} else if ($fileType === 'dir') {
-
-			// make way
-			$this->unlink($path2);
-
-			try {
-				$source = $this->fetchObject($path1 . '/');
-				$source->copy($this->bucket . '/' . $path2 . '/');
-				// invalidate target object to force repopulation on fetch
-				$this->objectCache->remove($path2);
-				$this->objectCache->remove($path2 . '/');
-			} catch (ClientErrorResponseException $e) {
-				\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
-				return false;
-			}
-
-			$dh = $this->opendir($path1);
-			while ($file = readdir($dh)) {
-				if (\OC\Files\Filesystem::isIgnoredDir($file)) {
-					continue;
-				}
-
-				$source = $path1 . '/' . $file;
-				$target = $path2 . '/' . $file;
-				$this->copy($source, $target);
-			}
-
-		} else {
-			//file does not exist
-			return false;
-		}
-
-		return true;
-	}
-
-	public function rename($path1, $path2) {
-		$path1 = $this->normalizePath($path1);
-		$path2 = $this->normalizePath($path2);
-
-		$fileType = $this->filetype($path1);
-
-		if ($fileType === 'dir' || $fileType === 'file') {
-			// copy
-			if ($this->copy($path1, $path2) === false) {
-				return false;
-			}
-
-			// cleanup
-			if ($this->unlink($path1) === false) {
-				$this->unlink($path2);
-				return false;
-			}
-
-			return true;
-		}
-
-		return false;
-	}
-
-	public function getId() {
-		return $this->id;
-	}
-
-	/**
-	 * Returns the connection
-	 *
-	 * @return OpenCloud\ObjectStore\Service connected client
-	 * @throws \Exception if connection could not be made
-	 */
-	public function getConnection() {
-		if (!is_null($this->connection)) {
-			return $this->connection;
-		}
-
-		$settings = array(
-			'username' => $this->params['user'],
-		);
-
-		if (!empty($this->params['password'])) {
-			$settings['password'] = $this->params['password'];
-		} else if (!empty($this->params['key'])) {
-			$settings['apiKey'] = $this->params['key'];
-		}
-
-		if (!empty($this->params['tenant'])) {
-			$settings['tenantName'] = $this->params['tenant'];
-		}
-
-		if (!empty($this->params['timeout'])) {
-			$settings['timeout'] = $this->params['timeout'];
-		}
-
-		if (isset($settings['apiKey'])) {
-			$this->anchor = new Rackspace($this->params['url'], $settings);
-		} else {
-			$this->anchor = new OpenStack($this->params['url'], $settings);
-		}
-
-		$connection = $this->anchor->objectStoreService($this->params['service_name'], $this->params['region']);
-
-		if (!empty($this->params['endpoint_url'])) {
-			$endpoint = $connection->getEndpoint();
-			$endpoint->setPublicUrl($this->params['endpoint_url']);
-			$endpoint->setPrivateUrl($this->params['endpoint_url']);
-			$connection->setEndpoint($endpoint);
-		}
-
-		$this->connection = $connection;
-
-		return $this->connection;
-	}
-
-	/**
-	 * Returns the initialized object store container.
-	 *
-	 * @return OpenCloud\ObjectStore\Resource\Container
-	 */
-	public function getContainer() {
-		if (!is_null($this->container)) {
-			return $this->container;
-		}
-
-		try {
-			$this->container = $this->getConnection()->getContainer($this->bucket);
-		} catch (ClientErrorResponseException $e) {
-			$this->container = $this->getConnection()->createContainer($this->bucket);
-		}
-
-		if (!$this->file_exists('.')) {
-			$this->mkdir('.');
-		}
-
-		return $this->container;
-	}
-
-	public function writeBack($tmpFile, $path) {
-		$fileData = fopen($tmpFile, 'r');
-		$this->getContainer()->uploadObject($path, $fileData);
-		// invalidate target object to force repopulation on fetch
-		$this->objectCache->remove(self::$tmpFiles[$tmpFile]);
-		unlink($tmpFile);
-	}
-
-	public function hasUpdated($path, $time) {
-		if ($this->is_file($path)) {
-			return parent::hasUpdated($path, $time);
-		}
-		$path = $this->normalizePath($path);
-		$dh = $this->opendir($path);
-		$content = array();
-		while (($file = readdir($dh)) !== false) {
-			$content[] = $file;
-		}
-		if ($path === '.') {
-			$path = '';
-		}
-		$cachedContent = $this->getCache()->getFolderContents($path);
-		$cachedNames = array_map(function ($content) {
-			return $content['name'];
-		}, $cachedContent);
-		sort($cachedNames);
-		sort($content);
-		return $cachedNames != $content;
-	}
-
-	/**
-	 * check if curl is installed
-	 */
-	public static function checkDependencies() {
-		return true;
-	}
+    /**
+     * @var \OpenCloud\ObjectStore\Service
+     */
+    private $connection;
+    /**
+     * @var \OpenCloud\ObjectStore\Resource\Container
+     */
+    private $container;
+    /**
+     * @var \OpenCloud\OpenStack
+     */
+    private $anchor;
+    /**
+     * @var string
+     */
+    private $bucket;
+    /**
+     * Connection parameters
+     *
+     * @var array
+     */
+    private $params;
+
+    /** @var string  */
+    private $id;
+
+    /**
+     * @var array
+     */
+    private static $tmpFiles = array();
+
+    /**
+     * Key value cache mapping path to data object. Maps path to
+     * \OpenCloud\OpenStack\ObjectStorage\Resource\DataObject for existing
+     * paths and path to false for not existing paths.
+     * @var \OCP\ICache
+     */
+    private $objectCache;
+
+    /**
+     * @param string $path
+     */
+    private function normalizePath($path) {
+        $path = trim($path, '/');
+
+        if (!$path) {
+            $path = '.';
+        }
+
+        $path = str_replace('#', '%23', $path);
+
+        return $path;
+    }
+
+    const SUBCONTAINER_FILE = '.subcontainers';
+
+    /**
+     * translate directory path to container name
+     *
+     * @param string $path
+     * @return string
+     */
+
+    /**
+     * Fetches an object from the API.
+     * If the object is cached already or a
+     * failed "doesn't exist" response was cached,
+     * that one will be returned.
+     *
+     * @param string $path
+     * @return \OpenCloud\OpenStack\ObjectStorage\Resource\DataObject|bool object
+     * or false if the object did not exist
+     */
+    private function fetchObject($path) {
+        if ($this->objectCache->hasKey($path)) {
+            // might be "false" if object did not exist from last check
+            return $this->objectCache->get($path);
+        }
+        try {
+            $object = $this->getContainer()->getPartialObject($path);
+            $this->objectCache->set($path, $object);
+            return $object;
+        } catch (ClientErrorResponseException $e) {
+            // this exception happens when the object does not exist, which
+            // is expected in most cases
+            $this->objectCache->set($path, false);
+            return false;
+        } catch (ClientErrorResponseException $e) {
+            // Expected response is "404 Not Found", so only log if it isn't
+            if ($e->getResponse()->getStatusCode() !== 404) {
+                \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
+            }
+            return false;
+        }
+    }
+
+    /**
+     * Returns whether the given path exists.
+     *
+     * @param string $path
+     *
+     * @return bool true if the object exist, false otherwise
+     */
+    private function doesObjectExist($path) {
+        return $this->fetchObject($path) !== false;
+    }
+
+    public function __construct($params) {
+        if ((empty($params['key']) and empty($params['password']))
+            or empty($params['user']) or empty($params['bucket'])
+            or empty($params['region'])
+        ) {
+            throw new \Exception("API Key or password, Username, Bucket and Region have to be configured.");
+        }
+
+        $this->id = 'swift::' . $params['user'] . md5($params['bucket']);
+
+        $bucketUrl = Url::factory($params['bucket']);
+        if ($bucketUrl->isAbsolute()) {
+            $this->bucket = end(($bucketUrl->getPathSegments()));
+            $params['endpoint_url'] = $bucketUrl->addPath('..')->normalizePath();
+        } else {
+            $this->bucket = $params['bucket'];
+        }
+
+        if (empty($params['url'])) {
+            $params['url'] = 'https://identity.api.rackspacecloud.com/v2.0/';
+        }
+
+        if (empty($params['service_name'])) {
+            $params['service_name'] = 'cloudFiles';
+        }
+
+        $this->params = $params;
+        // FIXME: private class...
+        $this->objectCache = new \OC\Cache\CappedMemoryCache();
+    }
+
+    public function mkdir($path) {
+        $path = $this->normalizePath($path);
+
+        if ($this->is_dir($path)) {
+            return false;
+        }
+
+        if ($path !== '.') {
+            $path .= '/';
+        }
+
+        try {
+            $customHeaders = array('content-type' => 'httpd/unix-directory');
+            $metadataHeaders = DataObject::stockHeaders(array());
+            $allHeaders = $customHeaders + $metadataHeaders;
+            $this->getContainer()->uploadObject($path, '', $allHeaders);
+            // invalidate so that the next access gets the real object
+            // with all properties
+            $this->objectCache->remove($path);
+        } catch (Exceptions\CreateUpdateError $e) {
+            \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
+            return false;
+        }
+
+        return true;
+    }
+
+    public function file_exists($path) {
+        $path = $this->normalizePath($path);
+
+        if ($path !== '.' && $this->is_dir($path)) {
+            $path .= '/';
+        }
+
+        return $this->doesObjectExist($path);
+    }
+
+    public function rmdir($path) {
+        $path = $this->normalizePath($path);
+
+        if (!$this->is_dir($path) || !$this->isDeletable($path)) {
+            return false;
+        }
+
+        $dh = $this->opendir($path);
+        while ($file = readdir($dh)) {
+            if (\OC\Files\Filesystem::isIgnoredDir($file)) {
+                continue;
+            }
+
+            if ($this->is_dir($path . '/' . $file)) {
+                $this->rmdir($path . '/' . $file);
+            } else {
+                $this->unlink($path . '/' . $file);
+            }
+        }
+
+        try {
+            $this->getContainer()->dataObject()->setName($path . '/')->delete();
+            $this->objectCache->remove($path . '/');
+        } catch (Exceptions\DeleteError $e) {
+            \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
+            return false;
+        }
+
+        return true;
+    }
+
+    public function opendir($path) {
+        $path = $this->normalizePath($path);
+
+        if ($path === '.') {
+            $path = '';
+        } else {
+            $path .= '/';
+        }
+
+        $path = str_replace('%23', '#', $path); // the prefix is sent as a query param, so revert the encoding of #
+
+        try {
+            $files = array();
+            /** @var OpenCloud\Common\Collection $objects */
+            $objects = $this->getContainer()->objectList(array(
+                'prefix' => $path,
+                'delimiter' => '/'
+            ));
+
+            /** @var OpenCloud\ObjectStore\Resource\DataObject $object */
+            foreach ($objects as $object) {
+                $file = basename($object->getName());
+                if ($file !== basename($path)) {
+                    $files[] = $file;
+                }
+            }
+
+            return IteratorDirectory::wrap($files);
+        } catch (\Exception $e) {
+            \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
+            return false;
+        }
+
+    }
+
+    public function stat($path) {
+        $path = $this->normalizePath($path);
+
+        if ($path === '.') {
+            $path = '';
+        } else if ($this->is_dir($path)) {
+            $path .= '/';
+        }
+
+        try {
+            /** @var DataObject $object */
+            $object = $this->fetchObject($path);
+            if (!$object) {
+                return false;
+            }
+        } catch (ClientErrorResponseException $e) {
+            \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
+            return false;
+        }
+
+        $dateTime = \DateTime::createFromFormat(\DateTime::RFC1123, $object->getLastModified());
+        if ($dateTime !== false) {
+            $mtime = $dateTime->getTimestamp();
+        } else {
+            $mtime = null;
+        }
+        $objectMetadata = $object->getMetadata();
+        $metaTimestamp = $objectMetadata->getProperty('timestamp');
+        if (isset($metaTimestamp)) {
+            $mtime = $metaTimestamp;
+        }
+
+        if (!empty($mtime)) {
+            $mtime = floor($mtime);
+        }
+
+        $stat = array();
+        $stat['size'] = (int)$object->getContentLength();
+        $stat['mtime'] = $mtime;
+        $stat['atime'] = time();
+        return $stat;
+    }
+
+    public function filetype($path) {
+        $path = $this->normalizePath($path);
+
+        if ($path !== '.' && $this->doesObjectExist($path)) {
+            return 'file';
+        }
+
+        if ($path !== '.') {
+            $path .= '/';
+        }
+
+        if ($this->doesObjectExist($path)) {
+            return 'dir';
+        }
+    }
+
+    public function unlink($path) {
+        $path = $this->normalizePath($path);
+
+        if ($this->is_dir($path)) {
+            return $this->rmdir($path);
+        }
+
+        try {
+            $this->getContainer()->dataObject()->setName($path)->delete();
+            $this->objectCache->remove($path);
+            $this->objectCache->remove($path . '/');
+        } catch (ClientErrorResponseException $e) {
+            if ($e->getResponse()->getStatusCode() !== 404) {
+                \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
+            }
+            return false;
+        }
+
+        return true;
+    }
+
+    public function fopen($path, $mode) {
+        $path = $this->normalizePath($path);
+
+        switch ($mode) {
+            case 'a':
+            case 'ab':
+            case 'a+':
+                return false;
+            case 'r':
+            case 'rb':
+                try {
+                    $c = $this->getContainer();
+                    $streamFactory = new \Guzzle\Stream\PhpStreamRequestFactory();
+                    $streamInterface = $streamFactory->fromRequest(
+                        $c->getClient()
+                            ->get($c->getUrl($path)));
+                    $streamInterface->rewind();
+                    $stream = $streamInterface->getStream();
+                    stream_context_set_option($stream, 'swift','content', $streamInterface);
+                    if(!strrpos($streamInterface
+                        ->getMetaData('wrapper_data')[0], '404 Not Found')) {
+                        return $stream;
+                    }
+                    return false;
+                } catch (\Guzzle\Http\Exception\BadResponseException $e) {
+                    \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
+                    return false;
+                }
+            case 'w':
+            case 'wb':
+            case 'r+':
+            case 'w+':
+            case 'wb+':
+            case 'x':
+            case 'x+':
+            case 'c':
+            case 'c+':
+                if (strrpos($path, '.') !== false) {
+                    $ext = substr($path, strrpos($path, '.'));
+                } else {
+                    $ext = '';
+                }
+                $tmpFile = \OCP\Files::tmpFile($ext);
+                // Fetch existing file if required
+                if ($mode[0] !== 'w' && $this->file_exists($path)) {
+                    if ($mode[0] === 'x') {
+                        // File cannot already exist
+                        return false;
+                    }
+                    $source = $this->fopen($path, 'r');
+                    file_put_contents($tmpFile, $source);
+                }
+                $handle = fopen($tmpFile, $mode);
+                return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
+                    $this->writeBack($tmpFile, $path);
+                });
+        }
+    }
+
+    public function touch($path, $mtime = null) {
+        $path = $this->normalizePath($path);
+        if (is_null($mtime)) {
+            $mtime = time();
+        }
+        $metadata = array('timestamp' => $mtime);
+        if ($this->file_exists($path)) {
+            if ($this->is_dir($path) && $path != '.') {
+                $path .= '/';
+            }
+
+            $object = $this->fetchObject($path);
+            if ($object->saveMetadata($metadata)) {
+                // invalidate target object to force repopulation on fetch
+                $this->objectCache->remove($path);
+            }
+            return true;
+        } else {
+            $mimeType = \OC::$server->getMimeTypeDetector()->detectPath($path);
+            $customHeaders = array('content-type' => $mimeType);
+            $metadataHeaders = DataObject::stockHeaders($metadata);
+            $allHeaders = $customHeaders + $metadataHeaders;
+            $this->getContainer()->uploadObject($path, '', $allHeaders);
+            // invalidate target object to force repopulation on fetch
+            $this->objectCache->remove($path);
+            return true;
+        }
+    }
+
+    public function copy($path1, $path2) {
+        $path1 = $this->normalizePath($path1);
+        $path2 = $this->normalizePath($path2);
+
+        $fileType = $this->filetype($path1);
+        if ($fileType === 'file') {
+
+            // make way
+            $this->unlink($path2);
+
+            try {
+                $source = $this->fetchObject($path1);
+                $source->copy($this->bucket . '/' . $path2);
+                // invalidate target object to force repopulation on fetch
+                $this->objectCache->remove($path2);
+                $this->objectCache->remove($path2 . '/');
+            } catch (ClientErrorResponseException $e) {
+                \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
+                return false;
+            }
+
+        } else if ($fileType === 'dir') {
+
+            // make way
+            $this->unlink($path2);
+
+            try {
+                $source = $this->fetchObject($path1 . '/');
+                $source->copy($this->bucket . '/' . $path2 . '/');
+                // invalidate target object to force repopulation on fetch
+                $this->objectCache->remove($path2);
+                $this->objectCache->remove($path2 . '/');
+            } catch (ClientErrorResponseException $e) {
+                \OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
+                return false;
+            }
+
+            $dh = $this->opendir($path1);
+            while ($file = readdir($dh)) {
+                if (\OC\Files\Filesystem::isIgnoredDir($file)) {
+                    continue;
+                }
+
+                $source = $path1 . '/' . $file;
+                $target = $path2 . '/' . $file;
+                $this->copy($source, $target);
+            }
+
+        } else {
+            //file does not exist
+            return false;
+        }
+
+        return true;
+    }
+
+    public function rename($path1, $path2) {
+        $path1 = $this->normalizePath($path1);
+        $path2 = $this->normalizePath($path2);
+
+        $fileType = $this->filetype($path1);
+
+        if ($fileType === 'dir' || $fileType === 'file') {
+            // copy
+            if ($this->copy($path1, $path2) === false) {
+                return false;
+            }
+
+            // cleanup
+            if ($this->unlink($path1) === false) {
+                $this->unlink($path2);
+                return false;
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
+    public function getId() {
+        return $this->id;
+    }
+
+    /**
+     * Returns the connection
+     *
+     * @return OpenCloud\ObjectStore\Service connected client
+     * @throws \Exception if connection could not be made
+     */
+    public function getConnection() {
+        if (!is_null($this->connection)) {
+            return $this->connection;
+        }
+
+        $settings = array(
+            'username' => $this->params['user'],
+        );
+
+        if (!empty($this->params['password'])) {
+            $settings['password'] = $this->params['password'];
+        } else if (!empty($this->params['key'])) {
+            $settings['apiKey'] = $this->params['key'];
+        }
+
+        if (!empty($this->params['tenant'])) {
+            $settings['tenantName'] = $this->params['tenant'];
+        }
+
+        if (!empty($this->params['timeout'])) {
+            $settings['timeout'] = $this->params['timeout'];
+        }
+
+        if (isset($settings['apiKey'])) {
+            $this->anchor = new Rackspace($this->params['url'], $settings);
+        } else {
+            $this->anchor = new OpenStack($this->params['url'], $settings);
+        }
+
+        $connection = $this->anchor->objectStoreService($this->params['service_name'], $this->params['region']);
+
+        if (!empty($this->params['endpoint_url'])) {
+            $endpoint = $connection->getEndpoint();
+            $endpoint->setPublicUrl($this->params['endpoint_url']);
+            $endpoint->setPrivateUrl($this->params['endpoint_url']);
+            $connection->setEndpoint($endpoint);
+        }
+
+        $this->connection = $connection;
+
+        return $this->connection;
+    }
+
+    /**
+     * Returns the initialized object store container.
+     *
+     * @return OpenCloud\ObjectStore\Resource\Container
+     */
+    public function getContainer() {
+        if (!is_null($this->container)) {
+            return $this->container;
+        }
+
+        try {
+            $this->container = $this->getConnection()->getContainer($this->bucket);
+        } catch (ClientErrorResponseException $e) {
+            $this->container = $this->getConnection()->createContainer($this->bucket);
+        }
+
+        if (!$this->file_exists('.')) {
+            $this->mkdir('.');
+        }
+
+        return $this->container;
+    }
+
+    public function writeBack($tmpFile, $path) {
+        $fileData = fopen($tmpFile, 'r');
+        $this->getContainer()->uploadObject($path, $fileData);
+        // invalidate target object to force repopulation on fetch
+        $this->objectCache->remove(self::$tmpFiles[$tmpFile]);
+        unlink($tmpFile);
+    }
+
+    public function hasUpdated($path, $time) {
+        if ($this->is_file($path)) {
+            return parent::hasUpdated($path, $time);
+        }
+        $path = $this->normalizePath($path);
+        $dh = $this->opendir($path);
+        $content = array();
+        while (($file = readdir($dh)) !== false) {
+            $content[] = $file;
+        }
+        if ($path === '.') {
+            $path = '';
+        }
+        $cachedContent = $this->getCache()->getFolderContents($path);
+        $cachedNames = array_map(function ($content) {
+            return $content['name'];
+        }, $cachedContent);
+        sort($cachedNames);
+        sort($content);
+        return $cachedNames != $content;
+    }
+
+    /**
+     * check if curl is installed
+     */
+    public static function checkDependencies() {
+        return true;
+    }
 
 }

Spacing +19 added lines, -19 removed lines

@@ -163,7 +163,7 @@ 
 			throw new \Exception("API Key or password, Username, Bucket and Region have to be configured.");
 		}
 
-		$this->id = 'swift::' . $params['user'] . md5($params['bucket']);
+		$this->id = 'swift::'.$params['user'].md5($params['bucket']);
 
 		$bucketUrl = Url::factory($params['bucket']);
 		if ($bucketUrl->isAbsolute()) {
@@ -236,16 +236,16 @@ 
 				continue;
 			}
 
-			if ($this->is_dir($path . '/' . $file)) {
-				$this->rmdir($path . '/' . $file);
+			if ($this->is_dir($path.'/'.$file)) {
+				$this->rmdir($path.'/'.$file);
 			} else {
-				$this->unlink($path . '/' . $file);
+				$this->unlink($path.'/'.$file);
 			}
 		}
 
 		try {
-			$this->getContainer()->dataObject()->setName($path . '/')->delete();
-			$this->objectCache->remove($path . '/');
+			$this->getContainer()->dataObject()->setName($path.'/')->delete();
+			$this->objectCache->remove($path.'/');
 		} catch (Exceptions\DeleteError $e) {
 			\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
 			return false;
@@ -326,7 +326,7 @@ 
 		}
 
 		$stat = array();
-		$stat['size'] = (int)$object->getContentLength();
+		$stat['size'] = (int) $object->getContentLength();
 		$stat['mtime'] = $mtime;
 		$stat['atime'] = time();
 		return $stat;
@@ -358,7 +358,7 @@ 
 		try {
 			$this->getContainer()->dataObject()->setName($path)->delete();
 			$this->objectCache->remove($path);
-			$this->objectCache->remove($path . '/');
+			$this->objectCache->remove($path.'/');
 		} catch (ClientErrorResponseException $e) {
 			if ($e->getResponse()->getStatusCode() !== 404) {
 				\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
@@ -387,8 +387,8 @@ 
 							->get($c->getUrl($path)));
 					$streamInterface->rewind();
 					$stream = $streamInterface->getStream();
-					stream_context_set_option($stream, 'swift','content', $streamInterface);
-					if(!strrpos($streamInterface
+					stream_context_set_option($stream, 'swift', 'content', $streamInterface);
+					if (!strrpos($streamInterface
 						->getMetaData('wrapper_data')[0], '404 Not Found')) {
 						return $stream;
 					}
@@ -422,7 +422,7 @@ 
 					file_put_contents($tmpFile, $source);
 				}
 				$handle = fopen($tmpFile, $mode);
-				return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
+				return CallbackWrapper::wrap($handle, null, null, function() use ($path, $tmpFile) {
 					$this->writeBack($tmpFile, $path);
 				});
 		}
@@ -469,10 +469,10 @@ 
 
 			try {
 				$source = $this->fetchObject($path1);
-				$source->copy($this->bucket . '/' . $path2);
+				$source->copy($this->bucket.'/'.$path2);
 				// invalidate target object to force repopulation on fetch
 				$this->objectCache->remove($path2);
-				$this->objectCache->remove($path2 . '/');
+				$this->objectCache->remove($path2.'/');
 			} catch (ClientErrorResponseException $e) {
 				\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
 				return false;
@@ -484,11 +484,11 @@ 
 			$this->unlink($path2);
 
 			try {
-				$source = $this->fetchObject($path1 . '/');
-				$source->copy($this->bucket . '/' . $path2 . '/');
+				$source = $this->fetchObject($path1.'/');
+				$source->copy($this->bucket.'/'.$path2.'/');
 				// invalidate target object to force repopulation on fetch
 				$this->objectCache->remove($path2);
-				$this->objectCache->remove($path2 . '/');
+				$this->objectCache->remove($path2.'/');
 			} catch (ClientErrorResponseException $e) {
 				\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
 				return false;
@@ -500,8 +500,8 @@ 
 					continue;
 				}
 
-				$source = $path1 . '/' . $file;
-				$target = $path2 . '/' . $file;
+				$source = $path1.'/'.$file;
+				$target = $path2.'/'.$file;
 				$this->copy($source, $target);
 			}
 
@@ -635,7 +635,7 @@ 
 			$path = '';
 		}
 		$cachedContent = $this->getCache()->getFolderContents($path);
-		$cachedNames = array_map(function ($content) {
+		$cachedNames = array_map(function($content) {
 			return $content['name'];
 		}, $cachedContent);
 		sort($cachedNames);

apps/files_sharing/lib/Controller/ShareController.php

Doc Comments +1 added lines, -1 removed lines

@@ -597,7 +597,7 @@
 	 * publish activity
 	 *
 	 * @param string $subject
-	 * @param array $parameters
+	 * @param string[] $parameters
 	 * @param string $affectedUser
 	 * @param int $fileId
 	 * @param string $filePath

Spacing +12 added lines, -12 removed lines

@@ -150,7 +150,7 @@ 
 	public function showAuthenticate($token) {
 		$share = $this->shareManager->getShareByToken($token);
 
-		if($this->linkShareAuth($share)) {
+		if ($this->linkShareAuth($share)) {
 			return new RedirectResponse($this->urlGenerator->linkToRoute('files_sharing.sharecontroller.showShare', array('token' => $token)));
 		}
 
@@ -178,7 +178,7 @@ 
 
 		$authenticate = $this->linkShareAuth($share, $password);
 
-		if($authenticate === true) {
+		if ($authenticate === true) {
 			return new RedirectResponse($this->urlGenerator->linkToRoute('files_sharing.sharecontroller.showShare', array('token' => $token)));
 		}
 
@@ -199,15 +199,15 @@ 
 	private function linkShareAuth(\OCP\Share\IShare $share, $password = null) {
 		if ($password !== null) {
 			if ($this->shareManager->checkPassword($share, $password)) {
-				$this->session->set('public_link_authenticated', (string)$share->getId());
+				$this->session->set('public_link_authenticated', (string) $share->getId());
 			} else {
 				$this->emitAccessShareHook($share, 403, 'Wrong password');
 				return false;
 			}
 		} else {
 			// not authenticated ?
-			if ( ! $this->session->exists('public_link_authenticated')
-				|| $this->session->get('public_link_authenticated') !== (string)$share->getId()) {
+			if (!$this->session->exists('public_link_authenticated')
+				|| $this->session->get('public_link_authenticated') !== (string) $share->getId()) {
 				return false;
 			}
 		}
@@ -228,7 +228,7 @@ 
 		$itemType = $itemSource = $uidOwner = '';
 		$token = $share;
 		$exception = null;
-		if($share instanceof \OCP\Share\IShare) {
+		if ($share instanceof \OCP\Share\IShare) {
 			try {
 				$token = $share->getToken();
 				$uidOwner = $share->getSharedBy();
@@ -247,7 +247,7 @@ 
 			'errorCode' => $errorCode,
 			'errorMessage' => $errorMessage,
 		]);
-		if(!is_null($exception)) {
+		if (!is_null($exception)) {
 			throw $exception;
 		}
 	}
@@ -340,7 +340,7 @@ 
 			if ($freeSpace < \OCP\Files\FileInfo::SPACE_UNLIMITED) {
 				$freeSpace = max($freeSpace, 0);
 			} else {
-				$freeSpace = (INF > 0) ? INF: PHP_INT_MAX; // work around https://bugs.php.net/bug.php?id=69188
+				$freeSpace = (INF > 0) ? INF : PHP_INT_MAX; // work around https://bugs.php.net/bug.php?id=69188
 			}
 
 			$hideFileList = $share->getPermissions() & \OCP\Constants::PERMISSION_READ ? false : true;
@@ -371,7 +371,7 @@ 
 		$shareTmpl['previewMaxY'] = $this->config->getSystemValue('preview_max_y', 1024);
 		$shareTmpl['disclaimer'] = $this->config->getAppValue('core', 'shareapi_public_link_disclaimertext', null);
 		if ($shareTmpl['previewSupported']) {
-			$shareTmpl['previewImage'] = $this->urlGenerator->linkToRouteAbsolute( 'files_sharing.PublicPreview.getPreview',
+			$shareTmpl['previewImage'] = $this->urlGenerator->linkToRouteAbsolute('files_sharing.PublicPreview.getPreview',
 				['x' => 200, 'y' => 200, 'file' => $shareTmpl['directory_path'], 't' => $shareTmpl['dirToken']]);
 		} else {
 			$shareTmpl['previewImage'] = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'favicon-fb.png'));
@@ -401,7 +401,7 @@ 
 		}
 
 		// OpenGraph Support: http://ogp.me/
-		\OCP\Util::addHeader('meta', ['property' => "og:title", 'content' => $this->defaults->getName() . ' - ' . $this->defaults->getSlogan()]);
+		\OCP\Util::addHeader('meta', ['property' => "og:title", 'content' => $this->defaults->getName().' - '.$this->defaults->getSlogan()]);
 		\OCP\Util::addHeader('meta', ['property' => "og:description", 'content' => $this->l10n->t('%s is publicly shared', [$shareTmpl['filename']])]);
 		\OCP\Util::addHeader('meta', ['property' => "og:site_name", 'content' => $this->defaults->getName()]);
 		\OCP\Util::addHeader('meta', ['property' => "og:url", 'content' => $shareTmpl['shareUrl']]);
@@ -436,7 +436,7 @@ 
 
 		$share = $this->shareManager->getShareByToken($token);
 
-		if(!($share->getPermissions() & \OCP\Constants::PERMISSION_READ)) {
+		if (!($share->getPermissions() & \OCP\Constants::PERMISSION_READ)) {
 			return new \OCP\AppFramework\Http\DataResponse('Share is read-only');
 		}
 
@@ -514,7 +514,7 @@ 
 
 		$this->emitAccessShareHook($share);
 
-		$server_params = array( 'head' => $this->request->getMethod() == 'HEAD' );
+		$server_params = array('head' => $this->request->getMethod() == 'HEAD');
 
 		/**
 		 * Http range requests support

Indentation +548 added lines, -548 removed lines

@@ -64,556 +64,556 @@
  */
 class ShareController extends Controller {
 
-	/** @var IConfig */
-	protected $config;
-	/** @var IURLGenerator */
-	protected $urlGenerator;
-	/** @var IUserManager */
-	protected $userManager;
-	/** @var ILogger */
-	protected $logger;
-	/** @var \OCP\Activity\IManager */
-	protected $activityManager;
-	/** @var \OCP\Share\IManager */
-	protected $shareManager;
-	/** @var ISession */
-	protected $session;
-	/** @var IPreview */
-	protected $previewManager;
-	/** @var IRootFolder */
-	protected $rootFolder;
-	/** @var FederatedShareProvider */
-	protected $federatedShareProvider;
-	/** @var EventDispatcherInterface */
-	protected $eventDispatcher;
-	/** @var IL10N */
-	protected $l10n;
-	/** @var Defaults */
-	protected $defaults;
-
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IConfig $config
-	 * @param IURLGenerator $urlGenerator
-	 * @param IUserManager $userManager
-	 * @param ILogger $logger
-	 * @param \OCP\Activity\IManager $activityManager
-	 * @param \OCP\Share\IManager $shareManager
-	 * @param ISession $session
-	 * @param IPreview $previewManager
-	 * @param IRootFolder $rootFolder
-	 * @param FederatedShareProvider $federatedShareProvider
-	 * @param EventDispatcherInterface $eventDispatcher
-	 * @param IL10N $l10n
-	 * @param Defaults $defaults
-	 */
-	public function __construct($appName,
-								IRequest $request,
-								IConfig $config,
-								IURLGenerator $urlGenerator,
-								IUserManager $userManager,
-								ILogger $logger,
-								\OCP\Activity\IManager $activityManager,
-								\OCP\Share\IManager $shareManager,
-								ISession $session,
-								IPreview $previewManager,
-								IRootFolder $rootFolder,
-								FederatedShareProvider $federatedShareProvider,
-								EventDispatcherInterface $eventDispatcher,
-								IL10N $l10n,
-								Defaults $defaults) {
-		parent::__construct($appName, $request);
-
-		$this->config = $config;
-		$this->urlGenerator = $urlGenerator;
-		$this->userManager = $userManager;
-		$this->logger = $logger;
-		$this->activityManager = $activityManager;
-		$this->shareManager = $shareManager;
-		$this->session = $session;
-		$this->previewManager = $previewManager;
-		$this->rootFolder = $rootFolder;
-		$this->federatedShareProvider = $federatedShareProvider;
-		$this->eventDispatcher = $eventDispatcher;
-		$this->l10n = $l10n;
-		$this->defaults = $defaults;
-	}
-
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 *
-	 * @param string $token
-	 * @return TemplateResponse|RedirectResponse
-	 */
-	public function showAuthenticate($token) {
-		$share = $this->shareManager->getShareByToken($token);
-
-		if($this->linkShareAuth($share)) {
-			return new RedirectResponse($this->urlGenerator->linkToRoute('files_sharing.sharecontroller.showShare', array('token' => $token)));
-		}
-
-		return new TemplateResponse($this->appName, 'authenticate', array(), 'guest');
-	}
-
-	/**
-	 * @PublicPage
-	 * @UseSession
-	 * @BruteForceProtection publicLinkAuth
-	 *
-	 * Authenticates against password-protected shares
-	 * @param string $token
-	 * @param string $password
-	 * @return RedirectResponse|TemplateResponse|NotFoundResponse
-	 */
-	public function authenticate($token, $password = '') {
-
-		// Check whether share exists
-		try {
-			$share = $this->shareManager->getShareByToken($token);
-		} catch (ShareNotFound $e) {
-			return new NotFoundResponse();
-		}
-
-		$authenticate = $this->linkShareAuth($share, $password);
-
-		if($authenticate === true) {
-			return new RedirectResponse($this->urlGenerator->linkToRoute('files_sharing.sharecontroller.showShare', array('token' => $token)));
-		}
-
-		return new TemplateResponse($this->appName, 'authenticate', array('wrongpw' => true), 'guest');
-	}
-
-	/**
-	 * Authenticate a link item with the given password.
-	 * Or use the session if no password is provided.
-	 *
-	 * This is a modified version of Helper::authenticate
-	 * TODO: Try to merge back eventually with Helper::authenticate
-	 *
-	 * @param \OCP\Share\IShare $share
-	 * @param string|null $password
-	 * @return bool
-	 */
-	private function linkShareAuth(\OCP\Share\IShare $share, $password = null) {
-		if ($password !== null) {
-			if ($this->shareManager->checkPassword($share, $password)) {
-				$this->session->set('public_link_authenticated', (string)$share->getId());
-			} else {
-				$this->emitAccessShareHook($share, 403, 'Wrong password');
-				return false;
-			}
-		} else {
-			// not authenticated ?
-			if ( ! $this->session->exists('public_link_authenticated')
-				|| $this->session->get('public_link_authenticated') !== (string)$share->getId()) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * throws hooks when a share is attempted to be accessed
-	 *
-	 * @param \OCP\Share\IShare|string $share the Share instance if available,
-	 * otherwise token
-	 * @param int $errorCode
-	 * @param string $errorMessage
-	 * @throws \OC\HintException
-	 * @throws \OC\ServerNotAvailableException
-	 */
-	protected function emitAccessShareHook($share, $errorCode = 200, $errorMessage = '') {
-		$itemType = $itemSource = $uidOwner = '';
-		$token = $share;
-		$exception = null;
-		if($share instanceof \OCP\Share\IShare) {
-			try {
-				$token = $share->getToken();
-				$uidOwner = $share->getSharedBy();
-				$itemType = $share->getNodeType();
-				$itemSource = $share->getNodeId();
-			} catch (\Exception $e) {
-				// we log what we know and pass on the exception afterwards
-				$exception = $e;
-			}
-		}
-		\OC_Hook::emit('OCP\Share', 'share_link_access', [
-			'itemType' => $itemType,
-			'itemSource' => $itemSource,
-			'uidOwner' => $uidOwner,
-			'token' => $token,
-			'errorCode' => $errorCode,
-			'errorMessage' => $errorMessage,
-		]);
-		if(!is_null($exception)) {
-			throw $exception;
-		}
-	}
-
-	/**
-	 * Validate the permissions of the share
-	 *
-	 * @param Share\IShare $share
-	 * @return bool
-	 */
-	private function validateShare(\OCP\Share\IShare $share) {
-		return $share->getNode()->isReadable() && $share->getNode()->isShareable();
-	}
-
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 *
-	 * @param string $token
-	 * @param string $path
-	 * @return TemplateResponse|RedirectResponse|NotFoundResponse
-	 * @throws NotFoundException
-	 * @throws \Exception
-	 */
-	public function showShare($token, $path = '') {
-		\OC_User::setIncognitoMode(true);
-
-		// Check whether share exists
-		try {
-			$share = $this->shareManager->getShareByToken($token);
-		} catch (ShareNotFound $e) {
-			$this->emitAccessShareHook($token, 404, 'Share not found');
-			return new NotFoundResponse();
-		}
-
-		// Share is password protected - check whether the user is permitted to access the share
-		if ($share->getPassword() !== null && !$this->linkShareAuth($share)) {
-			return new RedirectResponse($this->urlGenerator->linkToRoute('files_sharing.sharecontroller.authenticate',
-				array('token' => $token)));
-		}
-
-		if (!$this->validateShare($share)) {
-			throw new NotFoundException();
-		}
-		// We can't get the path of a file share
-		try {
-			if ($share->getNode() instanceof \OCP\Files\File && $path !== '') {
-				$this->emitAccessShareHook($share, 404, 'Share not found');
-				throw new NotFoundException();
-			}
-		} catch (\Exception $e) {
-			$this->emitAccessShareHook($share, 404, 'Share not found');
-			throw $e;
-		}
-
-		$shareTmpl = [];
-		$shareTmpl['displayName'] = $this->userManager->get($share->getShareOwner())->getDisplayName();
-		$shareTmpl['owner'] = $share->getShareOwner();
-		$shareTmpl['filename'] = $share->getNode()->getName();
-		$shareTmpl['directory_path'] = $share->getTarget();
-		$shareTmpl['mimetype'] = $share->getNode()->getMimetype();
-		$shareTmpl['previewSupported'] = $this->previewManager->isMimeSupported($share->getNode()->getMimetype());
-		$shareTmpl['dirToken'] = $token;
-		$shareTmpl['sharingToken'] = $token;
-		$shareTmpl['server2serversharing'] = $this->federatedShareProvider->isOutgoingServer2serverShareEnabled();
-		$shareTmpl['protected'] = $share->getPassword() !== null ? 'true' : 'false';
-		$shareTmpl['dir'] = '';
-		$shareTmpl['nonHumanFileSize'] = $share->getNode()->getSize();
-		$shareTmpl['fileSize'] = \OCP\Util::humanFileSize($share->getNode()->getSize());
-
-		// Show file list
-		$hideFileList = false;
-		if ($share->getNode() instanceof \OCP\Files\Folder) {
-			/** @var \OCP\Files\Folder $rootFolder */
-			$rootFolder = $share->getNode();
-
-			try {
-				$folderNode = $rootFolder->get($path);
-			} catch (\OCP\Files\NotFoundException $e) {
-				$this->emitAccessShareHook($share, 404, 'Share not found');
-				throw new NotFoundException();
-			}
-
-			$shareTmpl['dir'] = $rootFolder->getRelativePath($folderNode->getPath());
-
-			/*
+    /** @var IConfig */
+    protected $config;
+    /** @var IURLGenerator */
+    protected $urlGenerator;
+    /** @var IUserManager */
+    protected $userManager;
+    /** @var ILogger */
+    protected $logger;
+    /** @var \OCP\Activity\IManager */
+    protected $activityManager;
+    /** @var \OCP\Share\IManager */
+    protected $shareManager;
+    /** @var ISession */
+    protected $session;
+    /** @var IPreview */
+    protected $previewManager;
+    /** @var IRootFolder */
+    protected $rootFolder;
+    /** @var FederatedShareProvider */
+    protected $federatedShareProvider;
+    /** @var EventDispatcherInterface */
+    protected $eventDispatcher;
+    /** @var IL10N */
+    protected $l10n;
+    /** @var Defaults */
+    protected $defaults;
+
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IConfig $config
+     * @param IURLGenerator $urlGenerator
+     * @param IUserManager $userManager
+     * @param ILogger $logger
+     * @param \OCP\Activity\IManager $activityManager
+     * @param \OCP\Share\IManager $shareManager
+     * @param ISession $session
+     * @param IPreview $previewManager
+     * @param IRootFolder $rootFolder
+     * @param FederatedShareProvider $federatedShareProvider
+     * @param EventDispatcherInterface $eventDispatcher
+     * @param IL10N $l10n
+     * @param Defaults $defaults
+     */
+    public function __construct($appName,
+                                IRequest $request,
+                                IConfig $config,
+                                IURLGenerator $urlGenerator,
+                                IUserManager $userManager,
+                                ILogger $logger,
+                                \OCP\Activity\IManager $activityManager,
+                                \OCP\Share\IManager $shareManager,
+                                ISession $session,
+                                IPreview $previewManager,
+                                IRootFolder $rootFolder,
+                                FederatedShareProvider $federatedShareProvider,
+                                EventDispatcherInterface $eventDispatcher,
+                                IL10N $l10n,
+                                Defaults $defaults) {
+        parent::__construct($appName, $request);
+
+        $this->config = $config;
+        $this->urlGenerator = $urlGenerator;
+        $this->userManager = $userManager;
+        $this->logger = $logger;
+        $this->activityManager = $activityManager;
+        $this->shareManager = $shareManager;
+        $this->session = $session;
+        $this->previewManager = $previewManager;
+        $this->rootFolder = $rootFolder;
+        $this->federatedShareProvider = $federatedShareProvider;
+        $this->eventDispatcher = $eventDispatcher;
+        $this->l10n = $l10n;
+        $this->defaults = $defaults;
+    }
+
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     *
+     * @param string $token
+     * @return TemplateResponse|RedirectResponse
+     */
+    public function showAuthenticate($token) {
+        $share = $this->shareManager->getShareByToken($token);
+
+        if($this->linkShareAuth($share)) {
+            return new RedirectResponse($this->urlGenerator->linkToRoute('files_sharing.sharecontroller.showShare', array('token' => $token)));
+        }
+
+        return new TemplateResponse($this->appName, 'authenticate', array(), 'guest');
+    }
+
+    /**
+     * @PublicPage
+     * @UseSession
+     * @BruteForceProtection publicLinkAuth
+     *
+     * Authenticates against password-protected shares
+     * @param string $token
+     * @param string $password
+     * @return RedirectResponse|TemplateResponse|NotFoundResponse
+     */
+    public function authenticate($token, $password = '') {
+
+        // Check whether share exists
+        try {
+            $share = $this->shareManager->getShareByToken($token);
+        } catch (ShareNotFound $e) {
+            return new NotFoundResponse();
+        }
+
+        $authenticate = $this->linkShareAuth($share, $password);
+
+        if($authenticate === true) {
+            return new RedirectResponse($this->urlGenerator->linkToRoute('files_sharing.sharecontroller.showShare', array('token' => $token)));
+        }
+
+        return new TemplateResponse($this->appName, 'authenticate', array('wrongpw' => true), 'guest');
+    }
+
+    /**
+     * Authenticate a link item with the given password.
+     * Or use the session if no password is provided.
+     *
+     * This is a modified version of Helper::authenticate
+     * TODO: Try to merge back eventually with Helper::authenticate
+     *
+     * @param \OCP\Share\IShare $share
+     * @param string|null $password
+     * @return bool
+     */
+    private function linkShareAuth(\OCP\Share\IShare $share, $password = null) {
+        if ($password !== null) {
+            if ($this->shareManager->checkPassword($share, $password)) {
+                $this->session->set('public_link_authenticated', (string)$share->getId());
+            } else {
+                $this->emitAccessShareHook($share, 403, 'Wrong password');
+                return false;
+            }
+        } else {
+            // not authenticated ?
+            if ( ! $this->session->exists('public_link_authenticated')
+                || $this->session->get('public_link_authenticated') !== (string)$share->getId()) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * throws hooks when a share is attempted to be accessed
+     *
+     * @param \OCP\Share\IShare|string $share the Share instance if available,
+     * otherwise token
+     * @param int $errorCode
+     * @param string $errorMessage
+     * @throws \OC\HintException
+     * @throws \OC\ServerNotAvailableException
+     */
+    protected function emitAccessShareHook($share, $errorCode = 200, $errorMessage = '') {
+        $itemType = $itemSource = $uidOwner = '';
+        $token = $share;
+        $exception = null;
+        if($share instanceof \OCP\Share\IShare) {
+            try {
+                $token = $share->getToken();
+                $uidOwner = $share->getSharedBy();
+                $itemType = $share->getNodeType();
+                $itemSource = $share->getNodeId();
+            } catch (\Exception $e) {
+                // we log what we know and pass on the exception afterwards
+                $exception = $e;
+            }
+        }
+        \OC_Hook::emit('OCP\Share', 'share_link_access', [
+            'itemType' => $itemType,
+            'itemSource' => $itemSource,
+            'uidOwner' => $uidOwner,
+            'token' => $token,
+            'errorCode' => $errorCode,
+            'errorMessage' => $errorMessage,
+        ]);
+        if(!is_null($exception)) {
+            throw $exception;
+        }
+    }
+
+    /**
+     * Validate the permissions of the share
+     *
+     * @param Share\IShare $share
+     * @return bool
+     */
+    private function validateShare(\OCP\Share\IShare $share) {
+        return $share->getNode()->isReadable() && $share->getNode()->isShareable();
+    }
+
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     *
+     * @param string $token
+     * @param string $path
+     * @return TemplateResponse|RedirectResponse|NotFoundResponse
+     * @throws NotFoundException
+     * @throws \Exception
+     */
+    public function showShare($token, $path = '') {
+        \OC_User::setIncognitoMode(true);
+
+        // Check whether share exists
+        try {
+            $share = $this->shareManager->getShareByToken($token);
+        } catch (ShareNotFound $e) {
+            $this->emitAccessShareHook($token, 404, 'Share not found');
+            return new NotFoundResponse();
+        }
+
+        // Share is password protected - check whether the user is permitted to access the share
+        if ($share->getPassword() !== null && !$this->linkShareAuth($share)) {
+            return new RedirectResponse($this->urlGenerator->linkToRoute('files_sharing.sharecontroller.authenticate',
+                array('token' => $token)));
+        }
+
+        if (!$this->validateShare($share)) {
+            throw new NotFoundException();
+        }
+        // We can't get the path of a file share
+        try {
+            if ($share->getNode() instanceof \OCP\Files\File && $path !== '') {
+                $this->emitAccessShareHook($share, 404, 'Share not found');
+                throw new NotFoundException();
+            }
+        } catch (\Exception $e) {
+            $this->emitAccessShareHook($share, 404, 'Share not found');
+            throw $e;
+        }
+
+        $shareTmpl = [];
+        $shareTmpl['displayName'] = $this->userManager->get($share->getShareOwner())->getDisplayName();
+        $shareTmpl['owner'] = $share->getShareOwner();
+        $shareTmpl['filename'] = $share->getNode()->getName();
+        $shareTmpl['directory_path'] = $share->getTarget();
+        $shareTmpl['mimetype'] = $share->getNode()->getMimetype();
+        $shareTmpl['previewSupported'] = $this->previewManager->isMimeSupported($share->getNode()->getMimetype());
+        $shareTmpl['dirToken'] = $token;
+        $shareTmpl['sharingToken'] = $token;
+        $shareTmpl['server2serversharing'] = $this->federatedShareProvider->isOutgoingServer2serverShareEnabled();
+        $shareTmpl['protected'] = $share->getPassword() !== null ? 'true' : 'false';
+        $shareTmpl['dir'] = '';
+        $shareTmpl['nonHumanFileSize'] = $share->getNode()->getSize();
+        $shareTmpl['fileSize'] = \OCP\Util::humanFileSize($share->getNode()->getSize());
+
+        // Show file list
+        $hideFileList = false;
+        if ($share->getNode() instanceof \OCP\Files\Folder) {
+            /** @var \OCP\Files\Folder $rootFolder */
+            $rootFolder = $share->getNode();
+
+            try {
+                $folderNode = $rootFolder->get($path);
+            } catch (\OCP\Files\NotFoundException $e) {
+                $this->emitAccessShareHook($share, 404, 'Share not found');
+                throw new NotFoundException();
+            }
+
+            $shareTmpl['dir'] = $rootFolder->getRelativePath($folderNode->getPath());
+
+            /*
 			 * The OC_Util methods require a view. This just uses the node API
 			 */
-			$freeSpace = $share->getNode()->getStorage()->free_space($share->getNode()->getInternalPath());
-			if ($freeSpace < \OCP\Files\FileInfo::SPACE_UNLIMITED) {
-				$freeSpace = max($freeSpace, 0);
-			} else {
-				$freeSpace = (INF > 0) ? INF: PHP_INT_MAX; // work around https://bugs.php.net/bug.php?id=69188
-			}
-
-			$hideFileList = $share->getPermissions() & \OCP\Constants::PERMISSION_READ ? false : true;
-			$maxUploadFilesize = $freeSpace;
-
-			$folder = new Template('files', 'list', '');
-			$folder->assign('dir', $rootFolder->getRelativePath($folderNode->getPath()));
-			$folder->assign('dirToken', $token);
-			$folder->assign('permissions', \OCP\Constants::PERMISSION_READ);
-			$folder->assign('isPublic', true);
-			$folder->assign('hideFileList', $hideFileList);
-			$folder->assign('publicUploadEnabled', 'no');
-			$folder->assign('uploadMaxFilesize', $maxUploadFilesize);
-			$folder->assign('uploadMaxHumanFilesize', \OCP\Util::humanFileSize($maxUploadFilesize));
-			$folder->assign('freeSpace', $freeSpace);
-			$folder->assign('usedSpacePercent', 0);
-			$folder->assign('trash', false);
-			$shareTmpl['folder'] = $folder->fetchPage();
-		}
-
-		$shareTmpl['hideFileList'] = $hideFileList;
-		$shareTmpl['shareOwner'] = $this->userManager->get($share->getShareOwner())->getDisplayName();
-		$shareTmpl['downloadURL'] = $this->urlGenerator->linkToRouteAbsolute('files_sharing.sharecontroller.downloadShare', ['token' => $token]);
-		$shareTmpl['shareUrl'] = $this->urlGenerator->linkToRouteAbsolute('files_sharing.sharecontroller.showShare', ['token' => $token]);
-		$shareTmpl['maxSizeAnimateGif'] = $this->config->getSystemValue('max_filesize_animated_gifs_public_sharing', 10);
-		$shareTmpl['previewEnabled'] = $this->config->getSystemValue('enable_previews', true);
-		$shareTmpl['previewMaxX'] = $this->config->getSystemValue('preview_max_x', 1024);
-		$shareTmpl['previewMaxY'] = $this->config->getSystemValue('preview_max_y', 1024);
-		$shareTmpl['disclaimer'] = $this->config->getAppValue('core', 'shareapi_public_link_disclaimertext', null);
-		if ($shareTmpl['previewSupported']) {
-			$shareTmpl['previewImage'] = $this->urlGenerator->linkToRouteAbsolute( 'files_sharing.PublicPreview.getPreview',
-				['x' => 200, 'y' => 200, 'file' => $shareTmpl['directory_path'], 't' => $shareTmpl['dirToken']]);
-		} else {
-			$shareTmpl['previewImage'] = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'favicon-fb.png'));
-		}
-
-		// Load files we need
-		\OCP\Util::addScript('files', 'file-upload');
-		\OCP\Util::addStyle('files_sharing', 'publicView');
-		\OCP\Util::addScript('files_sharing', 'public');
-		\OCP\Util::addScript('files', 'fileactions');
-		\OCP\Util::addScript('files', 'fileactionsmenu');
-		\OCP\Util::addScript('files', 'jquery.fileupload');
-		\OCP\Util::addScript('files_sharing', 'files_drop');
-
-		if (isset($shareTmpl['folder'])) {
-			// JS required for folders
-			\OCP\Util::addStyle('files', 'merged');
-			\OCP\Util::addScript('files', 'filesummary');
-			\OCP\Util::addScript('files', 'breadcrumb');
-			\OCP\Util::addScript('files', 'fileinfomodel');
-			\OCP\Util::addScript('files', 'newfilemenu');
-			\OCP\Util::addScript('files', 'files');
-			\OCP\Util::addScript('files', 'filelist');
-			\OCP\Util::addScript('files', 'keyboardshortcuts');
-		}
-
-		// OpenGraph Support: http://ogp.me/
-		\OCP\Util::addHeader('meta', ['property' => "og:title", 'content' => $this->defaults->getName() . ' - ' . $this->defaults->getSlogan()]);
-		\OCP\Util::addHeader('meta', ['property' => "og:description", 'content' => $this->l10n->t('%s is publicly shared', [$shareTmpl['filename']])]);
-		\OCP\Util::addHeader('meta', ['property' => "og:site_name", 'content' => $this->defaults->getName()]);
-		\OCP\Util::addHeader('meta', ['property' => "og:url", 'content' => $shareTmpl['shareUrl']]);
-		\OCP\Util::addHeader('meta', ['property' => "og:type", 'content' => "object"]);
-		\OCP\Util::addHeader('meta', ['property' => "og:image", 'content' => $shareTmpl['previewImage']]);
-
-		$this->eventDispatcher->dispatch('OCA\Files_Sharing::loadAdditionalScripts');
-
-		$csp = new \OCP\AppFramework\Http\ContentSecurityPolicy();
-		$csp->addAllowedFrameDomain('\'self\'');
-		$response = new TemplateResponse($this->appName, 'public', $shareTmpl, 'base');
-		$response->setContentSecurityPolicy($csp);
-
-		$this->emitAccessShareHook($share);
-
-		return $response;
-	}
-
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 *
-	 * @param string $token
-	 * @param string $files
-	 * @param string $path
-	 * @param string $downloadStartSecret
-	 * @return void|\OCP\AppFramework\Http\Response
-	 * @throws NotFoundException
-	 */
-	public function downloadShare($token, $files = null, $path = '', $downloadStartSecret = '') {
-		\OC_User::setIncognitoMode(true);
-
-		$share = $this->shareManager->getShareByToken($token);
-
-		if(!($share->getPermissions() & \OCP\Constants::PERMISSION_READ)) {
-			return new \OCP\AppFramework\Http\DataResponse('Share is read-only');
-		}
-
-		// Share is password protected - check whether the user is permitted to access the share
-		if ($share->getPassword() !== null && !$this->linkShareAuth($share)) {
-			return new RedirectResponse($this->urlGenerator->linkToRoute('files_sharing.sharecontroller.authenticate',
-				['token' => $token]));
-		}
-
-		$files_list = null;
-		if (!is_null($files)) { // download selected files
-			$files_list = json_decode($files);
-			// in case we get only a single file
-			if ($files_list === null) {
-				$files_list = [$files];
-			}
-		}
-
-		$userFolder = $this->rootFolder->getUserFolder($share->getShareOwner());
-		$originalSharePath = $userFolder->getRelativePath($share->getNode()->getPath());
-
-		if (!$this->validateShare($share)) {
-			throw new NotFoundException();
-		}
-
-		// Single file share
-		if ($share->getNode() instanceof \OCP\Files\File) {
-			// Single file download
-			$this->singleFileDownloaded($share, $share->getNode());
-		}
-		// Directory share
-		else {
-			/** @var \OCP\Files\Folder $node */
-			$node = $share->getNode();
-
-			// Try to get the path
-			if ($path !== '') {
-				try {
-					$node = $node->get($path);
-				} catch (NotFoundException $e) {
-					$this->emitAccessShareHook($share, 404, 'Share not found');
-					return new NotFoundResponse();
-				}
-			}
-
-			$originalSharePath = $userFolder->getRelativePath($node->getPath());
-
-			if ($node instanceof \OCP\Files\File) {
-				// Single file download
-				$this->singleFileDownloaded($share, $share->getNode());
-			} else if (!empty($files_list)) {
-				$this->fileListDownloaded($share, $files_list, $node);
-			} else {
-				// The folder is downloaded
-				$this->singleFileDownloaded($share, $share->getNode());
-			}
-		}
-
-		/* FIXME: We should do this all nicely in OCP */
-		OC_Util::tearDownFS();
-		OC_Util::setupFS($share->getShareOwner());
-
-		/**
-		 * this sets a cookie to be able to recognize the start of the download
-		 * the content must not be longer than 32 characters and must only contain
-		 * alphanumeric characters
-		 */
-		if (!empty($downloadStartSecret)
-			&& !isset($downloadStartSecret[32])
-			&& preg_match('!^[a-zA-Z0-9]+$!', $downloadStartSecret) === 1) {
-
-			// FIXME: set on the response once we use an actual app framework response
-			setcookie('ocDownloadStarted', $downloadStartSecret, time() + 20, '/');
-		}
-
-		$this->emitAccessShareHook($share);
-
-		$server_params = array( 'head' => $this->request->getMethod() == 'HEAD' );
-
-		/**
-		 * Http range requests support
-		 */
-		if (isset($_SERVER['HTTP_RANGE'])) {
-			$server_params['range'] = $this->request->getHeader('Range');
-		}
-
-		// download selected files
-		if (!is_null($files) && $files !== '') {
-			// FIXME: The exit is required here because otherwise the AppFramework is trying to add headers as well
-			// after dispatching the request which results in a "Cannot modify header information" notice.
-			OC_Files::get($originalSharePath, $files_list, $server_params);
-			exit();
-		} else {
-			// FIXME: The exit is required here because otherwise the AppFramework is trying to add headers as well
-			// after dispatching the request which results in a "Cannot modify header information" notice.
-			OC_Files::get(dirname($originalSharePath), basename($originalSharePath), $server_params);
-			exit();
-		}
-	}
-
-	/**
-	 * create activity for every downloaded file
-	 *
-	 * @param Share\IShare $share
-	 * @param array $files_list
-	 * @param \OCP\Files\Folder $node
-	 */
-	protected function fileListDownloaded(Share\IShare $share, array $files_list, \OCP\Files\Folder $node) {
-		foreach ($files_list as $file) {
-			$subNode = $node->get($file);
-			$this->singleFileDownloaded($share, $subNode);
-		}
-
-	}
-
-	/**
-	 * create activity if a single file was downloaded from a link share
-	 *
-	 * @param Share\IShare $share
-	 */
-	protected function singleFileDownloaded(Share\IShare $share, \OCP\Files\Node $node) {
-
-		$fileId = $node->getId();
-
-		$userFolder = $this->rootFolder->getUserFolder($share->getSharedBy());
-		$userNodeList = $userFolder->getById($fileId);
-		$userNode = $userNodeList[0];
-		$ownerFolder = $this->rootFolder->getUserFolder($share->getShareOwner());
-		$userPath = $userFolder->getRelativePath($userNode->getPath());
-		$ownerPath = $ownerFolder->getRelativePath($node->getPath());
-
-		$parameters = [$userPath];
-
-		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_EMAIL) {
-			if ($node instanceof \OCP\Files\File) {
-				$subject = Downloads::SUBJECT_SHARED_FILE_BY_EMAIL_DOWNLOADED;
-			} else {
-				$subject = Downloads::SUBJECT_SHARED_FOLDER_BY_EMAIL_DOWNLOADED;
-			}
-			$parameters[] = $share->getSharedWith();
-		} else {
-			if ($node instanceof \OCP\Files\File) {
-				$subject = Downloads::SUBJECT_PUBLIC_SHARED_FILE_DOWNLOADED;
-			} else {
-				$subject = Downloads::SUBJECT_PUBLIC_SHARED_FOLDER_DOWNLOADED;
-			}
-		}
-
-		$this->publishActivity($subject, $parameters, $share->getSharedBy(), $fileId, $userPath);
-
-		if ($share->getShareOwner() !== $share->getSharedBy()) {
-			$parameters[0] = $ownerPath;
-			$this->publishActivity($subject, $parameters, $share->getShareOwner(), $fileId, $ownerPath);
-		}
-	}
-
-	/**
-	 * publish activity
-	 *
-	 * @param string $subject
-	 * @param array $parameters
-	 * @param string $affectedUser
-	 * @param int $fileId
-	 * @param string $filePath
-	 */
-	protected function publishActivity($subject,
-										array $parameters,
-										$affectedUser,
-										$fileId,
-										$filePath) {
-
-		$event = $this->activityManager->generateEvent();
-		$event->setApp('files_sharing')
-			->setType('public_links')
-			->setSubject($subject, $parameters)
-			->setAffectedUser($affectedUser)
-			->setObject('files', $fileId, $filePath);
-		$this->activityManager->publish($event);
-	}
+            $freeSpace = $share->getNode()->getStorage()->free_space($share->getNode()->getInternalPath());
+            if ($freeSpace < \OCP\Files\FileInfo::SPACE_UNLIMITED) {
+                $freeSpace = max($freeSpace, 0);
+            } else {
+                $freeSpace = (INF > 0) ? INF: PHP_INT_MAX; // work around https://bugs.php.net/bug.php?id=69188
+            }
+
+            $hideFileList = $share->getPermissions() & \OCP\Constants::PERMISSION_READ ? false : true;
+            $maxUploadFilesize = $freeSpace;
+
+            $folder = new Template('files', 'list', '');
+            $folder->assign('dir', $rootFolder->getRelativePath($folderNode->getPath()));
+            $folder->assign('dirToken', $token);
+            $folder->assign('permissions', \OCP\Constants::PERMISSION_READ);
+            $folder->assign('isPublic', true);
+            $folder->assign('hideFileList', $hideFileList);
+            $folder->assign('publicUploadEnabled', 'no');
+            $folder->assign('uploadMaxFilesize', $maxUploadFilesize);
+            $folder->assign('uploadMaxHumanFilesize', \OCP\Util::humanFileSize($maxUploadFilesize));
+            $folder->assign('freeSpace', $freeSpace);
+            $folder->assign('usedSpacePercent', 0);
+            $folder->assign('trash', false);
+            $shareTmpl['folder'] = $folder->fetchPage();
+        }
+
+        $shareTmpl['hideFileList'] = $hideFileList;
+        $shareTmpl['shareOwner'] = $this->userManager->get($share->getShareOwner())->getDisplayName();
+        $shareTmpl['downloadURL'] = $this->urlGenerator->linkToRouteAbsolute('files_sharing.sharecontroller.downloadShare', ['token' => $token]);
+        $shareTmpl['shareUrl'] = $this->urlGenerator->linkToRouteAbsolute('files_sharing.sharecontroller.showShare', ['token' => $token]);
+        $shareTmpl['maxSizeAnimateGif'] = $this->config->getSystemValue('max_filesize_animated_gifs_public_sharing', 10);
+        $shareTmpl['previewEnabled'] = $this->config->getSystemValue('enable_previews', true);
+        $shareTmpl['previewMaxX'] = $this->config->getSystemValue('preview_max_x', 1024);
+        $shareTmpl['previewMaxY'] = $this->config->getSystemValue('preview_max_y', 1024);
+        $shareTmpl['disclaimer'] = $this->config->getAppValue('core', 'shareapi_public_link_disclaimertext', null);
+        if ($shareTmpl['previewSupported']) {
+            $shareTmpl['previewImage'] = $this->urlGenerator->linkToRouteAbsolute( 'files_sharing.PublicPreview.getPreview',
+                ['x' => 200, 'y' => 200, 'file' => $shareTmpl['directory_path'], 't' => $shareTmpl['dirToken']]);
+        } else {
+            $shareTmpl['previewImage'] = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'favicon-fb.png'));
+        }
+
+        // Load files we need
+        \OCP\Util::addScript('files', 'file-upload');
+        \OCP\Util::addStyle('files_sharing', 'publicView');
+        \OCP\Util::addScript('files_sharing', 'public');
+        \OCP\Util::addScript('files', 'fileactions');
+        \OCP\Util::addScript('files', 'fileactionsmenu');
+        \OCP\Util::addScript('files', 'jquery.fileupload');
+        \OCP\Util::addScript('files_sharing', 'files_drop');
+
+        if (isset($shareTmpl['folder'])) {
+            // JS required for folders
+            \OCP\Util::addStyle('files', 'merged');
+            \OCP\Util::addScript('files', 'filesummary');
+            \OCP\Util::addScript('files', 'breadcrumb');
+            \OCP\Util::addScript('files', 'fileinfomodel');
+            \OCP\Util::addScript('files', 'newfilemenu');
+            \OCP\Util::addScript('files', 'files');
+            \OCP\Util::addScript('files', 'filelist');
+            \OCP\Util::addScript('files', 'keyboardshortcuts');
+        }
+
+        // OpenGraph Support: http://ogp.me/
+        \OCP\Util::addHeader('meta', ['property' => "og:title", 'content' => $this->defaults->getName() . ' - ' . $this->defaults->getSlogan()]);
+        \OCP\Util::addHeader('meta', ['property' => "og:description", 'content' => $this->l10n->t('%s is publicly shared', [$shareTmpl['filename']])]);
+        \OCP\Util::addHeader('meta', ['property' => "og:site_name", 'content' => $this->defaults->getName()]);
+        \OCP\Util::addHeader('meta', ['property' => "og:url", 'content' => $shareTmpl['shareUrl']]);
+        \OCP\Util::addHeader('meta', ['property' => "og:type", 'content' => "object"]);
+        \OCP\Util::addHeader('meta', ['property' => "og:image", 'content' => $shareTmpl['previewImage']]);
+
+        $this->eventDispatcher->dispatch('OCA\Files_Sharing::loadAdditionalScripts');
+
+        $csp = new \OCP\AppFramework\Http\ContentSecurityPolicy();
+        $csp->addAllowedFrameDomain('\'self\'');
+        $response = new TemplateResponse($this->appName, 'public', $shareTmpl, 'base');
+        $response->setContentSecurityPolicy($csp);
+
+        $this->emitAccessShareHook($share);
+
+        return $response;
+    }
+
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     *
+     * @param string $token
+     * @param string $files
+     * @param string $path
+     * @param string $downloadStartSecret
+     * @return void|\OCP\AppFramework\Http\Response
+     * @throws NotFoundException
+     */
+    public function downloadShare($token, $files = null, $path = '', $downloadStartSecret = '') {
+        \OC_User::setIncognitoMode(true);
+
+        $share = $this->shareManager->getShareByToken($token);
+
+        if(!($share->getPermissions() & \OCP\Constants::PERMISSION_READ)) {
+            return new \OCP\AppFramework\Http\DataResponse('Share is read-only');
+        }
+
+        // Share is password protected - check whether the user is permitted to access the share
+        if ($share->getPassword() !== null && !$this->linkShareAuth($share)) {
+            return new RedirectResponse($this->urlGenerator->linkToRoute('files_sharing.sharecontroller.authenticate',
+                ['token' => $token]));
+        }
+
+        $files_list = null;
+        if (!is_null($files)) { // download selected files
+            $files_list = json_decode($files);
+            // in case we get only a single file
+            if ($files_list === null) {
+                $files_list = [$files];
+            }
+        }
+
+        $userFolder = $this->rootFolder->getUserFolder($share->getShareOwner());
+        $originalSharePath = $userFolder->getRelativePath($share->getNode()->getPath());
+
+        if (!$this->validateShare($share)) {
+            throw new NotFoundException();
+        }
+
+        // Single file share
+        if ($share->getNode() instanceof \OCP\Files\File) {
+            // Single file download
+            $this->singleFileDownloaded($share, $share->getNode());
+        }
+        // Directory share
+        else {
+            /** @var \OCP\Files\Folder $node */
+            $node = $share->getNode();
+
+            // Try to get the path
+            if ($path !== '') {
+                try {
+                    $node = $node->get($path);
+                } catch (NotFoundException $e) {
+                    $this->emitAccessShareHook($share, 404, 'Share not found');
+                    return new NotFoundResponse();
+                }
+            }
+
+            $originalSharePath = $userFolder->getRelativePath($node->getPath());
+
+            if ($node instanceof \OCP\Files\File) {
+                // Single file download
+                $this->singleFileDownloaded($share, $share->getNode());
+            } else if (!empty($files_list)) {
+                $this->fileListDownloaded($share, $files_list, $node);
+            } else {
+                // The folder is downloaded
+                $this->singleFileDownloaded($share, $share->getNode());
+            }
+        }
+
+        /* FIXME: We should do this all nicely in OCP */
+        OC_Util::tearDownFS();
+        OC_Util::setupFS($share->getShareOwner());
+
+        /**
+         * this sets a cookie to be able to recognize the start of the download
+         * the content must not be longer than 32 characters and must only contain
+         * alphanumeric characters
+         */
+        if (!empty($downloadStartSecret)
+            && !isset($downloadStartSecret[32])
+            && preg_match('!^[a-zA-Z0-9]+$!', $downloadStartSecret) === 1) {
+
+            // FIXME: set on the response once we use an actual app framework response
+            setcookie('ocDownloadStarted', $downloadStartSecret, time() + 20, '/');
+        }
+
+        $this->emitAccessShareHook($share);
+
+        $server_params = array( 'head' => $this->request->getMethod() == 'HEAD' );
+
+        /**
+         * Http range requests support
+         */
+        if (isset($_SERVER['HTTP_RANGE'])) {
+            $server_params['range'] = $this->request->getHeader('Range');
+        }
+
+        // download selected files
+        if (!is_null($files) && $files !== '') {
+            // FIXME: The exit is required here because otherwise the AppFramework is trying to add headers as well
+            // after dispatching the request which results in a "Cannot modify header information" notice.
+            OC_Files::get($originalSharePath, $files_list, $server_params);
+            exit();
+        } else {
+            // FIXME: The exit is required here because otherwise the AppFramework is trying to add headers as well
+            // after dispatching the request which results in a "Cannot modify header information" notice.
+            OC_Files::get(dirname($originalSharePath), basename($originalSharePath), $server_params);
+            exit();
+        }
+    }
+
+    /**
+     * create activity for every downloaded file
+     *
+     * @param Share\IShare $share
+     * @param array $files_list
+     * @param \OCP\Files\Folder $node
+     */
+    protected function fileListDownloaded(Share\IShare $share, array $files_list, \OCP\Files\Folder $node) {
+        foreach ($files_list as $file) {
+            $subNode = $node->get($file);
+            $this->singleFileDownloaded($share, $subNode);
+        }
+
+    }
+
+    /**
+     * create activity if a single file was downloaded from a link share
+     *
+     * @param Share\IShare $share
+     */
+    protected function singleFileDownloaded(Share\IShare $share, \OCP\Files\Node $node) {
+
+        $fileId = $node->getId();
+
+        $userFolder = $this->rootFolder->getUserFolder($share->getSharedBy());
+        $userNodeList = $userFolder->getById($fileId);
+        $userNode = $userNodeList[0];
+        $ownerFolder = $this->rootFolder->getUserFolder($share->getShareOwner());
+        $userPath = $userFolder->getRelativePath($userNode->getPath());
+        $ownerPath = $ownerFolder->getRelativePath($node->getPath());
+
+        $parameters = [$userPath];
+
+        if ($share->getShareType() === \OCP\Share::SHARE_TYPE_EMAIL) {
+            if ($node instanceof \OCP\Files\File) {
+                $subject = Downloads::SUBJECT_SHARED_FILE_BY_EMAIL_DOWNLOADED;
+            } else {
+                $subject = Downloads::SUBJECT_SHARED_FOLDER_BY_EMAIL_DOWNLOADED;
+            }
+            $parameters[] = $share->getSharedWith();
+        } else {
+            if ($node instanceof \OCP\Files\File) {
+                $subject = Downloads::SUBJECT_PUBLIC_SHARED_FILE_DOWNLOADED;
+            } else {
+                $subject = Downloads::SUBJECT_PUBLIC_SHARED_FOLDER_DOWNLOADED;
+            }
+        }
+
+        $this->publishActivity($subject, $parameters, $share->getSharedBy(), $fileId, $userPath);
+
+        if ($share->getShareOwner() !== $share->getSharedBy()) {
+            $parameters[0] = $ownerPath;
+            $this->publishActivity($subject, $parameters, $share->getShareOwner(), $fileId, $ownerPath);
+        }
+    }
+
+    /**
+     * publish activity
+     *
+     * @param string $subject
+     * @param array $parameters
+     * @param string $affectedUser
+     * @param int $fileId
+     * @param string $filePath
+     */
+    protected function publishActivity($subject,
+                                        array $parameters,
+                                        $affectedUser,
+                                        $fileId,
+                                        $filePath) {
+
+        $event = $this->activityManager->generateEvent();
+        $event->setApp('files_sharing')
+            ->setType('public_links')
+            ->setSubject($subject, $parameters)
+            ->setAffectedUser($affectedUser)
+            ->setObject('files', $fileId, $filePath);
+        $this->activityManager->publish($event);
+    }
 
 
 }

apps/files_sharing/lib/Controller/ShareesAPIController.php

Doc Comments +4 added lines, -1 removed lines

@@ -358,7 +358,7 @@ 
 	 * split user and remote from federated cloud id
 	 *
 	 * @param string $address federated share address
-	 * @return array [user, remoteURL]
+	 * @return string[] [user, remoteURL]
 	 * @throws \Exception
 	 */
 	public function splitUserRemote($address) {
@@ -633,6 +633,9 @@ 
 		return $result;
 	}
 
+	/**
+	 * @param string $search
+	 */
 	protected function getLookup($search) {
 		$isEnabled = $this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'no');
 		$result = [];

Spacing +14 added lines, -14 removed lines

@@ -234,17 +234,17 @@ 
 		$this->result['groups'] = $this->result['exact']['groups'] = [];
 
 		$groups = $this->groupManager->search($search, $this->limit, $this->offset);
-		$groupIds = array_map(function (IGroup $group) { return $group->getGID(); }, $groups);
+		$groupIds = array_map(function(IGroup $group) { return $group->getGID(); }, $groups);
 
 		if (!$this->shareeEnumeration || sizeof($groups) < $this->limit) {
 			$this->reachedEndFor[] = 'groups';
 		}
 
-		$userGroups =  [];
+		$userGroups = [];
 		if (!empty($groups) && $this->shareWithGroupOnly) {
 			// Intersect all the groups that match with the groups this user is a member of
 			$userGroups = $this->groupManager->getUserGroups($this->userSession->getUser());
-			$userGroups = array_map(function (IGroup $group) { return $group->getGID(); }, $userGroups);
+			$userGroups = array_map(function(IGroup $group) { return $group->getGID(); }, $userGroups);
 			$groupIds = array_intersect($groupIds, $userGroups);
 		}
 
@@ -322,7 +322,7 @@ 
 							$result['exactIdMatch'] = true;
 						}
 						$result['exact'][] = [
-							'label' => $contact['FN'] . " ($cloudId)",
+							'label' => $contact['FN']." ($cloudId)",
 							'value' => [
 								'shareType' => Share::SHARE_TYPE_REMOTE,
 								'shareWith' => $cloudId,
@@ -331,7 +331,7 @@ 
 						];
 					} else {
 						$result['results'][] = [
-							'label' => $contact['FN'] . " ($cloudId)",
+							'label' => $contact['FN']." ($cloudId)",
 							'value' => [
 								'shareType' => Share::SHARE_TYPE_REMOTE,
 								'shareWith' => $cloudId,
@@ -415,13 +415,13 @@ 
 	public function search($search = '', $itemType = null, $page = 1, $perPage = 200, $shareType = null, $lookup = true) {
 
 		// only search for string larger than a given threshold
-		$threshold = (int)$this->config->getSystemValue('sharing.minSearchStringLength', 0);
+		$threshold = (int) $this->config->getSystemValue('sharing.minSearchStringLength', 0);
 		if (strlen($search) < $threshold) {
 			return new DataResponse($this->result);
 		}
 
 		// never return more than the max. number of results configured in the config.php
-		$maxResults = (int)$this->config->getSystemValue('sharing.maxAutocompleteResults', 0);
+		$maxResults = (int) $this->config->getSystemValue('sharing.maxAutocompleteResults', 0);
 		if ($maxResults > 0) {
 			$perPage = min($perPage, $maxResults);
 		}
@@ -585,7 +585,7 @@ 
 							$result['exactIdMatch'] = true;
 						}
 						$result['exact'][] = [
-							'label' => $contact['FN'] . " ($emailAddress)",
+							'label' => $contact['FN']." ($emailAddress)",
 							'value' => [
 								'shareType' => Share::SHARE_TYPE_EMAIL,
 								'shareWith' => $emailAddress,
@@ -593,7 +593,7 @@ 
 						];
 					} else {
 						$result['results'][] = [
-							'label' => $contact['FN'] . " ($emailAddress)",
+							'label' => $contact['FN']." ($emailAddress)",
 							'value' => [
 								'shareType' => Share::SHARE_TYPE_EMAIL,
 								'shareWith' => $emailAddress,
@@ -627,11 +627,11 @@ 
 		$isEnabled = $this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'no');
 		$result = [];
 
-		if($isEnabled === 'yes') {
+		if ($isEnabled === 'yes') {
 			try {
 				$client = $this->clientService->newClient();
 				$response = $client->get(
-					'https://lookup.nextcloud.com/users?search=' . urlencode($search),
+					'https://lookup.nextcloud.com/users?search='.urlencode($search),
 					[
 						'timeout' => 10,
 						'connect_timeout' => 3,
@@ -666,12 +666,12 @@ 
 	 */
 	protected function getPaginationLink($page, array $params) {
 		if ($this->isV2()) {
-			$url = $this->urlGenerator->getAbsoluteURL('/ocs/v2.php/apps/files_sharing/api/v1/sharees') . '?';
+			$url = $this->urlGenerator->getAbsoluteURL('/ocs/v2.php/apps/files_sharing/api/v1/sharees').'?';
 		} else {
-			$url = $this->urlGenerator->getAbsoluteURL('/ocs/v1.php/apps/files_sharing/api/v1/sharees') . '?';
+			$url = $this->urlGenerator->getAbsoluteURL('/ocs/v1.php/apps/files_sharing/api/v1/sharees').'?';
 		}
 		$params['page'] = $page + 1;
-		$link = '<' . $url . http_build_query($params) . '>; rel="next"';
+		$link = '<'.$url.http_build_query($params).'>; rel="next"';
 
 		return $link;
 	}

Indentation +668 added lines, -668 removed lines

@@ -43,672 +43,672 @@
 
 class ShareesAPIController extends OCSController {
 
-	/** @var IGroupManager */
-	protected $groupManager;
-
-	/** @var IUserManager */
-	protected $userManager;
-
-	/** @var IManager */
-	protected $contactsManager;
-
-	/** @var IConfig */
-	protected $config;
-
-	/** @var IUserSession */
-	protected $userSession;
-
-	/** @var IURLGenerator */
-	protected $urlGenerator;
-
-	/** @var ILogger */
-	protected $logger;
-
-	/** @var \OCP\Share\IManager */
-	protected $shareManager;
-
-	/** @var IClientService */
-	protected $clientService;
-
-	/** @var ICloudIdManager  */
-	protected $cloudIdManager;
-
-	/** @var bool */
-	protected $shareWithGroupOnly = false;
-
-	/** @var bool */
-	protected $shareeEnumeration = true;
-
-	/** @var int */
-	protected $offset = 0;
-
-	/** @var int */
-	protected $limit = 10;
-
-	/** @var array */
-	protected $result = [
-		'exact' => [
-			'users' => [],
-			'groups' => [],
-			'remotes' => [],
-			'emails' => [],
-			'circles' => [],
-		],
-		'users' => [],
-		'groups' => [],
-		'remotes' => [],
-		'emails' => [],
-		'lookup' => [],
-		'circles' => [],
-	];
-
-	protected $reachedEndFor = [];
-
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IGroupManager $groupManager
-	 * @param IUserManager $userManager
-	 * @param IManager $contactsManager
-	 * @param IConfig $config
-	 * @param IUserSession $userSession
-	 * @param IURLGenerator $urlGenerator
-	 * @param ILogger $logger
-	 * @param \OCP\Share\IManager $shareManager
-	 * @param IClientService $clientService
-	 * @param ICloudIdManager $cloudIdManager
-	 */
-	public function __construct($appName,
-								IRequest $request,
-								IGroupManager $groupManager,
-								IUserManager $userManager,
-								IManager $contactsManager,
-								IConfig $config,
-								IUserSession $userSession,
-								IURLGenerator $urlGenerator,
-								ILogger $logger,
-								\OCP\Share\IManager $shareManager,
-								IClientService $clientService,
-								ICloudIdManager $cloudIdManager
-	) {
-		parent::__construct($appName, $request);
-
-		$this->groupManager = $groupManager;
-		$this->userManager = $userManager;
-		$this->contactsManager = $contactsManager;
-		$this->config = $config;
-		$this->userSession = $userSession;
-		$this->urlGenerator = $urlGenerator;
-		$this->logger = $logger;
-		$this->shareManager = $shareManager;
-		$this->clientService = $clientService;
-		$this->cloudIdManager = $cloudIdManager;
-	}
-
-	/**
-	 * @param string $search
-	 */
-	protected function getUsers($search) {
-		$this->result['users'] = $this->result['exact']['users'] = $users = [];
-
-		$userGroups = [];
-		if ($this->shareWithGroupOnly) {
-			// Search in all the groups this user is part of
-			$userGroups = $this->groupManager->getUserGroupIds($this->userSession->getUser());
-			foreach ($userGroups as $userGroup) {
-				$usersTmp = $this->groupManager->displayNamesInGroup($userGroup, $search, $this->limit, $this->offset);
-				foreach ($usersTmp as $uid => $userDisplayName) {
-					$users[$uid] = $userDisplayName;
-				}
-			}
-		} else {
-			// Search in all users
-			$usersTmp = $this->userManager->searchDisplayName($search, $this->limit, $this->offset);
-
-			foreach ($usersTmp as $user) {
-				$users[$user->getUID()] = $user->getDisplayName();
-			}
-		}
-
-		if (!$this->shareeEnumeration || sizeof($users) < $this->limit) {
-			$this->reachedEndFor[] = 'users';
-		}
-
-		$foundUserById = false;
-		$lowerSearch = strtolower($search);
-		foreach ($users as $uid => $userDisplayName) {
-			if (strtolower($uid) === $lowerSearch || strtolower($userDisplayName) === $lowerSearch) {
-				if (strtolower($uid) === $lowerSearch) {
-					$foundUserById = true;
-				}
-				$this->result['exact']['users'][] = [
-					'label' => $userDisplayName,
-					'value' => [
-						'shareType' => Share::SHARE_TYPE_USER,
-						'shareWith' => $uid,
-					],
-				];
-			} else {
-				$this->result['users'][] = [
-					'label' => $userDisplayName,
-					'value' => [
-						'shareType' => Share::SHARE_TYPE_USER,
-						'shareWith' => $uid,
-					],
-				];
-			}
-		}
-
-		if ($this->offset === 0 && !$foundUserById) {
-			// On page one we try if the search result has a direct hit on the
-			// user id and if so, we add that to the exact match list
-			$user = $this->userManager->get($search);
-			if ($user instanceof IUser) {
-				$addUser = true;
-
-				if ($this->shareWithGroupOnly) {
-					// Only add, if we have a common group
-					$commonGroups = array_intersect($userGroups, $this->groupManager->getUserGroupIds($user));
-					$addUser = !empty($commonGroups);
-				}
-
-				if ($addUser) {
-					array_push($this->result['exact']['users'], [
-						'label' => $user->getDisplayName(),
-						'value' => [
-							'shareType' => Share::SHARE_TYPE_USER,
-							'shareWith' => $user->getUID(),
-						],
-					]);
-				}
-			}
-		}
-
-		if (!$this->shareeEnumeration) {
-			$this->result['users'] = [];
-		}
-	}
-
-	/**
-	 * @param string $search
-	 */
-	protected function getGroups($search) {
-		$this->result['groups'] = $this->result['exact']['groups'] = [];
-
-		$groups = $this->groupManager->search($search, $this->limit, $this->offset);
-		$groupIds = array_map(function (IGroup $group) { return $group->getGID(); }, $groups);
-
-		if (!$this->shareeEnumeration || sizeof($groups) < $this->limit) {
-			$this->reachedEndFor[] = 'groups';
-		}
-
-		$userGroups =  [];
-		if (!empty($groups) && $this->shareWithGroupOnly) {
-			// Intersect all the groups that match with the groups this user is a member of
-			$userGroups = $this->groupManager->getUserGroups($this->userSession->getUser());
-			$userGroups = array_map(function (IGroup $group) { return $group->getGID(); }, $userGroups);
-			$groupIds = array_intersect($groupIds, $userGroups);
-		}
-
-		$lowerSearch = strtolower($search);
-		foreach ($groups as $group) {
-			// FIXME: use a more efficient approach
-			$gid = $group->getGID();
-			if (!in_array($gid, $groupIds)) {
-				continue;
-			}
-			if (strtolower($gid) === $lowerSearch || strtolower($group->getDisplayName()) === $lowerSearch) {
-				$this->result['exact']['groups'][] = [
-					'label' => $group->getDisplayName(),
-					'value' => [
-						'shareType' => Share::SHARE_TYPE_GROUP,
-						'shareWith' => $gid,
-					],
-				];
-			} else {
-				$this->result['groups'][] = [
-					'label' => $group->getDisplayName(),
-					'value' => [
-						'shareType' => Share::SHARE_TYPE_GROUP,
-						'shareWith' => $gid,
-					],
-				];
-			}
-		}
-
-		if ($this->offset === 0 && empty($this->result['exact']['groups'])) {
-			// On page one we try if the search result has a direct hit on the
-			// user id and if so, we add that to the exact match list
-			$group = $this->groupManager->get($search);
-			if ($group instanceof IGroup && (!$this->shareWithGroupOnly || in_array($group->getGID(), $userGroups))) {
-				array_push($this->result['exact']['groups'], [
-					'label' => $group->getDisplayName(),
-					'value' => [
-						'shareType' => Share::SHARE_TYPE_GROUP,
-						'shareWith' => $group->getGID(),
-					],
-				]);
-			}
-		}
-
-		if (!$this->shareeEnumeration) {
-			$this->result['groups'] = [];
-		}
-	}
-
-
-	/**
-	 * @param string $search
-	 */
-	protected function getCircles($search) {
-		$this->result['circles'] = $this->result['exact']['circles'] = [];
-
-		$result = \OCA\Circles\Api\Sharees::search($search, $this->limit, $this->offset);
-		if (array_key_exists('circles', $result['exact'])) {
-			$this->result['exact']['circles'] = $result['exact']['circles'];
-		}
-		if (array_key_exists('circles', $result)) {
-			$this->result['circles'] = $result['circles'];
-		}
-	}
-
-
-	/**
-	 * @param string $search
-	 * @return array
-	 */
-	protected function getRemote($search) {
-		$result = ['results' => [], 'exact' => []];
-
-		// Search in contacts
-		//@todo Pagination missing
-		$addressBookContacts = $this->contactsManager->search($search, ['CLOUD', 'FN']);
-		$result['exactIdMatch'] = false;
-		foreach ($addressBookContacts as $contact) {
-			if (isset($contact['isLocalSystemBook'])) {
-				continue;
-			}
-			if (isset($contact['CLOUD'])) {
-				$cloudIds = $contact['CLOUD'];
-				if (!is_array($cloudIds)) {
-					$cloudIds = [$cloudIds];
-				}
-				$lowerSearch = strtolower($search);
-				foreach ($cloudIds as $cloudId) {
-					list(, $serverUrl) = $this->splitUserRemote($cloudId);
-					if (strtolower($contact['FN']) === $lowerSearch || strtolower($cloudId) === $lowerSearch) {
-						if (strtolower($cloudId) === $lowerSearch) {
-							$result['exactIdMatch'] = true;
-						}
-						$result['exact'][] = [
-							'label' => $contact['FN'] . " ($cloudId)",
-							'value' => [
-								'shareType' => Share::SHARE_TYPE_REMOTE,
-								'shareWith' => $cloudId,
-								'server' => $serverUrl,
-							],
-						];
-					} else {
-						$result['results'][] = [
-							'label' => $contact['FN'] . " ($cloudId)",
-							'value' => [
-								'shareType' => Share::SHARE_TYPE_REMOTE,
-								'shareWith' => $cloudId,
-								'server' => $serverUrl,
-							],
-						];
-					}
-				}
-			}
-		}
-
-		if (!$this->shareeEnumeration) {
-			$result['results'] = [];
-		}
-
-		if (!$result['exactIdMatch'] && $this->cloudIdManager->isValidCloudId($search) && $this->offset === 0) {
-			$result['exact'][] = [
-				'label' => $search,
-				'value' => [
-					'shareType' => Share::SHARE_TYPE_REMOTE,
-					'shareWith' => $search,
-				],
-			];
-		}
-
-		$this->reachedEndFor[] = 'remotes';
-
-		return $result;
-	}
-
-	/**
-	 * split user and remote from federated cloud id
-	 *
-	 * @param string $address federated share address
-	 * @return array [user, remoteURL]
-	 * @throws \Exception
-	 */
-	public function splitUserRemote($address) {
-		try {
-			$cloudId = $this->cloudIdManager->resolveCloudId($address);
-			return [$cloudId->getUser(), $cloudId->getRemote()];
-		} catch (\InvalidArgumentException $e) {
-			throw new \Exception('Invalid Federated Cloud ID', 0, $e);
-		}
-	}
-
-	/**
-	 * Strips away a potential file names and trailing slashes:
-	 * - http://localhost
-	 * - http://localhost/
-	 * - http://localhost/index.php
-	 * - http://localhost/index.php/s/{shareToken}
-	 *
-	 * all return: http://localhost
-	 *
-	 * @param string $remote
-	 * @return string
-	 */
-	protected function fixRemoteURL($remote) {
-		$remote = str_replace('\\', '/', $remote);
-		if ($fileNamePosition = strpos($remote, '/index.php')) {
-			$remote = substr($remote, 0, $fileNamePosition);
-		}
-		$remote = rtrim($remote, '/');
-
-		return $remote;
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param string $search
-	 * @param string $itemType
-	 * @param int $page
-	 * @param int $perPage
-	 * @param int|int[] $shareType
-	 * @param bool $lookup
-	 * @return DataResponse
-	 * @throws OCSBadRequestException
-	 */
-	public function search($search = '', $itemType = null, $page = 1, $perPage = 200, $shareType = null, $lookup = true) {
-
-		// only search for string larger than a given threshold
-		$threshold = (int)$this->config->getSystemValue('sharing.minSearchStringLength', 0);
-		if (strlen($search) < $threshold) {
-			return new DataResponse($this->result);
-		}
-
-		// never return more than the max. number of results configured in the config.php
-		$maxResults = (int)$this->config->getSystemValue('sharing.maxAutocompleteResults', 0);
-		if ($maxResults > 0) {
-			$perPage = min($perPage, $maxResults);
-		}
-		if ($perPage <= 0) {
-			throw new OCSBadRequestException('Invalid perPage argument');
-		}
-		if ($page <= 0) {
-			throw new OCSBadRequestException('Invalid page');
-		}
-
-		$shareTypes = [
-			Share::SHARE_TYPE_USER,
-		];
-
-		if ($itemType === 'file' || $itemType === 'folder') {
-			if ($this->shareManager->allowGroupSharing()) {
-				$shareTypes[] = Share::SHARE_TYPE_GROUP;
-			}
-
-			if ($this->isRemoteSharingAllowed($itemType)) {
-				$shareTypes[] = Share::SHARE_TYPE_REMOTE;
-			}
-
-			if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_EMAIL)) {
-				$shareTypes[] = Share::SHARE_TYPE_EMAIL;
-			}
-		} else {
-			$shareTypes[] = Share::SHARE_TYPE_GROUP;
-			$shareTypes[] = Share::SHARE_TYPE_EMAIL;
-		}
-
-		if (\OCP\App::isEnabled('circles')) {
-			$shareTypes[] = Share::SHARE_TYPE_CIRCLE;
-		}
-
-		if (isset($_GET['shareType']) && is_array($_GET['shareType'])) {
-			$shareTypes = array_intersect($shareTypes, $_GET['shareType']);
-			sort($shareTypes);
-		} else if (is_numeric($shareType)) {
-			$shareTypes = array_intersect($shareTypes, [(int) $shareType]);
-			sort($shareTypes);
-		}
-
-		$this->shareWithGroupOnly = $this->config->getAppValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes';
-		$this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
-		$this->limit = (int) $perPage;
-		$this->offset = $perPage * ($page - 1);
-
-		return $this->searchSharees($search, $itemType, $shareTypes, $page, $perPage, $lookup);
-	}
-
-	/**
-	 * Method to get out the static call for better testing
-	 *
-	 * @param string $itemType
-	 * @return bool
-	 */
-	protected function isRemoteSharingAllowed($itemType) {
-		try {
-			$backend = Share::getBackend($itemType);
-			return $backend->isShareTypeAllowed(Share::SHARE_TYPE_REMOTE);
-		} catch (\Exception $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * Testable search function that does not need globals
-	 *
-	 * @param string $search
-	 * @param string $itemType
-	 * @param array $shareTypes
-	 * @param int $page
-	 * @param int $perPage
-	 * @param bool $lookup
-	 * @return DataResponse
-	 * @throws OCSBadRequestException
-	 */
-	protected function searchSharees($search, $itemType, array $shareTypes, $page, $perPage, $lookup) {
-		// Verify arguments
-		if ($itemType === null) {
-			throw new OCSBadRequestException('Missing itemType');
-		}
-
-		// Get users
-		if (in_array(Share::SHARE_TYPE_USER, $shareTypes)) {
-			$this->getUsers($search);
-		}
-
-		// Get groups
-		if (in_array(Share::SHARE_TYPE_GROUP, $shareTypes)) {
-			$this->getGroups($search);
-		}
-
-		// Get circles
-		if (in_array(Share::SHARE_TYPE_CIRCLE, $shareTypes)) {
-			$this->getCircles($search);
-		}
-
-
-		// Get remote
-		$remoteResults = ['results' => [], 'exact' => [], 'exactIdMatch' => false];
-		if (in_array(Share::SHARE_TYPE_REMOTE, $shareTypes)) {
-			$remoteResults = $this->getRemote($search);
-		}
-
-		// Get emails
-		$mailResults = ['results' => [], 'exact' => [], 'exactIdMatch' => false];
-		if (in_array(Share::SHARE_TYPE_EMAIL, $shareTypes)) {
-			$mailResults = $this->getEmail($search);
-		}
-
-		// Get from lookup server
-		if ($lookup) {
-			$this->getLookup($search);
-		}
-
-		// if we have a exact match, either for the federated cloud id or for the
-		// email address we only return the exact match. It is highly unlikely
-		// that the exact same email address and federated cloud id exists
-		if ($mailResults['exactIdMatch'] && !$remoteResults['exactIdMatch']) {
-			$this->result['emails'] = $mailResults['results'];
-			$this->result['exact']['emails'] = $mailResults['exact'];
-		} else if (!$mailResults['exactIdMatch'] && $remoteResults['exactIdMatch']) {
-			$this->result['remotes'] = $remoteResults['results'];
-			$this->result['exact']['remotes'] = $remoteResults['exact'];
-		} else {
-			$this->result['remotes'] = $remoteResults['results'];
-			$this->result['exact']['remotes'] = $remoteResults['exact'];
-			$this->result['emails'] = $mailResults['results'];
-			$this->result['exact']['emails'] = $mailResults['exact'];
-		}
-
-		$response = new DataResponse($this->result);
-
-		if (sizeof($this->reachedEndFor) < 3) {
-			$response->addHeader('Link', $this->getPaginationLink($page, [
-				'search' => $search,
-				'itemType' => $itemType,
-				'shareType' => $shareTypes,
-				'perPage' => $perPage,
-			]));
-		}
-
-		return $response;
-	}
-
-	/**
-	 * @param string $search
-	 * @return array
-	 */
-	protected function getEmail($search) {
-		$result = ['results' => [], 'exact' => []];
-
-		// Search in contacts
-		//@todo Pagination missing
-		$addressBookContacts = $this->contactsManager->search($search, ['EMAIL', 'FN']);
-		$result['exactIdMatch'] = false;
-		foreach ($addressBookContacts as $contact) {
-			if (isset($contact['isLocalSystemBook'])) {
-				continue;
-			}
-			if (isset($contact['EMAIL'])) {
-				$emailAddresses = $contact['EMAIL'];
-				if (!is_array($emailAddresses)) {
-					$emailAddresses = [$emailAddresses];
-				}
-				foreach ($emailAddresses as $emailAddress) {
-					if (strtolower($contact['FN']) === strtolower($search) || strtolower($emailAddress) === strtolower($search)) {
-						if (strtolower($emailAddress) === strtolower($search)) {
-							$result['exactIdMatch'] = true;
-						}
-						$result['exact'][] = [
-							'label' => $contact['FN'] . " ($emailAddress)",
-							'value' => [
-								'shareType' => Share::SHARE_TYPE_EMAIL,
-								'shareWith' => $emailAddress,
-							],
-						];
-					} else {
-						$result['results'][] = [
-							'label' => $contact['FN'] . " ($emailAddress)",
-							'value' => [
-								'shareType' => Share::SHARE_TYPE_EMAIL,
-								'shareWith' => $emailAddress,
-							],
-						];
-					}
-				}
-			}
-		}
-
-		if (!$this->shareeEnumeration) {
-			$result['results'] = [];
-		}
-
-		if (!$result['exactIdMatch'] && filter_var($search, FILTER_VALIDATE_EMAIL)) {
-			$result['exact'][] = [
-				'label' => $search,
-				'value' => [
-					'shareType' => Share::SHARE_TYPE_EMAIL,
-					'shareWith' => $search,
-				],
-			];
-		}
-
-		$this->reachedEndFor[] = 'emails';
-
-		return $result;
-	}
-
-	protected function getLookup($search) {
-		$isEnabled = $this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'no');
-		$result = [];
-
-		if($isEnabled === 'yes') {
-			try {
-				$client = $this->clientService->newClient();
-				$response = $client->get(
-					'https://lookup.nextcloud.com/users?search=' . urlencode($search),
-					[
-						'timeout' => 10,
-						'connect_timeout' => 3,
-					]
-				);
-
-				$body = json_decode($response->getBody(), true);
-
-				$result = [];
-				foreach ($body as $lookup) {
-					$result[] = [
-						'label' => $lookup['federationId'],
-						'value' => [
-							'shareType' => Share::SHARE_TYPE_REMOTE,
-							'shareWith' => $lookup['federationId'],
-						],
-						'extra' => $lookup,
-					];
-				}
-			} catch (\Exception $e) {}
-		}
-
-		$this->result['lookup'] = $result;
-	}
-
-	/**
-	 * Generates a bunch of pagination links for the current page
-	 *
-	 * @param int $page Current page
-	 * @param array $params Parameters for the URL
-	 * @return string
-	 */
-	protected function getPaginationLink($page, array $params) {
-		if ($this->isV2()) {
-			$url = $this->urlGenerator->getAbsoluteURL('/ocs/v2.php/apps/files_sharing/api/v1/sharees') . '?';
-		} else {
-			$url = $this->urlGenerator->getAbsoluteURL('/ocs/v1.php/apps/files_sharing/api/v1/sharees') . '?';
-		}
-		$params['page'] = $page + 1;
-		$link = '<' . $url . http_build_query($params) . '>; rel="next"';
-
-		return $link;
-	}
-
-	/**
-	 * @return bool
-	 */
-	protected function isV2() {
-		return $this->request->getScriptName() === '/ocs/v2.php';
-	}
+    /** @var IGroupManager */
+    protected $groupManager;
+
+    /** @var IUserManager */
+    protected $userManager;
+
+    /** @var IManager */
+    protected $contactsManager;
+
+    /** @var IConfig */
+    protected $config;
+
+    /** @var IUserSession */
+    protected $userSession;
+
+    /** @var IURLGenerator */
+    protected $urlGenerator;
+
+    /** @var ILogger */
+    protected $logger;
+
+    /** @var \OCP\Share\IManager */
+    protected $shareManager;
+
+    /** @var IClientService */
+    protected $clientService;
+
+    /** @var ICloudIdManager  */
+    protected $cloudIdManager;
+
+    /** @var bool */
+    protected $shareWithGroupOnly = false;
+
+    /** @var bool */
+    protected $shareeEnumeration = true;
+
+    /** @var int */
+    protected $offset = 0;
+
+    /** @var int */
+    protected $limit = 10;
+
+    /** @var array */
+    protected $result = [
+        'exact' => [
+            'users' => [],
+            'groups' => [],
+            'remotes' => [],
+            'emails' => [],
+            'circles' => [],
+        ],
+        'users' => [],
+        'groups' => [],
+        'remotes' => [],
+        'emails' => [],
+        'lookup' => [],
+        'circles' => [],
+    ];
+
+    protected $reachedEndFor = [];
+
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IGroupManager $groupManager
+     * @param IUserManager $userManager
+     * @param IManager $contactsManager
+     * @param IConfig $config
+     * @param IUserSession $userSession
+     * @param IURLGenerator $urlGenerator
+     * @param ILogger $logger
+     * @param \OCP\Share\IManager $shareManager
+     * @param IClientService $clientService
+     * @param ICloudIdManager $cloudIdManager
+     */
+    public function __construct($appName,
+                                IRequest $request,
+                                IGroupManager $groupManager,
+                                IUserManager $userManager,
+                                IManager $contactsManager,
+                                IConfig $config,
+                                IUserSession $userSession,
+                                IURLGenerator $urlGenerator,
+                                ILogger $logger,
+                                \OCP\Share\IManager $shareManager,
+                                IClientService $clientService,
+                                ICloudIdManager $cloudIdManager
+    ) {
+        parent::__construct($appName, $request);
+
+        $this->groupManager = $groupManager;
+        $this->userManager = $userManager;
+        $this->contactsManager = $contactsManager;
+        $this->config = $config;
+        $this->userSession = $userSession;
+        $this->urlGenerator = $urlGenerator;
+        $this->logger = $logger;
+        $this->shareManager = $shareManager;
+        $this->clientService = $clientService;
+        $this->cloudIdManager = $cloudIdManager;
+    }
+
+    /**
+     * @param string $search
+     */
+    protected function getUsers($search) {
+        $this->result['users'] = $this->result['exact']['users'] = $users = [];
+
+        $userGroups = [];
+        if ($this->shareWithGroupOnly) {
+            // Search in all the groups this user is part of
+            $userGroups = $this->groupManager->getUserGroupIds($this->userSession->getUser());
+            foreach ($userGroups as $userGroup) {
+                $usersTmp = $this->groupManager->displayNamesInGroup($userGroup, $search, $this->limit, $this->offset);
+                foreach ($usersTmp as $uid => $userDisplayName) {
+                    $users[$uid] = $userDisplayName;
+                }
+            }
+        } else {
+            // Search in all users
+            $usersTmp = $this->userManager->searchDisplayName($search, $this->limit, $this->offset);
+
+            foreach ($usersTmp as $user) {
+                $users[$user->getUID()] = $user->getDisplayName();
+            }
+        }
+
+        if (!$this->shareeEnumeration || sizeof($users) < $this->limit) {
+            $this->reachedEndFor[] = 'users';
+        }
+
+        $foundUserById = false;
+        $lowerSearch = strtolower($search);
+        foreach ($users as $uid => $userDisplayName) {
+            if (strtolower($uid) === $lowerSearch || strtolower($userDisplayName) === $lowerSearch) {
+                if (strtolower($uid) === $lowerSearch) {
+                    $foundUserById = true;
+                }
+                $this->result['exact']['users'][] = [
+                    'label' => $userDisplayName,
+                    'value' => [
+                        'shareType' => Share::SHARE_TYPE_USER,
+                        'shareWith' => $uid,
+                    ],
+                ];
+            } else {
+                $this->result['users'][] = [
+                    'label' => $userDisplayName,
+                    'value' => [
+                        'shareType' => Share::SHARE_TYPE_USER,
+                        'shareWith' => $uid,
+                    ],
+                ];
+            }
+        }
+
+        if ($this->offset === 0 && !$foundUserById) {
+            // On page one we try if the search result has a direct hit on the
+            // user id and if so, we add that to the exact match list
+            $user = $this->userManager->get($search);
+            if ($user instanceof IUser) {
+                $addUser = true;
+
+                if ($this->shareWithGroupOnly) {
+                    // Only add, if we have a common group
+                    $commonGroups = array_intersect($userGroups, $this->groupManager->getUserGroupIds($user));
+                    $addUser = !empty($commonGroups);
+                }
+
+                if ($addUser) {
+                    array_push($this->result['exact']['users'], [
+                        'label' => $user->getDisplayName(),
+                        'value' => [
+                            'shareType' => Share::SHARE_TYPE_USER,
+                            'shareWith' => $user->getUID(),
+                        ],
+                    ]);
+                }
+            }
+        }
+
+        if (!$this->shareeEnumeration) {
+            $this->result['users'] = [];
+        }
+    }
+
+    /**
+     * @param string $search
+     */
+    protected function getGroups($search) {
+        $this->result['groups'] = $this->result['exact']['groups'] = [];
+
+        $groups = $this->groupManager->search($search, $this->limit, $this->offset);
+        $groupIds = array_map(function (IGroup $group) { return $group->getGID(); }, $groups);
+
+        if (!$this->shareeEnumeration || sizeof($groups) < $this->limit) {
+            $this->reachedEndFor[] = 'groups';
+        }
+
+        $userGroups =  [];
+        if (!empty($groups) && $this->shareWithGroupOnly) {
+            // Intersect all the groups that match with the groups this user is a member of
+            $userGroups = $this->groupManager->getUserGroups($this->userSession->getUser());
+            $userGroups = array_map(function (IGroup $group) { return $group->getGID(); }, $userGroups);
+            $groupIds = array_intersect($groupIds, $userGroups);
+        }
+
+        $lowerSearch = strtolower($search);
+        foreach ($groups as $group) {
+            // FIXME: use a more efficient approach
+            $gid = $group->getGID();
+            if (!in_array($gid, $groupIds)) {
+                continue;
+            }
+            if (strtolower($gid) === $lowerSearch || strtolower($group->getDisplayName()) === $lowerSearch) {
+                $this->result['exact']['groups'][] = [
+                    'label' => $group->getDisplayName(),
+                    'value' => [
+                        'shareType' => Share::SHARE_TYPE_GROUP,
+                        'shareWith' => $gid,
+                    ],
+                ];
+            } else {
+                $this->result['groups'][] = [
+                    'label' => $group->getDisplayName(),
+                    'value' => [
+                        'shareType' => Share::SHARE_TYPE_GROUP,
+                        'shareWith' => $gid,
+                    ],
+                ];
+            }
+        }
+
+        if ($this->offset === 0 && empty($this->result['exact']['groups'])) {
+            // On page one we try if the search result has a direct hit on the
+            // user id and if so, we add that to the exact match list
+            $group = $this->groupManager->get($search);
+            if ($group instanceof IGroup && (!$this->shareWithGroupOnly || in_array($group->getGID(), $userGroups))) {
+                array_push($this->result['exact']['groups'], [
+                    'label' => $group->getDisplayName(),
+                    'value' => [
+                        'shareType' => Share::SHARE_TYPE_GROUP,
+                        'shareWith' => $group->getGID(),
+                    ],
+                ]);
+            }
+        }
+
+        if (!$this->shareeEnumeration) {
+            $this->result['groups'] = [];
+        }
+    }
+
+
+    /**
+     * @param string $search
+     */
+    protected function getCircles($search) {
+        $this->result['circles'] = $this->result['exact']['circles'] = [];
+
+        $result = \OCA\Circles\Api\Sharees::search($search, $this->limit, $this->offset);
+        if (array_key_exists('circles', $result['exact'])) {
+            $this->result['exact']['circles'] = $result['exact']['circles'];
+        }
+        if (array_key_exists('circles', $result)) {
+            $this->result['circles'] = $result['circles'];
+        }
+    }
+
+
+    /**
+     * @param string $search
+     * @return array
+     */
+    protected function getRemote($search) {
+        $result = ['results' => [], 'exact' => []];
+
+        // Search in contacts
+        //@todo Pagination missing
+        $addressBookContacts = $this->contactsManager->search($search, ['CLOUD', 'FN']);
+        $result['exactIdMatch'] = false;
+        foreach ($addressBookContacts as $contact) {
+            if (isset($contact['isLocalSystemBook'])) {
+                continue;
+            }
+            if (isset($contact['CLOUD'])) {
+                $cloudIds = $contact['CLOUD'];
+                if (!is_array($cloudIds)) {
+                    $cloudIds = [$cloudIds];
+                }
+                $lowerSearch = strtolower($search);
+                foreach ($cloudIds as $cloudId) {
+                    list(, $serverUrl) = $this->splitUserRemote($cloudId);
+                    if (strtolower($contact['FN']) === $lowerSearch || strtolower($cloudId) === $lowerSearch) {
+                        if (strtolower($cloudId) === $lowerSearch) {
+                            $result['exactIdMatch'] = true;
+                        }
+                        $result['exact'][] = [
+                            'label' => $contact['FN'] . " ($cloudId)",
+                            'value' => [
+                                'shareType' => Share::SHARE_TYPE_REMOTE,
+                                'shareWith' => $cloudId,
+                                'server' => $serverUrl,
+                            ],
+                        ];
+                    } else {
+                        $result['results'][] = [
+                            'label' => $contact['FN'] . " ($cloudId)",
+                            'value' => [
+                                'shareType' => Share::SHARE_TYPE_REMOTE,
+                                'shareWith' => $cloudId,
+                                'server' => $serverUrl,
+                            ],
+                        ];
+                    }
+                }
+            }
+        }
+
+        if (!$this->shareeEnumeration) {
+            $result['results'] = [];
+        }
+
+        if (!$result['exactIdMatch'] && $this->cloudIdManager->isValidCloudId($search) && $this->offset === 0) {
+            $result['exact'][] = [
+                'label' => $search,
+                'value' => [
+                    'shareType' => Share::SHARE_TYPE_REMOTE,
+                    'shareWith' => $search,
+                ],
+            ];
+        }
+
+        $this->reachedEndFor[] = 'remotes';
+
+        return $result;
+    }
+
+    /**
+     * split user and remote from federated cloud id
+     *
+     * @param string $address federated share address
+     * @return array [user, remoteURL]
+     * @throws \Exception
+     */
+    public function splitUserRemote($address) {
+        try {
+            $cloudId = $this->cloudIdManager->resolveCloudId($address);
+            return [$cloudId->getUser(), $cloudId->getRemote()];
+        } catch (\InvalidArgumentException $e) {
+            throw new \Exception('Invalid Federated Cloud ID', 0, $e);
+        }
+    }
+
+    /**
+     * Strips away a potential file names and trailing slashes:
+     * - http://localhost
+     * - http://localhost/
+     * - http://localhost/index.php
+     * - http://localhost/index.php/s/{shareToken}
+     *
+     * all return: http://localhost
+     *
+     * @param string $remote
+     * @return string
+     */
+    protected function fixRemoteURL($remote) {
+        $remote = str_replace('\\', '/', $remote);
+        if ($fileNamePosition = strpos($remote, '/index.php')) {
+            $remote = substr($remote, 0, $fileNamePosition);
+        }
+        $remote = rtrim($remote, '/');
+
+        return $remote;
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @param string $search
+     * @param string $itemType
+     * @param int $page
+     * @param int $perPage
+     * @param int|int[] $shareType
+     * @param bool $lookup
+     * @return DataResponse
+     * @throws OCSBadRequestException
+     */
+    public function search($search = '', $itemType = null, $page = 1, $perPage = 200, $shareType = null, $lookup = true) {
+
+        // only search for string larger than a given threshold
+        $threshold = (int)$this->config->getSystemValue('sharing.minSearchStringLength', 0);
+        if (strlen($search) < $threshold) {
+            return new DataResponse($this->result);
+        }
+
+        // never return more than the max. number of results configured in the config.php
+        $maxResults = (int)$this->config->getSystemValue('sharing.maxAutocompleteResults', 0);
+        if ($maxResults > 0) {
+            $perPage = min($perPage, $maxResults);
+        }
+        if ($perPage <= 0) {
+            throw new OCSBadRequestException('Invalid perPage argument');
+        }
+        if ($page <= 0) {
+            throw new OCSBadRequestException('Invalid page');
+        }
+
+        $shareTypes = [
+            Share::SHARE_TYPE_USER,
+        ];
+
+        if ($itemType === 'file' || $itemType === 'folder') {
+            if ($this->shareManager->allowGroupSharing()) {
+                $shareTypes[] = Share::SHARE_TYPE_GROUP;
+            }
+
+            if ($this->isRemoteSharingAllowed($itemType)) {
+                $shareTypes[] = Share::SHARE_TYPE_REMOTE;
+            }
+
+            if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_EMAIL)) {
+                $shareTypes[] = Share::SHARE_TYPE_EMAIL;
+            }
+        } else {
+            $shareTypes[] = Share::SHARE_TYPE_GROUP;
+            $shareTypes[] = Share::SHARE_TYPE_EMAIL;
+        }
+
+        if (\OCP\App::isEnabled('circles')) {
+            $shareTypes[] = Share::SHARE_TYPE_CIRCLE;
+        }
+
+        if (isset($_GET['shareType']) && is_array($_GET['shareType'])) {
+            $shareTypes = array_intersect($shareTypes, $_GET['shareType']);
+            sort($shareTypes);
+        } else if (is_numeric($shareType)) {
+            $shareTypes = array_intersect($shareTypes, [(int) $shareType]);
+            sort($shareTypes);
+        }
+
+        $this->shareWithGroupOnly = $this->config->getAppValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes';
+        $this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
+        $this->limit = (int) $perPage;
+        $this->offset = $perPage * ($page - 1);
+
+        return $this->searchSharees($search, $itemType, $shareTypes, $page, $perPage, $lookup);
+    }
+
+    /**
+     * Method to get out the static call for better testing
+     *
+     * @param string $itemType
+     * @return bool
+     */
+    protected function isRemoteSharingAllowed($itemType) {
+        try {
+            $backend = Share::getBackend($itemType);
+            return $backend->isShareTypeAllowed(Share::SHARE_TYPE_REMOTE);
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
+
+    /**
+     * Testable search function that does not need globals
+     *
+     * @param string $search
+     * @param string $itemType
+     * @param array $shareTypes
+     * @param int $page
+     * @param int $perPage
+     * @param bool $lookup
+     * @return DataResponse
+     * @throws OCSBadRequestException
+     */
+    protected function searchSharees($search, $itemType, array $shareTypes, $page, $perPage, $lookup) {
+        // Verify arguments
+        if ($itemType === null) {
+            throw new OCSBadRequestException('Missing itemType');
+        }
+
+        // Get users
+        if (in_array(Share::SHARE_TYPE_USER, $shareTypes)) {
+            $this->getUsers($search);
+        }
+
+        // Get groups
+        if (in_array(Share::SHARE_TYPE_GROUP, $shareTypes)) {
+            $this->getGroups($search);
+        }
+
+        // Get circles
+        if (in_array(Share::SHARE_TYPE_CIRCLE, $shareTypes)) {
+            $this->getCircles($search);
+        }
+
+
+        // Get remote
+        $remoteResults = ['results' => [], 'exact' => [], 'exactIdMatch' => false];
+        if (in_array(Share::SHARE_TYPE_REMOTE, $shareTypes)) {
+            $remoteResults = $this->getRemote($search);
+        }
+
+        // Get emails
+        $mailResults = ['results' => [], 'exact' => [], 'exactIdMatch' => false];
+        if (in_array(Share::SHARE_TYPE_EMAIL, $shareTypes)) {
+            $mailResults = $this->getEmail($search);
+        }
+
+        // Get from lookup server
+        if ($lookup) {
+            $this->getLookup($search);
+        }
+
+        // if we have a exact match, either for the federated cloud id or for the
+        // email address we only return the exact match. It is highly unlikely
+        // that the exact same email address and federated cloud id exists
+        if ($mailResults['exactIdMatch'] && !$remoteResults['exactIdMatch']) {
+            $this->result['emails'] = $mailResults['results'];
+            $this->result['exact']['emails'] = $mailResults['exact'];
+        } else if (!$mailResults['exactIdMatch'] && $remoteResults['exactIdMatch']) {
+            $this->result['remotes'] = $remoteResults['results'];
+            $this->result['exact']['remotes'] = $remoteResults['exact'];
+        } else {
+            $this->result['remotes'] = $remoteResults['results'];
+            $this->result['exact']['remotes'] = $remoteResults['exact'];
+            $this->result['emails'] = $mailResults['results'];
+            $this->result['exact']['emails'] = $mailResults['exact'];
+        }
+
+        $response = new DataResponse($this->result);
+
+        if (sizeof($this->reachedEndFor) < 3) {
+            $response->addHeader('Link', $this->getPaginationLink($page, [
+                'search' => $search,
+                'itemType' => $itemType,
+                'shareType' => $shareTypes,
+                'perPage' => $perPage,
+            ]));
+        }
+
+        return $response;
+    }
+
+    /**
+     * @param string $search
+     * @return array
+     */
+    protected function getEmail($search) {
+        $result = ['results' => [], 'exact' => []];
+
+        // Search in contacts
+        //@todo Pagination missing
+        $addressBookContacts = $this->contactsManager->search($search, ['EMAIL', 'FN']);
+        $result['exactIdMatch'] = false;
+        foreach ($addressBookContacts as $contact) {
+            if (isset($contact['isLocalSystemBook'])) {
+                continue;
+            }
+            if (isset($contact['EMAIL'])) {
+                $emailAddresses = $contact['EMAIL'];
+                if (!is_array($emailAddresses)) {
+                    $emailAddresses = [$emailAddresses];
+                }
+                foreach ($emailAddresses as $emailAddress) {
+                    if (strtolower($contact['FN']) === strtolower($search) || strtolower($emailAddress) === strtolower($search)) {
+                        if (strtolower($emailAddress) === strtolower($search)) {
+                            $result['exactIdMatch'] = true;
+                        }
+                        $result['exact'][] = [
+                            'label' => $contact['FN'] . " ($emailAddress)",
+                            'value' => [
+                                'shareType' => Share::SHARE_TYPE_EMAIL,
+                                'shareWith' => $emailAddress,
+                            ],
+                        ];
+                    } else {
+                        $result['results'][] = [
+                            'label' => $contact['FN'] . " ($emailAddress)",
+                            'value' => [
+                                'shareType' => Share::SHARE_TYPE_EMAIL,
+                                'shareWith' => $emailAddress,
+                            ],
+                        ];
+                    }
+                }
+            }
+        }
+
+        if (!$this->shareeEnumeration) {
+            $result['results'] = [];
+        }
+
+        if (!$result['exactIdMatch'] && filter_var($search, FILTER_VALIDATE_EMAIL)) {
+            $result['exact'][] = [
+                'label' => $search,
+                'value' => [
+                    'shareType' => Share::SHARE_TYPE_EMAIL,
+                    'shareWith' => $search,
+                ],
+            ];
+        }
+
+        $this->reachedEndFor[] = 'emails';
+
+        return $result;
+    }
+
+    protected function getLookup($search) {
+        $isEnabled = $this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'no');
+        $result = [];
+
+        if($isEnabled === 'yes') {
+            try {
+                $client = $this->clientService->newClient();
+                $response = $client->get(
+                    'https://lookup.nextcloud.com/users?search=' . urlencode($search),
+                    [
+                        'timeout' => 10,
+                        'connect_timeout' => 3,
+                    ]
+                );
+
+                $body = json_decode($response->getBody(), true);
+
+                $result = [];
+                foreach ($body as $lookup) {
+                    $result[] = [
+                        'label' => $lookup['federationId'],
+                        'value' => [
+                            'shareType' => Share::SHARE_TYPE_REMOTE,
+                            'shareWith' => $lookup['federationId'],
+                        ],
+                        'extra' => $lookup,
+                    ];
+                }
+            } catch (\Exception $e) {}
+        }
+
+        $this->result['lookup'] = $result;
+    }
+
+    /**
+     * Generates a bunch of pagination links for the current page
+     *
+     * @param int $page Current page
+     * @param array $params Parameters for the URL
+     * @return string
+     */
+    protected function getPaginationLink($page, array $params) {
+        if ($this->isV2()) {
+            $url = $this->urlGenerator->getAbsoluteURL('/ocs/v2.php/apps/files_sharing/api/v1/sharees') . '?';
+        } else {
+            $url = $this->urlGenerator->getAbsoluteURL('/ocs/v1.php/apps/files_sharing/api/v1/sharees') . '?';
+        }
+        $params['page'] = $page + 1;
+        $link = '<' . $url . http_build_query($params) . '>; rel="next"';
+
+        return $link;
+    }
+
+    /**
+     * @return bool
+     */
+    protected function isV2() {
+        return $this->request->getScriptName() === '/ocs/v2.php';
+    }
 }

apps/provisioning_api/lib/Controller/UsersController.php

Doc Comments +1 added lines, -1 removed lines

@@ -225,7 +225,7 @@
 	/**
 	 * creates a array with all user data
 	 *
-	 * @param $userId
+	 * @param string $userId
 	 * @return array
 	 * @throws OCSException
 	 */

Braces +1 added lines, -1 removed lines

@@ -335,7 +335,7 @@
 					}
 					if($quota === 0) {
 						$quota = 'default';
-					}else if($quota === -1) {
+					} else if($quota === -1) {
 						$quota = 'none';
 					} else {
 						$quota = \OCP\Util::humanFileSize($quota);

Spacing +52 added lines, -52 removed lines

@@ -139,7 +139,7 @@ 
 		// Admin? Or SubAdmin?
 		$uid = $user->getUID();
 		$subAdminManager = $this->groupManager->getSubAdmin();
-		if($this->groupManager->isAdmin($uid)){
+		if ($this->groupManager->isAdmin($uid)) {
 			$users = $this->userManager->search($search, $limit, $offset);
 		} else if ($subAdminManager->isSubAdmin($user)) {
 			$subAdminOfGroups = $subAdminManager->getSubAdminsGroups($user);
@@ -147,7 +147,7 @@ 
 				$subAdminOfGroups[$key] = $group->getGID();
 			}
 
-			if($offset === null) {
+			if ($offset === null) {
 				$offset = 0;
 			}
 
@@ -181,22 +181,22 @@ 
 		$isAdmin = $this->groupManager->isAdmin($user->getUID());
 		$subAdminManager = $this->groupManager->getSubAdmin();
 
-		if($this->userManager->userExists($userid)) {
+		if ($this->userManager->userExists($userid)) {
 			$this->logger->error('Failed addUser attempt: User already exists.', ['app' => 'ocs_api']);
 			throw new OCSException('User already exists', 102);
 		}
 
-		if(is_array($groups)) {
+		if (is_array($groups)) {
 			foreach ($groups as $group) {
-				if(!$this->groupManager->groupExists($group)) {
+				if (!$this->groupManager->groupExists($group)) {
 					throw new OCSException('group '.$group.' does not exist', 104);
 				}
-				if(!$isAdmin && !$subAdminManager->isSubAdminofGroup($user, $this->groupManager->get($group))) {
-					throw new OCSException('insufficient privileges for group '. $group, 105);
+				if (!$isAdmin && !$subAdminManager->isSubAdminofGroup($user, $this->groupManager->get($group))) {
+					throw new OCSException('insufficient privileges for group '.$group, 105);
 				}
 			}
 		} else {
-			if(!$isAdmin) {
+			if (!$isAdmin) {
 				throw new OCSException('no group specified (required for subadmins)', 106);
 			}
 		}
@@ -245,7 +245,7 @@ 
 	public function getCurrentUser() {
 		$user = $this->userSession->getUser();
 		if ($user) {
-			$data =  $this->getUserData($user->getUID());
+			$data = $this->getUserData($user->getUID());
 			// rename "displayname" to "display-name" only for this call to keep
 			// the API stable.
 			$data['display-name'] = $data['displayname'];
@@ -271,17 +271,17 @@ 
 
 		// Check if the target user exists
 		$targetUserObject = $this->userManager->get($userId);
-		if($targetUserObject === null) {
+		if ($targetUserObject === null) {
 			throw new OCSException('The requested user could not be found', \OCP\API::RESPOND_NOT_FOUND);
 		}
 
 		// Admin? Or SubAdmin?
-		if($this->groupManager->isAdmin($currentLoggedInUser->getUID())
+		if ($this->groupManager->isAdmin($currentLoggedInUser->getUID())
 			|| $this->groupManager->getSubAdmin()->isUserAccessible($currentLoggedInUser, $targetUserObject)) {
 			$data['enabled'] = $this->config->getUserValue($userId, 'core', 'enabled', 'true');
 		} else {
 			// Check they are looking up themselves
-			if($currentLoggedInUser->getUID() !== $userId) {
+			if ($currentLoggedInUser->getUID() !== $userId) {
 				throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
 			}
 		}
@@ -325,12 +325,12 @@ 
 		$currentLoggedInUser = $this->userSession->getUser();
 
 		$targetUser = $this->userManager->get($userId);
-		if($targetUser === null) {
+		if ($targetUser === null) {
 			throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
 		}
 
 		$permittedFields = [];
-		if($userId === $currentLoggedInUser->getUID()) {
+		if ($userId === $currentLoggedInUser->getUID()) {
 			// Editing self (display, email)
 			$permittedFields[] = 'display';
 			$permittedFields[] = AccountManager::PROPERTY_DISPLAYNAME;
@@ -341,13 +341,13 @@ 
 			$permittedFields[] = AccountManager::PROPERTY_WEBSITE;
 			$permittedFields[] = AccountManager::PROPERTY_TWITTER;
 			// If admin they can edit their own quota
-			if($this->groupManager->isAdmin($currentLoggedInUser->getUID())) {
+			if ($this->groupManager->isAdmin($currentLoggedInUser->getUID())) {
 				$permittedFields[] = 'quota';
 			}
 		} else {
 			// Check if admin / subadmin
 			$subAdminManager = $this->groupManager->getSubAdmin();
-			if($subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)
+			if ($subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)
 			|| $this->groupManager->isAdmin($currentLoggedInUser->getUID())) {
 				// They have permissions over the user
 				$permittedFields[] = 'display';
@@ -365,18 +365,18 @@ 
 			}
 		}
 		// Check if permitted to edit this field
-		if(!in_array($key, $permittedFields)) {
+		if (!in_array($key, $permittedFields)) {
 			throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
 		}
 		// Process the edit
-		switch($key) {
+		switch ($key) {
 			case 'display':
 			case AccountManager::PROPERTY_DISPLAYNAME:
 				$targetUser->setDisplayName($value);
 				break;
 			case 'quota':
 				$quota = $value;
-				if($quota !== 'none' && $quota !== 'default') {
+				if ($quota !== 'none' && $quota !== 'default') {
 					if (is_numeric($quota)) {
 						$quota = (float) $quota;
 					} else {
@@ -385,9 +385,9 @@ 
 					if ($quota === false) {
 						throw new OCSException('Invalid quota value '.$value, 103);
 					}
-					if($quota === 0) {
+					if ($quota === 0) {
 						$quota = 'default';
-					}else if($quota === -1) {
+					} else if ($quota === -1) {
 						$quota = 'none';
 					} else {
 						$quota = \OCP\Util::humanFileSize($quota);
@@ -399,7 +399,7 @@ 
 				$targetUser->setPassword($value);
 				break;
 			case AccountManager::PROPERTY_EMAIL:
-				if(filter_var($value, FILTER_VALIDATE_EMAIL)) {
+				if (filter_var($value, FILTER_VALIDATE_EMAIL)) {
 					$targetUser->setEMailAddress($value);
 				} else {
 					throw new OCSException('', 102);
@@ -435,18 +435,18 @@ 
 
 		$targetUser = $this->userManager->get($userId);
 
-		if($targetUser === null || $targetUser->getUID() === $currentLoggedInUser->getUID()) {
+		if ($targetUser === null || $targetUser->getUID() === $currentLoggedInUser->getUID()) {
 			throw new OCSException('', 101);
 		}
 
 		// If not permitted
 		$subAdminManager = $this->groupManager->getSubAdmin();
-		if(!$this->groupManager->isAdmin($currentLoggedInUser->getUID()) && !$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)) {
+		if (!$this->groupManager->isAdmin($currentLoggedInUser->getUID()) && !$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)) {
 			throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
 		}
 
 		// Go ahead with the delete
-		if($targetUser->delete()) {
+		if ($targetUser->delete()) {
 			return new DataResponse();
 		} else {
 			throw new OCSException('', 101);
@@ -490,13 +490,13 @@ 
 		$currentLoggedInUser = $this->userSession->getUser();
 
 		$targetUser = $this->userManager->get($userId);
-		if($targetUser === null || $targetUser->getUID() === $currentLoggedInUser->getUID()) {
+		if ($targetUser === null || $targetUser->getUID() === $currentLoggedInUser->getUID()) {
 			throw new OCSException('', 101);
 		}
 
 		// If not permitted
 		$subAdminManager = $this->groupManager->getSubAdmin();
-		if(!$this->groupManager->isAdmin($currentLoggedInUser->getUID()) && !$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)) {
+		if (!$this->groupManager->isAdmin($currentLoggedInUser->getUID()) && !$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)) {
 			throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
 		}
 
@@ -517,11 +517,11 @@ 
 		$loggedInUser = $this->userSession->getUser();
 
 		$targetUser = $this->userManager->get($userId);
-		if($targetUser === null) {
+		if ($targetUser === null) {
 			throw new OCSException('', \OCP\API::RESPOND_NOT_FOUND);
 		}
 
-		if($targetUser->getUID() === $loggedInUser->getUID() || $this->groupManager->isAdmin($loggedInUser->getUID())) {
+		if ($targetUser->getUID() === $loggedInUser->getUID() || $this->groupManager->isAdmin($loggedInUser->getUID())) {
 			// Self lookup or admin lookup
 			return new DataResponse([
 				'groups' => $this->groupManager->getUserGroupIds($targetUser)
@@ -530,7 +530,7 @@ 
 			$subAdminManager = $this->groupManager->getSubAdmin();
 
 			// Looking up someone else
-			if($subAdminManager->isUserAccessible($loggedInUser, $targetUser)) {
+			if ($subAdminManager->isUserAccessible($loggedInUser, $targetUser)) {
 				// Return the group that the method caller is subadmin of for the user in question
 				/** @var IGroup[] $getSubAdminsGroups */
 				$getSubAdminsGroups = $subAdminManager->getSubAdminsGroups($loggedInUser);
@@ -560,16 +560,16 @@ 
 	 * @throws OCSException
 	 */
 	public function addToGroup($userId, $groupid = '') {
-		if($groupid === '') {
+		if ($groupid === '') {
 			throw new OCSException('', 101);
 		}
 
 		$group = $this->groupManager->get($groupid);
 		$targetUser = $this->userManager->get($userId);
-		if($group === null) {
+		if ($group === null) {
 			throw new OCSException('', 102);
 		}
-		if($targetUser === null) {
+		if ($targetUser === null) {
 			throw new OCSException('', 103);
 		}
 
@@ -597,17 +597,17 @@ 
 	public function removeFromGroup($userId, $groupid) {
 		$loggedInUser = $this->userSession->getUser();
 
-		if($groupid === null) {
+		if ($groupid === null) {
 			throw new OCSException('', 101);
 		}
 
 		$group = $this->groupManager->get($groupid);
-		if($group === null) {
+		if ($group === null) {
 			throw new OCSException('', 102);
 		}
 
 		$targetUser = $this->userManager->get($userId);
-		if($targetUser === null) {
+		if ($targetUser === null) {
 			throw new OCSException('', 103);
 		}
 
@@ -631,7 +631,7 @@ 
 		} else if (!$this->groupManager->isAdmin($loggedInUser->getUID())) {
 			/** @var IGroup[] $subAdminGroups */
 			$subAdminGroups = $subAdminManager->getSubAdminsGroups($loggedInUser);
-			$subAdminGroups = array_map(function (IGroup $subAdminGroup) {
+			$subAdminGroups = array_map(function(IGroup $subAdminGroup) {
 				return $subAdminGroup->getGID();
 			}, $subAdminGroups);
 			$userGroups = $this->groupManager->getUserGroupIds($targetUser);
@@ -663,15 +663,15 @@ 
 		$user = $this->userManager->get($userId);
 
 		// Check if the user exists
-		if($user === null) {
+		if ($user === null) {
 			throw new OCSException('User does not exist', 101);
 		}
 		// Check if group exists
-		if($group === null) {
-			throw new OCSException('Group:'.$groupid.' does not exist',  102);
+		if ($group === null) {
+			throw new OCSException('Group:'.$groupid.' does not exist', 102);
 		}
 		// Check if trying to make subadmin of admin group
-		if(strtolower($groupid) === 'admin') {
+		if (strtolower($groupid) === 'admin') {
 			throw new OCSException('Cannot create subadmins for admin group', 103);
 		}
 
@@ -682,7 +682,7 @@ 
 			return new DataResponse();
 		}
 		// Go
-		if($subAdminManager->createSubAdmin($user, $group)) {
+		if ($subAdminManager->createSubAdmin($user, $group)) {
 			return new DataResponse();
 		} else {
 			throw new OCSException('Unknown error occurred', 103);
@@ -705,20 +705,20 @@ 
 		$subAdminManager = $this->groupManager->getSubAdmin();
 
 		// Check if the user exists
-		if($user === null) {
+		if ($user === null) {
 			throw new OCSException('User does not exist', 101);
 		}
 		// Check if the group exists
-		if($group === null) {
+		if ($group === null) {
 			throw new OCSException('Group does not exist', 101);
 		}
 		// Check if they are a subadmin of this said group
-		if(!$subAdminManager->isSubAdminofGroup($user, $group)) {
+		if (!$subAdminManager->isSubAdminofGroup($user, $group)) {
 			throw new OCSException('User is not a subadmin of this group', 102);
 		}
 
 		// Go
-		if($subAdminManager->deleteSubAdmin($user, $group)) {
+		if ($subAdminManager->deleteSubAdmin($user, $group)) {
 			return new DataResponse();
 		} else {
 			throw new OCSException('Unknown error occurred', 103);
@@ -735,7 +735,7 @@ 
 	public function getUserSubAdminGroups($userId) {
 		$user = $this->userManager->get($userId);
 		// Check if the user exists
-		if($user === null) {
+		if ($user === null) {
 			throw new OCSException('User does not exist', 101);
 		}
 
@@ -745,7 +745,7 @@ 
 			$groups[$key] = $group->getGID();
 		}
 
-		if(!$groups) {
+		if (!$groups) {
 			throw new OCSException('Unknown error occurred', 102);
 		} else {
 			return new DataResponse($groups);
@@ -789,13 +789,13 @@ 
 		$currentLoggedInUser = $this->userSession->getUser();
 
 		$targetUser = $this->userManager->get($userId);
-		if($targetUser === null) {
+		if ($targetUser === null) {
 			throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
 		}
 
 		// Check if admin / subadmin
 		$subAdminManager = $this->groupManager->getSubAdmin();
-		if(!$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)
+		if (!$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)
 			&& !$this->groupManager->isAdmin($currentLoggedInUser->getUID())) {
 			// No rights
 			throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
@@ -817,8 +817,8 @@ 
 			$this->newUserMailHelper->setL10N($l10n);
 			$emailTemplate = $this->newUserMailHelper->generateTemplate($targetUser, false);
 			$this->newUserMailHelper->sendMail($targetUser, $emailTemplate);
-		} catch(\Exception $e) {
-			$this->logger->error("Can't send new user mail to $email: " . $e->getMessage(), array('app' => 'settings'));
+		} catch (\Exception $e) {
+			$this->logger->error("Can't send new user mail to $email: ".$e->getMessage(), array('app' => 'settings'));
 			throw new OCSException('Sending email failed', 102);
 		}
 

Indentation +773 added lines, -773 removed lines

@@ -51,777 +51,777 @@
 
 class UsersController extends OCSController {
 
-	/** @var IUserManager */
-	private $userManager;
-	/** @var IConfig */
-	private $config;
-	/** @var IGroupManager|\OC\Group\Manager */ // FIXME Requires a method that is not on the interface
-	private $groupManager;
-	/** @var IUserSession */
-	private $userSession;
-	/** @var AccountManager */
-	private $accountManager;
-	/** @var ILogger */
-	private $logger;
-	/** @var string */
-	private $fromMailAddress;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var IMailer */
-	private $mailer;
-	/** @var Defaults */
-	private $defaults;
-	/** @var IFactory */
-	private $l10nFactory;
-	/** @var NewUserMailHelper */
-	private $newUserMailHelper;
-
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IUserManager $userManager
-	 * @param IConfig $config
-	 * @param IGroupManager $groupManager
-	 * @param IUserSession $userSession
-	 * @param AccountManager $accountManager
-	 * @param ILogger $logger
-	 * @param string $fromMailAddress
-	 * @param IURLGenerator $urlGenerator
-	 * @param IMailer $mailer
-	 * @param Defaults $defaults
-	 * @param IFactory $l10nFactory
-	 * @param NewUserMailHelper $newUserMailHelper
-	 */
-	public function __construct($appName,
-								IRequest $request,
-								IUserManager $userManager,
-								IConfig $config,
-								IGroupManager $groupManager,
-								IUserSession $userSession,
-								AccountManager $accountManager,
-								ILogger $logger,
-								$fromMailAddress,
-								IURLGenerator $urlGenerator,
-								IMailer $mailer,
-								Defaults $defaults,
-								IFactory $l10nFactory,
-								NewUserMailHelper $newUserMailHelper) {
-		parent::__construct($appName, $request);
-
-		$this->userManager = $userManager;
-		$this->config = $config;
-		$this->groupManager = $groupManager;
-		$this->userSession = $userSession;
-		$this->accountManager = $accountManager;
-		$this->logger = $logger;
-		$this->fromMailAddress = $fromMailAddress;
-		$this->urlGenerator = $urlGenerator;
-		$this->mailer = $mailer;
-		$this->defaults = $defaults;
-		$this->l10nFactory = $l10nFactory;
-		$this->newUserMailHelper = $newUserMailHelper;
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * returns a list of users
-	 *
-	 * @param string $search
-	 * @param int $limit
-	 * @param int $offset
-	 * @return DataResponse
-	 */
-	public function getUsers($search = '', $limit = null, $offset = null) {
-		$user = $this->userSession->getUser();
-		$users = [];
-
-		// Admin? Or SubAdmin?
-		$uid = $user->getUID();
-		$subAdminManager = $this->groupManager->getSubAdmin();
-		if($this->groupManager->isAdmin($uid)){
-			$users = $this->userManager->search($search, $limit, $offset);
-		} else if ($subAdminManager->isSubAdmin($user)) {
-			$subAdminOfGroups = $subAdminManager->getSubAdminsGroups($user);
-			foreach ($subAdminOfGroups as $key => $group) {
-				$subAdminOfGroups[$key] = $group->getGID();
-			}
-
-			if($offset === null) {
-				$offset = 0;
-			}
-
-			$users = [];
-			foreach ($subAdminOfGroups as $group) {
-				$users = array_merge($users, $this->groupManager->displayNamesInGroup($group, $search));
-			}
-
-			$users = array_slice($users, $offset, $limit);
-		}
-
-		$users = array_keys($users);
-
-		return new DataResponse([
-			'users' => $users
-		]);
-	}
-
-	/**
-	 * @PasswordConfirmationRequired
-	 * @NoAdminRequired
-	 *
-	 * @param string $userid
-	 * @param string $password
-	 * @param array $groups
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function addUser($userid, $password, $groups = null) {
-		$user = $this->userSession->getUser();
-		$isAdmin = $this->groupManager->isAdmin($user->getUID());
-		$subAdminManager = $this->groupManager->getSubAdmin();
-
-		if($this->userManager->userExists($userid)) {
-			$this->logger->error('Failed addUser attempt: User already exists.', ['app' => 'ocs_api']);
-			throw new OCSException('User already exists', 102);
-		}
-
-		if(is_array($groups)) {
-			foreach ($groups as $group) {
-				if(!$this->groupManager->groupExists($group)) {
-					throw new OCSException('group '.$group.' does not exist', 104);
-				}
-				if(!$isAdmin && !$subAdminManager->isSubAdminofGroup($user, $this->groupManager->get($group))) {
-					throw new OCSException('insufficient privileges for group '. $group, 105);
-				}
-			}
-		} else {
-			if(!$isAdmin) {
-				throw new OCSException('no group specified (required for subadmins)', 106);
-			}
-		}
-
-		try {
-			$newUser = $this->userManager->createUser($userid, $password);
-			$this->logger->info('Successful addUser call with userid: '.$userid, ['app' => 'ocs_api']);
-
-			if (is_array($groups)) {
-				foreach ($groups as $group) {
-					$this->groupManager->get($group)->addUser($newUser);
-					$this->logger->info('Added userid '.$userid.' to group '.$group, ['app' => 'ocs_api']);
-				}
-			}
-			return new DataResponse();
-		} catch (\Exception $e) {
-			$this->logger->error('Failed addUser attempt with exception: '.$e->getMessage(), ['app' => 'ocs_api']);
-			throw new OCSException('Bad request', 101);
-		}
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoSubAdminRequired
-	 *
-	 * gets user info
-	 *
-	 * @param string $userId
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function getUser($userId) {
-		$data = $this->getUserData($userId);
-		return new DataResponse($data);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoSubAdminRequired
-	 *
-	 * gets user info from the currently logged in user
-	 *
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function getCurrentUser() {
-		$user = $this->userSession->getUser();
-		if ($user) {
-			$data =  $this->getUserData($user->getUID());
-			// rename "displayname" to "display-name" only for this call to keep
-			// the API stable.
-			$data['display-name'] = $data['displayname'];
-			unset($data['displayname']);
-			return new DataResponse($data);
-
-		}
-
-		throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
-	}
-
-	/**
-	 * creates a array with all user data
-	 *
-	 * @param $userId
-	 * @return array
-	 * @throws OCSException
-	 */
-	protected function getUserData($userId) {
-		$currentLoggedInUser = $this->userSession->getUser();
-
-		$data = [];
-
-		// Check if the target user exists
-		$targetUserObject = $this->userManager->get($userId);
-		if($targetUserObject === null) {
-			throw new OCSException('The requested user could not be found', \OCP\API::RESPOND_NOT_FOUND);
-		}
-
-		// Admin? Or SubAdmin?
-		if($this->groupManager->isAdmin($currentLoggedInUser->getUID())
-			|| $this->groupManager->getSubAdmin()->isUserAccessible($currentLoggedInUser, $targetUserObject)) {
-			$data['enabled'] = $this->config->getUserValue($userId, 'core', 'enabled', 'true');
-		} else {
-			// Check they are looking up themselves
-			if($currentLoggedInUser->getUID() !== $userId) {
-				throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
-			}
-		}
-
-		$userAccount = $this->accountManager->getUser($targetUserObject);
-		$groups = $this->groupManager->getUserGroups($targetUserObject);
-		$gids = [];
-		foreach ($groups as $group) {
-			$gids[] = $group->getDisplayName();
-		}
-
-		// Find the data
-		$data['id'] = $targetUserObject->getUID();
-		$data['quota'] = $this->fillStorageInfo($userId);
-		$data[AccountManager::PROPERTY_EMAIL] = $targetUserObject->getEMailAddress();
-		$data[AccountManager::PROPERTY_DISPLAYNAME] = $targetUserObject->getDisplayName();
-		$data[AccountManager::PROPERTY_PHONE] = $userAccount[AccountManager::PROPERTY_PHONE]['value'];
-		$data[AccountManager::PROPERTY_ADDRESS] = $userAccount[AccountManager::PROPERTY_ADDRESS]['value'];
-		$data[AccountManager::PROPERTY_WEBSITE] = $userAccount[AccountManager::PROPERTY_WEBSITE]['value'];
-		$data[AccountManager::PROPERTY_TWITTER] = $userAccount[AccountManager::PROPERTY_TWITTER]['value'];
-		$data['groups'] = $gids;
-
-		return $data;
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoSubAdminRequired
-	 * @PasswordConfirmationRequired
-	 *
-	 * edit users
-	 *
-	 * @param string $userId
-	 * @param string $key
-	 * @param string $value
-	 * @return DataResponse
-	 * @throws OCSException
-	 * @throws OCSForbiddenException
-	 */
-	public function editUser($userId, $key, $value) {
-		$currentLoggedInUser = $this->userSession->getUser();
-
-		$targetUser = $this->userManager->get($userId);
-		if($targetUser === null) {
-			throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
-		}
-
-		$permittedFields = [];
-		if($userId === $currentLoggedInUser->getUID()) {
-			// Editing self (display, email)
-			$permittedFields[] = 'display';
-			$permittedFields[] = AccountManager::PROPERTY_DISPLAYNAME;
-			$permittedFields[] = AccountManager::PROPERTY_EMAIL;
-			$permittedFields[] = 'password';
-			$permittedFields[] = AccountManager::PROPERTY_PHONE;
-			$permittedFields[] = AccountManager::PROPERTY_ADDRESS;
-			$permittedFields[] = AccountManager::PROPERTY_WEBSITE;
-			$permittedFields[] = AccountManager::PROPERTY_TWITTER;
-			// If admin they can edit their own quota
-			if($this->groupManager->isAdmin($currentLoggedInUser->getUID())) {
-				$permittedFields[] = 'quota';
-			}
-		} else {
-			// Check if admin / subadmin
-			$subAdminManager = $this->groupManager->getSubAdmin();
-			if($subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)
-			|| $this->groupManager->isAdmin($currentLoggedInUser->getUID())) {
-				// They have permissions over the user
-				$permittedFields[] = 'display';
-				$permittedFields[] = AccountManager::PROPERTY_DISPLAYNAME;
-				$permittedFields[] = AccountManager::PROPERTY_EMAIL;
-				$permittedFields[] = 'password';
-				$permittedFields[] = AccountManager::PROPERTY_PHONE;
-				$permittedFields[] = AccountManager::PROPERTY_ADDRESS;
-				$permittedFields[] = AccountManager::PROPERTY_WEBSITE;
-				$permittedFields[] = AccountManager::PROPERTY_TWITTER;
-				$permittedFields[] = 'quota';
-			} else {
-				// No rights
-				throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
-			}
-		}
-		// Check if permitted to edit this field
-		if(!in_array($key, $permittedFields)) {
-			throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
-		}
-		// Process the edit
-		switch($key) {
-			case 'display':
-			case AccountManager::PROPERTY_DISPLAYNAME:
-				$targetUser->setDisplayName($value);
-				break;
-			case 'quota':
-				$quota = $value;
-				if($quota !== 'none' && $quota !== 'default') {
-					if (is_numeric($quota)) {
-						$quota = (float) $quota;
-					} else {
-						$quota = \OCP\Util::computerFileSize($quota);
-					}
-					if ($quota === false) {
-						throw new OCSException('Invalid quota value '.$value, 103);
-					}
-					if($quota === 0) {
-						$quota = 'default';
-					}else if($quota === -1) {
-						$quota = 'none';
-					} else {
-						$quota = \OCP\Util::humanFileSize($quota);
-					}
-				}
-				$targetUser->setQuota($quota);
-				break;
-			case 'password':
-				$targetUser->setPassword($value);
-				break;
-			case AccountManager::PROPERTY_EMAIL:
-				if(filter_var($value, FILTER_VALIDATE_EMAIL)) {
-					$targetUser->setEMailAddress($value);
-				} else {
-					throw new OCSException('', 102);
-				}
-				break;
-			case AccountManager::PROPERTY_PHONE:
-			case AccountManager::PROPERTY_ADDRESS:
-			case AccountManager::PROPERTY_WEBSITE:
-			case AccountManager::PROPERTY_TWITTER:
-				$userAccount = $this->accountManager->getUser($targetUser);
-				if ($userAccount[$key]['value'] !== $value) {
-					$userAccount[$key]['value'] = $value;
-					$this->accountManager->updateUser($targetUser, $userAccount);
-				}
-				break;
-			default:
-				throw new OCSException('', 103);
-		}
-		return new DataResponse();
-	}
-
-	/**
-	 * @PasswordConfirmationRequired
-	 * @NoAdminRequired
-	 *
-	 * @param string $userId
-	 * @return DataResponse
-	 * @throws OCSException
-	 * @throws OCSForbiddenException
-	 */
-	public function deleteUser($userId) {
-		$currentLoggedInUser = $this->userSession->getUser();
-
-		$targetUser = $this->userManager->get($userId);
-
-		if($targetUser === null || $targetUser->getUID() === $currentLoggedInUser->getUID()) {
-			throw new OCSException('', 101);
-		}
-
-		// If not permitted
-		$subAdminManager = $this->groupManager->getSubAdmin();
-		if(!$this->groupManager->isAdmin($currentLoggedInUser->getUID()) && !$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)) {
-			throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
-		}
-
-		// Go ahead with the delete
-		if($targetUser->delete()) {
-			return new DataResponse();
-		} else {
-			throw new OCSException('', 101);
-		}
-	}
-
-	/**
-	 * @PasswordConfirmationRequired
-	 * @NoAdminRequired
-	 *
-	 * @param string $userId
-	 * @return DataResponse
-	 * @throws OCSException
-	 * @throws OCSForbiddenException
-	 */
-	public function disableUser($userId) {
-		return $this->setEnabled($userId, false);
-	}
-
-	/**
-	 * @PasswordConfirmationRequired
-	 * @NoAdminRequired
-	 *
-	 * @param string $userId
-	 * @return DataResponse
-	 * @throws OCSException
-	 * @throws OCSForbiddenException
-	 */
-	public function enableUser($userId) {
-		return $this->setEnabled($userId, true);
-	}
-
-	/**
-	 * @param string $userId
-	 * @param bool $value
-	 * @return DataResponse
-	 * @throws OCSException
-	 * @throws OCSForbiddenException
-	 */
-	private function setEnabled($userId, $value) {
-		$currentLoggedInUser = $this->userSession->getUser();
-
-		$targetUser = $this->userManager->get($userId);
-		if($targetUser === null || $targetUser->getUID() === $currentLoggedInUser->getUID()) {
-			throw new OCSException('', 101);
-		}
-
-		// If not permitted
-		$subAdminManager = $this->groupManager->getSubAdmin();
-		if(!$this->groupManager->isAdmin($currentLoggedInUser->getUID()) && !$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)) {
-			throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
-		}
-
-		// enable/disable the user now
-		$targetUser->setEnabled($value);
-		return new DataResponse();
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoSubAdminRequired
-	 *
-	 * @param string $userId
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function getUsersGroups($userId) {
-		$loggedInUser = $this->userSession->getUser();
-
-		$targetUser = $this->userManager->get($userId);
-		if($targetUser === null) {
-			throw new OCSException('', \OCP\API::RESPOND_NOT_FOUND);
-		}
-
-		if($targetUser->getUID() === $loggedInUser->getUID() || $this->groupManager->isAdmin($loggedInUser->getUID())) {
-			// Self lookup or admin lookup
-			return new DataResponse([
-				'groups' => $this->groupManager->getUserGroupIds($targetUser)
-			]);
-		} else {
-			$subAdminManager = $this->groupManager->getSubAdmin();
-
-			// Looking up someone else
-			if($subAdminManager->isUserAccessible($loggedInUser, $targetUser)) {
-				// Return the group that the method caller is subadmin of for the user in question
-				/** @var IGroup[] $getSubAdminsGroups */
-				$getSubAdminsGroups = $subAdminManager->getSubAdminsGroups($loggedInUser);
-				foreach ($getSubAdminsGroups as $key => $group) {
-					$getSubAdminsGroups[$key] = $group->getGID();
-				}
-				$groups = array_intersect(
-					$getSubAdminsGroups,
-					$this->groupManager->getUserGroupIds($targetUser)
-				);
-				return new DataResponse(['groups' => $groups]);
-			} else {
-				// Not permitted
-				throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
-			}
-		}
-
-	}
-
-	/**
-	 * @PasswordConfirmationRequired
-	 * @NoAdminRequired
-	 *
-	 * @param string $userId
-	 * @param string $groupid
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function addToGroup($userId, $groupid = '') {
-		if($groupid === '') {
-			throw new OCSException('', 101);
-		}
-
-		$group = $this->groupManager->get($groupid);
-		$targetUser = $this->userManager->get($userId);
-		if($group === null) {
-			throw new OCSException('', 102);
-		}
-		if($targetUser === null) {
-			throw new OCSException('', 103);
-		}
-
-		// If they're not an admin, check they are a subadmin of the group in question
-		$loggedInUser = $this->userSession->getUser();
-		$subAdminManager = $this->groupManager->getSubAdmin();
-		if (!$this->groupManager->isAdmin($loggedInUser->getUID()) && !$subAdminManager->isSubAdminOfGroup($loggedInUser, $group)) {
-			throw new OCSException('', 104);
-		}
-
-		// Add user to group
-		$group->addUser($targetUser);
-		return new DataResponse();
-	}
-
-	/**
-	 * @PasswordConfirmationRequired
-	 * @NoAdminRequired
-	 *
-	 * @param string $userId
-	 * @param string $groupid
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function removeFromGroup($userId, $groupid) {
-		$loggedInUser = $this->userSession->getUser();
-
-		if($groupid === null) {
-			throw new OCSException('', 101);
-		}
-
-		$group = $this->groupManager->get($groupid);
-		if($group === null) {
-			throw new OCSException('', 102);
-		}
-
-		$targetUser = $this->userManager->get($userId);
-		if($targetUser === null) {
-			throw new OCSException('', 103);
-		}
-
-		// If they're not an admin, check they are a subadmin of the group in question
-		$subAdminManager = $this->groupManager->getSubAdmin();
-		if (!$this->groupManager->isAdmin($loggedInUser->getUID()) && !$subAdminManager->isSubAdminOfGroup($loggedInUser, $group)) {
-			throw new OCSException('', 104);
-		}
-
-		// Check they aren't removing themselves from 'admin' or their 'subadmin; group
-		if ($userId === $loggedInUser->getUID()) {
-			if ($this->groupManager->isAdmin($loggedInUser->getUID())) {
-				if ($group->getGID() === 'admin') {
-					throw new OCSException('Cannot remove yourself from the admin group', 105);
-				}
-			} else {
-				// Not an admin, so the user must be a subadmin of this group, but that is not allowed.
-				throw new OCSException('Cannot remove yourself from this group as you are a SubAdmin', 105);
-			}
-
-		} else if (!$this->groupManager->isAdmin($loggedInUser->getUID())) {
-			/** @var IGroup[] $subAdminGroups */
-			$subAdminGroups = $subAdminManager->getSubAdminsGroups($loggedInUser);
-			$subAdminGroups = array_map(function (IGroup $subAdminGroup) {
-				return $subAdminGroup->getGID();
-			}, $subAdminGroups);
-			$userGroups = $this->groupManager->getUserGroupIds($targetUser);
-			$userSubAdminGroups = array_intersect($subAdminGroups, $userGroups);
-
-			if (count($userSubAdminGroups) <= 1) {
-				// Subadmin must not be able to remove a user from all their subadmin groups.
-				throw new OCSException('Cannot remove user from this group as this is the only remaining group you are a SubAdmin of', 105);
-			}
-		}
-
-		// Remove user from group
-		$group->removeUser($targetUser);
-		return new DataResponse();
-	}
-
-	/**
-	 * Creates a subadmin
-	 *
-	 * @PasswordConfirmationRequired
-	 *
-	 * @param string $userId
-	 * @param string $groupid
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function addSubAdmin($userId, $groupid) {
-		$group = $this->groupManager->get($groupid);
-		$user = $this->userManager->get($userId);
-
-		// Check if the user exists
-		if($user === null) {
-			throw new OCSException('User does not exist', 101);
-		}
-		// Check if group exists
-		if($group === null) {
-			throw new OCSException('Group:'.$groupid.' does not exist',  102);
-		}
-		// Check if trying to make subadmin of admin group
-		if(strtolower($groupid) === 'admin') {
-			throw new OCSException('Cannot create subadmins for admin group', 103);
-		}
-
-		$subAdminManager = $this->groupManager->getSubAdmin();
-
-		// We cannot be subadmin twice
-		if ($subAdminManager->isSubAdminofGroup($user, $group)) {
-			return new DataResponse();
-		}
-		// Go
-		if($subAdminManager->createSubAdmin($user, $group)) {
-			return new DataResponse();
-		} else {
-			throw new OCSException('Unknown error occurred', 103);
-		}
-	}
-
-	/**
-	 * Removes a subadmin from a group
-	 *
-	 * @PasswordConfirmationRequired
-	 *
-	 * @param string $userId
-	 * @param string $groupid
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function removeSubAdmin($userId, $groupid) {
-		$group = $this->groupManager->get($groupid);
-		$user = $this->userManager->get($userId);
-		$subAdminManager = $this->groupManager->getSubAdmin();
-
-		// Check if the user exists
-		if($user === null) {
-			throw new OCSException('User does not exist', 101);
-		}
-		// Check if the group exists
-		if($group === null) {
-			throw new OCSException('Group does not exist', 101);
-		}
-		// Check if they are a subadmin of this said group
-		if(!$subAdminManager->isSubAdminofGroup($user, $group)) {
-			throw new OCSException('User is not a subadmin of this group', 102);
-		}
-
-		// Go
-		if($subAdminManager->deleteSubAdmin($user, $group)) {
-			return new DataResponse();
-		} else {
-			throw new OCSException('Unknown error occurred', 103);
-		}
-	}
-
-	/**
-	 * Get the groups a user is a subadmin of
-	 *
-	 * @param string $userId
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function getUserSubAdminGroups($userId) {
-		$user = $this->userManager->get($userId);
-		// Check if the user exists
-		if($user === null) {
-			throw new OCSException('User does not exist', 101);
-		}
-
-		// Get the subadmin groups
-		$groups = $this->groupManager->getSubAdmin()->getSubAdminsGroups($user);
-		foreach ($groups as $key => $group) {
-			$groups[$key] = $group->getGID();
-		}
-
-		if(!$groups) {
-			throw new OCSException('Unknown error occurred', 102);
-		} else {
-			return new DataResponse($groups);
-		}
-	}
-
-	/**
-	 * @param string $userId
-	 * @return array
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	protected function fillStorageInfo($userId) {
-		try {
-			\OC_Util::tearDownFS();
-			\OC_Util::setupFS($userId);
-			$storage = OC_Helper::getStorageInfo('/');
-			$data = [
-				'free' => $storage['free'],
-				'used' => $storage['used'],
-				'total' => $storage['total'],
-				'relative' => $storage['relative'],
-				'quota' => $storage['quota'],
-			];
-		} catch (NotFoundException $ex) {
-			$data = [];
-		}
-		return $data;
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @PasswordConfirmationRequired
-	 *
-	 * resend welcome message
-	 *
-	 * @param string $userId
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function resendWelcomeMessage($userId) {
-		$currentLoggedInUser = $this->userSession->getUser();
-
-		$targetUser = $this->userManager->get($userId);
-		if($targetUser === null) {
-			throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
-		}
-
-		// Check if admin / subadmin
-		$subAdminManager = $this->groupManager->getSubAdmin();
-		if(!$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)
-			&& !$this->groupManager->isAdmin($currentLoggedInUser->getUID())) {
-			// No rights
-			throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
-		}
-
-		$email = $targetUser->getEMailAddress();
-		if ($email === '' || $email === null) {
-			throw new OCSException('Email address not available', 101);
-		}
-		$username = $targetUser->getUID();
-		$lang = $this->config->getUserValue($username, 'core', 'lang', 'en');
-		if (!$this->l10nFactory->languageExists('settings', $lang)) {
-			$lang = 'en';
-		}
-
-		$l10n = $this->l10nFactory->get('settings', $lang);
-
-		try {
-			$this->newUserMailHelper->setL10N($l10n);
-			$emailTemplate = $this->newUserMailHelper->generateTemplate($targetUser, false);
-			$this->newUserMailHelper->sendMail($targetUser, $emailTemplate);
-		} catch(\Exception $e) {
-			$this->logger->error("Can't send new user mail to $email: " . $e->getMessage(), array('app' => 'settings'));
-			throw new OCSException('Sending email failed', 102);
-		}
-
-		return new DataResponse();
-	}
+    /** @var IUserManager */
+    private $userManager;
+    /** @var IConfig */
+    private $config;
+    /** @var IGroupManager|\OC\Group\Manager */ // FIXME Requires a method that is not on the interface
+    private $groupManager;
+    /** @var IUserSession */
+    private $userSession;
+    /** @var AccountManager */
+    private $accountManager;
+    /** @var ILogger */
+    private $logger;
+    /** @var string */
+    private $fromMailAddress;
+    /** @var IURLGenerator */
+    private $urlGenerator;
+    /** @var IMailer */
+    private $mailer;
+    /** @var Defaults */
+    private $defaults;
+    /** @var IFactory */
+    private $l10nFactory;
+    /** @var NewUserMailHelper */
+    private $newUserMailHelper;
+
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IUserManager $userManager
+     * @param IConfig $config
+     * @param IGroupManager $groupManager
+     * @param IUserSession $userSession
+     * @param AccountManager $accountManager
+     * @param ILogger $logger
+     * @param string $fromMailAddress
+     * @param IURLGenerator $urlGenerator
+     * @param IMailer $mailer
+     * @param Defaults $defaults
+     * @param IFactory $l10nFactory
+     * @param NewUserMailHelper $newUserMailHelper
+     */
+    public function __construct($appName,
+                                IRequest $request,
+                                IUserManager $userManager,
+                                IConfig $config,
+                                IGroupManager $groupManager,
+                                IUserSession $userSession,
+                                AccountManager $accountManager,
+                                ILogger $logger,
+                                $fromMailAddress,
+                                IURLGenerator $urlGenerator,
+                                IMailer $mailer,
+                                Defaults $defaults,
+                                IFactory $l10nFactory,
+                                NewUserMailHelper $newUserMailHelper) {
+        parent::__construct($appName, $request);
+
+        $this->userManager = $userManager;
+        $this->config = $config;
+        $this->groupManager = $groupManager;
+        $this->userSession = $userSession;
+        $this->accountManager = $accountManager;
+        $this->logger = $logger;
+        $this->fromMailAddress = $fromMailAddress;
+        $this->urlGenerator = $urlGenerator;
+        $this->mailer = $mailer;
+        $this->defaults = $defaults;
+        $this->l10nFactory = $l10nFactory;
+        $this->newUserMailHelper = $newUserMailHelper;
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * returns a list of users
+     *
+     * @param string $search
+     * @param int $limit
+     * @param int $offset
+     * @return DataResponse
+     */
+    public function getUsers($search = '', $limit = null, $offset = null) {
+        $user = $this->userSession->getUser();
+        $users = [];
+
+        // Admin? Or SubAdmin?
+        $uid = $user->getUID();
+        $subAdminManager = $this->groupManager->getSubAdmin();
+        if($this->groupManager->isAdmin($uid)){
+            $users = $this->userManager->search($search, $limit, $offset);
+        } else if ($subAdminManager->isSubAdmin($user)) {
+            $subAdminOfGroups = $subAdminManager->getSubAdminsGroups($user);
+            foreach ($subAdminOfGroups as $key => $group) {
+                $subAdminOfGroups[$key] = $group->getGID();
+            }
+
+            if($offset === null) {
+                $offset = 0;
+            }
+
+            $users = [];
+            foreach ($subAdminOfGroups as $group) {
+                $users = array_merge($users, $this->groupManager->displayNamesInGroup($group, $search));
+            }
+
+            $users = array_slice($users, $offset, $limit);
+        }
+
+        $users = array_keys($users);
+
+        return new DataResponse([
+            'users' => $users
+        ]);
+    }
+
+    /**
+     * @PasswordConfirmationRequired
+     * @NoAdminRequired
+     *
+     * @param string $userid
+     * @param string $password
+     * @param array $groups
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function addUser($userid, $password, $groups = null) {
+        $user = $this->userSession->getUser();
+        $isAdmin = $this->groupManager->isAdmin($user->getUID());
+        $subAdminManager = $this->groupManager->getSubAdmin();
+
+        if($this->userManager->userExists($userid)) {
+            $this->logger->error('Failed addUser attempt: User already exists.', ['app' => 'ocs_api']);
+            throw new OCSException('User already exists', 102);
+        }
+
+        if(is_array($groups)) {
+            foreach ($groups as $group) {
+                if(!$this->groupManager->groupExists($group)) {
+                    throw new OCSException('group '.$group.' does not exist', 104);
+                }
+                if(!$isAdmin && !$subAdminManager->isSubAdminofGroup($user, $this->groupManager->get($group))) {
+                    throw new OCSException('insufficient privileges for group '. $group, 105);
+                }
+            }
+        } else {
+            if(!$isAdmin) {
+                throw new OCSException('no group specified (required for subadmins)', 106);
+            }
+        }
+
+        try {
+            $newUser = $this->userManager->createUser($userid, $password);
+            $this->logger->info('Successful addUser call with userid: '.$userid, ['app' => 'ocs_api']);
+
+            if (is_array($groups)) {
+                foreach ($groups as $group) {
+                    $this->groupManager->get($group)->addUser($newUser);
+                    $this->logger->info('Added userid '.$userid.' to group '.$group, ['app' => 'ocs_api']);
+                }
+            }
+            return new DataResponse();
+        } catch (\Exception $e) {
+            $this->logger->error('Failed addUser attempt with exception: '.$e->getMessage(), ['app' => 'ocs_api']);
+            throw new OCSException('Bad request', 101);
+        }
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoSubAdminRequired
+     *
+     * gets user info
+     *
+     * @param string $userId
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function getUser($userId) {
+        $data = $this->getUserData($userId);
+        return new DataResponse($data);
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoSubAdminRequired
+     *
+     * gets user info from the currently logged in user
+     *
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function getCurrentUser() {
+        $user = $this->userSession->getUser();
+        if ($user) {
+            $data =  $this->getUserData($user->getUID());
+            // rename "displayname" to "display-name" only for this call to keep
+            // the API stable.
+            $data['display-name'] = $data['displayname'];
+            unset($data['displayname']);
+            return new DataResponse($data);
+
+        }
+
+        throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
+    }
+
+    /**
+     * creates a array with all user data
+     *
+     * @param $userId
+     * @return array
+     * @throws OCSException
+     */
+    protected function getUserData($userId) {
+        $currentLoggedInUser = $this->userSession->getUser();
+
+        $data = [];
+
+        // Check if the target user exists
+        $targetUserObject = $this->userManager->get($userId);
+        if($targetUserObject === null) {
+            throw new OCSException('The requested user could not be found', \OCP\API::RESPOND_NOT_FOUND);
+        }
+
+        // Admin? Or SubAdmin?
+        if($this->groupManager->isAdmin($currentLoggedInUser->getUID())
+            || $this->groupManager->getSubAdmin()->isUserAccessible($currentLoggedInUser, $targetUserObject)) {
+            $data['enabled'] = $this->config->getUserValue($userId, 'core', 'enabled', 'true');
+        } else {
+            // Check they are looking up themselves
+            if($currentLoggedInUser->getUID() !== $userId) {
+                throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
+            }
+        }
+
+        $userAccount = $this->accountManager->getUser($targetUserObject);
+        $groups = $this->groupManager->getUserGroups($targetUserObject);
+        $gids = [];
+        foreach ($groups as $group) {
+            $gids[] = $group->getDisplayName();
+        }
+
+        // Find the data
+        $data['id'] = $targetUserObject->getUID();
+        $data['quota'] = $this->fillStorageInfo($userId);
+        $data[AccountManager::PROPERTY_EMAIL] = $targetUserObject->getEMailAddress();
+        $data[AccountManager::PROPERTY_DISPLAYNAME] = $targetUserObject->getDisplayName();
+        $data[AccountManager::PROPERTY_PHONE] = $userAccount[AccountManager::PROPERTY_PHONE]['value'];
+        $data[AccountManager::PROPERTY_ADDRESS] = $userAccount[AccountManager::PROPERTY_ADDRESS]['value'];
+        $data[AccountManager::PROPERTY_WEBSITE] = $userAccount[AccountManager::PROPERTY_WEBSITE]['value'];
+        $data[AccountManager::PROPERTY_TWITTER] = $userAccount[AccountManager::PROPERTY_TWITTER]['value'];
+        $data['groups'] = $gids;
+
+        return $data;
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoSubAdminRequired
+     * @PasswordConfirmationRequired
+     *
+     * edit users
+     *
+     * @param string $userId
+     * @param string $key
+     * @param string $value
+     * @return DataResponse
+     * @throws OCSException
+     * @throws OCSForbiddenException
+     */
+    public function editUser($userId, $key, $value) {
+        $currentLoggedInUser = $this->userSession->getUser();
+
+        $targetUser = $this->userManager->get($userId);
+        if($targetUser === null) {
+            throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
+        }
+
+        $permittedFields = [];
+        if($userId === $currentLoggedInUser->getUID()) {
+            // Editing self (display, email)
+            $permittedFields[] = 'display';
+            $permittedFields[] = AccountManager::PROPERTY_DISPLAYNAME;
+            $permittedFields[] = AccountManager::PROPERTY_EMAIL;
+            $permittedFields[] = 'password';
+            $permittedFields[] = AccountManager::PROPERTY_PHONE;
+            $permittedFields[] = AccountManager::PROPERTY_ADDRESS;
+            $permittedFields[] = AccountManager::PROPERTY_WEBSITE;
+            $permittedFields[] = AccountManager::PROPERTY_TWITTER;
+            // If admin they can edit their own quota
+            if($this->groupManager->isAdmin($currentLoggedInUser->getUID())) {
+                $permittedFields[] = 'quota';
+            }
+        } else {
+            // Check if admin / subadmin
+            $subAdminManager = $this->groupManager->getSubAdmin();
+            if($subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)
+            || $this->groupManager->isAdmin($currentLoggedInUser->getUID())) {
+                // They have permissions over the user
+                $permittedFields[] = 'display';
+                $permittedFields[] = AccountManager::PROPERTY_DISPLAYNAME;
+                $permittedFields[] = AccountManager::PROPERTY_EMAIL;
+                $permittedFields[] = 'password';
+                $permittedFields[] = AccountManager::PROPERTY_PHONE;
+                $permittedFields[] = AccountManager::PROPERTY_ADDRESS;
+                $permittedFields[] = AccountManager::PROPERTY_WEBSITE;
+                $permittedFields[] = AccountManager::PROPERTY_TWITTER;
+                $permittedFields[] = 'quota';
+            } else {
+                // No rights
+                throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
+            }
+        }
+        // Check if permitted to edit this field
+        if(!in_array($key, $permittedFields)) {
+            throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
+        }
+        // Process the edit
+        switch($key) {
+            case 'display':
+            case AccountManager::PROPERTY_DISPLAYNAME:
+                $targetUser->setDisplayName($value);
+                break;
+            case 'quota':
+                $quota = $value;
+                if($quota !== 'none' && $quota !== 'default') {
+                    if (is_numeric($quota)) {
+                        $quota = (float) $quota;
+                    } else {
+                        $quota = \OCP\Util::computerFileSize($quota);
+                    }
+                    if ($quota === false) {
+                        throw new OCSException('Invalid quota value '.$value, 103);
+                    }
+                    if($quota === 0) {
+                        $quota = 'default';
+                    }else if($quota === -1) {
+                        $quota = 'none';
+                    } else {
+                        $quota = \OCP\Util::humanFileSize($quota);
+                    }
+                }
+                $targetUser->setQuota($quota);
+                break;
+            case 'password':
+                $targetUser->setPassword($value);
+                break;
+            case AccountManager::PROPERTY_EMAIL:
+                if(filter_var($value, FILTER_VALIDATE_EMAIL)) {
+                    $targetUser->setEMailAddress($value);
+                } else {
+                    throw new OCSException('', 102);
+                }
+                break;
+            case AccountManager::PROPERTY_PHONE:
+            case AccountManager::PROPERTY_ADDRESS:
+            case AccountManager::PROPERTY_WEBSITE:
+            case AccountManager::PROPERTY_TWITTER:
+                $userAccount = $this->accountManager->getUser($targetUser);
+                if ($userAccount[$key]['value'] !== $value) {
+                    $userAccount[$key]['value'] = $value;
+                    $this->accountManager->updateUser($targetUser, $userAccount);
+                }
+                break;
+            default:
+                throw new OCSException('', 103);
+        }
+        return new DataResponse();
+    }
+
+    /**
+     * @PasswordConfirmationRequired
+     * @NoAdminRequired
+     *
+     * @param string $userId
+     * @return DataResponse
+     * @throws OCSException
+     * @throws OCSForbiddenException
+     */
+    public function deleteUser($userId) {
+        $currentLoggedInUser = $this->userSession->getUser();
+
+        $targetUser = $this->userManager->get($userId);
+
+        if($targetUser === null || $targetUser->getUID() === $currentLoggedInUser->getUID()) {
+            throw new OCSException('', 101);
+        }
+
+        // If not permitted
+        $subAdminManager = $this->groupManager->getSubAdmin();
+        if(!$this->groupManager->isAdmin($currentLoggedInUser->getUID()) && !$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)) {
+            throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
+        }
+
+        // Go ahead with the delete
+        if($targetUser->delete()) {
+            return new DataResponse();
+        } else {
+            throw new OCSException('', 101);
+        }
+    }
+
+    /**
+     * @PasswordConfirmationRequired
+     * @NoAdminRequired
+     *
+     * @param string $userId
+     * @return DataResponse
+     * @throws OCSException
+     * @throws OCSForbiddenException
+     */
+    public function disableUser($userId) {
+        return $this->setEnabled($userId, false);
+    }
+
+    /**
+     * @PasswordConfirmationRequired
+     * @NoAdminRequired
+     *
+     * @param string $userId
+     * @return DataResponse
+     * @throws OCSException
+     * @throws OCSForbiddenException
+     */
+    public function enableUser($userId) {
+        return $this->setEnabled($userId, true);
+    }
+
+    /**
+     * @param string $userId
+     * @param bool $value
+     * @return DataResponse
+     * @throws OCSException
+     * @throws OCSForbiddenException
+     */
+    private function setEnabled($userId, $value) {
+        $currentLoggedInUser = $this->userSession->getUser();
+
+        $targetUser = $this->userManager->get($userId);
+        if($targetUser === null || $targetUser->getUID() === $currentLoggedInUser->getUID()) {
+            throw new OCSException('', 101);
+        }
+
+        // If not permitted
+        $subAdminManager = $this->groupManager->getSubAdmin();
+        if(!$this->groupManager->isAdmin($currentLoggedInUser->getUID()) && !$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)) {
+            throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
+        }
+
+        // enable/disable the user now
+        $targetUser->setEnabled($value);
+        return new DataResponse();
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoSubAdminRequired
+     *
+     * @param string $userId
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function getUsersGroups($userId) {
+        $loggedInUser = $this->userSession->getUser();
+
+        $targetUser = $this->userManager->get($userId);
+        if($targetUser === null) {
+            throw new OCSException('', \OCP\API::RESPOND_NOT_FOUND);
+        }
+
+        if($targetUser->getUID() === $loggedInUser->getUID() || $this->groupManager->isAdmin($loggedInUser->getUID())) {
+            // Self lookup or admin lookup
+            return new DataResponse([
+                'groups' => $this->groupManager->getUserGroupIds($targetUser)
+            ]);
+        } else {
+            $subAdminManager = $this->groupManager->getSubAdmin();
+
+            // Looking up someone else
+            if($subAdminManager->isUserAccessible($loggedInUser, $targetUser)) {
+                // Return the group that the method caller is subadmin of for the user in question
+                /** @var IGroup[] $getSubAdminsGroups */
+                $getSubAdminsGroups = $subAdminManager->getSubAdminsGroups($loggedInUser);
+                foreach ($getSubAdminsGroups as $key => $group) {
+                    $getSubAdminsGroups[$key] = $group->getGID();
+                }
+                $groups = array_intersect(
+                    $getSubAdminsGroups,
+                    $this->groupManager->getUserGroupIds($targetUser)
+                );
+                return new DataResponse(['groups' => $groups]);
+            } else {
+                // Not permitted
+                throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
+            }
+        }
+
+    }
+
+    /**
+     * @PasswordConfirmationRequired
+     * @NoAdminRequired
+     *
+     * @param string $userId
+     * @param string $groupid
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function addToGroup($userId, $groupid = '') {
+        if($groupid === '') {
+            throw new OCSException('', 101);
+        }
+
+        $group = $this->groupManager->get($groupid);
+        $targetUser = $this->userManager->get($userId);
+        if($group === null) {
+            throw new OCSException('', 102);
+        }
+        if($targetUser === null) {
+            throw new OCSException('', 103);
+        }
+
+        // If they're not an admin, check they are a subadmin of the group in question
+        $loggedInUser = $this->userSession->getUser();
+        $subAdminManager = $this->groupManager->getSubAdmin();
+        if (!$this->groupManager->isAdmin($loggedInUser->getUID()) && !$subAdminManager->isSubAdminOfGroup($loggedInUser, $group)) {
+            throw new OCSException('', 104);
+        }
+
+        // Add user to group
+        $group->addUser($targetUser);
+        return new DataResponse();
+    }
+
+    /**
+     * @PasswordConfirmationRequired
+     * @NoAdminRequired
+     *
+     * @param string $userId
+     * @param string $groupid
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function removeFromGroup($userId, $groupid) {
+        $loggedInUser = $this->userSession->getUser();
+
+        if($groupid === null) {
+            throw new OCSException('', 101);
+        }
+
+        $group = $this->groupManager->get($groupid);
+        if($group === null) {
+            throw new OCSException('', 102);
+        }
+
+        $targetUser = $this->userManager->get($userId);
+        if($targetUser === null) {
+            throw new OCSException('', 103);
+        }
+
+        // If they're not an admin, check they are a subadmin of the group in question
+        $subAdminManager = $this->groupManager->getSubAdmin();
+        if (!$this->groupManager->isAdmin($loggedInUser->getUID()) && !$subAdminManager->isSubAdminOfGroup($loggedInUser, $group)) {
+            throw new OCSException('', 104);
+        }
+
+        // Check they aren't removing themselves from 'admin' or their 'subadmin; group
+        if ($userId === $loggedInUser->getUID()) {
+            if ($this->groupManager->isAdmin($loggedInUser->getUID())) {
+                if ($group->getGID() === 'admin') {
+                    throw new OCSException('Cannot remove yourself from the admin group', 105);
+                }
+            } else {
+                // Not an admin, so the user must be a subadmin of this group, but that is not allowed.
+                throw new OCSException('Cannot remove yourself from this group as you are a SubAdmin', 105);
+            }
+
+        } else if (!$this->groupManager->isAdmin($loggedInUser->getUID())) {
+            /** @var IGroup[] $subAdminGroups */
+            $subAdminGroups = $subAdminManager->getSubAdminsGroups($loggedInUser);
+            $subAdminGroups = array_map(function (IGroup $subAdminGroup) {
+                return $subAdminGroup->getGID();
+            }, $subAdminGroups);
+            $userGroups = $this->groupManager->getUserGroupIds($targetUser);
+            $userSubAdminGroups = array_intersect($subAdminGroups, $userGroups);
+
+            if (count($userSubAdminGroups) <= 1) {
+                // Subadmin must not be able to remove a user from all their subadmin groups.
+                throw new OCSException('Cannot remove user from this group as this is the only remaining group you are a SubAdmin of', 105);
+            }
+        }
+
+        // Remove user from group
+        $group->removeUser($targetUser);
+        return new DataResponse();
+    }
+
+    /**
+     * Creates a subadmin
+     *
+     * @PasswordConfirmationRequired
+     *
+     * @param string $userId
+     * @param string $groupid
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function addSubAdmin($userId, $groupid) {
+        $group = $this->groupManager->get($groupid);
+        $user = $this->userManager->get($userId);
+
+        // Check if the user exists
+        if($user === null) {
+            throw new OCSException('User does not exist', 101);
+        }
+        // Check if group exists
+        if($group === null) {
+            throw new OCSException('Group:'.$groupid.' does not exist',  102);
+        }
+        // Check if trying to make subadmin of admin group
+        if(strtolower($groupid) === 'admin') {
+            throw new OCSException('Cannot create subadmins for admin group', 103);
+        }
+
+        $subAdminManager = $this->groupManager->getSubAdmin();
+
+        // We cannot be subadmin twice
+        if ($subAdminManager->isSubAdminofGroup($user, $group)) {
+            return new DataResponse();
+        }
+        // Go
+        if($subAdminManager->createSubAdmin($user, $group)) {
+            return new DataResponse();
+        } else {
+            throw new OCSException('Unknown error occurred', 103);
+        }
+    }
+
+    /**
+     * Removes a subadmin from a group
+     *
+     * @PasswordConfirmationRequired
+     *
+     * @param string $userId
+     * @param string $groupid
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function removeSubAdmin($userId, $groupid) {
+        $group = $this->groupManager->get($groupid);
+        $user = $this->userManager->get($userId);
+        $subAdminManager = $this->groupManager->getSubAdmin();
+
+        // Check if the user exists
+        if($user === null) {
+            throw new OCSException('User does not exist', 101);
+        }
+        // Check if the group exists
+        if($group === null) {
+            throw new OCSException('Group does not exist', 101);
+        }
+        // Check if they are a subadmin of this said group
+        if(!$subAdminManager->isSubAdminofGroup($user, $group)) {
+            throw new OCSException('User is not a subadmin of this group', 102);
+        }
+
+        // Go
+        if($subAdminManager->deleteSubAdmin($user, $group)) {
+            return new DataResponse();
+        } else {
+            throw new OCSException('Unknown error occurred', 103);
+        }
+    }
+
+    /**
+     * Get the groups a user is a subadmin of
+     *
+     * @param string $userId
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function getUserSubAdminGroups($userId) {
+        $user = $this->userManager->get($userId);
+        // Check if the user exists
+        if($user === null) {
+            throw new OCSException('User does not exist', 101);
+        }
+
+        // Get the subadmin groups
+        $groups = $this->groupManager->getSubAdmin()->getSubAdminsGroups($user);
+        foreach ($groups as $key => $group) {
+            $groups[$key] = $group->getGID();
+        }
+
+        if(!$groups) {
+            throw new OCSException('Unknown error occurred', 102);
+        } else {
+            return new DataResponse($groups);
+        }
+    }
+
+    /**
+     * @param string $userId
+     * @return array
+     * @throws \OCP\Files\NotFoundException
+     */
+    protected function fillStorageInfo($userId) {
+        try {
+            \OC_Util::tearDownFS();
+            \OC_Util::setupFS($userId);
+            $storage = OC_Helper::getStorageInfo('/');
+            $data = [
+                'free' => $storage['free'],
+                'used' => $storage['used'],
+                'total' => $storage['total'],
+                'relative' => $storage['relative'],
+                'quota' => $storage['quota'],
+            ];
+        } catch (NotFoundException $ex) {
+            $data = [];
+        }
+        return $data;
+    }
+
+    /**
+     * @NoAdminRequired
+     * @PasswordConfirmationRequired
+     *
+     * resend welcome message
+     *
+     * @param string $userId
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function resendWelcomeMessage($userId) {
+        $currentLoggedInUser = $this->userSession->getUser();
+
+        $targetUser = $this->userManager->get($userId);
+        if($targetUser === null) {
+            throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
+        }
+
+        // Check if admin / subadmin
+        $subAdminManager = $this->groupManager->getSubAdmin();
+        if(!$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)
+            && !$this->groupManager->isAdmin($currentLoggedInUser->getUID())) {
+            // No rights
+            throw new OCSException('', \OCP\API::RESPOND_UNAUTHORISED);
+        }
+
+        $email = $targetUser->getEMailAddress();
+        if ($email === '' || $email === null) {
+            throw new OCSException('Email address not available', 101);
+        }
+        $username = $targetUser->getUID();
+        $lang = $this->config->getUserValue($username, 'core', 'lang', 'en');
+        if (!$this->l10nFactory->languageExists('settings', $lang)) {
+            $lang = 'en';
+        }
+
+        $l10n = $this->l10nFactory->get('settings', $lang);
+
+        try {
+            $this->newUserMailHelper->setL10N($l10n);
+            $emailTemplate = $this->newUserMailHelper->generateTemplate($targetUser, false);
+            $this->newUserMailHelper->sendMail($targetUser, $emailTemplate);
+        } catch(\Exception $e) {
+            $this->logger->error("Can't send new user mail to $email: " . $e->getMessage(), array('app' => 'settings'));
+            throw new OCSException('Sending email failed', 102);
+        }
+
+        return new DataResponse();
+    }
 }

apps/user_ldap/lib/Helper.php

Doc Comments +3 added lines

@@ -124,6 +124,9 @@
 		return $nextPrefix;
 	}
 
+	/**
+	 * @param string $value
+	 */
 	private function getServersConfig($value) {
 		$regex = '/' . $value . '$/S';
 

Indentation +258 added lines, -258 removed lines

@@ -34,126 +34,126 @@ 
 
 class Helper {
 
-	/** @var IConfig */
-	private $config;
-
-	/**
-	 * Helper constructor.
-	 *
-	 * @param IConfig $config
-	 */
-	public function __construct(IConfig $config) {
-		$this->config = $config;
-	}
-
-	/**
-	 * returns prefixes for each saved LDAP/AD server configuration.
-	 * @param bool $activeConfigurations optional, whether only active configuration shall be
-	 * retrieved, defaults to false
-	 * @return array with a list of the available prefixes
-	 *
-	 * Configuration prefixes are used to set up configurations for n LDAP or
-	 * AD servers. Since configuration is stored in the database, table
-	 * appconfig under appid user_ldap, the common identifiers in column
-	 * 'configkey' have a prefix. The prefix for the very first server
-	 * configuration is empty.
-	 * Configkey Examples:
-	 * Server 1: ldap_login_filter
-	 * Server 2: s1_ldap_login_filter
-	 * Server 3: s2_ldap_login_filter
-	 *
-	 * The prefix needs to be passed to the constructor of Connection class,
-	 * except the default (first) server shall be connected to.
-	 *
-	 */
-	public function getServerConfigurationPrefixes($activeConfigurations = false) {
-		$referenceConfigkey = 'ldap_configuration_active';
-
-		$keys = $this->getServersConfig($referenceConfigkey);
-
-		$prefixes = [];
-		foreach ($keys as $key) {
-			if ($activeConfigurations && $this->config->getAppValue('user_ldap', $key, '0') !== '1') {
-				continue;
-			}
-
-			$len = strlen($key) - strlen($referenceConfigkey);
-			$prefixes[] = substr($key, 0, $len);
-		}
-
-		return $prefixes;
-	}
-
-	/**
-	 *
-	 * determines the host for every configured connection
-	 * @return array an array with configprefix as keys
-	 *
-	 */
-	public function getServerConfigurationHosts() {
-		$referenceConfigkey = 'ldap_host';
-
-		$keys = $this->getServersConfig($referenceConfigkey);
-
-		$result = array();
-		foreach($keys as $key) {
-			$len = strlen($key) - strlen($referenceConfigkey);
-			$prefix = substr($key, 0, $len);
-			$result[$prefix] = $this->config->getAppValue('user_ldap', $key);
-		}
-
-		return $result;
-	}
-
-	/**
-	 * return the next available configuration prefix
-	 *
-	 * @return string
-	 */
-	public function getNextServerConfigurationPrefix() {
-		$serverConnections = $this->getServerConfigurationPrefixes();
-
-		if(count($serverConnections) === 0) {
-			return 's01';
-		}
-
-		sort($serverConnections);
-		$lastKey = array_pop($serverConnections);
-		$lastNumber = intval(str_replace('s', '', $lastKey));
-		$nextPrefix = 's' . str_pad($lastNumber + 1, 2, '0', STR_PAD_LEFT);
-		return $nextPrefix;
-	}
-
-	private function getServersConfig($value) {
-		$regex = '/' . $value . '$/S';
-
-		$keys = $this->config->getAppKeys('user_ldap');
-		$result = [];
-		foreach ($keys as $key) {
-			if (preg_match($regex, $key) === 1) {
-				$result[] = $key;
-			}
-		}
-
-		return $result;
-	}
-
-	/**
-	 * deletes a given saved LDAP/AD server configuration.
-	 * @param string $prefix the configuration prefix of the config to delete
-	 * @return bool true on success, false otherwise
-	 */
-	public function deleteServerConfiguration($prefix) {
-		if(!in_array($prefix, self::getServerConfigurationPrefixes())) {
-			return false;
-		}
-
-		$saveOtherConfigurations = '';
-		if(empty($prefix)) {
-			$saveOtherConfigurations = 'AND `configkey` NOT LIKE \'s%\'';
-		}
-
-		$query = \OCP\DB::prepare('
+    /** @var IConfig */
+    private $config;
+
+    /**
+     * Helper constructor.
+     *
+     * @param IConfig $config
+     */
+    public function __construct(IConfig $config) {
+        $this->config = $config;
+    }
+
+    /**
+     * returns prefixes for each saved LDAP/AD server configuration.
+     * @param bool $activeConfigurations optional, whether only active configuration shall be
+     * retrieved, defaults to false
+     * @return array with a list of the available prefixes
+     *
+     * Configuration prefixes are used to set up configurations for n LDAP or
+     * AD servers. Since configuration is stored in the database, table
+     * appconfig under appid user_ldap, the common identifiers in column
+     * 'configkey' have a prefix. The prefix for the very first server
+     * configuration is empty.
+     * Configkey Examples:
+     * Server 1: ldap_login_filter
+     * Server 2: s1_ldap_login_filter
+     * Server 3: s2_ldap_login_filter
+     *
+     * The prefix needs to be passed to the constructor of Connection class,
+     * except the default (first) server shall be connected to.
+     *
+     */
+    public function getServerConfigurationPrefixes($activeConfigurations = false) {
+        $referenceConfigkey = 'ldap_configuration_active';
+
+        $keys = $this->getServersConfig($referenceConfigkey);
+
+        $prefixes = [];
+        foreach ($keys as $key) {
+            if ($activeConfigurations && $this->config->getAppValue('user_ldap', $key, '0') !== '1') {
+                continue;
+            }
+
+            $len = strlen($key) - strlen($referenceConfigkey);
+            $prefixes[] = substr($key, 0, $len);
+        }
+
+        return $prefixes;
+    }
+
+    /**
+     *
+     * determines the host for every configured connection
+     * @return array an array with configprefix as keys
+     *
+     */
+    public function getServerConfigurationHosts() {
+        $referenceConfigkey = 'ldap_host';
+
+        $keys = $this->getServersConfig($referenceConfigkey);
+
+        $result = array();
+        foreach($keys as $key) {
+            $len = strlen($key) - strlen($referenceConfigkey);
+            $prefix = substr($key, 0, $len);
+            $result[$prefix] = $this->config->getAppValue('user_ldap', $key);
+        }
+
+        return $result;
+    }
+
+    /**
+     * return the next available configuration prefix
+     *
+     * @return string
+     */
+    public function getNextServerConfigurationPrefix() {
+        $serverConnections = $this->getServerConfigurationPrefixes();
+
+        if(count($serverConnections) === 0) {
+            return 's01';
+        }
+
+        sort($serverConnections);
+        $lastKey = array_pop($serverConnections);
+        $lastNumber = intval(str_replace('s', '', $lastKey));
+        $nextPrefix = 's' . str_pad($lastNumber + 1, 2, '0', STR_PAD_LEFT);
+        return $nextPrefix;
+    }
+
+    private function getServersConfig($value) {
+        $regex = '/' . $value . '$/S';
+
+        $keys = $this->config->getAppKeys('user_ldap');
+        $result = [];
+        foreach ($keys as $key) {
+            if (preg_match($regex, $key) === 1) {
+                $result[] = $key;
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * deletes a given saved LDAP/AD server configuration.
+     * @param string $prefix the configuration prefix of the config to delete
+     * @return bool true on success, false otherwise
+     */
+    public function deleteServerConfiguration($prefix) {
+        if(!in_array($prefix, self::getServerConfigurationPrefixes())) {
+            return false;
+        }
+
+        $saveOtherConfigurations = '';
+        if(empty($prefix)) {
+            $saveOtherConfigurations = 'AND `configkey` NOT LIKE \'s%\'';
+        }
+
+        $query = \OCP\DB::prepare('
 			DELETE
 			FROM `*PREFIX*appconfig`
 			WHERE `configkey` LIKE ?
@@ -161,145 +161,145 @@ 
 				AND `appid` = \'user_ldap\'
 				AND `configkey` NOT IN (\'enabled\', \'installed_version\', \'types\', \'bgjUpdateGroupsLastRun\')
 		');
-		$delRows = $query->execute(array($prefix.'%'));
-
-		if(\OCP\DB::isError($delRows)) {
-			return false;
-		}
-
-		if($delRows === 0) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * checks whether there is one or more disabled LDAP configurations
-	 * @throws \Exception
-	 * @return bool
-	 */
-	public function haveDisabledConfigurations() {
-		$all = $this->getServerConfigurationPrefixes(false);
-		$active = $this->getServerConfigurationPrefixes(true);
-
-		if(!is_array($all) || !is_array($active)) {
-			throw new \Exception('Unexpected Return Value');
-		}
-
-		return count($all) !== count($active) || count($all) === 0;
-	}
-
-	/**
-	 * extracts the domain from a given URL
-	 * @param string $url the URL
-	 * @return string|false domain as string on success, false otherwise
-	 */
-	public function getDomainFromURL($url) {
-		$uinfo = parse_url($url);
-		if(!is_array($uinfo)) {
-			return false;
-		}
-
-		$domain = false;
-		if(isset($uinfo['host'])) {
-			$domain = $uinfo['host'];
-		} else if(isset($uinfo['path'])) {
-			$domain = $uinfo['path'];
-		}
-
-		return $domain;
-	}
+        $delRows = $query->execute(array($prefix.'%'));
+
+        if(\OCP\DB::isError($delRows)) {
+            return false;
+        }
+
+        if($delRows === 0) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * checks whether there is one or more disabled LDAP configurations
+     * @throws \Exception
+     * @return bool
+     */
+    public function haveDisabledConfigurations() {
+        $all = $this->getServerConfigurationPrefixes(false);
+        $active = $this->getServerConfigurationPrefixes(true);
+
+        if(!is_array($all) || !is_array($active)) {
+            throw new \Exception('Unexpected Return Value');
+        }
+
+        return count($all) !== count($active) || count($all) === 0;
+    }
+
+    /**
+     * extracts the domain from a given URL
+     * @param string $url the URL
+     * @return string|false domain as string on success, false otherwise
+     */
+    public function getDomainFromURL($url) {
+        $uinfo = parse_url($url);
+        if(!is_array($uinfo)) {
+            return false;
+        }
+
+        $domain = false;
+        if(isset($uinfo['host'])) {
+            $domain = $uinfo['host'];
+        } else if(isset($uinfo['path'])) {
+            $domain = $uinfo['path'];
+        }
+
+        return $domain;
+    }
 	
-	/**
-	 *
-	 * Set the LDAPProvider in the config
-	 *
-	 */
-	public function setLDAPProvider() {
-		$current = \OC::$server->getConfig()->getSystemValue('ldapProviderFactory', null);
-		if(is_null($current)) {
-			\OC::$server->getConfig()->setSystemValue('ldapProviderFactory', '\\OCA\\User_LDAP\\LDAPProviderFactory');
-		}
-	}
+    /**
+     *
+     * Set the LDAPProvider in the config
+     *
+     */
+    public function setLDAPProvider() {
+        $current = \OC::$server->getConfig()->getSystemValue('ldapProviderFactory', null);
+        if(is_null($current)) {
+            \OC::$server->getConfig()->setSystemValue('ldapProviderFactory', '\\OCA\\User_LDAP\\LDAPProviderFactory');
+        }
+    }
 	
-	/**
-	 * sanitizes a DN received from the LDAP server
-	 * @param array $dn the DN in question
-	 * @return array the sanitized DN
-	 */
-	public function sanitizeDN($dn) {
-		//treating multiple base DNs
-		if(is_array($dn)) {
-			$result = array();
-			foreach($dn as $singleDN) {
-				$result[] = $this->sanitizeDN($singleDN);
-			}
-			return $result;
-		}
-
-		//OID sometimes gives back DNs with whitespace after the comma
-		// a la "uid=foo, cn=bar, dn=..." We need to tackle this!
-		$dn = preg_replace('/([^\\\]),(\s+)/u', '\1,', $dn);
-
-		//make comparisons and everything work
-		$dn = mb_strtolower($dn, 'UTF-8');
-
-		//escape DN values according to RFC 2253 – this is already done by ldap_explode_dn
-		//to use the DN in search filters, \ needs to be escaped to \5c additionally
-		//to use them in bases, we convert them back to simple backslashes in readAttribute()
-		$replacements = array(
-			'\,' => '\5c2C',
-			'\=' => '\5c3D',
-			'\+' => '\5c2B',
-			'\<' => '\5c3C',
-			'\>' => '\5c3E',
-			'\;' => '\5c3B',
-			'\"' => '\5c22',
-			'\#' => '\5c23',
-			'('  => '\28',
-			')'  => '\29',
-			'*'  => '\2A',
-		);
-		$dn = str_replace(array_keys($replacements), array_values($replacements), $dn);
-
-		return $dn;
-	}
+    /**
+     * sanitizes a DN received from the LDAP server
+     * @param array $dn the DN in question
+     * @return array the sanitized DN
+     */
+    public function sanitizeDN($dn) {
+        //treating multiple base DNs
+        if(is_array($dn)) {
+            $result = array();
+            foreach($dn as $singleDN) {
+                $result[] = $this->sanitizeDN($singleDN);
+            }
+            return $result;
+        }
+
+        //OID sometimes gives back DNs with whitespace after the comma
+        // a la "uid=foo, cn=bar, dn=..." We need to tackle this!
+        $dn = preg_replace('/([^\\\]),(\s+)/u', '\1,', $dn);
+
+        //make comparisons and everything work
+        $dn = mb_strtolower($dn, 'UTF-8');
+
+        //escape DN values according to RFC 2253 – this is already done by ldap_explode_dn
+        //to use the DN in search filters, \ needs to be escaped to \5c additionally
+        //to use them in bases, we convert them back to simple backslashes in readAttribute()
+        $replacements = array(
+            '\,' => '\5c2C',
+            '\=' => '\5c3D',
+            '\+' => '\5c2B',
+            '\<' => '\5c3C',
+            '\>' => '\5c3E',
+            '\;' => '\5c3B',
+            '\"' => '\5c22',
+            '\#' => '\5c23',
+            '('  => '\28',
+            ')'  => '\29',
+            '*'  => '\2A',
+        );
+        $dn = str_replace(array_keys($replacements), array_values($replacements), $dn);
+
+        return $dn;
+    }
 	
-	/**
-	 * converts a stored DN so it can be used as base parameter for LDAP queries, internally we store them for usage in LDAP filters
-	 * @param string $dn the DN
-	 * @return string
-	 */
-	public function DNasBaseParameter($dn) {
-		return str_ireplace('\\5c', '\\', $dn);
-	}
-
-	/**
-	 * listens to a hook thrown by server2server sharing and replaces the given
-	 * login name by a username, if it matches an LDAP user.
-	 *
-	 * @param array $param
-	 * @throws \Exception
-	 */
-	public static function loginName2UserName($param) {
-		if(!isset($param['uid'])) {
-			throw new \Exception('key uid is expected to be set in $param');
-		}
-
-		//ain't it ironic?
-		$helper = new Helper(\OC::$server->getConfig());
-
-		$configPrefixes = $helper->getServerConfigurationPrefixes(true);
-		$ldapWrapper = new LDAP();
-		$ocConfig = \OC::$server->getConfig();
-
-		$userBackend  = new User_Proxy(
-			$configPrefixes, $ldapWrapper, $ocConfig
-		);
-		$uid = $userBackend->loginName2UserName($param['uid'] );
-		if($uid !== false) {
-			$param['uid'] = $uid;
-		}
-	}
+    /**
+     * converts a stored DN so it can be used as base parameter for LDAP queries, internally we store them for usage in LDAP filters
+     * @param string $dn the DN
+     * @return string
+     */
+    public function DNasBaseParameter($dn) {
+        return str_ireplace('\\5c', '\\', $dn);
+    }
+
+    /**
+     * listens to a hook thrown by server2server sharing and replaces the given
+     * login name by a username, if it matches an LDAP user.
+     *
+     * @param array $param
+     * @throws \Exception
+     */
+    public static function loginName2UserName($param) {
+        if(!isset($param['uid'])) {
+            throw new \Exception('key uid is expected to be set in $param');
+        }
+
+        //ain't it ironic?
+        $helper = new Helper(\OC::$server->getConfig());
+
+        $configPrefixes = $helper->getServerConfigurationPrefixes(true);
+        $ldapWrapper = new LDAP();
+        $ocConfig = \OC::$server->getConfig();
+
+        $userBackend  = new User_Proxy(
+            $configPrefixes, $ldapWrapper, $ocConfig
+        );
+        $uid = $userBackend->loginName2UserName($param['uid'] );
+        if($uid !== false) {
+            $param['uid'] = $uid;
+        }
+    }
 }

Spacing +19 added lines, -19 removed lines

@@ -96,7 +96,7 @@ 
 		$keys = $this->getServersConfig($referenceConfigkey);
 
 		$result = array();
-		foreach($keys as $key) {
+		foreach ($keys as $key) {
 			$len = strlen($key) - strlen($referenceConfigkey);
 			$prefix = substr($key, 0, $len);
 			$result[$prefix] = $this->config->getAppValue('user_ldap', $key);
@@ -113,19 +113,19 @@ 
 	public function getNextServerConfigurationPrefix() {
 		$serverConnections = $this->getServerConfigurationPrefixes();
 
-		if(count($serverConnections) === 0) {
+		if (count($serverConnections) === 0) {
 			return 's01';
 		}
 
 		sort($serverConnections);
 		$lastKey = array_pop($serverConnections);
 		$lastNumber = intval(str_replace('s', '', $lastKey));
-		$nextPrefix = 's' . str_pad($lastNumber + 1, 2, '0', STR_PAD_LEFT);
+		$nextPrefix = 's'.str_pad($lastNumber + 1, 2, '0', STR_PAD_LEFT);
 		return $nextPrefix;
 	}
 
 	private function getServersConfig($value) {
-		$regex = '/' . $value . '$/S';
+		$regex = '/'.$value.'$/S';
 
 		$keys = $this->config->getAppKeys('user_ldap');
 		$result = [];
@@ -144,12 +144,12 @@ 
 	 * @return bool true on success, false otherwise
 	 */
 	public function deleteServerConfiguration($prefix) {
-		if(!in_array($prefix, self::getServerConfigurationPrefixes())) {
+		if (!in_array($prefix, self::getServerConfigurationPrefixes())) {
 			return false;
 		}
 
 		$saveOtherConfigurations = '';
-		if(empty($prefix)) {
+		if (empty($prefix)) {
 			$saveOtherConfigurations = 'AND `configkey` NOT LIKE \'s%\'';
 		}
 
@@ -163,11 +163,11 @@ 
 		');
 		$delRows = $query->execute(array($prefix.'%'));
 
-		if(\OCP\DB::isError($delRows)) {
+		if (\OCP\DB::isError($delRows)) {
 			return false;
 		}
 
-		if($delRows === 0) {
+		if ($delRows === 0) {
 			return false;
 		}
 
@@ -183,7 +183,7 @@ 
 		$all = $this->getServerConfigurationPrefixes(false);
 		$active = $this->getServerConfigurationPrefixes(true);
 
-		if(!is_array($all) || !is_array($active)) {
+		if (!is_array($all) || !is_array($active)) {
 			throw new \Exception('Unexpected Return Value');
 		}
 
@@ -197,14 +197,14 @@ 
 	 */
 	public function getDomainFromURL($url) {
 		$uinfo = parse_url($url);
-		if(!is_array($uinfo)) {
+		if (!is_array($uinfo)) {
 			return false;
 		}
 
 		$domain = false;
-		if(isset($uinfo['host'])) {
+		if (isset($uinfo['host'])) {
 			$domain = $uinfo['host'];
-		} else if(isset($uinfo['path'])) {
+		} else if (isset($uinfo['path'])) {
 			$domain = $uinfo['path'];
 		}
 
@@ -218,7 +218,7 @@ 
 	 */
 	public function setLDAPProvider() {
 		$current = \OC::$server->getConfig()->getSystemValue('ldapProviderFactory', null);
-		if(is_null($current)) {
+		if (is_null($current)) {
 			\OC::$server->getConfig()->setSystemValue('ldapProviderFactory', '\\OCA\\User_LDAP\\LDAPProviderFactory');
 		}
 	}
@@ -230,9 +230,9 @@ 
 	 */
 	public function sanitizeDN($dn) {
 		//treating multiple base DNs
-		if(is_array($dn)) {
+		if (is_array($dn)) {
 			$result = array();
-			foreach($dn as $singleDN) {
+			foreach ($dn as $singleDN) {
 				$result[] = $this->sanitizeDN($singleDN);
 			}
 			return $result;
@@ -283,7 +283,7 @@ 
 	 * @throws \Exception
 	 */
 	public static function loginName2UserName($param) {
-		if(!isset($param['uid'])) {
+		if (!isset($param['uid'])) {
 			throw new \Exception('key uid is expected to be set in $param');
 		}
 
@@ -294,11 +294,11 @@ 
 		$ldapWrapper = new LDAP();
 		$ocConfig = \OC::$server->getConfig();
 
-		$userBackend  = new User_Proxy(
+		$userBackend = new User_Proxy(
 			$configPrefixes, $ldapWrapper, $ocConfig
 		);
-		$uid = $userBackend->loginName2UserName($param['uid'] );
-		if($uid !== false) {
+		$uid = $userBackend->loginName2UserName($param['uid']);
+		if ($uid !== false) {
 			$param['uid'] = $uid;
 		}
 	}