nextcloud / server

lib/private/Encryption/Update.php

Indentation +155 added lines, -155 removed lines

@@ -35,159 +35,159 @@
  */
 class Update {
 
-	/** @var \OC\Files\View */
-	protected $view;
-
-	/** @var \OC\Encryption\Util */
-	protected $util;
-
-	/** @var \OC\Files\Mount\Manager */
-	protected $mountManager;
-
-	/** @var \OC\Encryption\Manager */
-	protected $encryptionManager;
-
-	/** @var string */
-	protected $uid;
-
-	/** @var \OC\Encryption\File */
-	protected $file;
-
-	/**
-	 *
-	 * @param \OC\Files\View $view
-	 * @param \OC\Encryption\Util $util
-	 * @param \OC\Files\Mount\Manager $mountManager
-	 * @param \OC\Encryption\Manager $encryptionManager
-	 * @param \OC\Encryption\File $file
-	 * @param string $uid
-	 */
-	public function __construct(
-			View $view,
-			Util $util,
-			Mount\Manager $mountManager,
-			Manager $encryptionManager,
-			File $file,
-			$uid
-		) {
-		$this->view = $view;
-		$this->util = $util;
-		$this->mountManager = $mountManager;
-		$this->encryptionManager = $encryptionManager;
-		$this->file = $file;
-		$this->uid = $uid;
-	}
-
-	/**
-	 * hook after file was shared
-	 *
-	 * @param array $params
-	 */
-	public function postShared($params) {
-		if ($this->encryptionManager->isEnabled()) {
-			if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {
-				$path = Filesystem::getPath($params['fileSource']);
-				[$owner, $ownerPath] = $this->getOwnerPath($path);
-				$absPath = '/' . $owner . '/files/' . $ownerPath;
-				$this->update($absPath);
-			}
-		}
-	}
-
-	/**
-	 * hook after file was unshared
-	 *
-	 * @param array $params
-	 */
-	public function postUnshared($params) {
-		if ($this->encryptionManager->isEnabled()) {
-			if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {
-				$path = Filesystem::getPath($params['fileSource']);
-				[$owner, $ownerPath] = $this->getOwnerPath($path);
-				$absPath = '/' . $owner . '/files/' . $ownerPath;
-				$this->update($absPath);
-			}
-		}
-	}
-
-	/**
-	 * inform encryption module that a file was restored from the trash bin,
-	 * e.g. to update the encryption keys
-	 *
-	 * @param array $params
-	 */
-	public function postRestore($params) {
-		if ($this->encryptionManager->isEnabled()) {
-			$path = Filesystem::normalizePath('/' . $this->uid . '/files/' . $params['filePath']);
-			$this->update($path);
-		}
-	}
-
-	/**
-	 * inform encryption module that a file was renamed,
-	 * e.g. to update the encryption keys
-	 *
-	 * @param array $params
-	 */
-	public function postRename($params) {
-		$source = $params['oldpath'];
-		$target = $params['newpath'];
-		if (
-			$this->encryptionManager->isEnabled() &&
-			dirname($source) !== dirname($target)
-		) {
-			[$owner, $ownerPath] = $this->getOwnerPath($target);
-			$absPath = '/' . $owner . '/files/' . $ownerPath;
-			$this->update($absPath);
-		}
-	}
-
-	/**
-	 * get owner and path relative to data/<owner>/files
-	 *
-	 * @param string $path path to file for current user
-	 * @return array ['owner' => $owner, 'path' => $path]
-	 * @throw \InvalidArgumentException
-	 */
-	protected function getOwnerPath($path) {
-		$info = Filesystem::getFileInfo($path);
-		$owner = Filesystem::getOwner($path);
-		$view = new View('/' . $owner . '/files');
-		$path = $view->getPath($info->getId());
-		if ($path === null) {
-			throw new \InvalidArgumentException('No file found for ' . $info->getId());
-		}
-
-		return [$owner, $path];
-	}
-
-	/**
-	 * notify encryption module about added/removed users from a file/folder
-	 *
-	 * @param string $path relative to data/
-	 * @throws Exceptions\ModuleDoesNotExistsException
-	 */
-	public function update($path) {
-		$encryptionModule = $this->encryptionManager->getEncryptionModule();
-
-		// if the encryption module doesn't encrypt the files on a per-user basis
-		// we have nothing to do here.
-		if ($encryptionModule->needDetailedAccessList() === false) {
-			return;
-		}
-
-		// if a folder was shared, get a list of all (sub-)folders
-		if ($this->view->is_dir($path)) {
-			$allFiles = $this->util->getAllFiles($path);
-		} else {
-			$allFiles = [$path];
-		}
-
-
-
-		foreach ($allFiles as $file) {
-			$usersSharing = $this->file->getAccessList($file);
-			$encryptionModule->update($file, $this->uid, $usersSharing);
-		}
-	}
+    /** @var \OC\Files\View */
+    protected $view;
+
+    /** @var \OC\Encryption\Util */
+    protected $util;
+
+    /** @var \OC\Files\Mount\Manager */
+    protected $mountManager;
+
+    /** @var \OC\Encryption\Manager */
+    protected $encryptionManager;
+
+    /** @var string */
+    protected $uid;
+
+    /** @var \OC\Encryption\File */
+    protected $file;
+
+    /**
+     *
+     * @param \OC\Files\View $view
+     * @param \OC\Encryption\Util $util
+     * @param \OC\Files\Mount\Manager $mountManager
+     * @param \OC\Encryption\Manager $encryptionManager
+     * @param \OC\Encryption\File $file
+     * @param string $uid
+     */
+    public function __construct(
+            View $view,
+            Util $util,
+            Mount\Manager $mountManager,
+            Manager $encryptionManager,
+            File $file,
+            $uid
+        ) {
+        $this->view = $view;
+        $this->util = $util;
+        $this->mountManager = $mountManager;
+        $this->encryptionManager = $encryptionManager;
+        $this->file = $file;
+        $this->uid = $uid;
+    }
+
+    /**
+     * hook after file was shared
+     *
+     * @param array $params
+     */
+    public function postShared($params) {
+        if ($this->encryptionManager->isEnabled()) {
+            if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {
+                $path = Filesystem::getPath($params['fileSource']);
+                [$owner, $ownerPath] = $this->getOwnerPath($path);
+                $absPath = '/' . $owner . '/files/' . $ownerPath;
+                $this->update($absPath);
+            }
+        }
+    }
+
+    /**
+     * hook after file was unshared
+     *
+     * @param array $params
+     */
+    public function postUnshared($params) {
+        if ($this->encryptionManager->isEnabled()) {
+            if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {
+                $path = Filesystem::getPath($params['fileSource']);
+                [$owner, $ownerPath] = $this->getOwnerPath($path);
+                $absPath = '/' . $owner . '/files/' . $ownerPath;
+                $this->update($absPath);
+            }
+        }
+    }
+
+    /**
+     * inform encryption module that a file was restored from the trash bin,
+     * e.g. to update the encryption keys
+     *
+     * @param array $params
+     */
+    public function postRestore($params) {
+        if ($this->encryptionManager->isEnabled()) {
+            $path = Filesystem::normalizePath('/' . $this->uid . '/files/' . $params['filePath']);
+            $this->update($path);
+        }
+    }
+
+    /**
+     * inform encryption module that a file was renamed,
+     * e.g. to update the encryption keys
+     *
+     * @param array $params
+     */
+    public function postRename($params) {
+        $source = $params['oldpath'];
+        $target = $params['newpath'];
+        if (
+            $this->encryptionManager->isEnabled() &&
+            dirname($source) !== dirname($target)
+        ) {
+            [$owner, $ownerPath] = $this->getOwnerPath($target);
+            $absPath = '/' . $owner . '/files/' . $ownerPath;
+            $this->update($absPath);
+        }
+    }
+
+    /**
+     * get owner and path relative to data/<owner>/files
+     *
+     * @param string $path path to file for current user
+     * @return array ['owner' => $owner, 'path' => $path]
+     * @throw \InvalidArgumentException
+     */
+    protected function getOwnerPath($path) {
+        $info = Filesystem::getFileInfo($path);
+        $owner = Filesystem::getOwner($path);
+        $view = new View('/' . $owner . '/files');
+        $path = $view->getPath($info->getId());
+        if ($path === null) {
+            throw new \InvalidArgumentException('No file found for ' . $info->getId());
+        }
+
+        return [$owner, $path];
+    }
+
+    /**
+     * notify encryption module about added/removed users from a file/folder
+     *
+     * @param string $path relative to data/
+     * @throws Exceptions\ModuleDoesNotExistsException
+     */
+    public function update($path) {
+        $encryptionModule = $this->encryptionManager->getEncryptionModule();
+
+        // if the encryption module doesn't encrypt the files on a per-user basis
+        // we have nothing to do here.
+        if ($encryptionModule->needDetailedAccessList() === false) {
+            return;
+        }
+
+        // if a folder was shared, get a list of all (sub-)folders
+        if ($this->view->is_dir($path)) {
+            $allFiles = $this->util->getAllFiles($path);
+        } else {
+            $allFiles = [$path];
+        }
+
+
+
+        foreach ($allFiles as $file) {
+            $usersSharing = $this->file->getAccessList($file);
+            $encryptionModule->update($file, $this->uid, $usersSharing);
+        }
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -88,7 +88,7 @@ 
 			if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {
 				$path = Filesystem::getPath($params['fileSource']);
 				[$owner, $ownerPath] = $this->getOwnerPath($path);
-				$absPath = '/' . $owner . '/files/' . $ownerPath;
+				$absPath = '/'.$owner.'/files/'.$ownerPath;
 				$this->update($absPath);
 			}
 		}
@@ -104,7 +104,7 @@ 
 			if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {
 				$path = Filesystem::getPath($params['fileSource']);
 				[$owner, $ownerPath] = $this->getOwnerPath($path);
-				$absPath = '/' . $owner . '/files/' . $ownerPath;
+				$absPath = '/'.$owner.'/files/'.$ownerPath;
 				$this->update($absPath);
 			}
 		}
@@ -118,7 +118,7 @@ 
 	 */
 	public function postRestore($params) {
 		if ($this->encryptionManager->isEnabled()) {
-			$path = Filesystem::normalizePath('/' . $this->uid . '/files/' . $params['filePath']);
+			$path = Filesystem::normalizePath('/'.$this->uid.'/files/'.$params['filePath']);
 			$this->update($path);
 		}
 	}
@@ -137,7 +137,7 @@ 
 			dirname($source) !== dirname($target)
 		) {
 			[$owner, $ownerPath] = $this->getOwnerPath($target);
-			$absPath = '/' . $owner . '/files/' . $ownerPath;
+			$absPath = '/'.$owner.'/files/'.$ownerPath;
 			$this->update($absPath);
 		}
 	}
