nextcloud / server

lib/private/TagManager.php

Indentation +44 added lines, -44 removed lines

@@ -40,53 +40,53 @@
 
 class TagManager implements \OCP\ITagManager {
 
-	/**
-	 * User session
-	 *
-	 * @var \OCP\IUserSession
-	 */
-	private $userSession;
+    /**
+     * User session
+     *
+     * @var \OCP\IUserSession
+     */
+    private $userSession;
 
-	/**
-	 * TagMapper
-	 *
-	 * @var TagMapper
-	 */
-	private $mapper;
+    /**
+     * TagMapper
+     *
+     * @var TagMapper
+     */
+    private $mapper;
 
-	/**
-	* Constructor.
-	*
-	* @param TagMapper $mapper Instance of the TagMapper abstraction layer.
-	* @param \OCP\IUserSession $userSession the user session
-	*/
-	public function __construct(TagMapper $mapper, \OCP\IUserSession $userSession) {
-		$this->mapper = $mapper;
-		$this->userSession = $userSession;
+    /**
+     * Constructor.
+     *
+     * @param TagMapper $mapper Instance of the TagMapper abstraction layer.
+     * @param \OCP\IUserSession $userSession the user session
+     */
+    public function __construct(TagMapper $mapper, \OCP\IUserSession $userSession) {
+        $this->mapper = $mapper;
+        $this->userSession = $userSession;
 
-	}
+    }
 
-	/**
-	* Create a new \OCP\ITags instance and load tags from db.
-	*
-	* @see \OCP\ITags
-	* @param string $type The type identifier e.g. 'contact' or 'event'.
-	* @param array $defaultTags An array of default tags to be used if none are stored.
-	* @param boolean $includeShared Whether to include tags for items shared with this user by others.
-	* @param string $userId user for which to retrieve the tags, defaults to the currently
-	* logged in user
-	* @return \OCP\ITags
-	*/
-	public function load($type, $defaultTags = [], $includeShared = false, $userId = null) {
-		if (is_null($userId)) {
-			$user = $this->userSession->getUser();
-			if ($user === null) {
-				// nothing we can do without a user
-				return null;
-			}
-			$userId = $this->userSession->getUser()->getUId();
-		}
-		return new Tags($this->mapper, $userId, $type, $defaultTags, $includeShared);
-	}
+    /**
+     * Create a new \OCP\ITags instance and load tags from db.
+     *
+     * @see \OCP\ITags
+     * @param string $type The type identifier e.g. 'contact' or 'event'.
+     * @param array $defaultTags An array of default tags to be used if none are stored.
+     * @param boolean $includeShared Whether to include tags for items shared with this user by others.
+     * @param string $userId user for which to retrieve the tags, defaults to the currently
+     * logged in user
+     * @return \OCP\ITags
+     */
+    public function load($type, $defaultTags = [], $includeShared = false, $userId = null) {
+        if (is_null($userId)) {
+            $user = $this->userSession->getUser();
+            if ($user === null) {
+                // nothing we can do without a user
+                return null;
+            }
+            $userId = $this->userSession->getUser()->getUId();
+        }
+        return new Tags($this->mapper, $userId, $type, $defaultTags, $includeShared);
+    }
 
 }

lib/private/LargeFileHelper.php

Indentation +165 added lines, -165 removed lines

@@ -32,180 +32,180 @@
  * Helper class for large files on 32-bit platforms.
  */
 class LargeFileHelper {
-	/**
-	* pow(2, 53) as a base-10 string.
-	* @var string
-	*/
-	const POW_2_53 = '9007199254740992';
+    /**
+     * pow(2, 53) as a base-10 string.
+     * @var string
+     */
+    const POW_2_53 = '9007199254740992';
 
-	/**
-	* pow(2, 53) - 1 as a base-10 string.
-	* @var string
-	*/
-	const POW_2_53_MINUS_1 = '9007199254740991';
+    /**
+     * pow(2, 53) - 1 as a base-10 string.
+     * @var string
+     */
+    const POW_2_53_MINUS_1 = '9007199254740991';
 
-	/**
-	* @brief Checks whether our assumptions hold on the PHP platform we are on.
-	*
-	* @throws \RunTimeException if our assumptions do not hold on the current
-	*                           PHP platform.
-	*/
-	public function __construct() {
-		$pow_2_53 = (float)self::POW_2_53_MINUS_1 + 1.0;
-		if ($this->formatUnsignedInteger($pow_2_53) !== self::POW_2_53) {
-			throw new \RuntimeException(
-				'This class assumes floats to be double precision or "better".'
-			);
-		}
-	}
+    /**
+     * @brief Checks whether our assumptions hold on the PHP platform we are on.
+     *
+     * @throws \RunTimeException if our assumptions do not hold on the current
+     *                           PHP platform.
+     */
+    public function __construct() {
+        $pow_2_53 = (float)self::POW_2_53_MINUS_1 + 1.0;
+        if ($this->formatUnsignedInteger($pow_2_53) !== self::POW_2_53) {
+            throw new \RuntimeException(
+                'This class assumes floats to be double precision or "better".'
+            );
+        }
+    }
 
-	/**
-	* @brief Formats a signed integer or float as an unsigned integer base-10
-	*        string. Passed strings will be checked for being base-10.
-	*
-	* @param int|float|string $number Number containing unsigned integer data
-	*
-	* @throws \UnexpectedValueException if $number is not a float, not an int
-	*                                   and not a base-10 string.
-	*
-	* @return string Unsigned integer base-10 string
-	*/
-	public function formatUnsignedInteger($number) {
-		if (is_float($number)) {
-			// Undo the effect of the php.ini setting 'precision'.
-			return number_format($number, 0, '', '');
-		} else if (is_string($number) && ctype_digit($number)) {
-			return $number;
-		} else if (is_int($number)) {
-			// Interpret signed integer as unsigned integer.
-			return sprintf('%u', $number);
-		} else {
-			throw new \UnexpectedValueException(
-				'Expected int, float or base-10 string'
-			);
-		}
-	}
+    /**
+     * @brief Formats a signed integer or float as an unsigned integer base-10
+     *        string. Passed strings will be checked for being base-10.
+     *
+     * @param int|float|string $number Number containing unsigned integer data
+     *
+     * @throws \UnexpectedValueException if $number is not a float, not an int
+     *                                   and not a base-10 string.
+     *
+     * @return string Unsigned integer base-10 string
+     */
+    public function formatUnsignedInteger($number) {
+        if (is_float($number)) {
+            // Undo the effect of the php.ini setting 'precision'.
+            return number_format($number, 0, '', '');
+        } else if (is_string($number) && ctype_digit($number)) {
+            return $number;
+        } else if (is_int($number)) {
+            // Interpret signed integer as unsigned integer.
+            return sprintf('%u', $number);
+        } else {
+            throw new \UnexpectedValueException(
+                'Expected int, float or base-10 string'
+            );
+        }
+    }
 
-	/**
-	* @brief Tries to get the size of a file via various workarounds that
-	*        even work for large files on 32-bit platforms.
-	*
-	* @param string $filename Path to the file.
-	*
-	* @return null|int|float Number of bytes as number (float or int) or
-	*                        null on failure.
-	*/
-	public function getFileSize($filename) {
-		$fileSize = $this->getFileSizeViaCurl($filename);
-		if (!is_null($fileSize)) {
-			return $fileSize;
-		}
-		$fileSize = $this->getFileSizeViaExec($filename);
-		if (!is_null($fileSize)) {
-			return $fileSize;
-		}
-		return $this->getFileSizeNative($filename);
-	}
+    /**
+     * @brief Tries to get the size of a file via various workarounds that
+     *        even work for large files on 32-bit platforms.
+     *
+     * @param string $filename Path to the file.
+     *
+     * @return null|int|float Number of bytes as number (float or int) or
+     *                        null on failure.
+     */
+    public function getFileSize($filename) {
+        $fileSize = $this->getFileSizeViaCurl($filename);
+        if (!is_null($fileSize)) {
+            return $fileSize;
+        }
+        $fileSize = $this->getFileSizeViaExec($filename);
+        if (!is_null($fileSize)) {
+            return $fileSize;
+        }
+        return $this->getFileSizeNative($filename);
+    }
 
-	/**
-	* @brief Tries to get the size of a file via a CURL HEAD request.
-	*
-	* @param string $fileName Path to the file.
-	*
-	* @return null|int|float Number of bytes as number (float or int) or
-	*                        null on failure.
-	*/
-	public function getFileSizeViaCurl($fileName) {
-		if (\OC::$server->getIniWrapper()->getString('open_basedir') === '') {
-			$encodedFileName = rawurlencode($fileName);
-			$ch = curl_init("file:///$encodedFileName");
-			curl_setopt($ch, CURLOPT_NOBODY, true);
-			curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-			curl_setopt($ch, CURLOPT_HEADER, true);
-			$data = curl_exec($ch);
-			curl_close($ch);
-			if ($data !== false) {
-				$matches = [];
-				preg_match('/Content-Length: (\d+)/', $data, $matches);
-				if (isset($matches[1])) {
-					return 0 + $matches[1];
-				}
-			}
-		}
-		return null;
-	}
+    /**
+     * @brief Tries to get the size of a file via a CURL HEAD request.
+     *
+     * @param string $fileName Path to the file.
+     *
+     * @return null|int|float Number of bytes as number (float or int) or
+     *                        null on failure.
+     */
+    public function getFileSizeViaCurl($fileName) {
+        if (\OC::$server->getIniWrapper()->getString('open_basedir') === '') {
+            $encodedFileName = rawurlencode($fileName);
+            $ch = curl_init("file:///$encodedFileName");
+            curl_setopt($ch, CURLOPT_NOBODY, true);
+            curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+            curl_setopt($ch, CURLOPT_HEADER, true);
+            $data = curl_exec($ch);
+            curl_close($ch);
+            if ($data !== false) {
+                $matches = [];
+                preg_match('/Content-Length: (\d+)/', $data, $matches);
+                if (isset($matches[1])) {
+                    return 0 + $matches[1];
+                }
+            }
+        }
+        return null;
+    }
 
-	/**
-	* @brief Tries to get the size of a file via an exec() call.
-	*
-	* @param string $filename Path to the file.
-	*
-	* @return null|int|float Number of bytes as number (float or int) or
-	*                        null on failure.
-	*/
-	public function getFileSizeViaExec($filename) {
-		if (\OC_Helper::is_function_enabled('exec')) {
-			$os = strtolower(php_uname('s'));
-			$arg = escapeshellarg($filename);
-			$result = null;
-			if (strpos($os, 'linux') !== false) {
-				$result = $this->exec("stat -c %s $arg");
-			} else if (strpos($os, 'bsd') !== false || strpos($os, 'darwin') !== false) {
-				$result = $this->exec("stat -f %z $arg");
-			}
-			return $result;
-		}
-		return null;
-	}
+    /**
+     * @brief Tries to get the size of a file via an exec() call.
+     *
+     * @param string $filename Path to the file.
+     *
+     * @return null|int|float Number of bytes as number (float or int) or
+     *                        null on failure.
+     */
+    public function getFileSizeViaExec($filename) {
+        if (\OC_Helper::is_function_enabled('exec')) {
+            $os = strtolower(php_uname('s'));
+            $arg = escapeshellarg($filename);
+            $result = null;
+            if (strpos($os, 'linux') !== false) {
+                $result = $this->exec("stat -c %s $arg");
+            } else if (strpos($os, 'bsd') !== false || strpos($os, 'darwin') !== false) {
+                $result = $this->exec("stat -f %z $arg");
+            }
+            return $result;
+        }
+        return null;
+    }
 
-	/**
-	* @brief Gets the size of a file via a filesize() call and converts
-	*        negative signed int to positive float. As the result of filesize()
-	*        will wrap around after a file size of 2^32 bytes = 4 GiB, this
-	*        should only be used as a last resort.
-	*
-	* @param string $filename Path to the file.
-	*
-	* @return int|float Number of bytes as number (float or int).
-	*/
-	public function getFileSizeNative($filename) {
-		$result = filesize($filename);
-		if ($result < 0) {
-			// For file sizes between 2 GiB and 4 GiB, filesize() will return a
-			// negative int, as the PHP data type int is signed. Interpret the
-			// returned int as an unsigned integer and put it into a float.
-			return (float) sprintf('%u', $result);
-		}
-		return $result;
-	}
+    /**
+     * @brief Gets the size of a file via a filesize() call and converts
+     *        negative signed int to positive float. As the result of filesize()
+     *        will wrap around after a file size of 2^32 bytes = 4 GiB, this
+     *        should only be used as a last resort.
+     *
+     * @param string $filename Path to the file.
+     *
+     * @return int|float Number of bytes as number (float or int).
+     */
+    public function getFileSizeNative($filename) {
+        $result = filesize($filename);
+        if ($result < 0) {
+            // For file sizes between 2 GiB and 4 GiB, filesize() will return a
+            // negative int, as the PHP data type int is signed. Interpret the
+            // returned int as an unsigned integer and put it into a float.
+            return (float) sprintf('%u', $result);
+        }
+        return $result;
+    }
 
-	/**
-	 * Returns the current mtime for $fullPath
-	 *
-	 * @param string $fullPath
-	 * @return int
-	 */
-	public function getFileMtime($fullPath) {
-		try {
-			$result = filemtime($fullPath);
-		} catch (\Exception $e) {
-			$result =- 1;
-		}
-		if ($result < 0) {
-			if (\OC_Helper::is_function_enabled('exec')) {
-				$os = strtolower(php_uname('s'));
-				if (strpos($os, 'linux') !== false) {
-					return $this->exec('stat -c %Y ' . escapeshellarg($fullPath));
-				}
-			}
-		}
-		return $result;
+    /**
+     * Returns the current mtime for $fullPath
+     *
+     * @param string $fullPath
+     * @return int
+     */
+    public function getFileMtime($fullPath) {
+        try {
+            $result = filemtime($fullPath);
+        } catch (\Exception $e) {
+            $result =- 1;
+        }
+        if ($result < 0) {
+            if (\OC_Helper::is_function_enabled('exec')) {
+                $os = strtolower(php_uname('s'));
+                if (strpos($os, 'linux') !== false) {
+                    return $this->exec('stat -c %Y ' . escapeshellarg($fullPath));
+                }
+            }
+        }
+        return $result;
 
 
-	}
+    }
 
-	protected function exec($cmd) {
-		$result = trim(exec($cmd));
-		return ctype_digit($result) ? 0 + $result : null;
-	}
+    protected function exec($cmd) {
+        $result = trim(exec($cmd));
+        return ctype_digit($result) ? 0 + $result : null;
+    }
 }

lib/private/Route/Route.php

Indentation +115 added lines, -115 removed lines

@@ -32,128 +32,128 @@
 use Symfony\Component\Routing\Route as SymfonyRoute;
 
 class Route extends SymfonyRoute implements IRoute {
-	/**
-	 * Specify the method when this route is to be used
-	 *
-	 * @param string $method HTTP method (uppercase)
-	 * @return \OC\Route\Route
-	 */
-	public function method($method) {
-		$this->setMethods($method);
-		return $this;
-	}
+    /**
+     * Specify the method when this route is to be used
+     *
+     * @param string $method HTTP method (uppercase)
+     * @return \OC\Route\Route
+     */
+    public function method($method) {
+        $this->setMethods($method);
+        return $this;
+    }
 
-	/**
-	 * Specify POST as the method to use with this route
-	 * @return \OC\Route\Route
-	 */
-	public function post() {
-		$this->method('POST');
-		return $this;
-	}
+    /**
+     * Specify POST as the method to use with this route
+     * @return \OC\Route\Route
+     */
+    public function post() {
+        $this->method('POST');
+        return $this;
+    }
 
-	/**
-	 * Specify GET as the method to use with this route
-	 * @return \OC\Route\Route
-	 */
-	public function get() {
-		$this->method('GET');
-		return $this;
-	}
+    /**
+     * Specify GET as the method to use with this route
+     * @return \OC\Route\Route
+     */
+    public function get() {
+        $this->method('GET');
+        return $this;
+    }
 
-	/**
-	 * Specify PUT as the method to use with this route
-	 * @return \OC\Route\Route
-	 */
-	public function put() {
-		$this->method('PUT');
-		return $this;
-	}
+    /**
+     * Specify PUT as the method to use with this route
+     * @return \OC\Route\Route
+     */
+    public function put() {
+        $this->method('PUT');
+        return $this;
+    }
 
-	/**
-	 * Specify DELETE as the method to use with this route
-	 * @return \OC\Route\Route
-	 */
-	public function delete() {
-		$this->method('DELETE');
-		return $this;
-	}
+    /**
+     * Specify DELETE as the method to use with this route
+     * @return \OC\Route\Route
+     */
+    public function delete() {
+        $this->method('DELETE');
+        return $this;
+    }
 
-	/**
-	 * Specify PATCH as the method to use with this route
-	 * @return \OC\Route\Route
-	 */
-	public function patch() {
-		$this->method('PATCH');
-		return $this;
-	}
+    /**
+     * Specify PATCH as the method to use with this route
+     * @return \OC\Route\Route
+     */
+    public function patch() {
+        $this->method('PATCH');
+        return $this;
+    }
 
-	/**
-	 * Defaults to use for this route
-	 *
-	 * @param array $defaults The defaults
-	 * @return \OC\Route\Route
-	 */
-	public function defaults($defaults) {
-		$action = $this->getDefault('action');
-		$this->setDefaults($defaults);
-		if (isset($defaults['action'])) {
-			$action = $defaults['action'];
-		}
-		$this->action($action);
-		return $this;
-	}
+    /**
+     * Defaults to use for this route
+     *
+     * @param array $defaults The defaults
+     * @return \OC\Route\Route
+     */
+    public function defaults($defaults) {
+        $action = $this->getDefault('action');
+        $this->setDefaults($defaults);
+        if (isset($defaults['action'])) {
+            $action = $defaults['action'];
+        }
+        $this->action($action);
+        return $this;
+    }
 
-	/**
-	 * Requirements for this route
-	 *
-	 * @param array $requirements The requirements
-	 * @return \OC\Route\Route
-	 */
-	public function requirements($requirements) {
-		$method = $this->getMethods();
-		$this->setRequirements($requirements);
-		if (isset($requirements['_method'])) {
-			$method = $requirements['_method'];
-		}
-		if ($method) {
-			$this->method($method);
-		}
-		return $this;
-	}
+    /**
+     * Requirements for this route
+     *
+     * @param array $requirements The requirements
+     * @return \OC\Route\Route
+     */
+    public function requirements($requirements) {
+        $method = $this->getMethods();
+        $this->setRequirements($requirements);
+        if (isset($requirements['_method'])) {
+            $method = $requirements['_method'];
+        }
+        if ($method) {
+            $this->method($method);
+        }
+        return $this;
+    }
 
-	/**
-	 * The action to execute when this route matches
-	 *
-	 * @param string|callable $class the class or a callable
-	 * @param string $function the function to use with the class
-	 * @return \OC\Route\Route
-	 *
-	 * This function is called with $class set to a callable or
-	 * to the class with $function
-	 */
-	public function action($class, $function = null) {
-		$action = [$class, $function];
-		if (is_null($function)) {
-			$action = $class;
-		}
-		$this->setDefault('action', $action);
-		return $this;
-	}
+    /**
+     * The action to execute when this route matches
+     *
+     * @param string|callable $class the class or a callable
+     * @param string $function the function to use with the class
+     * @return \OC\Route\Route
+     *
+     * This function is called with $class set to a callable or
+     * to the class with $function
+     */
+    public function action($class, $function = null) {
+        $action = [$class, $function];
+        if (is_null($function)) {
+            $action = $class;
+        }
+        $this->setDefault('action', $action);
+        return $this;
+    }
 
-	/**
-	 * The action to execute when this route matches, includes a file like
-	 * it is called directly
-	 * @param string $file
-	 * @return void
-	 */
-	public function actionInclude($file) {
-		$function = function($param) use ($file) {
-			unset($param["_route"]);
-			$_GET=array_merge($_GET, $param);
-			unset($param);
-			require_once "$file";
-		} ;
-		$this->action($function);
-	}
+    /**
+     * The action to execute when this route matches, includes a file like
+     * it is called directly
+     * @param string $file
+     * @return void
+     */
+    public function actionInclude($file) {
+        $function = function($param) use ($file) {
+            unset($param["_route"]);
+            $_GET=array_merge($_GET, $param);
+            unset($param);
+            require_once "$file";
+        } ;
+        $this->action($function);
+    }
 }

lib/private/Route/CachingRouter.php

Indentation +34 added lines, -34 removed lines

@@ -27,40 +27,40 @@
 use OCP\ILogger;
 
 class CachingRouter extends Router {
-	/**
-	 * @var \OCP\ICache
-	 */
-	protected $cache;
+    /**
+     * @var \OCP\ICache
+     */
+    protected $cache;
 
-	/**
-	 * @param \OCP\ICache $cache
-	 * @param ILogger $logger
-	 */
-	public function __construct($cache, ILogger $logger) {
-		$this->cache = $cache;
-		parent::__construct($logger);
-	}
+    /**
+     * @param \OCP\ICache $cache
+     * @param ILogger $logger
+     */
+    public function __construct($cache, ILogger $logger) {
+        $this->cache = $cache;
+        parent::__construct($logger);
+    }
 
-	/**
-	 * Generate url based on $name and $parameters
-	 *
-	 * @param string $name Name of the route to use.
-	 * @param array $parameters Parameters for the route
-	 * @param bool $absolute
-	 * @return string
-	 */
-	public function generate($name, $parameters = [], $absolute = false) {
-		asort($parameters);
-		$key = $this->context->getHost() . '#' . $this->context->getBaseUrl() . $name . sha1(json_encode($parameters)) . (int)$absolute;
-		$cachedKey = $this->cache->get($key);
-		if ($cachedKey) {
-			return $cachedKey;
-		} else {
-			$url = parent::generate($name, $parameters, $absolute);
-			if ($url) {
-				$this->cache->set($key, $url, 3600);
-			}
-			return $url;
-		}
-	}
+    /**
+     * Generate url based on $name and $parameters
+     *
+     * @param string $name Name of the route to use.
+     * @param array $parameters Parameters for the route
+     * @param bool $absolute
+     * @return string
+     */
+    public function generate($name, $parameters = [], $absolute = false) {
+        asort($parameters);
+        $key = $this->context->getHost() . '#' . $this->context->getBaseUrl() . $name . sha1(json_encode($parameters)) . (int)$absolute;
+        $cachedKey = $this->cache->get($key);
+        if ($cachedKey) {
+            return $cachedKey;
+        } else {
+            $url = parent::generate($name, $parameters, $absolute);
+            if ($url) {
+                $this->cache->set($key, $url, 3600);
+            }
+            return $url;
+        }
+    }
 }

lib/private/AllConfig.php

Indentation +497 added lines, -497 removed lines

@@ -38,501 +38,501 @@
  * Class to combine all the configuration options ownCloud offers
  */
 class AllConfig implements \OCP\IConfig {
-	/** @var SystemConfig */
-	private $systemConfig;
-
-	/** @var IDBConnection */
-	private $connection;
-
-	/**
-	 * 3 dimensional array with the following structure:
-	 * [ $userId =>
-	 *     [ $appId =>
-	 *         [ $key => $value ]
-	 *     ]
-	 * ]
-	 *
-	 * database table: preferences
-	 *
-	 * methods that use this:
-	 *   - setUserValue
-	 *   - getUserValue
-	 *   - getUserKeys
-	 *   - deleteUserValue
-	 *   - deleteAllUserValues
-	 *   - deleteAppFromAllUsers
-	 *
-	 * @var CappedMemoryCache $userCache
-	 */
-	private $userCache;
-
-	/**
-	 * @param SystemConfig $systemConfig
-	 */
-	public function __construct(SystemConfig $systemConfig) {
-		$this->userCache = new CappedMemoryCache();
-		$this->systemConfig = $systemConfig;
-	}
-
-	/**
-	 * TODO - FIXME This fixes an issue with base.php that cause cyclic
-	 * dependencies, especially with autoconfig setup
-	 *
-	 * Replace this by properly injected database connection. Currently the
-	 * base.php triggers the getDatabaseConnection too early which causes in
-	 * autoconfig setup case a too early distributed database connection and
-	 * the autoconfig then needs to reinit all already initialized dependencies
-	 * that use the database connection.
-	 *
-	 * otherwise a SQLite database is created in the wrong directory
-	 * because the database connection was created with an uninitialized config
-	 */
-	private function fixDIInit() {
-		if($this->connection === null) {
-			$this->connection = \OC::$server->getDatabaseConnection();
-		}
-	}
-
-	/**
-	 * Sets and deletes system wide values
-	 *
-	 * @param array $configs Associative array with `key => value` pairs
-	 *                       If value is null, the config key will be deleted
-	 */
-	public function setSystemValues(array $configs) {
-		$this->systemConfig->setValues($configs);
-	}
-
-	/**
-	 * Sets a new system wide value
-	 *
-	 * @param string $key the key of the value, under which will be saved
-	 * @param mixed $value the value that should be stored
-	 */
-	public function setSystemValue($key, $value) {
-		$this->systemConfig->setValue($key, $value);
-	}
-
-	/**
-	 * Looks up a system wide defined value
-	 *
-	 * @param string $key the key of the value, under which it was saved
-	 * @param mixed $default the default value to be returned if the value isn't set
-	 * @return mixed the value or $default
-	 */
-	public function getSystemValue($key, $default = '') {
-		return $this->systemConfig->getValue($key, $default);
-	}
-
-	/**
-	 * Looks up a boolean system wide defined value
-	 *
-	 * @param string $key the key of the value, under which it was saved
-	 * @param mixed $default the default value to be returned if the value isn't set
-	 *
-	 * @return bool
-	 *
-	 * @since 16.0.0
-	 */
-	public function getSystemValueBool(string $key, bool $default = false): bool {
-		return (bool) $this->getSystemValue($key, $default);
-	}
-
-	/**
-	 * Looks up an integer system wide defined value
-	 *
-	 * @param string $key the key of the value, under which it was saved
-	 * @param mixed $default the default value to be returned if the value isn't set
-	 *
-	 * @return int
-	 *
-	 * @since 16.0.0
-	 */
-	public function getSystemValueInt(string $key, int $default = 0): int {
-		return (int) $this->getSystemValue($key, $default);
-	}
-
-	/**
-	 * Looks up a string system wide defined value
-	 *
-	 * @param string $key the key of the value, under which it was saved
-	 * @param mixed $default the default value to be returned if the value isn't set
-	 *
-	 * @return string
-	 *
-	 * @since 16.0.0
-	 */
-	public function getSystemValueString(string $key, string $default = ''): string {
-		return (string) $this->getSystemValue($key, $default);
-	}
-
-	/**
-	 * Looks up a system wide defined value and filters out sensitive data
-	 *
-	 * @param string $key the key of the value, under which it was saved
-	 * @param mixed $default the default value to be returned if the value isn't set
-	 * @return mixed the value or $default
-	 */
-	public function getFilteredSystemValue($key, $default = '') {
-		return $this->systemConfig->getFilteredValue($key, $default);
-	}
-
-	/**
-	 * Delete a system wide defined value
-	 *
-	 * @param string $key the key of the value, under which it was saved
-	 */
-	public function deleteSystemValue($key) {
-		$this->systemConfig->deleteValue($key);
-	}
-
-	/**
-	 * Get all keys stored for an app
-	 *
-	 * @param string $appName the appName that we stored the value under
-	 * @return string[] the keys stored for the app
-	 */
-	public function getAppKeys($appName) {
-		return \OC::$server->query(\OC\AppConfig::class)->getKeys($appName);
-	}
-
-	/**
-	 * Writes a new app wide value
-	 *
-	 * @param string $appName the appName that we want to store the value under
-	 * @param string $key the key of the value, under which will be saved
-	 * @param string|float|int $value the value that should be stored
-	 */
-	public function setAppValue($appName, $key, $value) {
-		\OC::$server->query(\OC\AppConfig::class)->setValue($appName, $key, $value);
-	}
-
-	/**
-	 * Looks up an app wide defined value
-	 *
-	 * @param string $appName the appName that we stored the value under
-	 * @param string $key the key of the value, under which it was saved
-	 * @param string $default the default value to be returned if the value isn't set
-	 * @return string the saved value
-	 */
-	public function getAppValue($appName, $key, $default = '') {
-		return \OC::$server->query(\OC\AppConfig::class)->getValue($appName, $key, $default);
-	}
-
-	/**
-	 * Delete an app wide defined value
-	 *
-	 * @param string $appName the appName that we stored the value under
-	 * @param string $key the key of the value, under which it was saved
-	 */
-	public function deleteAppValue($appName, $key) {
-		\OC::$server->query(\OC\AppConfig::class)->deleteKey($appName, $key);
-	}
-
-	/**
-	 * Removes all keys in appconfig belonging to the app
-	 *
-	 * @param string $appName the appName the configs are stored under
-	 */
-	public function deleteAppValues($appName) {
-		\OC::$server->query(\OC\AppConfig::class)->deleteApp($appName);
-	}
-
-
-	/**
-	 * Set a user defined value
-	 *
-	 * @param string $userId the userId of the user that we want to store the value under
-	 * @param string $appName the appName that we want to store the value under
-	 * @param string $key the key under which the value is being stored
-	 * @param string|float|int $value the value that you want to store
-	 * @param string $preCondition only update if the config value was previously the value passed as $preCondition
-	 * @throws \OCP\PreConditionNotMetException if a precondition is specified and is not met
-	 * @throws \UnexpectedValueException when trying to store an unexpected value
-	 */
-	public function setUserValue($userId, $appName, $key, $value, $preCondition = null) {
-		if (!is_int($value) && !is_float($value) && !is_string($value)) {
-			throw new \UnexpectedValueException('Only integers, floats and strings are allowed as value');
-		}
-
-		// TODO - FIXME
-		$this->fixDIInit();
-
-		$prevValue = $this->getUserValue($userId, $appName, $key, null);
-
-		if ($prevValue !== null) {
-			if ($prevValue === (string)$value) {
-				return;
-			} else if ($preCondition !== null && $prevValue !== (string)$preCondition) {
-				throw new PreConditionNotMetException();
-			} else {
-				$qb = $this->connection->getQueryBuilder();
-				$qb->update('preferences')
-					->set('configvalue', $qb->createNamedParameter($value))
-					->where($qb->expr()->eq('userid', $qb->createNamedParameter($userId)))
-					->andWhere($qb->expr()->eq('appid', $qb->createNamedParameter($appName)))
-					->andWhere($qb->expr()->eq('configkey', $qb->createNamedParameter($key)));
-				$qb->execute();
-
-				$this->userCache[$userId][$appName][$key] = (string)$value;
-				return;
-			}
-		}
-
-		$preconditionArray = [];
-		if (isset($preCondition)) {
-			$preconditionArray = [
-				'configvalue' => $preCondition,
-			];
-		}
-
-		$this->connection->setValues('preferences', [
-			'userid' => $userId,
-			'appid' => $appName,
-			'configkey' => $key,
-		], [
-			'configvalue' => $value,
-		], $preconditionArray);
-
-		// only add to the cache if we already loaded data for the user
-		if (isset($this->userCache[$userId])) {
-			if (!isset($this->userCache[$userId][$appName])) {
-				$this->userCache[$userId][$appName] = [];
-			}
-			$this->userCache[$userId][$appName][$key] = (string)$value;
-		}
-	}
-
-	/**
-	 * Getting a user defined value
-	 *
-	 * @param string $userId the userId of the user that we want to store the value under
-	 * @param string $appName the appName that we stored the value under
-	 * @param string $key the key under which the value is being stored
-	 * @param mixed $default the default value to be returned if the value isn't set
-	 * @return string
-	 */
-	public function getUserValue($userId, $appName, $key, $default = '') {
-		$data = $this->getUserValues($userId);
-		if (isset($data[$appName]) and isset($data[$appName][$key])) {
-			return $data[$appName][$key];
-		} else {
-			return $default;
-		}
-	}
-
-	/**
-	 * Get the keys of all stored by an app for the user
-	 *
-	 * @param string $userId the userId of the user that we want to store the value under
-	 * @param string $appName the appName that we stored the value under
-	 * @return string[]
-	 */
-	public function getUserKeys($userId, $appName) {
-		$data = $this->getUserValues($userId);
-		if (isset($data[$appName])) {
-			return array_keys($data[$appName]);
-		} else {
-			return [];
-		}
-	}
-
-	/**
-	 * Delete a user value
-	 *
-	 * @param string $userId the userId of the user that we want to store the value under
-	 * @param string $appName the appName that we stored the value under
-	 * @param string $key the key under which the value is being stored
-	 */
-	public function deleteUserValue($userId, $appName, $key) {
-		// TODO - FIXME
-		$this->fixDIInit();
-
-		$sql  = 'DELETE FROM `*PREFIX*preferences` '.
-				'WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?';
-		$this->connection->executeUpdate($sql, [$userId, $appName, $key]);
-
-		if (isset($this->userCache[$userId]) and isset($this->userCache[$userId][$appName])) {
-			unset($this->userCache[$userId][$appName][$key]);
-		}
-	}
-
-	/**
-	 * Delete all user values
-	 *
-	 * @param string $userId the userId of the user that we want to remove all values from
-	 */
-	public function deleteAllUserValues($userId) {
-		// TODO - FIXME
-		$this->fixDIInit();
-
-		$sql  = 'DELETE FROM `*PREFIX*preferences` '.
-			'WHERE `userid` = ?';
-		$this->connection->executeUpdate($sql, [$userId]);
-
-		unset($this->userCache[$userId]);
-	}
-
-	/**
-	 * Delete all user related values of one app
-	 *
-	 * @param string $appName the appName of the app that we want to remove all values from
-	 */
-	public function deleteAppFromAllUsers($appName) {
-		// TODO - FIXME
-		$this->fixDIInit();
-
-		$sql  = 'DELETE FROM `*PREFIX*preferences` '.
-				'WHERE `appid` = ?';
-		$this->connection->executeUpdate($sql, [$appName]);
-
-		foreach ($this->userCache as &$userCache) {
-			unset($userCache[$appName]);
-		}
-	}
-
-	/**
-	 * Returns all user configs sorted by app of one user
-	 *
-	 * @param string $userId the user ID to get the app configs from
-	 * @return array[] - 2 dimensional array with the following structure:
-	 *     [ $appId =>
-	 *         [ $key => $value ]
-	 *     ]
-	 */
-	private function getUserValues($userId) {
-		if (isset($this->userCache[$userId])) {
-			return $this->userCache[$userId];
-		}
-		if ($userId === null || $userId === '') {
-			$this->userCache[$userId]=[];
-			return $this->userCache[$userId];
-		}
-
-		// TODO - FIXME
-		$this->fixDIInit();
-
-		$data = [];
-		$query = 'SELECT `appid`, `configkey`, `configvalue` FROM `*PREFIX*preferences` WHERE `userid` = ?';
-		$result = $this->connection->executeQuery($query, [$userId]);
-		while ($row = $result->fetch()) {
-			$appId = $row['appid'];
-			if (!isset($data[$appId])) {
-				$data[$appId] = [];
-			}
-			$data[$appId][$row['configkey']] = $row['configvalue'];
-		}
-		$this->userCache[$userId] = $data;
-		return $data;
-	}
-
-	/**
-	 * Fetches a mapped list of userId -> value, for a specified app and key and a list of user IDs.
-	 *
-	 * @param string $appName app to get the value for
-	 * @param string $key the key to get the value for
-	 * @param array $userIds the user IDs to fetch the values for
-	 * @return array Mapped values: userId => value
-	 */
-	public function getUserValueForUsers($appName, $key, $userIds) {
-		// TODO - FIXME
-		$this->fixDIInit();
-
-		if (empty($userIds) || !is_array($userIds)) {
-			return [];
-		}
-
-		$chunkedUsers = array_chunk($userIds, 50, true);
-		$placeholders50 = implode(',', array_fill(0, 50, '?'));
-
-		$userValues = [];
-		foreach ($chunkedUsers as $chunk) {
-			$queryParams = $chunk;
-			// create [$app, $key, $chunkedUsers]
-			array_unshift($queryParams, $key);
-			array_unshift($queryParams, $appName);
-
-			$placeholders = (count($chunk) === 50) ? $placeholders50 :  implode(',', array_fill(0, count($chunk), '?'));
-
-			$query    = 'SELECT `userid`, `configvalue` ' .
-						'FROM `*PREFIX*preferences` ' .
-						'WHERE `appid` = ? AND `configkey` = ? ' .
-						'AND `userid` IN (' . $placeholders . ')';
-			$result = $this->connection->executeQuery($query, $queryParams);
-
-			while ($row = $result->fetch()) {
-				$userValues[$row['userid']] = $row['configvalue'];
-			}
-		}
-
-		return $userValues;
-	}
-
-	/**
-	 * Determines the users that have the given value set for a specific app-key-pair
-	 *
-	 * @param string $appName the app to get the user for
-	 * @param string $key the key to get the user for
-	 * @param string $value the value to get the user for
-	 * @return array of user IDs
-	 */
-	public function getUsersForUserValue($appName, $key, $value) {
-		// TODO - FIXME
-		$this->fixDIInit();
-
-		$sql  = 'SELECT `userid` FROM `*PREFIX*preferences` ' .
-				'WHERE `appid` = ? AND `configkey` = ? ';
-
-		if($this->getSystemValue('dbtype', 'sqlite') === 'oci') {
-			//oracle hack: need to explicitly cast CLOB to CHAR for comparison
-			$sql .= 'AND to_char(`configvalue`) = ?';
-		} else {
-			$sql .= 'AND `configvalue` = ?';
-		}
-
-		$result = $this->connection->executeQuery($sql, [$appName, $key, $value]);
-
-		$userIDs = [];
-		while ($row = $result->fetch()) {
-			$userIDs[] = $row['userid'];
-		}
-
-		return $userIDs;
-	}
-
-	/**
-	 * Determines the users that have the given value set for a specific app-key-pair
-	 *
-	 * @param string $appName the app to get the user for
-	 * @param string $key the key to get the user for
-	 * @param string $value the value to get the user for
-	 * @return array of user IDs
-	 */
-	public function getUsersForUserValueCaseInsensitive($appName, $key, $value) {
-		// TODO - FIXME
-		$this->fixDIInit();
-
-		$sql  = 'SELECT `userid` FROM `*PREFIX*preferences` ' .
-			'WHERE `appid` = ? AND `configkey` = ? ';
-
-		if($this->getSystemValue('dbtype', 'sqlite') === 'oci') {
-			//oracle hack: need to explicitly cast CLOB to CHAR for comparison
-			$sql .= 'AND LOWER(to_char(`configvalue`)) = LOWER(?)';
-		} else {
-			$sql .= 'AND LOWER(`configvalue`) = LOWER(?)';
-		}
-
-		$result = $this->connection->executeQuery($sql, [$appName, $key, $value]);
-
-		$userIDs = [];
-		while ($row = $result->fetch()) {
-			$userIDs[] = $row['userid'];
-		}
-
-		return $userIDs;
-	}
-
-	public function getSystemConfig() {
-		return $this->systemConfig;
-	}
+    /** @var SystemConfig */
+    private $systemConfig;
+
+    /** @var IDBConnection */
+    private $connection;
+
+    /**
+     * 3 dimensional array with the following structure:
+     * [ $userId =>
+     *     [ $appId =>
+     *         [ $key => $value ]
+     *     ]
+     * ]
+     *
+     * database table: preferences
+     *
+     * methods that use this:
+     *   - setUserValue
+     *   - getUserValue
+     *   - getUserKeys
+     *   - deleteUserValue
+     *   - deleteAllUserValues
+     *   - deleteAppFromAllUsers
+     *
+     * @var CappedMemoryCache $userCache
+     */
+    private $userCache;
+
+    /**
+     * @param SystemConfig $systemConfig
+     */
+    public function __construct(SystemConfig $systemConfig) {
+        $this->userCache = new CappedMemoryCache();
+        $this->systemConfig = $systemConfig;
+    }
+
+    /**
+     * TODO - FIXME This fixes an issue with base.php that cause cyclic
+     * dependencies, especially with autoconfig setup
+     *
+     * Replace this by properly injected database connection. Currently the
+     * base.php triggers the getDatabaseConnection too early which causes in
+     * autoconfig setup case a too early distributed database connection and
+     * the autoconfig then needs to reinit all already initialized dependencies
+     * that use the database connection.
+     *
+     * otherwise a SQLite database is created in the wrong directory
+     * because the database connection was created with an uninitialized config
+     */
+    private function fixDIInit() {
+        if($this->connection === null) {
+            $this->connection = \OC::$server->getDatabaseConnection();
+        }
+    }
+
+    /**
+     * Sets and deletes system wide values
+     *
+     * @param array $configs Associative array with `key => value` pairs
+     *                       If value is null, the config key will be deleted
+     */
+    public function setSystemValues(array $configs) {
+        $this->systemConfig->setValues($configs);
+    }
+
+    /**
+     * Sets a new system wide value
+     *
+     * @param string $key the key of the value, under which will be saved
+     * @param mixed $value the value that should be stored
+     */
+    public function setSystemValue($key, $value) {
+        $this->systemConfig->setValue($key, $value);
+    }
+
+    /**
+     * Looks up a system wide defined value
+     *
+     * @param string $key the key of the value, under which it was saved
+     * @param mixed $default the default value to be returned if the value isn't set
+     * @return mixed the value or $default
+     */
+    public function getSystemValue($key, $default = '') {
+        return $this->systemConfig->getValue($key, $default);
+    }
+
+    /**
+     * Looks up a boolean system wide defined value
+     *
+     * @param string $key the key of the value, under which it was saved
+     * @param mixed $default the default value to be returned if the value isn't set
+     *
+     * @return bool
+     *
+     * @since 16.0.0
+     */
+    public function getSystemValueBool(string $key, bool $default = false): bool {
+        return (bool) $this->getSystemValue($key, $default);
+    }
+
+    /**
+     * Looks up an integer system wide defined value
+     *
+     * @param string $key the key of the value, under which it was saved
+     * @param mixed $default the default value to be returned if the value isn't set
+     *
+     * @return int
+     *
+     * @since 16.0.0
+     */
+    public function getSystemValueInt(string $key, int $default = 0): int {
+        return (int) $this->getSystemValue($key, $default);
+    }
+
+    /**
+     * Looks up a string system wide defined value
+     *
+     * @param string $key the key of the value, under which it was saved
+     * @param mixed $default the default value to be returned if the value isn't set
+     *
+     * @return string
+     *
+     * @since 16.0.0
+     */
+    public function getSystemValueString(string $key, string $default = ''): string {
+        return (string) $this->getSystemValue($key, $default);
+    }
+
+    /**
+     * Looks up a system wide defined value and filters out sensitive data
+     *
+     * @param string $key the key of the value, under which it was saved
+     * @param mixed $default the default value to be returned if the value isn't set
+     * @return mixed the value or $default
+     */
+    public function getFilteredSystemValue($key, $default = '') {
+        return $this->systemConfig->getFilteredValue($key, $default);
+    }
+
+    /**
+     * Delete a system wide defined value
+     *
+     * @param string $key the key of the value, under which it was saved
+     */
+    public function deleteSystemValue($key) {
+        $this->systemConfig->deleteValue($key);
+    }
+
+    /**
+     * Get all keys stored for an app
+     *
+     * @param string $appName the appName that we stored the value under
+     * @return string[] the keys stored for the app
+     */
+    public function getAppKeys($appName) {
+        return \OC::$server->query(\OC\AppConfig::class)->getKeys($appName);
+    }
+
+    /**
+     * Writes a new app wide value
+     *
+     * @param string $appName the appName that we want to store the value under
+     * @param string $key the key of the value, under which will be saved
+     * @param string|float|int $value the value that should be stored
+     */
+    public function setAppValue($appName, $key, $value) {
+        \OC::$server->query(\OC\AppConfig::class)->setValue($appName, $key, $value);
+    }
+
+    /**
+     * Looks up an app wide defined value
+     *
+     * @param string $appName the appName that we stored the value under
+     * @param string $key the key of the value, under which it was saved
+     * @param string $default the default value to be returned if the value isn't set
+     * @return string the saved value
+     */
+    public function getAppValue($appName, $key, $default = '') {
+        return \OC::$server->query(\OC\AppConfig::class)->getValue($appName, $key, $default);
+    }
+
+    /**
+     * Delete an app wide defined value
+     *
+     * @param string $appName the appName that we stored the value under
+     * @param string $key the key of the value, under which it was saved
+     */
+    public function deleteAppValue($appName, $key) {
+        \OC::$server->query(\OC\AppConfig::class)->deleteKey($appName, $key);
+    }
+
+    /**
+     * Removes all keys in appconfig belonging to the app
+     *
+     * @param string $appName the appName the configs are stored under
+     */
+    public function deleteAppValues($appName) {
+        \OC::$server->query(\OC\AppConfig::class)->deleteApp($appName);
+    }
+
+
+    /**
+     * Set a user defined value
+     *
+     * @param string $userId the userId of the user that we want to store the value under
+     * @param string $appName the appName that we want to store the value under
+     * @param string $key the key under which the value is being stored
+     * @param string|float|int $value the value that you want to store
+     * @param string $preCondition only update if the config value was previously the value passed as $preCondition
+     * @throws \OCP\PreConditionNotMetException if a precondition is specified and is not met
+     * @throws \UnexpectedValueException when trying to store an unexpected value
+     */
+    public function setUserValue($userId, $appName, $key, $value, $preCondition = null) {
+        if (!is_int($value) && !is_float($value) && !is_string($value)) {
+            throw new \UnexpectedValueException('Only integers, floats and strings are allowed as value');
+        }
+
+        // TODO - FIXME
+        $this->fixDIInit();
+
+        $prevValue = $this->getUserValue($userId, $appName, $key, null);
+
+        if ($prevValue !== null) {
+            if ($prevValue === (string)$value) {
+                return;
+            } else if ($preCondition !== null && $prevValue !== (string)$preCondition) {
+                throw new PreConditionNotMetException();
+            } else {
+                $qb = $this->connection->getQueryBuilder();
+                $qb->update('preferences')
+                    ->set('configvalue', $qb->createNamedParameter($value))
+                    ->where($qb->expr()->eq('userid', $qb->createNamedParameter($userId)))
+                    ->andWhere($qb->expr()->eq('appid', $qb->createNamedParameter($appName)))
+                    ->andWhere($qb->expr()->eq('configkey', $qb->createNamedParameter($key)));
+                $qb->execute();
+
+                $this->userCache[$userId][$appName][$key] = (string)$value;
+                return;
+            }
+        }
+
+        $preconditionArray = [];
+        if (isset($preCondition)) {
+            $preconditionArray = [
+                'configvalue' => $preCondition,
+            ];
+        }
+
+        $this->connection->setValues('preferences', [
+            'userid' => $userId,
+            'appid' => $appName,
+            'configkey' => $key,
+        ], [
+            'configvalue' => $value,
+        ], $preconditionArray);
+
+        // only add to the cache if we already loaded data for the user
+        if (isset($this->userCache[$userId])) {
+            if (!isset($this->userCache[$userId][$appName])) {
+                $this->userCache[$userId][$appName] = [];
+            }
+            $this->userCache[$userId][$appName][$key] = (string)$value;
+        }
+    }
+
+    /**
+     * Getting a user defined value
+     *
+     * @param string $userId the userId of the user that we want to store the value under
+     * @param string $appName the appName that we stored the value under
+     * @param string $key the key under which the value is being stored
+     * @param mixed $default the default value to be returned if the value isn't set
+     * @return string
+     */
+    public function getUserValue($userId, $appName, $key, $default = '') {
+        $data = $this->getUserValues($userId);
+        if (isset($data[$appName]) and isset($data[$appName][$key])) {
+            return $data[$appName][$key];
+        } else {
+            return $default;
+        }
+    }
+
+    /**
+     * Get the keys of all stored by an app for the user
+     *
+     * @param string $userId the userId of the user that we want to store the value under
+     * @param string $appName the appName that we stored the value under
+     * @return string[]
+     */
+    public function getUserKeys($userId, $appName) {
+        $data = $this->getUserValues($userId);
+        if (isset($data[$appName])) {
+            return array_keys($data[$appName]);
+        } else {
+            return [];
+        }
+    }
+
+    /**
+     * Delete a user value
+     *
+     * @param string $userId the userId of the user that we want to store the value under
+     * @param string $appName the appName that we stored the value under
+     * @param string $key the key under which the value is being stored
+     */
+    public function deleteUserValue($userId, $appName, $key) {
+        // TODO - FIXME
+        $this->fixDIInit();
+
+        $sql  = 'DELETE FROM `*PREFIX*preferences` '.
+                'WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?';
+        $this->connection->executeUpdate($sql, [$userId, $appName, $key]);
+
+        if (isset($this->userCache[$userId]) and isset($this->userCache[$userId][$appName])) {
+            unset($this->userCache[$userId][$appName][$key]);
+        }
+    }
+
+    /**
+     * Delete all user values
+     *
+     * @param string $userId the userId of the user that we want to remove all values from
+     */
+    public function deleteAllUserValues($userId) {
+        // TODO - FIXME
+        $this->fixDIInit();
+
+        $sql  = 'DELETE FROM `*PREFIX*preferences` '.
+            'WHERE `userid` = ?';
+        $this->connection->executeUpdate($sql, [$userId]);
+
+        unset($this->userCache[$userId]);
+    }
+
+    /**
+     * Delete all user related values of one app
+     *
+     * @param string $appName the appName of the app that we want to remove all values from
+     */
+    public function deleteAppFromAllUsers($appName) {
+        // TODO - FIXME
+        $this->fixDIInit();
+
+        $sql  = 'DELETE FROM `*PREFIX*preferences` '.
+                'WHERE `appid` = ?';
+        $this->connection->executeUpdate($sql, [$appName]);
+
+        foreach ($this->userCache as &$userCache) {
+            unset($userCache[$appName]);
+        }
+    }
+
+    /**
+     * Returns all user configs sorted by app of one user
+     *
+     * @param string $userId the user ID to get the app configs from
+     * @return array[] - 2 dimensional array with the following structure:
+     *     [ $appId =>
+     *         [ $key => $value ]
+     *     ]
+     */
+    private function getUserValues($userId) {
+        if (isset($this->userCache[$userId])) {
+            return $this->userCache[$userId];
+        }
+        if ($userId === null || $userId === '') {
+            $this->userCache[$userId]=[];
+            return $this->userCache[$userId];
+        }
+
+        // TODO - FIXME
+        $this->fixDIInit();
+
+        $data = [];
+        $query = 'SELECT `appid`, `configkey`, `configvalue` FROM `*PREFIX*preferences` WHERE `userid` = ?';
+        $result = $this->connection->executeQuery($query, [$userId]);
+        while ($row = $result->fetch()) {
+            $appId = $row['appid'];
+            if (!isset($data[$appId])) {
+                $data[$appId] = [];
+            }
+            $data[$appId][$row['configkey']] = $row['configvalue'];
+        }
+        $this->userCache[$userId] = $data;
+        return $data;
+    }
+
+    /**
+     * Fetches a mapped list of userId -> value, for a specified app and key and a list of user IDs.
+     *
+     * @param string $appName app to get the value for
+     * @param string $key the key to get the value for
+     * @param array $userIds the user IDs to fetch the values for
+     * @return array Mapped values: userId => value
+     */
+    public function getUserValueForUsers($appName, $key, $userIds) {
+        // TODO - FIXME
+        $this->fixDIInit();
+
+        if (empty($userIds) || !is_array($userIds)) {
+            return [];
+        }
+
+        $chunkedUsers = array_chunk($userIds, 50, true);
+        $placeholders50 = implode(',', array_fill(0, 50, '?'));
+
+        $userValues = [];
+        foreach ($chunkedUsers as $chunk) {
+            $queryParams = $chunk;
+            // create [$app, $key, $chunkedUsers]
+            array_unshift($queryParams, $key);
+            array_unshift($queryParams, $appName);
+
+            $placeholders = (count($chunk) === 50) ? $placeholders50 :  implode(',', array_fill(0, count($chunk), '?'));
+
+            $query    = 'SELECT `userid`, `configvalue` ' .
+                        'FROM `*PREFIX*preferences` ' .
+                        'WHERE `appid` = ? AND `configkey` = ? ' .
+                        'AND `userid` IN (' . $placeholders . ')';
+            $result = $this->connection->executeQuery($query, $queryParams);
+
+            while ($row = $result->fetch()) {
+                $userValues[$row['userid']] = $row['configvalue'];
+            }
+        }
+
+        return $userValues;
+    }
+
+    /**
+     * Determines the users that have the given value set for a specific app-key-pair
+     *
+     * @param string $appName the app to get the user for
+     * @param string $key the key to get the user for
+     * @param string $value the value to get the user for
+     * @return array of user IDs
+     */
+    public function getUsersForUserValue($appName, $key, $value) {
+        // TODO - FIXME
+        $this->fixDIInit();
+
+        $sql  = 'SELECT `userid` FROM `*PREFIX*preferences` ' .
+                'WHERE `appid` = ? AND `configkey` = ? ';
+
+        if($this->getSystemValue('dbtype', 'sqlite') === 'oci') {
+            //oracle hack: need to explicitly cast CLOB to CHAR for comparison
+            $sql .= 'AND to_char(`configvalue`) = ?';
+        } else {
+            $sql .= 'AND `configvalue` = ?';
+        }
+
+        $result = $this->connection->executeQuery($sql, [$appName, $key, $value]);
+
+        $userIDs = [];
+        while ($row = $result->fetch()) {
+            $userIDs[] = $row['userid'];
+        }
+
+        return $userIDs;
+    }
+
+    /**
+     * Determines the users that have the given value set for a specific app-key-pair
+     *
+     * @param string $appName the app to get the user for
+     * @param string $key the key to get the user for
+     * @param string $value the value to get the user for
+     * @return array of user IDs
+     */
+    public function getUsersForUserValueCaseInsensitive($appName, $key, $value) {
+        // TODO - FIXME
+        $this->fixDIInit();
+
+        $sql  = 'SELECT `userid` FROM `*PREFIX*preferences` ' .
+            'WHERE `appid` = ? AND `configkey` = ? ';
+
+        if($this->getSystemValue('dbtype', 'sqlite') === 'oci') {
+            //oracle hack: need to explicitly cast CLOB to CHAR for comparison
+            $sql .= 'AND LOWER(to_char(`configvalue`)) = LOWER(?)';
+        } else {
+            $sql .= 'AND LOWER(`configvalue`) = LOWER(?)';
+        }
+
+        $result = $this->connection->executeQuery($sql, [$appName, $key, $value]);
+
+        $userIDs = [];
+        while ($row = $result->fetch()) {
+            $userIDs[] = $row['userid'];
+        }
+
+        return $userIDs;
+    }
+
+    public function getSystemConfig() {
+        return $this->systemConfig;
+    }
 }