@@ -152,10 +152,10 @@ 
 	protected function getOwnerPath($path) {
 		$info = Filesystem::getFileInfo($path);
 		$owner = Filesystem::getOwner($path);
-		$view = new View('/' . $owner . '/files');
+		$view = new View('/'.$owner.'/files');
 		$path = $view->getPath($info->getId());
 		if ($path === null) {
-			throw new \InvalidArgumentException('No file found for ' . $info->getId());
+			throw new \InvalidArgumentException('No file found for '.$info->getId());
 		}
 
 		return [$owner, $path];

lib/private/Encryption/File.php

Indentation +90 added lines, -90 removed lines

@@ -35,94 +35,94 @@
 
 class File implements \OCP\Encryption\IFile {
 
-	/** @var Util */
-	protected $util;
-
-	/** @var IRootFolder */
-	private $rootFolder;
-
-	/** @var IManager */
-	private $shareManager;
-
-	/**
-	 * cache results of already checked folders
-	 *
-	 * @var array
-	 */
-	protected $cache;
-
-	public function __construct(Util $util,
-								IRootFolder $rootFolder,
-								IManager $shareManager) {
-		$this->util = $util;
-		$this->cache = new CappedMemoryCache();
-		$this->rootFolder = $rootFolder;
-		$this->shareManager = $shareManager;
-	}
-
-
-	/**
-	 * get list of users with access to the file
-	 *
-	 * @param string $path to the file
-	 * @return array  ['users' => $uniqueUserIds, 'public' => $public]
-	 */
-	public function getAccessList($path) {
-
-		// Make sure that a share key is generated for the owner too
-		[$owner, $ownerPath] = $this->util->getUidAndFilename($path);
-
-		// always add owner to the list of users with access to the file
-		$userIds = [$owner];
-
-		if (!$this->util->isFile($owner . '/' . $ownerPath)) {
-			return ['users' => $userIds, 'public' => false];
-		}
-
-		$ownerPath = substr($ownerPath, strlen('/files'));
-		$userFolder = $this->rootFolder->getUserFolder($owner);
-		try {
-			$file = $userFolder->get($ownerPath);
-		} catch (NotFoundException $e) {
-			$file = null;
-		}
-		$ownerPath = $this->util->stripPartialFileExtension($ownerPath);
-
-		// first get the shares for the parent and cache the result so that we don't
-		// need to check all parents for every file
-		$parent = dirname($ownerPath);
-		$parentNode = $userFolder->get($parent);
-		if (isset($this->cache[$parent])) {
-			$resultForParents = $this->cache[$parent];
-		} else {
-			$resultForParents = $this->shareManager->getAccessList($parentNode);
-			$this->cache[$parent] = $resultForParents;
-		}
-		$userIds = array_merge($userIds, $resultForParents['users']);
-		$public = $resultForParents['public'] || $resultForParents['remote'];
-
-
-		// Find out who, if anyone, is sharing the file
-		if ($file !== null) {
-			$resultForFile = $this->shareManager->getAccessList($file, false);
-			$userIds = array_merge($userIds, $resultForFile['users']);
-			$public = $resultForFile['public'] || $resultForFile['remote'] || $public;
-		}
-
-		// check if it is a group mount
-		if (\OCP\App::isEnabled("files_external")) {
-			$mounts = \OCA\Files_External\MountConfig::getSystemMountPoints();
-			foreach ($mounts as $mount) {
-				if ($mount['mountpoint'] == substr($ownerPath, 1, strlen($mount['mountpoint']))) {
-					$mountedFor = $this->util->getUserWithAccessToMountPoint($mount['applicable']['users'], $mount['applicable']['groups']);
-					$userIds = array_merge($userIds, $mountedFor);
-				}
-			}
-		}
-
-		// Remove duplicate UIDs
-		$uniqueUserIds = array_unique($userIds);
-
-		return ['users' => $uniqueUserIds, 'public' => $public];
-	}
+    /** @var Util */
+    protected $util;
+
+    /** @var IRootFolder */
+    private $rootFolder;
+
+    /** @var IManager */
+    private $shareManager;
+
+    /**
+     * cache results of already checked folders
+     *
+     * @var array
+     */
+    protected $cache;
+
+    public function __construct(Util $util,
+                                IRootFolder $rootFolder,
+                                IManager $shareManager) {
+        $this->util = $util;
+        $this->cache = new CappedMemoryCache();
+        $this->rootFolder = $rootFolder;
+        $this->shareManager = $shareManager;
+    }
+
+
+    /**
+     * get list of users with access to the file
+     *
+     * @param string $path to the file
+     * @return array  ['users' => $uniqueUserIds, 'public' => $public]
+     */
+    public function getAccessList($path) {
+
+        // Make sure that a share key is generated for the owner too
+        [$owner, $ownerPath] = $this->util->getUidAndFilename($path);
+
+        // always add owner to the list of users with access to the file
+        $userIds = [$owner];
+
+        if (!$this->util->isFile($owner . '/' . $ownerPath)) {
+            return ['users' => $userIds, 'public' => false];
+        }
+
+        $ownerPath = substr($ownerPath, strlen('/files'));
+        $userFolder = $this->rootFolder->getUserFolder($owner);
+        try {
+            $file = $userFolder->get($ownerPath);
+        } catch (NotFoundException $e) {
+            $file = null;
+        }
+        $ownerPath = $this->util->stripPartialFileExtension($ownerPath);
+
+        // first get the shares for the parent and cache the result so that we don't
+        // need to check all parents for every file
+        $parent = dirname($ownerPath);
+        $parentNode = $userFolder->get($parent);
+        if (isset($this->cache[$parent])) {
+            $resultForParents = $this->cache[$parent];
+        } else {
+            $resultForParents = $this->shareManager->getAccessList($parentNode);
+            $this->cache[$parent] = $resultForParents;
+        }
+        $userIds = array_merge($userIds, $resultForParents['users']);
+        $public = $resultForParents['public'] || $resultForParents['remote'];
+
+
+        // Find out who, if anyone, is sharing the file
+        if ($file !== null) {
+            $resultForFile = $this->shareManager->getAccessList($file, false);
+            $userIds = array_merge($userIds, $resultForFile['users']);
+            $public = $resultForFile['public'] || $resultForFile['remote'] || $public;
+        }
+
+        // check if it is a group mount
+        if (\OCP\App::isEnabled("files_external")) {
+            $mounts = \OCA\Files_External\MountConfig::getSystemMountPoints();
+            foreach ($mounts as $mount) {
+                if ($mount['mountpoint'] == substr($ownerPath, 1, strlen($mount['mountpoint']))) {
+                    $mountedFor = $this->util->getUserWithAccessToMountPoint($mount['applicable']['users'], $mount['applicable']['groups']);
+                    $userIds = array_merge($userIds, $mountedFor);
+                }
+            }
+        }
+
+        // Remove duplicate UIDs
+        $uniqueUserIds = array_unique($userIds);
+
+        return ['users' => $uniqueUserIds, 'public' => $public];
+    }
 }

lib/private/legacy/OC_Template.php

Indentation +307 added lines, -307 removed lines

@@ -48,311 +48,311 @@
  */
 class OC_Template extends \OC\Template\Base {
 
-	/** @var string */
-	private $renderAs; // Create a full page?
-
-	/** @var string */
-	private $path; // The path to the template
-
-	/** @var array */
-	private $headers = []; //custom headers
-
-	/** @var string */
-	protected $app; // app id
-
-	protected static $initTemplateEngineFirstRun = true;
-
-	/**
-	 * Constructor
-	 *
-	 * @param string $app app providing the template
-	 * @param string $name of the template file (without suffix)
-	 * @param string $renderAs If $renderAs is set, OC_Template will try to
-	 *                         produce a full page in the according layout. For
-	 *                         now, $renderAs can be set to "guest", "user" or
-	 *                         "admin".
-	 * @param bool $registerCall = true
-	 */
-	public function __construct($app, $name, $renderAs = TemplateResponse::RENDER_AS_BLANK, $registerCall = true) {
-		// Read the selected theme from the config file
-		self::initTemplateEngine($renderAs);
-
-		$theme = OC_Util::getTheme();
-
-		$requestToken = (OC::$server->getSession() && $registerCall) ? \OCP\Util::callRegister() : '';
-
-		$parts = explode('/', $app); // fix translation when app is something like core/lostpassword
-		$l10n = \OC::$server->getL10N($parts[0]);
-		/** @var \OCP\Defaults $themeDefaults */
-		$themeDefaults = \OC::$server->query(\OCP\Defaults::class);
-
-		[$path, $template] = $this->findTemplate($theme, $app, $name);
-
-		// Set the private data
-		$this->renderAs = $renderAs;
-		$this->path = $path;
-		$this->app = $app;
-
-		parent::__construct($template, $requestToken, $l10n, $themeDefaults);
-	}
-
-	/**
-	 * @param string $renderAs
-	 */
-	public static function initTemplateEngine($renderAs) {
-		if (self::$initTemplateEngineFirstRun) {
-
-			//apps that started before the template initialization can load their own scripts/styles
-			//so to make sure this scripts/styles here are loaded first we use OC_Util::addScript() with $prepend=true
-			//meaning the last script/style in this list will be loaded first
-			if (\OC::$server->getSystemConfig()->getValue('installed', false) && $renderAs !== TemplateResponse::RENDER_AS_ERROR && !\OCP\Util::needUpgrade()) {
-				if (\OC::$server->getConfig()->getAppValue('core', 'backgroundjobs_mode', 'ajax') == 'ajax') {
-					OC_Util::addScript('backgroundjobs', null, true);
-				}
-			}
-			OC_Util::addStyle('css-variables', null, true);
-			OC_Util::addStyle('server', null, true);
-			OC_Util::addTranslations('core', null, true);
-
-			if (\OC::$server->getSystemConfig()->getValue('installed', false) && !\OCP\Util::needUpgrade()) {
-				OC_Util::addScript('merged-template-prepend', null, true);
-				OC_Util::addScript('dist/files_client', null, true);
-				OC_Util::addScript('dist/files_fileinfo', null, true);
-			}
-			OC_Util::addScript('core', 'dist/main', true);
-
-			if (\OC::$server->getRequest()->isUserAgent([\OC\AppFramework\Http\Request::USER_AGENT_IE])) {
-				// shim for the davclient.js library
-				\OCP\Util::addScript('dist/files_iedavclient');
-			}
-
-			self::$initTemplateEngineFirstRun = false;
-		}
-	}
-
-
-	/**
-	 * find the template with the given name
-	 * @param string $name of the template file (without suffix)
-	 *
-	 * Will select the template file for the selected theme.
-	 * Checking all the possible locations.
-	 * @param string $theme
-	 * @param string $app
-	 * @return string[]
-	 */
-	protected function findTemplate($theme, $app, $name) {
-		// Check if it is a app template or not.
-		if ($app !== '') {
-			$dirs = $this->getAppTemplateDirs($theme, $app, OC::$SERVERROOT, OC_App::getAppPath($app));
-		} else {
-			$dirs = $this->getCoreTemplateDirs($theme, OC::$SERVERROOT);
-		}
-		$locator = new \OC\Template\TemplateFileLocator($dirs);
-		$template = $locator->find($name);
-		$path = $locator->getPath();
-		return [$path, $template];
-	}
-
-	/**
-	 * Add a custom element to the header
-	 * @param string $tag tag name of the element
-	 * @param array $attributes array of attributes for the element
-	 * @param string $text the text content for the element. If $text is null then the
-	 * element will be written as empty element. So use "" to get a closing tag.
-	 */
-	public function addHeader($tag, $attributes, $text = null) {
-		$this->headers[] = [
-			'tag' => $tag,
-			'attributes' => $attributes,
-			'text' => $text
-		];
-	}
-
-	/**
-	 * Process the template
-	 * @return string
-	 *
-	 * This function process the template. If $this->renderAs is set, it
-	 * will produce a full page.
-	 */
-	public function fetchPage($additionalParams = null) {
-		$data = parent::fetchPage($additionalParams);
-
-		if ($this->renderAs) {
-			$page = new TemplateLayout($this->renderAs, $this->app);
-
-			if (is_array($additionalParams)) {
-				foreach ($additionalParams as $key => $value) {
-					$page->assign($key, $value);
-				}
-			}
-
-			// Add custom headers
-			$headers = '';
-			foreach (OC_Util::$headers as $header) {
-				$headers .= '<'.\OCP\Util::sanitizeHTML($header['tag']);
-				if (strcasecmp($header['tag'], 'script') === 0 && in_array('src', array_map('strtolower', array_keys($header['attributes'])))) {
-					$headers .= ' defer';
-				}
-				foreach ($header['attributes'] as $name => $value) {
-					$headers .= ' '.\OCP\Util::sanitizeHTML($name).'="'.\OCP\Util::sanitizeHTML($value).'"';
-				}
-				if ($header['text'] !== null) {
-					$headers .= '>'.\OCP\Util::sanitizeHTML($header['text']).'</'.\OCP\Util::sanitizeHTML($header['tag']).'>';
-				} else {
-					$headers .= '/>';
-				}
-			}
-
-			$page->assign('headers', $headers);
-
-			$page->assign('content', $data);
-			return $page->fetchPage($additionalParams);
-		}
-
-		return $data;
-	}
-
-	/**
-	 * Include template
-	 *
-	 * @param string $file
-	 * @param array|null $additionalParams
-	 * @return string returns content of included template
-	 *
-	 * Includes another template. use <?php echo $this->inc('template'); ?> to
-	 * do this.
-	 */
-	public function inc($file, $additionalParams = null) {
-		return $this->load($this->path.$file.'.php', $additionalParams);
-	}
-
-	/**
-	 * Shortcut to print a simple page for users
-	 * @param string $application The application we render the template for
-	 * @param string $name Name of the template
-	 * @param array $parameters Parameters for the template
-	 * @return boolean|null
-	 */
-	public static function printUserPage($application, $name, $parameters = []) {
-		$content = new OC_Template($application, $name, "user");
-		foreach ($parameters as $key => $value) {
-			$content->assign($key, $value);
-		}
-		print $content->printPage();
-	}
-
-	/**
-	 * Shortcut to print a simple page for admins
-	 * @param string $application The application we render the template for
-	 * @param string $name Name of the template
-	 * @param array $parameters Parameters for the template
-	 * @return bool
-	 */
-	public static function printAdminPage($application, $name, $parameters = []) {
-		$content = new OC_Template($application, $name, "admin");
-		foreach ($parameters as $key => $value) {
-			$content->assign($key, $value);
-		}
-		return $content->printPage();
-	}
-
-	/**
-	 * Shortcut to print a simple page for guests
-	 * @param string $application The application we render the template for
-	 * @param string $name Name of the template
-	 * @param array|string $parameters Parameters for the template
-	 * @return bool
-	 */
-	public static function printGuestPage($application, $name, $parameters = []) {
-		$content = new OC_Template($application, $name, $name === 'error' ? $name : 'guest');
-		foreach ($parameters as $key => $value) {
-			$content->assign($key, $value);
-		}
-		return $content->printPage();
-	}
-
-	/**
-	 * Print a fatal error page and terminates the script
-	 * @param string $error_msg The error message to show
-	 * @param string $hint An optional hint message - needs to be properly escape
-	 * @param int $statusCode
-	 * @suppress PhanAccessMethodInternal
-	 */
-	public static function printErrorPage($error_msg, $hint = '', $statusCode = 500) {
-		if (\OC::$server->getAppManager()->isEnabledForUser('theming') && !\OC_App::isAppLoaded('theming')) {
-			\OC_App::loadApp('theming');
-		}
-
-
-		if ($error_msg === $hint) {
-			// If the hint is the same as the message there is no need to display it twice.
-			$hint = '';
-		}
-
-		http_response_code($statusCode);
-		try {
-			$content = new \OC_Template('', 'error', 'error', false);
-			$errors = [['error' => $error_msg, 'hint' => $hint]];
-			$content->assign('errors', $errors);
-			$content->printPage();
-		} catch (\Exception $e) {
-			$logger = \OC::$server->getLogger();
-			$logger->error("$error_msg $hint", ['app' => 'core']);
-			$logger->logException($e, ['app' => 'core']);
-
-			header('Content-Type: text/plain; charset=utf-8');
-			print("$error_msg $hint");
-		}
-		die();
-	}
-
-	/**
-	 * print error page using Exception details
-	 * @param Exception|Throwable $exception
-	 * @param int $statusCode
-	 * @return bool|string
-	 * @suppress PhanAccessMethodInternal
-	 */
-	public static function printExceptionErrorPage($exception, $statusCode = 503) {
-		http_response_code($statusCode);
-		try {
-			$request = \OC::$server->getRequest();
-			$content = new \OC_Template('', 'exception', 'error', false);
-			$content->assign('errorClass', get_class($exception));
-			$content->assign('errorMsg', $exception->getMessage());
-			$content->assign('errorCode', $exception->getCode());
-			$content->assign('file', $exception->getFile());
-			$content->assign('line', $exception->getLine());
-			$content->assign('exception', $exception);
-			$content->assign('debugMode', \OC::$server->getSystemConfig()->getValue('debug', false));
-			$content->assign('remoteAddr', $request->getRemoteAddress());
-			$content->assign('requestID', $request->getId());
-			$content->printPage();
-		} catch (\Exception $e) {
-			try {
-				$logger = \OC::$server->getLogger();
-				$logger->logException($exception, ['app' => 'core']);
-				$logger->logException($e, ['app' => 'core']);
-			} catch (Throwable $e) {
-				// no way to log it properly - but to avoid a white page of death we send some output
-				header('Content-Type: text/plain; charset=utf-8');
-				print("Internal Server Error\n\n");
-				print("The server encountered an internal error and was unable to complete your request.\n");
-				print("Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report.\n");
-				print("More details can be found in the server log.\n");
-
-				// and then throw it again to log it at least to the web server error log
-				throw $e;
-			}
-
-			header('Content-Type: text/plain; charset=utf-8');
-			print("Internal Server Error\n\n");
-			print("The server encountered an internal error and was unable to complete your request.\n");
-			print("Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report.\n");
-			print("More details can be found in the server log.\n");
-		}
-		die();
-	}
+    /** @var string */
+    private $renderAs; // Create a full page?
+
+    /** @var string */
+    private $path; // The path to the template
+
+    /** @var array */
+    private $headers = []; //custom headers
+
+    /** @var string */
+    protected $app; // app id
+
+    protected static $initTemplateEngineFirstRun = true;
+
+    /**
+     * Constructor
+     *
+     * @param string $app app providing the template
+     * @param string $name of the template file (without suffix)
+     * @param string $renderAs If $renderAs is set, OC_Template will try to
+     *                         produce a full page in the according layout. For
+     *                         now, $renderAs can be set to "guest", "user" or
+     *                         "admin".
+     * @param bool $registerCall = true
+     */
+    public function __construct($app, $name, $renderAs = TemplateResponse::RENDER_AS_BLANK, $registerCall = true) {
+        // Read the selected theme from the config file
+        self::initTemplateEngine($renderAs);
+
+        $theme = OC_Util::getTheme();
+
+        $requestToken = (OC::$server->getSession() && $registerCall) ? \OCP\Util::callRegister() : '';
+
+        $parts = explode('/', $app); // fix translation when app is something like core/lostpassword
+        $l10n = \OC::$server->getL10N($parts[0]);
+        /** @var \OCP\Defaults $themeDefaults */
+        $themeDefaults = \OC::$server->query(\OCP\Defaults::class);
+
+        [$path, $template] = $this->findTemplate($theme, $app, $name);
+
+        // Set the private data
+        $this->renderAs = $renderAs;
+        $this->path = $path;
+        $this->app = $app;
+
+        parent::__construct($template, $requestToken, $l10n, $themeDefaults);
+    }
+
+    /**
+     * @param string $renderAs
+     */
+    public static function initTemplateEngine($renderAs) {
+        if (self::$initTemplateEngineFirstRun) {
+
+            //apps that started before the template initialization can load their own scripts/styles
+            //so to make sure this scripts/styles here are loaded first we use OC_Util::addScript() with $prepend=true
+            //meaning the last script/style in this list will be loaded first
+            if (\OC::$server->getSystemConfig()->getValue('installed', false) && $renderAs !== TemplateResponse::RENDER_AS_ERROR && !\OCP\Util::needUpgrade()) {
+                if (\OC::$server->getConfig()->getAppValue('core', 'backgroundjobs_mode', 'ajax') == 'ajax') {
+                    OC_Util::addScript('backgroundjobs', null, true);
+                }
+            }
+            OC_Util::addStyle('css-variables', null, true);
+            OC_Util::addStyle('server', null, true);
+            OC_Util::addTranslations('core', null, true);
+
+            if (\OC::$server->getSystemConfig()->getValue('installed', false) && !\OCP\Util::needUpgrade()) {
+                OC_Util::addScript('merged-template-prepend', null, true);
+                OC_Util::addScript('dist/files_client', null, true);
+                OC_Util::addScript('dist/files_fileinfo', null, true);
+            }
+            OC_Util::addScript('core', 'dist/main', true);
+
+            if (\OC::$server->getRequest()->isUserAgent([\OC\AppFramework\Http\Request::USER_AGENT_IE])) {
+                // shim for the davclient.js library
+                \OCP\Util::addScript('dist/files_iedavclient');
+            }
+
+            self::$initTemplateEngineFirstRun = false;
+        }
+    }
+
+
+    /**
+     * find the template with the given name
+     * @param string $name of the template file (without suffix)
+     *
+     * Will select the template file for the selected theme.
+     * Checking all the possible locations.
+     * @param string $theme
+     * @param string $app
+     * @return string[]
+     */
+    protected function findTemplate($theme, $app, $name) {
+        // Check if it is a app template or not.
+        if ($app !== '') {
+            $dirs = $this->getAppTemplateDirs($theme, $app, OC::$SERVERROOT, OC_App::getAppPath($app));
+        } else {
+            $dirs = $this->getCoreTemplateDirs($theme, OC::$SERVERROOT);
+        }
+        $locator = new \OC\Template\TemplateFileLocator($dirs);
+        $template = $locator->find($name);
+        $path = $locator->getPath();
+        return [$path, $template];
+    }
+
+    /**
+     * Add a custom element to the header
+     * @param string $tag tag name of the element
+     * @param array $attributes array of attributes for the element
+     * @param string $text the text content for the element. If $text is null then the
+     * element will be written as empty element. So use "" to get a closing tag.
+     */
+    public function addHeader($tag, $attributes, $text = null) {
+        $this->headers[] = [
+            'tag' => $tag,
+            'attributes' => $attributes,
+            'text' => $text
+        ];
+    }
+
+    /**
+     * Process the template
+     * @return string
+     *
+     * This function process the template. If $this->renderAs is set, it
+     * will produce a full page.
+     */
+    public function fetchPage($additionalParams = null) {
+        $data = parent::fetchPage($additionalParams);
+
+        if ($this->renderAs) {
+            $page = new TemplateLayout($this->renderAs, $this->app);
+
+            if (is_array($additionalParams)) {
+                foreach ($additionalParams as $key => $value) {
+                    $page->assign($key, $value);
+                }
+            }
+
+            // Add custom headers
+            $headers = '';
+            foreach (OC_Util::$headers as $header) {
+                $headers .= '<'.\OCP\Util::sanitizeHTML($header['tag']);
+                if (strcasecmp($header['tag'], 'script') === 0 && in_array('src', array_map('strtolower', array_keys($header['attributes'])))) {
+                    $headers .= ' defer';
+                }
+                foreach ($header['attributes'] as $name => $value) {
+                    $headers .= ' '.\OCP\Util::sanitizeHTML($name).'="'.\OCP\Util::sanitizeHTML($value).'"';
+                }
+                if ($header['text'] !== null) {
+                    $headers .= '>'.\OCP\Util::sanitizeHTML($header['text']).'</'.\OCP\Util::sanitizeHTML($header['tag']).'>';
+                } else {
+                    $headers .= '/>';
+                }
+            }
+
+            $page->assign('headers', $headers);
+
+            $page->assign('content', $data);
+            return $page->fetchPage($additionalParams);
+        }
+
+        return $data;
+    }
+
+    /**
+     * Include template
+     *
+     * @param string $file
+     * @param array|null $additionalParams
+     * @return string returns content of included template
+     *
+     * Includes another template. use <?php echo $this->inc('template'); ?> to
+     * do this.
+     */
+    public function inc($file, $additionalParams = null) {
+        return $this->load($this->path.$file.'.php', $additionalParams);
+    }
+
+    /**
+     * Shortcut to print a simple page for users
+     * @param string $application The application we render the template for
+     * @param string $name Name of the template
+     * @param array $parameters Parameters for the template
+     * @return boolean|null
+     */
+    public static function printUserPage($application, $name, $parameters = []) {
+        $content = new OC_Template($application, $name, "user");
+        foreach ($parameters as $key => $value) {
+            $content->assign($key, $value);
+        }
+        print $content->printPage();
+    }
+
+    /**
+     * Shortcut to print a simple page for admins
+     * @param string $application The application we render the template for
+     * @param string $name Name of the template
+     * @param array $parameters Parameters for the template
+     * @return bool
+     */
+    public static function printAdminPage($application, $name, $parameters = []) {
+        $content = new OC_Template($application, $name, "admin");
+        foreach ($parameters as $key => $value) {
+            $content->assign($key, $value);
+        }
+        return $content->printPage();
+    }
+
+    /**
+     * Shortcut to print a simple page for guests
+     * @param string $application The application we render the template for
+     * @param string $name Name of the template
+     * @param array|string $parameters Parameters for the template
+     * @return bool
+     */
+    public static function printGuestPage($application, $name, $parameters = []) {
+        $content = new OC_Template($application, $name, $name === 'error' ? $name : 'guest');
+        foreach ($parameters as $key => $value) {
+            $content->assign($key, $value);
+        }
+        return $content->printPage();
+    }
+
+    /**
+     * Print a fatal error page and terminates the script
+     * @param string $error_msg The error message to show
+     * @param string $hint An optional hint message - needs to be properly escape
+     * @param int $statusCode
+     * @suppress PhanAccessMethodInternal
+     */
+    public static function printErrorPage($error_msg, $hint = '', $statusCode = 500) {
+        if (\OC::$server->getAppManager()->isEnabledForUser('theming') && !\OC_App::isAppLoaded('theming')) {
+            \OC_App::loadApp('theming');
+        }
+
+
+        if ($error_msg === $hint) {
+            // If the hint is the same as the message there is no need to display it twice.
+            $hint = '';
+        }
+
+        http_response_code($statusCode);
+        try {
+            $content = new \OC_Template('', 'error', 'error', false);
+            $errors = [['error' => $error_msg, 'hint' => $hint]];
+            $content->assign('errors', $errors);
+            $content->printPage();
+        } catch (\Exception $e) {
+            $logger = \OC::$server->getLogger();
+            $logger->error("$error_msg $hint", ['app' => 'core']);
+            $logger->logException($e, ['app' => 'core']);
+
+            header('Content-Type: text/plain; charset=utf-8');
+            print("$error_msg $hint");
+        }
+        die();
+    }
+
+    /**
+     * print error page using Exception details
+     * @param Exception|Throwable $exception
+     * @param int $statusCode
+     * @return bool|string
+     * @suppress PhanAccessMethodInternal
+     */
+    public static function printExceptionErrorPage($exception, $statusCode = 503) {
+        http_response_code($statusCode);
+        try {
+            $request = \OC::$server->getRequest();
+            $content = new \OC_Template('', 'exception', 'error', false);
+            $content->assign('errorClass', get_class($exception));
+            $content->assign('errorMsg', $exception->getMessage());
+            $content->assign('errorCode', $exception->getCode());
+            $content->assign('file', $exception->getFile());
+            $content->assign('line', $exception->getLine());
+            $content->assign('exception', $exception);
+            $content->assign('debugMode', \OC::$server->getSystemConfig()->getValue('debug', false));
+            $content->assign('remoteAddr', $request->getRemoteAddress());
+            $content->assign('requestID', $request->getId());
+            $content->printPage();
+        } catch (\Exception $e) {
+            try {
+                $logger = \OC::$server->getLogger();
+                $logger->logException($exception, ['app' => 'core']);
+                $logger->logException($e, ['app' => 'core']);
+            } catch (Throwable $e) {
+                // no way to log it properly - but to avoid a white page of death we send some output
+                header('Content-Type: text/plain; charset=utf-8');
+                print("Internal Server Error\n\n");
+                print("The server encountered an internal error and was unable to complete your request.\n");
+                print("Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report.\n");
+                print("More details can be found in the server log.\n");
+
+                // and then throw it again to log it at least to the web server error log
+                throw $e;
+            }
+
+            header('Content-Type: text/plain; charset=utf-8');
+            print("Internal Server Error\n\n");
+            print("The server encountered an internal error and was unable to complete your request.\n");
+            print("Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report.\n");
+            print("More details can be found in the server log.\n");
+        }
+        die();
+    }
 }

lib/private/Mail/Message.php

Indentation +255 added lines, -255 removed lines

@@ -43,259 +43,259 @@
  * @package OC\Mail
  */
 class Message implements IMessage {
-	/** @var Swift_Message */
-	private $swiftMessage;
-	/** @var bool */
-	private $plainTextOnly;
-
-	public function __construct(Swift_Message $swiftMessage, bool $plainTextOnly) {
-		$this->swiftMessage = $swiftMessage;
-		$this->plainTextOnly = $plainTextOnly;
-	}
-
-	/**
-	 * @param IAttachment $attachment
-	 * @return $this
-	 * @since 13.0.0
-	 */
-	public function attach(IAttachment $attachment): IMessage {
-		/** @var Attachment $attachment */
-		$this->swiftMessage->attach($attachment->getSwiftAttachment());
-		return $this;
-	}
-
-	/**
-	 * SwiftMailer does currently not work with IDN domains, this function therefore converts the domains
-	 * FIXME: Remove this once SwiftMailer supports IDN
-	 *
-	 * @param array $addresses Array of mail addresses, key will get converted
-	 * @return array Converted addresses if `idn_to_ascii` exists
-	 */
-	protected function convertAddresses(array $addresses): array {
-		if (!function_exists('idn_to_ascii') || !defined('INTL_IDNA_VARIANT_UTS46')) {
-			return $addresses;
-		}
-
-		$convertedAddresses = [];
-
-		foreach ($addresses as $email => $readableName) {
-			if (!is_numeric($email)) {
-				[$name, $domain] = explode('@', $email, 2);
-				$domain = idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46);
-				$convertedAddresses[$name.'@'.$domain] = $readableName;
-			} else {
-				[$name, $domain] = explode('@', $readableName, 2);
-				$domain = idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46);
-				$convertedAddresses[$email] = $name.'@'.$domain;
-			}
-		}
-
-		return $convertedAddresses;
-	}
-
-	/**
-	 * Set the from address of this message.
-	 *
-	 * If no "From" address is used \OC\Mail\Mailer will use mail_from_address and mail_domain from config.php
-	 *
-	 * @param array $addresses Example: array('sender@domain.org', 'other@domain.org' => 'A name')
-	 * @return $this
-	 */
-	public function setFrom(array $addresses): IMessage {
-		$addresses = $this->convertAddresses($addresses);
-
-		$this->swiftMessage->setFrom($addresses);
-		return $this;
-	}
-
-	/**
-	 * Get the from address of this message.
-	 *
-	 * @return array
-	 */
-	public function getFrom(): array {
-		return $this->swiftMessage->getFrom() ?? [];
-	}
-
-	/**
-	 * Set the Reply-To address of this message
-	 *
-	 * @param array $addresses
-	 * @return $this
-	 */
-	public function setReplyTo(array $addresses): IMessage {
-		$addresses = $this->convertAddresses($addresses);
-
-		$this->swiftMessage->setReplyTo($addresses);
-		return $this;
-	}
-
-	/**
-	 * Returns the Reply-To address of this message
-	 *
-	 * @return string
-	 */
-	public function getReplyTo(): string {
-		return $this->swiftMessage->getReplyTo();
-	}
-
-	/**
-	 * Set the to addresses of this message.
-	 *
-	 * @param array $recipients Example: array('recipient@domain.org', 'other@domain.org' => 'A name')
-	 * @return $this
-	 */
-	public function setTo(array $recipients): IMessage {
-		$recipients = $this->convertAddresses($recipients);
-
-		$this->swiftMessage->setTo($recipients);
-		return $this;
-	}
-
-	/**
-	 * Get the to address of this message.
-	 *
-	 * @return array
-	 */
-	public function getTo(): array {
-		return $this->swiftMessage->getTo() ?? [];
-	}
-
-	/**
-	 * Set the CC recipients of this message.
-	 *
-	 * @param array $recipients Example: array('recipient@domain.org', 'other@domain.org' => 'A name')
-	 * @return $this
-	 */
-	public function setCc(array $recipients): IMessage {
-		$recipients = $this->convertAddresses($recipients);
-
-		$this->swiftMessage->setCc($recipients);
-		return $this;
-	}
-
-	/**
-	 * Get the cc address of this message.
-	 *
-	 * @return array
-	 */
-	public function getCc(): array {
-		return $this->swiftMessage->getCc() ?? [];
-	}
-
-	/**
-	 * Set the BCC recipients of this message.
-	 *
-	 * @param array $recipients Example: array('recipient@domain.org', 'other@domain.org' => 'A name')
-	 * @return $this
-	 */
-	public function setBcc(array $recipients): IMessage {
-		$recipients = $this->convertAddresses($recipients);
-
-		$this->swiftMessage->setBcc($recipients);
-		return $this;
-	}
-
-	/**
-	 * Get the Bcc address of this message.
-	 *
-	 * @return array
-	 */
-	public function getBcc(): array {
-		return $this->swiftMessage->getBcc() ?? [];
-	}
-
-	/**
-	 * Set the subject of this message.
-	 *
-	 * @param string $subject
-	 * @return IMessage
-	 */
-	public function setSubject(string $subject): IMessage {
-		$this->swiftMessage->setSubject($subject);
-		return $this;
-	}
-
-	/**
-	 * Get the from subject of this message.
-	 *
-	 * @return string
-	 */
-	public function getSubject(): string {
-		return $this->swiftMessage->getSubject();
-	}
-
-	/**
-	 * Set the plain-text body of this message.
-	 *
-	 * @param string $body
-	 * @return $this
-	 */
-	public function setPlainBody(string $body): IMessage {
-		$this->swiftMessage->setBody($body);
-		return $this;
-	}
-
-	/**
-	 * Get the plain body of this message.
-	 *
-	 * @return string
-	 */
-	public function getPlainBody(): string {
-		return $this->swiftMessage->getBody();
-	}
-
-	/**
-	 * Set the HTML body of this message. Consider also sending a plain-text body instead of only an HTML one.
-	 *
-	 * @param string $body
-	 * @return $this
-	 */
-	public function setHtmlBody($body) {
-		if (!$this->plainTextOnly) {
-			$this->swiftMessage->addPart($body, 'text/html');
-		}
-		return $this;
-	}
-
-	/**
-	 * Get's the underlying SwiftMessage
-	 * @param Swift_Message $swiftMessage
-	 */
-	public function setSwiftMessage(Swift_Message $swiftMessage): void {
-		$this->swiftMessage = $swiftMessage;
-	}
-
-	/**
-	 * Get's the underlying SwiftMessage
-	 * @return Swift_Message
-	 */
-	public function getSwiftMessage(): Swift_Message {
-		return $this->swiftMessage;
-	}
-
-	/**
-	 * @param string $body
-	 * @param string $contentType
-	 * @return $this
-	 */
-	public function setBody($body, $contentType) {
-		if (!$this->plainTextOnly || $contentType !== 'text/html') {
-			$this->swiftMessage->setBody($body, $contentType);
-		}
-		return $this;
-	}
-
-	/**
-	 * @param IEMailTemplate $emailTemplate
-	 * @return $this
-	 */
-	public function useTemplate(IEMailTemplate $emailTemplate): IMessage {
-		$this->setSubject($emailTemplate->renderSubject());
-		$this->setPlainBody($emailTemplate->renderText());
-		if (!$this->plainTextOnly) {
-			$this->setHtmlBody($emailTemplate->renderHtml());
-		}
-		return $this;
-	}
+    /** @var Swift_Message */
+    private $swiftMessage;
+    /** @var bool */
+    private $plainTextOnly;
+
+    public function __construct(Swift_Message $swiftMessage, bool $plainTextOnly) {
+        $this->swiftMessage = $swiftMessage;
+        $this->plainTextOnly = $plainTextOnly;
+    }
+
+    /**
+     * @param IAttachment $attachment
+     * @return $this
+     * @since 13.0.0
+     */
+    public function attach(IAttachment $attachment): IMessage {
+        /** @var Attachment $attachment */
+        $this->swiftMessage->attach($attachment->getSwiftAttachment());
+        return $this;
+    }
+
+    /**
+     * SwiftMailer does currently not work with IDN domains, this function therefore converts the domains
+     * FIXME: Remove this once SwiftMailer supports IDN
+     *
+     * @param array $addresses Array of mail addresses, key will get converted
+     * @return array Converted addresses if `idn_to_ascii` exists
+     */
+    protected function convertAddresses(array $addresses): array {
+        if (!function_exists('idn_to_ascii') || !defined('INTL_IDNA_VARIANT_UTS46')) {
+            return $addresses;
+        }
+
+        $convertedAddresses = [];
+
+        foreach ($addresses as $email => $readableName) {
+            if (!is_numeric($email)) {
+                [$name, $domain] = explode('@', $email, 2);
+                $domain = idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46);
+                $convertedAddresses[$name.'@'.$domain] = $readableName;
+            } else {
+                [$name, $domain] = explode('@', $readableName, 2);
+                $domain = idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46);
+                $convertedAddresses[$email] = $name.'@'.$domain;
+            }
+        }
+
+        return $convertedAddresses;
+    }
+
+    /**
+     * Set the from address of this message.
+     *
+     * If no "From" address is used \OC\Mail\Mailer will use mail_from_address and mail_domain from config.php
+     *
+     * @param array $addresses Example: array('sender@domain.org', 'other@domain.org' => 'A name')
+     * @return $this
+     */
+    public function setFrom(array $addresses): IMessage {
+        $addresses = $this->convertAddresses($addresses);
+
+        $this->swiftMessage->setFrom($addresses);
+        return $this;
+    }
+
+    /**
+     * Get the from address of this message.
+     *
+     * @return array
+     */
+    public function getFrom(): array {
+        return $this->swiftMessage->getFrom() ?? [];
+    }
+
+    /**
+     * Set the Reply-To address of this message
+     *
+     * @param array $addresses
+     * @return $this
+     */
+    public function setReplyTo(array $addresses): IMessage {
+        $addresses = $this->convertAddresses($addresses);
+
+        $this->swiftMessage->setReplyTo($addresses);
+        return $this;
+    }
+
+    /**
+     * Returns the Reply-To address of this message
+     *
+     * @return string
+     */
+    public function getReplyTo(): string {
+        return $this->swiftMessage->getReplyTo();
+    }
+
+    /**
+     * Set the to addresses of this message.
+     *
+     * @param array $recipients Example: array('recipient@domain.org', 'other@domain.org' => 'A name')
+     * @return $this
+     */
+    public function setTo(array $recipients): IMessage {
+        $recipients = $this->convertAddresses($recipients);
+
+        $this->swiftMessage->setTo($recipients);
+        return $this;
+    }
+
+    /**
+     * Get the to address of this message.
+     *
+     * @return array
+     */
+    public function getTo(): array {
+        return $this->swiftMessage->getTo() ?? [];
+    }
+
+    /**
+     * Set the CC recipients of this message.
+     *
+     * @param array $recipients Example: array('recipient@domain.org', 'other@domain.org' => 'A name')
+     * @return $this
+     */
+    public function setCc(array $recipients): IMessage {
+        $recipients = $this->convertAddresses($recipients);
+
+        $this->swiftMessage->setCc($recipients);
+        return $this;
+    }
+
+    /**
+     * Get the cc address of this message.
+     *
+     * @return array
+     */
+    public function getCc(): array {
+        return $this->swiftMessage->getCc() ?? [];
+    }
+
+    /**
+     * Set the BCC recipients of this message.
+     *
+     * @param array $recipients Example: array('recipient@domain.org', 'other@domain.org' => 'A name')
+     * @return $this
+     */
+    public function setBcc(array $recipients): IMessage {
+        $recipients = $this->convertAddresses($recipients);
+
+        $this->swiftMessage->setBcc($recipients);
+        return $this;
+    }
+
+    /**
+     * Get the Bcc address of this message.
+     *
+     * @return array
+     */
+    public function getBcc(): array {
+        return $this->swiftMessage->getBcc() ?? [];
+    }
+
+    /**
+     * Set the subject of this message.
+     *
+     * @param string $subject
+     * @return IMessage
+     */
+    public function setSubject(string $subject): IMessage {
+        $this->swiftMessage->setSubject($subject);
+        return $this;
+    }
+
+    /**
+     * Get the from subject of this message.
+     *
+     * @return string
+     */
+    public function getSubject(): string {
+        return $this->swiftMessage->getSubject();
+    }
+
+    /**
+     * Set the plain-text body of this message.
+     *
+     * @param string $body
+     * @return $this
+     */
+    public function setPlainBody(string $body): IMessage {
+        $this->swiftMessage->setBody($body);
+        return $this;
+    }
+
+    /**
+     * Get the plain body of this message.
+     *
+     * @return string
+     */
+    public function getPlainBody(): string {
+        return $this->swiftMessage->getBody();
+    }
+
+    /**
+     * Set the HTML body of this message. Consider also sending a plain-text body instead of only an HTML one.
+     *
+     * @param string $body
+     * @return $this
+     */
+    public function setHtmlBody($body) {
+        if (!$this->plainTextOnly) {
+            $this->swiftMessage->addPart($body, 'text/html');
+        }
+        return $this;
+    }
+
+    /**
+     * Get's the underlying SwiftMessage
+     * @param Swift_Message $swiftMessage
+     */
+    public function setSwiftMessage(Swift_Message $swiftMessage): void {
+        $this->swiftMessage = $swiftMessage;
+    }
+
+    /**
+     * Get's the underlying SwiftMessage
+     * @return Swift_Message
+     */
+    public function getSwiftMessage(): Swift_Message {
+        return $this->swiftMessage;
+    }
+
+    /**
+     * @param string $body
+     * @param string $contentType
+     * @return $this
+     */
+    public function setBody($body, $contentType) {
+        if (!$this->plainTextOnly || $contentType !== 'text/html') {
+            $this->swiftMessage->setBody($body, $contentType);
+        }
+        return $this;
+    }
+
+    /**
+     * @param IEMailTemplate $emailTemplate
+     * @return $this
+     */
+    public function useTemplate(IEMailTemplate $emailTemplate): IMessage {
+        $this->setSubject($emailTemplate->renderSubject());
+        $this->setPlainBody($emailTemplate->renderText());
+        if (!$this->plainTextOnly) {
+            $this->setHtmlBody($emailTemplate->renderHtml());
+        }
+        return $this;
+    }
 }

lib/private/Mail/Mailer.php

Indentation +256 added lines, -256 removed lines