lib/private/Repair/RepairMimeTypes.php

Indentation +174 added lines, -174 removed lines

@@ -36,196 +36,196 @@
 use OCP\Migration\IRepairStep;
 
 class RepairMimeTypes implements IRepairStep {
-	/**
-	 * @var \OCP\IConfig
-	 */
-	protected $config;
-
-	/**
-	 * @var int
-	 */
-	protected $folderMimeTypeId;
-
-	/**
-	 * @param \OCP\IConfig $config
-	 */
-	public function __construct($config) {
-		$this->config = $config;
-	}
-
-	public function getName() {
-		return 'Repair mime types';
-	}
-
-	private static function existsStmt() {
-		return \OC_DB::prepare('
+    /**
+     * @var \OCP\IConfig
+     */
+    protected $config;
+
+    /**
+     * @var int
+     */
+    protected $folderMimeTypeId;
+
+    /**
+     * @param \OCP\IConfig $config
+     */
+    public function __construct($config) {
+        $this->config = $config;
+    }
+
+    public function getName() {
+        return 'Repair mime types';
+    }
+
+    private static function existsStmt() {
+        return \OC_DB::prepare('
 			SELECT count(`mimetype`)
 			FROM   `*PREFIX*mimetypes`
 			WHERE  `mimetype` = ?
 		');
-	}
+    }
 
-	private static function getIdStmt() {
-		return \OC_DB::prepare('
+    private static function getIdStmt() {
+        return \OC_DB::prepare('
 			SELECT `id`
 			FROM   `*PREFIX*mimetypes`
 			WHERE  `mimetype` = ?
 		');
-	}
+    }
 
-	private static function insertStmt() {
-		return \OC_DB::prepare('
+    private static function insertStmt() {
+        return \OC_DB::prepare('
 			INSERT INTO `*PREFIX*mimetypes` ( `mimetype` )
 			VALUES ( ? )
 		');
-	}
+    }
 
-	private static function updateByNameStmt() {
-		return \OC_DB::prepare('
+    private static function updateByNameStmt() {
+        return \OC_DB::prepare('
 			UPDATE `*PREFIX*filecache`
 			SET `mimetype` = ?
 			WHERE `mimetype` <> ? AND `mimetype` <> ? AND `name` ILIKE ?
 		');
-	}
-
-	private function updateMimetypes($updatedMimetypes) {
-		if (empty($this->folderMimeTypeId)) {
-			$result = \OC_DB::executeAudited(self::getIdStmt(), ['httpd/unix-directory']);
-			$this->folderMimeTypeId = (int)$result->fetchOne();
-		}
-
-		$count = 0;
-		foreach ($updatedMimetypes as $extension => $mimetype) {
-			$result = \OC_DB::executeAudited(self::existsStmt(), [$mimetype]);
-			$exists = $result->fetchOne();
-
-			if (!$exists) {
-				// insert mimetype
-				\OC_DB::executeAudited(self::insertStmt(), [$mimetype]);
-			}
-
-			// get target mimetype id
-			$result = \OC_DB::executeAudited(self::getIdStmt(), [$mimetype]);
-			$mimetypeId = $result->fetchOne();
-
-			// change mimetype for files with x extension
-			$count += \OC_DB::executeAudited(self::updateByNameStmt(), [$mimetypeId, $this->folderMimeTypeId, $mimetypeId, '%.' . $extension]);
-		}
-
-		return $count;
-	}
-
-	private function introduceImageTypes() {
-		$updatedMimetypes = [
-			'jp2' => 'image/jp2',
-			'webp' => 'image/webp',
-		];
-
-		return $this->updateMimetypes($updatedMimetypes);
-	}
-
-	private function introduceWindowsProgramTypes() {
-		$updatedMimetypes = [
-			'htaccess' => 'text/plain',
-			'bat' => 'application/x-msdos-program',
-			'cmd' => 'application/cmd',
-		];
-
-		return $this->updateMimetypes($updatedMimetypes);
-	}
-
-	private function introduceLocationTypes() {
-		$updatedMimetypes = [
-			'gpx' => 'application/gpx+xml',
-			'kml' => 'application/vnd.google-earth.kml+xml',
-			'kmz' => 'application/vnd.google-earth.kmz',
-			'tcx' => 'application/vnd.garmin.tcx+xml',
-		];
-
-		return $this->updateMimetypes($updatedMimetypes);
-	}
-
-	private function introduceInternetShortcutTypes() {
-		$updatedMimetypes = [
-			'url' => 'application/internet-shortcut',
-			'webloc' => 'application/internet-shortcut'
-		];
-
-		return $this->updateMimetypes($updatedMimetypes);
-	}
-
-	private function introduceStreamingTypes() {
-		$updatedMimetypes = [
-			'm3u' => 'audio/mpegurl',
-			'm3u8' => 'audio/mpegurl',
-			'pls' => 'audio/x-scpls'
-		];
-
-		return $this->updateMimetypes($updatedMimetypes);
-	}
-
-	private function introduceVisioTypes() {
-		$updatedMimetypes = [
-			'vsdm' => 'application/vnd.visio',
-			'vsdx' => 'application/vnd.visio',
-			'vssm' => 'application/vnd.visio',
-			'vssx' => 'application/vnd.visio',
-			'vstm' => 'application/vnd.visio',
-			'vstx' => 'application/vnd.visio',
-		];
-
-		return $this->updateMimetypes($updatedMimetypes);
-	}
-
-	private function introduceComicbookTypes() {
-		$updatedMimetypes = [
-			'cb7' => 'application/comicbook+7z',
-			'cba' => 'application/comicbook+ace',
-			'cbr' => 'application/comicbook+rar',
-			'cbt' => 'application/comicbook+tar',
-			'cbtc' => 'application/comicbook+truecrypt',
-			'cbz' => 'application/comicbook+zip',
-		];
-
-		return $this->updateMimetypes($updatedMimetypes);
-	}
-
-	/**
-	 * Fix mime types
-	 */
-	public function run(IOutput $out) {
-
-		$ocVersionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
-
-		// NOTE TO DEVELOPERS: when adding new mime types, please make sure to
-		// add a version comparison to avoid doing it every time
-
-		if (version_compare($ocVersionFromBeforeUpdate, '12.0.0.14', '<') && $this->introduceImageTypes()) {
-			$out->info('Fixed image mime types');
-		}
-
-		if (version_compare($ocVersionFromBeforeUpdate, '12.0.0.13', '<') && $this->introduceWindowsProgramTypes()) {
-			$out->info('Fixed windows program mime types');
-		}
-
-		if (version_compare($ocVersionFromBeforeUpdate, '13.0.0.0', '<') && $this->introduceLocationTypes()) {
-			$out->info('Fixed geospatial mime types');
-		}
-
-		if (version_compare($ocVersionFromBeforeUpdate, '13.0.0.3', '<') && $this->introduceInternetShortcutTypes()) {
-			$out->info('Fixed internet-shortcut mime types');
-		}
-
-		if (version_compare($ocVersionFromBeforeUpdate, '13.0.0.6', '<') && $this->introduceStreamingTypes()) {
-			$out->info('Fixed streaming mime types');
-		}
-
-		if (version_compare($ocVersionFromBeforeUpdate, '14.0.0.8', '<') && $this->introduceVisioTypes()) {
-			$out->info('Fixed visio mime types');
-		}
-
-		if (version_compare($ocVersionFromBeforeUpdate, '14.0.0.10', '<') && $this->introduceComicbookTypes()) {
-			$out->info('Fixed comicbook mime types');
-		}
-	}
+    }
+
+    private function updateMimetypes($updatedMimetypes) {
+        if (empty($this->folderMimeTypeId)) {
+            $result = \OC_DB::executeAudited(self::getIdStmt(), ['httpd/unix-directory']);
+            $this->folderMimeTypeId = (int)$result->fetchOne();
+        }
+
+        $count = 0;
+        foreach ($updatedMimetypes as $extension => $mimetype) {
+            $result = \OC_DB::executeAudited(self::existsStmt(), [$mimetype]);
+            $exists = $result->fetchOne();
+
+            if (!$exists) {
+                // insert mimetype
+                \OC_DB::executeAudited(self::insertStmt(), [$mimetype]);
+            }
+
+            // get target mimetype id
+            $result = \OC_DB::executeAudited(self::getIdStmt(), [$mimetype]);
+            $mimetypeId = $result->fetchOne();
+
+            // change mimetype for files with x extension
+            $count += \OC_DB::executeAudited(self::updateByNameStmt(), [$mimetypeId, $this->folderMimeTypeId, $mimetypeId, '%.' . $extension]);
+        }
+
+        return $count;
+    }
+
+    private function introduceImageTypes() {
+        $updatedMimetypes = [
+            'jp2' => 'image/jp2',
+            'webp' => 'image/webp',
+        ];
+
+        return $this->updateMimetypes($updatedMimetypes);
+    }
+
+    private function introduceWindowsProgramTypes() {
+        $updatedMimetypes = [
+            'htaccess' => 'text/plain',
+            'bat' => 'application/x-msdos-program',
+            'cmd' => 'application/cmd',
+        ];
+
+        return $this->updateMimetypes($updatedMimetypes);
+    }
+
+    private function introduceLocationTypes() {
+        $updatedMimetypes = [
+            'gpx' => 'application/gpx+xml',
+            'kml' => 'application/vnd.google-earth.kml+xml',
+            'kmz' => 'application/vnd.google-earth.kmz',
+            'tcx' => 'application/vnd.garmin.tcx+xml',
+        ];
+
+        return $this->updateMimetypes($updatedMimetypes);
+    }
+
+    private function introduceInternetShortcutTypes() {
+        $updatedMimetypes = [
+            'url' => 'application/internet-shortcut',
+            'webloc' => 'application/internet-shortcut'
+        ];
+
+        return $this->updateMimetypes($updatedMimetypes);
+    }
+
+    private function introduceStreamingTypes() {
+        $updatedMimetypes = [
+            'm3u' => 'audio/mpegurl',
+            'm3u8' => 'audio/mpegurl',
+            'pls' => 'audio/x-scpls'
+        ];
+
+        return $this->updateMimetypes($updatedMimetypes);
+    }
+
+    private function introduceVisioTypes() {
+        $updatedMimetypes = [
+            'vsdm' => 'application/vnd.visio',
+            'vsdx' => 'application/vnd.visio',
+            'vssm' => 'application/vnd.visio',
+            'vssx' => 'application/vnd.visio',
+            'vstm' => 'application/vnd.visio',
+            'vstx' => 'application/vnd.visio',
+        ];
+
+        return $this->updateMimetypes($updatedMimetypes);
+    }
+
+    private function introduceComicbookTypes() {
+        $updatedMimetypes = [
+            'cb7' => 'application/comicbook+7z',
+            'cba' => 'application/comicbook+ace',
+            'cbr' => 'application/comicbook+rar',
+            'cbt' => 'application/comicbook+tar',
+            'cbtc' => 'application/comicbook+truecrypt',
+            'cbz' => 'application/comicbook+zip',
+        ];
+
+        return $this->updateMimetypes($updatedMimetypes);
+    }
+
+    /**
+     * Fix mime types
+     */
+    public function run(IOutput $out) {
+
+        $ocVersionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
+
+        // NOTE TO DEVELOPERS: when adding new mime types, please make sure to
+        // add a version comparison to avoid doing it every time
+
+        if (version_compare($ocVersionFromBeforeUpdate, '12.0.0.14', '<') && $this->introduceImageTypes()) {
+            $out->info('Fixed image mime types');
+        }
+
+        if (version_compare($ocVersionFromBeforeUpdate, '12.0.0.13', '<') && $this->introduceWindowsProgramTypes()) {
+            $out->info('Fixed windows program mime types');
+        }
+
+        if (version_compare($ocVersionFromBeforeUpdate, '13.0.0.0', '<') && $this->introduceLocationTypes()) {
+            $out->info('Fixed geospatial mime types');
+        }
+
+        if (version_compare($ocVersionFromBeforeUpdate, '13.0.0.3', '<') && $this->introduceInternetShortcutTypes()) {
+            $out->info('Fixed internet-shortcut mime types');
+        }
+
+        if (version_compare($ocVersionFromBeforeUpdate, '13.0.0.6', '<') && $this->introduceStreamingTypes()) {
+            $out->info('Fixed streaming mime types');
+        }
+
+        if (version_compare($ocVersionFromBeforeUpdate, '14.0.0.8', '<') && $this->introduceVisioTypes()) {
+            $out->info('Fixed visio mime types');
+        }
+
+        if (version_compare($ocVersionFromBeforeUpdate, '14.0.0.10', '<') && $this->introduceComicbookTypes()) {
+            $out->info('Fixed comicbook mime types');
+        }
+    }
 }

lib/private/Repair/Collation.php

Indentation +115 added lines, -115 removed lines

@@ -35,119 +35,119 @@
 use OCP\Migration\IRepairStep;
 
 class Collation implements IRepairStep {
-	/**  @var IConfig */
-	protected $config;
-
-	/** @var ILogger */
-	protected $logger;
-
-	/** @var IDBConnection */
-	protected $connection;
-
-	/** @var bool */
-	protected $ignoreFailures;
-
-	/**
-	 * @param IConfig $config
-	 * @param ILogger $logger
-	 * @param IDBConnection $connection
-	 * @param bool $ignoreFailures
-	 */
-	public function __construct(IConfig $config, ILogger $logger, IDBConnection $connection, $ignoreFailures) {
-		$this->connection = $connection;
-		$this->config = $config;
-		$this->logger = $logger;
-		$this->ignoreFailures = $ignoreFailures;
-	}
-
-	public function getName() {
-		return 'Repair MySQL collation';
-	}
-
-	/**
-	 * Fix mime types
-	 */
-	public function run(IOutput $output) {
-		if (!$this->connection->getDatabasePlatform() instanceof MySqlPlatform) {
-			$output->info('Not a mysql database -> nothing to do');
-			return;
-		}
-
-		$characterSet = $this->config->getSystemValue('mysql.utf8mb4', false) ? 'utf8mb4' : 'utf8';
-
-		$tables = $this->getAllNonUTF8BinTables($this->connection);
-		foreach ($tables as $table) {
-			$output->info("Change row format for $table ...");
-			$query = $this->connection->prepare('ALTER TABLE `' . $table . '` ROW_FORMAT = DYNAMIC;');
-			try {
-				$query->execute();
-			} catch (DriverException $e) {
-				// Just log this
-				$this->logger->logException($e);
-				if (!$this->ignoreFailures) {
-					throw $e;
-				}
-			}
-
-			$output->info("Change collation for $table ...");
-			if ($characterSet === 'utf8mb4') {
-				// need to set row compression first
-				$query = $this->connection->prepare('ALTER TABLE `' . $table . '` ROW_FORMAT=COMPRESSED;');
-				$query->execute();
-			}
-			$query = $this->connection->prepare('ALTER TABLE `' . $table . '` CONVERT TO CHARACTER SET ' . $characterSet . ' COLLATE ' . $characterSet . '_bin;');
-			try {
-				$query->execute();
-			} catch (DriverException $e) {
-				// Just log this
-				$this->logger->logException($e);
-				if (!$this->ignoreFailures) {
-					throw $e;
-				}
-			}
-		}
-		if (empty($tables)) {
-			$output->info('All tables already have the correct collation -> nothing to do');
-		}
-	}
-
-	/**
-	 * @param IDBConnection $connection
-	 * @return string[]
-	 */
-	protected function getAllNonUTF8BinTables(IDBConnection $connection) {
-		$dbName = $this->config->getSystemValue("dbname");
-		$characterSet = $this->config->getSystemValue('mysql.utf8mb4', false) ? 'utf8mb4' : 'utf8';
-
-		// fetch tables by columns
-		$statement = $connection->executeQuery(
-			"SELECT DISTINCT(TABLE_NAME) AS `table`" .
-			"	FROM INFORMATION_SCHEMA . COLUMNS" .
-			"	WHERE TABLE_SCHEMA = ?" .
-			"	AND (COLLATION_NAME <> '" . $characterSet . "_bin' OR CHARACTER_SET_NAME <> '" . $characterSet . "')" .
-			"	AND TABLE_NAME LIKE '*PREFIX*%'",
-			[$dbName]
-		);
-		$rows = $statement->fetchAll();
-		$result = [];
-		foreach ($rows as $row) {
-			$result[$row['table']] = true;
-		}
-
-		// fetch tables by collation
-		$statement = $connection->executeQuery(
-			"SELECT DISTINCT(TABLE_NAME) AS `table`" .
-			"	FROM INFORMATION_SCHEMA . TABLES" .
-			"	WHERE TABLE_SCHEMA = ?" .
-			"	AND TABLE_COLLATION <> '" . $characterSet . "_bin'" .
-			"	AND TABLE_NAME LIKE '*PREFIX*%'",
-			[$dbName]
-		);
-		$rows = $statement->fetchAll();
-		foreach ($rows as $row) {
-			$result[$row['table']] = true;
-		}
-
-		return array_keys($result);
-	}
+    /**  @var IConfig */
+    protected $config;
+
+    /** @var ILogger */
+    protected $logger;
+
+    /** @var IDBConnection */
+    protected $connection;
+
+    /** @var bool */
+    protected $ignoreFailures;
+
+    /**
+     * @param IConfig $config
+     * @param ILogger $logger
+     * @param IDBConnection $connection
+     * @param bool $ignoreFailures
+     */
+    public function __construct(IConfig $config, ILogger $logger, IDBConnection $connection, $ignoreFailures) {
+        $this->connection = $connection;
+        $this->config = $config;
+        $this->logger = $logger;
+        $this->ignoreFailures = $ignoreFailures;
+    }
+
+    public function getName() {
+        return 'Repair MySQL collation';
+    }
+
+    /**
+     * Fix mime types
+     */
+    public function run(IOutput $output) {
+        if (!$this->connection->getDatabasePlatform() instanceof MySqlPlatform) {
+            $output->info('Not a mysql database -> nothing to do');
+            return;
+        }
+
+        $characterSet = $this->config->getSystemValue('mysql.utf8mb4', false) ? 'utf8mb4' : 'utf8';
+
+        $tables = $this->getAllNonUTF8BinTables($this->connection);
+        foreach ($tables as $table) {
+            $output->info("Change row format for $table ...");
+            $query = $this->connection->prepare('ALTER TABLE `' . $table . '` ROW_FORMAT = DYNAMIC;');
+            try {
+                $query->execute();
+            } catch (DriverException $e) {
+                // Just log this
+                $this->logger->logException($e);
+                if (!$this->ignoreFailures) {
+                    throw $e;
+                }
+            }
+
+            $output->info("Change collation for $table ...");
+            if ($characterSet === 'utf8mb4') {
+                // need to set row compression first
+                $query = $this->connection->prepare('ALTER TABLE `' . $table . '` ROW_FORMAT=COMPRESSED;');
+                $query->execute();
+            }
+            $query = $this->connection->prepare('ALTER TABLE `' . $table . '` CONVERT TO CHARACTER SET ' . $characterSet . ' COLLATE ' . $characterSet . '_bin;');
+            try {
+                $query->execute();
+            } catch (DriverException $e) {
+                // Just log this
+                $this->logger->logException($e);
+                if (!$this->ignoreFailures) {
+                    throw $e;
+                }
+            }
+        }
+        if (empty($tables)) {
+            $output->info('All tables already have the correct collation -> nothing to do');
+        }
+    }
+
+    /**
+     * @param IDBConnection $connection
+     * @return string[]
+     */
+    protected function getAllNonUTF8BinTables(IDBConnection $connection) {
+        $dbName = $this->config->getSystemValue("dbname");
+        $characterSet = $this->config->getSystemValue('mysql.utf8mb4', false) ? 'utf8mb4' : 'utf8';
+
+        // fetch tables by columns
+        $statement = $connection->executeQuery(
+            "SELECT DISTINCT(TABLE_NAME) AS `table`" .
+            "	FROM INFORMATION_SCHEMA . COLUMNS" .
+            "	WHERE TABLE_SCHEMA = ?" .
+            "	AND (COLLATION_NAME <> '" . $characterSet . "_bin' OR CHARACTER_SET_NAME <> '" . $characterSet . "')" .
+            "	AND TABLE_NAME LIKE '*PREFIX*%'",
+            [$dbName]
+        );
+        $rows = $statement->fetchAll();
+        $result = [];
+        foreach ($rows as $row) {
+            $result[$row['table']] = true;
+        }
+
+        // fetch tables by collation
+        $statement = $connection->executeQuery(
+            "SELECT DISTINCT(TABLE_NAME) AS `table`" .
+            "	FROM INFORMATION_SCHEMA . TABLES" .
+            "	WHERE TABLE_SCHEMA = ?" .
+            "	AND TABLE_COLLATION <> '" . $characterSet . "_bin'" .
+            "	AND TABLE_NAME LIKE '*PREFIX*%'",
+            [$dbName]
+        );
+        $rows = $statement->fetchAll();
+        foreach ($rows as $row) {
+            $result[$row['table']] = true;
+        }
+
+        return array_keys($result);
+    }
 }

lib/private/Repair/CleanTags.php

Indentation +168 added lines, -168 removed lines

@@ -40,172 +40,172 @@
  */
 class CleanTags implements IRepairStep {
 
-	/** @var IDBConnection */
-	protected $connection;
-
-	/** @var IUserManager */
-	protected $userManager;
-
-	protected $deletedTags = 0;
-
-	/**
-	 * @param IDBConnection $connection
-	 * @param IUserManager $userManager
-	 */
-	public function __construct(IDBConnection $connection, IUserManager $userManager) {
-		$this->connection = $connection;
-		$this->userManager = $userManager;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getName() {
-		return 'Clean tags and favorites';
-	}
-
-	/**
-	 * Updates the configuration after running an update
-	 */
-	public function run(IOutput $output) {
-		$this->deleteOrphanTags($output);
-		$this->deleteOrphanFileEntries($output);
-		$this->deleteOrphanTagEntries($output);
-		$this->deleteOrphanCategoryEntries($output);
-	}
-
-	/**
-	 * Delete tags for deleted users
-	 */
-	protected function deleteOrphanTags(IOutput $output) {
-		$offset = 0;
-		while ($this->checkTags($offset)) {
-			$offset += 50;
-		}
-
-		$output->info(sprintf('%d tags of deleted users have been removed.', $this->deletedTags));
-	}
-
-	protected function checkTags($offset) {
-		$query = $this->connection->getQueryBuilder();
-		$query->select('uid')
-			->from('vcategory')
-			->groupBy('uid')
-			->orderBy('uid')
-			->setMaxResults(50)
-			->setFirstResult($offset);
-		$result = $query->execute();
-
-		$users = [];
-		$hadResults = false;
-		while ($row = $result->fetch()) {
-			$hadResults = true;
-			if (!$this->userManager->userExists($row['uid'])) {
-				$users[] = $row['uid'];
-			}
-		}
-		$result->closeCursor();
-
-		if (!$hadResults) {
-			// No more tags, stop looping
-			return false;
-		}
-
-		if (!empty($users)) {
-			$query = $this->connection->getQueryBuilder();
-			$query->delete('vcategory')
-				->where($query->expr()->in('uid', $query->createNamedParameter($users, IQueryBuilder::PARAM_STR_ARRAY)));
-			$this->deletedTags += $query->execute();
-		}
-		return true;
-	}
-
-	/**
-	 * Delete tag entries for deleted files
-	 */
-	protected function deleteOrphanFileEntries(IOutput $output) {
-		$this->deleteOrphanEntries(
-			$output,
-			'%d tags for delete files have been removed.',
-			'vcategory_to_object', 'objid',
-			'filecache', 'fileid', 'path_hash'
-		);
-	}
-
-	/**
-	 * Delete tag entries for deleted tags
-	 */
-	protected function deleteOrphanTagEntries(IOutput $output) {
-		$this->deleteOrphanEntries(
-			$output,
-			'%d tag entries for deleted tags have been removed.',
-			'vcategory_to_object', 'categoryid',
-			'vcategory', 'id', 'uid'
-		);
-	}
-
-	/**
-	 * Delete tags that have no entries
-	 */
-	protected function deleteOrphanCategoryEntries(IOutput $output) {
-		$this->deleteOrphanEntries(
-			$output,
-			'%d tags with no entries have been removed.',
-			'vcategory', 'id',
-			'vcategory_to_object', 'categoryid', 'type'
-		);
-	}
-
-	/**
-	 * Deletes all entries from $deleteTable that do not have a matching entry in $sourceTable
-	 *
-	 * A query joins $deleteTable.$deleteId = $sourceTable.$sourceId and checks
-	 * whether $sourceNullColumn is null. If it is null, the entry in $deleteTable
-	 * is being deleted.
-	 *
-	 * @param string $repairInfo
-	 * @param string $deleteTable
-	 * @param string $deleteId
-	 * @param string $sourceTable
-	 * @param string $sourceId
-	 * @param string $sourceNullColumn	If this column is null in the source table,
-	 * 								the entry is deleted in the $deleteTable
-	 * @suppress SqlInjectionChecker
-	 */
-	protected function deleteOrphanEntries(IOutput $output, $repairInfo, $deleteTable, $deleteId, $sourceTable, $sourceId, $sourceNullColumn) {
-		$qb = $this->connection->getQueryBuilder();
-
-		$qb->select('d.' . $deleteId)
-			->from($deleteTable, 'd')
-			->leftJoin('d', $sourceTable, 's', $qb->expr()->eq('d.' . $deleteId, 's.' . $sourceId))
-			->where(
-				$qb->expr()->eq('d.type', $qb->expr()->literal('files'))
-			)
-			->andWhere(
-				$qb->expr()->isNull('s.' . $sourceNullColumn)
-			);
-		$result = $qb->execute();
-
-		$orphanItems = [];
-		while ($row = $result->fetch()) {
-			$orphanItems[] = (int) $row[$deleteId];
-		}
-
-		if (!empty($orphanItems)) {
-			$orphanItemsBatch = array_chunk($orphanItems, 200);
-			foreach ($orphanItemsBatch as $items) {
-				$qb->delete($deleteTable)
-					->where(
-						$qb->expr()->eq('type', $qb->expr()->literal('files'))
-					)
-					->andWhere($qb->expr()->in($deleteId, $qb->createParameter('ids')));
-				$qb->setParameter('ids', $items, IQueryBuilder::PARAM_INT_ARRAY);
-				$qb->execute();
-			}
-		}
-
-		if ($repairInfo) {
-			$output->info(sprintf($repairInfo, count($orphanItems)));
-		}
-	}
+    /** @var IDBConnection */
+    protected $connection;
+
+    /** @var IUserManager */
+    protected $userManager;
+
+    protected $deletedTags = 0;
+
+    /**
+     * @param IDBConnection $connection
+     * @param IUserManager $userManager
+     */
+    public function __construct(IDBConnection $connection, IUserManager $userManager) {
+        $this->connection = $connection;
+        $this->userManager = $userManager;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName() {
+        return 'Clean tags and favorites';
+    }
+
+    /**
+     * Updates the configuration after running an update
+     */
+    public function run(IOutput $output) {
+        $this->deleteOrphanTags($output);
+        $this->deleteOrphanFileEntries($output);
+        $this->deleteOrphanTagEntries($output);
+        $this->deleteOrphanCategoryEntries($output);
+    }
+
+    /**
+     * Delete tags for deleted users
+     */
+    protected function deleteOrphanTags(IOutput $output) {
+        $offset = 0;
+        while ($this->checkTags($offset)) {
+            $offset += 50;
+        }
+
+        $output->info(sprintf('%d tags of deleted users have been removed.', $this->deletedTags));
+    }
+
+    protected function checkTags($offset) {
+        $query = $this->connection->getQueryBuilder();
+        $query->select('uid')
+            ->from('vcategory')
+            ->groupBy('uid')
+            ->orderBy('uid')
+            ->setMaxResults(50)
+            ->setFirstResult($offset);
+        $result = $query->execute();
+
+        $users = [];
+        $hadResults = false;
+        while ($row = $result->fetch()) {
+            $hadResults = true;
+            if (!$this->userManager->userExists($row['uid'])) {
+                $users[] = $row['uid'];
+            }
+        }
+        $result->closeCursor();
+
+        if (!$hadResults) {
+            // No more tags, stop looping
+            return false;
+        }
+
+        if (!empty($users)) {
+            $query = $this->connection->getQueryBuilder();
+            $query->delete('vcategory')
+                ->where($query->expr()->in('uid', $query->createNamedParameter($users, IQueryBuilder::PARAM_STR_ARRAY)));
+            $this->deletedTags += $query->execute();
+        }
+        return true;
+    }
+
+    /**
+     * Delete tag entries for deleted files
+     */
+    protected function deleteOrphanFileEntries(IOutput $output) {
+        $this->deleteOrphanEntries(
+            $output,
+            '%d tags for delete files have been removed.',
+            'vcategory_to_object', 'objid',
+            'filecache', 'fileid', 'path_hash'
+        );
+    }
+
+    /**
+     * Delete tag entries for deleted tags
+     */
+    protected function deleteOrphanTagEntries(IOutput $output) {
+        $this->deleteOrphanEntries(
+            $output,
+            '%d tag entries for deleted tags have been removed.',
+            'vcategory_to_object', 'categoryid',
+            'vcategory', 'id', 'uid'
+        );
+    }
+
+    /**
+     * Delete tags that have no entries
+     */
+    protected function deleteOrphanCategoryEntries(IOutput $output) {
+        $this->deleteOrphanEntries(
+            $output,
+            '%d tags with no entries have been removed.',
+            'vcategory', 'id',
+            'vcategory_to_object', 'categoryid', 'type'
+        );
+    }
+
+    /**
+     * Deletes all entries from $deleteTable that do not have a matching entry in $sourceTable
+     *
+     * A query joins $deleteTable.$deleteId = $sourceTable.$sourceId and checks
+     * whether $sourceNullColumn is null. If it is null, the entry in $deleteTable
+     * is being deleted.
+     *
+     * @param string $repairInfo
+     * @param string $deleteTable
+     * @param string $deleteId
+     * @param string $sourceTable
+     * @param string $sourceId
+     * @param string $sourceNullColumn	If this column is null in the source table,
+     * 								the entry is deleted in the $deleteTable
+     * @suppress SqlInjectionChecker
+     */
+    protected function deleteOrphanEntries(IOutput $output, $repairInfo, $deleteTable, $deleteId, $sourceTable, $sourceId, $sourceNullColumn) {
+        $qb = $this->connection->getQueryBuilder();
+
+        $qb->select('d.' . $deleteId)
+            ->from($deleteTable, 'd')
+            ->leftJoin('d', $sourceTable, 's', $qb->expr()->eq('d.' . $deleteId, 's.' . $sourceId))
+            ->where(
+                $qb->expr()->eq('d.type', $qb->expr()->literal('files'))
+            )
+            ->andWhere(
+                $qb->expr()->isNull('s.' . $sourceNullColumn)
+            );
+        $result = $qb->execute();
+
+        $orphanItems = [];
+        while ($row = $result->fetch()) {
+            $orphanItems[] = (int) $row[$deleteId];
+        }
+
+        if (!empty($orphanItems)) {
+            $orphanItemsBatch = array_chunk($orphanItems, 200);
+            foreach ($orphanItemsBatch as $items) {
+                $qb->delete($deleteTable)
+                    ->where(
+                        $qb->expr()->eq('type', $qb->expr()->literal('files'))
+                    )
+                    ->andWhere($qb->expr()->in($deleteId, $qb->createParameter('ids')));
+                $qb->setParameter('ids', $items, IQueryBuilder::PARAM_INT_ARRAY);
+                $qb->execute();
+            }
+        }
+
+        if ($repairInfo) {
+            $output->info(sprintf($repairInfo, count($orphanItems)));
+        }
+    }
 }

lib/private/Share20/DefaultShareProvider.php

Indentation +1405 added lines, -1405 removed lines

@@ -63,1445 +63,1445 @@
  */
 class DefaultShareProvider implements IShareProvider {
 
-	// Special share type for user modified group shares
-	const SHARE_TYPE_USERGROUP = 2;
-
-	/** @var IDBConnection */
-	private $dbConn;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var IGroupManager */
-	private $groupManager;
-
-	/** @var IRootFolder */
-	private $rootFolder;
-
-	/** @var IMailer */
-	private $mailer;
-
-	/** @var Defaults */
-	private $defaults;
-
-	/** @var IL10N */
-	private $l;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	/**
-	 * DefaultShareProvider constructor.
-	 *
-	 * @param IDBConnection $connection
-	 * @param IUserManager $userManager
-	 * @param IGroupManager $groupManager
-	 * @param IRootFolder $rootFolder
-	 * @param IMailer $mailer ;
-	 * @param Defaults $defaults
-	 * @param IL10N $l
-	 * @param IURLGenerator $urlGenerator
-	 */
-	public function __construct(
-			IDBConnection $connection,
-			IUserManager $userManager,
-			IGroupManager $groupManager,
-			IRootFolder $rootFolder,
-			IMailer $mailer,
-			Defaults $defaults,
-			IL10N $l,
-			IURLGenerator $urlGenerator) {
-		$this->dbConn = $connection;
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-		$this->rootFolder = $rootFolder;
-		$this->mailer = $mailer;
-		$this->defaults = $defaults;
-		$this->l = $l;
-		$this->urlGenerator = $urlGenerator;
-	}
-
-	/**
-	 * Return the identifier of this provider.
-	 *
-	 * @return string Containing only [a-zA-Z0-9]
-	 */
-	public function identifier() {
-		return 'ocinternal';
-	}
-
-	/**
-	 * Share a path
-	 *
-	 * @param \OCP\Share\IShare $share
-	 * @return \OCP\Share\IShare The share object
-	 * @throws ShareNotFound
-	 * @throws \Exception
-	 */
-	public function create(\OCP\Share\IShare $share) {
-		$qb = $this->dbConn->getQueryBuilder();
-
-		$qb->insert('share');
-		$qb->setValue('share_type', $qb->createNamedParameter($share->getShareType()));
-
-		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER) {
-			//Set the UID of the user we share with
-			$qb->setValue('share_with', $qb->createNamedParameter($share->getSharedWith()));
-			$qb->setValue('accepted', $qb->createNamedParameter(IShare::STATUS_PENDING));
-
-			//If an expiration date is set store it
-			if ($share->getExpirationDate() !== null) {
-				$qb->setValue('expiration', $qb->createNamedParameter($share->getExpirationDate(), 'datetime'));
-			}
-		} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
-			//Set the GID of the group we share with
-			$qb->setValue('share_with', $qb->createNamedParameter($share->getSharedWith()));
-
-			//If an expiration date is set store it
-			if ($share->getExpirationDate() !== null) {
-				$qb->setValue('expiration', $qb->createNamedParameter($share->getExpirationDate(), 'datetime'));
-			}
-		} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK) {
-			//set label for public link
-			$qb->setValue('label', $qb->createNamedParameter($share->getLabel()));
-			//Set the token of the share
-			$qb->setValue('token', $qb->createNamedParameter($share->getToken()));
-
-			//If a password is set store it
-			if ($share->getPassword() !== null) {
-				$qb->setValue('password', $qb->createNamedParameter($share->getPassword()));
-			}
-
-			$qb->setValue('password_by_talk', $qb->createNamedParameter($share->getSendPasswordByTalk(), IQueryBuilder::PARAM_BOOL));
-
-			//If an expiration date is set store it
-			if ($share->getExpirationDate() !== null) {
-				$qb->setValue('expiration', $qb->createNamedParameter($share->getExpirationDate(), 'datetime'));
-			}
-
-			if (method_exists($share, 'getParent')) {
-				$qb->setValue('parent', $qb->createNamedParameter($share->getParent()));
-			}
-		} else {
-			throw new \Exception('invalid share type!');
-		}
-
-		// Set what is shares
-		$qb->setValue('item_type', $qb->createParameter('itemType'));
-		if ($share->getNode() instanceof \OCP\Files\File) {
-			$qb->setParameter('itemType', 'file');
-		} else {
-			$qb->setParameter('itemType', 'folder');
-		}
-
-		// Set the file id
-		$qb->setValue('item_source', $qb->createNamedParameter($share->getNode()->getId()));
-		$qb->setValue('file_source', $qb->createNamedParameter($share->getNode()->getId()));
-
-		// set the permissions
-		$qb->setValue('permissions', $qb->createNamedParameter($share->getPermissions()));
-
-		// Set who created this share
-		$qb->setValue('uid_initiator', $qb->createNamedParameter($share->getSharedBy()));
-
-		// Set who is the owner of this file/folder (and this the owner of the share)
-		$qb->setValue('uid_owner', $qb->createNamedParameter($share->getShareOwner()));
-
-		// Set the file target
-		$qb->setValue('file_target', $qb->createNamedParameter($share->getTarget()));
-
-		// Set the time this share was created
-		$qb->setValue('stime', $qb->createNamedParameter(time()));
-
-		// insert the data and fetch the id of the share
-		$this->dbConn->beginTransaction();
-		$qb->execute();
-		$id = $this->dbConn->lastInsertId('*PREFIX*share');
-
-		// Now fetch the inserted share and create a complete share object
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->select('*')
-			->from('share')
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($id)));
-
-		$cursor = $qb->execute();
-		$data = $cursor->fetch();
-		$this->dbConn->commit();
-		$cursor->closeCursor();
-
-		if ($data === false) {
-			throw new ShareNotFound();
-		}
-
-		$mailSendValue = $share->getMailSend();
-		$data['mail_send'] = ($mailSendValue === null) ? true : $mailSendValue;
-
-		$share = $this->createShare($data);
-		return $share;
-	}
-
-	/**
-	 * Update a share
-	 *
-	 * @param \OCP\Share\IShare $share
-	 * @return \OCP\Share\IShare The share object
-	 * @throws ShareNotFound
-	 * @throws \OCP\Files\InvalidPathException
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	public function update(\OCP\Share\IShare $share) {
-
-		$originalShare = $this->getShareById($share->getId());
-
-		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER) {
-			/*
+    // Special share type for user modified group shares
+    const SHARE_TYPE_USERGROUP = 2;
+
+    /** @var IDBConnection */
+    private $dbConn;
+
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var IGroupManager */
+    private $groupManager;
+
+    /** @var IRootFolder */
+    private $rootFolder;
+
+    /** @var IMailer */
+    private $mailer;
+
+    /** @var Defaults */
+    private $defaults;
+
+    /** @var IL10N */
+    private $l;
+
+    /** @var IURLGenerator */
+    private $urlGenerator;
+
+    /**
+     * DefaultShareProvider constructor.
+     *
+     * @param IDBConnection $connection
+     * @param IUserManager $userManager
+     * @param IGroupManager $groupManager
+     * @param IRootFolder $rootFolder
+     * @param IMailer $mailer ;
+     * @param Defaults $defaults
+     * @param IL10N $l
+     * @param IURLGenerator $urlGenerator
+     */
+    public function __construct(
+            IDBConnection $connection,
+            IUserManager $userManager,
+            IGroupManager $groupManager,
+            IRootFolder $rootFolder,
+            IMailer $mailer,
+            Defaults $defaults,
+            IL10N $l,
+            IURLGenerator $urlGenerator) {
+        $this->dbConn = $connection;
+        $this->userManager = $userManager;
+        $this->groupManager = $groupManager;
+        $this->rootFolder = $rootFolder;
+        $this->mailer = $mailer;
+        $this->defaults = $defaults;
+        $this->l = $l;
+        $this->urlGenerator = $urlGenerator;
+    }
+
+    /**
+     * Return the identifier of this provider.
+     *
+     * @return string Containing only [a-zA-Z0-9]
+     */
+    public function identifier() {
+        return 'ocinternal';
+    }
+
+    /**
+     * Share a path
+     *
+     * @param \OCP\Share\IShare $share
+     * @return \OCP\Share\IShare The share object
+     * @throws ShareNotFound
+     * @throws \Exception
+     */
+    public function create(\OCP\Share\IShare $share) {
+        $qb = $this->dbConn->getQueryBuilder();
+
+        $qb->insert('share');
+        $qb->setValue('share_type', $qb->createNamedParameter($share->getShareType()));
+
+        if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER) {
+            //Set the UID of the user we share with
+            $qb->setValue('share_with', $qb->createNamedParameter($share->getSharedWith()));
+            $qb->setValue('accepted', $qb->createNamedParameter(IShare::STATUS_PENDING));
+
+            //If an expiration date is set store it
+            if ($share->getExpirationDate() !== null) {
+                $qb->setValue('expiration', $qb->createNamedParameter($share->getExpirationDate(), 'datetime'));
+            }
+        } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
+            //Set the GID of the group we share with
+            $qb->setValue('share_with', $qb->createNamedParameter($share->getSharedWith()));
+
+            //If an expiration date is set store it
+            if ($share->getExpirationDate() !== null) {
+                $qb->setValue('expiration', $qb->createNamedParameter($share->getExpirationDate(), 'datetime'));
+            }
+        } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK) {
+            //set label for public link
+            $qb->setValue('label', $qb->createNamedParameter($share->getLabel()));
+            //Set the token of the share
+            $qb->setValue('token', $qb->createNamedParameter($share->getToken()));
+
+            //If a password is set store it
+            if ($share->getPassword() !== null) {
+                $qb->setValue('password', $qb->createNamedParameter($share->getPassword()));
+            }
+
+            $qb->setValue('password_by_talk', $qb->createNamedParameter($share->getSendPasswordByTalk(), IQueryBuilder::PARAM_BOOL));
+
+            //If an expiration date is set store it
+            if ($share->getExpirationDate() !== null) {
+                $qb->setValue('expiration', $qb->createNamedParameter($share->getExpirationDate(), 'datetime'));
+            }
+
+            if (method_exists($share, 'getParent')) {
+                $qb->setValue('parent', $qb->createNamedParameter($share->getParent()));
+            }
+        } else {
+            throw new \Exception('invalid share type!');
+        }
+
+        // Set what is shares
+        $qb->setValue('item_type', $qb->createParameter('itemType'));
+        if ($share->getNode() instanceof \OCP\Files\File) {
+            $qb->setParameter('itemType', 'file');
+        } else {
+            $qb->setParameter('itemType', 'folder');
+        }
+
+        // Set the file id
+        $qb->setValue('item_source', $qb->createNamedParameter($share->getNode()->getId()));
+        $qb->setValue('file_source', $qb->createNamedParameter($share->getNode()->getId()));
+
+        // set the permissions
+        $qb->setValue('permissions', $qb->createNamedParameter($share->getPermissions()));
+
+        // Set who created this share
+        $qb->setValue('uid_initiator', $qb->createNamedParameter($share->getSharedBy()));
+
+        // Set who is the owner of this file/folder (and this the owner of the share)
+        $qb->setValue('uid_owner', $qb->createNamedParameter($share->getShareOwner()));
+
+        // Set the file target
+        $qb->setValue('file_target', $qb->createNamedParameter($share->getTarget()));
+
+        // Set the time this share was created
+        $qb->setValue('stime', $qb->createNamedParameter(time()));
+
+        // insert the data and fetch the id of the share
+        $this->dbConn->beginTransaction();
+        $qb->execute();
+        $id = $this->dbConn->lastInsertId('*PREFIX*share');
+
+        // Now fetch the inserted share and create a complete share object
+        $qb = $this->dbConn->getQueryBuilder();
+        $qb->select('*')
+            ->from('share')
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($id)));
+
+        $cursor = $qb->execute();
+        $data = $cursor->fetch();
+        $this->dbConn->commit();
+        $cursor->closeCursor();
+
+        if ($data === false) {
+            throw new ShareNotFound();
+        }
+
+        $mailSendValue = $share->getMailSend();
+        $data['mail_send'] = ($mailSendValue === null) ? true : $mailSendValue;
+
+        $share = $this->createShare($data);
+        return $share;
+    }
+
+    /**
+     * Update a share
+     *
+     * @param \OCP\Share\IShare $share
+     * @return \OCP\Share\IShare The share object
+     * @throws ShareNotFound
+     * @throws \OCP\Files\InvalidPathException
+     * @throws \OCP\Files\NotFoundException
+     */
+    public function update(\OCP\Share\IShare $share) {
+
+        $originalShare = $this->getShareById($share->getId());
+
+        if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER) {
+            /*
 			 * We allow updating the recipient on user shares.
 			 */
-			$qb = $this->dbConn->getQueryBuilder();
-			$qb->update('share')
-				->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
-				->set('share_with', $qb->createNamedParameter($share->getSharedWith()))
-				->set('uid_owner', $qb->createNamedParameter($share->getShareOwner()))
-				->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy()))
-				->set('permissions', $qb->createNamedParameter($share->getPermissions()))
-				->set('item_source', $qb->createNamedParameter($share->getNode()->getId()))
-				->set('file_source', $qb->createNamedParameter($share->getNode()->getId()))
-				->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATE))
-				->set('note', $qb->createNamedParameter($share->getNote()))
-				->set('accepted', $qb->createNamedParameter($share->getStatus()))
-				->execute();
-		} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
-			$qb = $this->dbConn->getQueryBuilder();
-			$qb->update('share')
-				->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
-				->set('uid_owner', $qb->createNamedParameter($share->getShareOwner()))
-				->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy()))
-				->set('permissions', $qb->createNamedParameter($share->getPermissions()))
-				->set('item_source', $qb->createNamedParameter($share->getNode()->getId()))
-				->set('file_source', $qb->createNamedParameter($share->getNode()->getId()))
-				->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATE))
-				->set('note', $qb->createNamedParameter($share->getNote()))
-				->execute();
-
-			/*
+            $qb = $this->dbConn->getQueryBuilder();
+            $qb->update('share')
+                ->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
+                ->set('share_with', $qb->createNamedParameter($share->getSharedWith()))
+                ->set('uid_owner', $qb->createNamedParameter($share->getShareOwner()))
+                ->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy()))
+                ->set('permissions', $qb->createNamedParameter($share->getPermissions()))
+                ->set('item_source', $qb->createNamedParameter($share->getNode()->getId()))
+                ->set('file_source', $qb->createNamedParameter($share->getNode()->getId()))
+                ->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATE))
+                ->set('note', $qb->createNamedParameter($share->getNote()))
+                ->set('accepted', $qb->createNamedParameter($share->getStatus()))
+                ->execute();
+        } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
+            $qb = $this->dbConn->getQueryBuilder();
+            $qb->update('share')
+                ->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
+                ->set('uid_owner', $qb->createNamedParameter($share->getShareOwner()))
+                ->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy()))
+                ->set('permissions', $qb->createNamedParameter($share->getPermissions()))
+                ->set('item_source', $qb->createNamedParameter($share->getNode()->getId()))
+                ->set('file_source', $qb->createNamedParameter($share->getNode()->getId()))
+                ->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATE))
+                ->set('note', $qb->createNamedParameter($share->getNote()))
+                ->execute();
+
+            /*
 			 * Update all user defined group shares
 			 */
-			$qb = $this->dbConn->getQueryBuilder();
-			$qb->update('share')
-				->where($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())))
-				->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP)))
-				->set('uid_owner', $qb->createNamedParameter($share->getShareOwner()))
-				->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy()))
-				->set('item_source', $qb->createNamedParameter($share->getNode()->getId()))
-				->set('file_source', $qb->createNamedParameter($share->getNode()->getId()))
-				->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATE))
-				->set('note', $qb->createNamedParameter($share->getNote()))
-				->execute();
-
-			/*
+            $qb = $this->dbConn->getQueryBuilder();
+            $qb->update('share')
+                ->where($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())))
+                ->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP)))
+                ->set('uid_owner', $qb->createNamedParameter($share->getShareOwner()))
+                ->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy()))
+                ->set('item_source', $qb->createNamedParameter($share->getNode()->getId()))
+                ->set('file_source', $qb->createNamedParameter($share->getNode()->getId()))
+                ->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATE))
+                ->set('note', $qb->createNamedParameter($share->getNote()))
+                ->execute();
+
+            /*
 			 * Now update the permissions for all children that have not set it to 0
 			 */
-			$qb = $this->dbConn->getQueryBuilder();
-			$qb->update('share')
-				->where($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())))
-				->andWhere($qb->expr()->neq('permissions', $qb->createNamedParameter(0)))
-				->set('permissions', $qb->createNamedParameter($share->getPermissions()))
-				->execute();
-
-		} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK) {
-			$qb = $this->dbConn->getQueryBuilder();
-			$qb->update('share')
-				->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
-				->set('password', $qb->createNamedParameter($share->getPassword()))
-				->set('password_by_talk', $qb->createNamedParameter($share->getSendPasswordByTalk(), IQueryBuilder::PARAM_BOOL))
-				->set('uid_owner', $qb->createNamedParameter($share->getShareOwner()))
-				->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy()))
-				->set('permissions', $qb->createNamedParameter($share->getPermissions()))
-				->set('item_source', $qb->createNamedParameter($share->getNode()->getId()))
-				->set('file_source', $qb->createNamedParameter($share->getNode()->getId()))
-				->set('token', $qb->createNamedParameter($share->getToken()))
-				->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATE))
-				->set('note', $qb->createNamedParameter($share->getNote()))
-				->set('label', $qb->createNamedParameter($share->getLabel()))
-				->set('hide_download', $qb->createNamedParameter($share->getHideDownload() ? 1 : 0), IQueryBuilder::PARAM_INT)
-				->execute();
-		}
-
-		if ($originalShare->getNote() !== $share->getNote() && $share->getNote() !== '') {
-			$this->propagateNote($share);
-		}
-
-
-		return $share;
-	}
-
-	/**
-	 * Accept a share.
-	 *
-	 * @param IShare $share
-	 * @param string $recipient
-	 * @return IShare The share object
-	 * @since 9.0.0
-	 */
-	public function acceptShare(IShare $share, string $recipient): IShare {
-		if ($share->getShareType() === IShare::TYPE_GROUP) {
-			$group = $this->groupManager->get($share->getSharedWith());
-			$user = $this->userManager->get($recipient);
-
-			if (is_null($group)) {
-				throw new ProviderException('Group "' . $share->getSharedWith() . '" does not exist');
-			}
-
-			if (!$group->inGroup($user)) {
-				throw new ProviderException('Recipient not in receiving group');
-			}
-
-			// Try to fetch user specific share
-			$qb = $this->dbConn->getQueryBuilder();
-			$stmt = $qb->select('*')
-				->from('share')
-				->where($qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP)))
-				->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($recipient)))
-				->andWhere($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())))
-				->andWhere($qb->expr()->orX(
-					$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
-					$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
-				))
-				->execute();
-
-			$data = $stmt->fetch();
-			$stmt->closeCursor();
-
-			/*
+            $qb = $this->dbConn->getQueryBuilder();
+            $qb->update('share')
+                ->where($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())))
+                ->andWhere($qb->expr()->neq('permissions', $qb->createNamedParameter(0)))
+                ->set('permissions', $qb->createNamedParameter($share->getPermissions()))
+                ->execute();
+
+        } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK) {
+            $qb = $this->dbConn->getQueryBuilder();
+            $qb->update('share')
+                ->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
+                ->set('password', $qb->createNamedParameter($share->getPassword()))
+                ->set('password_by_talk', $qb->createNamedParameter($share->getSendPasswordByTalk(), IQueryBuilder::PARAM_BOOL))
+                ->set('uid_owner', $qb->createNamedParameter($share->getShareOwner()))
+                ->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy()))
+                ->set('permissions', $qb->createNamedParameter($share->getPermissions()))
+                ->set('item_source', $qb->createNamedParameter($share->getNode()->getId()))
+                ->set('file_source', $qb->createNamedParameter($share->getNode()->getId()))
+                ->set('token', $qb->createNamedParameter($share->getToken()))
+                ->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATE))
+                ->set('note', $qb->createNamedParameter($share->getNote()))
+                ->set('label', $qb->createNamedParameter($share->getLabel()))
+                ->set('hide_download', $qb->createNamedParameter($share->getHideDownload() ? 1 : 0), IQueryBuilder::PARAM_INT)
+                ->execute();
+        }
+
+        if ($originalShare->getNote() !== $share->getNote() && $share->getNote() !== '') {
+            $this->propagateNote($share);
+        }
+
+
+        return $share;
+    }
+
+    /**
+     * Accept a share.
+     *
+     * @param IShare $share
+     * @param string $recipient
+     * @return IShare The share object
+     * @since 9.0.0
+     */
+    public function acceptShare(IShare $share, string $recipient): IShare {
+        if ($share->getShareType() === IShare::TYPE_GROUP) {
+            $group = $this->groupManager->get($share->getSharedWith());
+            $user = $this->userManager->get($recipient);
+
+            if (is_null($group)) {
+                throw new ProviderException('Group "' . $share->getSharedWith() . '" does not exist');
+            }
+
+            if (!$group->inGroup($user)) {
+                throw new ProviderException('Recipient not in receiving group');
+            }
+
+            // Try to fetch user specific share
+            $qb = $this->dbConn->getQueryBuilder();
+            $stmt = $qb->select('*')
+                ->from('share')
+                ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP)))
+                ->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($recipient)))
+                ->andWhere($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())))
+                ->andWhere($qb->expr()->orX(
+                    $qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
+                    $qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
+                ))
+                ->execute();
+
+            $data = $stmt->fetch();
+            $stmt->closeCursor();
+
+            /*
 			 * Check if there already is a user specific group share.
 			 * If there is update it (if required).
 			 */