@@ -70,260 +70,260 @@
  * @package OC\Mail
  */
 class Mailer implements IMailer {
-	/** @var \Swift_Mailer Cached mailer */
-	private $instance = null;
-	/** @var IConfig */
-	private $config;
-	/** @var ILogger */
-	private $logger;
-	/** @var Defaults */
-	private $defaults;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var IL10N */
-	private $l10n;
-	/** @var IEventDispatcher */
-	private $dispatcher;
-	/** @var IFactory */
-	private $l10nFactory;
-
-	/**
-	 * @param IConfig $config
-	 * @param ILogger $logger
-	 * @param Defaults $defaults
-	 * @param IURLGenerator $urlGenerator
-	 * @param IL10N $l10n
-	 * @param IEventDispatcher $dispatcher
-	 */
-	public function __construct(IConfig $config,
-						 ILogger $logger,
-						 Defaults $defaults,
-						 IURLGenerator $urlGenerator,
-						 IL10N $l10n,
-						 IEventDispatcher $dispatcher,
-						 IFactory $l10nFactory) {
-		$this->config = $config;
-		$this->logger = $logger;
-		$this->defaults = $defaults;
-		$this->urlGenerator = $urlGenerator;
-		$this->l10n = $l10n;
-		$this->dispatcher = $dispatcher;
-		$this->l10nFactory = $l10nFactory;
-	}
-
-	/**
-	 * Creates a new message object that can be passed to send()
-	 *
-	 * @return IMessage
-	 */
-	public function createMessage(): IMessage {
-		$plainTextOnly = $this->config->getSystemValue('mail_send_plaintext_only', false);
-		return new Message(new \Swift_Message(), $plainTextOnly);
-	}
-
-	/**
-	 * @param string|null $data
-	 * @param string|null $filename
-	 * @param string|null $contentType
-	 * @return IAttachment
-	 * @since 13.0.0
-	 */
-	public function createAttachment($data = null, $filename = null, $contentType = null): IAttachment {
-		return new Attachment(new \Swift_Attachment($data, $filename, $contentType));
-	}
-
-	/**
-	 * @param string $path
-	 * @param string|null $contentType
-	 * @return IAttachment
-	 * @since 13.0.0
-	 */
-	public function createAttachmentFromPath(string $path, $contentType = null): IAttachment {
-		return new Attachment(\Swift_Attachment::fromPath($path, $contentType));
-	}
-
-	/**
-	 * Creates a new email template object
-	 *
-	 * @param string $emailId
-	 * @param array $data
-	 * @return IEMailTemplate
-	 * @since 12.0.0
-	 */
-	public function createEMailTemplate(string $emailId, array $data = []): IEMailTemplate {
-		$class = $this->config->getSystemValue('mail_template_class', '');
-
-		if ($class !== '' && class_exists($class) && is_a($class, EMailTemplate::class, true)) {
-			return new $class(
-				$this->defaults,
-				$this->urlGenerator,
-				$this->l10nFactory,
-				$emailId,
-				$data
-			);
-		}
-
-		return new EMailTemplate(
-			$this->defaults,
-			$this->urlGenerator,
-			$this->l10nFactory,
-			$emailId,
-			$data
-		);
-	}
-
-	/**
-	 * Send the specified message. Also sets the from address to the value defined in config.php
-	 * if no-one has been passed.
-	 *
-	 * @param IMessage|Message $message Message to send
-	 * @return string[] Array with failed recipients. Be aware that this depends on the used mail backend and
-	 * therefore should be considered
-	 * @throws \Exception In case it was not possible to send the message. (for example if an invalid mail address
-	 * has been supplied.)
-	 */
-	public function send(IMessage $message): array {
-		$debugMode = $this->config->getSystemValue('mail_smtpdebug', false);
-
-		if (empty($message->getFrom())) {
-			$message->setFrom([\OCP\Util::getDefaultEmailAddress('no-reply') => $this->defaults->getName()]);
-		}
-
-		$failedRecipients = [];
-
-		$mailer = $this->getInstance();
-
-		// Enable logger if debug mode is enabled
-		if ($debugMode) {
-			$mailLogger = new \Swift_Plugins_Loggers_ArrayLogger();
-			$mailer->registerPlugin(new \Swift_Plugins_LoggerPlugin($mailLogger));
-		}
-
-
-		$this->dispatcher->dispatchTyped(new BeforeMessageSent($message));
-
-		$mailer->send($message->getSwiftMessage(), $failedRecipients);
-
-		// Debugging logging
-		$logMessage = sprintf('Sent mail to "%s" with subject "%s"', print_r($message->getTo(), true), $message->getSubject());
-		$this->logger->debug($logMessage, ['app' => 'core']);
-		if ($debugMode && isset($mailLogger)) {
-			$this->logger->debug($mailLogger->dump(), ['app' => 'core']);
-		}
-
-		return $failedRecipients;
-	}
-
-	/**
-	 * Checks if an e-mail address is valid
-	 *
-	 * @param string $email Email address to be validated
-	 * @return bool True if the mail address is valid, false otherwise
-	 */
-	public function validateMailAddress(string $email): bool {
-		if ($email === '') {
-			// Shortcut: empty addresses are never valid
-			return false;
-		}
-		$validator = new EmailValidator();
-		$validation = new RFCValidation();
-
-		return $validator->isValid($this->convertEmail($email), $validation);
-	}
-
-	/**
-	 * SwiftMailer does currently not work with IDN domains, this function therefore converts the domains
-	 *
-	 * FIXME: Remove this once SwiftMailer supports IDN
-	 *
-	 * @param string $email
-	 * @return string Converted mail address if `idn_to_ascii` exists
-	 */
-	protected function convertEmail(string $email): string {
-		if (!function_exists('idn_to_ascii') || !defined('INTL_IDNA_VARIANT_UTS46') || strpos($email, '@') === false) {
-			return $email;
-		}
-
-		[$name, $domain] = explode('@', $email, 2);
-		$domain = idn_to_ascii($domain, 0,INTL_IDNA_VARIANT_UTS46);
-		return $name.'@'.$domain;
-	}
-
-	protected function getInstance(): \Swift_Mailer {
-		if (!is_null($this->instance)) {
-			return $this->instance;
-		}
-
-		$transport = null;
-
-		switch ($this->config->getSystemValue('mail_smtpmode', 'smtp')) {
-			case 'sendmail':
-				$transport = $this->getSendMailInstance();
-				break;
-			case 'smtp':
-			default:
-				$transport = $this->getSmtpInstance();
-				break;
-		}
-
-		return new \Swift_Mailer($transport);
-	}
-
-	/**
-	 * Returns the SMTP transport
-	 *
-	 * @return \Swift_SmtpTransport
-	 */
-	protected function getSmtpInstance(): \Swift_SmtpTransport {
-		$transport = new \Swift_SmtpTransport();
-		$transport->setTimeout($this->config->getSystemValue('mail_smtptimeout', 10));
-		$transport->setHost($this->config->getSystemValue('mail_smtphost', '127.0.0.1'));
-		$transport->setPort($this->config->getSystemValue('mail_smtpport', 25));
-		if ($this->config->getSystemValue('mail_smtpauth', false)) {
-			$transport->setUsername($this->config->getSystemValue('mail_smtpname', ''));
-			$transport->setPassword($this->config->getSystemValue('mail_smtppassword', ''));
-			$transport->setAuthMode($this->config->getSystemValue('mail_smtpauthtype', 'LOGIN'));
-		}
-		$smtpSecurity = $this->config->getSystemValue('mail_smtpsecure', '');
-		if (!empty($smtpSecurity)) {
-			$transport->setEncryption($smtpSecurity);
-		}
-		$streamingOptions = $this->config->getSystemValue('mail_smtpstreamoptions', []);
-		if (is_array($streamingOptions) && !empty($streamingOptions)) {
-			$transport->setStreamOptions($streamingOptions);
-		}
-
-		return $transport;
-	}
-
-	/**
-	 * Returns the sendmail transport
-	 *
-	 * @return \Swift_SendmailTransport
-	 */
-	protected function getSendMailInstance(): \Swift_SendmailTransport {
-		switch ($this->config->getSystemValue('mail_smtpmode', 'smtp')) {
-			case 'qmail':
-				$binaryPath = '/var/qmail/bin/sendmail';
-				break;
-			default:
-				$sendmail = \OC_Helper::findBinaryPath('sendmail');
-				if ($sendmail === null) {
-					$sendmail = '/usr/sbin/sendmail';
-				}
-				$binaryPath = $sendmail;
-				break;
-		}
-
-		switch ($this->config->getSystemValue('mail_sendmailmode', 'smtp')) {
-			case 'pipe':
-				$binaryParam = ' -t';
-				break;
-			default:
-				$binaryParam = ' -bs';
-				break;
-		}
-
-		return new \Swift_SendmailTransport($binaryPath . $binaryParam);
-	}
+    /** @var \Swift_Mailer Cached mailer */
+    private $instance = null;
+    /** @var IConfig */
+    private $config;
+    /** @var ILogger */
+    private $logger;
+    /** @var Defaults */
+    private $defaults;
+    /** @var IURLGenerator */
+    private $urlGenerator;
+    /** @var IL10N */
+    private $l10n;
+    /** @var IEventDispatcher */
+    private $dispatcher;
+    /** @var IFactory */
+    private $l10nFactory;
+
+    /**
+     * @param IConfig $config
+     * @param ILogger $logger
+     * @param Defaults $defaults
+     * @param IURLGenerator $urlGenerator
+     * @param IL10N $l10n
+     * @param IEventDispatcher $dispatcher
+     */
+    public function __construct(IConfig $config,
+                            ILogger $logger,
+                            Defaults $defaults,
+                            IURLGenerator $urlGenerator,
+                            IL10N $l10n,
+                            IEventDispatcher $dispatcher,
+                            IFactory $l10nFactory) {
+        $this->config = $config;
+        $this->logger = $logger;
+        $this->defaults = $defaults;
+        $this->urlGenerator = $urlGenerator;
+        $this->l10n = $l10n;
+        $this->dispatcher = $dispatcher;
+        $this->l10nFactory = $l10nFactory;
+    }
+
+    /**
+     * Creates a new message object that can be passed to send()
+     *
+     * @return IMessage
+     */
+    public function createMessage(): IMessage {
+        $plainTextOnly = $this->config->getSystemValue('mail_send_plaintext_only', false);
+        return new Message(new \Swift_Message(), $plainTextOnly);
+    }
+
+    /**
+     * @param string|null $data
+     * @param string|null $filename
+     * @param string|null $contentType
+     * @return IAttachment
+     * @since 13.0.0
+     */
+    public function createAttachment($data = null, $filename = null, $contentType = null): IAttachment {
+        return new Attachment(new \Swift_Attachment($data, $filename, $contentType));
+    }
+
+    /**
+     * @param string $path
+     * @param string|null $contentType
+     * @return IAttachment
+     * @since 13.0.0
+     */
+    public function createAttachmentFromPath(string $path, $contentType = null): IAttachment {
+        return new Attachment(\Swift_Attachment::fromPath($path, $contentType));
+    }
+
+    /**
+     * Creates a new email template object
+     *
+     * @param string $emailId
+     * @param array $data
+     * @return IEMailTemplate
+     * @since 12.0.0
+     */
+    public function createEMailTemplate(string $emailId, array $data = []): IEMailTemplate {
+        $class = $this->config->getSystemValue('mail_template_class', '');
+
+        if ($class !== '' && class_exists($class) && is_a($class, EMailTemplate::class, true)) {
+            return new $class(
+                $this->defaults,
+                $this->urlGenerator,
+                $this->l10nFactory,
+                $emailId,
+                $data
+            );
+        }
+
+        return new EMailTemplate(
+            $this->defaults,
+            $this->urlGenerator,
+            $this->l10nFactory,
+            $emailId,
+            $data
+        );
+    }
+
+    /**
+     * Send the specified message. Also sets the from address to the value defined in config.php
+     * if no-one has been passed.
+     *
+     * @param IMessage|Message $message Message to send
+     * @return string[] Array with failed recipients. Be aware that this depends on the used mail backend and
+     * therefore should be considered
+     * @throws \Exception In case it was not possible to send the message. (for example if an invalid mail address
+     * has been supplied.)
+     */
+    public function send(IMessage $message): array {
+        $debugMode = $this->config->getSystemValue('mail_smtpdebug', false);
+
+        if (empty($message->getFrom())) {
+            $message->setFrom([\OCP\Util::getDefaultEmailAddress('no-reply') => $this->defaults->getName()]);
+        }
+
+        $failedRecipients = [];
+
+        $mailer = $this->getInstance();
+
+        // Enable logger if debug mode is enabled
+        if ($debugMode) {
+            $mailLogger = new \Swift_Plugins_Loggers_ArrayLogger();
+            $mailer->registerPlugin(new \Swift_Plugins_LoggerPlugin($mailLogger));
+        }
+
+
+        $this->dispatcher->dispatchTyped(new BeforeMessageSent($message));
+
+        $mailer->send($message->getSwiftMessage(), $failedRecipients);
+
+        // Debugging logging
+        $logMessage = sprintf('Sent mail to "%s" with subject "%s"', print_r($message->getTo(), true), $message->getSubject());
+        $this->logger->debug($logMessage, ['app' => 'core']);
+        if ($debugMode && isset($mailLogger)) {
+            $this->logger->debug($mailLogger->dump(), ['app' => 'core']);
+        }
+
+        return $failedRecipients;
+    }
+
+    /**
+     * Checks if an e-mail address is valid
+     *
+     * @param string $email Email address to be validated
+     * @return bool True if the mail address is valid, false otherwise
+     */
+    public function validateMailAddress(string $email): bool {
+        if ($email === '') {
+            // Shortcut: empty addresses are never valid
+            return false;
+        }
+        $validator = new EmailValidator();
+        $validation = new RFCValidation();
+
+        return $validator->isValid($this->convertEmail($email), $validation);
+    }
+
+    /**
+     * SwiftMailer does currently not work with IDN domains, this function therefore converts the domains
+     *
+     * FIXME: Remove this once SwiftMailer supports IDN
+     *
+     * @param string $email
+     * @return string Converted mail address if `idn_to_ascii` exists
+     */
+    protected function convertEmail(string $email): string {
+        if (!function_exists('idn_to_ascii') || !defined('INTL_IDNA_VARIANT_UTS46') || strpos($email, '@') === false) {
+            return $email;
+        }
+
+        [$name, $domain] = explode('@', $email, 2);
+        $domain = idn_to_ascii($domain, 0,INTL_IDNA_VARIANT_UTS46);
+        return $name.'@'.$domain;
+    }
+
+    protected function getInstance(): \Swift_Mailer {
+        if (!is_null($this->instance)) {
+            return $this->instance;
+        }
+
+        $transport = null;
+
+        switch ($this->config->getSystemValue('mail_smtpmode', 'smtp')) {
+            case 'sendmail':
+                $transport = $this->getSendMailInstance();
+                break;
+            case 'smtp':
+            default:
+                $transport = $this->getSmtpInstance();
+                break;
+        }
+
+        return new \Swift_Mailer($transport);
+    }
+
+    /**
+     * Returns the SMTP transport
+     *
+     * @return \Swift_SmtpTransport
+     */
+    protected function getSmtpInstance(): \Swift_SmtpTransport {
+        $transport = new \Swift_SmtpTransport();
+        $transport->setTimeout($this->config->getSystemValue('mail_smtptimeout', 10));
+        $transport->setHost($this->config->getSystemValue('mail_smtphost', '127.0.0.1'));
+        $transport->setPort($this->config->getSystemValue('mail_smtpport', 25));
+        if ($this->config->getSystemValue('mail_smtpauth', false)) {
+            $transport->setUsername($this->config->getSystemValue('mail_smtpname', ''));
+            $transport->setPassword($this->config->getSystemValue('mail_smtppassword', ''));
+            $transport->setAuthMode($this->config->getSystemValue('mail_smtpauthtype', 'LOGIN'));
+        }
+        $smtpSecurity = $this->config->getSystemValue('mail_smtpsecure', '');
+        if (!empty($smtpSecurity)) {
+            $transport->setEncryption($smtpSecurity);
+        }
+        $streamingOptions = $this->config->getSystemValue('mail_smtpstreamoptions', []);
+        if (is_array($streamingOptions) && !empty($streamingOptions)) {
+            $transport->setStreamOptions($streamingOptions);
+        }
+
+        return $transport;
+    }
+
+    /**
+     * Returns the sendmail transport
+     *
+     * @return \Swift_SendmailTransport
+     */
+    protected function getSendMailInstance(): \Swift_SendmailTransport {
+        switch ($this->config->getSystemValue('mail_smtpmode', 'smtp')) {
+            case 'qmail':
+                $binaryPath = '/var/qmail/bin/sendmail';
+                break;
+            default:
+                $sendmail = \OC_Helper::findBinaryPath('sendmail');
+                if ($sendmail === null) {
+                    $sendmail = '/usr/sbin/sendmail';
+                }
+                $binaryPath = $sendmail;
+                break;
+        }
+
+        switch ($this->config->getSystemValue('mail_sendmailmode', 'smtp')) {
+            case 'pipe':
+                $binaryParam = ' -t';
+                break;
+            default:
+                $binaryParam = ' -bs';
+                break;
+        }
+
+        return new \Swift_SendmailTransport($binaryPath . $binaryParam);
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -245,7 +245,7 @@ 
 		}
 
 		[$name, $domain] = explode('@', $email, 2);
-		$domain = idn_to_ascii($domain, 0,INTL_IDNA_VARIANT_UTS46);
+		$domain = idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46);
 		return $name.'@'.$domain;
 	}
 
@@ -324,6 +324,6 @@ 
 				break;
 		}
 
-		return new \Swift_SendmailTransport($binaryPath . $binaryParam);
+		return new \Swift_SendmailTransport($binaryPath.$binaryParam);
 	}
 }

lib/private/Security/IdentityProof/Manager.php

Indentation +131 added lines, -131 removed lines

@@ -38,135 +38,135 @@
 use OCP\Security\ICrypto;
 
 class Manager {
-	/** @var IAppData */
-	private $appData;
-	/** @var ICrypto */
-	private $crypto;
-	/** @var IConfig */
-	private $config;
-	/** @var ILogger */
-	private $logger;
-
-	public function __construct(Factory $appDataFactory,
-								ICrypto $crypto,
-								IConfig $config,
-								ILogger $logger
-	) {
-		$this->appData = $appDataFactory->get('identityproof');
-		$this->crypto = $crypto;
-		$this->config = $config;
-		$this->logger = $logger;
-	}
-
-	/**
-	 * Calls the openssl functions to generate a public and private key.
-	 * In a separate function for unit testing purposes.
-	 *
-	 * @return array [$publicKey, $privateKey]
-	 * @throws \RuntimeException
-	 */
-	protected function generateKeyPair(): array {
-		$config = [
-			'digest_alg' => 'sha512',
-			'private_key_bits' => 2048,
-		];
-
-		// Generate new key
-		$res = openssl_pkey_new($config);
-
-		if ($res === false) {
-			$this->logOpensslError();
-			throw new \RuntimeException('OpenSSL reported a problem');
-		}
-
-		if (openssl_pkey_export($res, $privateKey, null, $config) === false) {
-			$this->logOpensslError();
-			throw new \RuntimeException('OpenSSL reported a problem');
-		}
-
-		// Extract the public key from $res to $pubKey
-		$publicKey = openssl_pkey_get_details($res);
-		$publicKey = $publicKey['key'];
-
-		return [$publicKey, $privateKey];
-	}
-
-	/**
-	 * Generate a key for a given ID
-	 * Note: If a key already exists it will be overwritten
-	 *
-	 * @param string $id key id
-	 * @return Key
-	 * @throws \RuntimeException
-	 */
-	protected function generateKey(string $id): Key {
-		[$publicKey, $privateKey] = $this->generateKeyPair();
-
-		// Write the private and public key to the disk
-		try {
-			$this->appData->newFolder($id);
-		} catch (\Exception $e) {
-		}
-		$folder = $this->appData->getFolder($id);
-		$folder->newFile('private')
-			->putContent($this->crypto->encrypt($privateKey));
-		$folder->newFile('public')
-			->putContent($publicKey);
-
-		return new Key($publicKey, $privateKey);
-	}
-
-	/**
-	 * Get key for a specific id
-	 *
-	 * @param string $id
-	 * @return Key
-	 * @throws \RuntimeException
-	 */
-	protected function retrieveKey(string $id): Key {
-		try {
-			$folder = $this->appData->getFolder($id);
-			$privateKey = $this->crypto->decrypt(
-				$folder->getFile('private')->getContent()
-			);
-			$publicKey = $folder->getFile('public')->getContent();
-			return new Key($publicKey, $privateKey);
-		} catch (\Exception $e) {
-			return $this->generateKey($id);
-		}
-	}
-
-	/**
-	 * Get public and private key for $user
-	 *
-	 * @param IUser $user
-	 * @return Key
-	 * @throws \RuntimeException
-	 */
-	public function getKey(IUser $user): Key {
-		$uid = $user->getUID();
-		return $this->retrieveKey('user-' . $uid);
-	}
-
-	/**
-	 * Get instance wide public and private key
-	 *
-	 * @return Key
-	 * @throws \RuntimeException
-	 */
-	public function getSystemKey(): Key {
-		$instanceId = $this->config->getSystemValue('instanceid', null);
-		if ($instanceId === null) {
-			throw new \RuntimeException('no instance id!');
-		}
-		return $this->retrieveKey('system-' . $instanceId);
-	}
-
-	private function logOpensslError(): void {
-		$errors = [];
-		while ($error = openssl_error_string()) {
-			$errors[] = $error;
-		}
-		$this->logger->critical('Something is wrong with your openssl setup: ' . implode(', ', $errors));
-	}
+    /** @var IAppData */
+    private $appData;
+    /** @var ICrypto */
+    private $crypto;
+    /** @var IConfig */
+    private $config;
+    /** @var ILogger */
+    private $logger;
+
+    public function __construct(Factory $appDataFactory,
+                                ICrypto $crypto,
+                                IConfig $config,
+                                ILogger $logger
+    ) {
+        $this->appData = $appDataFactory->get('identityproof');
+        $this->crypto = $crypto;
+        $this->config = $config;
+        $this->logger = $logger;
+    }
+
+    /**
+     * Calls the openssl functions to generate a public and private key.
+     * In a separate function for unit testing purposes.
+     *
+     * @return array [$publicKey, $privateKey]
+     * @throws \RuntimeException
+     */
+    protected function generateKeyPair(): array {
+        $config = [
+            'digest_alg' => 'sha512',
+            'private_key_bits' => 2048,
+        ];
+
+        // Generate new key
+        $res = openssl_pkey_new($config);
+
+        if ($res === false) {
+            $this->logOpensslError();
+            throw new \RuntimeException('OpenSSL reported a problem');
+        }
+
+        if (openssl_pkey_export($res, $privateKey, null, $config) === false) {
+            $this->logOpensslError();
+            throw new \RuntimeException('OpenSSL reported a problem');
+        }
+
+        // Extract the public key from $res to $pubKey
+        $publicKey = openssl_pkey_get_details($res);
+        $publicKey = $publicKey['key'];
+
+        return [$publicKey, $privateKey];
+    }
+
+    /**
+     * Generate a key for a given ID
+     * Note: If a key already exists it will be overwritten
+     *
+     * @param string $id key id
+     * @return Key
+     * @throws \RuntimeException
+     */
+    protected function generateKey(string $id): Key {
+        [$publicKey, $privateKey] = $this->generateKeyPair();
+
+        // Write the private and public key to the disk
+        try {
+            $this->appData->newFolder($id);
+        } catch (\Exception $e) {
+        }
+        $folder = $this->appData->getFolder($id);
+        $folder->newFile('private')
+            ->putContent($this->crypto->encrypt($privateKey));
+        $folder->newFile('public')
+            ->putContent($publicKey);
+
+        return new Key($publicKey, $privateKey);
+    }
+
+    /**
+     * Get key for a specific id
+     *
+     * @param string $id
+     * @return Key
+     * @throws \RuntimeException
+     */
+    protected function retrieveKey(string $id): Key {
+        try {
+            $folder = $this->appData->getFolder($id);
+            $privateKey = $this->crypto->decrypt(
+                $folder->getFile('private')->getContent()
+            );
+            $publicKey = $folder->getFile('public')->getContent();
+            return new Key($publicKey, $privateKey);
+        } catch (\Exception $e) {
+            return $this->generateKey($id);
+        }
+    }
+
+    /**
+     * Get public and private key for $user
+     *
+     * @param IUser $user
+     * @return Key
+     * @throws \RuntimeException
+     */
+    public function getKey(IUser $user): Key {
+        $uid = $user->getUID();
+        return $this->retrieveKey('user-' . $uid);
+    }
+
+    /**
+     * Get instance wide public and private key
+     *
+     * @return Key
+     * @throws \RuntimeException
+     */
+    public function getSystemKey(): Key {
+        $instanceId = $this->config->getSystemValue('instanceid', null);
+        if ($instanceId === null) {
+            throw new \RuntimeException('no instance id!');
+        }
+        return $this->retrieveKey('system-' . $instanceId);
+    }
+
+    private function logOpensslError(): void {
+        $errors = [];
+        while ($error = openssl_error_string()) {
+            $errors[] = $error;
+        }
+        $this->logger->critical('Something is wrong with your openssl setup: ' . implode(', ', $errors));
+    }
 }

lib/private/DB/QueryBuilder/QuoteHelper.php

Indentation +41 added lines, -41 removed lines

@@ -28,55 +28,55 @@
 use OCP\DB\QueryBuilder\IQueryFunction;
 
 class QuoteHelper {
-	/**
-	 * @param array|string|ILiteral|IParameter|IQueryFunction $strings string, Literal or Parameter
-	 * @return array|string
-	 */
-	public function quoteColumnNames($strings) {
-		if (!is_array($strings)) {
-			return $this->quoteColumnName($strings);
-		}
+    /**
+     * @param array|string|ILiteral|IParameter|IQueryFunction $strings string, Literal or Parameter
+     * @return array|string
+     */
+    public function quoteColumnNames($strings) {
+        if (!is_array($strings)) {
+            return $this->quoteColumnName($strings);
+        }
 
-		$return = [];
-		foreach ($strings as $string) {
-			$return[] = $this->quoteColumnName($string);
-		}
+        $return = [];
+        foreach ($strings as $string) {
+            $return[] = $this->quoteColumnName($string);
+        }
 
-		return $return;
-	}
+        return $return;
+    }
 
-	/**
-	 * @param string|ILiteral|IParameter|IQueryFunction $string string, Literal or Parameter
-	 * @return string
-	 */
-	public function quoteColumnName($string) {
-		if ($string instanceof IParameter || $string instanceof ILiteral || $string instanceof IQueryFunction) {
-			return (string) $string;
-		}
+    /**
+     * @param string|ILiteral|IParameter|IQueryFunction $string string, Literal or Parameter
+     * @return string
+     */
+    public function quoteColumnName($string) {
+        if ($string instanceof IParameter || $string instanceof ILiteral || $string instanceof IQueryFunction) {
+            return (string) $string;
+        }
 
-		if ($string === null || $string === 'null' || $string === '*') {
-			return $string;
-		}
+        if ($string === null || $string === 'null' || $string === '*') {
+            return $string;
+        }
 
-		if (!is_string($string)) {
-			throw new \InvalidArgumentException('Only strings, Literals and Parameters are allowed');
-		}
+        if (!is_string($string)) {
+            throw new \InvalidArgumentException('Only strings, Literals and Parameters are allowed');
+        }
 
-		$string = str_replace(' AS ', ' as ', $string);
-		if (substr_count($string, ' as ')) {
-			return implode(' as ', array_map([$this, 'quoteColumnName'], explode(' as ', $string, 2)));
-		}
+        $string = str_replace(' AS ', ' as ', $string);
+        if (substr_count($string, ' as ')) {
+            return implode(' as ', array_map([$this, 'quoteColumnName'], explode(' as ', $string, 2)));
+        }
 
-		if (substr_count($string, '.')) {
-			[$alias, $columnName] = explode('.', $string, 2);
+        if (substr_count($string, '.')) {
+            [$alias, $columnName] = explode('.', $string, 2);
 
-			if ($columnName === '*') {
-				return '`' . $alias . '`.*';
-			}
+            if ($columnName === '*') {
+                return '`' . $alias . '`.*';
+            }
 
-			return '`' . $alias . '`.`' . $columnName . '`';
-		}
+            return '`' . $alias . '`.`' . $columnName . '`';
+        }
 
-		return '`' . $string . '`';
-	}
+        return '`' . $string . '`';
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -71,12 +71,12 @@
 			[$alias, $columnName] = explode('.', $string, 2);
 
 			if ($columnName === '*') {
-				return '`' . $alias . '`.*';
+				return '`'.$alias.'`.*';
 			}
 
-			return '`' . $alias . '`.`' . $columnName . '`';
+			return '`'.$alias.'`.`'.$columnName.'`';
 		}
 
-		return '`' . $string . '`';
+		return '`'.$string.'`';
 	}
 }

lib/private/Share20/Manager.php

Indentation +1803 added lines, -1803 removed lines