-			if ($data === false) {
-				$id = $this->createUserSpecificGroupShare($share, $recipient);
-			} else {
-				$id = $data['id'];
-			}
-
-		} else if ($share->getShareType() === IShare::TYPE_USER) {
-			if ($share->getSharedWith() !== $recipient) {
-				throw new ProviderException('Recipient does not match');
-			}
-
-			$id = $share->getId();
-		} else {
-			throw new ProviderException('Invalid shareType');
-		}
-
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->update('share')
-			->set('accepted', $qb->createNamedParameter(IShare::STATUS_ACCEPTED))
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
-			->execute();
-
-		return $share;
-	}
-
-	/**
-	 * Get all children of this share
-	 * FIXME: remove once https://github.com/owncloud/core/pull/21660 is in
-	 *
-	 * @param \OCP\Share\IShare $parent
-	 * @return \OCP\Share\IShare[]
-	 */
-	public function getChildren(\OCP\Share\IShare $parent) {
-		$children = [];
-
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->select('*')
-			->from('share')
-			->where($qb->expr()->eq('parent', $qb->createNamedParameter($parent->getId())))
-			->andWhere(
-				$qb->expr()->in(
-					'share_type',
-					$qb->createNamedParameter([
-						\OCP\Share::SHARE_TYPE_USER,
-						\OCP\Share::SHARE_TYPE_GROUP,
-						\OCP\Share::SHARE_TYPE_LINK,
-					], IQueryBuilder::PARAM_INT_ARRAY)
-				)
-			)
-			->andWhere($qb->expr()->orX(
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
-			))
-			->orderBy('id');
-
-		$cursor = $qb->execute();
-		while($data = $cursor->fetch()) {
-			$children[] = $this->createShare($data);
-		}
-		$cursor->closeCursor();
-
-		return $children;
-	}
-
-	/**
-	 * Delete a share
-	 *
-	 * @param \OCP\Share\IShare $share
-	 */
-	public function delete(\OCP\Share\IShare $share) {
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->delete('share')
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())));
-
-		/*
+            if ($data === false) {
+                $id = $this->createUserSpecificGroupShare($share, $recipient);
+            } else {
+                $id = $data['id'];
+            }
+
+        } else if ($share->getShareType() === IShare::TYPE_USER) {
+            if ($share->getSharedWith() !== $recipient) {
+                throw new ProviderException('Recipient does not match');
+            }
+
+            $id = $share->getId();
+        } else {
+            throw new ProviderException('Invalid shareType');
+        }
+
+        $qb = $this->dbConn->getQueryBuilder();
+        $qb->update('share')
+            ->set('accepted', $qb->createNamedParameter(IShare::STATUS_ACCEPTED))
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
+            ->execute();
+
+        return $share;
+    }
+
+    /**
+     * Get all children of this share
+     * FIXME: remove once https://github.com/owncloud/core/pull/21660 is in
+     *
+     * @param \OCP\Share\IShare $parent
+     * @return \OCP\Share\IShare[]
+     */
+    public function getChildren(\OCP\Share\IShare $parent) {
+        $children = [];
+
+        $qb = $this->dbConn->getQueryBuilder();
+        $qb->select('*')
+            ->from('share')
+            ->where($qb->expr()->eq('parent', $qb->createNamedParameter($parent->getId())))
+            ->andWhere(
+                $qb->expr()->in(
+                    'share_type',
+                    $qb->createNamedParameter([
+                        \OCP\Share::SHARE_TYPE_USER,
+                        \OCP\Share::SHARE_TYPE_GROUP,
+                        \OCP\Share::SHARE_TYPE_LINK,
+                    ], IQueryBuilder::PARAM_INT_ARRAY)
+                )
+            )
+            ->andWhere($qb->expr()->orX(
+                $qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
+                $qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
+            ))
+            ->orderBy('id');
+
+        $cursor = $qb->execute();
+        while($data = $cursor->fetch()) {
+            $children[] = $this->createShare($data);
+        }
+        $cursor->closeCursor();
+
+        return $children;
+    }
+
+    /**
+     * Delete a share
+     *
+     * @param \OCP\Share\IShare $share
+     */
+    public function delete(\OCP\Share\IShare $share) {
+        $qb = $this->dbConn->getQueryBuilder();
+        $qb->delete('share')
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())));
+
+        /*
 		 * If the share is a group share delete all possible
 		 * user defined groups shares.
 		 */
-		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
-			$qb->orWhere($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())));
-		}
-
-		$qb->execute();
-	}
-
-	/**
-	 * Unshare a share from the recipient. If this is a group share
-	 * this means we need a special entry in the share db.
-	 *
-	 * @param IShare $share
-	 * @param string $recipient UserId of recipient
-	 * @throws BackendError
-	 * @throws ProviderException
-	 */
-	public function deleteFromSelf(IShare $share, $recipient) {
-		if ($share->getShareType() === IShare::TYPE_GROUP) {
-
-			$group = $this->groupManager->get($share->getSharedWith());
-			$user = $this->userManager->get($recipient);
-
-			if (is_null($group)) {
-				throw new ProviderException('Group "' . $share->getSharedWith() . '" does not exist');
-			}
-
-			if (!$group->inGroup($user)) {
-				throw new ProviderException('Recipient not in receiving group');
-			}
-
-			// Try to fetch user specific share
-			$qb = $this->dbConn->getQueryBuilder();
-			$stmt = $qb->select('*')
-				->from('share')
-				->where($qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP)))
-				->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($recipient)))
-				->andWhere($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())))
-				->andWhere($qb->expr()->orX(
-					$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
-					$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
-				))
-				->execute();
-
-			$data = $stmt->fetch();
-
-			/*
+        if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
+            $qb->orWhere($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())));
+        }
+
+        $qb->execute();
+    }
+
+    /**
+     * Unshare a share from the recipient. If this is a group share
+     * this means we need a special entry in the share db.
+     *
+     * @param IShare $share
+     * @param string $recipient UserId of recipient
+     * @throws BackendError
+     * @throws ProviderException
+     */
+    public function deleteFromSelf(IShare $share, $recipient) {
+        if ($share->getShareType() === IShare::TYPE_GROUP) {
+
+            $group = $this->groupManager->get($share->getSharedWith());
+            $user = $this->userManager->get($recipient);
+
+            if (is_null($group)) {
+                throw new ProviderException('Group "' . $share->getSharedWith() . '" does not exist');
+            }
+
+            if (!$group->inGroup($user)) {
+                throw new ProviderException('Recipient not in receiving group');
+            }
+
+            // Try to fetch user specific share
+            $qb = $this->dbConn->getQueryBuilder();
+            $stmt = $qb->select('*')
+                ->from('share')
+                ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP)))
+                ->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($recipient)))
+                ->andWhere($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())))
+                ->andWhere($qb->expr()->orX(
+                    $qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
+                    $qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
+                ))
+                ->execute();
+
+            $data = $stmt->fetch();
+
+            /*
 			 * Check if there already is a user specific group share.
 			 * If there is update it (if required).
 			 */
-			if ($data === false) {
-				$id = $this->createUserSpecificGroupShare($share, $recipient);
-				$permissions = $share->getPermissions();
-			} else {
-				$permissions = $data['permissions'];
-				$id = $data['id'];
-			}
-
-			if ($permissions !== 0) {
-				// Update existing usergroup share
-				$qb = $this->dbConn->getQueryBuilder();
-				$qb->update('share')
-					->set('permissions', $qb->createNamedParameter(0))
-					->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
-					->execute();
-			}
-
-		} else if ($share->getShareType() === IShare::TYPE_USER) {
-
-			if ($share->getSharedWith() !== $recipient) {
-				throw new ProviderException('Recipient does not match');
-			}
-
-			// We can just delete user and link shares
-			$this->delete($share);
-		} else {
-			throw new ProviderException('Invalid shareType');
-		}
-	}
-
-	protected function createUserSpecificGroupShare(IShare $share, string $recipient): int {
-		$type = $share->getNodeType();
-
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->insert('share')
-			->values([
-				'share_type' => $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP),
-				'share_with' => $qb->createNamedParameter($recipient),
-				'uid_owner' => $qb->createNamedParameter($share->getShareOwner()),
-				'uid_initiator' => $qb->createNamedParameter($share->getSharedBy()),
-				'parent' => $qb->createNamedParameter($share->getId()),
-				'item_type' => $qb->createNamedParameter($type),
-				'item_source' => $qb->createNamedParameter($share->getNodeId()),
-				'file_source' => $qb->createNamedParameter($share->getNodeId()),
-				'file_target' => $qb->createNamedParameter($share->getTarget()),
-				'permissions' => $qb->createNamedParameter($share->getPermissions()),
-				'stime' => $qb->createNamedParameter($share->getShareTime()->getTimestamp()),
-			])->execute();
-
-		return $qb->getLastInsertId();
-	}
-
-	/**
-	 * @inheritdoc
-	 *
-	 * For now this only works for group shares
-	 * If this gets implemented for normal shares we have to extend it
-	 */
-	public function restore(IShare $share, string $recipient): IShare {
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->select('permissions')
-			->from('share')
-			->where(
-				$qb->expr()->eq('id', $qb->createNamedParameter($share->getId()))
-			);
-		$cursor = $qb->execute();
-		$data = $cursor->fetch();
-		$cursor->closeCursor();
-
-		$originalPermission = $data['permissions'];
-
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->update('share')
-			->set('permissions', $qb->createNamedParameter($originalPermission))
-			->where(
-				$qb->expr()->eq('parent', $qb->createNamedParameter($share->getParent()))
-			)->andWhere(
-				$qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP))
-			)->andWhere(
-				$qb->expr()->eq('share_with', $qb->createNamedParameter($recipient))
-			);
-
-		$qb->execute();
-
-		return $this->getShareById($share->getId(), $recipient);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function move(\OCP\Share\IShare $share, $recipient) {
-		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER) {
-			// Just update the target
-			$qb = $this->dbConn->getQueryBuilder();
-			$qb->update('share')
-				->set('file_target', $qb->createNamedParameter($share->getTarget()))
-				->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
-				->execute();
-
-		} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
-
-			// Check if there is a usergroup share
-			$qb = $this->dbConn->getQueryBuilder();
-			$stmt = $qb->select('id')
-				->from('share')
-				->where($qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP)))
-				->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($recipient)))
-				->andWhere($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())))
-				->andWhere($qb->expr()->orX(
-					$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
-					$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
-				))
-				->setMaxResults(1)
-				->execute();
-
-			$data = $stmt->fetch();
-			$stmt->closeCursor();
-
-			if ($data === false) {
-				// No usergroup share yet. Create one.
-				$qb = $this->dbConn->getQueryBuilder();
-				$qb->insert('share')
-					->values([
-						'share_type' => $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP),
-						'share_with' => $qb->createNamedParameter($recipient),
-						'uid_owner' => $qb->createNamedParameter($share->getShareOwner()),
-						'uid_initiator' => $qb->createNamedParameter($share->getSharedBy()),
-						'parent' => $qb->createNamedParameter($share->getId()),
-						'item_type' => $qb->createNamedParameter($share->getNodeType()),
-						'item_source' => $qb->createNamedParameter($share->getNodeId()),
-						'file_source' => $qb->createNamedParameter($share->getNodeId()),
-						'file_target' => $qb->createNamedParameter($share->getTarget()),
-						'permissions' => $qb->createNamedParameter($share->getPermissions()),
-						'stime' => $qb->createNamedParameter($share->getShareTime()->getTimestamp()),
-					])->execute();
-			} else {
-				// Already a usergroup share. Update it.
-				$qb = $this->dbConn->getQueryBuilder();
-				$qb->update('share')
-					->set('file_target', $qb->createNamedParameter($share->getTarget()))
-					->where($qb->expr()->eq('id', $qb->createNamedParameter($data['id'])))
-					->execute();
-			}
-		}
-
-		return $share;
-	}
-
-	public function getSharesInFolder($userId, Folder $node, $reshares) {
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->select('*')
-			->from('share', 's')
-			->andWhere($qb->expr()->orX(
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
-			));
-
-		$qb->andWhere($qb->expr()->orX(
-			$qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_USER)),
-			$qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_GROUP)),
-			$qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_LINK))
-		));
-
-		/**
-		 * Reshares for this user are shares where they are the owner.
-		 */
-		if ($reshares === false) {
-			$qb->andWhere($qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId)));
-		} else {
-			$qb->andWhere(
-				$qb->expr()->orX(
-					$qb->expr()->eq('uid_owner', $qb->createNamedParameter($userId)),
-					$qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId))
-				)
-			);
-		}
-
-		$qb->innerJoin('s', 'filecache' ,'f', $qb->expr()->eq('s.file_source', 'f.fileid'));
-		$qb->andWhere($qb->expr()->eq('f.parent', $qb->createNamedParameter($node->getId())));
-
-		$qb->orderBy('id');
-
-		$cursor = $qb->execute();
-		$shares = [];
-		while ($data = $cursor->fetch()) {
-			$shares[$data['fileid']][] = $this->createShare($data);
-		}
-		$cursor->closeCursor();
-
-		return $shares;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getSharesBy($userId, $shareType, $node, $reshares, $limit, $offset) {
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->select('*')
-			->from('share')
-			->andWhere($qb->expr()->orX(
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
-			));
-
-		$qb->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter($shareType)));
-
-		/**
-		 * Reshares for this user are shares where they are the owner.
-		 */
-		if ($reshares === false) {
-			$qb->andWhere($qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId)));
-		} else {
-			if ($node === null) {
-				$qb->andWhere(
-					$qb->expr()->orX(
-						$qb->expr()->eq('uid_owner', $qb->createNamedParameter($userId)),
-						$qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId))
-					)
-				);
-			}
-		}
-
-		if ($node !== null) {
-			$qb->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($node->getId())));
-		}
-
-		if ($limit !== -1) {
-			$qb->setMaxResults($limit);
-		}
-
-		$qb->setFirstResult($offset);
-		$qb->orderBy('id');
-
-		$cursor = $qb->execute();
-		$shares = [];
-		while($data = $cursor->fetch()) {
-			$shares[] = $this->createShare($data);
-		}
-		$cursor->closeCursor();
-
-		return $shares;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getShareById($id, $recipientId = null) {
-		$qb = $this->dbConn->getQueryBuilder();
-
-		$qb->select('*')
-			->from('share')
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
-			->andWhere(
-				$qb->expr()->in(
-					'share_type',
-					$qb->createNamedParameter([
-						\OCP\Share::SHARE_TYPE_USER,
-						\OCP\Share::SHARE_TYPE_GROUP,
-						\OCP\Share::SHARE_TYPE_LINK,
-					], IQueryBuilder::PARAM_INT_ARRAY)
-				)
-			)
-			->andWhere($qb->expr()->orX(
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
-			));
-
-		$cursor = $qb->execute();
-		$data = $cursor->fetch();
-		$cursor->closeCursor();
-
-		if ($data === false) {
-			throw new ShareNotFound();
-		}
-
-		try {
-			$share = $this->createShare($data);
-		} catch (InvalidShare $e) {
-			throw new ShareNotFound();
-		}
-
-		// If the recipient is set for a group share resolve to that user
-		if ($recipientId !== null && $share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
-			$share = $this->resolveGroupShares([$share], $recipientId)[0];
-		}
-
-		return $share;
-	}
-
-	/**
-	 * Get shares for a given path
-	 *
-	 * @param \OCP\Files\Node $path
-	 * @return \OCP\Share\IShare[]
-	 */
-	public function getSharesByPath(Node $path) {
-		$qb = $this->dbConn->getQueryBuilder();
-
-		$cursor = $qb->select('*')
-			->from('share')
-			->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($path->getId())))
-			->andWhere(
-				$qb->expr()->orX(
-					$qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_USER)),
-					$qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_GROUP))
-				)
-			)
-			->andWhere($qb->expr()->orX(
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
-			))
-			->execute();
-
-		$shares = [];
-		while($data = $cursor->fetch()) {
-			$shares[] = $this->createShare($data);
-		}
-		$cursor->closeCursor();
-
-		return $shares;
-	}
-
-	/**
-	 * Returns whether the given database result can be interpreted as
-	 * a share with accessible file (not trashed, not deleted)
-	 */
-	private function isAccessibleResult($data) {
-		// exclude shares leading to deleted file entries
-		if ($data['fileid'] === null) {
-			return false;
-		}
-
-		// exclude shares leading to trashbin on home storages
-		$pathSections = explode('/', $data['path'], 2);
-		// FIXME: would not detect rare md5'd home storage case properly
-		if ($pathSections[0] !== 'files'
-		    	&& in_array(explode(':', $data['storage_string_id'], 2)[0], ['home', 'object'])) {
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getSharedWith($userId, $shareType, $node, $limit, $offset) {
-		/** @var Share[] $shares */
-		$shares = [];
-
-		if ($shareType === \OCP\Share::SHARE_TYPE_USER) {
-			//Get shares directly with this user
-			$qb = $this->dbConn->getQueryBuilder();
-			$qb->select('s.*',
-				'f.fileid', 'f.path', 'f.permissions AS f_permissions', 'f.storage', 'f.path_hash',
-				'f.parent AS f_parent', 'f.name', 'f.mimetype', 'f.mimepart', 'f.size', 'f.mtime', 'f.storage_mtime',
-				'f.encrypted', 'f.unencrypted_size', 'f.etag', 'f.checksum'
-			)
-				->selectAlias('st.id', 'storage_string_id')
-				->from('share', 's')
-				->leftJoin('s', 'filecache', 'f', $qb->expr()->eq('s.file_source', 'f.fileid'))
-				->leftJoin('f', 'storages', 'st', $qb->expr()->eq('f.storage', 'st.numeric_id'));
-
-			// Order by id
-			$qb->orderBy('s.id');
-
-			// Set limit and offset
-			if ($limit !== -1) {
-				$qb->setMaxResults($limit);
-			}
-			$qb->setFirstResult($offset);
-
-			$qb->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_USER)))
-				->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($userId)))
-				->andWhere($qb->expr()->orX(
-					$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
-					$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
-				));
-
-			// Filter by node if provided
-			if ($node !== null) {
-				$qb->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($node->getId())));
-			}
-
-			$cursor = $qb->execute();
-
-			while($data = $cursor->fetch()) {
-				if ($this->isAccessibleResult($data)) {
-					$shares[] = $this->createShare($data);
-				}
-			}
-			$cursor->closeCursor();
-
-		} else if ($shareType === \OCP\Share::SHARE_TYPE_GROUP) {
-			$user = $this->userManager->get($userId);
-			$allGroups = $this->groupManager->getUserGroups($user);
-
-			/** @var Share[] $shares2 */
-			$shares2 = [];
-
-			$start = 0;
-			while(true) {
-				$groups = array_slice($allGroups, $start, 100);
-				$start += 100;
-
-				if ($groups === []) {
-					break;
-				}
-
-				$qb = $this->dbConn->getQueryBuilder();
-				$qb->select('s.*',
-					'f.fileid', 'f.path', 'f.permissions AS f_permissions', 'f.storage', 'f.path_hash',
-					'f.parent AS f_parent', 'f.name', 'f.mimetype', 'f.mimepart', 'f.size', 'f.mtime', 'f.storage_mtime',
-					'f.encrypted', 'f.unencrypted_size', 'f.etag', 'f.checksum'
-				)
-					->selectAlias('st.id', 'storage_string_id')
-					->from('share', 's')
-					->leftJoin('s', 'filecache', 'f', $qb->expr()->eq('s.file_source', 'f.fileid'))
-					->leftJoin('f', 'storages', 'st', $qb->expr()->eq('f.storage', 'st.numeric_id'))
-					->orderBy('s.id')
-					->setFirstResult(0);
-
-				if ($limit !== -1) {
-					$qb->setMaxResults($limit - count($shares));
-				}
-
-				// Filter by node if provided
-				if ($node !== null) {
-					$qb->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($node->getId())));
-				}
-
-
-				$groups = array_filter($groups, function($group) { return $group instanceof IGroup; });
-				$groups = array_map(function(IGroup $group) { return $group->getGID(); }, $groups);
-
-				$qb->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_GROUP)))
-					->andWhere($qb->expr()->in('share_with', $qb->createNamedParameter(
-						$groups,
-						IQueryBuilder::PARAM_STR_ARRAY
-					)))
-					->andWhere($qb->expr()->orX(
-						$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
-						$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
-					));
-
-				$cursor = $qb->execute();
-				while($data = $cursor->fetch()) {
-					if ($offset > 0) {
-						$offset--;
-						continue;
-					}
-
-					if ($this->isAccessibleResult($data)) {
-						$shares2[] = $this->createShare($data);
-					}
-				}
-				$cursor->closeCursor();
-			}
-
-			/*
+            if ($data === false) {
+                $id = $this->createUserSpecificGroupShare($share, $recipient);
+                $permissions = $share->getPermissions();
+            } else {
+                $permissions = $data['permissions'];
+                $id = $data['id'];
+            }
+
+            if ($permissions !== 0) {
+                // Update existing usergroup share
+                $qb = $this->dbConn->getQueryBuilder();
+                $qb->update('share')
+                    ->set('permissions', $qb->createNamedParameter(0))
+                    ->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
+                    ->execute();
+            }
+
+        } else if ($share->getShareType() === IShare::TYPE_USER) {
+
+            if ($share->getSharedWith() !== $recipient) {
+                throw new ProviderException('Recipient does not match');
+            }
+
+            // We can just delete user and link shares
+            $this->delete($share);
+        } else {
+            throw new ProviderException('Invalid shareType');
+        }
+    }
+
+    protected function createUserSpecificGroupShare(IShare $share, string $recipient): int {
+        $type = $share->getNodeType();
+
+        $qb = $this->dbConn->getQueryBuilder();
+        $qb->insert('share')
+            ->values([
+                'share_type' => $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP),
+                'share_with' => $qb->createNamedParameter($recipient),
+                'uid_owner' => $qb->createNamedParameter($share->getShareOwner()),
+                'uid_initiator' => $qb->createNamedParameter($share->getSharedBy()),
+                'parent' => $qb->createNamedParameter($share->getId()),
+                'item_type' => $qb->createNamedParameter($type),
+                'item_source' => $qb->createNamedParameter($share->getNodeId()),
+                'file_source' => $qb->createNamedParameter($share->getNodeId()),
+                'file_target' => $qb->createNamedParameter($share->getTarget()),
+                'permissions' => $qb->createNamedParameter($share->getPermissions()),
+                'stime' => $qb->createNamedParameter($share->getShareTime()->getTimestamp()),
+            ])->execute();
+
+        return $qb->getLastInsertId();
+    }
+
+    /**
+     * @inheritdoc
+     *
+     * For now this only works for group shares
+     * If this gets implemented for normal shares we have to extend it
+     */
+    public function restore(IShare $share, string $recipient): IShare {
+        $qb = $this->dbConn->getQueryBuilder();
+        $qb->select('permissions')
+            ->from('share')
+            ->where(
+                $qb->expr()->eq('id', $qb->createNamedParameter($share->getId()))
+            );
+        $cursor = $qb->execute();
+        $data = $cursor->fetch();
+        $cursor->closeCursor();
+
+        $originalPermission = $data['permissions'];
+
+        $qb = $this->dbConn->getQueryBuilder();
+        $qb->update('share')
+            ->set('permissions', $qb->createNamedParameter($originalPermission))
+            ->where(
+                $qb->expr()->eq('parent', $qb->createNamedParameter($share->getParent()))
+            )->andWhere(
+                $qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP))
+            )->andWhere(
+                $qb->expr()->eq('share_with', $qb->createNamedParameter($recipient))
+            );
+
+        $qb->execute();
+
+        return $this->getShareById($share->getId(), $recipient);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function move(\OCP\Share\IShare $share, $recipient) {
+        if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER) {
+            // Just update the target
+            $qb = $this->dbConn->getQueryBuilder();
+            $qb->update('share')
+                ->set('file_target', $qb->createNamedParameter($share->getTarget()))
+                ->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
+                ->execute();
+
+        } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
+
+            // Check if there is a usergroup share
+            $qb = $this->dbConn->getQueryBuilder();
+            $stmt = $qb->select('id')
+                ->from('share')
+                ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP)))
+                ->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($recipient)))
+                ->andWhere($qb->expr()->eq('parent', $qb->createNamedParameter($share->getId())))
+                ->andWhere($qb->expr()->orX(
+                    $qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
+                    $qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
+                ))
+                ->setMaxResults(1)
+                ->execute();
+
+            $data = $stmt->fetch();
+            $stmt->closeCursor();
+
+            if ($data === false) {
+                // No usergroup share yet. Create one.
+                $qb = $this->dbConn->getQueryBuilder();
+                $qb->insert('share')
+                    ->values([
+                        'share_type' => $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP),
+                        'share_with' => $qb->createNamedParameter($recipient),
+                        'uid_owner' => $qb->createNamedParameter($share->getShareOwner()),
+                        'uid_initiator' => $qb->createNamedParameter($share->getSharedBy()),
+                        'parent' => $qb->createNamedParameter($share->getId()),
+                        'item_type' => $qb->createNamedParameter($share->getNodeType()),
+                        'item_source' => $qb->createNamedParameter($share->getNodeId()),
+                        'file_source' => $qb->createNamedParameter($share->getNodeId()),
+                        'file_target' => $qb->createNamedParameter($share->getTarget()),
+                        'permissions' => $qb->createNamedParameter($share->getPermissions()),
+                        'stime' => $qb->createNamedParameter($share->getShareTime()->getTimestamp()),
+                    ])->execute();
+            } else {
+                // Already a usergroup share. Update it.
+                $qb = $this->dbConn->getQueryBuilder();
+                $qb->update('share')
+                    ->set('file_target', $qb->createNamedParameter($share->getTarget()))
+                    ->where($qb->expr()->eq('id', $qb->createNamedParameter($data['id'])))
+                    ->execute();
+            }
+        }
+
+        return $share;
+    }
+
+    public function getSharesInFolder($userId, Folder $node, $reshares) {
+        $qb = $this->dbConn->getQueryBuilder();
+        $qb->select('*')
+            ->from('share', 's')
+            ->andWhere($qb->expr()->orX(
+                $qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
+                $qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
+            ));
+
+        $qb->andWhere($qb->expr()->orX(
+            $qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_USER)),
+            $qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_GROUP)),
+            $qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_LINK))
+        ));
+
+        /**
+         * Reshares for this user are shares where they are the owner.
+         */
+        if ($reshares === false) {
+            $qb->andWhere($qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId)));
+        } else {
+            $qb->andWhere(
+                $qb->expr()->orX(
+                    $qb->expr()->eq('uid_owner', $qb->createNamedParameter($userId)),
+                    $qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId))
+                )
+            );
+        }
+
+        $qb->innerJoin('s', 'filecache' ,'f', $qb->expr()->eq('s.file_source', 'f.fileid'));
+        $qb->andWhere($qb->expr()->eq('f.parent', $qb->createNamedParameter($node->getId())));
+
+        $qb->orderBy('id');
+
+        $cursor = $qb->execute();
+        $shares = [];
+        while ($data = $cursor->fetch()) {
+            $shares[$data['fileid']][] = $this->createShare($data);
+        }
+        $cursor->closeCursor();
+
+        return $shares;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSharesBy($userId, $shareType, $node, $reshares, $limit, $offset) {
+        $qb = $this->dbConn->getQueryBuilder();
+        $qb->select('*')
+            ->from('share')
+            ->andWhere($qb->expr()->orX(
+                $qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
+                $qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
+            ));
+
+        $qb->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter($shareType)));
+
+        /**
+         * Reshares for this user are shares where they are the owner.
+         */
+        if ($reshares === false) {
+            $qb->andWhere($qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId)));
+        } else {
+            if ($node === null) {
+                $qb->andWhere(
+                    $qb->expr()->orX(
+                        $qb->expr()->eq('uid_owner', $qb->createNamedParameter($userId)),
+                        $qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId))
+                    )
+                );
+            }
+        }
+
+        if ($node !== null) {
+            $qb->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($node->getId())));
+        }
+
+        if ($limit !== -1) {
+            $qb->setMaxResults($limit);
+        }
+
+        $qb->setFirstResult($offset);
+        $qb->orderBy('id');
+
+        $cursor = $qb->execute();
+        $shares = [];
+        while($data = $cursor->fetch()) {
+            $shares[] = $this->createShare($data);
+        }
+        $cursor->closeCursor();
+
+        return $shares;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getShareById($id, $recipientId = null) {
+        $qb = $this->dbConn->getQueryBuilder();
+
+        $qb->select('*')
+            ->from('share')
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
+            ->andWhere(
+                $qb->expr()->in(
+                    'share_type',
+                    $qb->createNamedParameter([
+                        \OCP\Share::SHARE_TYPE_USER,
+                        \OCP\Share::SHARE_TYPE_GROUP,
+                        \OCP\Share::SHARE_TYPE_LINK,
+                    ], IQueryBuilder::PARAM_INT_ARRAY)
+                )
+            )
+            ->andWhere($qb->expr()->orX(
+                $qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
+                $qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
+            ));
+
+        $cursor = $qb->execute();
+        $data = $cursor->fetch();
+        $cursor->closeCursor();
+
+        if ($data === false) {
+            throw new ShareNotFound();
+        }
+
+        try {
+            $share = $this->createShare($data);
+        } catch (InvalidShare $e) {
+            throw new ShareNotFound();
+        }
+
+        // If the recipient is set for a group share resolve to that user
+        if ($recipientId !== null && $share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
+            $share = $this->resolveGroupShares([$share], $recipientId)[0];
+        }
+
+        return $share;
+    }
+
+    /**
+     * Get shares for a given path
+     *
+     * @param \OCP\Files\Node $path
+     * @return \OCP\Share\IShare[]
+     */
+    public function getSharesByPath(Node $path) {
+        $qb = $this->dbConn->getQueryBuilder();
+
+        $cursor = $qb->select('*')
+            ->from('share')
+            ->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($path->getId())))
+            ->andWhere(
+                $qb->expr()->orX(
+                    $qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_USER)),
+                    $qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_GROUP))
+                )
+            )
+            ->andWhere($qb->expr()->orX(
+                $qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
+                $qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
+            ))
+            ->execute();
+
+        $shares = [];
+        while($data = $cursor->fetch()) {
+            $shares[] = $this->createShare($data);
+        }
+        $cursor->closeCursor();
+
+        return $shares;
+    }
+
+    /**
+     * Returns whether the given database result can be interpreted as
+     * a share with accessible file (not trashed, not deleted)
+     */
+    private function isAccessibleResult($data) {
+        // exclude shares leading to deleted file entries
+        if ($data['fileid'] === null) {
+            return false;
+        }
+
+        // exclude shares leading to trashbin on home storages
+        $pathSections = explode('/', $data['path'], 2);
+        // FIXME: would not detect rare md5'd home storage case properly
+        if ($pathSections[0] !== 'files'
+                && in_array(explode(':', $data['storage_string_id'], 2)[0], ['home', 'object'])) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSharedWith($userId, $shareType, $node, $limit, $offset) {
+        /** @var Share[] $shares */
+        $shares = [];
+
+        if ($shareType === \OCP\Share::SHARE_TYPE_USER) {
+            //Get shares directly with this user
+            $qb = $this->dbConn->getQueryBuilder();
+            $qb->select('s.*',
+                'f.fileid', 'f.path', 'f.permissions AS f_permissions', 'f.storage', 'f.path_hash',
+                'f.parent AS f_parent', 'f.name', 'f.mimetype', 'f.mimepart', 'f.size', 'f.mtime', 'f.storage_mtime',
+                'f.encrypted', 'f.unencrypted_size', 'f.etag', 'f.checksum'
+            )
+                ->selectAlias('st.id', 'storage_string_id')
+                ->from('share', 's')
+                ->leftJoin('s', 'filecache', 'f', $qb->expr()->eq('s.file_source', 'f.fileid'))
+                ->leftJoin('f', 'storages', 'st', $qb->expr()->eq('f.storage', 'st.numeric_id'));
+
+            // Order by id
+            $qb->orderBy('s.id');
+
+            // Set limit and offset
+            if ($limit !== -1) {
+                $qb->setMaxResults($limit);
+            }
+            $qb->setFirstResult($offset);
+
+            $qb->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_USER)))
+                ->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($userId)))
+                ->andWhere($qb->expr()->orX(
+                    $qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
+                    $qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
+                ));
+
+            // Filter by node if provided
+            if ($node !== null) {
+                $qb->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($node->getId())));
+            }
+
+            $cursor = $qb->execute();
+
+            while($data = $cursor->fetch()) {
+                if ($this->isAccessibleResult($data)) {
+                    $shares[] = $this->createShare($data);
+                }
+            }
+            $cursor->closeCursor();
+
+        } else if ($shareType === \OCP\Share::SHARE_TYPE_GROUP) {
+            $user = $this->userManager->get($userId);
+            $allGroups = $this->groupManager->getUserGroups($user);
+
+            /** @var Share[] $shares2 */
+            $shares2 = [];
+
+            $start = 0;
+            while(true) {
+                $groups = array_slice($allGroups, $start, 100);
+                $start += 100;
+
+                if ($groups === []) {
+                    break;
+                }
+
+                $qb = $this->dbConn->getQueryBuilder();
+                $qb->select('s.*',
+                    'f.fileid', 'f.path', 'f.permissions AS f_permissions', 'f.storage', 'f.path_hash',
+                    'f.parent AS f_parent', 'f.name', 'f.mimetype', 'f.mimepart', 'f.size', 'f.mtime', 'f.storage_mtime',
+                    'f.encrypted', 'f.unencrypted_size', 'f.etag', 'f.checksum'
+                )
+                    ->selectAlias('st.id', 'storage_string_id')
+                    ->from('share', 's')
+                    ->leftJoin('s', 'filecache', 'f', $qb->expr()->eq('s.file_source', 'f.fileid'))
+                    ->leftJoin('f', 'storages', 'st', $qb->expr()->eq('f.storage', 'st.numeric_id'))
+                    ->orderBy('s.id')
+                    ->setFirstResult(0);
+
+                if ($limit !== -1) {
+                    $qb->setMaxResults($limit - count($shares));
+                }
+
+                // Filter by node if provided
+                if ($node !== null) {
+                    $qb->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($node->getId())));
+                }
+
+
+                $groups = array_filter($groups, function($group) { return $group instanceof IGroup; });
+                $groups = array_map(function(IGroup $group) { return $group->getGID(); }, $groups);
+
+                $qb->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_GROUP)))
+                    ->andWhere($qb->expr()->in('share_with', $qb->createNamedParameter(
+                        $groups,
+                        IQueryBuilder::PARAM_STR_ARRAY
+                    )))
+                    ->andWhere($qb->expr()->orX(
+                        $qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
+                        $qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
+                    ));
+
+                $cursor = $qb->execute();
+                while($data = $cursor->fetch()) {
+                    if ($offset > 0) {
+                        $offset--;
+                        continue;
+                    }
+
+                    if ($this->isAccessibleResult($data)) {
+                        $shares2[] = $this->createShare($data);
+                    }
+                }
+                $cursor->closeCursor();
+            }
+
+            /*
  			 * Resolve all group shares to user specific shares
  			 */