@@ -77,1830 +77,1830 @@
  */
 class Manager implements IManager {
 
-	/** @var IProviderFactory */
-	private $factory;
-	/** @var ILogger */
-	private $logger;
-	/** @var IConfig */
-	private $config;
-	/** @var ISecureRandom */
-	private $secureRandom;
-	/** @var IHasher */
-	private $hasher;
-	/** @var IMountManager */
-	private $mountManager;
-	/** @var IGroupManager */
-	private $groupManager;
-	/** @var IL10N */
-	private $l;
-	/** @var IFactory */
-	private $l10nFactory;
-	/** @var IUserManager */
-	private $userManager;
-	/** @var IRootFolder */
-	private $rootFolder;
-	/** @var CappedMemoryCache */
-	private $sharingDisabledForUsersCache;
-	/** @var EventDispatcherInterface */
-	private $legacyDispatcher;
-	/** @var LegacyHooks */
-	private $legacyHooks;
-	/** @var IMailer */
-	private $mailer;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var \OC_Defaults */
-	private $defaults;
-	/** @var IEventDispatcher */
-	private $dispatcher;
-
-
-	/**
-	 * Manager constructor.
-	 *
-	 * @param ILogger $logger
-	 * @param IConfig $config
-	 * @param ISecureRandom $secureRandom
-	 * @param IHasher $hasher
-	 * @param IMountManager $mountManager
-	 * @param IGroupManager $groupManager
-	 * @param IL10N $l
-	 * @param IFactory $l10nFactory
-	 * @param IProviderFactory $factory
-	 * @param IUserManager $userManager
-	 * @param IRootFolder $rootFolder
-	 * @param EventDispatcherInterface $eventDispatcher
-	 * @param IMailer $mailer
-	 * @param IURLGenerator $urlGenerator
-	 * @param \OC_Defaults $defaults
-	 */
-	public function __construct(
-			ILogger $logger,
-			IConfig $config,
-			ISecureRandom $secureRandom,
-			IHasher $hasher,
-			IMountManager $mountManager,
-			IGroupManager $groupManager,
-			IL10N $l,
-			IFactory $l10nFactory,
-			IProviderFactory $factory,
-			IUserManager $userManager,
-			IRootFolder $rootFolder,
-			EventDispatcherInterface $legacyDispatcher,
-			IMailer $mailer,
-			IURLGenerator $urlGenerator,
-			\OC_Defaults $defaults,
-			IEventDispatcher $dispatcher
-	) {
-		$this->logger = $logger;
-		$this->config = $config;
-		$this->secureRandom = $secureRandom;
-		$this->hasher = $hasher;
-		$this->mountManager = $mountManager;
-		$this->groupManager = $groupManager;
-		$this->l = $l;
-		$this->l10nFactory = $l10nFactory;
-		$this->factory = $factory;
-		$this->userManager = $userManager;
-		$this->rootFolder = $rootFolder;
-		$this->legacyDispatcher = $legacyDispatcher;
-		$this->sharingDisabledForUsersCache = new CappedMemoryCache();
-		$this->legacyHooks = new LegacyHooks($this->legacyDispatcher);
-		$this->mailer = $mailer;
-		$this->urlGenerator = $urlGenerator;
-		$this->defaults = $defaults;
-		$this->dispatcher = $dispatcher;
-	}
-
-	/**
-	 * Convert from a full share id to a tuple (providerId, shareId)
-	 *
-	 * @param string $id
-	 * @return string[]
-	 */
-	private function splitFullId($id) {
-		return explode(':', $id, 2);
-	}
-
-	/**
-	 * Verify if a password meets all requirements
-	 *
-	 * @param string $password
-	 * @throws \Exception
-	 */
-	protected function verifyPassword($password) {
-		if ($password === null) {
-			// No password is set, check if this is allowed.
-			if ($this->shareApiLinkEnforcePassword()) {
-				throw new \InvalidArgumentException('Passwords are enforced for link shares');
-			}
-
-			return;
-		}
-
-		// Let others verify the password
-		try {
-			$this->legacyDispatcher->dispatch(new ValidatePasswordPolicyEvent($password));
-		} catch (HintException $e) {
-			throw new \Exception($e->getHint());
-		}
-	}
-
-	/**
-	 * Check for generic requirements before creating a share
-	 *
-	 * @param IShare $share
-	 * @throws \InvalidArgumentException
-	 * @throws GenericShareException
-	 *
-	 * @suppress PhanUndeclaredClassMethod
-	 */
-	protected function generalCreateChecks(IShare $share) {
-		if ($share->getShareType() === IShare::TYPE_USER) {
-			// We expect a valid user as sharedWith for user shares
-			if (!$this->userManager->userExists($share->getSharedWith())) {
-				throw new \InvalidArgumentException('SharedWith is not a valid user');
-			}
-		} elseif ($share->getShareType() === IShare::TYPE_GROUP) {
-			// We expect a valid group as sharedWith for group shares
-			if (!$this->groupManager->groupExists($share->getSharedWith())) {
-				throw new \InvalidArgumentException('SharedWith is not a valid group');
-			}
-		} elseif ($share->getShareType() === IShare::TYPE_LINK) {
-			if ($share->getSharedWith() !== null) {
-				throw new \InvalidArgumentException('SharedWith should be empty');
-			}
-		} elseif ($share->getShareType() === IShare::TYPE_REMOTE) {
-			if ($share->getSharedWith() === null) {
-				throw new \InvalidArgumentException('SharedWith should not be empty');
-			}
-		} elseif ($share->getShareType() === IShare::TYPE_REMOTE_GROUP) {
-			if ($share->getSharedWith() === null) {
-				throw new \InvalidArgumentException('SharedWith should not be empty');
-			}
-		} elseif ($share->getShareType() === IShare::TYPE_EMAIL) {
-			if ($share->getSharedWith() === null) {
-				throw new \InvalidArgumentException('SharedWith should not be empty');
-			}
-		} elseif ($share->getShareType() === IShare::TYPE_CIRCLE) {
-			$circle = \OCA\Circles\Api\v1\Circles::detailsCircle($share->getSharedWith());
-			if ($circle === null) {
-				throw new \InvalidArgumentException('SharedWith is not a valid circle');
-			}
-		} elseif ($share->getShareType() === IShare::TYPE_ROOM) {
-		} elseif ($share->getShareType() === IShare::TYPE_DECK) {
-		} else {
-			// We can't handle other types yet
-			throw new \InvalidArgumentException('unknown share type');
-		}
-
-		// Verify the initiator of the share is set
-		if ($share->getSharedBy() === null) {
-			throw new \InvalidArgumentException('SharedBy should be set');
-		}
-
-		// Cannot share with yourself
-		if ($share->getShareType() === IShare::TYPE_USER &&
-			$share->getSharedWith() === $share->getSharedBy()) {
-			throw new \InvalidArgumentException('Can’t share with yourself');
-		}
-
-		// The path should be set
-		if ($share->getNode() === null) {
-			throw new \InvalidArgumentException('Path should be set');
-		}
-
-		// And it should be a file or a folder
-		if (!($share->getNode() instanceof \OCP\Files\File) &&
-				!($share->getNode() instanceof \OCP\Files\Folder)) {
-			throw new \InvalidArgumentException('Path should be either a file or a folder');
-		}
-
-		// And you can't share your rootfolder
-		if ($this->userManager->userExists($share->getSharedBy())) {
-			$userFolder = $this->rootFolder->getUserFolder($share->getSharedBy());
-		} else {
-			$userFolder = $this->rootFolder->getUserFolder($share->getShareOwner());
-		}
-		if ($userFolder->getId() === $share->getNode()->getId()) {
-			throw new \InvalidArgumentException('You can’t share your root folder');
-		}
-
-		// Check if we actually have share permissions
-		if (!$share->getNode()->isShareable()) {
-			$message_t = $this->l->t('You are not allowed to share %s', [$share->getNode()->getName()]);
-			throw new GenericShareException($message_t, $message_t, 404);
-		}
-
-		// Permissions should be set
-		if ($share->getPermissions() === null) {
-			throw new \InvalidArgumentException('A share requires permissions');
-		}
-
-		$isFederatedShare = $share->getNode()->getStorage()->instanceOfStorage('\OCA\Files_Sharing\External\Storage');
-		$permissions = 0;
-
-		if (!$isFederatedShare && $share->getNode()->getOwner() && $share->getNode()->getOwner()->getUID() !== $share->getSharedBy()) {
-			$userMounts = array_filter($userFolder->getById($share->getNode()->getId()), function ($mount) {
-				// We need to filter since there might be other mountpoints that contain the file
-				// e.g. if the user has access to the same external storage that the file is originating from
-				return $mount->getStorage()->instanceOfStorage(ISharedStorage::class);
-			});
-			$userMount = array_shift($userMounts);
-			if ($userMount === null) {
-				throw new GenericShareException('Could not get proper share mount for ' . $share->getNode()->getId() . '. Failing since else the next calls are called with null');
-			}
-			$mount = $userMount->getMountPoint();
-			// When it's a reshare use the parent share permissions as maximum
-			$userMountPointId = $mount->getStorageRootId();
-			$userMountPoints = $userFolder->getById($userMountPointId);
-			$userMountPoint = array_shift($userMountPoints);
-
-			if ($userMountPoint === null) {
-				throw new GenericShareException('Could not get proper user mount for ' . $userMountPointId . '. Failing since else the next calls are called with null');
-			}
-
-			/* Check if this is an incoming share */
-			$incomingShares = $this->getSharedWith($share->getSharedBy(), IShare::TYPE_USER, $userMountPoint, -1, 0);
-			$incomingShares = array_merge($incomingShares, $this->getSharedWith($share->getSharedBy(), IShare::TYPE_GROUP, $userMountPoint, -1, 0));
-			$incomingShares = array_merge($incomingShares, $this->getSharedWith($share->getSharedBy(), IShare::TYPE_CIRCLE, $userMountPoint, -1, 0));
-			$incomingShares = array_merge($incomingShares, $this->getSharedWith($share->getSharedBy(), IShare::TYPE_ROOM, $userMountPoint, -1, 0));
-
-			/** @var IShare[] $incomingShares */
-			if (!empty($incomingShares)) {
-				foreach ($incomingShares as $incomingShare) {
-					$permissions |= $incomingShare->getPermissions();
-				}
-			}
-		} else {
-			/*
+    /** @var IProviderFactory */
+    private $factory;
+    /** @var ILogger */
+    private $logger;
+    /** @var IConfig */
+    private $config;
+    /** @var ISecureRandom */
+    private $secureRandom;
+    /** @var IHasher */
+    private $hasher;
+    /** @var IMountManager */
+    private $mountManager;
+    /** @var IGroupManager */
+    private $groupManager;
+    /** @var IL10N */
+    private $l;
+    /** @var IFactory */
+    private $l10nFactory;
+    /** @var IUserManager */
+    private $userManager;
+    /** @var IRootFolder */
+    private $rootFolder;
+    /** @var CappedMemoryCache */
+    private $sharingDisabledForUsersCache;
+    /** @var EventDispatcherInterface */
+    private $legacyDispatcher;
+    /** @var LegacyHooks */
+    private $legacyHooks;
+    /** @var IMailer */
+    private $mailer;
+    /** @var IURLGenerator */
+    private $urlGenerator;
+    /** @var \OC_Defaults */
+    private $defaults;
+    /** @var IEventDispatcher */
+    private $dispatcher;
+
+
+    /**
+     * Manager constructor.
+     *
+     * @param ILogger $logger
+     * @param IConfig $config
+     * @param ISecureRandom $secureRandom
+     * @param IHasher $hasher
+     * @param IMountManager $mountManager
+     * @param IGroupManager $groupManager
+     * @param IL10N $l
+     * @param IFactory $l10nFactory
+     * @param IProviderFactory $factory
+     * @param IUserManager $userManager
+     * @param IRootFolder $rootFolder
+     * @param EventDispatcherInterface $eventDispatcher
+     * @param IMailer $mailer
+     * @param IURLGenerator $urlGenerator
+     * @param \OC_Defaults $defaults
+     */
+    public function __construct(
+            ILogger $logger,
+            IConfig $config,
+            ISecureRandom $secureRandom,
+            IHasher $hasher,
+            IMountManager $mountManager,
+            IGroupManager $groupManager,
+            IL10N $l,
+            IFactory $l10nFactory,
+            IProviderFactory $factory,
+            IUserManager $userManager,
+            IRootFolder $rootFolder,
+            EventDispatcherInterface $legacyDispatcher,
+            IMailer $mailer,
+            IURLGenerator $urlGenerator,
+            \OC_Defaults $defaults,
+            IEventDispatcher $dispatcher
+    ) {
+        $this->logger = $logger;
+        $this->config = $config;
+        $this->secureRandom = $secureRandom;
+        $this->hasher = $hasher;
+        $this->mountManager = $mountManager;
+        $this->groupManager = $groupManager;
+        $this->l = $l;
+        $this->l10nFactory = $l10nFactory;
+        $this->factory = $factory;
+        $this->userManager = $userManager;
+        $this->rootFolder = $rootFolder;
+        $this->legacyDispatcher = $legacyDispatcher;
+        $this->sharingDisabledForUsersCache = new CappedMemoryCache();
+        $this->legacyHooks = new LegacyHooks($this->legacyDispatcher);
+        $this->mailer = $mailer;
+        $this->urlGenerator = $urlGenerator;
+        $this->defaults = $defaults;
+        $this->dispatcher = $dispatcher;
+    }
+
+    /**
+     * Convert from a full share id to a tuple (providerId, shareId)
+     *
+     * @param string $id
+     * @return string[]
+     */
+    private function splitFullId($id) {
+        return explode(':', $id, 2);
+    }
+
+    /**
+     * Verify if a password meets all requirements
+     *
+     * @param string $password
+     * @throws \Exception
+     */
+    protected function verifyPassword($password) {
+        if ($password === null) {
+            // No password is set, check if this is allowed.
+            if ($this->shareApiLinkEnforcePassword()) {
+                throw new \InvalidArgumentException('Passwords are enforced for link shares');
+            }
+
+            return;
+        }
+
+        // Let others verify the password
+        try {
+            $this->legacyDispatcher->dispatch(new ValidatePasswordPolicyEvent($password));
+        } catch (HintException $e) {
+            throw new \Exception($e->getHint());
+        }
+    }
+
+    /**
+     * Check for generic requirements before creating a share
+     *
+     * @param IShare $share
+     * @throws \InvalidArgumentException
+     * @throws GenericShareException
+     *
+     * @suppress PhanUndeclaredClassMethod
+     */
+    protected function generalCreateChecks(IShare $share) {
+        if ($share->getShareType() === IShare::TYPE_USER) {
+            // We expect a valid user as sharedWith for user shares
+            if (!$this->userManager->userExists($share->getSharedWith())) {
+                throw new \InvalidArgumentException('SharedWith is not a valid user');
+            }
+        } elseif ($share->getShareType() === IShare::TYPE_GROUP) {
+            // We expect a valid group as sharedWith for group shares
+            if (!$this->groupManager->groupExists($share->getSharedWith())) {
+                throw new \InvalidArgumentException('SharedWith is not a valid group');
+            }
+        } elseif ($share->getShareType() === IShare::TYPE_LINK) {
+            if ($share->getSharedWith() !== null) {
+                throw new \InvalidArgumentException('SharedWith should be empty');
+            }
+        } elseif ($share->getShareType() === IShare::TYPE_REMOTE) {
+            if ($share->getSharedWith() === null) {
+                throw new \InvalidArgumentException('SharedWith should not be empty');
+            }
+        } elseif ($share->getShareType() === IShare::TYPE_REMOTE_GROUP) {
+            if ($share->getSharedWith() === null) {
+                throw new \InvalidArgumentException('SharedWith should not be empty');
+            }
+        } elseif ($share->getShareType() === IShare::TYPE_EMAIL) {
+            if ($share->getSharedWith() === null) {
+                throw new \InvalidArgumentException('SharedWith should not be empty');
+            }
+        } elseif ($share->getShareType() === IShare::TYPE_CIRCLE) {
+            $circle = \OCA\Circles\Api\v1\Circles::detailsCircle($share->getSharedWith());
+            if ($circle === null) {
+                throw new \InvalidArgumentException('SharedWith is not a valid circle');
+            }
+        } elseif ($share->getShareType() === IShare::TYPE_ROOM) {
+        } elseif ($share->getShareType() === IShare::TYPE_DECK) {
+        } else {
+            // We can't handle other types yet
+            throw new \InvalidArgumentException('unknown share type');
+        }
+
+        // Verify the initiator of the share is set
+        if ($share->getSharedBy() === null) {
+            throw new \InvalidArgumentException('SharedBy should be set');
+        }
+
+        // Cannot share with yourself
+        if ($share->getShareType() === IShare::TYPE_USER &&
+            $share->getSharedWith() === $share->getSharedBy()) {
+            throw new \InvalidArgumentException('Can’t share with yourself');
+        }
+
+        // The path should be set
+        if ($share->getNode() === null) {
+            throw new \InvalidArgumentException('Path should be set');
+        }
+
+        // And it should be a file or a folder
+        if (!($share->getNode() instanceof \OCP\Files\File) &&
+                !($share->getNode() instanceof \OCP\Files\Folder)) {
+            throw new \InvalidArgumentException('Path should be either a file or a folder');
+        }
+
+        // And you can't share your rootfolder
+        if ($this->userManager->userExists($share->getSharedBy())) {
+            $userFolder = $this->rootFolder->getUserFolder($share->getSharedBy());
+        } else {
+            $userFolder = $this->rootFolder->getUserFolder($share->getShareOwner());
+        }
+        if ($userFolder->getId() === $share->getNode()->getId()) {
+            throw new \InvalidArgumentException('You can’t share your root folder');
+        }
+
+        // Check if we actually have share permissions
+        if (!$share->getNode()->isShareable()) {
+            $message_t = $this->l->t('You are not allowed to share %s', [$share->getNode()->getName()]);
+            throw new GenericShareException($message_t, $message_t, 404);
+        }
+
+        // Permissions should be set
+        if ($share->getPermissions() === null) {
+            throw new \InvalidArgumentException('A share requires permissions');
+        }
+
+        $isFederatedShare = $share->getNode()->getStorage()->instanceOfStorage('\OCA\Files_Sharing\External\Storage');
+        $permissions = 0;
+
+        if (!$isFederatedShare && $share->getNode()->getOwner() && $share->getNode()->getOwner()->getUID() !== $share->getSharedBy()) {
+            $userMounts = array_filter($userFolder->getById($share->getNode()->getId()), function ($mount) {
+                // We need to filter since there might be other mountpoints that contain the file
+                // e.g. if the user has access to the same external storage that the file is originating from
+                return $mount->getStorage()->instanceOfStorage(ISharedStorage::class);
+            });
+            $userMount = array_shift($userMounts);
+            if ($userMount === null) {
+                throw new GenericShareException('Could not get proper share mount for ' . $share->getNode()->getId() . '. Failing since else the next calls are called with null');
+            }
+            $mount = $userMount->getMountPoint();
+            // When it's a reshare use the parent share permissions as maximum
+            $userMountPointId = $mount->getStorageRootId();
+            $userMountPoints = $userFolder->getById($userMountPointId);
+            $userMountPoint = array_shift($userMountPoints);
+
+            if ($userMountPoint === null) {
+                throw new GenericShareException('Could not get proper user mount for ' . $userMountPointId . '. Failing since else the next calls are called with null');
+            }
+
+            /* Check if this is an incoming share */
+            $incomingShares = $this->getSharedWith($share->getSharedBy(), IShare::TYPE_USER, $userMountPoint, -1, 0);
+            $incomingShares = array_merge($incomingShares, $this->getSharedWith($share->getSharedBy(), IShare::TYPE_GROUP, $userMountPoint, -1, 0));
+            $incomingShares = array_merge($incomingShares, $this->getSharedWith($share->getSharedBy(), IShare::TYPE_CIRCLE, $userMountPoint, -1, 0));
+            $incomingShares = array_merge($incomingShares, $this->getSharedWith($share->getSharedBy(), IShare::TYPE_ROOM, $userMountPoint, -1, 0));
+
+            /** @var IShare[] $incomingShares */
+            if (!empty($incomingShares)) {
+                foreach ($incomingShares as $incomingShare) {
+                    $permissions |= $incomingShare->getPermissions();
+                }
+            }
+        } else {
+            /*
 			 * Quick fix for #23536
 			 * Non moveable mount points do not have update and delete permissions
 			 * while we 'most likely' do have that on the storage.
 			 */
-			$permissions = $share->getNode()->getPermissions();
-			if (!($share->getNode()->getMountPoint() instanceof MoveableMount)) {
-				$permissions |= \OCP\Constants::PERMISSION_DELETE | \OCP\Constants::PERMISSION_UPDATE;
-			}
-		}
-
-		// Check that we do not share with more permissions than we have
-		if ($share->getPermissions() & ~$permissions) {
-			$path = $userFolder->getRelativePath($share->getNode()->getPath());
-			$message_t = $this->l->t('Can’t increase permissions of %s', [$path]);
-			throw new GenericShareException($message_t, $message_t, 404);
-		}
-
-
-		// Check that read permissions are always set
-		// Link shares are allowed to have no read permissions to allow upload to hidden folders
-		$noReadPermissionRequired = $share->getShareType() === IShare::TYPE_LINK
-			|| $share->getShareType() === IShare::TYPE_EMAIL;
-		if (!$noReadPermissionRequired &&
-			($share->getPermissions() & \OCP\Constants::PERMISSION_READ) === 0) {
-			throw new \InvalidArgumentException('Shares need at least read permissions');
-		}
-
-		if ($share->getNode() instanceof \OCP\Files\File) {
-			if ($share->getPermissions() & \OCP\Constants::PERMISSION_DELETE) {
-				$message_t = $this->l->t('Files can’t be shared with delete permissions');
-				throw new GenericShareException($message_t);
-			}
-			if ($share->getPermissions() & \OCP\Constants::PERMISSION_CREATE) {
-				$message_t = $this->l->t('Files can’t be shared with create permissions');
-				throw new GenericShareException($message_t);
-			}
-		}
-	}
-
-	/**
-	 * Validate if the expiration date fits the system settings
-	 *
-	 * @param IShare $share The share to validate the expiration date of
-	 * @return IShare The modified share object
-	 * @throws GenericShareException
-	 * @throws \InvalidArgumentException
-	 * @throws \Exception
-	 */
-	protected function validateExpirationDateInternal(IShare $share) {
-		$expirationDate = $share->getExpirationDate();
-
-		if ($expirationDate !== null) {
-			//Make sure the expiration date is a date
-			$expirationDate->setTime(0, 0, 0);
-
-			$date = new \DateTime();
-			$date->setTime(0, 0, 0);
-			if ($date >= $expirationDate) {
-				$message = $this->l->t('Expiration date is in the past');
-				throw new GenericShareException($message, $message, 404);
-			}
-		}
-
-		// If expiredate is empty set a default one if there is a default
-		$fullId = null;
-		try {
-			$fullId = $share->getFullId();
-		} catch (\UnexpectedValueException $e) {
-			// This is a new share
-		}
-
-		if ($fullId === null && $expirationDate === null && $this->shareApiInternalDefaultExpireDate()) {
-			$expirationDate = new \DateTime();
-			$expirationDate->setTime(0,0,0);
-
-			$days = (int)$this->config->getAppValue('core', 'internal_defaultExpDays', (string)$this->shareApiInternalDefaultExpireDays());
-			if ($days > $this->shareApiInternalDefaultExpireDays()) {
-				$days = $this->shareApiInternalDefaultExpireDays();
-			}
-			$expirationDate->add(new \DateInterval('P'.$days.'D'));
-		}
-
-		// If we enforce the expiration date check that is does not exceed
-		if ($this->shareApiInternalDefaultExpireDateEnforced()) {
-			if ($expirationDate === null) {
-				throw new \InvalidArgumentException('Expiration date is enforced');
-			}
-
-			$date = new \DateTime();
-			$date->setTime(0, 0, 0);
-			$date->add(new \DateInterval('P' . $this->shareApiInternalDefaultExpireDays() . 'D'));
-			if ($date < $expirationDate) {
-				$message = $this->l->t('Can’t set expiration date more than %s days in the future', [$this->shareApiInternalDefaultExpireDays()]);
-				throw new GenericShareException($message, $message, 404);
-			}
-		}
-
-		$accepted = true;
-		$message = '';
-		\OCP\Util::emitHook('\OC\Share', 'verifyExpirationDate', [
-			'expirationDate' => &$expirationDate,
-			'accepted' => &$accepted,
-			'message' => &$message,
-			'passwordSet' => $share->getPassword() !== null,
-		]);
-
-		if (!$accepted) {
-			throw new \Exception($message);
-		}
-
-		$share->setExpirationDate($expirationDate);
-
-		return $share;
-	}
-
-	/**
-	 * Validate if the expiration date fits the system settings
-	 *
-	 * @param IShare $share The share to validate the expiration date of
-	 * @return IShare The modified share object
-	 * @throws GenericShareException
-	 * @throws \InvalidArgumentException
-	 * @throws \Exception
-	 */
-	protected function validateExpirationDate(IShare $share) {
-		$expirationDate = $share->getExpirationDate();
-
-		if ($expirationDate !== null) {
-			//Make sure the expiration date is a date
-			$expirationDate->setTime(0, 0, 0);
-
-			$date = new \DateTime();
-			$date->setTime(0, 0, 0);
-			if ($date >= $expirationDate) {
-				$message = $this->l->t('Expiration date is in the past');
-				throw new GenericShareException($message, $message, 404);
-			}
-		}
-
-		// If expiredate is empty set a default one if there is a default
-		$fullId = null;
-		try {
-			$fullId = $share->getFullId();
-		} catch (\UnexpectedValueException $e) {
-			// This is a new share
-		}
-
-		if ($fullId === null && $expirationDate === null && $this->shareApiLinkDefaultExpireDate()) {
-			$expirationDate = new \DateTime();
-			$expirationDate->setTime(0,0,0);
-
-			$days = (int)$this->config->getAppValue('core', 'link_defaultExpDays', $this->shareApiLinkDefaultExpireDays());
-			if ($days > $this->shareApiLinkDefaultExpireDays()) {
-				$days = $this->shareApiLinkDefaultExpireDays();
-			}
-			$expirationDate->add(new \DateInterval('P'.$days.'D'));
-		}
-
-		// If we enforce the expiration date check that is does not exceed
-		if ($this->shareApiLinkDefaultExpireDateEnforced()) {
-			if ($expirationDate === null) {
-				throw new \InvalidArgumentException('Expiration date is enforced');
-			}
-
-			$date = new \DateTime();
-			$date->setTime(0, 0, 0);
-			$date->add(new \DateInterval('P' . $this->shareApiLinkDefaultExpireDays() . 'D'));
-			if ($date < $expirationDate) {
-				$message = $this->l->t('Can’t set expiration date more than %s days in the future', [$this->shareApiLinkDefaultExpireDays()]);
-				throw new GenericShareException($message, $message, 404);
-			}
-		}
-
-		$accepted = true;
-		$message = '';
-		\OCP\Util::emitHook('\OC\Share', 'verifyExpirationDate', [
-			'expirationDate' => &$expirationDate,
-			'accepted' => &$accepted,
-			'message' => &$message,
-			'passwordSet' => $share->getPassword() !== null,
-		]);
-
-		if (!$accepted) {
-			throw new \Exception($message);
-		}
-
-		$share->setExpirationDate($expirationDate);
-
-		return $share;
-	}
-
-	/**
-	 * Check for pre share requirements for user shares
-	 *
-	 * @param IShare $share
-	 * @throws \Exception
-	 */
-	protected function userCreateChecks(IShare $share) {
-		// Check if we can share with group members only
-		if ($this->shareWithGroupMembersOnly()) {
-			$sharedBy = $this->userManager->get($share->getSharedBy());
-			$sharedWith = $this->userManager->get($share->getSharedWith());
-			// Verify we can share with this user
-			$groups = array_intersect(
-					$this->groupManager->getUserGroupIds($sharedBy),
-					$this->groupManager->getUserGroupIds($sharedWith)
-			);
-			if (empty($groups)) {
-				$message_t = $this->l->t('Sharing is only allowed with group members');
-				throw new \Exception($message_t);
-			}
-		}
-
-		/*
+            $permissions = $share->getNode()->getPermissions();
+            if (!($share->getNode()->getMountPoint() instanceof MoveableMount)) {
+                $permissions |= \OCP\Constants::PERMISSION_DELETE | \OCP\Constants::PERMISSION_UPDATE;
+            }
+        }
+
+        // Check that we do not share with more permissions than we have
+        if ($share->getPermissions() & ~$permissions) {
+            $path = $userFolder->getRelativePath($share->getNode()->getPath());
+            $message_t = $this->l->t('Can’t increase permissions of %s', [$path]);
+            throw new GenericShareException($message_t, $message_t, 404);
+        }
+
+
+        // Check that read permissions are always set
+        // Link shares are allowed to have no read permissions to allow upload to hidden folders
+        $noReadPermissionRequired = $share->getShareType() === IShare::TYPE_LINK
+            || $share->getShareType() === IShare::TYPE_EMAIL;
+        if (!$noReadPermissionRequired &&
+            ($share->getPermissions() & \OCP\Constants::PERMISSION_READ) === 0) {
+            throw new \InvalidArgumentException('Shares need at least read permissions');
+        }
+
+        if ($share->getNode() instanceof \OCP\Files\File) {
+            if ($share->getPermissions() & \OCP\Constants::PERMISSION_DELETE) {
+                $message_t = $this->l->t('Files can’t be shared with delete permissions');
+                throw new GenericShareException($message_t);
+            }
+            if ($share->getPermissions() & \OCP\Constants::PERMISSION_CREATE) {
+                $message_t = $this->l->t('Files can’t be shared with create permissions');
+                throw new GenericShareException($message_t);
+            }
+        }
+    }
+
+    /**
+     * Validate if the expiration date fits the system settings
+     *
+     * @param IShare $share The share to validate the expiration date of
+     * @return IShare The modified share object
+     * @throws GenericShareException
+     * @throws \InvalidArgumentException
+     * @throws \Exception
+     */
+    protected function validateExpirationDateInternal(IShare $share) {
+        $expirationDate = $share->getExpirationDate();
+
+        if ($expirationDate !== null) {
+            //Make sure the expiration date is a date
+            $expirationDate->setTime(0, 0, 0);
+
+            $date = new \DateTime();
+            $date->setTime(0, 0, 0);
+            if ($date >= $expirationDate) {
+                $message = $this->l->t('Expiration date is in the past');
+                throw new GenericShareException($message, $message, 404);
+            }
+        }
+
+        // If expiredate is empty set a default one if there is a default
+        $fullId = null;
+        try {
+            $fullId = $share->getFullId();
+        } catch (\UnexpectedValueException $e) {
+            // This is a new share
+        }
+
+        if ($fullId === null && $expirationDate === null && $this->shareApiInternalDefaultExpireDate()) {
+            $expirationDate = new \DateTime();
+            $expirationDate->setTime(0,0,0);
+
+            $days = (int)$this->config->getAppValue('core', 'internal_defaultExpDays', (string)$this->shareApiInternalDefaultExpireDays());
+            if ($days > $this->shareApiInternalDefaultExpireDays()) {
+                $days = $this->shareApiInternalDefaultExpireDays();
+            }
+            $expirationDate->add(new \DateInterval('P'.$days.'D'));
+        }
+
+        // If we enforce the expiration date check that is does not exceed
+        if ($this->shareApiInternalDefaultExpireDateEnforced()) {
+            if ($expirationDate === null) {
+                throw new \InvalidArgumentException('Expiration date is enforced');
+            }
+
+            $date = new \DateTime();
+            $date->setTime(0, 0, 0);
+            $date->add(new \DateInterval('P' . $this->shareApiInternalDefaultExpireDays() . 'D'));
+            if ($date < $expirationDate) {
+                $message = $this->l->t('Can’t set expiration date more than %s days in the future', [$this->shareApiInternalDefaultExpireDays()]);
+                throw new GenericShareException($message, $message, 404);
+            }
+        }
+
+        $accepted = true;
+        $message = '';
+        \OCP\Util::emitHook('\OC\Share', 'verifyExpirationDate', [
+            'expirationDate' => &$expirationDate,
+            'accepted' => &$accepted,
+            'message' => &$message,
+            'passwordSet' => $share->getPassword() !== null,
+        ]);
+
+        if (!$accepted) {
+            throw new \Exception($message);
+        }
+
+        $share->setExpirationDate($expirationDate);
+
+        return $share;
+    }
+
+    /**
+     * Validate if the expiration date fits the system settings
+     *
+     * @param IShare $share The share to validate the expiration date of
+     * @return IShare The modified share object
+     * @throws GenericShareException
+     * @throws \InvalidArgumentException
+     * @throws \Exception
+     */
+    protected function validateExpirationDate(IShare $share) {
+        $expirationDate = $share->getExpirationDate();
+
+        if ($expirationDate !== null) {
+            //Make sure the expiration date is a date
+            $expirationDate->setTime(0, 0, 0);
+
+            $date = new \DateTime();
+            $date->setTime(0, 0, 0);
+            if ($date >= $expirationDate) {
+                $message = $this->l->t('Expiration date is in the past');
+                throw new GenericShareException($message, $message, 404);
+            }
+        }
+
+        // If expiredate is empty set a default one if there is a default
+        $fullId = null;
+        try {
+            $fullId = $share->getFullId();
+        } catch (\UnexpectedValueException $e) {
+            // This is a new share
+        }
+
+        if ($fullId === null && $expirationDate === null && $this->shareApiLinkDefaultExpireDate()) {
+            $expirationDate = new \DateTime();
+            $expirationDate->setTime(0,0,0);
+
+            $days = (int)$this->config->getAppValue('core', 'link_defaultExpDays', $this->shareApiLinkDefaultExpireDays());
+            if ($days > $this->shareApiLinkDefaultExpireDays()) {
+                $days = $this->shareApiLinkDefaultExpireDays();
+            }
+            $expirationDate->add(new \DateInterval('P'.$days.'D'));
+        }
+
+        // If we enforce the expiration date check that is does not exceed
+        if ($this->shareApiLinkDefaultExpireDateEnforced()) {
+            if ($expirationDate === null) {
+                throw new \InvalidArgumentException('Expiration date is enforced');
+            }
+
+            $date = new \DateTime();
+            $date->setTime(0, 0, 0);
+            $date->add(new \DateInterval('P' . $this->shareApiLinkDefaultExpireDays() . 'D'));
+            if ($date < $expirationDate) {
+                $message = $this->l->t('Can’t set expiration date more than %s days in the future', [$this->shareApiLinkDefaultExpireDays()]);
+                throw new GenericShareException($message, $message, 404);
+            }
+        }
+
+        $accepted = true;
+        $message = '';
+        \OCP\Util::emitHook('\OC\Share', 'verifyExpirationDate', [
+            'expirationDate' => &$expirationDate,
+            'accepted' => &$accepted,
+            'message' => &$message,
+            'passwordSet' => $share->getPassword() !== null,
+        ]);
+
+        if (!$accepted) {
+            throw new \Exception($message);
+        }
+
+        $share->setExpirationDate($expirationDate);
+
+        return $share;
+    }
+
+    /**
+     * Check for pre share requirements for user shares
+     *
+     * @param IShare $share
+     * @throws \Exception
+     */
+    protected function userCreateChecks(IShare $share) {
+        // Check if we can share with group members only
+        if ($this->shareWithGroupMembersOnly()) {
+            $sharedBy = $this->userManager->get($share->getSharedBy());
+            $sharedWith = $this->userManager->get($share->getSharedWith());
+            // Verify we can share with this user
+            $groups = array_intersect(
+                    $this->groupManager->getUserGroupIds($sharedBy),
+                    $this->groupManager->getUserGroupIds($sharedWith)
+            );
+            if (empty($groups)) {
+                $message_t = $this->l->t('Sharing is only allowed with group members');
+                throw new \Exception($message_t);
+            }
+        }
+
+        /*
 		 * TODO: Could be costly, fix
 		 *
 		 * Also this is not what we want in the future.. then we want to squash identical shares.
 		 */
-		$provider = $this->factory->getProviderForType(IShare::TYPE_USER);
-		$existingShares = $provider->getSharesByPath($share->getNode());
-		foreach ($existingShares as $existingShare) {
-			// Ignore if it is the same share
-			try {
-				if ($existingShare->getFullId() === $share->getFullId()) {
-					continue;
-				}
-			} catch (\UnexpectedValueException $e) {
-				//Shares are not identical
-			}
-
-			// Identical share already existst
-			if ($existingShare->getSharedWith() === $share->getSharedWith() && $existingShare->getShareType() === $share->getShareType()) {
-				throw new \Exception('Path is already shared with this user');
-			}
-
-			// The share is already shared with this user via a group share
-			if ($existingShare->getShareType() === IShare::TYPE_GROUP) {
-				$group = $this->groupManager->get($existingShare->getSharedWith());
-				if (!is_null($group)) {
-					$user = $this->userManager->get($share->getSharedWith());
-
-					if ($group->inGroup($user) && $existingShare->getShareOwner() !== $share->getShareOwner()) {
-						throw new \Exception('Path is already shared with this user');
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Check for pre share requirements for group shares
-	 *
-	 * @param IShare $share
-	 * @throws \Exception
-	 */
-	protected function groupCreateChecks(IShare $share) {
-		// Verify group shares are allowed
-		if (!$this->allowGroupSharing()) {
-			throw new \Exception('Group sharing is now allowed');
-		}
-
-		// Verify if the user can share with this group
-		if ($this->shareWithGroupMembersOnly()) {
-			$sharedBy = $this->userManager->get($share->getSharedBy());
-			$sharedWith = $this->groupManager->get($share->getSharedWith());
-			if (is_null($sharedWith) || !$sharedWith->inGroup($sharedBy)) {
-				throw new \Exception('Sharing is only allowed within your own groups');
-			}
-		}
-
-		/*
+        $provider = $this->factory->getProviderForType(IShare::TYPE_USER);
+        $existingShares = $provider->getSharesByPath($share->getNode());
+        foreach ($existingShares as $existingShare) {
+            // Ignore if it is the same share
+            try {
+                if ($existingShare->getFullId() === $share->getFullId()) {
+                    continue;
+                }
+            } catch (\UnexpectedValueException $e) {
+                //Shares are not identical
+            }
+
+            // Identical share already existst
+            if ($existingShare->getSharedWith() === $share->getSharedWith() && $existingShare->getShareType() === $share->getShareType()) {
+                throw new \Exception('Path is already shared with this user');
+            }
+
+            // The share is already shared with this user via a group share
+            if ($existingShare->getShareType() === IShare::TYPE_GROUP) {
+                $group = $this->groupManager->get($existingShare->getSharedWith());
+                if (!is_null($group)) {
+                    $user = $this->userManager->get($share->getSharedWith());
+
+                    if ($group->inGroup($user) && $existingShare->getShareOwner() !== $share->getShareOwner()) {
+                        throw new \Exception('Path is already shared with this user');
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Check for pre share requirements for group shares
+     *
+     * @param IShare $share
+     * @throws \Exception
+     */
+    protected function groupCreateChecks(IShare $share) {
+        // Verify group shares are allowed
+        if (!$this->allowGroupSharing()) {
+            throw new \Exception('Group sharing is now allowed');
+        }
+
+        // Verify if the user can share with this group
+        if ($this->shareWithGroupMembersOnly()) {
+            $sharedBy = $this->userManager->get($share->getSharedBy());
+            $sharedWith = $this->groupManager->get($share->getSharedWith());
+            if (is_null($sharedWith) || !$sharedWith->inGroup($sharedBy)) {
+                throw new \Exception('Sharing is only allowed within your own groups');
+            }
+        }
+
+        /*
 		 * TODO: Could be costly, fix
 		 *
 		 * Also this is not what we want in the future.. then we want to squash identical shares.
 		 */
-		$provider = $this->factory->getProviderForType(IShare::TYPE_GROUP);
-		$existingShares = $provider->getSharesByPath($share->getNode());
-		foreach ($existingShares as $existingShare) {
-			try {
-				if ($existingShare->getFullId() === $share->getFullId()) {
-					continue;
-				}
-			} catch (\UnexpectedValueException $e) {
-				//It is a new share so just continue
-			}
-
-			if ($existingShare->getSharedWith() === $share->getSharedWith() && $existingShare->getShareType() === $share->getShareType()) {
-				throw new \Exception('Path is already shared with this group');
-			}
-		}
-	}
-
-	/**
-	 * Check for pre share requirements for link shares
-	 *
-	 * @param IShare $share
-	 * @throws \Exception
-	 */
-	protected function linkCreateChecks(IShare $share) {
-		// Are link shares allowed?
-		if (!$this->shareApiAllowLinks()) {
-			throw new \Exception('Link sharing is not allowed');
-		}
-
-		// Check if public upload is allowed
-		if (!$this->shareApiLinkAllowPublicUpload() &&
-			($share->getPermissions() & (\OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_DELETE))) {
-			throw new \InvalidArgumentException('Public upload is not allowed');
-		}
-	}
-
-	/**
-	 * To make sure we don't get invisible link shares we set the parent
-	 * of a link if it is a reshare. This is a quick word around
-	 * until we can properly display multiple link shares in the UI
-	 *
-	 * See: https://github.com/owncloud/core/issues/22295
-	 *
-	 * FIXME: Remove once multiple link shares can be properly displayed
-	 *
-	 * @param IShare $share
-	 */
-	protected function setLinkParent(IShare $share) {
-
-		// No sense in checking if the method is not there.
-		if (method_exists($share, 'setParent')) {
-			$storage = $share->getNode()->getStorage();
-			if ($storage->instanceOfStorage('\OCA\Files_Sharing\ISharedStorage')) {
-				/** @var \OCA\Files_Sharing\SharedStorage $storage */
-				$share->setParent($storage->getShareId());
-			}
-		}
-	}
-
-	/**
-	 * @param File|Folder $path
-	 */
-	protected function pathCreateChecks($path) {
-		// Make sure that we do not share a path that contains a shared mountpoint
-		if ($path instanceof \OCP\Files\Folder) {
-			$mounts = $this->mountManager->findIn($path->getPath());
-			foreach ($mounts as $mount) {
-				if ($mount->getStorage()->instanceOfStorage('\OCA\Files_Sharing\ISharedStorage')) {
-					throw new \InvalidArgumentException('Path contains files shared with you');
-				}
-			}
-		}
-	}
-
-	/**
-	 * Check if the user that is sharing can actually share
-	 *
-	 * @param IShare $share
-	 * @throws \Exception
-	 */
-	protected function canShare(IShare $share) {
-		if (!$this->shareApiEnabled()) {
-			throw new \Exception('Sharing is disabled');
-		}
-
-		if ($this->sharingDisabledForUser($share->getSharedBy())) {
-			throw new \Exception('Sharing is disabled for you');
-		}
-	}
-
-	/**
-	 * Share a path
-	 *
-	 * @param IShare $share
-	 * @return IShare The share object
-	 * @throws \Exception
-	 *
-	 * TODO: handle link share permissions or check them
-	 */
-	public function createShare(IShare $share) {
-		$this->canShare($share);
-
-		$this->generalCreateChecks($share);
-
-		// Verify if there are any issues with the path
-		$this->pathCreateChecks($share->getNode());
-
-		/*
+        $provider = $this->factory->getProviderForType(IShare::TYPE_GROUP);
+        $existingShares = $provider->getSharesByPath($share->getNode());
+        foreach ($existingShares as $existingShare) {
+            try {
+                if ($existingShare->getFullId() === $share->getFullId()) {
+                    continue;
+                }
+            } catch (\UnexpectedValueException $e) {
+                //It is a new share so just continue
+            }
+
+            if ($existingShare->getSharedWith() === $share->getSharedWith() && $existingShare->getShareType() === $share->getShareType()) {
+                throw new \Exception('Path is already shared with this group');
+            }
+        }
+    }
+
+    /**
+     * Check for pre share requirements for link shares
+     *
+     * @param IShare $share
+     * @throws \Exception
+     */
+    protected function linkCreateChecks(IShare $share) {
+        // Are link shares allowed?
+        if (!$this->shareApiAllowLinks()) {
+            throw new \Exception('Link sharing is not allowed');
+        }
+
+        // Check if public upload is allowed
+        if (!$this->shareApiLinkAllowPublicUpload() &&
+            ($share->getPermissions() & (\OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_DELETE))) {
+            throw new \InvalidArgumentException('Public upload is not allowed');
+        }
+    }
+
+    /**
+     * To make sure we don't get invisible link shares we set the parent
+     * of a link if it is a reshare. This is a quick word around
+     * until we can properly display multiple link shares in the UI
+     *
+     * See: https://github.com/owncloud/core/issues/22295
+     *
+     * FIXME: Remove once multiple link shares can be properly displayed
+     *
+     * @param IShare $share
+     */
+    protected function setLinkParent(IShare $share) {
+
+        // No sense in checking if the method is not there.
+        if (method_exists($share, 'setParent')) {
+            $storage = $share->getNode()->getStorage();
+            if ($storage->instanceOfStorage('\OCA\Files_Sharing\ISharedStorage')) {
+                /** @var \OCA\Files_Sharing\SharedStorage $storage */
+                $share->setParent($storage->getShareId());
+            }
+        }
+    }
+
+    /**
+     * @param File|Folder $path
+     */
+    protected function pathCreateChecks($path) {
+        // Make sure that we do not share a path that contains a shared mountpoint
+        if ($path instanceof \OCP\Files\Folder) {
+            $mounts = $this->mountManager->findIn($path->getPath());
+            foreach ($mounts as $mount) {
+                if ($mount->getStorage()->instanceOfStorage('\OCA\Files_Sharing\ISharedStorage')) {
+                    throw new \InvalidArgumentException('Path contains files shared with you');
+                }
+            }
+        }
+    }
+
+    /**
+     * Check if the user that is sharing can actually share
+     *
+     * @param IShare $share
+     * @throws \Exception
+     */
+    protected function canShare(IShare $share) {
+        if (!$this->shareApiEnabled()) {
+            throw new \Exception('Sharing is disabled');
+        }
+
+        if ($this->sharingDisabledForUser($share->getSharedBy())) {
+            throw new \Exception('Sharing is disabled for you');
+        }
+    }
+
+    /**
+     * Share a path
+     *
+     * @param IShare $share
+     * @return IShare The share object
+     * @throws \Exception
+     *
+     * TODO: handle link share permissions or check them
+     */
+    public function createShare(IShare $share) {
+        $this->canShare($share);
+
+        $this->generalCreateChecks($share);
+
+        // Verify if there are any issues with the path
+        $this->pathCreateChecks($share->getNode());
+
+        /*
 		 * On creation of a share the owner is always the owner of the path
 		 * Except for mounted federated shares.
 		 */
-		$storage = $share->getNode()->getStorage();
-		if ($storage->instanceOfStorage('OCA\Files_Sharing\External\Storage')) {
-			$parent = $share->getNode()->getParent();
-			while ($parent->getStorage()->instanceOfStorage('OCA\Files_Sharing\External\Storage')) {
-				$parent = $parent->getParent();
-			}
-			$share->setShareOwner($parent->getOwner()->getUID());
-		} else {
-			if ($share->getNode()->getOwner()) {
-				$share->setShareOwner($share->getNode()->getOwner()->getUID());
-			} else {
-				$share->setShareOwner($share->getSharedBy());
-			}
-		}
-
-		//Verify share type
-		if ($share->getShareType() === IShare::TYPE_USER) {
-			$this->userCreateChecks($share);
-
-			//Verify the expiration date
-			$share = $this->validateExpirationDateInternal($share);
-		} elseif ($share->getShareType() === IShare::TYPE_GROUP) {
-			$this->groupCreateChecks($share);
-
-			//Verify the expiration date
-			$share = $this->validateExpirationDateInternal($share);
-		} elseif ($share->getShareType() === IShare::TYPE_LINK) {
-			$this->linkCreateChecks($share);
-			$this->setLinkParent($share);
-
-			/*
+        $storage = $share->getNode()->getStorage();
+        if ($storage->instanceOfStorage('OCA\Files_Sharing\External\Storage')) {
+            $parent = $share->getNode()->getParent();
+            while ($parent->getStorage()->instanceOfStorage('OCA\Files_Sharing\External\Storage')) {
+                $parent = $parent->getParent();
+            }
+            $share->setShareOwner($parent->getOwner()->getUID());
+        } else {
+            if ($share->getNode()->getOwner()) {
+                $share->setShareOwner($share->getNode()->getOwner()->getUID());
+            } else {
+                $share->setShareOwner($share->getSharedBy());
+            }
+        }
+
+        //Verify share type
+        if ($share->getShareType() === IShare::TYPE_USER) {
+            $this->userCreateChecks($share);
+
+            //Verify the expiration date
+            $share = $this->validateExpirationDateInternal($share);
+        } elseif ($share->getShareType() === IShare::TYPE_GROUP) {
+            $this->groupCreateChecks($share);
+
+            //Verify the expiration date
+            $share = $this->validateExpirationDateInternal($share);
+        } elseif ($share->getShareType() === IShare::TYPE_LINK) {
+            $this->linkCreateChecks($share);
+            $this->setLinkParent($share);
+
+            /*
 			 * For now ignore a set token.
 			 */
-			$share->setToken(
-				$this->secureRandom->generate(
-					\OC\Share\Constants::TOKEN_LENGTH,
-					\OCP\Security\ISecureRandom::CHAR_HUMAN_READABLE
-				)
-			);
-
-			//Verify the expiration date
-			$share = $this->validateExpirationDate($share);
-
-			//Verify the password
-			$this->verifyPassword($share->getPassword());
-
-			// If a password is set. Hash it!
-			if ($share->getPassword() !== null) {
-				$share->setPassword($this->hasher->hash($share->getPassword()));
-			}
-		} elseif ($share->getShareType() === IShare::TYPE_EMAIL) {
-			$share->setToken(
-				$this->secureRandom->generate(
-					\OC\Share\Constants::TOKEN_LENGTH,
-					\OCP\Security\ISecureRandom::CHAR_HUMAN_READABLE
-				)
-			);
-		}
-
-		// Cannot share with the owner
-		if ($share->getShareType() === IShare::TYPE_USER &&
-			$share->getSharedWith() === $share->getShareOwner()) {
-			throw new \InvalidArgumentException('Can’t share with the share owner');
-		}
-
-		// Generate the target
-		$target = $this->config->getSystemValue('share_folder', '/') .'/'. $share->getNode()->getName();
-		$target = \OC\Files\Filesystem::normalizePath($target);
-		$share->setTarget($target);
-
-		// Pre share event
-		$event = new GenericEvent($share);
-		$this->legacyDispatcher->dispatch('OCP\Share::preShare', $event);
-		if ($event->isPropagationStopped() && $event->hasArgument('error')) {
-			throw new \Exception($event->getArgument('error'));
-		}
-
-		$oldShare = $share;
-		$provider = $this->factory->getProviderForType($share->getShareType());
-		$share = $provider->create($share);
-		//reuse the node we already have
-		$share->setNode($oldShare->getNode());
-
-		// Reset the target if it is null for the new share
-		if ($share->getTarget() === '') {
-			$share->setTarget($target);
-		}
-
-		// Post share event
-		$event = new GenericEvent($share);
-		$this->legacyDispatcher->dispatch('OCP\Share::postShare', $event);
-
-		$this->dispatcher->dispatchTyped(new Share\Events\ShareCreatedEvent($share));
-
-		if ($this->config->getSystemValueBool('sharing.enable_share_mail', true)
-			&& $share->getShareType() === IShare::TYPE_USER) {
-			$mailSend = $share->getMailSend();
-			if ($mailSend === true) {
-				$user = $this->userManager->get($share->getSharedWith());
-				if ($user !== null) {
-					$emailAddress = $user->getEMailAddress();
-					if ($emailAddress !== null && $emailAddress !== '') {
-						$userLang = $this->l10nFactory->getUserLanguage($user);
-						$l = $this->l10nFactory->get('lib', $userLang);
-						$this->sendMailNotification(
-							$l,
-							$share->getNode()->getName(),
-							$this->urlGenerator->linkToRouteAbsolute('files_sharing.Accept.accept', ['shareId' => $share->getFullId()]),
-							$share->getSharedBy(),
-							$emailAddress,
-							$share->getExpirationDate()
-						);
-						$this->logger->debug('Sent share notification to ' . $emailAddress . ' for share with ID ' . $share->getId(), ['app' => 'share']);
-					} else {
-						$this->logger->debug('Share notification not sent to ' . $share->getSharedWith() . ' because email address is not set.', ['app' => 'share']);
-					}
-				} else {
-					$this->logger->debug('Share notification not sent to ' . $share->getSharedWith() . ' because user could not be found.', ['app' => 'share']);
-				}
-			} else {
-				$this->logger->debug('Share notification not sent because mailsend is false.', ['app' => 'share']);
-			}
-		}
-
-		return $share;
-	}
-
-	/**
-	 * Send mail notifications
-	 *
-	 * This method will catch and log mail transmission errors
-	 *
-	 * @param IL10N $l Language of the recipient
-	 * @param string $filename file/folder name
-	 * @param string $link link to the file/folder
-	 * @param string $initiator user ID of share sender
-	 * @param string $shareWith email address of share receiver
-	 * @param \DateTime|null $expiration
-	 */
-	protected function sendMailNotification(IL10N $l,
-											$filename,
-											$link,
-											$initiator,
-											$shareWith,
-											\DateTime $expiration = null) {
-		$initiatorUser = $this->userManager->get($initiator);
-		$initiatorDisplayName = ($initiatorUser instanceof IUser) ? $initiatorUser->getDisplayName() : $initiator;
-
-		$message = $this->mailer->createMessage();
-
-		$emailTemplate = $this->mailer->createEMailTemplate('files_sharing.RecipientNotification', [
-			'filename' => $filename,
-			'link' => $link,
-			'initiator' => $initiatorDisplayName,
-			'expiration' => $expiration,
-			'shareWith' => $shareWith,
-		]);
-
-		$emailTemplate->setSubject($l->t('%1$s shared »%2$s« with you', [$initiatorDisplayName, $filename]));
-		$emailTemplate->addHeader();
-		$emailTemplate->addHeading($l->t('%1$s shared »%2$s« with you', [$initiatorDisplayName, $filename]), false);
-		$text = $l->t('%1$s shared »%2$s« with you.', [$initiatorDisplayName, $filename]);
-
-		$emailTemplate->addBodyText(
-			htmlspecialchars($text . ' ' . $l->t('Click the button below to open it.')),
-			$text
-		);
-		$emailTemplate->addBodyButton(
-			$l->t('Open »%s«', [$filename]),
-			$link
-		);
-
-		$message->setTo([$shareWith]);
-
-		// The "From" contains the sharers name
-		$instanceName = $this->defaults->getName();
-		$senderName = $l->t(
-			'%1$s via %2$s',
-			[
-				$initiatorDisplayName,
-				$instanceName
-			]
-		);
-		$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
-
-		// The "Reply-To" is set to the sharer if an mail address is configured
-		// also the default footer contains a "Do not reply" which needs to be adjusted.
-		$initiatorEmail = $initiatorUser->getEMailAddress();
-		if ($initiatorEmail !== null) {
-			$message->setReplyTo([$initiatorEmail => $initiatorDisplayName]);
-			$emailTemplate->addFooter($instanceName . ($this->defaults->getSlogan($l->getLanguageCode()) !== '' ? ' - ' . $this->defaults->getSlogan($l->getLanguageCode()) : ''));
-		} else {
-			$emailTemplate->addFooter('', $l->getLanguageCode());
-		}
-
-		$message->useTemplate($emailTemplate);
-		try {
-			$failedRecipients = $this->mailer->send($message);
-			if (!empty($failedRecipients)) {
-				$this->logger->error('Share notification mail could not be sent to: ' . implode(', ', $failedRecipients));
-				return;
-			}
-		} catch (\Exception $e) {
-			$this->logger->logException($e, ['message' => 'Share notification mail could not be sent']);
-		}
-	}
-
-	/**
-	 * Update a share
-	 *
-	 * @param IShare $share
-	 * @return IShare The share object
-	 * @throws \InvalidArgumentException
-	 */
-	public function updateShare(IShare $share) {
-		$expirationDateUpdated = false;
-
-		$this->canShare($share);
-
-		try {
-			$originalShare = $this->getShareById($share->getFullId());
-		} catch (\UnexpectedValueException $e) {
-			throw new \InvalidArgumentException('Share does not have a full id');
-		}
-
-		// We can't change the share type!
-		if ($share->getShareType() !== $originalShare->getShareType()) {
-			throw new \InvalidArgumentException('Can’t change share type');
-		}
-
-		// We can only change the recipient on user shares
-		if ($share->getSharedWith() !== $originalShare->getSharedWith() &&
-			$share->getShareType() !== IShare::TYPE_USER) {
-			throw new \InvalidArgumentException('Can only update recipient on user shares');
-		}
-
-		// Cannot share with the owner
-		if ($share->getShareType() === IShare::TYPE_USER &&
-			$share->getSharedWith() === $share->getShareOwner()) {
-			throw new \InvalidArgumentException('Can’t share with the share owner');
-		}
-
-		$this->generalCreateChecks($share);
-
-		if ($share->getShareType() === IShare::TYPE_USER) {
-			$this->userCreateChecks($share);
-
-			if ($share->getExpirationDate() != $originalShare->getExpirationDate()) {
-				//Verify the expiration date
-				$this->validateExpirationDate($share);
-				$expirationDateUpdated = true;
-			}
-		} elseif ($share->getShareType() === IShare::TYPE_GROUP) {
-			$this->groupCreateChecks($share);
-
-			if ($share->getExpirationDate() != $originalShare->getExpirationDate()) {
-				//Verify the expiration date
-				$this->validateExpirationDate($share);
-				$expirationDateUpdated = true;
-			}
-		} elseif ($share->getShareType() === IShare::TYPE_LINK) {
-			$this->linkCreateChecks($share);
-
-			$plainTextPassword = $share->getPassword();
-
-			$this->updateSharePasswordIfNeeded($share, $originalShare);
-
-			if (empty($plainTextPassword) && $share->getSendPasswordByTalk()) {
-				throw new \InvalidArgumentException('Can’t enable sending the password by Talk with an empty password');
-			}
-
-			if ($share->getExpirationDate() != $originalShare->getExpirationDate()) {
-				//Verify the expiration date
-				$this->validateExpirationDate($share);
-				$expirationDateUpdated = true;
-			}
-		} elseif ($share->getShareType() === IShare::TYPE_EMAIL) {
-			// The new password is not set again if it is the same as the old
-			// one.
-			$plainTextPassword = $share->getPassword();
-			if (!empty($plainTextPassword) && !$this->updateSharePasswordIfNeeded($share, $originalShare)) {
-				$plainTextPassword = null;
-			}
-			if (empty($plainTextPassword) && !$originalShare->getSendPasswordByTalk() && $share->getSendPasswordByTalk()) {
-				// If the same password was already sent by mail the recipient
-				// would already have access to the share without having to call
-				// the sharer to verify her identity
-				throw new \InvalidArgumentException('Can’t enable sending the password by Talk without setting a new password');
-			} elseif (empty($plainTextPassword) && $originalShare->getSendPasswordByTalk() && !$share->getSendPasswordByTalk()) {
-				throw new \InvalidArgumentException('Can’t disable sending the password by Talk without setting a new password');
-			}
-		}
-
-		$this->pathCreateChecks($share->getNode());
-
-		// Now update the share!
-		$provider = $this->factory->getProviderForType($share->getShareType());
-		if ($share->getShareType() === IShare::TYPE_EMAIL) {
-			$share = $provider->update($share, $plainTextPassword);
-		} else {
-			$share = $provider->update($share);
-		}
-
-		if ($expirationDateUpdated === true) {
-			\OC_Hook::emit(Share::class, 'post_set_expiration_date', [
-				'itemType' => $share->getNode() instanceof \OCP\Files\File ? 'file' : 'folder',
-				'itemSource' => $share->getNode()->getId(),
-				'date' => $share->getExpirationDate(),
-				'uidOwner' => $share->getSharedBy(),
-			]);
-		}
-
-		if ($share->getPassword() !== $originalShare->getPassword()) {
-			\OC_Hook::emit(Share::class, 'post_update_password', [
-				'itemType' => $share->getNode() instanceof \OCP\Files\File ? 'file' : 'folder',
-				'itemSource' => $share->getNode()->getId(),
-				'uidOwner' => $share->getSharedBy(),
-				'token' => $share->getToken(),
-				'disabled' => is_null($share->getPassword()),
-			]);
-		}
-
-		if ($share->getPermissions() !== $originalShare->getPermissions()) {
-			if ($this->userManager->userExists($share->getShareOwner())) {
-				$userFolder = $this->rootFolder->getUserFolder($share->getShareOwner());
-			} else {
-				$userFolder = $this->rootFolder->getUserFolder($share->getSharedBy());
-			}
-			\OC_Hook::emit(Share::class, 'post_update_permissions', [
-				'itemType' => $share->getNode() instanceof \OCP\Files\File ? 'file' : 'folder',
-				'itemSource' => $share->getNode()->getId(),
-				'shareType' => $share->getShareType(),
-				'shareWith' => $share->getSharedWith(),
-				'uidOwner' => $share->getSharedBy(),
-				'permissions' => $share->getPermissions(),
-				'path' => $userFolder->getRelativePath($share->getNode()->getPath()),
-			]);
-		}
-
-		return $share;
-	}
-
-	/**
-	 * Accept a share.
-	 *
-	 * @param IShare $share
-	 * @param string $recipientId
-	 * @return IShare The share object
-	 * @throws \InvalidArgumentException
-	 * @since 9.0.0
-	 */
-	public function acceptShare(IShare $share, string $recipientId): IShare {
-		[$providerId, ] = $this->splitFullId($share->getFullId());
-		$provider = $this->factory->getProvider($providerId);
-
-		if (!method_exists($provider, 'acceptShare')) {
-			// TODO FIX ME
-			throw new \InvalidArgumentException('Share provider does not support accepting');
-		}
-		$provider->acceptShare($share, $recipientId);
-		$event = new GenericEvent($share);
-		$this->legacyDispatcher->dispatch('OCP\Share::postAcceptShare', $event);
-
-		return $share;
-	}
-
-	/**
-	 * Updates the password of the given share if it is not the same as the
-	 * password of the original share.
-	 *
-	 * @param IShare $share the share to update its password.
-	 * @param IShare $originalShare the original share to compare its
-	 *        password with.
-	 * @return boolean whether the password was updated or not.
-	 */
-	private function updateSharePasswordIfNeeded(IShare $share, IShare $originalShare) {
-		$passwordsAreDifferent = ($share->getPassword() !== $originalShare->getPassword()) &&
-									(($share->getPassword() !== null && $originalShare->getPassword() === null) ||
-									 ($share->getPassword() === null && $originalShare->getPassword() !== null) ||
-									 ($share->getPassword() !== null && $originalShare->getPassword() !== null &&
-										!$this->hasher->verify($share->getPassword(), $originalShare->getPassword())));
-
-		// Password updated.
-		if ($passwordsAreDifferent) {
-			//Verify the password
-			$this->verifyPassword($share->getPassword());
-
-			// If a password is set. Hash it!
-			if ($share->getPassword() !== null) {
-				$share->setPassword($this->hasher->hash($share->getPassword()));
-
-				return true;
-			}
-		} else {
-			// Reset the password to the original one, as it is either the same
-			// as the "new" password or a hashed version of it.
-			$share->setPassword($originalShare->getPassword());
-		}
-
-		return false;
-	}
-
-	/**
-	 * Delete all the children of this share
-	 * FIXME: remove once https://github.com/owncloud/core/pull/21660 is in
-	 *
-	 * @param IShare $share
-	 * @return IShare[] List of deleted shares
-	 */
-	protected function deleteChildren(IShare $share) {
-		$deletedShares = [];
-
-		$provider = $this->factory->getProviderForType($share->getShareType());
-
-		foreach ($provider->getChildren($share) as $child) {
-			$deletedChildren = $this->deleteChildren($child);
-			$deletedShares = array_merge($deletedShares, $deletedChildren);
-
-			$provider->delete($child);
-			$this->dispatcher->dispatchTyped(new Share\Events\ShareDeletedEvent($child));
-			$deletedShares[] = $child;
-		}
-
-		return $deletedShares;
-	}
-
-	/**
-	 * Delete a share
-	 *
-	 * @param IShare $share
-	 * @throws ShareNotFound
-	 * @throws \InvalidArgumentException
-	 */
-	public function deleteShare(IShare $share) {
-		try {
-			$share->getFullId();
-		} catch (\UnexpectedValueException $e) {
-			throw new \InvalidArgumentException('Share does not have a full id');
-		}
-
-		$event = new GenericEvent($share);
-		$this->legacyDispatcher->dispatch('OCP\Share::preUnshare', $event);
-
-		// Get all children and delete them as well
-		$deletedShares = $this->deleteChildren($share);
-
-		// Do the actual delete
-		$provider = $this->factory->getProviderForType($share->getShareType());
-		$provider->delete($share);
-
-		$this->dispatcher->dispatchTyped(new Share\Events\ShareDeletedEvent($share));
-
-		// All the deleted shares caused by this delete
-		$deletedShares[] = $share;
-
-		// Emit post hook
-		$event->setArgument('deletedShares', $deletedShares);
-		$this->legacyDispatcher->dispatch('OCP\Share::postUnshare', $event);
-	}
-
-
-	/**
-	 * Unshare a file as the recipient.
-	 * This can be different from a regular delete for example when one of
-	 * the users in a groups deletes that share. But the provider should
-	 * handle this.
-	 *
-	 * @param IShare $share
-	 * @param string $recipientId
-	 */
-	public function deleteFromSelf(IShare $share, $recipientId) {
-		[$providerId, ] = $this->splitFullId($share->getFullId());
-		$provider = $this->factory->getProvider($providerId);
-
-		$provider->deleteFromSelf($share, $recipientId);
-		$event = new GenericEvent($share);
-		$this->legacyDispatcher->dispatch('OCP\Share::postUnshareFromSelf', $event);
-	}
-
-	public function restoreShare(IShare $share, string $recipientId): IShare {
-		[$providerId, ] = $this->splitFullId($share->getFullId());
-		$provider = $this->factory->getProvider($providerId);
-
-		return $provider->restore($share, $recipientId);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function moveShare(IShare $share, $recipientId) {
-		if ($share->getShareType() === IShare::TYPE_LINK) {
-			throw new \InvalidArgumentException('Can’t change target of link share');
-		}
-
-		if ($share->getShareType() === IShare::TYPE_USER && $share->getSharedWith() !== $recipientId) {
-			throw new \InvalidArgumentException('Invalid recipient');
-		}
-
-		if ($share->getShareType() === IShare::TYPE_GROUP) {
-			$sharedWith = $this->groupManager->get($share->getSharedWith());
-			if (is_null($sharedWith)) {
-				throw new \InvalidArgumentException('Group "' . $share->getSharedWith() . '" does not exist');
-			}
-			$recipient = $this->userManager->get($recipientId);
-			if (!$sharedWith->inGroup($recipient)) {
-				throw new \InvalidArgumentException('Invalid recipient');
-			}
-		}
-
-		[$providerId, ] = $this->splitFullId($share->getFullId());
-		$provider = $this->factory->getProvider($providerId);
-
-		return $provider->move($share, $recipientId);
-	}
-
-	public function getSharesInFolder($userId, Folder $node, $reshares = false) {
-		$providers = $this->factory->getAllProviders();
-
-		return array_reduce($providers, function ($shares, IShareProvider $provider) use ($userId, $node, $reshares) {
-			$newShares = $provider->getSharesInFolder($userId, $node, $reshares);
-			foreach ($newShares as $fid => $data) {
-				if (!isset($shares[$fid])) {
-					$shares[$fid] = [];
-				}
-
-				$shares[$fid] = array_merge($shares[$fid], $data);
-			}
-			return $shares;
-		}, []);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getSharesBy($userId, $shareType, $path = null, $reshares = false, $limit = 50, $offset = 0) {
-		if ($path !== null &&
-				!($path instanceof \OCP\Files\File) &&
-				!($path instanceof \OCP\Files\Folder)) {
-			throw new \InvalidArgumentException('invalid path');
-		}
-
-		try {
-			$provider = $this->factory->getProviderForType($shareType);
-		} catch (ProviderException $e) {
-			return [];
-		}
-
-		$shares = $provider->getSharesBy($userId, $shareType, $path, $reshares, $limit, $offset);
-
-		/*
+            $share->setToken(
+                $this->secureRandom->generate(
+                    \OC\Share\Constants::TOKEN_LENGTH,
+                    \OCP\Security\ISecureRandom::CHAR_HUMAN_READABLE
+                )
+            );
+
+            //Verify the expiration date
+            $share = $this->validateExpirationDate($share);
+
+            //Verify the password
+            $this->verifyPassword($share->getPassword());
+
+            // If a password is set. Hash it!
+            if ($share->getPassword() !== null) {
+                $share->setPassword($this->hasher->hash($share->getPassword()));
+            }
+        } elseif ($share->getShareType() === IShare::TYPE_EMAIL) {
+            $share->setToken(
+                $this->secureRandom->generate(
+                    \OC\Share\Constants::TOKEN_LENGTH,
+                    \OCP\Security\ISecureRandom::CHAR_HUMAN_READABLE
+                )
+            );
+        }
+
+        // Cannot share with the owner
+        if ($share->getShareType() === IShare::TYPE_USER &&
+            $share->getSharedWith() === $share->getShareOwner()) {
+            throw new \InvalidArgumentException('Can’t share with the share owner');
+        }
+
+        // Generate the target
+        $target = $this->config->getSystemValue('share_folder', '/') .'/'. $share->getNode()->getName();
+        $target = \OC\Files\Filesystem::normalizePath($target);
+        $share->setTarget($target);
+
+        // Pre share event
+        $event = new GenericEvent($share);
+        $this->legacyDispatcher->dispatch('OCP\Share::preShare', $event);
+        if ($event->isPropagationStopped() && $event->hasArgument('error')) {
+            throw new \Exception($event->getArgument('error'));
+        }
+
+        $oldShare = $share;
+        $provider = $this->factory->getProviderForType($share->getShareType());
+        $share = $provider->create($share);
+        //reuse the node we already have
+        $share->setNode($oldShare->getNode());
+
+        // Reset the target if it is null for the new share
+        if ($share->getTarget() === '') {
+            $share->setTarget($target);
+        }
+
+        // Post share event
+        $event = new GenericEvent($share);
+        $this->legacyDispatcher->dispatch('OCP\Share::postShare', $event);
+
+        $this->dispatcher->dispatchTyped(new Share\Events\ShareCreatedEvent($share));
+
+        if ($this->config->getSystemValueBool('sharing.enable_share_mail', true)
+            && $share->getShareType() === IShare::TYPE_USER) {
+            $mailSend = $share->getMailSend();
+            if ($mailSend === true) {
+                $user = $this->userManager->get($share->getSharedWith());
+                if ($user !== null) {
+                    $emailAddress = $user->getEMailAddress();
+                    if ($emailAddress !== null && $emailAddress !== '') {
+                        $userLang = $this->l10nFactory->getUserLanguage($user);
+                        $l = $this->l10nFactory->get('lib', $userLang);
+                        $this->sendMailNotification(
+                            $l,
+                            $share->getNode()->getName(),
+                            $this->urlGenerator->linkToRouteAbsolute('files_sharing.Accept.accept', ['shareId' => $share->getFullId()]),
+                            $share->getSharedBy(),
+                            $emailAddress,
+                            $share->getExpirationDate()
+                        );
+                        $this->logger->debug('Sent share notification to ' . $emailAddress . ' for share with ID ' . $share->getId(), ['app' => 'share']);
+                    } else {
+                        $this->logger->debug('Share notification not sent to ' . $share->getSharedWith() . ' because email address is not set.', ['app' => 'share']);
+                    }
+                } else {
+                    $this->logger->debug('Share notification not sent to ' . $share->getSharedWith() . ' because user could not be found.', ['app' => 'share']);
+                }
+            } else {
+                $this->logger->debug('Share notification not sent because mailsend is false.', ['app' => 'share']);
+            }
+        }
+
+        return $share;
+    }
+
+    /**
+     * Send mail notifications
+     *
+     * This method will catch and log mail transmission errors
+     *
+     * @param IL10N $l Language of the recipient
+     * @param string $filename file/folder name
+     * @param string $link link to the file/folder
+     * @param string $initiator user ID of share sender
+     * @param string $shareWith email address of share receiver
+     * @param \DateTime|null $expiration
+     */
+    protected function sendMailNotification(IL10N $l,
+                                            $filename,
+                                            $link,
+                                            $initiator,
+                                            $shareWith,
+                                            \DateTime $expiration = null) {
+        $initiatorUser = $this->userManager->get($initiator);
+        $initiatorDisplayName = ($initiatorUser instanceof IUser) ? $initiatorUser->getDisplayName() : $initiator;
+
+        $message = $this->mailer->createMessage();
+
+        $emailTemplate = $this->mailer->createEMailTemplate('files_sharing.RecipientNotification', [
+            'filename' => $filename,
+            'link' => $link,
+            'initiator' => $initiatorDisplayName,
+            'expiration' => $expiration,
+            'shareWith' => $shareWith,
+        ]);
+
+        $emailTemplate->setSubject($l->t('%1$s shared »%2$s« with you', [$initiatorDisplayName, $filename]));
+        $emailTemplate->addHeader();
+        $emailTemplate->addHeading($l->t('%1$s shared »%2$s« with you', [$initiatorDisplayName, $filename]), false);
+        $text = $l->t('%1$s shared »%2$s« with you.', [$initiatorDisplayName, $filename]);
+
+        $emailTemplate->addBodyText(
+            htmlspecialchars($text . ' ' . $l->t('Click the button below to open it.')),
+            $text
+        );
+        $emailTemplate->addBodyButton(
+            $l->t('Open »%s«', [$filename]),
+            $link
+        );
+
+        $message->setTo([$shareWith]);
+
+        // The "From" contains the sharers name
+        $instanceName = $this->defaults->getName();
+        $senderName = $l->t(
+            '%1$s via %2$s',
+            [
+                $initiatorDisplayName,
+                $instanceName
+            ]
+        );
+        $message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
+
+        // The "Reply-To" is set to the sharer if an mail address is configured
+        // also the default footer contains a "Do not reply" which needs to be adjusted.
+        $initiatorEmail = $initiatorUser->getEMailAddress();
+        if ($initiatorEmail !== null) {
+            $message->setReplyTo([$initiatorEmail => $initiatorDisplayName]);
+            $emailTemplate->addFooter($instanceName . ($this->defaults->getSlogan($l->getLanguageCode()) !== '' ? ' - ' . $this->defaults->getSlogan($l->getLanguageCode()) : ''));
+        } else {
+            $emailTemplate->addFooter('', $l->getLanguageCode());
+        }
+
+        $message->useTemplate($emailTemplate);
+        try {
+            $failedRecipients = $this->mailer->send($message);
+            if (!empty($failedRecipients)) {
+                $this->logger->error('Share notification mail could not be sent to: ' . implode(', ', $failedRecipients));
+                return;
+            }
+        } catch (\Exception $e) {
+            $this->logger->logException($e, ['message' => 'Share notification mail could not be sent']);
+        }
+    }
+
+    /**
+     * Update a share
+     *
+     * @param IShare $share
+     * @return IShare The share object
+     * @throws \InvalidArgumentException
+     */
+    public function updateShare(IShare $share) {
+        $expirationDateUpdated = false;
+
+        $this->canShare($share);
+
+        try {
+            $originalShare = $this->getShareById($share->getFullId());
+        } catch (\UnexpectedValueException $e) {
+            throw new \InvalidArgumentException('Share does not have a full id');
+        }
+
+        // We can't change the share type!
+        if ($share->getShareType() !== $originalShare->getShareType()) {
+            throw new \InvalidArgumentException('Can’t change share type');
+        }
+
+        // We can only change the recipient on user shares
+        if ($share->getSharedWith() !== $originalShare->getSharedWith() &&
+            $share->getShareType() !== IShare::TYPE_USER) {
+            throw new \InvalidArgumentException('Can only update recipient on user shares');
+        }
+
+        // Cannot share with the owner
+        if ($share->getShareType() === IShare::TYPE_USER &&
+            $share->getSharedWith() === $share->getShareOwner()) {
+            throw new \InvalidArgumentException('Can’t share with the share owner');
+        }
+
+        $this->generalCreateChecks($share);
+
+        if ($share->getShareType() === IShare::TYPE_USER) {
+            $this->userCreateChecks($share);
+
+            if ($share->getExpirationDate() != $originalShare->getExpirationDate()) {
+                //Verify the expiration date
+                $this->validateExpirationDate($share);
+                $expirationDateUpdated = true;
+            }
+        } elseif ($share->getShareType() === IShare::TYPE_GROUP) {
+            $this->groupCreateChecks($share);
+
+            if ($share->getExpirationDate() != $originalShare->getExpirationDate()) {
+                //Verify the expiration date
+                $this->validateExpirationDate($share);
+                $expirationDateUpdated = true;
+            }
+        } elseif ($share->getShareType() === IShare::TYPE_LINK) {
+            $this->linkCreateChecks($share);
+
+            $plainTextPassword = $share->getPassword();
+
+            $this->updateSharePasswordIfNeeded($share, $originalShare);
+
+            if (empty($plainTextPassword) && $share->getSendPasswordByTalk()) {
+                throw new \InvalidArgumentException('Can’t enable sending the password by Talk with an empty password');
+            }
+
+            if ($share->getExpirationDate() != $originalShare->getExpirationDate()) {
+                //Verify the expiration date
+                $this->validateExpirationDate($share);
+                $expirationDateUpdated = true;
+            }
+        } elseif ($share->getShareType() === IShare::TYPE_EMAIL) {
+            // The new password is not set again if it is the same as the old
+            // one.
+            $plainTextPassword = $share->getPassword();
+            if (!empty($plainTextPassword) && !$this->updateSharePasswordIfNeeded($share, $originalShare)) {
+                $plainTextPassword = null;
+            }
+            if (empty($plainTextPassword) && !$originalShare->getSendPasswordByTalk() && $share->getSendPasswordByTalk()) {
+                // If the same password was already sent by mail the recipient
+                // would already have access to the share without having to call
+                // the sharer to verify her identity
+                throw new \InvalidArgumentException('Can’t enable sending the password by Talk without setting a new password');
+            } elseif (empty($plainTextPassword) && $originalShare->getSendPasswordByTalk() && !$share->getSendPasswordByTalk()) {
+                throw new \InvalidArgumentException('Can’t disable sending the password by Talk without setting a new password');
+            }
+        }
+
+        $this->pathCreateChecks($share->getNode());
+
+        // Now update the share!
+        $provider = $this->factory->getProviderForType($share->getShareType());
+        if ($share->getShareType() === IShare::TYPE_EMAIL) {
+            $share = $provider->update($share, $plainTextPassword);
+        } else {
+            $share = $provider->update($share);
+        }
+
+        if ($expirationDateUpdated === true) {
+            \OC_Hook::emit(Share::class, 'post_set_expiration_date', [
+                'itemType' => $share->getNode() instanceof \OCP\Files\File ? 'file' : 'folder',
+                'itemSource' => $share->getNode()->getId(),
+                'date' => $share->getExpirationDate(),
+                'uidOwner' => $share->getSharedBy(),
+            ]);
+        }
+
+        if ($share->getPassword() !== $originalShare->getPassword()) {
+            \OC_Hook::emit(Share::class, 'post_update_password', [
+                'itemType' => $share->getNode() instanceof \OCP\Files\File ? 'file' : 'folder',
+                'itemSource' => $share->getNode()->getId(),
+                'uidOwner' => $share->getSharedBy(),
+                'token' => $share->getToken(),
+                'disabled' => is_null($share->getPassword()),
+            ]);
+        }
+
+        if ($share->getPermissions() !== $originalShare->getPermissions()) {
+            if ($this->userManager->userExists($share->getShareOwner())) {
+                $userFolder = $this->rootFolder->getUserFolder($share->getShareOwner());
+            } else {
+                $userFolder = $this->rootFolder->getUserFolder($share->getSharedBy());
+            }
+            \OC_Hook::emit(Share::class, 'post_update_permissions', [
+                'itemType' => $share->getNode() instanceof \OCP\Files\File ? 'file' : 'folder',
+                'itemSource' => $share->getNode()->getId(),
+                'shareType' => $share->getShareType(),
+                'shareWith' => $share->getSharedWith(),
+                'uidOwner' => $share->getSharedBy(),
+                'permissions' => $share->getPermissions(),
+                'path' => $userFolder->getRelativePath($share->getNode()->getPath()),
+            ]);
+        }
+
+        return $share;
+    }
+
+    /**
+     * Accept a share.
+     *
+     * @param IShare $share
+     * @param string $recipientId
+     * @return IShare The share object
+     * @throws \InvalidArgumentException
+     * @since 9.0.0
+     */
+    public function acceptShare(IShare $share, string $recipientId): IShare {
+        [$providerId, ] = $this->splitFullId($share->getFullId());
+        $provider = $this->factory->getProvider($providerId);
+
+        if (!method_exists($provider, 'acceptShare')) {
+            // TODO FIX ME
+            throw new \InvalidArgumentException('Share provider does not support accepting');
+        }
+        $provider->acceptShare($share, $recipientId);
+        $event = new GenericEvent($share);
+        $this->legacyDispatcher->dispatch('OCP\Share::postAcceptShare', $event);
+
+        return $share;
+    }
+
+    /**
+     * Updates the password of the given share if it is not the same as the
+     * password of the original share.
+     *
+     * @param IShare $share the share to update its password.
+     * @param IShare $originalShare the original share to compare its
+     *        password with.
+     * @return boolean whether the password was updated or not.
+     */
+    private function updateSharePasswordIfNeeded(IShare $share, IShare $originalShare) {
+        $passwordsAreDifferent = ($share->getPassword() !== $originalShare->getPassword()) &&
+                                    (($share->getPassword() !== null && $originalShare->getPassword() === null) ||
+                                     ($share->getPassword() === null && $originalShare->getPassword() !== null) ||
+                                     ($share->getPassword() !== null && $originalShare->getPassword() !== null &&
+                                        !$this->hasher->verify($share->getPassword(), $originalShare->getPassword())));
+
+        // Password updated.
+        if ($passwordsAreDifferent) {
+            //Verify the password
+            $this->verifyPassword($share->getPassword());
+
+            // If a password is set. Hash it!
+            if ($share->getPassword() !== null) {
+                $share->setPassword($this->hasher->hash($share->getPassword()));
+
+                return true;
+            }
+        } else {
+            // Reset the password to the original one, as it is either the same
+            // as the "new" password or a hashed version of it.
+            $share->setPassword($originalShare->getPassword());
+        }
+
+        return false;
+    }
+
+    /**
+     * Delete all the children of this share
+     * FIXME: remove once https://github.com/owncloud/core/pull/21660 is in
+     *
+     * @param IShare $share
+     * @return IShare[] List of deleted shares
+     */
+    protected function deleteChildren(IShare $share) {
+        $deletedShares = [];
+
+        $provider = $this->factory->getProviderForType($share->getShareType());
+
+        foreach ($provider->getChildren($share) as $child) {
+            $deletedChildren = $this->deleteChildren($child);
+            $deletedShares = array_merge($deletedShares, $deletedChildren);
+
+            $provider->delete($child);
+            $this->dispatcher->dispatchTyped(new Share\Events\ShareDeletedEvent($child));
+            $deletedShares[] = $child;
+        }
+
+        return $deletedShares;
+    }
+
+    /**
+     * Delete a share
+     *
+     * @param IShare $share
+     * @throws ShareNotFound
+     * @throws \InvalidArgumentException
+     */
+    public function deleteShare(IShare $share) {
+        try {
+            $share->getFullId();
+        } catch (\UnexpectedValueException $e) {
+            throw new \InvalidArgumentException('Share does not have a full id');
+        }
+
+        $event = new GenericEvent($share);
+        $this->legacyDispatcher->dispatch('OCP\Share::preUnshare', $event);
+
+        // Get all children and delete them as well
+        $deletedShares = $this->deleteChildren($share);
+
+        // Do the actual delete
+        $provider = $this->factory->getProviderForType($share->getShareType());
+        $provider->delete($share);
+
+        $this->dispatcher->dispatchTyped(new Share\Events\ShareDeletedEvent($share));
+
+        // All the deleted shares caused by this delete
+        $deletedShares[] = $share;
+
+        // Emit post hook
+        $event->setArgument('deletedShares', $deletedShares);
+        $this->legacyDispatcher->dispatch('OCP\Share::postUnshare', $event);
+    }
+
+
+    /**
+     * Unshare a file as the recipient.
+     * This can be different from a regular delete for example when one of
+     * the users in a groups deletes that share. But the provider should
+     * handle this.
+     *
+     * @param IShare $share
+     * @param string $recipientId
+     */
+    public function deleteFromSelf(IShare $share, $recipientId) {
+        [$providerId, ] = $this->splitFullId($share->getFullId());
+        $provider = $this->factory->getProvider($providerId);
+
+        $provider->deleteFromSelf($share, $recipientId);
+        $event = new GenericEvent($share);
+        $this->legacyDispatcher->dispatch('OCP\Share::postUnshareFromSelf', $event);
+    }
+
+    public function restoreShare(IShare $share, string $recipientId): IShare {
+        [$providerId, ] = $this->splitFullId($share->getFullId());
+        $provider = $this->factory->getProvider($providerId);
+
+        return $provider->restore($share, $recipientId);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function moveShare(IShare $share, $recipientId) {
+        if ($share->getShareType() === IShare::TYPE_LINK) {
+            throw new \InvalidArgumentException('Can’t change target of link share');
+        }
+
+        if ($share->getShareType() === IShare::TYPE_USER && $share->getSharedWith() !== $recipientId) {
+            throw new \InvalidArgumentException('Invalid recipient');
+        }
+
+        if ($share->getShareType() === IShare::TYPE_GROUP) {
+            $sharedWith = $this->groupManager->get($share->getSharedWith());
+            if (is_null($sharedWith)) {
+                throw new \InvalidArgumentException('Group "' . $share->getSharedWith() . '" does not exist');
+            }
+            $recipient = $this->userManager->get($recipientId);
+            if (!$sharedWith->inGroup($recipient)) {
+                throw new \InvalidArgumentException('Invalid recipient');
+            }
+        }
+
+        [$providerId, ] = $this->splitFullId($share->getFullId());
+        $provider = $this->factory->getProvider($providerId);
+
+        return $provider->move($share, $recipientId);
+    }
+
+    public function getSharesInFolder($userId, Folder $node, $reshares = false) {
+        $providers = $this->factory->getAllProviders();
+
+        return array_reduce($providers, function ($shares, IShareProvider $provider) use ($userId, $node, $reshares) {
+            $newShares = $provider->getSharesInFolder($userId, $node, $reshares);
+            foreach ($newShares as $fid => $data) {
+                if (!isset($shares[$fid])) {
+                    $shares[$fid] = [];
+                }
+
+                $shares[$fid] = array_merge($shares[$fid], $data);
+            }
+            return $shares;
+        }, []);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSharesBy($userId, $shareType, $path = null, $reshares = false, $limit = 50, $offset = 0) {
+        if ($path !== null &&
+                !($path instanceof \OCP\Files\File) &&
+                !($path instanceof \OCP\Files\Folder)) {
+            throw new \InvalidArgumentException('invalid path');
+        }
+
+        try {
+            $provider = $this->factory->getProviderForType($shareType);
+        } catch (ProviderException $e) {
+            return [];
+        }
+
+        $shares = $provider->getSharesBy($userId, $shareType, $path, $reshares, $limit, $offset);
+
+        /*
 		 * Work around so we don't return expired shares but still follow
 		 * proper pagination.
 		 */
 
-		$shares2 = [];
-
-		while (true) {
-			$added = 0;
-			foreach ($shares as $share) {
-				try {
-					$this->checkExpireDate($share);
-				} catch (ShareNotFound $e) {
-					//Ignore since this basically means the share is deleted
-					continue;
-				}
-
-				$added++;
-				$shares2[] = $share;
-
-				if (count($shares2) === $limit) {
-					break;
-				}
-			}
-
-			// If we did not fetch more shares than the limit then there are no more shares
-			if (count($shares) < $limit) {
-				break;
-			}
-
-			if (count($shares2) === $limit) {
-				break;
-			}
-
-			// If there was no limit on the select we are done
-			if ($limit === -1) {
-				break;
-			}
-
-			$offset += $added;
-
-			// Fetch again $limit shares
-			$shares = $provider->getSharesBy($userId, $shareType, $path, $reshares, $limit, $offset);
-
-			// No more shares means we are done
-			if (empty($shares)) {
-				break;
-			}
-		}
-
-		$shares = $shares2;
-
-		return $shares;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getSharedWith($userId, $shareType, $node = null, $limit = 50, $offset = 0) {
-		try {
-			$provider = $this->factory->getProviderForType($shareType);
-		} catch (ProviderException $e) {
-			return [];
-		}
-
-		$shares = $provider->getSharedWith($userId, $shareType, $node, $limit, $offset);
-
-		// remove all shares which are already expired
-		foreach ($shares as $key => $share) {
-			try {
-				$this->checkExpireDate($share);
-			} catch (ShareNotFound $e) {
-				unset($shares[$key]);
-			}
-		}
-
-		return $shares;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getDeletedSharedWith($userId, $shareType, $node = null, $limit = 50, $offset = 0) {
-		$shares = $this->getSharedWith($userId, $shareType, $node, $limit, $offset);
-
-		// Only get deleted shares
-		$shares = array_filter($shares, function (IShare $share) {
-			return $share->getPermissions() === 0;
-		});
-
-		// Only get shares where the owner still exists
-		$shares = array_filter($shares, function (IShare $share) {
-			return $this->userManager->userExists($share->getShareOwner());
-		});
-
-		return $shares;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getShareById($id, $recipient = null) {
-		if ($id === null) {
-			throw new ShareNotFound();
-		}
-
-		[$providerId, $id] = $this->splitFullId($id);
-
-		try {
-			$provider = $this->factory->getProvider($providerId);
-		} catch (ProviderException $e) {
-			throw new ShareNotFound();
-		}
-
-		$share = $provider->getShareById($id, $recipient);
-
-		$this->checkExpireDate($share);
-
-		return $share;
-	}
-
-	/**
-	 * Get all the shares for a given path
-	 *
-	 * @param \OCP\Files\Node $path
-	 * @param int $page
-	 * @param int $perPage
-	 *
-	 * @return Share[]
-	 */
-	public function getSharesByPath(\OCP\Files\Node $path, $page = 0, $perPage = 50) {
-		return [];
-	}
-
-	/**
-	 * Get the share by token possible with password
-	 *
-	 * @param string $token
-	 * @return IShare
-	 *
-	 * @throws ShareNotFound
-	 */
-	public function getShareByToken($token) {
-		// tokens can't be valid local user names
-		if ($this->userManager->userExists($token)) {
-			throw new ShareNotFound();
-		}
-		$share = null;
-		try {
-			if ($this->shareApiAllowLinks()) {
-				$provider = $this->factory->getProviderForType(IShare::TYPE_LINK);
-				$share = $provider->getShareByToken($token);
-			}
-		} catch (ProviderException $e) {
-		} catch (ShareNotFound $e) {
-		}
-
-
-		// If it is not a link share try to fetch a federated share by token
-		if ($share === null) {
-			try {
-				$provider = $this->factory->getProviderForType(IShare::TYPE_REMOTE);
-				$share = $provider->getShareByToken($token);
-			} catch (ProviderException $e) {
-			} catch (ShareNotFound $e) {
-			}
-		}
-
-		// If it is not a link share try to fetch a mail share by token
-		if ($share === null && $this->shareProviderExists(IShare::TYPE_EMAIL)) {
-			try {
-				$provider = $this->factory->getProviderForType(IShare::TYPE_EMAIL);
-				$share = $provider->getShareByToken($token);
-			} catch (ProviderException $e) {
-			} catch (ShareNotFound $e) {
-			}
-		}
-
-		if ($share === null && $this->shareProviderExists(IShare::TYPE_CIRCLE)) {
-			try {
-				$provider = $this->factory->getProviderForType(IShare::TYPE_CIRCLE);
-				$share = $provider->getShareByToken($token);
-			} catch (ProviderException $e) {
-			} catch (ShareNotFound $e) {
-			}
-		}
-
-		if ($share === null && $this->shareProviderExists(IShare::TYPE_ROOM)) {
-			try {
-				$provider = $this->factory->getProviderForType(IShare::TYPE_ROOM);
-				$share = $provider->getShareByToken($token);
-			} catch (ProviderException $e) {
-			} catch (ShareNotFound $e) {
-			}
-		}
-
-		if ($share === null) {
-			throw new ShareNotFound($this->l->t('The requested share does not exist anymore'));
-		}
-
-		$this->checkExpireDate($share);
-
-		/*
+        $shares2 = [];
+
+        while (true) {
+            $added = 0;
+            foreach ($shares as $share) {
+                try {
+                    $this->checkExpireDate($share);
+                } catch (ShareNotFound $e) {
+                    //Ignore since this basically means the share is deleted
+                    continue;
+                }
+
+                $added++;
+                $shares2[] = $share;
+
+                if (count($shares2) === $limit) {
+                    break;
+                }
+            }
+
+            // If we did not fetch more shares than the limit then there are no more shares
+            if (count($shares) < $limit) {
+                break;
+            }
+
+            if (count($shares2) === $limit) {
+                break;
+            }
+
+            // If there was no limit on the select we are done
+            if ($limit === -1) {
+                break;
+            }
+
+            $offset += $added;
+
+            // Fetch again $limit shares
+            $shares = $provider->getSharesBy($userId, $shareType, $path, $reshares, $limit, $offset);
+
+            // No more shares means we are done
+            if (empty($shares)) {
+                break;
+            }
+        }
+
+        $shares = $shares2;
+
+        return $shares;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSharedWith($userId, $shareType, $node = null, $limit = 50, $offset = 0) {
+        try {
+            $provider = $this->factory->getProviderForType($shareType);
+        } catch (ProviderException $e) {
+            return [];
+        }
+
+        $shares = $provider->getSharedWith($userId, $shareType, $node, $limit, $offset);
+
+        // remove all shares which are already expired
+        foreach ($shares as $key => $share) {
+            try {
+                $this->checkExpireDate($share);
+            } catch (ShareNotFound $e) {
+                unset($shares[$key]);
+            }
+        }
+
+        return $shares;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getDeletedSharedWith($userId, $shareType, $node = null, $limit = 50, $offset = 0) {
+        $shares = $this->getSharedWith($userId, $shareType, $node, $limit, $offset);
+
+        // Only get deleted shares
+        $shares = array_filter($shares, function (IShare $share) {
+            return $share->getPermissions() === 0;
+        });
+
+        // Only get shares where the owner still exists
+        $shares = array_filter($shares, function (IShare $share) {
+            return $this->userManager->userExists($share->getShareOwner());
+        });
+
+        return $shares;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getShareById($id, $recipient = null) {
+        if ($id === null) {
+            throw new ShareNotFound();
+        }
+
+        [$providerId, $id] = $this->splitFullId($id);
+
+        try {
+            $provider = $this->factory->getProvider($providerId);
+        } catch (ProviderException $e) {
+            throw new ShareNotFound();
+        }
+
+        $share = $provider->getShareById($id, $recipient);
+
+        $this->checkExpireDate($share);
+
+        return $share;
+    }
+
+    /**
+     * Get all the shares for a given path
+     *
+     * @param \OCP\Files\Node $path
+     * @param int $page
+     * @param int $perPage
+     *
+     * @return Share[]
+     */
+    public function getSharesByPath(\OCP\Files\Node $path, $page = 0, $perPage = 50) {
+        return [];
+    }
+
+    /**
+     * Get the share by token possible with password
+     *
+     * @param string $token
+     * @return IShare
+     *
+     * @throws ShareNotFound
+     */
+    public function getShareByToken($token) {
+        // tokens can't be valid local user names
+        if ($this->userManager->userExists($token)) {
+            throw new ShareNotFound();
+        }
+        $share = null;
+        try {
+            if ($this->shareApiAllowLinks()) {
+                $provider = $this->factory->getProviderForType(IShare::TYPE_LINK);
+                $share = $provider->getShareByToken($token);
+            }
+        } catch (ProviderException $e) {
+        } catch (ShareNotFound $e) {
+        }
+
+
+        // If it is not a link share try to fetch a federated share by token
+        if ($share === null) {
+            try {
+                $provider = $this->factory->getProviderForType(IShare::TYPE_REMOTE);
+                $share = $provider->getShareByToken($token);
+            } catch (ProviderException $e) {
+            } catch (ShareNotFound $e) {
+            }
+        }
+
+        // If it is not a link share try to fetch a mail share by token
+        if ($share === null && $this->shareProviderExists(IShare::TYPE_EMAIL)) {
+            try {
+                $provider = $this->factory->getProviderForType(IShare::TYPE_EMAIL);
+                $share = $provider->getShareByToken($token);
+            } catch (ProviderException $e) {
+            } catch (ShareNotFound $e) {
+            }
+        }
+
+        if ($share === null && $this->shareProviderExists(IShare::TYPE_CIRCLE)) {
+            try {
+                $provider = $this->factory->getProviderForType(IShare::TYPE_CIRCLE);
+                $share = $provider->getShareByToken($token);
+            } catch (ProviderException $e) {
+            } catch (ShareNotFound $e) {
+            }
+        }
+
+        if ($share === null && $this->shareProviderExists(IShare::TYPE_ROOM)) {
+            try {
+                $provider = $this->factory->getProviderForType(IShare::TYPE_ROOM);
+                $share = $provider->getShareByToken($token);
+            } catch (ProviderException $e) {
+            } catch (ShareNotFound $e) {
+            }
+        }
+
+        if ($share === null) {
+            throw new ShareNotFound($this->l->t('The requested share does not exist anymore'));
+        }
+
+        $this->checkExpireDate($share);
+
+        /*
 		 * Reduce the permissions for link shares if public upload is not enabled
 		 */
-		if ($share->getShareType() === IShare::TYPE_LINK &&
-			!$this->shareApiLinkAllowPublicUpload()) {
-			$share->setPermissions($share->getPermissions() & ~(\OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_UPDATE));
-		}
-
-		return $share;
-	}
-
-	protected function checkExpireDate($share) {
-		if ($share->isExpired()) {
-			$this->deleteShare($share);
-			throw new ShareNotFound($this->l->t('The requested share does not exist anymore'));
-		}
-	}
-
-	/**
-	 * Verify the password of a public share
-	 *
-	 * @param IShare $share
-	 * @param string $password
-	 * @return bool
-	 */
-	public function checkPassword(IShare $share, $password) {
-		$passwordProtected = $share->getShareType() !== IShare::TYPE_LINK
-							 || $share->getShareType() !== IShare::TYPE_EMAIL
-							 || $share->getShareType() !== IShare::TYPE_CIRCLE;
-		if (!$passwordProtected) {
-			//TODO maybe exception?
-			return false;
-		}
-
-		if ($password === null || $share->getPassword() === null) {
-			return false;
-		}
-
-		$newHash = '';
-		if (!$this->hasher->verify($password, $share->getPassword(), $newHash)) {
-			return false;
-		}
-
-		if (!empty($newHash)) {
-			$share->setPassword($newHash);
-			$provider = $this->factory->getProviderForType($share->getShareType());
-			$provider->update($share);
-		}
-
-		return true;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function userDeleted($uid) {
-		$types = [IShare::TYPE_USER, IShare::TYPE_GROUP, IShare::TYPE_LINK, IShare::TYPE_REMOTE, IShare::TYPE_EMAIL];
-
-		foreach ($types as $type) {
-			try {
-				$provider = $this->factory->getProviderForType($type);
-			} catch (ProviderException $e) {
-				continue;
-			}
-			$provider->userDeleted($uid, $type);
-		}
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function groupDeleted($gid) {
-		$provider = $this->factory->getProviderForType(IShare::TYPE_GROUP);
-		$provider->groupDeleted($gid);
-
-		$excludedGroups = $this->config->getAppValue('core', 'shareapi_exclude_groups_list', '');
-		if ($excludedGroups === '') {
-			return;
-		}
-
-		$excludedGroups = json_decode($excludedGroups, true);
-		if (json_last_error() !== JSON_ERROR_NONE) {
-			return;
-		}
-
-		$excludedGroups = array_diff($excludedGroups, [$gid]);
-		$this->config->setAppValue('core', 'shareapi_exclude_groups_list', json_encode($excludedGroups));
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function userDeletedFromGroup($uid, $gid) {
-		$provider = $this->factory->getProviderForType(IShare::TYPE_GROUP);
-		$provider->userDeletedFromGroup($uid, $gid);
-	}
-
-	/**
-	 * Get access list to a path. This means
-	 * all the users that can access a given path.
-	 *
-	 * Consider:
-	 * -root
-	 * |-folder1 (23)
-	 *  |-folder2 (32)
-	 *   |-fileA (42)
-	 *
-	 * fileA is shared with user1 and user1@server1
-	 * folder2 is shared with group2 (user4 is a member of group2)
-	 * folder1 is shared with user2 (renamed to "folder (1)") and user2@server2
-	 *
-	 * Then the access list to '/folder1/folder2/fileA' with $currentAccess is:
-	 * [
-	 *  users  => [
-	 *      'user1' => ['node_id' => 42, 'node_path' => '/fileA'],
-	 *      'user4' => ['node_id' => 32, 'node_path' => '/folder2'],
-	 *      'user2' => ['node_id' => 23, 'node_path' => '/folder (1)'],
-	 *  ],
-	 *  remote => [
-	 *      'user1@server1' => ['node_id' => 42, 'token' => 'SeCr3t'],
-	 *      'user2@server2' => ['node_id' => 23, 'token' => 'FooBaR'],
-	 *  ],
-	 *  public => bool
-	 *  mail => bool
-	 * ]
-	 *
-	 * The access list to '/folder1/folder2/fileA' **without** $currentAccess is:
-	 * [
-	 *  users  => ['user1', 'user2', 'user4'],
-	 *  remote => bool,
-	 *  public => bool
-	 *  mail => bool
-	 * ]
-	 *
-	 * This is required for encryption/activity
-	 *
-	 * @param \OCP\Files\Node $path
-	 * @param bool $recursive Should we check all parent folders as well
-	 * @param bool $currentAccess Ensure the recipient has access to the file (e.g. did not unshare it)
-	 * @return array
-	 */
-	public function getAccessList(\OCP\Files\Node $path, $recursive = true, $currentAccess = false) {
-		$owner = $path->getOwner();
-
-		if ($owner === null) {
-			return [];
-		}
-
-		$owner = $owner->getUID();
-
-		if ($currentAccess) {
-			$al = ['users' => [], 'remote' => [], 'public' => false];
-		} else {
-			$al = ['users' => [], 'remote' => false, 'public' => false];
-		}
-		if (!$this->userManager->userExists($owner)) {
-			return $al;
-		}
-
-		//Get node for the owner and correct the owner in case of external storages
-		$userFolder = $this->rootFolder->getUserFolder($owner);
-		if ($path->getId() !== $userFolder->getId() && !$userFolder->isSubNode($path)) {
-			$nodes = $userFolder->getById($path->getId());
-			$path = array_shift($nodes);
-			if ($path->getOwner() === null) {
-				return [];
-			}
-			$owner = $path->getOwner()->getUID();
-		}
-
-		$providers = $this->factory->getAllProviders();
-
-		/** @var Node[] $nodes */
-		$nodes = [];
-
-
-		if ($currentAccess) {
-			$ownerPath = $path->getPath();
-			$ownerPath = explode('/', $ownerPath, 4);
-			if (count($ownerPath) < 4) {
-				$ownerPath = '';
-			} else {
-				$ownerPath = $ownerPath[3];
-			}
-			$al['users'][$owner] = [
-				'node_id' => $path->getId(),
-				'node_path' => '/' . $ownerPath,
-			];
-		} else {
-			$al['users'][] = $owner;
-		}
-
-		// Collect all the shares
-		while ($path->getPath() !== $userFolder->getPath()) {
-			$nodes[] = $path;
-			if (!$recursive) {
-				break;
-			}
-			$path = $path->getParent();
-		}
-
-		foreach ($providers as $provider) {
-			$tmp = $provider->getAccessList($nodes, $currentAccess);
-
-			foreach ($tmp as $k => $v) {
-				if (isset($al[$k])) {
-					if (is_array($al[$k])) {
-						if ($currentAccess) {
-							$al[$k] += $v;
-						} else {
-							$al[$k] = array_merge($al[$k], $v);
-							$al[$k] = array_unique($al[$k]);
-							$al[$k] = array_values($al[$k]);
-						}
-					} else {
-						$al[$k] = $al[$k] || $v;
-					}
-				} else {
-					$al[$k] = $v;
-				}
-			}
-		}
-
-		return $al;
-	}
-
-	/**
-	 * Create a new share
-	 *
-	 * @return IShare
-	 */
-	public function newShare() {
-		return new \OC\Share20\Share($this->rootFolder, $this->userManager);
-	}
-
-	/**
-	 * Is the share API enabled
-	 *
-	 * @return bool
-	 */
-	public function shareApiEnabled() {
-		return $this->config->getAppValue('core', 'shareapi_enabled', 'yes') === 'yes';
-	}
-
-	/**
-	 * Is public link sharing enabled
-	 *
-	 * @return bool
-	 */
-	public function shareApiAllowLinks() {
-		return $this->config->getAppValue('core', 'shareapi_allow_links', 'yes') === 'yes';
-	}
-
-	/**
-	 * Is password on public link requires
-	 *
-	 * @return bool
-	 */
-	public function shareApiLinkEnforcePassword() {
-		return $this->config->getAppValue('core', 'shareapi_enforce_links_password', 'no') === 'yes';
-	}
-
-	/**
-	 * Is default link expire date enabled
-	 *
-	 * @return bool
-	 */
-	public function shareApiLinkDefaultExpireDate() {
-		return $this->config->getAppValue('core', 'shareapi_default_expire_date', 'no') === 'yes';
-	}
-
-	/**
-	 * Is default link expire date enforced
-	 *`
-	 * @return bool
-	 */
-	public function shareApiLinkDefaultExpireDateEnforced() {
-		return $this->shareApiLinkDefaultExpireDate() &&
-			$this->config->getAppValue('core', 'shareapi_enforce_expire_date', 'no') === 'yes';
-	}
-
-
-	/**
-	 * Number of default link expire days
-	 * @return int
-	 */
-	public function shareApiLinkDefaultExpireDays() {
-		return (int)$this->config->getAppValue('core', 'shareapi_expire_after_n_days', '7');
-	}
-
-	/**
-	 * Is default internal expire date enabled
-	 *
-	 * @return bool
-	 */
-	public function shareApiInternalDefaultExpireDate(): bool {
-		return $this->config->getAppValue('core', 'shareapi_default_internal_expire_date', 'no') === 'yes';
-	}
-
-	/**
-	 * Is default expire date enforced
-	 *`
-	 * @return bool
-	 */
-	public function shareApiInternalDefaultExpireDateEnforced(): bool {
-		return $this->shareApiInternalDefaultExpireDate() &&
-			$this->config->getAppValue('core', 'shareapi_enforce_internal_expire_date', 'no') === 'yes';
-	}
-
-
-	/**
-	 * Number of default expire days
-	 * @return int
-	 */
-	public function shareApiInternalDefaultExpireDays(): int {
-		return (int)$this->config->getAppValue('core', 'shareapi_internal_expire_after_n_days', '7');
-	}
-
-	/**
-	 * Allow public upload on link shares
-	 *
-	 * @return bool
-	 */
-	public function shareApiLinkAllowPublicUpload() {
-		return $this->config->getAppValue('core', 'shareapi_allow_public_upload', 'yes') === 'yes';
-	}
-
-	/**
-	 * check if user can only share with group members
-	 * @return bool
-	 */
-	public function shareWithGroupMembersOnly() {
-		return $this->config->getAppValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes';
-	}
-
-	/**
-	 * Check if users can share with groups
-	 * @return bool
-	 */
-	public function allowGroupSharing() {
-		return $this->config->getAppValue('core', 'shareapi_allow_group_sharing', 'yes') === 'yes';
-	}
-
-	public function allowEnumeration(): bool {
-		return $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
-	}
-
-	public function limitEnumerationToGroups(): bool {
-		return $this->allowEnumeration() &&
-			$this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_to_group', 'no') === 'yes';
-	}
-
-	/**
-	 * Copied from \OC_Util::isSharingDisabledForUser
-	 *
-	 * TODO: Deprecate fuction from OC_Util
-	 *
-	 * @param string $userId
-	 * @return bool
-	 */
-	public function sharingDisabledForUser($userId) {
-		if ($userId === null) {
-			return false;
-		}
-
-		if (isset($this->sharingDisabledForUsersCache[$userId])) {
-			return $this->sharingDisabledForUsersCache[$userId];
-		}
-
-		if ($this->config->getAppValue('core', 'shareapi_exclude_groups', 'no') === 'yes') {
-			$groupsList = $this->config->getAppValue('core', 'shareapi_exclude_groups_list', '');
-			$excludedGroups = json_decode($groupsList);
-			if (is_null($excludedGroups)) {
-				$excludedGroups = explode(',', $groupsList);
-				$newValue = json_encode($excludedGroups);
-				$this->config->setAppValue('core', 'shareapi_exclude_groups_list', $newValue);
-			}
-			$user = $this->userManager->get($userId);
-			$usersGroups = $this->groupManager->getUserGroupIds($user);
-			if (!empty($usersGroups)) {
-				$remainingGroups = array_diff($usersGroups, $excludedGroups);
-				// if the user is only in groups which are disabled for sharing then
-				// sharing is also disabled for the user
-				if (empty($remainingGroups)) {
-					$this->sharingDisabledForUsersCache[$userId] = true;
-					return true;
-				}
-			}
-		}
-
-		$this->sharingDisabledForUsersCache[$userId] = false;
-		return false;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function outgoingServer2ServerSharesAllowed() {
-		return $this->config->getAppValue('files_sharing', 'outgoing_server2server_share_enabled', 'yes') === 'yes';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function outgoingServer2ServerGroupSharesAllowed() {
-		return $this->config->getAppValue('files_sharing', 'outgoing_server2server_group_share_enabled', 'no') === 'yes';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function shareProviderExists($shareType) {
-		try {
-			$this->factory->getProviderForType($shareType);
-		} catch (ProviderException $e) {
-			return false;
-		}
-
-		return true;
-	}
-
-	public function registerShareProvider(string $shareProviderClass): void {
-		$this->factory->registerProvider($shareProviderClass);
-	}
-
-	public function getAllShares(): iterable {
-		$providers = $this->factory->getAllProviders();
-
-		foreach ($providers as $provider) {
-			yield from $provider->getAllShares();
-		}
-	}
+        if ($share->getShareType() === IShare::TYPE_LINK &&
+            !$this->shareApiLinkAllowPublicUpload()) {
+            $share->setPermissions($share->getPermissions() & ~(\OCP\Constants::PERMISSION_CREATE | \OCP\Constants::PERMISSION_UPDATE));
+        }
+
+        return $share;
+    }
+
+    protected function checkExpireDate($share) {
+        if ($share->isExpired()) {
+            $this->deleteShare($share);
+            throw new ShareNotFound($this->l->t('The requested share does not exist anymore'));
+        }
+    }
+
+    /**
+     * Verify the password of a public share
+     *
+     * @param IShare $share
+     * @param string $password
+     * @return bool
+     */
+    public function checkPassword(IShare $share, $password) {
+        $passwordProtected = $share->getShareType() !== IShare::TYPE_LINK
+                             || $share->getShareType() !== IShare::TYPE_EMAIL
+                             || $share->getShareType() !== IShare::TYPE_CIRCLE;
+        if (!$passwordProtected) {
+            //TODO maybe exception?
+            return false;
+        }
+
+        if ($password === null || $share->getPassword() === null) {
+            return false;
+        }
+
+        $newHash = '';
+        if (!$this->hasher->verify($password, $share->getPassword(), $newHash)) {
+            return false;
+        }
+
+        if (!empty($newHash)) {
+            $share->setPassword($newHash);
+            $provider = $this->factory->getProviderForType($share->getShareType());
+            $provider->update($share);
+        }
+
+        return true;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function userDeleted($uid) {
+        $types = [IShare::TYPE_USER, IShare::TYPE_GROUP, IShare::TYPE_LINK, IShare::TYPE_REMOTE, IShare::TYPE_EMAIL];
+
+        foreach ($types as $type) {
+            try {
+                $provider = $this->factory->getProviderForType($type);
+            } catch (ProviderException $e) {
+                continue;
+            }
+            $provider->userDeleted($uid, $type);
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function groupDeleted($gid) {
+        $provider = $this->factory->getProviderForType(IShare::TYPE_GROUP);
+        $provider->groupDeleted($gid);
+
+        $excludedGroups = $this->config->getAppValue('core', 'shareapi_exclude_groups_list', '');
+        if ($excludedGroups === '') {
+            return;
+        }
+
+        $excludedGroups = json_decode($excludedGroups, true);
+        if (json_last_error() !== JSON_ERROR_NONE) {
+            return;
+        }
+
+        $excludedGroups = array_diff($excludedGroups, [$gid]);
+        $this->config->setAppValue('core', 'shareapi_exclude_groups_list', json_encode($excludedGroups));
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function userDeletedFromGroup($uid, $gid) {
+        $provider = $this->factory->getProviderForType(IShare::TYPE_GROUP);
+        $provider->userDeletedFromGroup($uid, $gid);
+    }
+
+    /**
+     * Get access list to a path. This means
+     * all the users that can access a given path.
+     *
+     * Consider:
+     * -root
+     * |-folder1 (23)
+     *  |-folder2 (32)
+     *   |-fileA (42)
+     *
+     * fileA is shared with user1 and user1@server1
+     * folder2 is shared with group2 (user4 is a member of group2)
+     * folder1 is shared with user2 (renamed to "folder (1)") and user2@server2
+     *
+     * Then the access list to '/folder1/folder2/fileA' with $currentAccess is:
+     * [
+     *  users  => [
+     *      'user1' => ['node_id' => 42, 'node_path' => '/fileA'],
+     *      'user4' => ['node_id' => 32, 'node_path' => '/folder2'],
+     *      'user2' => ['node_id' => 23, 'node_path' => '/folder (1)'],
+     *  ],
+     *  remote => [
+     *      'user1@server1' => ['node_id' => 42, 'token' => 'SeCr3t'],
+     *      'user2@server2' => ['node_id' => 23, 'token' => 'FooBaR'],
+     *  ],
+     *  public => bool
+     *  mail => bool
+     * ]
+     *
+     * The access list to '/folder1/folder2/fileA' **without** $currentAccess is:
+     * [
+     *  users  => ['user1', 'user2', 'user4'],
+     *  remote => bool,
+     *  public => bool
+     *  mail => bool
+     * ]
+     *
+     * This is required for encryption/activity
+     *
+     * @param \OCP\Files\Node $path
+     * @param bool $recursive Should we check all parent folders as well
+     * @param bool $currentAccess Ensure the recipient has access to the file (e.g. did not unshare it)
+     * @return array
+     */
+    public function getAccessList(\OCP\Files\Node $path, $recursive = true, $currentAccess = false) {
+        $owner = $path->getOwner();
+
+        if ($owner === null) {
+            return [];
+        }
+
+        $owner = $owner->getUID();
+
+        if ($currentAccess) {
+            $al = ['users' => [], 'remote' => [], 'public' => false];
+        } else {
+            $al = ['users' => [], 'remote' => false, 'public' => false];
+        }
+        if (!$this->userManager->userExists($owner)) {
+            return $al;
+        }
+
+        //Get node for the owner and correct the owner in case of external storages
+        $userFolder = $this->rootFolder->getUserFolder($owner);
+        if ($path->getId() !== $userFolder->getId() && !$userFolder->isSubNode($path)) {
+            $nodes = $userFolder->getById($path->getId());
+            $path = array_shift($nodes);
+            if ($path->getOwner() === null) {
+                return [];
+            }
+            $owner = $path->getOwner()->getUID();
+        }
+
+        $providers = $this->factory->getAllProviders();
+
+        /** @var Node[] $nodes */
+        $nodes = [];
+
+
+        if ($currentAccess) {
+            $ownerPath = $path->getPath();
+            $ownerPath = explode('/', $ownerPath, 4);
+            if (count($ownerPath) < 4) {
+                $ownerPath = '';
+            } else {
+                $ownerPath = $ownerPath[3];
+            }
+            $al['users'][$owner] = [
+                'node_id' => $path->getId(),
+                'node_path' => '/' . $ownerPath,
+            ];
+        } else {
+            $al['users'][] = $owner;
+        }
+
+        // Collect all the shares
+        while ($path->getPath() !== $userFolder->getPath()) {
+            $nodes[] = $path;
+            if (!$recursive) {
+                break;
+            }
+            $path = $path->getParent();
+        }
+
+        foreach ($providers as $provider) {
+            $tmp = $provider->getAccessList($nodes, $currentAccess);
+
+            foreach ($tmp as $k => $v) {
+                if (isset($al[$k])) {
+                    if (is_array($al[$k])) {
+                        if ($currentAccess) {
+                            $al[$k] += $v;
+                        } else {
+                            $al[$k] = array_merge($al[$k], $v);
+                            $al[$k] = array_unique($al[$k]);
+                            $al[$k] = array_values($al[$k]);
+                        }
+                    } else {
+                        $al[$k] = $al[$k] || $v;
+                    }
+                } else {
+                    $al[$k] = $v;
+                }
+            }
+        }
+
+        return $al;
+    }
+
+    /**
+     * Create a new share
+     *
+     * @return IShare
+     */
+    public function newShare() {
+        return new \OC\Share20\Share($this->rootFolder, $this->userManager);
+    }
+
+    /**
+     * Is the share API enabled
+     *
+     * @return bool
+     */
+    public function shareApiEnabled() {
+        return $this->config->getAppValue('core', 'shareapi_enabled', 'yes') === 'yes';
+    }
+
+    /**
+     * Is public link sharing enabled
+     *
+     * @return bool
+     */
+    public function shareApiAllowLinks() {
+        return $this->config->getAppValue('core', 'shareapi_allow_links', 'yes') === 'yes';
+    }
+
+    /**
+     * Is password on public link requires
+     *
+     * @return bool
+     */
+    public function shareApiLinkEnforcePassword() {
+        return $this->config->getAppValue('core', 'shareapi_enforce_links_password', 'no') === 'yes';
+    }
+
+    /**
+     * Is default link expire date enabled
+     *
+     * @return bool
+     */
+    public function shareApiLinkDefaultExpireDate() {
+        return $this->config->getAppValue('core', 'shareapi_default_expire_date', 'no') === 'yes';
+    }
+
+    /**
+     * Is default link expire date enforced
+     *`
+     * @return bool
+     */
+    public function shareApiLinkDefaultExpireDateEnforced() {
+        return $this->shareApiLinkDefaultExpireDate() &&
+            $this->config->getAppValue('core', 'shareapi_enforce_expire_date', 'no') === 'yes';
+    }
+
+
+    /**
+     * Number of default link expire days
+     * @return int
+     */
+    public function shareApiLinkDefaultExpireDays() {
+        return (int)$this->config->getAppValue('core', 'shareapi_expire_after_n_days', '7');
+    }
+
+    /**
+     * Is default internal expire date enabled
+     *
+     * @return bool
+     */
+    public function shareApiInternalDefaultExpireDate(): bool {
+        return $this->config->getAppValue('core', 'shareapi_default_internal_expire_date', 'no') === 'yes';
+    }
+
+    /**
+     * Is default expire date enforced
+     *`
+     * @return bool
+     */
+    public function shareApiInternalDefaultExpireDateEnforced(): bool {
+        return $this->shareApiInternalDefaultExpireDate() &&
+            $this->config->getAppValue('core', 'shareapi_enforce_internal_expire_date', 'no') === 'yes';
+    }
+
+
+    /**
+     * Number of default expire days
+     * @return int
+     */
+    public function shareApiInternalDefaultExpireDays(): int {
+        return (int)$this->config->getAppValue('core', 'shareapi_internal_expire_after_n_days', '7');
+    }
+
+    /**
+     * Allow public upload on link shares
+     *
+     * @return bool
+     */
+    public function shareApiLinkAllowPublicUpload() {
+        return $this->config->getAppValue('core', 'shareapi_allow_public_upload', 'yes') === 'yes';
+    }
+
+    /**
+     * check if user can only share with group members
+     * @return bool
+     */
+    public function shareWithGroupMembersOnly() {
+        return $this->config->getAppValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes';
+    }
+
+    /**
+     * Check if users can share with groups
+     * @return bool
+     */
+    public function allowGroupSharing() {
+        return $this->config->getAppValue('core', 'shareapi_allow_group_sharing', 'yes') === 'yes';
+    }
+
+    public function allowEnumeration(): bool {
+        return $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
+    }
+
+    public function limitEnumerationToGroups(): bool {
+        return $this->allowEnumeration() &&
+            $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_to_group', 'no') === 'yes';
+    }
+
+    /**
+     * Copied from \OC_Util::isSharingDisabledForUser
+     *
+     * TODO: Deprecate fuction from OC_Util
+     *
+     * @param string $userId
+     * @return bool
+     */
+    public function sharingDisabledForUser($userId) {
+        if ($userId === null) {
+            return false;
+        }
+
+        if (isset($this->sharingDisabledForUsersCache[$userId])) {
+            return $this->sharingDisabledForUsersCache[$userId];
+        }
+
+        if ($this->config->getAppValue('core', 'shareapi_exclude_groups', 'no') === 'yes') {
+            $groupsList = $this->config->getAppValue('core', 'shareapi_exclude_groups_list', '');
+            $excludedGroups = json_decode($groupsList);
+            if (is_null($excludedGroups)) {
+                $excludedGroups = explode(',', $groupsList);
+                $newValue = json_encode($excludedGroups);
+                $this->config->setAppValue('core', 'shareapi_exclude_groups_list', $newValue);
+            }
+            $user = $this->userManager->get($userId);
+            $usersGroups = $this->groupManager->getUserGroupIds($user);
+            if (!empty($usersGroups)) {
+                $remainingGroups = array_diff($usersGroups, $excludedGroups);
+                // if the user is only in groups which are disabled for sharing then
+                // sharing is also disabled for the user
+                if (empty($remainingGroups)) {
+                    $this->sharingDisabledForUsersCache[$userId] = true;
+                    return true;
+                }
+            }
+        }
+
+        $this->sharingDisabledForUsersCache[$userId] = false;
+        return false;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function outgoingServer2ServerSharesAllowed() {
+        return $this->config->getAppValue('files_sharing', 'outgoing_server2server_share_enabled', 'yes') === 'yes';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function outgoingServer2ServerGroupSharesAllowed() {
+        return $this->config->getAppValue('files_sharing', 'outgoing_server2server_group_share_enabled', 'no') === 'yes';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function shareProviderExists($shareType) {
+        try {
+            $this->factory->getProviderForType($shareType);
+        } catch (ProviderException $e) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public function registerShareProvider(string $shareProviderClass): void {
+        $this->factory->registerProvider($shareProviderClass);
+    }
+
+    public function getAllShares(): iterable {
+        $providers = $this->factory->getAllProviders();
+
+        foreach ($providers as $provider) {
+            yield from $provider->getAllShares();
+        }
+    }
 }

Spacing +23 added lines, -23 removed lines

@@ -301,14 +301,14 @@ 
 		$permissions = 0;
 
 		if (!$isFederatedShare && $share->getNode()->getOwner() && $share->getNode()->getOwner()->getUID() !== $share->getSharedBy()) {
-			$userMounts = array_filter($userFolder->getById($share->getNode()->getId()), function ($mount) {
+			$userMounts = array_filter($userFolder->getById($share->getNode()->getId()), function($mount) {
 				// We need to filter since there might be other mountpoints that contain the file
 				// e.g. if the user has access to the same external storage that the file is originating from
 				return $mount->getStorage()->instanceOfStorage(ISharedStorage::class);
 			});
 			$userMount = array_shift($userMounts);
 			if ($userMount === null) {
-				throw new GenericShareException('Could not get proper share mount for ' . $share->getNode()->getId() . '. Failing since else the next calls are called with null');
+				throw new GenericShareException('Could not get proper share mount for '.$share->getNode()->getId().'. Failing since else the next calls are called with null');
 			}
 			$mount = $userMount->getMountPoint();
 			// When it's a reshare use the parent share permissions as maximum
@@ -317,7 +317,7 @@ 
 			$userMountPoint = array_shift($userMountPoints);
 
 			if ($userMountPoint === null) {
-				throw new GenericShareException('Could not get proper user mount for ' . $userMountPointId . '. Failing since else the next calls are called with null');
+				throw new GenericShareException('Could not get proper user mount for '.$userMountPointId.'. Failing since else the next calls are called with null');
 			}
 
 			/* Check if this is an incoming share */
@@ -407,9 +407,9 @@ 
 
 		if ($fullId === null && $expirationDate === null && $this->shareApiInternalDefaultExpireDate()) {
 			$expirationDate = new \DateTime();
-			$expirationDate->setTime(0,0,0);
+			$expirationDate->setTime(0, 0, 0);
 
-			$days = (int)$this->config->getAppValue('core', 'internal_defaultExpDays', (string)$this->shareApiInternalDefaultExpireDays());
+			$days = (int) $this->config->getAppValue('core', 'internal_defaultExpDays', (string) $this->shareApiInternalDefaultExpireDays());
 			if ($days > $this->shareApiInternalDefaultExpireDays()) {
 				$days = $this->shareApiInternalDefaultExpireDays();
 			}
@@ -424,7 +424,7 @@ 
 
 			$date = new \DateTime();
 			$date->setTime(0, 0, 0);
-			$date->add(new \DateInterval('P' . $this->shareApiInternalDefaultExpireDays() . 'D'));
+			$date->add(new \DateInterval('P'.$this->shareApiInternalDefaultExpireDays().'D'));
 			if ($date < $expirationDate) {
 				$message = $this->l->t('Can’t set expiration date more than %s days in the future', [$this->shareApiInternalDefaultExpireDays()]);
 				throw new GenericShareException($message, $message, 404);
@@ -483,9 +483,9 @@ 
 
 		if ($fullId === null && $expirationDate === null && $this->shareApiLinkDefaultExpireDate()) {
 			$expirationDate = new \DateTime();
-			$expirationDate->setTime(0,0,0);
+			$expirationDate->setTime(0, 0, 0);
 
-			$days = (int)$this->config->getAppValue('core', 'link_defaultExpDays', $this->shareApiLinkDefaultExpireDays());
+			$days = (int) $this->config->getAppValue('core', 'link_defaultExpDays', $this->shareApiLinkDefaultExpireDays());
 			if ($days > $this->shareApiLinkDefaultExpireDays()) {
 				$days = $this->shareApiLinkDefaultExpireDays();
 			}
@@ -500,7 +500,7 @@ 
 
 			$date = new \DateTime();
 			$date->setTime(0, 0, 0);
-			$date->add(new \DateInterval('P' . $this->shareApiLinkDefaultExpireDays() . 'D'));
+			$date->add(new \DateInterval('P'.$this->shareApiLinkDefaultExpireDays().'D'));
 			if ($date < $expirationDate) {
 				$message = $this->l->t('Can’t set expiration date more than %s days in the future', [$this->shareApiLinkDefaultExpireDays()]);
 				throw new GenericShareException($message, $message, 404);
@@ -786,7 +786,7 @@ 
 		}
 
 		// Generate the target
-		$target = $this->config->getSystemValue('share_folder', '/') .'/'. $share->getNode()->getName();
+		$target = $this->config->getSystemValue('share_folder', '/').'/'.$share->getNode()->getName();
 		$target = \OC\Files\Filesystem::normalizePath($target);
 		$share->setTarget($target);
 
@@ -832,12 +832,12 @@ 
 							$emailAddress,
 							$share->getExpirationDate()
 						);
-						$this->logger->debug('Sent share notification to ' . $emailAddress . ' for share with ID ' . $share->getId(), ['app' => 'share']);
+						$this->logger->debug('Sent share notification to '.$emailAddress.' for share with ID '.$share->getId(), ['app' => 'share']);
 					} else {
-						$this->logger->debug('Share notification not sent to ' . $share->getSharedWith() . ' because email address is not set.', ['app' => 'share']);
+						$this->logger->debug('Share notification not sent to '.$share->getSharedWith().' because email address is not set.', ['app' => 'share']);
 					}
 				} else {
-					$this->logger->debug('Share notification not sent to ' . $share->getSharedWith() . ' because user could not be found.', ['app' => 'share']);
+					$this->logger->debug('Share notification not sent to '.$share->getSharedWith().' because user could not be found.', ['app' => 'share']);
 				}
 			} else {
 				$this->logger->debug('Share notification not sent because mailsend is false.', ['app' => 'share']);
@@ -884,7 +884,7 @@ 
 		$text = $l->t('%1$s shared »%2$s« with you.', [$initiatorDisplayName, $filename]);
 
 		$emailTemplate->addBodyText(
-			htmlspecialchars($text . ' ' . $l->t('Click the button below to open it.')),
+			htmlspecialchars($text.' '.$l->t('Click the button below to open it.')),
 			$text
 		);
 		$emailTemplate->addBodyButton(
@@ -910,7 +910,7 @@ 
 		$initiatorEmail = $initiatorUser->getEMailAddress();
 		if ($initiatorEmail !== null) {
 			$message->setReplyTo([$initiatorEmail => $initiatorDisplayName]);
-			$emailTemplate->addFooter($instanceName . ($this->defaults->getSlogan($l->getLanguageCode()) !== '' ? ' - ' . $this->defaults->getSlogan($l->getLanguageCode()) : ''));
+			$emailTemplate->addFooter($instanceName.($this->defaults->getSlogan($l->getLanguageCode()) !== '' ? ' - '.$this->defaults->getSlogan($l->getLanguageCode()) : ''));
 		} else {
 			$emailTemplate->addFooter('', $l->getLanguageCode());
 		}
@@ -919,7 +919,7 @@ 
 		try {
 			$failedRecipients = $this->mailer->send($message);
 			if (!empty($failedRecipients)) {
-				$this->logger->error('Share notification mail could not be sent to: ' . implode(', ', $failedRecipients));
+				$this->logger->error('Share notification mail could not be sent to: '.implode(', ', $failedRecipients));
 				return;
 			}
 		} catch (\Exception $e) {
@@ -1221,7 +1221,7 @@ 
 		if ($share->getShareType() === IShare::TYPE_GROUP) {
 			$sharedWith = $this->groupManager->get($share->getSharedWith());
 			if (is_null($sharedWith)) {
-				throw new \InvalidArgumentException('Group "' . $share->getSharedWith() . '" does not exist');
+				throw new \InvalidArgumentException('Group "'.$share->getSharedWith().'" does not exist');
 			}
 			$recipient = $this->userManager->get($recipientId);
 			if (!$sharedWith->inGroup($recipient)) {
@@ -1238,7 +1238,7 @@ 
 	public function getSharesInFolder($userId, Folder $node, $reshares = false) {
 		$providers = $this->factory->getAllProviders();
 
-		return array_reduce($providers, function ($shares, IShareProvider $provider) use ($userId, $node, $reshares) {
+		return array_reduce($providers, function($shares, IShareProvider $provider) use ($userId, $node, $reshares) {
 			$newShares = $provider->getSharesInFolder($userId, $node, $reshares);
 			foreach ($newShares as $fid => $data) {
 				if (!isset($shares[$fid])) {
@@ -1355,12 +1355,12 @@ 
 		$shares = $this->getSharedWith($userId, $shareType, $node, $limit, $offset);
 
 		// Only get deleted shares
-		$shares = array_filter($shares, function (IShare $share) {
+		$shares = array_filter($shares, function(IShare $share) {
 			return $share->getPermissions() === 0;
 		});
 
 		// Only get shares where the owner still exists
-		$shares = array_filter($shares, function (IShare $share) {
+		$shares = array_filter($shares, function(IShare $share) {
 			return $this->userManager->userExists($share->getShareOwner());
 		});
 
@@ -1657,7 +1657,7 @@ 
 			}
 			$al['users'][$owner] = [
 				'node_id' => $path->getId(),
-				'node_path' => '/' . $ownerPath,
+				'node_path' => '/'.$ownerPath,
 			];
 		} else {
 			$al['users'][] = $owner;
@@ -1758,7 +1758,7 @@ 
 	 * @return int
 	 */
 	public function shareApiLinkDefaultExpireDays() {
-		return (int)$this->config->getAppValue('core', 'shareapi_expire_after_n_days', '7');
+		return (int) $this->config->getAppValue('core', 'shareapi_expire_after_n_days', '7');
 	}
 
 	/**
@@ -1786,7 +1786,7 @@ 
 	 * @return int
 	 */
 	public function shareApiInternalDefaultExpireDays(): int {
-		return (int)$this->config->getAppValue('core', 'shareapi_internal_expire_after_n_days', '7');
+		return (int) $this->config->getAppValue('core', 'shareapi_internal_expire_after_n_days', '7');
 	}
 
 	/**

lib/private/Avatar/Avatar.php

Indentation +268 added lines, -268 removed lines

@@ -50,277 +50,277 @@
  */
 abstract class Avatar implements IAvatar {
 
-	/** @var ILogger  */
-	protected $logger;
-
-	/**
-	 * https://github.com/sebdesign/cap-height -- for 500px height
-	 * Automated check: https://codepen.io/skjnldsv/pen/PydLBK/
-	 * Noto Sans cap-height is 0.715 and we want a 200px caps height size
-	 * (0.4 letter-to-total-height ratio, 500*0.4=200), so: 200/0.715 = 280px.
-	 * Since we start from the baseline (text-anchor) we need to
-	 * shift the y axis by 100px (half the caps height): 500/2+100=350
-	 *
-	 * @var string
-	 */
-	private $svgTemplate = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+    /** @var ILogger  */
+    protected $logger;
+
+    /**
+     * https://github.com/sebdesign/cap-height -- for 500px height
+     * Automated check: https://codepen.io/skjnldsv/pen/PydLBK/
+     * Noto Sans cap-height is 0.715 and we want a 200px caps height size
+     * (0.4 letter-to-total-height ratio, 500*0.4=200), so: 200/0.715 = 280px.
+     * Since we start from the baseline (text-anchor) we need to
+     * shift the y axis by 100px (half the caps height): 500/2+100=350
+     *
+     * @var string
+     */
+    private $svgTemplate = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 		<svg width="{size}" height="{size}" version="1.1" viewBox="0 0 500 500" xmlns="http://www.w3.org/2000/svg">
 			<rect width="100%" height="100%" fill="#{fill}"></rect>
 			<text x="50%" y="350" style="font-weight:normal;font-size:280px;font-family:\'Noto Sans\';text-anchor:middle;fill:#fff">{letter}</text>
 		</svg>';
 
-	/**
-	 * The base avatar constructor.
-	 *
-	 * @param ILogger $logger The logger
-	 */
-	public function __construct(ILogger $logger) {
-		$this->logger = $logger;
-	}
-
-	/**
-	 * Returns the user display name.
-	 *
-	 * @return string
-	 */
-	abstract public function getDisplayName(): string;
-
-	/**
-	 * Returns the first letter of the display name, or "?" if no name given.
-	 *
-	 * @return string
-	 */
-	private function getAvatarText(): string {
-		$displayName = $this->getDisplayName();
-		if (empty($displayName) === true) {
-			return '?';
-		}
-		$firstTwoLetters = array_map(function ($namePart) {
-			return mb_strtoupper(mb_substr($namePart, 0, 1), 'UTF-8');
-		}, explode(' ', $displayName, 2));
-		return implode('', $firstTwoLetters);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function get($size = 64) {
-		$size = (int) $size;
-
-		try {
-			$file = $this->getFile($size);
-		} catch (NotFoundException $e) {
-			return false;
-		}
-
-		$avatar = new OC_Image();
-		$avatar->loadFromData($file->getContent());
-		return $avatar;
-	}
-
-	/**
-	 * {size} = 500
-	 * {fill} = hex color to fill
-	 * {letter} = Letter to display
-	 *
-	 * Generate SVG avatar
-	 *
-	 * @param int $size The requested image size in pixel
-	 * @return string
-	 *
-	 */
-	protected function getAvatarVector(int $size): string {
-		$userDisplayName = $this->getDisplayName();
-		$bgRGB = $this->avatarBackgroundColor($userDisplayName);
-		$bgHEX = sprintf("%02x%02x%02x", $bgRGB->r, $bgRGB->g, $bgRGB->b);
-		$text = $this->getAvatarText();
-		$toReplace = ['{size}', '{fill}', '{letter}'];
-		return str_replace($toReplace, [$size, $bgHEX, $text], $this->svgTemplate);
-	}
-
-	/**
-	 * Generate png avatar from svg with Imagick
-	 *
-	 * @param int $size
-	 * @return string|boolean
-	 */
-	protected function generateAvatarFromSvg(int $size) {
-		if (!extension_loaded('imagick')) {
-			return false;
-		}
-		try {
-			$font = __DIR__ . '/../../core/fonts/NotoSans-Regular.ttf';
-			$svg = $this->getAvatarVector($size);
-			$avatar = new Imagick();
-			$avatar->setFont($font);
-			$avatar->readImageBlob($svg);
-			$avatar->setImageFormat('png');
-			$image = new OC_Image();
-			$image->loadFromData($avatar);
-			return $image->data();
-		} catch (\Exception $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * Generate png avatar with GD
-	 *
-	 * @param string $userDisplayName
-	 * @param int $size
-	 * @return string
-	 */
-	protected function generateAvatar($userDisplayName, $size) {
-		$text = $this->getAvatarText();
-		$backgroundColor = $this->avatarBackgroundColor($userDisplayName);
-
-		$im = imagecreatetruecolor($size, $size);
-		$background = imagecolorallocate(
-			$im,
-			$backgroundColor->r,
-			$backgroundColor->g,
-			$backgroundColor->b
-		);
-		$white = imagecolorallocate($im, 255, 255, 255);
-		imagefilledrectangle($im, 0, 0, $size, $size, $background);
-
-		$font = __DIR__ . '/../../../core/fonts/NotoSans-Regular.ttf';
-
-		$fontSize = $size * 0.4;
-		[$x, $y] = $this->imageTTFCenter(
-			$im, $text, $font, (int)$fontSize
-		);
-
-		imagettftext($im, $fontSize, 0, $x, $y, $white, $font, $text);
-
-		ob_start();
-		imagepng($im);
-		$data = ob_get_contents();
-		ob_end_clean();
-
-		return $data;
-	}
-
-	/**
-	 * Calculate real image ttf center
-	 *
-	 * @param resource $image
-	 * @param string $text text string
-	 * @param string $font font path
-	 * @param int $size font size
-	 * @param int $angle
-	 * @return array
-	 */
-	protected function imageTTFCenter(
-		$image,
-		string $text,
-		string $font,
-		int $size,
-		$angle = 0
-	): array {
-		// Image width & height
-		$xi = imagesx($image);
-		$yi = imagesy($image);
-
-		// bounding box
-		$box = imagettfbbox($size, $angle, $font, $text);
-
-		// imagettfbbox can return negative int
-		$xr = abs(max($box[2], $box[4]));
-		$yr = abs(max($box[5], $box[7]));
-
-		// calculate bottom left placement
-		$x = intval(($xi - $xr) / 2);
-		$y = intval(($yi + $yr) / 2);
-
-		return [$x, $y];
-	}
-
-	/**
-	 * Calculate steps between two Colors
-	 * @param object Color $steps start color
-	 * @param object Color $ends end color
-	 * @return array [r,g,b] steps for each color to go from $steps to $ends
-	 */
-	private function stepCalc($steps, $ends) {
-		$step = [];
-		$step[0] = ($ends[1]->r - $ends[0]->r) / $steps;
-		$step[1] = ($ends[1]->g - $ends[0]->g) / $steps;
-		$step[2] = ($ends[1]->b - $ends[0]->b) / $steps;
-		return $step;
-	}
-
-	/**
-	 * Convert a string to an integer evenly
-	 * @param string $hash the text to parse
-	 * @param int $maximum the maximum range
-	 * @return int[] between 0 and $maximum
-	 */
-	private function mixPalette($steps, $color1, $color2) {
-		$palette = [$color1];
-		$step = $this->stepCalc($steps, [$color1, $color2]);
-		for ($i = 1; $i < $steps; $i++) {
-			$r = intval($color1->r + ($step[0] * $i));
-			$g = intval($color1->g + ($step[1] * $i));
-			$b = intval($color1->b + ($step[2] * $i));
-			$palette[] = new Color($r, $g, $b);
-		}
-		return $palette;
-	}
-
-	/**
-	 * Convert a string to an integer evenly
-	 * @param string $hash the text to parse
-	 * @param int $maximum the maximum range
-	 * @return int between 0 and $maximum
-	 */
-	private function hashToInt($hash, $maximum) {
-		$final = 0;
-		$result = [];
-
-		// Splitting evenly the string
-		for ($i = 0; $i < strlen($hash); $i++) {
-			// chars in md5 goes up to f, hex:16
-			$result[] = intval(substr($hash, $i, 1), 16) % 16;
-		}
-		// Adds up all results
-		foreach ($result as $value) {
-			$final += $value;
-		}
-		// chars in md5 goes up to f, hex:16
-		return intval($final % $maximum);
-	}
-
-	/**
-	 * @param string $hash
-	 * @return Color Object containting r g b int in the range [0, 255]
-	 */
-	public function avatarBackgroundColor(string $hash) {
-		// Normalize hash
-		$hash = strtolower($hash);
-
-		// Already a md5 hash?
-		if (preg_match('/^([0-9a-f]{4}-?){8}$/', $hash, $matches) !== 1) {
-			$hash = md5($hash);
-		}
-
-		// Remove unwanted char
-		$hash = preg_replace('/[^0-9a-f]+/', '', $hash);
-
-		$red = new Color(182, 70, 157);
-		$yellow = new Color(221, 203, 85);
-		$blue = new Color(0, 130, 201); // Nextcloud blue
-
-		// Number of steps to go from a color to another
-		// 3 colors * 6 will result in 18 generated colors
-		$steps = 6;
-
-		$palette1 = $this->mixPalette($steps, $red, $yellow);
-		$palette2 = $this->mixPalette($steps, $yellow, $blue);
-		$palette3 = $this->mixPalette($steps, $blue, $red);
-
-		$finalPalette = array_merge($palette1, $palette2, $palette3);
-
-		return $finalPalette[$this->hashToInt($hash, $steps * 3)];
-	}
+    /**
+     * The base avatar constructor.
+     *
+     * @param ILogger $logger The logger
+     */
+    public function __construct(ILogger $logger) {
+        $this->logger = $logger;
+    }
+
+    /**
+     * Returns the user display name.
+     *
+     * @return string
+     */
+    abstract public function getDisplayName(): string;
+
+    /**
+     * Returns the first letter of the display name, or "?" if no name given.
+     *
+     * @return string
+     */
+    private function getAvatarText(): string {
+        $displayName = $this->getDisplayName();
+        if (empty($displayName) === true) {
+            return '?';
+        }
+        $firstTwoLetters = array_map(function ($namePart) {
+            return mb_strtoupper(mb_substr($namePart, 0, 1), 'UTF-8');
+        }, explode(' ', $displayName, 2));
+        return implode('', $firstTwoLetters);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function get($size = 64) {
+        $size = (int) $size;
+
+        try {
+            $file = $this->getFile($size);
+        } catch (NotFoundException $e) {
+            return false;
+        }
+
+        $avatar = new OC_Image();
+        $avatar->loadFromData($file->getContent());
+        return $avatar;
+    }
+
+    /**
+     * {size} = 500
+     * {fill} = hex color to fill
+     * {letter} = Letter to display
+     *
+     * Generate SVG avatar
+     *
+     * @param int $size The requested image size in pixel
+     * @return string
+     *
+     */
+    protected function getAvatarVector(int $size): string {
+        $userDisplayName = $this->getDisplayName();
+        $bgRGB = $this->avatarBackgroundColor($userDisplayName);
+        $bgHEX = sprintf("%02x%02x%02x", $bgRGB->r, $bgRGB->g, $bgRGB->b);
+        $text = $this->getAvatarText();
+        $toReplace = ['{size}', '{fill}', '{letter}'];
+        return str_replace($toReplace, [$size, $bgHEX, $text], $this->svgTemplate);
+    }
+
+    /**
+     * Generate png avatar from svg with Imagick
+     *
+     * @param int $size
+     * @return string|boolean
+     */
+    protected function generateAvatarFromSvg(int $size) {
+        if (!extension_loaded('imagick')) {
+            return false;
+        }
+        try {
+            $font = __DIR__ . '/../../core/fonts/NotoSans-Regular.ttf';
+            $svg = $this->getAvatarVector($size);
+            $avatar = new Imagick();
+            $avatar->setFont($font);
+            $avatar->readImageBlob($svg);
+            $avatar->setImageFormat('png');
+            $image = new OC_Image();
+            $image->loadFromData($avatar);
+            return $image->data();
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
+
+    /**
+     * Generate png avatar with GD
+     *
+     * @param string $userDisplayName
+     * @param int $size
+     * @return string
+     */
+    protected function generateAvatar($userDisplayName, $size) {
+        $text = $this->getAvatarText();
+        $backgroundColor = $this->avatarBackgroundColor($userDisplayName);
+
+        $im = imagecreatetruecolor($size, $size);
+        $background = imagecolorallocate(
+            $im,
+            $backgroundColor->r,
+            $backgroundColor->g,
+            $backgroundColor->b
+        );
+        $white = imagecolorallocate($im, 255, 255, 255);
+        imagefilledrectangle($im, 0, 0, $size, $size, $background);
+
+        $font = __DIR__ . '/../../../core/fonts/NotoSans-Regular.ttf';
+
+        $fontSize = $size * 0.4;
+        [$x, $y] = $this->imageTTFCenter(
+            $im, $text, $font, (int)$fontSize
+        );
+
+        imagettftext($im, $fontSize, 0, $x, $y, $white, $font, $text);
+
+        ob_start();
+        imagepng($im);
+        $data = ob_get_contents();
+        ob_end_clean();
+
+        return $data;
+    }
+
+    /**
+     * Calculate real image ttf center
+     *
+     * @param resource $image
+     * @param string $text text string
+     * @param string $font font path
+     * @param int $size font size
+     * @param int $angle
+     * @return array
+     */
+    protected function imageTTFCenter(
+        $image,
+        string $text,
+        string $font,
+        int $size,
+        $angle = 0
+    ): array {
+        // Image width & height
+        $xi = imagesx($image);
+        $yi = imagesy($image);
+
+        // bounding box
+        $box = imagettfbbox($size, $angle, $font, $text);
+
+        // imagettfbbox can return negative int
+        $xr = abs(max($box[2], $box[4]));
+        $yr = abs(max($box[5], $box[7]));
+
+        // calculate bottom left placement
+        $x = intval(($xi - $xr) / 2);
+        $y = intval(($yi + $yr) / 2);
+
+        return [$x, $y];
+    }
+
+    /**
+     * Calculate steps between two Colors
+     * @param object Color $steps start color
+     * @param object Color $ends end color
+     * @return array [r,g,b] steps for each color to go from $steps to $ends
+     */
+    private function stepCalc($steps, $ends) {
+        $step = [];
+        $step[0] = ($ends[1]->r - $ends[0]->r) / $steps;
+        $step[1] = ($ends[1]->g - $ends[0]->g) / $steps;
+        $step[2] = ($ends[1]->b - $ends[0]->b) / $steps;
+        return $step;
+    }
+
+    /**
+     * Convert a string to an integer evenly
+     * @param string $hash the text to parse
+     * @param int $maximum the maximum range
+     * @return int[] between 0 and $maximum
+     */
+    private function mixPalette($steps, $color1, $color2) {
+        $palette = [$color1];
+        $step = $this->stepCalc($steps, [$color1, $color2]);
+        for ($i = 1; $i < $steps; $i++) {
+            $r = intval($color1->r + ($step[0] * $i));
+            $g = intval($color1->g + ($step[1] * $i));
+            $b = intval($color1->b + ($step[2] * $i));
+            $palette[] = new Color($r, $g, $b);
+        }
+        return $palette;
+    }
+
+    /**
+     * Convert a string to an integer evenly
+     * @param string $hash the text to parse
+     * @param int $maximum the maximum range
+     * @return int between 0 and $maximum
+     */
+    private function hashToInt($hash, $maximum) {
+        $final = 0;
+        $result = [];
+
+        // Splitting evenly the string
+        for ($i = 0; $i < strlen($hash); $i++) {
+            // chars in md5 goes up to f, hex:16
+            $result[] = intval(substr($hash, $i, 1), 16) % 16;
+        }
+        // Adds up all results
+        foreach ($result as $value) {
+            $final += $value;
+        }
+        // chars in md5 goes up to f, hex:16
+        return intval($final % $maximum);
+    }
+
+    /**
+     * @param string $hash
+     * @return Color Object containting r g b int in the range [0, 255]
+     */
+    public function avatarBackgroundColor(string $hash) {
+        // Normalize hash
+        $hash = strtolower($hash);
+
+        // Already a md5 hash?
+        if (preg_match('/^([0-9a-f]{4}-?){8}$/', $hash, $matches) !== 1) {
+            $hash = md5($hash);
+        }
+
+        // Remove unwanted char
+        $hash = preg_replace('/[^0-9a-f]+/', '', $hash);
+
+        $red = new Color(182, 70, 157);
+        $yellow = new Color(221, 203, 85);
+        $blue = new Color(0, 130, 201); // Nextcloud blue
+
+        // Number of steps to go from a color to another
+        // 3 colors * 6 will result in 18 generated colors
+        $steps = 6;
+
+        $palette1 = $this->mixPalette($steps, $red, $yellow);
+        $palette2 = $this->mixPalette($steps, $yellow, $blue);
+        $palette3 = $this->mixPalette($steps, $blue, $red);
+
+        $finalPalette = array_merge($palette1, $palette2, $palette3);
+
+        return $finalPalette[$this->hashToInt($hash, $steps * 3)];
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -95,7 +95,7 @@ 
 		if (empty($displayName) === true) {
 			return '?';
 		}
-		$firstTwoLetters = array_map(function ($namePart) {
+		$firstTwoLetters = array_map(function($namePart) {
 			return mb_strtoupper(mb_substr($namePart, 0, 1), 'UTF-8');
 		}, explode(' ', $displayName, 2));
 		return implode('', $firstTwoLetters);
@@ -149,7 +149,7 @@ 
 			return false;
 		}
 		try {
-			$font = __DIR__ . '/../../core/fonts/NotoSans-Regular.ttf';
+			$font = __DIR__.'/../../core/fonts/NotoSans-Regular.ttf';
 			$svg = $this->getAvatarVector($size);
 			$avatar = new Imagick();
 			$avatar->setFont($font);
@@ -184,11 +184,11 @@ 
 		$white = imagecolorallocate($im, 255, 255, 255);
 		imagefilledrectangle($im, 0, 0, $size, $size, $background);
 
-		$font = __DIR__ . '/../../../core/fonts/NotoSans-Regular.ttf';
+		$font = __DIR__.'/../../../core/fonts/NotoSans-Regular.ttf';
 
 		$fontSize = $size * 0.4;
 		[$x, $y] = $this->imageTTFCenter(
-			$im, $text, $font, (int)$fontSize
+			$im, $text, $font, (int) $fontSize
 		);
 
 		imagettftext($im, $fontSize, 0, $x, $y, $white, $font, $text);