-			$shares = $this->resolveGroupShares($shares2, $userId);
-		} else {
-			throw new BackendError('Invalid backend');
-		}
-
-
-		return $shares;
-	}
-
-	/**
-	 * Get a share by token
-	 *
-	 * @param string $token
-	 * @return \OCP\Share\IShare
-	 * @throws ShareNotFound
-	 */
-	public function getShareByToken($token) {
-		$qb = $this->dbConn->getQueryBuilder();
-
-		$cursor = $qb->select('*')
-			->from('share')
-			->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_LINK)))
-			->andWhere($qb->expr()->eq('token', $qb->createNamedParameter($token)))
-			->andWhere($qb->expr()->orX(
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
-			))
-			->execute();
-
-		$data = $cursor->fetch();
-
-		if ($data === false) {
-			throw new ShareNotFound();
-		}
-
-		try {
-			$share = $this->createShare($data);
-		} catch (InvalidShare $e) {
-			throw new ShareNotFound();
-		}
-
-		return $share;
-	}
-
-	/**
-	 * Create a share object from an database row
-	 *
-	 * @param mixed[] $data
-	 * @return \OCP\Share\IShare
-	 * @throws InvalidShare
-	 */
-	private function createShare($data) {
-		$share = new Share($this->rootFolder, $this->userManager);
-		$share->setId((int)$data['id'])
-			->setShareType((int)$data['share_type'])
-			->setPermissions((int)$data['permissions'])
-			->setTarget($data['file_target'])
-			->setNote($data['note'])
-			->setMailSend((bool)$data['mail_send'])
-			->setStatus((int)$data['accepted'])
-			->setLabel($data['label']);
-
-		$shareTime = new \DateTime();
-		$shareTime->setTimestamp((int)$data['stime']);
-		$share->setShareTime($shareTime);
-
-		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER) {
-			$share->setSharedWith($data['share_with']);
-			$user = $this->userManager->get($data['share_with']);
-			if ($user !== null) {
-				$share->setSharedWithDisplayName($user->getDisplayName());
-			}
-		} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
-			$share->setSharedWith($data['share_with']);
-		} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK) {
-			$share->setPassword($data['password']);
-			$share->setSendPasswordByTalk((bool)$data['password_by_talk']);
-			$share->setToken($data['token']);
-		}
-
-		$share->setSharedBy($data['uid_initiator']);
-		$share->setShareOwner($data['uid_owner']);
-
-		$share->setNodeId((int)$data['file_source']);
-		$share->setNodeType($data['item_type']);
-
-		if ($data['expiration'] !== null) {
-			$expiration = \DateTime::createFromFormat('Y-m-d H:i:s', $data['expiration']);
-			$share->setExpirationDate($expiration);
-		}
-
-		if (isset($data['f_permissions'])) {
-			$entryData = $data;
-			$entryData['permissions'] = $entryData['f_permissions'];
-			$entryData['parent'] = $entryData['f_parent'];
-			$share->setNodeCacheEntry(Cache::cacheEntryFromData($entryData,
-				\OC::$server->getMimeTypeLoader()));
-		}
-
-		$share->setProviderId($this->identifier());
-		$share->setHideDownload((int)$data['hide_download'] === 1);
-
-		return $share;
-	}
-
-	/**
-	 * @param Share[] $shares
-	 * @param $userId
-	 * @return Share[] The updates shares if no update is found for a share return the original
-	 */
-	private function resolveGroupShares($shares, $userId) {
-		$result = [];
-
-		$start = 0;
-		while(true) {
-			/** @var Share[] $shareSlice */
-			$shareSlice = array_slice($shares, $start, 100);
-			$start += 100;
-
-			if ($shareSlice === []) {
-				break;
-			}
-
-			/** @var int[] $ids */
-			$ids = [];
-			/** @var Share[] $shareMap */
-			$shareMap = [];
-
-			foreach ($shareSlice as $share) {
-				$ids[] = (int)$share->getId();
-				$shareMap[$share->getId()] = $share;
-			}
-
-			$qb = $this->dbConn->getQueryBuilder();
-
-			$query = $qb->select('*')
-				->from('share')
-				->where($qb->expr()->in('parent', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)))
-				->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($userId)))
-				->andWhere($qb->expr()->orX(
-					$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
-					$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
-				));
-
-			$stmt = $query->execute();
-
-			while($data = $stmt->fetch()) {
-				$shareMap[$data['parent']]->setPermissions((int)$data['permissions']);
-				$shareMap[$data['parent']]->setStatus((int)$data['accepted']);
-				$shareMap[$data['parent']]->setTarget($data['file_target']);
-				$shareMap[$data['parent']]->setParent($data['parent']);
-			}
-
-			$stmt->closeCursor();
-
-			foreach ($shareMap as $share) {
-				$result[] = $share;
-			}
-		}
-
-		return $result;
-	}
-
-	/**
-	 * A user is deleted from the system
-	 * So clean up the relevant shares.
-	 *
-	 * @param string $uid
-	 * @param int $shareType
-	 */
-	public function userDeleted($uid, $shareType) {
-		$qb = $this->dbConn->getQueryBuilder();
-
-		$qb->delete('share');
-
-		if ($shareType === \OCP\Share::SHARE_TYPE_USER) {
-			/*
+            $shares = $this->resolveGroupShares($shares2, $userId);
+        } else {
+            throw new BackendError('Invalid backend');
+        }
+
+
+        return $shares;
+    }
+
+    /**
+     * Get a share by token
+     *
+     * @param string $token
+     * @return \OCP\Share\IShare
+     * @throws ShareNotFound
+     */
+    public function getShareByToken($token) {
+        $qb = $this->dbConn->getQueryBuilder();
+
+        $cursor = $qb->select('*')
+            ->from('share')
+            ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_LINK)))
+            ->andWhere($qb->expr()->eq('token', $qb->createNamedParameter($token)))
+            ->andWhere($qb->expr()->orX(
+                $qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
+                $qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
+            ))
+            ->execute();
+
+        $data = $cursor->fetch();
+
+        if ($data === false) {
+            throw new ShareNotFound();
+        }
+
+        try {
+            $share = $this->createShare($data);
+        } catch (InvalidShare $e) {
+            throw new ShareNotFound();
+        }
+
+        return $share;
+    }
+
+    /**
+     * Create a share object from an database row
+     *
+     * @param mixed[] $data
+     * @return \OCP\Share\IShare
+     * @throws InvalidShare
+     */
+    private function createShare($data) {
+        $share = new Share($this->rootFolder, $this->userManager);
+        $share->setId((int)$data['id'])
+            ->setShareType((int)$data['share_type'])
+            ->setPermissions((int)$data['permissions'])
+            ->setTarget($data['file_target'])
+            ->setNote($data['note'])
+            ->setMailSend((bool)$data['mail_send'])
+            ->setStatus((int)$data['accepted'])
+            ->setLabel($data['label']);
+
+        $shareTime = new \DateTime();
+        $shareTime->setTimestamp((int)$data['stime']);
+        $share->setShareTime($shareTime);
+
+        if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER) {
+            $share->setSharedWith($data['share_with']);
+            $user = $this->userManager->get($data['share_with']);
+            if ($user !== null) {
+                $share->setSharedWithDisplayName($user->getDisplayName());
+            }
+        } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
+            $share->setSharedWith($data['share_with']);
+        } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK) {
+            $share->setPassword($data['password']);
+            $share->setSendPasswordByTalk((bool)$data['password_by_talk']);
+            $share->setToken($data['token']);
+        }
+
+        $share->setSharedBy($data['uid_initiator']);
+        $share->setShareOwner($data['uid_owner']);
+
+        $share->setNodeId((int)$data['file_source']);
+        $share->setNodeType($data['item_type']);
+
+        if ($data['expiration'] !== null) {
+            $expiration = \DateTime::createFromFormat('Y-m-d H:i:s', $data['expiration']);
+            $share->setExpirationDate($expiration);
+        }
+
+        if (isset($data['f_permissions'])) {
+            $entryData = $data;
+            $entryData['permissions'] = $entryData['f_permissions'];
+            $entryData['parent'] = $entryData['f_parent'];
+            $share->setNodeCacheEntry(Cache::cacheEntryFromData($entryData,
+                \OC::$server->getMimeTypeLoader()));
+        }
+
+        $share->setProviderId($this->identifier());
+        $share->setHideDownload((int)$data['hide_download'] === 1);
+
+        return $share;
+    }
+
+    /**
+     * @param Share[] $shares
+     * @param $userId
+     * @return Share[] The updates shares if no update is found for a share return the original
+     */
+    private function resolveGroupShares($shares, $userId) {
+        $result = [];
+
+        $start = 0;
+        while(true) {
+            /** @var Share[] $shareSlice */
+            $shareSlice = array_slice($shares, $start, 100);
+            $start += 100;
+
+            if ($shareSlice === []) {
+                break;
+            }
+
+            /** @var int[] $ids */
+            $ids = [];
+            /** @var Share[] $shareMap */
+            $shareMap = [];
+
+            foreach ($shareSlice as $share) {
+                $ids[] = (int)$share->getId();
+                $shareMap[$share->getId()] = $share;
+            }
+
+            $qb = $this->dbConn->getQueryBuilder();
+
+            $query = $qb->select('*')
+                ->from('share')
+                ->where($qb->expr()->in('parent', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)))
+                ->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($userId)))
+                ->andWhere($qb->expr()->orX(
+                    $qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
+                    $qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
+                ));
+
+            $stmt = $query->execute();
+
+            while($data = $stmt->fetch()) {
+                $shareMap[$data['parent']]->setPermissions((int)$data['permissions']);
+                $shareMap[$data['parent']]->setStatus((int)$data['accepted']);
+                $shareMap[$data['parent']]->setTarget($data['file_target']);
+                $shareMap[$data['parent']]->setParent($data['parent']);
+            }
+
+            $stmt->closeCursor();
+
+            foreach ($shareMap as $share) {
+                $result[] = $share;
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * A user is deleted from the system
+     * So clean up the relevant shares.
+     *
+     * @param string $uid
+     * @param int $shareType
+     */
+    public function userDeleted($uid, $shareType) {
+        $qb = $this->dbConn->getQueryBuilder();
+
+        $qb->delete('share');
+
+        if ($shareType === \OCP\Share::SHARE_TYPE_USER) {
+            /*
 			 * Delete all user shares that are owned by this user
 			 * or that are received by this user
 			 */
 
-			$qb->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_USER)));
+            $qb->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_USER)));
 
-			$qb->andWhere(
-				$qb->expr()->orX(
-					$qb->expr()->eq('uid_owner', $qb->createNamedParameter($uid)),
-					$qb->expr()->eq('share_with', $qb->createNamedParameter($uid))
-				)
-			);
-		} else if ($shareType === \OCP\Share::SHARE_TYPE_GROUP) {
-			/*
+            $qb->andWhere(
+                $qb->expr()->orX(
+                    $qb->expr()->eq('uid_owner', $qb->createNamedParameter($uid)),
+                    $qb->expr()->eq('share_with', $qb->createNamedParameter($uid))
+                )
+            );
+        } else if ($shareType === \OCP\Share::SHARE_TYPE_GROUP) {
+            /*
 			 * Delete all group shares that are owned by this user
 			 * Or special user group shares that are received by this user
 			 */
-			$qb->where(
-				$qb->expr()->andX(
-					$qb->expr()->orX(
-						$qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_GROUP)),
-						$qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP))
-					),
-					$qb->expr()->eq('uid_owner', $qb->createNamedParameter($uid))
-				)
-			);
-
-			$qb->orWhere(
-				$qb->expr()->andX(
-					$qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP)),
-					$qb->expr()->eq('share_with', $qb->createNamedParameter($uid))
-				)
-			);
-		} else if ($shareType === \OCP\Share::SHARE_TYPE_LINK) {
-			/*
+            $qb->where(
+                $qb->expr()->andX(
+                    $qb->expr()->orX(
+                        $qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_GROUP)),
+                        $qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP))
+                    ),
+                    $qb->expr()->eq('uid_owner', $qb->createNamedParameter($uid))
+                )
+            );
+
+            $qb->orWhere(
+                $qb->expr()->andX(
+                    $qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP)),
+                    $qb->expr()->eq('share_with', $qb->createNamedParameter($uid))
+                )
+            );
+        } else if ($shareType === \OCP\Share::SHARE_TYPE_LINK) {
+            /*
 			 * Delete all link shares owned by this user.
 			 * And all link shares initiated by this user (until #22327 is in)
 			 */
-			$qb->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_LINK)));
-
-			$qb->andWhere(
-				$qb->expr()->orX(
-					$qb->expr()->eq('uid_owner', $qb->createNamedParameter($uid)),
-					$qb->expr()->eq('uid_initiator', $qb->createNamedParameter($uid))
-				)
-			);
-		} else {
-			\OC::$server->getLogger()->logException(new \InvalidArgumentException('Default share provider tried to delete all shares for type: ' . $shareType));
-			return;
-		}
-
-		$qb->execute();
-	}
-
-	/**
-	 * Delete all shares received by this group. As well as any custom group
-	 * shares for group members.
-	 *
-	 * @param string $gid
-	 */
-	public function groupDeleted($gid) {
-		/*
+            $qb->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_LINK)));
+
+            $qb->andWhere(
+                $qb->expr()->orX(
+                    $qb->expr()->eq('uid_owner', $qb->createNamedParameter($uid)),
+                    $qb->expr()->eq('uid_initiator', $qb->createNamedParameter($uid))
+                )
+            );
+        } else {
+            \OC::$server->getLogger()->logException(new \InvalidArgumentException('Default share provider tried to delete all shares for type: ' . $shareType));
+            return;
+        }
+
+        $qb->execute();
+    }
+
+    /**
+     * Delete all shares received by this group. As well as any custom group
+     * shares for group members.
+     *
+     * @param string $gid
+     */
+    public function groupDeleted($gid) {
+        /*
 		 * First delete all custom group shares for group members
 		 */
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->select('id')
-			->from('share')
-			->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_GROUP)))
-			->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($gid)));
-
-		$cursor = $qb->execute();
-		$ids = [];
-		while($row = $cursor->fetch()) {
-			$ids[] = (int)$row['id'];
-		}
-		$cursor->closeCursor();
-
-		if (!empty($ids)) {
-			$chunks = array_chunk($ids, 100);
-			foreach ($chunks as $chunk) {
-				$qb->delete('share')
-					->where($qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP)))
-					->andWhere($qb->expr()->in('parent', $qb->createNamedParameter($chunk, IQueryBuilder::PARAM_INT_ARRAY)));
-				$qb->execute();
-			}
-		}
-
-		/*
+        $qb = $this->dbConn->getQueryBuilder();
+        $qb->select('id')
+            ->from('share')
+            ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_GROUP)))
+            ->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($gid)));
+
+        $cursor = $qb->execute();
+        $ids = [];
+        while($row = $cursor->fetch()) {
+            $ids[] = (int)$row['id'];
+        }
+        $cursor->closeCursor();
+
+        if (!empty($ids)) {
+            $chunks = array_chunk($ids, 100);
+            foreach ($chunks as $chunk) {
+                $qb->delete('share')
+                    ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP)))
+                    ->andWhere($qb->expr()->in('parent', $qb->createNamedParameter($chunk, IQueryBuilder::PARAM_INT_ARRAY)));
+                $qb->execute();
+            }
+        }
+
+        /*
 		 * Now delete all the group shares
 		 */
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->delete('share')
-			->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_GROUP)))
-			->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($gid)));
-		$qb->execute();
-	}
-
-	/**
-	 * Delete custom group shares to this group for this user
-	 *
-	 * @param string $uid
-	 * @param string $gid
-	 */
-	public function userDeletedFromGroup($uid, $gid) {
-		/*
+        $qb = $this->dbConn->getQueryBuilder();
+        $qb->delete('share')
+            ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_GROUP)))
+            ->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($gid)));
+        $qb->execute();
+    }
+
+    /**
+     * Delete custom group shares to this group for this user
+     *
+     * @param string $uid
+     * @param string $gid
+     */
+    public function userDeletedFromGroup($uid, $gid) {
+        /*
 		 * Get all group shares
 		 */
-		$qb = $this->dbConn->getQueryBuilder();
-		$qb->select('id')
-			->from('share')
-			->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_GROUP)))
-			->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($gid)));
-
-		$cursor = $qb->execute();
-		$ids = [];
-		while($row = $cursor->fetch()) {
-			$ids[] = (int)$row['id'];
-		}
-		$cursor->closeCursor();
-
-		if (!empty($ids)) {
-			$chunks = array_chunk($ids, 100);
-			foreach ($chunks as $chunk) {
-				/*
+        $qb = $this->dbConn->getQueryBuilder();
+        $qb->select('id')
+            ->from('share')
+            ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_GROUP)))
+            ->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($gid)));
+
+        $cursor = $qb->execute();
+        $ids = [];
+        while($row = $cursor->fetch()) {
+            $ids[] = (int)$row['id'];
+        }
+        $cursor->closeCursor();
+
+        if (!empty($ids)) {
+            $chunks = array_chunk($ids, 100);
+            foreach ($chunks as $chunk) {
+                /*
 				 * Delete all special shares wit this users for the found group shares
 				 */
-				$qb->delete('share')
-					->where($qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP)))
-					->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($uid)))
-					->andWhere($qb->expr()->in('parent', $qb->createNamedParameter($chunk, IQueryBuilder::PARAM_INT_ARRAY)));
-				$qb->execute();
-			}
-		}
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getAccessList($nodes, $currentAccess) {
-		$ids = [];
-		foreach ($nodes as $node) {
-			$ids[] = $node->getId();
-		}
-
-		$qb = $this->dbConn->getQueryBuilder();
-
-		$or = $qb->expr()->orX(
-			$qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_USER)),
-			$qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_GROUP)),
-			$qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_LINK))
-		);
-
-		if ($currentAccess) {
-			$or->add($qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP)));
-		}
-
-		$qb->select('id', 'parent', 'share_type', 'share_with', 'file_source', 'file_target', 'permissions')
-			->from('share')
-			->where(
-				$or
-			)
-			->andWhere($qb->expr()->in('file_source', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)))
-			->andWhere($qb->expr()->orX(
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
-			));
-		$cursor = $qb->execute();
-
-		$users = [];
-		$link = false;
-		while($row = $cursor->fetch()) {
-			$type = (int)$row['share_type'];
-			if ($type === \OCP\Share::SHARE_TYPE_USER) {
-				$uid = $row['share_with'];
-				$users[$uid] = isset($users[$uid]) ? $users[$uid] : [];
-				$users[$uid][$row['id']] = $row;
-			} else if ($type === \OCP\Share::SHARE_TYPE_GROUP) {
-				$gid = $row['share_with'];
-				$group = $this->groupManager->get($gid);
-
-				if ($group === null) {
-					continue;
-				}
-
-				$userList = $group->getUsers();
-				foreach ($userList as $user) {
-					$uid = $user->getUID();
-					$users[$uid] = isset($users[$uid]) ? $users[$uid] : [];
-					$users[$uid][$row['id']] = $row;
-				}
-			} else if ($type === \OCP\Share::SHARE_TYPE_LINK) {
-				$link = true;
-			} else if ($type === self::SHARE_TYPE_USERGROUP && $currentAccess === true) {
-				$uid = $row['share_with'];
-				$users[$uid] = isset($users[$uid]) ? $users[$uid] : [];
-				$users[$uid][$row['id']] = $row;
-			}
-		}
-		$cursor->closeCursor();
-
-		if ($currentAccess === true) {
-			$users = array_map([$this, 'filterSharesOfUser'], $users);
-			$users = array_filter($users);
-		} else {
-			$users = array_keys($users);
-		}
-
-		return ['users' => $users, 'public' => $link];
-	}
-
-	/**
-	 * For each user the path with the fewest slashes is returned
-	 * @param array $shares
-	 * @return array
-	 */
-	protected function filterSharesOfUser(array $shares) {
-		// Group shares when the user has a share exception
-		foreach ($shares as $id => $share) {
-			$type = (int) $share['share_type'];
-			$permissions = (int) $share['permissions'];
-
-			if ($type === self::SHARE_TYPE_USERGROUP) {
-				unset($shares[$share['parent']]);
-
-				if ($permissions === 0) {
-					unset($shares[$id]);
-				}
-			}
-		}
-
-		$best = [];
-		$bestDepth = 0;
-		foreach ($shares as $id => $share) {
-			$depth = substr_count($share['file_target'], '/');
-			if (empty($best) || $depth < $bestDepth) {
-				$bestDepth = $depth;
-				$best = [
-					'node_id' => $share['file_source'],
-					'node_path' => $share['file_target'],
-				];
-			}
-		}
-
-		return $best;
-	}
-
-	/**
-	 * propagate notes to the recipients
-	 *
-	 * @param IShare $share
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	private function propagateNote(IShare $share) {
-		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER) {
-			$user = $this->userManager->get($share->getSharedWith());
-			$this->sendNote([$user], $share);
-		} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
-			$group = $this->groupManager->get($share->getSharedWith());
-			$groupMembers = $group->getUsers();
-			$this->sendNote($groupMembers, $share);
-		}
-	}
-
-	/**
-	 * send note by mail
-	 *
-	 * @param array $recipients
-	 * @param IShare $share
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	private function sendNote(array $recipients, IShare $share) {
-
-		$toList = [];
-
-		foreach ($recipients as $recipient) {
-			/** @var IUser $recipient */
-			$email = $recipient->getEMailAddress();
-			if ($email) {
-				$toList[$email] = $recipient->getDisplayName();
-			}
-		}
-
-		if (!empty($toList)) {
-
-			$filename = $share->getNode()->getName();
-			$initiator = $share->getSharedBy();
-			$note = $share->getNote();
-
-			$initiatorUser = $this->userManager->get($initiator);
-			$initiatorDisplayName = ($initiatorUser instanceof IUser) ? $initiatorUser->getDisplayName() : $initiator;
-			$initiatorEmailAddress = ($initiatorUser instanceof IUser) ? $initiatorUser->getEMailAddress() : null;
-			$plainHeading = $this->l->t('%1$s shared »%2$s« with you and wants to add:', [$initiatorDisplayName, $filename]);
-			$htmlHeading = $this->l->t('%1$s shared »%2$s« with you and wants to add', [$initiatorDisplayName, $filename]);
-			$message = $this->mailer->createMessage();
-
-			$emailTemplate = $this->mailer->createEMailTemplate('defaultShareProvider.sendNote');
-
-			$emailTemplate->setSubject($this->l->t('»%s« added a note to a file shared with you', [$initiatorDisplayName]));
-			$emailTemplate->addHeader();
-			$emailTemplate->addHeading($htmlHeading, $plainHeading);
-			$emailTemplate->addBodyText(htmlspecialchars($note), $note);
-
-			$link = $this->urlGenerator->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $share->getNode()->getId()]);
-			$emailTemplate->addBodyButton(
-				$this->l->t('Open »%s«', [$filename]),
-				$link
-			);
-
-
-			// The "From" contains the sharers name
-			$instanceName = $this->defaults->getName();
-			$senderName = $this->l->t(
-				'%1$s via %2$s',
-				[
-					$initiatorDisplayName,
-					$instanceName
-				]
-			);
-			$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
-			if ($initiatorEmailAddress !== null) {
-				$message->setReplyTo([$initiatorEmailAddress => $initiatorDisplayName]);
-				$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
-			} else {
-				$emailTemplate->addFooter();
-			}
-
-			if (count($toList) === 1) {
-				$message->setTo($toList);
-			} else {
-				$message->setTo([]);
-				$message->setBcc($toList);
-			}
-			$message->useTemplate($emailTemplate);
-			$this->mailer->send($message);
-		}
-
-	}
-
-	public function getAllShares(): iterable {
-		$qb = $this->dbConn->getQueryBuilder();
-
-		$qb->select('*')
-			->from('share')
-			->where(
-				$qb->expr()->orX(
-					$qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share\IShare::TYPE_USER)),
-					$qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share\IShare::TYPE_GROUP)),
-					$qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share\IShare::TYPE_LINK))
-				)
-			);
-
-		$cursor = $qb->execute();
-		while($data = $cursor->fetch()) {
-			try {
-				$share = $this->createShare($data);
-			} catch (InvalidShare $e) {
-				continue;
-			}
-
-			yield $share;
-		}
-		$cursor->closeCursor();
-	}
+                $qb->delete('share')
+                    ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP)))
+                    ->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($uid)))
+                    ->andWhere($qb->expr()->in('parent', $qb->createNamedParameter($chunk, IQueryBuilder::PARAM_INT_ARRAY)));
+                $qb->execute();
+            }
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAccessList($nodes, $currentAccess) {
+        $ids = [];
+        foreach ($nodes as $node) {
+            $ids[] = $node->getId();
+        }
+
+        $qb = $this->dbConn->getQueryBuilder();
+
+        $or = $qb->expr()->orX(
+            $qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_USER)),
+            $qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_GROUP)),
+            $qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_LINK))
+        );
+
+        if ($currentAccess) {
+            $or->add($qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USERGROUP)));
+        }
+
+        $qb->select('id', 'parent', 'share_type', 'share_with', 'file_source', 'file_target', 'permissions')
+            ->from('share')
+            ->where(
+                $or
+            )
+            ->andWhere($qb->expr()->in('file_source', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)))
+            ->andWhere($qb->expr()->orX(
+                $qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
+                $qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
+            ));
+        $cursor = $qb->execute();
+
+        $users = [];
+        $link = false;
+        while($row = $cursor->fetch()) {
+            $type = (int)$row['share_type'];
+            if ($type === \OCP\Share::SHARE_TYPE_USER) {
+                $uid = $row['share_with'];
+                $users[$uid] = isset($users[$uid]) ? $users[$uid] : [];
+                $users[$uid][$row['id']] = $row;
+            } else if ($type === \OCP\Share::SHARE_TYPE_GROUP) {
+                $gid = $row['share_with'];
+                $group = $this->groupManager->get($gid);
+
+                if ($group === null) {
+                    continue;
+                }
+
+                $userList = $group->getUsers();
+                foreach ($userList as $user) {
+                    $uid = $user->getUID();
+                    $users[$uid] = isset($users[$uid]) ? $users[$uid] : [];
+                    $users[$uid][$row['id']] = $row;
+                }
+            } else if ($type === \OCP\Share::SHARE_TYPE_LINK) {
+                $link = true;
+            } else if ($type === self::SHARE_TYPE_USERGROUP && $currentAccess === true) {
+                $uid = $row['share_with'];
+                $users[$uid] = isset($users[$uid]) ? $users[$uid] : [];
+                $users[$uid][$row['id']] = $row;
+            }
+        }
+        $cursor->closeCursor();
+
+        if ($currentAccess === true) {
+            $users = array_map([$this, 'filterSharesOfUser'], $users);
+            $users = array_filter($users);
+        } else {
+            $users = array_keys($users);
+        }
+
+        return ['users' => $users, 'public' => $link];
+    }
+
+    /**
+     * For each user the path with the fewest slashes is returned
+     * @param array $shares
+     * @return array
+     */
+    protected function filterSharesOfUser(array $shares) {
+        // Group shares when the user has a share exception
+        foreach ($shares as $id => $share) {
+            $type = (int) $share['share_type'];
+            $permissions = (int) $share['permissions'];
+
+            if ($type === self::SHARE_TYPE_USERGROUP) {
+                unset($shares[$share['parent']]);
+
+                if ($permissions === 0) {
+                    unset($shares[$id]);
+                }
+            }
+        }
+
+        $best = [];
+        $bestDepth = 0;
+        foreach ($shares as $id => $share) {
+            $depth = substr_count($share['file_target'], '/');
+            if (empty($best) || $depth < $bestDepth) {
+                $bestDepth = $depth;
+                $best = [
+                    'node_id' => $share['file_source'],
+                    'node_path' => $share['file_target'],
+                ];
+            }
+        }
+
+        return $best;
+    }
+
+    /**
+     * propagate notes to the recipients
+     *
+     * @param IShare $share
+     * @throws \OCP\Files\NotFoundException
+     */
+    private function propagateNote(IShare $share) {
+        if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER) {
+            $user = $this->userManager->get($share->getSharedWith());
+            $this->sendNote([$user], $share);
+        } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
+            $group = $this->groupManager->get($share->getSharedWith());
+            $groupMembers = $group->getUsers();
+            $this->sendNote($groupMembers, $share);
+        }
+    }
+
+    /**
+     * send note by mail
+     *
+     * @param array $recipients
+     * @param IShare $share
+     * @throws \OCP\Files\NotFoundException
+     */
+    private function sendNote(array $recipients, IShare $share) {
+
+        $toList = [];
+
+        foreach ($recipients as $recipient) {
+            /** @var IUser $recipient */
+            $email = $recipient->getEMailAddress();
+            if ($email) {
+                $toList[$email] = $recipient->getDisplayName();
+            }
+        }
+
+        if (!empty($toList)) {
+
+            $filename = $share->getNode()->getName();
+            $initiator = $share->getSharedBy();
+            $note = $share->getNote();
+
+            $initiatorUser = $this->userManager->get($initiator);
+            $initiatorDisplayName = ($initiatorUser instanceof IUser) ? $initiatorUser->getDisplayName() : $initiator;
+            $initiatorEmailAddress = ($initiatorUser instanceof IUser) ? $initiatorUser->getEMailAddress() : null;
+            $plainHeading = $this->l->t('%1$s shared »%2$s« with you and wants to add:', [$initiatorDisplayName, $filename]);
+            $htmlHeading = $this->l->t('%1$s shared »%2$s« with you and wants to add', [$initiatorDisplayName, $filename]);
+            $message = $this->mailer->createMessage();
+
+            $emailTemplate = $this->mailer->createEMailTemplate('defaultShareProvider.sendNote');
+
+            $emailTemplate->setSubject($this->l->t('»%s« added a note to a file shared with you', [$initiatorDisplayName]));
+            $emailTemplate->addHeader();
+            $emailTemplate->addHeading($htmlHeading, $plainHeading);
+            $emailTemplate->addBodyText(htmlspecialchars($note), $note);
+
+            $link = $this->urlGenerator->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $share->getNode()->getId()]);
+            $emailTemplate->addBodyButton(
+                $this->l->t('Open »%s«', [$filename]),
+                $link
+            );
+
+
+            // The "From" contains the sharers name
+            $instanceName = $this->defaults->getName();
+            $senderName = $this->l->t(
+                '%1$s via %2$s',
+                [
+                    $initiatorDisplayName,
+                    $instanceName
+                ]
+            );
+            $message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
+            if ($initiatorEmailAddress !== null) {
+                $message->setReplyTo([$initiatorEmailAddress => $initiatorDisplayName]);
+                $emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
+            } else {
+                $emailTemplate->addFooter();
+            }
+
+            if (count($toList) === 1) {
+                $message->setTo($toList);
+            } else {
+                $message->setTo([]);
+                $message->setBcc($toList);
+            }
+            $message->useTemplate($emailTemplate);
+            $this->mailer->send($message);
+        }
+
+    }
+
+    public function getAllShares(): iterable {
+        $qb = $this->dbConn->getQueryBuilder();
+
+        $qb->select('*')
+            ->from('share')
+            ->where(
+                $qb->expr()->orX(
+                    $qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share\IShare::TYPE_USER)),
+                    $qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share\IShare::TYPE_GROUP)),
+                    $qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share\IShare::TYPE_LINK))
+                )
+            );
+
+        $cursor = $qb->execute();
+        while($data = $cursor->fetch()) {
+            try {
+                $share = $this->createShare($data);
+            } catch (InvalidShare $e) {
+                continue;
+            }
+
+            yield $share;
+        }
+        $cursor->closeCursor();
+    }
 }