nextcloud / server

apps/files/lib/Helper.php

Indentation +208 added lines, -208 removed lines

@@ -40,232 +40,232 @@
  * Helper class for manipulating file information
  */
 class Helper {
-	/**
-	 * @param string $dir
-	 * @return array
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	public static function buildFileStorageStatistics($dir) {
-		// information about storage capacities
-		$storageInfo = \OC_Helper::getStorageInfo($dir);
-		$l = \OC::$server->getL10N('files');
-		$maxUploadFileSize = \OCP\Util::maxUploadFilesize($dir, $storageInfo['free']);
-		$maxHumanFileSize = \OCP\Util::humanFileSize($maxUploadFileSize);
-		$maxHumanFileSize = $l->t('Upload (max. %s)', [$maxHumanFileSize]);
+    /**
+     * @param string $dir
+     * @return array
+     * @throws \OCP\Files\NotFoundException
+     */
+    public static function buildFileStorageStatistics($dir) {
+        // information about storage capacities
+        $storageInfo = \OC_Helper::getStorageInfo($dir);
+        $l = \OC::$server->getL10N('files');
+        $maxUploadFileSize = \OCP\Util::maxUploadFilesize($dir, $storageInfo['free']);
+        $maxHumanFileSize = \OCP\Util::humanFileSize($maxUploadFileSize);
+        $maxHumanFileSize = $l->t('Upload (max. %s)', [$maxHumanFileSize]);
 
-		return [
-			'uploadMaxFilesize' => $maxUploadFileSize,
-			'maxHumanFilesize'  => $maxHumanFileSize,
-			'freeSpace' => $storageInfo['free'],
-			'quota' => $storageInfo['quota'],
-			'used' => $storageInfo['used'],
-			'usedSpacePercent'  => (int)$storageInfo['relative'],
-			'owner' => $storageInfo['owner'],
-			'ownerDisplayName' => $storageInfo['ownerDisplayName'],
-		];
-	}
+        return [
+            'uploadMaxFilesize' => $maxUploadFileSize,
+            'maxHumanFilesize'  => $maxHumanFileSize,
+            'freeSpace' => $storageInfo['free'],
+            'quota' => $storageInfo['quota'],
+            'used' => $storageInfo['used'],
+            'usedSpacePercent'  => (int)$storageInfo['relative'],
+            'owner' => $storageInfo['owner'],
+            'ownerDisplayName' => $storageInfo['ownerDisplayName'],
+        ];
+    }
 
-	/**
-	 * Determine icon for a given file
-	 *
-	 * @param \OCP\Files\FileInfo $file file info
-	 * @return string icon URL
-	 */
-	public static function determineIcon($file) {
-		if($file['type'] === 'dir') {
-			$icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir');
-			// TODO: move this part to the client side, using mountType
-			if ($file->isShared()) {
-				$icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir-shared');
-			} elseif ($file->isMounted()) {
-				$icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir-external');
-			}
-		}else{
-			$icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon($file->getMimetype());
-		}
+    /**
+     * Determine icon for a given file
+     *
+     * @param \OCP\Files\FileInfo $file file info
+     * @return string icon URL
+     */
+    public static function determineIcon($file) {
+        if($file['type'] === 'dir') {
+            $icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir');
+            // TODO: move this part to the client side, using mountType
+            if ($file->isShared()) {
+                $icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir-shared');
+            } elseif ($file->isMounted()) {
+                $icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir-external');
+            }
+        }else{
+            $icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon($file->getMimetype());
+        }
 
-		return substr($icon, 0, -3) . 'svg';
-	}
+        return substr($icon, 0, -3) . 'svg';
+    }
 
-	/**
-	 * Comparator function to sort files alphabetically and have
-	 * the directories appear first
-	 *
-	 * @param \OCP\Files\FileInfo $a file
-	 * @param \OCP\Files\FileInfo $b file
-	 * @return int -1 if $a must come before $b, 1 otherwise
-	 */
-	public static function compareFileNames(FileInfo $a, FileInfo $b) {
-		$aType = $a->getType();
-		$bType = $b->getType();
-		if ($aType === 'dir' and $bType !== 'dir') {
-			return -1;
-		} elseif ($aType !== 'dir' and $bType === 'dir') {
-			return 1;
-		} else {
-			return \OCP\Util::naturalSortCompare($a->getName(), $b->getName());
-		}
-	}
+    /**
+     * Comparator function to sort files alphabetically and have
+     * the directories appear first
+     *
+     * @param \OCP\Files\FileInfo $a file
+     * @param \OCP\Files\FileInfo $b file
+     * @return int -1 if $a must come before $b, 1 otherwise
+     */
+    public static function compareFileNames(FileInfo $a, FileInfo $b) {
+        $aType = $a->getType();
+        $bType = $b->getType();
+        if ($aType === 'dir' and $bType !== 'dir') {
+            return -1;
+        } elseif ($aType !== 'dir' and $bType === 'dir') {
+            return 1;
+        } else {
+            return \OCP\Util::naturalSortCompare($a->getName(), $b->getName());
+        }
+    }
 
-	/**
-	 * Comparator function to sort files by date
-	 *
-	 * @param \OCP\Files\FileInfo $a file
-	 * @param \OCP\Files\FileInfo $b file
-	 * @return int -1 if $a must come before $b, 1 otherwise
-	 */
-	public static function compareTimestamp(FileInfo $a, FileInfo $b) {
-		$aTime = $a->getMTime();
-		$bTime = $b->getMTime();
-		return ($aTime < $bTime) ? -1 : 1;
-	}
+    /**
+     * Comparator function to sort files by date
+     *
+     * @param \OCP\Files\FileInfo $a file
+     * @param \OCP\Files\FileInfo $b file
+     * @return int -1 if $a must come before $b, 1 otherwise
+     */
+    public static function compareTimestamp(FileInfo $a, FileInfo $b) {
+        $aTime = $a->getMTime();
+        $bTime = $b->getMTime();
+        return ($aTime < $bTime) ? -1 : 1;
+    }
 
-	/**
-	 * Comparator function to sort files by size
-	 *
-	 * @param \OCP\Files\FileInfo $a file
-	 * @param \OCP\Files\FileInfo $b file
-	 * @return int -1 if $a must come before $b, 1 otherwise
-	 */
-	public static function compareSize(FileInfo $a, FileInfo $b) {
-		$aSize = $a->getSize();
-		$bSize = $b->getSize();
-		return ($aSize < $bSize) ? -1 : 1;
-	}
+    /**
+     * Comparator function to sort files by size
+     *
+     * @param \OCP\Files\FileInfo $a file
+     * @param \OCP\Files\FileInfo $b file
+     * @return int -1 if $a must come before $b, 1 otherwise
+     */
+    public static function compareSize(FileInfo $a, FileInfo $b) {
+        $aSize = $a->getSize();
+        $bSize = $b->getSize();
+        return ($aSize < $bSize) ? -1 : 1;
+    }
 
-	/**
-	 * Formats the file info to be returned as JSON to the client.
-	 *
-	 * @param \OCP\Files\FileInfo $i
-	 * @return array formatted file info
-	 */
-	public static function formatFileInfo(FileInfo $i) {
-		$entry = [];
+    /**
+     * Formats the file info to be returned as JSON to the client.
+     *
+     * @param \OCP\Files\FileInfo $i
+     * @return array formatted file info
+     */
+    public static function formatFileInfo(FileInfo $i) {
+        $entry = [];
 
-		$entry['id'] = $i['fileid'];
-		$entry['parentId'] = $i['parent'];
-		$entry['mtime'] = $i['mtime'] * 1000;
-		// only pick out the needed attributes
-		$entry['name'] = $i->getName();
-		$entry['permissions'] = $i['permissions'];
-		$entry['mimetype'] = $i['mimetype'];
-		$entry['size'] = $i['size'];
-		$entry['type'] = $i['type'];
-		$entry['etag'] = $i['etag'];
-		if (isset($i['tags'])) {
-			$entry['tags'] = $i['tags'];
-		}
-		if (isset($i['displayname_owner'])) {
-			$entry['shareOwner'] = $i['displayname_owner'];
-		}
-		if (isset($i['is_share_mount_point'])) {
-			$entry['isShareMountPoint'] = $i['is_share_mount_point'];
-		}
-		$mountType = null;
-		$mount = $i->getMountPoint();
-		$mountType = $mount->getMountType();
-		if ($mountType !== '') {
-			if ($i->getInternalPath() === '') {
-				$mountType .= '-root';
-			}
-			$entry['mountType'] = $mountType;
-		}
-		if (isset($i['extraData'])) {
-			$entry['extraData'] = $i['extraData'];
-		}
-		return $entry;
-	}
+        $entry['id'] = $i['fileid'];
+        $entry['parentId'] = $i['parent'];
+        $entry['mtime'] = $i['mtime'] * 1000;
+        // only pick out the needed attributes
+        $entry['name'] = $i->getName();
+        $entry['permissions'] = $i['permissions'];
+        $entry['mimetype'] = $i['mimetype'];
+        $entry['size'] = $i['size'];
+        $entry['type'] = $i['type'];
+        $entry['etag'] = $i['etag'];
+        if (isset($i['tags'])) {
+            $entry['tags'] = $i['tags'];
+        }
+        if (isset($i['displayname_owner'])) {
+            $entry['shareOwner'] = $i['displayname_owner'];
+        }
+        if (isset($i['is_share_mount_point'])) {
+            $entry['isShareMountPoint'] = $i['is_share_mount_point'];
+        }
+        $mountType = null;
+        $mount = $i->getMountPoint();
+        $mountType = $mount->getMountType();
+        if ($mountType !== '') {
+            if ($i->getInternalPath() === '') {
+                $mountType .= '-root';
+            }
+            $entry['mountType'] = $mountType;
+        }
+        if (isset($i['extraData'])) {
+            $entry['extraData'] = $i['extraData'];
+        }
+        return $entry;
+    }
 
-	/**
-	 * Format file info for JSON
-	 * @param \OCP\Files\FileInfo[] $fileInfos file infos
-	 * @return array
-	 */
-	public static function formatFileInfos($fileInfos) {
-		$files = [];
-		foreach ($fileInfos as $i) {
-			$files[] = self::formatFileInfo($i);
-		}
+    /**
+     * Format file info for JSON
+     * @param \OCP\Files\FileInfo[] $fileInfos file infos
+     * @return array
+     */
+    public static function formatFileInfos($fileInfos) {
+        $files = [];
+        foreach ($fileInfos as $i) {
+            $files[] = self::formatFileInfo($i);
+        }
 
-		return $files;
-	}
+        return $files;
+    }
 
-	/**
-	 * Retrieves the contents of the given directory and
-	 * returns it as a sorted array of FileInfo.
-	 *
-	 * @param string $dir path to the directory
-	 * @param string $sortAttribute attribute to sort on
-	 * @param bool $sortDescending true for descending sort, false otherwise
-	 * @param string $mimetypeFilter limit returned content to this mimetype or mimepart
-	 * @return \OCP\Files\FileInfo[] files
-	 */
-	public static function getFiles($dir, $sortAttribute = 'name', $sortDescending = false, $mimetypeFilter = '') {
-		$content = \OC\Files\Filesystem::getDirectoryContent($dir, $mimetypeFilter);
+    /**
+     * Retrieves the contents of the given directory and
+     * returns it as a sorted array of FileInfo.
+     *
+     * @param string $dir path to the directory
+     * @param string $sortAttribute attribute to sort on
+     * @param bool $sortDescending true for descending sort, false otherwise
+     * @param string $mimetypeFilter limit returned content to this mimetype or mimepart
+     * @return \OCP\Files\FileInfo[] files
+     */
+    public static function getFiles($dir, $sortAttribute = 'name', $sortDescending = false, $mimetypeFilter = '') {
+        $content = \OC\Files\Filesystem::getDirectoryContent($dir, $mimetypeFilter);
 
-		return self::sortFiles($content, $sortAttribute, $sortDescending);
-	}
+        return self::sortFiles($content, $sortAttribute, $sortDescending);
+    }
 
-	/**
-	 * Populate the result set with file tags
-	 *
-	 * @param array $fileList
-	 * @param string $fileIdentifier identifier attribute name for values in $fileList
-	 * @param ITagManager $tagManager
-	 * @return array file list populated with tags
-	 */
-	public static function populateTags(array $fileList, $fileIdentifier = 'fileid', ITagManager $tagManager) {
-		$ids = [];
-		foreach ($fileList as $fileData) {
-			$ids[] = $fileData[$fileIdentifier];
-		}
-		$tagger = $tagManager->load('files');
-		$tags = $tagger->getTagsForObjects($ids);
+    /**
+     * Populate the result set with file tags
+     *
+     * @param array $fileList
+     * @param string $fileIdentifier identifier attribute name for values in $fileList
+     * @param ITagManager $tagManager
+     * @return array file list populated with tags
+     */
+    public static function populateTags(array $fileList, $fileIdentifier = 'fileid', ITagManager $tagManager) {
+        $ids = [];
+        foreach ($fileList as $fileData) {
+            $ids[] = $fileData[$fileIdentifier];
+        }
+        $tagger = $tagManager->load('files');
+        $tags = $tagger->getTagsForObjects($ids);
 
-		if (!is_array($tags)) {
-			throw new \UnexpectedValueException('$tags must be an array');
-		}
+        if (!is_array($tags)) {
+            throw new \UnexpectedValueException('$tags must be an array');
+        }
 
-		// Set empty tag array
-		foreach ($fileList as $key => $fileData) {
-			$fileList[$key]['tags'] = [];
-		}
+        // Set empty tag array
+        foreach ($fileList as $key => $fileData) {
+            $fileList[$key]['tags'] = [];
+        }
 
-		if (!empty($tags)) {
-			foreach ($tags as $fileId => $fileTags) {
+        if (!empty($tags)) {
+            foreach ($tags as $fileId => $fileTags) {
 
-				foreach ($fileList as $key => $fileData) {
-					if ($fileId !== $fileData[$fileIdentifier]) {
-						continue;
-					}
+                foreach ($fileList as $key => $fileData) {
+                    if ($fileId !== $fileData[$fileIdentifier]) {
+                        continue;
+                    }
 
-					$fileList[$key]['tags'] = $fileTags;
-				}
-			}
-		}
+                    $fileList[$key]['tags'] = $fileTags;
+                }
+            }
+        }
 
-		return $fileList;
-	}
+        return $fileList;
+    }
 
-	/**
-	 * Sort the given file info array
-	 *
-	 * @param \OCP\Files\FileInfo[] $files files to sort
-	 * @param string $sortAttribute attribute to sort on
-	 * @param bool $sortDescending true for descending sort, false otherwise
-	 * @return \OCP\Files\FileInfo[] sorted files
-	 */
-	public static function sortFiles($files, $sortAttribute = 'name', $sortDescending = false) {
-		$sortFunc = 'compareFileNames';
-		if ($sortAttribute === 'mtime') {
-			$sortFunc = 'compareTimestamp';
-		} else if ($sortAttribute === 'size') {
-			$sortFunc = 'compareSize';
-		}
-		usort($files, [Helper::class, $sortFunc]);
-		if ($sortDescending) {
-			$files = array_reverse($files);
-		}
-		return $files;
-	}
+    /**
+     * Sort the given file info array
+     *
+     * @param \OCP\Files\FileInfo[] $files files to sort
+     * @param string $sortAttribute attribute to sort on
+     * @param bool $sortDescending true for descending sort, false otherwise
+     * @return \OCP\Files\FileInfo[] sorted files
+     */
+    public static function sortFiles($files, $sortAttribute = 'name', $sortDescending = false) {
+        $sortFunc = 'compareFileNames';
+        if ($sortAttribute === 'mtime') {
+            $sortFunc = 'compareTimestamp';
+        } else if ($sortAttribute === 'size') {
+            $sortFunc = 'compareSize';
+        }
+        usort($files, [Helper::class, $sortFunc]);
+        if ($sortDescending) {
+            $files = array_reverse($files);
+        }
+        return $files;
+    }
 }

apps/files/lib/AppInfo/Application.php

Indentation +50 added lines, -50 removed lines

@@ -48,63 +48,63 @@
 
 class Application extends App {
 
-	public const APP_ID = 'files';
+    public const APP_ID = 'files';
 
-	public function __construct(array $urlParams=[]) {
-		parent::__construct(self::APP_ID, $urlParams);
-		$container = $this->getContainer();
-		$server = $container->getServer();
+    public function __construct(array $urlParams=[]) {
+        parent::__construct(self::APP_ID, $urlParams);
+        $container = $this->getContainer();
+        $server = $container->getServer();
 
-		/**
-		 * Controllers
-		 */
-		$container->registerService('APIController', function (IContainer $c) use ($server) {
-			return new ApiController(
-				$c->query('AppName'),
-				$c->query('Request'),
-				$server->getUserSession(),
-				$c->query('TagService'),
-				$server->getPreviewManager(),
-				$server->getShareManager(),
-				$server->getConfig(),
-				$server->getUserFolder()
-			);
-		});
+        /**
+         * Controllers
+         */
+        $container->registerService('APIController', function (IContainer $c) use ($server) {
+            return new ApiController(
+                $c->query('AppName'),
+                $c->query('Request'),
+                $server->getUserSession(),
+                $c->query('TagService'),
+                $server->getPreviewManager(),
+                $server->getShareManager(),
+                $server->getConfig(),
+                $server->getUserFolder()
+            );
+        });
 
-		/**
-		 * Services
-		 */
-		$container->registerService('TagService', function(IContainer $c) use ($server) {
-			$homeFolder = $c->query('ServerContainer')->getUserFolder();
-			return new TagService(
-				$c->query('ServerContainer')->getUserSession(),
-				$c->query('ServerContainer')->getActivityManager(),
-				$c->query('ServerContainer')->getTagManager()->load(self::APP_ID),
-				$homeFolder,
-				$server->getEventDispatcher()
-			);
-		});
+        /**
+         * Services
+         */
+        $container->registerService('TagService', function(IContainer $c) use ($server) {
+            $homeFolder = $c->query('ServerContainer')->getUserFolder();
+            return new TagService(
+                $c->query('ServerContainer')->getUserSession(),
+                $c->query('ServerContainer')->getActivityManager(),
+                $c->query('ServerContainer')->getTagManager()->load(self::APP_ID),
+                $homeFolder,
+                $server->getEventDispatcher()
+            );
+        });
 
-		/*
+        /*
 		 * Register capabilities
 		 */
-		$container->registerCapability(Capabilities::class);
+        $container->registerCapability(Capabilities::class);
 
-		/**
-		 * Register Collaboration ResourceProvider
-		 */
-		/** @var IProviderManager $providerManager */
-		$providerManager = $container->query(IProviderManager::class);
-		$providerManager->registerResourceProvider(ResourceProvider::class);
-		Listener::register($server->getEventDispatcher());
+        /**
+         * Register Collaboration ResourceProvider
+         */
+        /** @var IProviderManager $providerManager */
+        $providerManager = $container->query(IProviderManager::class);
+        $providerManager->registerResourceProvider(ResourceProvider::class);
+        Listener::register($server->getEventDispatcher());
 
-		/** @var IEventDispatcher $dispatcher */
-		$dispatcher = $container->query(IEventDispatcher::class);
-		$dispatcher->addServiceListener(LoadAdditionalScriptsEvent::class, LegacyLoadAdditionalScriptsAdapter::class);
-		$dispatcher->addServiceListener(LoadSidebar::class, LoadSidebarListener::class);
+        /** @var IEventDispatcher $dispatcher */
+        $dispatcher = $container->query(IEventDispatcher::class);
+        $dispatcher->addServiceListener(LoadAdditionalScriptsEvent::class, LegacyLoadAdditionalScriptsAdapter::class);
+        $dispatcher->addServiceListener(LoadSidebar::class, LoadSidebarListener::class);
 
-		/** @var \OCP\Notification\IManager $notifications */
-		$notifications = $container->query(\OCP\Notification\IManager::class);
-		$notifications->registerNotifierService(Notifier::class);
-	}
+        /** @var \OCP\Notification\IManager $notifications */
+        $notifications = $container->query(\OCP\Notification\IManager::class);
+        $notifications->registerNotifierService(Notifier::class);
+    }
 }

apps/files/lib/Controller/ViewController.php

Indentation +289 added lines, -289 removed lines

@@ -62,293 +62,293 @@
  * @package OCA\Files\Controller
  */
 class ViewController extends Controller {
-	/** @var string */
-	protected $appName;
-	/** @var IRequest */
-	protected $request;
-	/** @var IURLGenerator */
-	protected $urlGenerator;
-	/** @var IL10N */
-	protected $l10n;
-	/** @var IConfig */
-	protected $config;
-	/** @var IEventDispatcher */
-	protected $eventDispatcher;
-	/** @var IUserSession */
-	protected $userSession;
-	/** @var IAppManager */
-	protected $appManager;
-	/** @var IRootFolder */
-	protected $rootFolder;
-	/** @var Helper */
-	protected $activityHelper;
-
-	public function __construct(string $appName,
-		IRequest $request,
-		IURLGenerator $urlGenerator,
-		IL10N $l10n,
-		IConfig $config,
-		IEventDispatcher $eventDispatcher,
-		IUserSession $userSession,
-		IAppManager $appManager,
-		IRootFolder $rootFolder,
-		Helper $activityHelper
-	) {
-		parent::__construct($appName, $request);
-		$this->appName         = $appName;
-		$this->request         = $request;
-		$this->urlGenerator    = $urlGenerator;
-		$this->l10n            = $l10n;
-		$this->config          = $config;
-		$this->eventDispatcher = $eventDispatcher;
-		$this->userSession     = $userSession;
-		$this->appManager      = $appManager;
-		$this->rootFolder      = $rootFolder;
-		$this->activityHelper  = $activityHelper;
-	}
-
-	/**
-	 * @param string $appName
-	 * @param string $scriptName
-	 * @return string
-	 */
-	protected function renderScript($appName, $scriptName) {
-		$content    = '';
-		$appPath    = \OC_App::getAppPath($appName);
-		$scriptPath = $appPath . '/' . $scriptName;
-		if (file_exists($scriptPath)) {
-			// TODO: sanitize path / script name ?
-			ob_start();
-			include $scriptPath;
-			$content = ob_get_contents();
-			@ob_end_clean();
-		}
-
-		return $content;
-	}
-
-	/**
-	 * FIXME: Replace with non static code
-	 *
-	 * @return array
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	protected function getStorageInfo() {
-		$dirInfo = \OC\Files\Filesystem::getFileInfo('/', false);
-
-		return \OC_Helper::getStorageInfo('/', $dirInfo);
-	}
-
-	/**
-	 * @NoCSRFRequired
-	 * @NoAdminRequired
-	 *
-	 * @param string $fileid
-	 * @return TemplateResponse|RedirectResponse
-	 * @throws NotFoundException
-	 */
-	public function showFile(string $fileid = null): Response {
-		// This is the entry point from the `/f/{fileid}` URL which is hardcoded in the server.
-		try {
-			return $this->redirectToFile($fileid);
-		} catch (NotFoundException $e) {
-			return new RedirectResponse($this->urlGenerator->linkToRoute('files.view.index', ['fileNotFound' => true]));
-		}
-	}
-
-	/**
-	 * @NoCSRFRequired
-	 * @NoAdminRequired
-	 *
-	 * @param string $dir
-	 * @param string $view
-	 * @param string $fileid
-	 * @param bool $fileNotFound
-	 * @return TemplateResponse|RedirectResponse
-	 * @throws NotFoundException
-	 */
-	public function index($dir = '', $view = '', $fileid = null, $fileNotFound = false) {
-		if ($fileid !== null) {
-			try {
-				return $this->redirectToFile($fileid);
-			} catch (NotFoundException $e) {
-				return new RedirectResponse($this->urlGenerator->linkToRoute('files.view.index', ['fileNotFound' => true]));
-			}
-		}
-
-		$nav = new \OCP\Template('files', 'appnavigation', '');
-
-		// Load the files we need
-		\OCP\Util::addStyle('files', 'merged');
-		\OCP\Util::addScript('files', 'merged-index');
-
-		// mostly for the home storage's free space
-		// FIXME: Make non static
-		$storageInfo = $this->getStorageInfo();
-
-		$user = $this->userSession->getUser()->getUID();
-
-		// Get all the user favorites to create a submenu
-		try {
-			$favElements = $this->activityHelper->getFavoriteFilePaths($this->userSession->getUser()->getUID());
-		} catch (\RuntimeException $e) {
-			$favElements['folders'] = [];
-		}
-
-		$collapseClasses = '';
-		if (count($favElements['folders']) > 0) {
-			$collapseClasses = 'collapsible';
-		}
-
-		$favoritesSublistArray = [];
-
-		$navBarPositionPosition = 6;
-		$currentCount           = 0;
-		foreach ($favElements['folders'] as $dir) {
-
-			$link         = $this->urlGenerator->linkToRoute('files.view.index', ['dir' => $dir, 'view' => 'files']);
-			$sortingValue = ++$currentCount;
-			$element      = [
-				'id'                 => str_replace('/', '-', $dir),
-				'view'               => 'files',
-				'href'               => $link,
-				'dir'                => $dir,
-				'order'              => $navBarPositionPosition,
-				'folderPosition'     => $sortingValue,
-				'name'               => basename($dir),
-				'icon'               => 'files',
-				'quickaccesselement' => 'true'
-			];
-
-			array_push($favoritesSublistArray, $element);
-			$navBarPositionPosition++;
-		}
-
-		$navItems = \OCA\Files\App::getNavigationManager()->getAll();
-
-		// add the favorites entry in menu
-		$navItems['favorites']['sublist'] = $favoritesSublistArray;
-		$navItems['favorites']['classes'] = $collapseClasses;
-
-		// parse every menu and add the expandedState user value
-		foreach ($navItems as $key => $item) {
-			if (isset($item['expandedState'])) {
-				$navItems[$key]['defaultExpandedState'] = $this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', $item['expandedState'], '0') === '1';
-			}
-		}
-
-		$nav->assign('navigationItems', $navItems);
-
-		$nav->assign('usage', \OC_Helper::humanFileSize($storageInfo['used']));
-		if ($storageInfo['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED) {
-			$totalSpace = $this->l10n->t('Unlimited');
-		} else {
-			$totalSpace = \OC_Helper::humanFileSize($storageInfo['total']);
-		}
-		$nav->assign('total_space', $totalSpace);
-		$nav->assign('quota', $storageInfo['quota']);
-		$nav->assign('usage_relative', $storageInfo['relative']);
-
-		$nav->assign('webdav_url', \OCP\Util::linkToRemote('dav/files/' . $user));
-
-		$contentItems = [];
-
-		// render the container content for every navigation item
-		foreach ($navItems as $item) {
-			$content = '';
-			if (isset($item['script'])) {
-				$content = $this->renderScript($item['appname'], $item['script']);
-			}
-			// parse submenus
-			if (isset($item['sublist'])) {
-				foreach ($item['sublist'] as $subitem) {
-					$subcontent = '';
-					if (isset($subitem['script'])) {
-						$subcontent = $this->renderScript($subitem['appname'], $subitem['script']);
-					}
-					$contentItems[$subitem['id']] = [
-						'id'      => $subitem['id'],
-						'content' => $subcontent
-					];
-				}
-			}
-			$contentItems[$item['id']] = [
-				'id'      => $item['id'],
-				'content' => $content
-			];
-		}
-
-		$event = new LoadAdditionalScriptsEvent();
-		$this->eventDispatcher->dispatch(LoadAdditionalScriptsEvent::class, $event);
-
-		$this->eventDispatcher->dispatch(LoadSidebar::class, new LoadSidebar());
-		// Load Viewer scripts
-		if (class_exists(LoadViewer::class)) {
-			$this->eventDispatcher->dispatchTyped(new LoadViewer());
-		}
-
-		$params                                = [];
-		$params['usedSpacePercent']            = (int) $storageInfo['relative'];
-		$params['owner']                       = $storageInfo['owner'] ?? '';
-		$params['ownerDisplayName']            = $storageInfo['ownerDisplayName'] ?? '';
-		$params['isPublic']                    = false;
-		$params['allowShareWithLink']          = $this->config->getAppValue('core', 'shareapi_allow_links', 'yes');
-		$params['defaultFileSorting']          = $this->config->getUserValue($user, 'files', 'file_sorting', 'name');
-		$params['defaultFileSortingDirection'] = $this->config->getUserValue($user, 'files', 'file_sorting_direction', 'asc');
-		$params['showgridview']				   = $this->config->getUserValue($user, 'files', 'show_grid', false);
-		$params['isIE']						   = \OCP\Util::isIE();
-		$showHidden                            = (bool) $this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'show_hidden', false);
-		$params['showHiddenFiles']             = $showHidden ? 1 : 0;
-		$params['fileNotFound']                = $fileNotFound ? 1 : 0;
-		$params['appNavigation']               = $nav;
-		$params['appContents']                 = $contentItems;
-		$params['hiddenFields']                = $event->getHiddenFields();
-
-		$response = new TemplateResponse(
-			$this->appName,
-			'index',
-			$params
-		);
-		$policy = new ContentSecurityPolicy();
-		$policy->addAllowedFrameDomain('\'self\'');
-		$response->setContentSecurityPolicy($policy);
-
-		return $response;
-	}
-
-	/**
-	 * Redirects to the file list and highlight the given file id
-	 *
-	 * @param string $fileId file id to show
-	 * @return RedirectResponse redirect response or not found response
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	private function redirectToFile($fileId) {
-		$uid        = $this->userSession->getUser()->getUID();
-		$baseFolder = $this->rootFolder->getUserFolder($uid);
-		$files      = $baseFolder->getById($fileId);
-		$params     = [];
-
-		if (empty($files) && $this->appManager->isEnabledForUser('files_trashbin')) {
-			$baseFolder     = $this->rootFolder->get($uid . '/files_trashbin/files/');
-			$files          = $baseFolder->getById($fileId);
-			$params['view'] = 'trashbin';
-		}
-
-		if (!empty($files)) {
-			$file = current($files);
-			if ($file instanceof Folder) {
-				// set the full path to enter the folder
-				$params['dir'] = $baseFolder->getRelativePath($file->getPath());
-			} else {
-				// set parent path as dir
-				$params['dir'] = $baseFolder->getRelativePath($file->getParent()->getPath());
-				// and scroll to the entry
-				$params['scrollto'] = $file->getName();
-			}
-
-			return new RedirectResponse($this->urlGenerator->linkToRoute('files.view.index', $params));
-		}
-		throw new \OCP\Files\NotFoundException();
-	}
+    /** @var string */
+    protected $appName;
+    /** @var IRequest */
+    protected $request;
+    /** @var IURLGenerator */
+    protected $urlGenerator;
+    /** @var IL10N */
+    protected $l10n;
+    /** @var IConfig */
+    protected $config;
+    /** @var IEventDispatcher */
+    protected $eventDispatcher;
+    /** @var IUserSession */
+    protected $userSession;
+    /** @var IAppManager */
+    protected $appManager;
+    /** @var IRootFolder */
+    protected $rootFolder;
+    /** @var Helper */
+    protected $activityHelper;
+
+    public function __construct(string $appName,
+        IRequest $request,
+        IURLGenerator $urlGenerator,
+        IL10N $l10n,
+        IConfig $config,
+        IEventDispatcher $eventDispatcher,
+        IUserSession $userSession,
+        IAppManager $appManager,
+        IRootFolder $rootFolder,
+        Helper $activityHelper
+    ) {
+        parent::__construct($appName, $request);
+        $this->appName         = $appName;
+        $this->request         = $request;
+        $this->urlGenerator    = $urlGenerator;
+        $this->l10n            = $l10n;
+        $this->config          = $config;
+        $this->eventDispatcher = $eventDispatcher;
+        $this->userSession     = $userSession;
+        $this->appManager      = $appManager;
+        $this->rootFolder      = $rootFolder;
+        $this->activityHelper  = $activityHelper;
+    }
+
+    /**
+     * @param string $appName
+     * @param string $scriptName
+     * @return string
+     */
+    protected function renderScript($appName, $scriptName) {
+        $content    = '';
+        $appPath    = \OC_App::getAppPath($appName);
+        $scriptPath = $appPath . '/' . $scriptName;
+        if (file_exists($scriptPath)) {
+            // TODO: sanitize path / script name ?
+            ob_start();
+            include $scriptPath;
+            $content = ob_get_contents();
+            @ob_end_clean();
+        }
+
+        return $content;
+    }
+
+    /**
+     * FIXME: Replace with non static code
+     *
+     * @return array
+     * @throws \OCP\Files\NotFoundException
+     */
+    protected function getStorageInfo() {
+        $dirInfo = \OC\Files\Filesystem::getFileInfo('/', false);
+
+        return \OC_Helper::getStorageInfo('/', $dirInfo);
+    }
+
+    /**
+     * @NoCSRFRequired
+     * @NoAdminRequired
+     *
+     * @param string $fileid
+     * @return TemplateResponse|RedirectResponse
+     * @throws NotFoundException
+     */
+    public function showFile(string $fileid = null): Response {
+        // This is the entry point from the `/f/{fileid}` URL which is hardcoded in the server.
+        try {
+            return $this->redirectToFile($fileid);
+        } catch (NotFoundException $e) {
+            return new RedirectResponse($this->urlGenerator->linkToRoute('files.view.index', ['fileNotFound' => true]));
+        }
+    }
+
+    /**
+     * @NoCSRFRequired
+     * @NoAdminRequired
+     *
+     * @param string $dir
+     * @param string $view
+     * @param string $fileid
+     * @param bool $fileNotFound
+     * @return TemplateResponse|RedirectResponse
+     * @throws NotFoundException
+     */
+    public function index($dir = '', $view = '', $fileid = null, $fileNotFound = false) {
+        if ($fileid !== null) {
+            try {
+                return $this->redirectToFile($fileid);
+            } catch (NotFoundException $e) {
+                return new RedirectResponse($this->urlGenerator->linkToRoute('files.view.index', ['fileNotFound' => true]));
+            }
+        }
+
+        $nav = new \OCP\Template('files', 'appnavigation', '');
+
+        // Load the files we need
+        \OCP\Util::addStyle('files', 'merged');
+        \OCP\Util::addScript('files', 'merged-index');
+
+        // mostly for the home storage's free space
+        // FIXME: Make non static
+        $storageInfo = $this->getStorageInfo();
+
+        $user = $this->userSession->getUser()->getUID();
+
+        // Get all the user favorites to create a submenu
+        try {
+            $favElements = $this->activityHelper->getFavoriteFilePaths($this->userSession->getUser()->getUID());
+        } catch (\RuntimeException $e) {
+            $favElements['folders'] = [];
+        }
+
+        $collapseClasses = '';
+        if (count($favElements['folders']) > 0) {
+            $collapseClasses = 'collapsible';
+        }
+
+        $favoritesSublistArray = [];
+
+        $navBarPositionPosition = 6;
+        $currentCount           = 0;
+        foreach ($favElements['folders'] as $dir) {
+
+            $link         = $this->urlGenerator->linkToRoute('files.view.index', ['dir' => $dir, 'view' => 'files']);
+            $sortingValue = ++$currentCount;
+            $element      = [
+                'id'                 => str_replace('/', '-', $dir),
+                'view'               => 'files',
+                'href'               => $link,
+                'dir'                => $dir,
+                'order'              => $navBarPositionPosition,
+                'folderPosition'     => $sortingValue,
+                'name'               => basename($dir),
+                'icon'               => 'files',
+                'quickaccesselement' => 'true'
+            ];
+
+            array_push($favoritesSublistArray, $element);
+            $navBarPositionPosition++;
+        }
+
+        $navItems = \OCA\Files\App::getNavigationManager()->getAll();
+
+        // add the favorites entry in menu
+        $navItems['favorites']['sublist'] = $favoritesSublistArray;
+        $navItems['favorites']['classes'] = $collapseClasses;
+
+        // parse every menu and add the expandedState user value
+        foreach ($navItems as $key => $item) {
+            if (isset($item['expandedState'])) {
+                $navItems[$key]['defaultExpandedState'] = $this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', $item['expandedState'], '0') === '1';
+            }
+        }
+
+        $nav->assign('navigationItems', $navItems);
+
+        $nav->assign('usage', \OC_Helper::humanFileSize($storageInfo['used']));
+        if ($storageInfo['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED) {
+            $totalSpace = $this->l10n->t('Unlimited');
+        } else {
+            $totalSpace = \OC_Helper::humanFileSize($storageInfo['total']);
+        }
+        $nav->assign('total_space', $totalSpace);
+        $nav->assign('quota', $storageInfo['quota']);
+        $nav->assign('usage_relative', $storageInfo['relative']);
+
+        $nav->assign('webdav_url', \OCP\Util::linkToRemote('dav/files/' . $user));
+
+        $contentItems = [];
+
+        // render the container content for every navigation item
+        foreach ($navItems as $item) {
+            $content = '';
+            if (isset($item['script'])) {
+                $content = $this->renderScript($item['appname'], $item['script']);
+            }
+            // parse submenus
+            if (isset($item['sublist'])) {
+                foreach ($item['sublist'] as $subitem) {
+                    $subcontent = '';
+                    if (isset($subitem['script'])) {
+                        $subcontent = $this->renderScript($subitem['appname'], $subitem['script']);
+                    }
+                    $contentItems[$subitem['id']] = [
+                        'id'      => $subitem['id'],
+                        'content' => $subcontent
+                    ];
+                }
+            }
+            $contentItems[$item['id']] = [
+                'id'      => $item['id'],
+                'content' => $content
+            ];
+        }
+
+        $event = new LoadAdditionalScriptsEvent();
+        $this->eventDispatcher->dispatch(LoadAdditionalScriptsEvent::class, $event);
+
+        $this->eventDispatcher->dispatch(LoadSidebar::class, new LoadSidebar());
+        // Load Viewer scripts
+        if (class_exists(LoadViewer::class)) {
+            $this->eventDispatcher->dispatchTyped(new LoadViewer());
+        }
+
+        $params                                = [];
+        $params['usedSpacePercent']            = (int) $storageInfo['relative'];
+        $params['owner']                       = $storageInfo['owner'] ?? '';
+        $params['ownerDisplayName']            = $storageInfo['ownerDisplayName'] ?? '';
+        $params['isPublic']                    = false;
+        $params['allowShareWithLink']          = $this->config->getAppValue('core', 'shareapi_allow_links', 'yes');
+        $params['defaultFileSorting']          = $this->config->getUserValue($user, 'files', 'file_sorting', 'name');
+        $params['defaultFileSortingDirection'] = $this->config->getUserValue($user, 'files', 'file_sorting_direction', 'asc');
+        $params['showgridview']				   = $this->config->getUserValue($user, 'files', 'show_grid', false);
+        $params['isIE']						   = \OCP\Util::isIE();
+        $showHidden                            = (bool) $this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'show_hidden', false);
+        $params['showHiddenFiles']             = $showHidden ? 1 : 0;
+        $params['fileNotFound']                = $fileNotFound ? 1 : 0;
+        $params['appNavigation']               = $nav;
+        $params['appContents']                 = $contentItems;
+        $params['hiddenFields']                = $event->getHiddenFields();
+
+        $response = new TemplateResponse(
+            $this->appName,
+            'index',
+            $params
+        );
+        $policy = new ContentSecurityPolicy();
+        $policy->addAllowedFrameDomain('\'self\'');
+        $response->setContentSecurityPolicy($policy);
+
+        return $response;
+    }
+
+    /**
+     * Redirects to the file list and highlight the given file id
+     *
+     * @param string $fileId file id to show
+     * @return RedirectResponse redirect response or not found response
+     * @throws \OCP\Files\NotFoundException
+     */
+    private function redirectToFile($fileId) {
+        $uid        = $this->userSession->getUser()->getUID();
+        $baseFolder = $this->rootFolder->getUserFolder($uid);
+        $files      = $baseFolder->getById($fileId);
+        $params     = [];
+
+        if (empty($files) && $this->appManager->isEnabledForUser('files_trashbin')) {
+            $baseFolder     = $this->rootFolder->get($uid . '/files_trashbin/files/');
+            $files          = $baseFolder->getById($fileId);
+            $params['view'] = 'trashbin';
+        }
+
+        if (!empty($files)) {
+            $file = current($files);
+            if ($file instanceof Folder) {
+                // set the full path to enter the folder
+                $params['dir'] = $baseFolder->getRelativePath($file->getPath());
+            } else {
+                // set parent path as dir
+                $params['dir'] = $baseFolder->getRelativePath($file->getParent()->getPath());
+                // and scroll to the entry
+                $params['scrollto'] = $file->getName();
+            }
+
+            return new RedirectResponse($this->urlGenerator->linkToRoute('files.view.index', $params));
+        }
+        throw new \OCP\Files\NotFoundException();
+    }
 }

apps/files/lib/Service/TagService.php

Indentation +97 added lines, -97 removed lines

@@ -38,110 +38,110 @@
  */
 class TagService {
 
-	/** @var IUserSession */
-	private $userSession;
-	/** @var IManager */
-	private $activityManager;
-	/** @var ITags */
-	private $tagger;
-	/** @var Folder */
-	private $homeFolder;
-	/** @var EventDispatcherInterface */
-	private $dispatcher;
+    /** @var IUserSession */
+    private $userSession;
+    /** @var IManager */
+    private $activityManager;
+    /** @var ITags */
+    private $tagger;
+    /** @var Folder */
+    private $homeFolder;
+    /** @var EventDispatcherInterface */
+    private $dispatcher;
 
-	/**
-	 * @param IUserSession $userSession
-	 * @param IManager $activityManager
-	 * @param ITags $tagger
-	 * @param Folder $homeFolder
-	 * @param EventDispatcherInterface $dispatcher
-	 */
-	public function __construct(
-		IUserSession $userSession,
-		IManager $activityManager,
-		ITags $tagger,
-		Folder $homeFolder,
-		EventDispatcherInterface $dispatcher
-	) {
-		$this->userSession = $userSession;
-		$this->activityManager = $activityManager;
-		$this->tagger = $tagger;
-		$this->homeFolder = $homeFolder;
-		$this->dispatcher = $dispatcher;
-	}
+    /**
+     * @param IUserSession $userSession
+     * @param IManager $activityManager
+     * @param ITags $tagger
+     * @param Folder $homeFolder
+     * @param EventDispatcherInterface $dispatcher
+     */
+    public function __construct(
+        IUserSession $userSession,
+        IManager $activityManager,
+        ITags $tagger,
+        Folder $homeFolder,
+        EventDispatcherInterface $dispatcher
+    ) {
+        $this->userSession = $userSession;
+        $this->activityManager = $activityManager;
+        $this->tagger = $tagger;
+        $this->homeFolder = $homeFolder;
+        $this->dispatcher = $dispatcher;
+    }
 
-	/**
-	 * Updates the tags of the specified file path.
-	 * The passed tags are absolute, which means they will
-	 * replace the actual tag selection.
-	 *
-	 * @param string $path path
-	 * @param array  $tags array of tags
-	 * @return array list of tags
-	 * @throws \OCP\Files\NotFoundException if the file does not exist
-	 */
-	public function updateFileTags($path, $tags) {
-		$fileId = $this->homeFolder->get($path)->getId();
+    /**
+     * Updates the tags of the specified file path.
+     * The passed tags are absolute, which means they will
+     * replace the actual tag selection.
+     *
+     * @param string $path path
+     * @param array  $tags array of tags
+     * @return array list of tags
+     * @throws \OCP\Files\NotFoundException if the file does not exist
+     */
+    public function updateFileTags($path, $tags) {
+        $fileId = $this->homeFolder->get($path)->getId();
 
-		$currentTags = $this->tagger->getTagsForObjects([$fileId]);
+        $currentTags = $this->tagger->getTagsForObjects([$fileId]);
 
-		if (!empty($currentTags)) {
-			$currentTags = current($currentTags);
-		}
+        if (!empty($currentTags)) {
+            $currentTags = current($currentTags);
+        }
 
-		$newTags = array_diff($tags, $currentTags);
-		foreach ($newTags as $tag) {
-			if ($tag === ITags::TAG_FAVORITE) {
-				$this->addActivity(true, $fileId, $path);
-			}
-			$this->tagger->tagAs($fileId, $tag);
-		}
-		$deletedTags = array_diff($currentTags, $tags);
-		foreach ($deletedTags as $tag) {
-			if ($tag === ITags::TAG_FAVORITE) {
-				$this->addActivity(false, $fileId, $path);
-			}
-			$this->tagger->unTag($fileId, $tag);
-		}
+        $newTags = array_diff($tags, $currentTags);
+        foreach ($newTags as $tag) {
+            if ($tag === ITags::TAG_FAVORITE) {
+                $this->addActivity(true, $fileId, $path);
+            }
+            $this->tagger->tagAs($fileId, $tag);
+        }
+        $deletedTags = array_diff($currentTags, $tags);
+        foreach ($deletedTags as $tag) {
+            if ($tag === ITags::TAG_FAVORITE) {
+                $this->addActivity(false, $fileId, $path);
+            }
+            $this->tagger->unTag($fileId, $tag);
+        }
 
-		// TODO: re-read from tagger to make sure the
-		// list is up to date, in case of concurrent changes ?
-		return $tags;
-	}
+        // TODO: re-read from tagger to make sure the
+        // list is up to date, in case of concurrent changes ?
+        return $tags;
+    }
 
-	/**
-	 * @param bool $addToFavorite
-	 * @param int $fileId
-	 * @param string $path
-	 */
-	protected function addActivity($addToFavorite, $fileId, $path) {
-		$user = $this->userSession->getUser();
-		if (!$user instanceof IUser) {
-			return;
-		}
+    /**
+     * @param bool $addToFavorite
+     * @param int $fileId
+     * @param string $path
+     */
+    protected function addActivity($addToFavorite, $fileId, $path) {
+        $user = $this->userSession->getUser();
+        if (!$user instanceof IUser) {
+            return;
+        }
 
-		$eventName = $addToFavorite ? 'addFavorite' : 'removeFavorite';
-		$this->dispatcher->dispatch(self::class . '::' . $eventName, new GenericEvent(null, [
-			'userId' => $user->getUID(),
-			'fileId' => $fileId,
-			'path' => $path,
-		]));
+        $eventName = $addToFavorite ? 'addFavorite' : 'removeFavorite';
+        $this->dispatcher->dispatch(self::class . '::' . $eventName, new GenericEvent(null, [
+            'userId' => $user->getUID(),
+            'fileId' => $fileId,
+            'path' => $path,
+        ]));
 
-		$event = $this->activityManager->generateEvent();
-		try {
-			$event->setApp('files')
-				->setObject('files', $fileId, $path)
-				->setType('favorite')
-				->setAuthor($user->getUID())
-				->setAffectedUser($user->getUID())
-				->setTimestamp(time())
-				->setSubject(
-					$addToFavorite ? FavoriteProvider::SUBJECT_ADDED : FavoriteProvider::SUBJECT_REMOVED,
-					['id' => $fileId, 'path' => $path]
-				);
-			$this->activityManager->publish($event);
-		} catch (\InvalidArgumentException $e) {
-		} catch (\BadMethodCallException $e) {
-		}
-	}
+        $event = $this->activityManager->generateEvent();
+        try {
+            $event->setApp('files')
+                ->setObject('files', $fileId, $path)
+                ->setType('favorite')
+                ->setAuthor($user->getUID())
+                ->setAffectedUser($user->getUID())
+                ->setTimestamp(time())
+                ->setSubject(
+                    $addToFavorite ? FavoriteProvider::SUBJECT_ADDED : FavoriteProvider::SUBJECT_REMOVED,
+                    ['id' => $fileId, 'path' => $path]
+                );
+            $this->activityManager->publish($event);
+        } catch (\InvalidArgumentException $e) {
+        } catch (\BadMethodCallException $e) {
+        }
+    }
 }

apps/testing/lib/AppInfo/Application.php

Indentation +12 added lines, -12 removed lines

@@ -27,18 +27,18 @@
 use OCP\AppFramework\App;
 
 class Application extends App {
-	public function __construct (array $urlParams = []) {
-		$appName = 'testing';
-		parent::__construct($appName, $urlParams);
+    public function __construct (array $urlParams = []) {
+        $appName = 'testing';
+        parent::__construct($appName, $urlParams);
 
-		$c = $this->getContainer();
-		$config = $c->getServer()->getConfig();
-		if ($config->getAppValue($appName, 'enable_alt_user_backend', 'no') === 'yes') {
-			$userManager = $c->getServer()->getUserManager();
+        $c = $this->getContainer();
+        $config = $c->getServer()->getConfig();
+        if ($config->getAppValue($appName, 'enable_alt_user_backend', 'no') === 'yes') {
+            $userManager = $c->getServer()->getUserManager();
 
-			// replace all user backends with this one
-			$userManager->clearBackends();
-			$userManager->registerBackend($c->query(AlternativeHomeUserBackend::class));
-		}
-	}
+            // replace all user backends with this one
+            $userManager->clearBackends();
+            $userManager->registerBackend($c->query(AlternativeHomeUserBackend::class));
+        }
+    }
 }

apps/sharebymail/lib/AppInfo/Application.php

Indentation +11 added lines, -11 removed lines

@@ -33,19 +33,19 @@
 
 class Application extends App {
 
-	public function __construct(array $urlParams = []) {
-		parent::__construct('sharebymail', $urlParams);
+    public function __construct(array $urlParams = []) {
+        parent::__construct('sharebymail', $urlParams);
 
-		$settingsManager = \OC::$server->query(Settings\SettingsManager::class);
-		$settings = new Settings($settingsManager);
+        $settingsManager = \OC::$server->query(Settings\SettingsManager::class);
+        $settings = new Settings($settingsManager);
 
-		/** register capabilities */
-		$container = $this->getContainer();
-		$container->registerCapability(Capabilities::class);
+        /** register capabilities */
+        $container = $this->getContainer();
+        $container->registerCapability(Capabilities::class);
 
-		/** register hooks */
-		Util::connectHook('\OCP\Config', 'js', $settings, 'announceShareProvider');
-		Util::connectHook('\OCP\Config', 'js', $settings, 'announceShareByMailSettings');
-	}
+        /** register hooks */
+        Util::connectHook('\OCP\Config', 'js', $settings, 'announceShareProvider');
+        Util::connectHook('\OCP\Config', 'js', $settings, 'announceShareByMailSettings');
+    }
 
 }

apps/sharebymail/lib/ShareByMailProvider.php

Indentation +1135 added lines, -1135 removed lines

@@ -68,1152 +68,1152 @@
  */
 class ShareByMailProvider implements IShareProvider {
 
-	/** @var  IDBConnection */
-	private $dbConnection;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var ISecureRandom */
-	private $secureRandom;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var IRootFolder */
-	private $rootFolder;
-
-	/** @var IL10N */
-	private $l;
-
-	/** @var IMailer */
-	private $mailer;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	/** @var IManager  */
-	private $activityManager;
-
-	/** @var SettingsManager */
-	private $settingsManager;
-
-	/** @var Defaults */
-	private $defaults;
-
-	/** @var IHasher */
-	private $hasher;
-
-	/** @var  CapabilitiesManager */
-	private $capabilitiesManager;
-
-	/**
-	 * Return the identifier of this provider.
-	 *
-	 * @return string Containing only [a-zA-Z0-9]
-	 */
-	public function identifier() {
-		return 'ocMailShare';
-	}
-
-	/**
-	 * DefaultShareProvider constructor.
-	 *
-	 * @param IDBConnection $connection
-	 * @param ISecureRandom $secureRandom
-	 * @param IUserManager $userManager
-	 * @param IRootFolder $rootFolder
-	 * @param IL10N $l
-	 * @param ILogger $logger
-	 * @param IMailer $mailer
-	 * @param IURLGenerator $urlGenerator
-	 * @param IManager $activityManager
-	 * @param SettingsManager $settingsManager
-	 * @param Defaults $defaults
-	 * @param IHasher $hasher
-	 * @param CapabilitiesManager $capabilitiesManager
-	 */
-	public function __construct(
-		IDBConnection $connection,
-		ISecureRandom $secureRandom,
-		IUserManager $userManager,
-		IRootFolder $rootFolder,
-		IL10N $l,
-		ILogger $logger,
-		IMailer $mailer,
-		IURLGenerator $urlGenerator,
-		IManager $activityManager,
-		SettingsManager $settingsManager,
-		Defaults $defaults,
-		IHasher $hasher,
-		CapabilitiesManager $capabilitiesManager
-	) {
-		$this->dbConnection = $connection;
-		$this->secureRandom = $secureRandom;
-		$this->userManager = $userManager;
-		$this->rootFolder = $rootFolder;
-		$this->l = $l;
-		$this->logger = $logger;
-		$this->mailer = $mailer;
-		$this->urlGenerator = $urlGenerator;
-		$this->activityManager = $activityManager;
-		$this->settingsManager = $settingsManager;
-		$this->defaults = $defaults;
-		$this->hasher = $hasher;
-		$this->capabilitiesManager = $capabilitiesManager;
-	}
-
-	/**
-	 * Share a path
-	 *
-	 * @param IShare $share
-	 * @return IShare The share object
-	 * @throws ShareNotFound
-	 * @throws \Exception
-	 */
-	public function create(IShare $share) {
-
-		$shareWith = $share->getSharedWith();
-		/*
+    /** @var  IDBConnection */
+    private $dbConnection;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var ISecureRandom */
+    private $secureRandom;
+
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var IRootFolder */
+    private $rootFolder;
+
+    /** @var IL10N */
+    private $l;
+
+    /** @var IMailer */
+    private $mailer;
+
+    /** @var IURLGenerator */
+    private $urlGenerator;
+
+    /** @var IManager  */
+    private $activityManager;
+
+    /** @var SettingsManager */
+    private $settingsManager;
+
+    /** @var Defaults */
+    private $defaults;
+
+    /** @var IHasher */
+    private $hasher;
+
+    /** @var  CapabilitiesManager */
+    private $capabilitiesManager;
+
+    /**
+     * Return the identifier of this provider.
+     *
+     * @return string Containing only [a-zA-Z0-9]
+     */
+    public function identifier() {
+        return 'ocMailShare';
+    }
+
+    /**
+     * DefaultShareProvider constructor.
+     *
+     * @param IDBConnection $connection
+     * @param ISecureRandom $secureRandom
+     * @param IUserManager $userManager
+     * @param IRootFolder $rootFolder
+     * @param IL10N $l
+     * @param ILogger $logger
+     * @param IMailer $mailer
+     * @param IURLGenerator $urlGenerator
+     * @param IManager $activityManager
+     * @param SettingsManager $settingsManager
+     * @param Defaults $defaults
+     * @param IHasher $hasher
+     * @param CapabilitiesManager $capabilitiesManager
+     */
+    public function __construct(
+        IDBConnection $connection,
+        ISecureRandom $secureRandom,
+        IUserManager $userManager,
+        IRootFolder $rootFolder,
+        IL10N $l,
+        ILogger $logger,
+        IMailer $mailer,
+        IURLGenerator $urlGenerator,
+        IManager $activityManager,
+        SettingsManager $settingsManager,
+        Defaults $defaults,
+        IHasher $hasher,
+        CapabilitiesManager $capabilitiesManager
+    ) {
+        $this->dbConnection = $connection;
+        $this->secureRandom = $secureRandom;
+        $this->userManager = $userManager;
+        $this->rootFolder = $rootFolder;
+        $this->l = $l;
+        $this->logger = $logger;
+        $this->mailer = $mailer;
+        $this->urlGenerator = $urlGenerator;
+        $this->activityManager = $activityManager;
+        $this->settingsManager = $settingsManager;
+        $this->defaults = $defaults;
+        $this->hasher = $hasher;
+        $this->capabilitiesManager = $capabilitiesManager;
+    }
+
+    /**
+     * Share a path
+     *
+     * @param IShare $share
+     * @return IShare The share object
+     * @throws ShareNotFound
+     * @throws \Exception
+     */
+    public function create(IShare $share) {
+
+        $shareWith = $share->getSharedWith();
+        /*
 		 * Check if file is not already shared with the remote user
 		 */
-		$alreadyShared = $this->getSharedWith($shareWith, \OCP\Share::SHARE_TYPE_EMAIL, $share->getNode(), 1, 0);
-		if (!empty($alreadyShared)) {
-			$message = 'Sharing %1$s failed, this item is already shared with %2$s';
-			$message_t = $this->l->t('Sharing %1$s failed, this item is already shared with %2$s', [$share->getNode()->getName(), $shareWith]);
-			$this->logger->debug(sprintf($message, $share->getNode()->getName(), $shareWith), ['app' => 'Federated File Sharing']);
-			throw new \Exception($message_t);
-		}
-
-		// if the admin enforces a password for all mail shares we create a
-		// random password and send it to the recipient
-		$password = '';
-		$passwordEnforced = $this->settingsManager->enforcePasswordProtection();
-		if ($passwordEnforced) {
-			$password = $this->autoGeneratePassword($share);
-		}
-
-		$shareId = $this->createMailShare($share);
-		$send = $this->sendPassword($share, $password);
-		if ($passwordEnforced && $send === false) {
-			$this->sendPasswordToOwner($share, $password);
-		}
-
-		$this->createShareActivity($share);
-		$data = $this->getRawShare($shareId);
-
-		return $this->createShareObject($data);
-
-	}
-
-	/**
-	 * auto generate password in case of password enforcement on mail shares
-	 *
-	 * @param IShare $share
-	 * @return string
-	 * @throws \Exception
-	 */
-	protected function autoGeneratePassword($share) {
-		$initiatorUser = $this->userManager->get($share->getSharedBy());
-		$initiatorEMailAddress = ($initiatorUser instanceof IUser) ? $initiatorUser->getEMailAddress() : null;
-		$allowPasswordByMail = $this->settingsManager->sendPasswordByMail();
-
-		if ($initiatorEMailAddress === null && !$allowPasswordByMail) {
-			throw new \Exception(
-				$this->l->t("We can't send you the auto-generated password. Please set a valid email address in your personal settings and try again.")
-			);
-		}
-
-		$passwordPolicy = $this->getPasswordPolicy();
-		$passwordCharset = ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS;
-		$passwordLength = 8;
-		if (!empty($passwordPolicy)) {
-			$passwordLength = (int)$passwordPolicy['minLength'] > 0 ? (int)$passwordPolicy['minLength'] : $passwordLength;
-			$passwordCharset .= $passwordPolicy['enforceSpecialCharacters'] ? ISecureRandom::CHAR_SYMBOLS : '';
-		}
-
-		$password = $this->secureRandom->generate($passwordLength, $passwordCharset);
-
-		$share->setPassword($this->hasher->hash($password));
-
-		return $password;
-	}
-
-	/**
-	 * get password policy
-	 *
-	 * @return array
-	 */
-	protected function getPasswordPolicy() {
-		$capabilities = $this->capabilitiesManager->getCapabilities();
-		if (isset($capabilities['password_policy'])) {
-			return $capabilities['password_policy'];
-		}
-
-		return [];
-	}
-
-	/**
-	 * create activity if a file/folder was shared by mail
-	 *
-	 * @param IShare $share
-	 * @param string $type
-	 */
-	protected function createShareActivity(IShare $share, string $type = 'share') {
-
-		$userFolder = $this->rootFolder->getUserFolder($share->getSharedBy());
-
-		$this->publishActivity(
-			$type === 'share' ? Activity::SUBJECT_SHARED_EMAIL_SELF : Activity::SUBJECT_UNSHARED_EMAIL_SELF,
-			[$userFolder->getRelativePath($share->getNode()->getPath()), $share->getSharedWith()],
-			$share->getSharedBy(),
-			$share->getNode()->getId(),
-			(string) $userFolder->getRelativePath($share->getNode()->getPath())
-		);
-
-		if ($share->getShareOwner() !== $share->getSharedBy()) {
-			$ownerFolder = $this->rootFolder->getUserFolder($share->getShareOwner());
-			$fileId = $share->getNode()->getId();
-			$nodes = $ownerFolder->getById($fileId);
-			$ownerPath = $nodes[0]->getPath();
-			$this->publishActivity(
-				$type === 'share' ? Activity::SUBJECT_SHARED_EMAIL_BY : Activity::SUBJECT_UNSHARED_EMAIL_BY,
-				[$ownerFolder->getRelativePath($ownerPath), $share->getSharedWith(), $share->getSharedBy()],
-				$share->getShareOwner(),
-				$fileId,
-				(string) $ownerFolder->getRelativePath($ownerPath)
-			);
-		}
-
-	}
-
-	/**
-	 * create activity if a file/folder was shared by mail
-	 *
-	 * @param IShare $share
-	 * @param string $sharedWith
-	 * @param bool $sendToSelf
-	 */
-	protected function createPasswordSendActivity(IShare $share, $sharedWith, $sendToSelf) {
-
-		$userFolder = $this->rootFolder->getUserFolder($share->getSharedBy());
-
-		if ($sendToSelf) {
-			$this->publishActivity(
-				Activity::SUBJECT_SHARED_EMAIL_PASSWORD_SEND_SELF,
-				[$userFolder->getRelativePath($share->getNode()->getPath())],
-				$share->getSharedBy(),
-				$share->getNode()->getId(),
-				(string) $userFolder->getRelativePath($share->getNode()->getPath())
-			);
-		} else {
-			$this->publishActivity(
-				Activity::SUBJECT_SHARED_EMAIL_PASSWORD_SEND,
-				[$userFolder->getRelativePath($share->getNode()->getPath()), $sharedWith],
-				$share->getSharedBy(),
-				$share->getNode()->getId(),
-				(string) $userFolder->getRelativePath($share->getNode()->getPath())
-			);
-		}
-	}
-
-
-	/**
-	 * publish activity if a file/folder was shared by mail
-	 *
-	 * @param string $subject
-	 * @param array $parameters
-	 * @param string $affectedUser
-	 * @param int $fileId
-	 * @param string $filePath
-	 */
-	protected function publishActivity(string $subject, array $parameters, string $affectedUser, int $fileId, string $filePath) {
-		$event = $this->activityManager->generateEvent();
-		$event->setApp('sharebymail')
-			->setType('shared')
-			->setSubject($subject, $parameters)
-			->setAffectedUser($affectedUser)
-			->setObject('files', $fileId, $filePath);
-		$this->activityManager->publish($event);
-
-	}
-
-	/**
-	 * @param IShare $share
-	 * @return int
-	 * @throws \Exception
-	 */
-	protected function createMailShare(IShare $share) {
-		$share->setToken($this->generateToken());
-		$shareId = $this->addShareToDB(
-			$share->getNodeId(),
-			$share->getNodeType(),
-			$share->getSharedWith(),
-			$share->getSharedBy(),
-			$share->getShareOwner(),
-			$share->getPermissions(),
-			$share->getToken(),
-			$share->getPassword(),
-			$share->getSendPasswordByTalk(),
-			$share->getHideDownload()
-		);
-
-		try {
-			$link = $this->urlGenerator->linkToRouteAbsolute('files_sharing.sharecontroller.showShare',
-				['token' => $share->getToken()]);
-			$this->sendMailNotification(
-				$share->getNode()->getName(),
-				$link,
-				$share->getSharedBy(),
-				$share->getSharedWith(),
-				$share->getExpirationDate()
-			);
-		} catch (HintException $hintException) {
-			$this->logger->logException($hintException, [
-				'message' => 'Failed to send share by mail.',
-				'level' => ILogger::ERROR,
-				'app' => 'sharebymail',
-			]);
-			$this->removeShareFromTable($shareId);
-			throw $hintException;
-		} catch (\Exception $e) {
-			$this->logger->logException($e, [
-				'message' => 'Failed to send share by mail.',
-				'level' => ILogger::ERROR,
-				'app' => 'sharebymail',
-			]);
-			$this->removeShareFromTable($shareId);
-			throw new HintException('Failed to send share by mail',
-				$this->l->t('Failed to send share by email'));
-		}
-
-		return $shareId;
-
-	}
-
-	/**
-	 * @param string $filename
-	 * @param string $link
-	 * @param string $initiator
-	 * @param string $shareWith
-	 * @param \DateTime|null $expiration
-	 * @throws \Exception If mail couldn't be sent
-	 */
-	protected function sendMailNotification($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('sharebymail.RecipientNotification', [
-			'filename' => $filename,
-			'link' => $link,
-			'initiator' => $initiatorDisplayName,
-			'expiration' => $expiration,
-			'shareWith' => $shareWith,
-		]);
-
-		$emailTemplate->setSubject($this->l->t('%1$s shared »%2$s« with you', [$initiatorDisplayName, $filename]));
-		$emailTemplate->addHeader();
-		$emailTemplate->addHeading($this->l->t('%1$s shared »%2$s« with you', [$initiatorDisplayName, $filename]), false);
-		$text = $this->l->t('%1$s shared »%2$s« with you.', [$initiatorDisplayName, $filename]);
-
-		$emailTemplate->addBodyText(
-			htmlspecialchars($text . ' ' . $this->l->t('Click the button below to open it.')),
-			$text
-		);
-		$emailTemplate->addBodyButton(
-			$this->l->t('Open »%s«', [$filename]),
-			$link
-		);
-
-		$message->setTo([$shareWith]);
-
-		// The "From" contains the sharers name
-		$instanceName = $this->defaults->getName();
-		$senderName = $this->l->t(
-			'%1$s via %2$s',
-			[
-				$initiatorDisplayName,
-				$instanceName
-			]
-		);
-		$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
-
-		// 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() !== '' ? ' - ' . $this->defaults->getSlogan() : ''));
-		} else {
-			$emailTemplate->addFooter();
-		}
-
-		$message->useTemplate($emailTemplate);
-		$this->mailer->send($message);
-	}
-
-	/**
-	 * send password to recipient of a mail share
-	 *
-	 * @param IShare $share
-	 * @param string $password
-	 * @return bool
-	 */
-	protected function sendPassword(IShare $share, $password) {
-
-		$filename = $share->getNode()->getName();
-		$initiator = $share->getSharedBy();
-		$shareWith = $share->getSharedWith();
-
-		if ($password === '' || $this->settingsManager->sendPasswordByMail() === false || $share->getSendPasswordByTalk()) {
-			return false;
-		}
-
-		$initiatorUser = $this->userManager->get($initiator);
-		$initiatorDisplayName = ($initiatorUser instanceof IUser) ? $initiatorUser->getDisplayName() : $initiator;
-		$initiatorEmailAddress = ($initiatorUser instanceof IUser) ? $initiatorUser->getEMailAddress() : null;
-
-		$plainBodyPart = $this->l->t("%1\$s shared »%2\$s« with you.\nYou should have already received a separate mail with a link to access it.\n", [$initiatorDisplayName, $filename]);
-		$htmlBodyPart = $this->l->t('%1$s shared »%2$s« with you. You should have already received a separate mail with a link to access it.', [$initiatorDisplayName, $filename]);
-
-		$message = $this->mailer->createMessage();
-
-		$emailTemplate = $this->mailer->createEMailTemplate('sharebymail.RecipientPasswordNotification', [
-			'filename' => $filename,
-			'password' => $password,
-			'initiator' => $initiatorDisplayName,
-			'initiatorEmail' => $initiatorEmailAddress,
-			'shareWith' => $shareWith,
-		]);
-
-		$emailTemplate->setSubject($this->l->t('Password to access »%1$s« shared to you by %2$s', [$filename, $initiatorDisplayName]));
-		$emailTemplate->addHeader();
-		$emailTemplate->addHeading($this->l->t('Password to access »%s«', [$filename]), false);
-		$emailTemplate->addBodyText(htmlspecialchars($htmlBodyPart), $plainBodyPart);
-		$emailTemplate->addBodyText($this->l->t('It is protected with the following password:'));
-		$emailTemplate->addBodyText($password);
-
-		// The "From" contains the sharers name
-		$instanceName = $this->defaults->getName();
-		$senderName = $this->l->t(
-			'%1$s via %2$s',
-			[
-				$initiatorDisplayName,
-				$instanceName
-			]
-		);
-		$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
-		if ($initiatorEmailAddress !== null) {
-			$message->setReplyTo([$initiatorEmailAddress => $initiatorDisplayName]);
-			$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
-		} else {
-			$emailTemplate->addFooter();
-		}
-
-		$message->setTo([$shareWith]);
-		$message->useTemplate($emailTemplate);
-		$this->mailer->send($message);
-
-		$this->createPasswordSendActivity($share, $shareWith, false);
-
-		return true;
-	}
-
-	protected function sendNote(IShare $share) {
-
-		$recipient = $share->getSharedWith();
-
-
-		$filename = $share->getNode()->getName();
-		$initiator = $share->getSharedBy();
-		$note = $share->getNote();
-
-		$initiatorUser = $this->userManager->get($initiator);
-		$initiatorDisplayName = ($initiatorUser instanceof IUser) ? $initiatorUser->getDisplayName() : $initiator;
-		$initiatorEmailAddress = ($initiatorUser instanceof IUser) ? $initiatorUser->getEMailAddress() : null;
-
-		$plainHeading = $this->l->t('%1$s shared »%2$s« with you and wants to add:', [$initiatorDisplayName, $filename]);
-		$htmlHeading = $this->l->t('%1$s shared »%2$s« with you and wants to add', [$initiatorDisplayName, $filename]);
-
-		$message = $this->mailer->createMessage();
-
-		$emailTemplate = $this->mailer->createEMailTemplate('shareByMail.sendNote');
-
-		$emailTemplate->setSubject($this->l->t('»%s« added a note to a file shared with you', [$initiatorDisplayName]));
-		$emailTemplate->addHeader();
-		$emailTemplate->addHeading(htmlspecialchars($htmlHeading), $plainHeading);
-		$emailTemplate->addBodyText(htmlspecialchars($note), $note);
-
-		$link = $this->urlGenerator->linkToRouteAbsolute('files_sharing.sharecontroller.showShare',
-			['token' => $share->getToken()]);
-		$emailTemplate->addBodyButton(
-			$this->l->t('Open »%s«', [$filename]),
-			$link
-		);
-
-		// The "From" contains the sharers name
-		$instanceName = $this->defaults->getName();
-		$senderName = $this->l->t(
-			'%1$s via %2$s',
-			[
-				$initiatorDisplayName,
-				$instanceName
-			]
-		);
-		$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
-		if ($initiatorEmailAddress !== null) {
-			$message->setReplyTo([$initiatorEmailAddress => $initiatorDisplayName]);
-			$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
-		} else {
-			$emailTemplate->addFooter();
-		}
-
-		$message->setTo([$recipient]);
-		$message->useTemplate($emailTemplate);
-		$this->mailer->send($message);
-
-	}
-
-	/**
-	 * send auto generated password to the owner. This happens if the admin enforces
-	 * a password for mail shares and forbid to send the password by mail to the recipient
-	 *
-	 * @param IShare $share
-	 * @param string $password
-	 * @return bool
-	 * @throws \Exception
-	 */
-	protected function sendPasswordToOwner(IShare $share, $password) {
-
-		$filename = $share->getNode()->getName();
-		$initiator = $this->userManager->get($share->getSharedBy());
-		$initiatorEMailAddress = ($initiator instanceof IUser) ? $initiator->getEMailAddress() : null;
-		$initiatorDisplayName = ($initiator instanceof IUser) ? $initiator->getDisplayName() : $share->getSharedBy();
-		$shareWith = $share->getSharedWith();
-
-		if ($initiatorEMailAddress === null) {
-			throw new \Exception(
-				$this->l->t("We can't send you the auto-generated password. Please set a valid email address in your personal settings and try again.")
-			);
-		}
-
-		$bodyPart = $this->l->t('You just shared »%1$s« with %2$s. The share was already sent to the recipient. Due to the security policies defined by the administrator of %3$s each share needs to be protected by password and it is not allowed to send the password directly to the recipient. Therefore you need to forward the password manually to the recipient.', [$filename, $shareWith, $this->defaults->getName()]);
-
-		$message = $this->mailer->createMessage();
-		$emailTemplate = $this->mailer->createEMailTemplate('sharebymail.OwnerPasswordNotification', [
-			'filename' => $filename,
-			'password' => $password,
-			'initiator' => $initiatorDisplayName,
-			'initiatorEmail' => $initiatorEMailAddress,
-			'shareWith' => $shareWith,
-		]);
-
-		$emailTemplate->setSubject($this->l->t('Password to access »%1$s« shared by you with %2$s', [$filename, $shareWith]));
-		$emailTemplate->addHeader();
-		$emailTemplate->addHeading($this->l->t('Password to access »%s«', [$filename]), false);
-		$emailTemplate->addBodyText($bodyPart);
-		$emailTemplate->addBodyText($this->l->t('This is the password:'));
-		$emailTemplate->addBodyText($password);
-		$emailTemplate->addBodyText($this->l->t('You can choose a different password at any time in the share dialog.'));
-		$emailTemplate->addFooter();
-
-		$instanceName = $this->defaults->getName();
-		$senderName = $this->l->t(
-			'%1$s via %2$s',
-			[
-				$initiatorDisplayName,
-				$instanceName
-			]
-		);
-		$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
-		$message->setTo([$initiatorEMailAddress => $initiatorDisplayName]);
-		$message->useTemplate($emailTemplate);
-		$this->mailer->send($message);
-
-		$this->createPasswordSendActivity($share, $shareWith, true);
-
-		return true;
-	}
-
-	/**
-	 * generate share token
-	 *
-	 * @return string
-	 */
-	protected function generateToken($size = 15) {
-		$token = $this->secureRandom->generate($size, ISecureRandom::CHAR_HUMAN_READABLE);
-		return $token;
-	}
-
-	/**
-	 * Get all children of this share
-	 *
-	 * @param IShare $parent
-	 * @return IShare[]
-	 */
-	public function getChildren(IShare $parent) {
-		$children = [];
-
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->select('*')
-			->from('share')
-			->where($qb->expr()->eq('parent', $qb->createNamedParameter($parent->getId())))
-			->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_EMAIL)))
-			->orderBy('id');
-
-		$cursor = $qb->execute();
-		while($data = $cursor->fetch()) {
-			$children[] = $this->createShareObject($data);
-		}
-		$cursor->closeCursor();
-
-		return $children;
-	}
-
-	/**
-	 * add share to the database and return the ID
-	 *
-	 * @param int $itemSource
-	 * @param string $itemType
-	 * @param string $shareWith
-	 * @param string $sharedBy
-	 * @param string $uidOwner
-	 * @param int $permissions
-	 * @param string $token
-	 * @param string $password
-	 * @param bool $sendPasswordByTalk
-	 * @param bool $hideDownload
-	 * @return int
-	 */
-	protected function addShareToDB($itemSource, $itemType, $shareWith, $sharedBy, $uidOwner, $permissions, $token, $password, $sendPasswordByTalk, $hideDownload) {
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->insert('share')
-			->setValue('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_EMAIL))
-			->setValue('item_type', $qb->createNamedParameter($itemType))
-			->setValue('item_source', $qb->createNamedParameter($itemSource))
-			->setValue('file_source', $qb->createNamedParameter($itemSource))
-			->setValue('share_with', $qb->createNamedParameter($shareWith))
-			->setValue('uid_owner', $qb->createNamedParameter($uidOwner))
-			->setValue('uid_initiator', $qb->createNamedParameter($sharedBy))
-			->setValue('permissions', $qb->createNamedParameter($permissions))
-			->setValue('token', $qb->createNamedParameter($token))
-			->setValue('password', $qb->createNamedParameter($password))
-			->setValue('password_by_talk', $qb->createNamedParameter($sendPasswordByTalk, IQueryBuilder::PARAM_BOOL))
-			->setValue('stime', $qb->createNamedParameter(time()))
-			->setValue('hide_download', $qb->createNamedParameter((int)$hideDownload, IQueryBuilder::PARAM_INT));
-
-		/*
+        $alreadyShared = $this->getSharedWith($shareWith, \OCP\Share::SHARE_TYPE_EMAIL, $share->getNode(), 1, 0);
+        if (!empty($alreadyShared)) {
+            $message = 'Sharing %1$s failed, this item is already shared with %2$s';
+            $message_t = $this->l->t('Sharing %1$s failed, this item is already shared with %2$s', [$share->getNode()->getName(), $shareWith]);
+            $this->logger->debug(sprintf($message, $share->getNode()->getName(), $shareWith), ['app' => 'Federated File Sharing']);
+            throw new \Exception($message_t);
+        }
+
+        // if the admin enforces a password for all mail shares we create a
+        // random password and send it to the recipient
+        $password = '';
+        $passwordEnforced = $this->settingsManager->enforcePasswordProtection();
+        if ($passwordEnforced) {
+            $password = $this->autoGeneratePassword($share);
+        }
+
+        $shareId = $this->createMailShare($share);
+        $send = $this->sendPassword($share, $password);
+        if ($passwordEnforced && $send === false) {
+            $this->sendPasswordToOwner($share, $password);
+        }
+
+        $this->createShareActivity($share);
+        $data = $this->getRawShare($shareId);
+
+        return $this->createShareObject($data);
+
+    }
+
+    /**
+     * auto generate password in case of password enforcement on mail shares
+     *
+     * @param IShare $share
+     * @return string
+     * @throws \Exception
+     */
+    protected function autoGeneratePassword($share) {
+        $initiatorUser = $this->userManager->get($share->getSharedBy());
+        $initiatorEMailAddress = ($initiatorUser instanceof IUser) ? $initiatorUser->getEMailAddress() : null;
+        $allowPasswordByMail = $this->settingsManager->sendPasswordByMail();
+
+        if ($initiatorEMailAddress === null && !$allowPasswordByMail) {
+            throw new \Exception(
+                $this->l->t("We can't send you the auto-generated password. Please set a valid email address in your personal settings and try again.")
+            );
+        }
+
+        $passwordPolicy = $this->getPasswordPolicy();
+        $passwordCharset = ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS;
+        $passwordLength = 8;
+        if (!empty($passwordPolicy)) {
+            $passwordLength = (int)$passwordPolicy['minLength'] > 0 ? (int)$passwordPolicy['minLength'] : $passwordLength;
+            $passwordCharset .= $passwordPolicy['enforceSpecialCharacters'] ? ISecureRandom::CHAR_SYMBOLS : '';
+        }
+
+        $password = $this->secureRandom->generate($passwordLength, $passwordCharset);
+
+        $share->setPassword($this->hasher->hash($password));
+
+        return $password;
+    }
+
+    /**
+     * get password policy
+     *
+     * @return array
+     */
+    protected function getPasswordPolicy() {
+        $capabilities = $this->capabilitiesManager->getCapabilities();
+        if (isset($capabilities['password_policy'])) {
+            return $capabilities['password_policy'];
+        }
+
+        return [];
+    }
+
+    /**
+     * create activity if a file/folder was shared by mail
+     *
+     * @param IShare $share
+     * @param string $type
+     */
+    protected function createShareActivity(IShare $share, string $type = 'share') {
+
+        $userFolder = $this->rootFolder->getUserFolder($share->getSharedBy());
+
+        $this->publishActivity(
+            $type === 'share' ? Activity::SUBJECT_SHARED_EMAIL_SELF : Activity::SUBJECT_UNSHARED_EMAIL_SELF,
+            [$userFolder->getRelativePath($share->getNode()->getPath()), $share->getSharedWith()],
+            $share->getSharedBy(),
+            $share->getNode()->getId(),
+            (string) $userFolder->getRelativePath($share->getNode()->getPath())
+        );
+
+        if ($share->getShareOwner() !== $share->getSharedBy()) {
+            $ownerFolder = $this->rootFolder->getUserFolder($share->getShareOwner());
+            $fileId = $share->getNode()->getId();
+            $nodes = $ownerFolder->getById($fileId);
+            $ownerPath = $nodes[0]->getPath();
+            $this->publishActivity(
+                $type === 'share' ? Activity::SUBJECT_SHARED_EMAIL_BY : Activity::SUBJECT_UNSHARED_EMAIL_BY,
+                [$ownerFolder->getRelativePath($ownerPath), $share->getSharedWith(), $share->getSharedBy()],
+                $share->getShareOwner(),
+                $fileId,
+                (string) $ownerFolder->getRelativePath($ownerPath)
+            );
+        }
+
+    }
+
+    /**
+     * create activity if a file/folder was shared by mail
+     *
+     * @param IShare $share
+     * @param string $sharedWith
+     * @param bool $sendToSelf
+     */
+    protected function createPasswordSendActivity(IShare $share, $sharedWith, $sendToSelf) {
+
+        $userFolder = $this->rootFolder->getUserFolder($share->getSharedBy());
+
+        if ($sendToSelf) {
+            $this->publishActivity(
+                Activity::SUBJECT_SHARED_EMAIL_PASSWORD_SEND_SELF,
+                [$userFolder->getRelativePath($share->getNode()->getPath())],
+                $share->getSharedBy(),
+                $share->getNode()->getId(),
+                (string) $userFolder->getRelativePath($share->getNode()->getPath())
+            );
+        } else {
+            $this->publishActivity(
+                Activity::SUBJECT_SHARED_EMAIL_PASSWORD_SEND,
+                [$userFolder->getRelativePath($share->getNode()->getPath()), $sharedWith],
+                $share->getSharedBy(),
+                $share->getNode()->getId(),
+                (string) $userFolder->getRelativePath($share->getNode()->getPath())
+            );
+        }
+    }
+
+
+    /**
+     * publish activity if a file/folder was shared by mail
+     *
+     * @param string $subject
+     * @param array $parameters
+     * @param string $affectedUser
+     * @param int $fileId
+     * @param string $filePath
+     */
+    protected function publishActivity(string $subject, array $parameters, string $affectedUser, int $fileId, string $filePath) {
+        $event = $this->activityManager->generateEvent();
+        $event->setApp('sharebymail')
+            ->setType('shared')
+            ->setSubject($subject, $parameters)
+            ->setAffectedUser($affectedUser)
+            ->setObject('files', $fileId, $filePath);
+        $this->activityManager->publish($event);
+
+    }
+
+    /**
+     * @param IShare $share
+     * @return int
+     * @throws \Exception
+     */
+    protected function createMailShare(IShare $share) {
+        $share->setToken($this->generateToken());
+        $shareId = $this->addShareToDB(
+            $share->getNodeId(),
+            $share->getNodeType(),
+            $share->getSharedWith(),
+            $share->getSharedBy(),
+            $share->getShareOwner(),
+            $share->getPermissions(),
+            $share->getToken(),
+            $share->getPassword(),
+            $share->getSendPasswordByTalk(),
+            $share->getHideDownload()
+        );
+
+        try {
+            $link = $this->urlGenerator->linkToRouteAbsolute('files_sharing.sharecontroller.showShare',
+                ['token' => $share->getToken()]);
+            $this->sendMailNotification(
+                $share->getNode()->getName(),
+                $link,
+                $share->getSharedBy(),
+                $share->getSharedWith(),
+                $share->getExpirationDate()
+            );
+        } catch (HintException $hintException) {
+            $this->logger->logException($hintException, [
+                'message' => 'Failed to send share by mail.',
+                'level' => ILogger::ERROR,
+                'app' => 'sharebymail',
+            ]);
+            $this->removeShareFromTable($shareId);
+            throw $hintException;
+        } catch (\Exception $e) {
+            $this->logger->logException($e, [
+                'message' => 'Failed to send share by mail.',
+                'level' => ILogger::ERROR,
+                'app' => 'sharebymail',
+            ]);
+            $this->removeShareFromTable($shareId);
+            throw new HintException('Failed to send share by mail',
+                $this->l->t('Failed to send share by email'));
+        }
+
+        return $shareId;
+
+    }
+
+    /**
+     * @param string $filename
+     * @param string $link
+     * @param string $initiator
+     * @param string $shareWith
+     * @param \DateTime|null $expiration
+     * @throws \Exception If mail couldn't be sent
+     */
+    protected function sendMailNotification($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('sharebymail.RecipientNotification', [
+            'filename' => $filename,
+            'link' => $link,
+            'initiator' => $initiatorDisplayName,
+            'expiration' => $expiration,
+            'shareWith' => $shareWith,
+        ]);
+
+        $emailTemplate->setSubject($this->l->t('%1$s shared »%2$s« with you', [$initiatorDisplayName, $filename]));
+        $emailTemplate->addHeader();
+        $emailTemplate->addHeading($this->l->t('%1$s shared »%2$s« with you', [$initiatorDisplayName, $filename]), false);
+        $text = $this->l->t('%1$s shared »%2$s« with you.', [$initiatorDisplayName, $filename]);
+
+        $emailTemplate->addBodyText(
+            htmlspecialchars($text . ' ' . $this->l->t('Click the button below to open it.')),
+            $text
+        );
+        $emailTemplate->addBodyButton(
+            $this->l->t('Open »%s«', [$filename]),
+            $link
+        );
+
+        $message->setTo([$shareWith]);
+
+        // The "From" contains the sharers name
+        $instanceName = $this->defaults->getName();
+        $senderName = $this->l->t(
+            '%1$s via %2$s',
+            [
+                $initiatorDisplayName,
+                $instanceName
+            ]
+        );
+        $message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
+
+        // 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() !== '' ? ' - ' . $this->defaults->getSlogan() : ''));
+        } else {
+            $emailTemplate->addFooter();
+        }
+
+        $message->useTemplate($emailTemplate);
+        $this->mailer->send($message);
+    }
+
+    /**
+     * send password to recipient of a mail share
+     *
+     * @param IShare $share
+     * @param string $password
+     * @return bool
+     */
+    protected function sendPassword(IShare $share, $password) {
+
+        $filename = $share->getNode()->getName();
+        $initiator = $share->getSharedBy();
+        $shareWith = $share->getSharedWith();
+
+        if ($password === '' || $this->settingsManager->sendPasswordByMail() === false || $share->getSendPasswordByTalk()) {
+            return false;
+        }
+
+        $initiatorUser = $this->userManager->get($initiator);
+        $initiatorDisplayName = ($initiatorUser instanceof IUser) ? $initiatorUser->getDisplayName() : $initiator;
+        $initiatorEmailAddress = ($initiatorUser instanceof IUser) ? $initiatorUser->getEMailAddress() : null;
+
+        $plainBodyPart = $this->l->t("%1\$s shared »%2\$s« with you.\nYou should have already received a separate mail with a link to access it.\n", [$initiatorDisplayName, $filename]);
+        $htmlBodyPart = $this->l->t('%1$s shared »%2$s« with you. You should have already received a separate mail with a link to access it.', [$initiatorDisplayName, $filename]);
+
+        $message = $this->mailer->createMessage();
+
+        $emailTemplate = $this->mailer->createEMailTemplate('sharebymail.RecipientPasswordNotification', [
+            'filename' => $filename,
+            'password' => $password,
+            'initiator' => $initiatorDisplayName,
+            'initiatorEmail' => $initiatorEmailAddress,
+            'shareWith' => $shareWith,
+        ]);
+
+        $emailTemplate->setSubject($this->l->t('Password to access »%1$s« shared to you by %2$s', [$filename, $initiatorDisplayName]));
+        $emailTemplate->addHeader();
+        $emailTemplate->addHeading($this->l->t('Password to access »%s«', [$filename]), false);
+        $emailTemplate->addBodyText(htmlspecialchars($htmlBodyPart), $plainBodyPart);
+        $emailTemplate->addBodyText($this->l->t('It is protected with the following password:'));
+        $emailTemplate->addBodyText($password);
+
+        // The "From" contains the sharers name
+        $instanceName = $this->defaults->getName();
+        $senderName = $this->l->t(
+            '%1$s via %2$s',
+            [
+                $initiatorDisplayName,
+                $instanceName
+            ]
+        );
+        $message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
+        if ($initiatorEmailAddress !== null) {
+            $message->setReplyTo([$initiatorEmailAddress => $initiatorDisplayName]);
+            $emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
+        } else {
+            $emailTemplate->addFooter();
+        }
+
+        $message->setTo([$shareWith]);
+        $message->useTemplate($emailTemplate);
+        $this->mailer->send($message);
+
+        $this->createPasswordSendActivity($share, $shareWith, false);
+
+        return true;
+    }
+
+    protected function sendNote(IShare $share) {
+
+        $recipient = $share->getSharedWith();
+
+
+        $filename = $share->getNode()->getName();
+        $initiator = $share->getSharedBy();
+        $note = $share->getNote();
+
+        $initiatorUser = $this->userManager->get($initiator);
+        $initiatorDisplayName = ($initiatorUser instanceof IUser) ? $initiatorUser->getDisplayName() : $initiator;
+        $initiatorEmailAddress = ($initiatorUser instanceof IUser) ? $initiatorUser->getEMailAddress() : null;
+
+        $plainHeading = $this->l->t('%1$s shared »%2$s« with you and wants to add:', [$initiatorDisplayName, $filename]);
+        $htmlHeading = $this->l->t('%1$s shared »%2$s« with you and wants to add', [$initiatorDisplayName, $filename]);
+
+        $message = $this->mailer->createMessage();
+
+        $emailTemplate = $this->mailer->createEMailTemplate('shareByMail.sendNote');
+
+        $emailTemplate->setSubject($this->l->t('»%s« added a note to a file shared with you', [$initiatorDisplayName]));
+        $emailTemplate->addHeader();
+        $emailTemplate->addHeading(htmlspecialchars($htmlHeading), $plainHeading);
+        $emailTemplate->addBodyText(htmlspecialchars($note), $note);
+
+        $link = $this->urlGenerator->linkToRouteAbsolute('files_sharing.sharecontroller.showShare',
+            ['token' => $share->getToken()]);
+        $emailTemplate->addBodyButton(
+            $this->l->t('Open »%s«', [$filename]),
+            $link
+        );
+
+        // The "From" contains the sharers name
+        $instanceName = $this->defaults->getName();
+        $senderName = $this->l->t(
+            '%1$s via %2$s',
+            [
+                $initiatorDisplayName,
+                $instanceName
+            ]
+        );
+        $message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
+        if ($initiatorEmailAddress !== null) {
+            $message->setReplyTo([$initiatorEmailAddress => $initiatorDisplayName]);
+            $emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
+        } else {
+            $emailTemplate->addFooter();
+        }
+
+        $message->setTo([$recipient]);
+        $message->useTemplate($emailTemplate);
+        $this->mailer->send($message);
+
+    }
+
+    /**
+     * send auto generated password to the owner. This happens if the admin enforces
+     * a password for mail shares and forbid to send the password by mail to the recipient
+     *
+     * @param IShare $share
+     * @param string $password
+     * @return bool
+     * @throws \Exception
+     */
+    protected function sendPasswordToOwner(IShare $share, $password) {
+
+        $filename = $share->getNode()->getName();
+        $initiator = $this->userManager->get($share->getSharedBy());
+        $initiatorEMailAddress = ($initiator instanceof IUser) ? $initiator->getEMailAddress() : null;
+        $initiatorDisplayName = ($initiator instanceof IUser) ? $initiator->getDisplayName() : $share->getSharedBy();
+        $shareWith = $share->getSharedWith();
+
+        if ($initiatorEMailAddress === null) {
+            throw new \Exception(
+                $this->l->t("We can't send you the auto-generated password. Please set a valid email address in your personal settings and try again.")
+            );
+        }
+
+        $bodyPart = $this->l->t('You just shared »%1$s« with %2$s. The share was already sent to the recipient. Due to the security policies defined by the administrator of %3$s each share needs to be protected by password and it is not allowed to send the password directly to the recipient. Therefore you need to forward the password manually to the recipient.', [$filename, $shareWith, $this->defaults->getName()]);
+
+        $message = $this->mailer->createMessage();
+        $emailTemplate = $this->mailer->createEMailTemplate('sharebymail.OwnerPasswordNotification', [
+            'filename' => $filename,
+            'password' => $password,
+            'initiator' => $initiatorDisplayName,
+            'initiatorEmail' => $initiatorEMailAddress,
+            'shareWith' => $shareWith,
+        ]);
+
+        $emailTemplate->setSubject($this->l->t('Password to access »%1$s« shared by you with %2$s', [$filename, $shareWith]));
+        $emailTemplate->addHeader();
+        $emailTemplate->addHeading($this->l->t('Password to access »%s«', [$filename]), false);
+        $emailTemplate->addBodyText($bodyPart);
+        $emailTemplate->addBodyText($this->l->t('This is the password:'));
+        $emailTemplate->addBodyText($password);
+        $emailTemplate->addBodyText($this->l->t('You can choose a different password at any time in the share dialog.'));
+        $emailTemplate->addFooter();
+
+        $instanceName = $this->defaults->getName();
+        $senderName = $this->l->t(
+            '%1$s via %2$s',
+            [
+                $initiatorDisplayName,
+                $instanceName
+            ]
+        );
+        $message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
+        $message->setTo([$initiatorEMailAddress => $initiatorDisplayName]);
+        $message->useTemplate($emailTemplate);
+        $this->mailer->send($message);
+
+        $this->createPasswordSendActivity($share, $shareWith, true);
+
+        return true;
+    }
+
+    /**
+     * generate share token
+     *
+     * @return string
+     */
+    protected function generateToken($size = 15) {
+        $token = $this->secureRandom->generate($size, ISecureRandom::CHAR_HUMAN_READABLE);
+        return $token;
+    }
+
+    /**
+     * Get all children of this share
+     *
+     * @param IShare $parent
+     * @return IShare[]
+     */
+    public function getChildren(IShare $parent) {
+        $children = [];
+
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->select('*')
+            ->from('share')
+            ->where($qb->expr()->eq('parent', $qb->createNamedParameter($parent->getId())))
+            ->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_EMAIL)))
+            ->orderBy('id');
+
+        $cursor = $qb->execute();
+        while($data = $cursor->fetch()) {
+            $children[] = $this->createShareObject($data);
+        }
+        $cursor->closeCursor();
+
+        return $children;
+    }
+
+    /**
+     * add share to the database and return the ID
+     *
+     * @param int $itemSource
+     * @param string $itemType
+     * @param string $shareWith
+     * @param string $sharedBy
+     * @param string $uidOwner
+     * @param int $permissions
+     * @param string $token
+     * @param string $password
+     * @param bool $sendPasswordByTalk
+     * @param bool $hideDownload
+     * @return int
+     */
+    protected function addShareToDB($itemSource, $itemType, $shareWith, $sharedBy, $uidOwner, $permissions, $token, $password, $sendPasswordByTalk, $hideDownload) {
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->insert('share')
+            ->setValue('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_EMAIL))
+            ->setValue('item_type', $qb->createNamedParameter($itemType))
+            ->setValue('item_source', $qb->createNamedParameter($itemSource))
+            ->setValue('file_source', $qb->createNamedParameter($itemSource))
+            ->setValue('share_with', $qb->createNamedParameter($shareWith))
+            ->setValue('uid_owner', $qb->createNamedParameter($uidOwner))
+            ->setValue('uid_initiator', $qb->createNamedParameter($sharedBy))
+            ->setValue('permissions', $qb->createNamedParameter($permissions))
+            ->setValue('token', $qb->createNamedParameter($token))
+            ->setValue('password', $qb->createNamedParameter($password))
+            ->setValue('password_by_talk', $qb->createNamedParameter($sendPasswordByTalk, IQueryBuilder::PARAM_BOOL))
+            ->setValue('stime', $qb->createNamedParameter(time()))
+            ->setValue('hide_download', $qb->createNamedParameter((int)$hideDownload, IQueryBuilder::PARAM_INT));
+
+        /*
 		 * Added to fix https://github.com/owncloud/core/issues/22215
 		 * Can be removed once we get rid of ajax/share.php
 		 */
-		$qb->setValue('file_target', $qb->createNamedParameter(''));
+        $qb->setValue('file_target', $qb->createNamedParameter(''));
 
-		$qb->execute();
-		$id = $qb->getLastInsertId();
+        $qb->execute();
+        $id = $qb->getLastInsertId();
 
-		return (int)$id;
-	}
+        return (int)$id;
+    }
 
-	/**
-	 * Update a share
-	 *
-	 * @param IShare $share
-	 * @param string|null $plainTextPassword
-	 * @return IShare The share object
-	 */
-	public function update(IShare $share, $plainTextPassword = null) {
+    /**
+     * Update a share
+     *
+     * @param IShare $share
+     * @param string|null $plainTextPassword
+     * @return IShare The share object
+     */
+    public function update(IShare $share, $plainTextPassword = null) {
 
-		$originalShare = $this->getShareById($share->getId());
+        $originalShare = $this->getShareById($share->getId());
 
-		// a real password was given
-		$validPassword = $plainTextPassword !== null && $plainTextPassword !== '';
+        // a real password was given
+        $validPassword = $plainTextPassword !== null && $plainTextPassword !== '';
 
-		if($validPassword && ($originalShare->getPassword() !== $share->getPassword() ||
-								($originalShare->getSendPasswordByTalk() && !$share->getSendPasswordByTalk()))) {
-			$this->sendPassword($share, $plainTextPassword);
-		}
-		/*
+        if($validPassword && ($originalShare->getPassword() !== $share->getPassword() ||
+                                ($originalShare->getSendPasswordByTalk() && !$share->getSendPasswordByTalk()))) {
+            $this->sendPassword($share, $plainTextPassword);
+        }
+        /*
 		 * We allow updating the permissions and password of mail shares
 		 */
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->update('share')
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
-			->set('permissions', $qb->createNamedParameter($share->getPermissions()))
-			->set('uid_owner', $qb->createNamedParameter($share->getShareOwner()))
-			->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy()))
-			->set('password', $qb->createNamedParameter($share->getPassword()))
-			->set('password_by_talk', $qb->createNamedParameter($share->getSendPasswordByTalk(), IQueryBuilder::PARAM_BOOL))
-			->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATE))
-			->set('note', $qb->createNamedParameter($share->getNote()))
-			->set('hide_download', $qb->createNamedParameter((int)$share->getHideDownload(), IQueryBuilder::PARAM_INT))
-			->execute();
-
-		if ($originalShare->getNote() !== $share->getNote() && $share->getNote() !== '') {
-			$this->sendNote($share);
-		}
-
-		return $share;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function move(IShare $share, $recipient) {
-		/**
-		 * nothing to do here, mail shares are only outgoing shares
-		 */
-		return $share;
-	}
-
-	/**
-	 * Delete a share (owner unShares the file)
-	 *
-	 * @param IShare $share
-	 */
-	public function delete(IShare $share) {
-		try {
-			$this->createShareActivity($share, 'unshare');
-		} catch (\Exception $e) {
-		}
-
-		$this->removeShareFromTable($share->getId());
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function deleteFromSelf(IShare $share, $recipient) {
-		// nothing to do here, mail shares are only outgoing shares
-	}
-
-	public function restore(IShare $share, string $recipient): IShare {
-		throw new GenericShareException('not implemented');
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getSharesBy($userId, $shareType, $node, $reshares, $limit, $offset) {
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->select('*')
-			->from('share');
-
-		$qb->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_EMAIL)));
-
-		/**
-		 * Reshares for this user are shares where they are the owner.
-		 */
-		if ($reshares === false) {
-			//Special case for old shares created via the web UI
-			$or1 = $qb->expr()->andX(
-				$qb->expr()->eq('uid_owner', $qb->createNamedParameter($userId)),
-				$qb->expr()->isNull('uid_initiator')
-			);
-
-			$qb->andWhere(
-				$qb->expr()->orX(
-					$qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId)),
-					$or1
-				)
-			);
-		} else {
-			$qb->andWhere(
-				$qb->expr()->orX(
-					$qb->expr()->eq('uid_owner', $qb->createNamedParameter($userId)),
-					$qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId))
-				)
-			);
-		}
-
-		if ($node !== null) {
-			$qb->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($node->getId())));
-		}
-
-		if ($limit !== -1) {
-			$qb->setMaxResults($limit);
-		}
-
-		$qb->setFirstResult($offset);
-		$qb->orderBy('id');
-
-		$cursor = $qb->execute();
-		$shares = [];
-		while($data = $cursor->fetch()) {
-			$shares[] = $this->createShareObject($data);
-		}
-		$cursor->closeCursor();
-
-		return $shares;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getShareById($id, $recipientId = null) {
-		$qb = $this->dbConnection->getQueryBuilder();
-
-		$qb->select('*')
-			->from('share')
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
-			->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_EMAIL)));
-
-		$cursor = $qb->execute();
-		$data = $cursor->fetch();
-		$cursor->closeCursor();
-
-		if ($data === false) {
-			throw new ShareNotFound();
-		}
-
-		try {
-			$share = $this->createShareObject($data);
-		} catch (InvalidShare $e) {
-			throw new ShareNotFound();
-		}
-
-		return $share;
-	}
-
-	/**
-	 * Get shares for a given path
-	 *
-	 * @param \OCP\Files\Node $path
-	 * @return IShare[]
-	 */
-	public function getSharesByPath(Node $path) {
-		$qb = $this->dbConnection->getQueryBuilder();
-
-		$cursor = $qb->select('*')
-			->from('share')
-			->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($path->getId())))
-			->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_EMAIL)))
-			->execute();
-
-		$shares = [];
-		while($data = $cursor->fetch()) {
-			$shares[] = $this->createShareObject($data);
-		}
-		$cursor->closeCursor();
-
-		return $shares;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getSharedWith($userId, $shareType, $node, $limit, $offset) {
-		/** @var IShare[] $shares */
-		$shares = [];
-
-		//Get shares directly with this user
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->select('*')
-			->from('share');
-
-		// Order by id
-		$qb->orderBy('id');
-
-		// Set limit and offset
-		if ($limit !== -1) {
-			$qb->setMaxResults($limit);
-		}
-		$qb->setFirstResult($offset);
-
-		$qb->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_EMAIL)));
-		$qb->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($userId)));
-
-		// Filter by node if provided
-		if ($node !== null) {
-			$qb->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($node->getId())));
-		}
-
-		$cursor = $qb->execute();
-
-		while($data = $cursor->fetch()) {
-			$shares[] = $this->createShareObject($data);
-		}
-		$cursor->closeCursor();
-
-
-		return $shares;
-	}
-
-	/**
-	 * Get a share by token
-	 *
-	 * @param string $token
-	 * @return IShare
-	 * @throws ShareNotFound
-	 */
-	public function getShareByToken($token) {
-		$qb = $this->dbConnection->getQueryBuilder();
-
-		$cursor = $qb->select('*')
-			->from('share')
-			->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_EMAIL)))
-			->andWhere($qb->expr()->eq('token', $qb->createNamedParameter($token)))
-			->execute();
-
-		$data = $cursor->fetch();
-
-		if ($data === false) {
-			throw new ShareNotFound('Share not found', $this->l->t('Could not find share'));
-		}
-
-		try {
-			$share = $this->createShareObject($data);
-		} catch (InvalidShare $e) {
-			throw new ShareNotFound('Share not found', $this->l->t('Could not find share'));
-		}
-
-		return $share;
-	}
-
-	/**
-	 * remove share from table
-	 *
-	 * @param string $shareId
-	 */
-	protected function removeShareFromTable($shareId) {
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->delete('share')
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($shareId)));
-		$qb->execute();
-	}
-
-	/**
-	 * Create a share object from an database row
-	 *
-	 * @param array $data
-	 * @return IShare
-	 * @throws InvalidShare
-	 * @throws ShareNotFound
-	 */
-	protected function createShareObject($data) {
-
-		$share = new Share($this->rootFolder, $this->userManager);
-		$share->setId((int)$data['id'])
-			->setShareType((int)$data['share_type'])
-			->setPermissions((int)$data['permissions'])
-			->setTarget($data['file_target'])
-			->setMailSend((bool)$data['mail_send'])
-			->setNote($data['note'])
-			->setToken($data['token']);
-
-		$shareTime = new \DateTime();
-		$shareTime->setTimestamp((int)$data['stime']);
-		$share->setShareTime($shareTime);
-		$share->setSharedWith($data['share_with']);
-		$share->setPassword($data['password']);
-		$share->setSendPasswordByTalk((bool)$data['password_by_talk']);
-		$share->setHideDownload((bool)$data['hide_download']);
-
-		if ($data['uid_initiator'] !== null) {
-			$share->setShareOwner($data['uid_owner']);
-			$share->setSharedBy($data['uid_initiator']);
-		} else {
-			//OLD SHARE
-			$share->setSharedBy($data['uid_owner']);
-			$path = $this->getNode($share->getSharedBy(), (int)$data['file_source']);
-
-			$owner = $path->getOwner();
-			$share->setShareOwner($owner->getUID());
-		}
-
-		if ($data['expiration'] !== null) {
-			$expiration = \DateTime::createFromFormat('Y-m-d H:i:s', $data['expiration']);
-			if ($expiration !== false) {
-				$share->setExpirationDate($expiration);
-			}
-		}
-
-		$share->setNodeId((int)$data['file_source']);
-		$share->setNodeType($data['item_type']);
-
-		$share->setProviderId($this->identifier());
-
-		return $share;
-	}
-
-	/**
-	 * Get the node with file $id for $user
-	 *
-	 * @param string $userId
-	 * @param int $id
-	 * @return \OCP\Files\File|\OCP\Files\Folder
-	 * @throws InvalidShare
-	 */
-	private function getNode($userId, $id) {
-		try {
-			$userFolder = $this->rootFolder->getUserFolder($userId);
-		} catch (NoUserException $e) {
-			throw new InvalidShare();
-		}
-
-		$nodes = $userFolder->getById($id);
-
-		if (empty($nodes)) {
-			throw new InvalidShare();
-		}
-
-		return $nodes[0];
-	}
-
-	/**
-	 * A user is deleted from the system
-	 * So clean up the relevant shares.
-	 *
-	 * @param string $uid
-	 * @param int $shareType
-	 */
-	public function userDeleted($uid, $shareType) {
-		$qb = $this->dbConnection->getQueryBuilder();
-
-		$qb->delete('share')
-			->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_EMAIL)))
-			->andWhere($qb->expr()->eq('uid_owner', $qb->createNamedParameter($uid)))
-			->execute();
-	}
-
-	/**
-	 * This provider does not support group shares
-	 *
-	 * @param string $gid
-	 */
-	public function groupDeleted($gid) {
-	}
-
-	/**
-	 * This provider does not support group shares
-	 *
-	 * @param string $uid
-	 * @param string $gid
-	 */
-	public function userDeletedFromGroup($uid, $gid) {
-	}
-
-	/**
-	 * get database row of a give share
-	 *
-	 * @param $id
-	 * @return array
-	 * @throws ShareNotFound
-	 */
-	protected function getRawShare($id) {
-
-		// Now fetch the inserted share and create a complete share object
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->select('*')
-			->from('share')
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($id)));
-
-		$cursor = $qb->execute();
-		$data = $cursor->fetch();
-		$cursor->closeCursor();
-
-		if ($data === false) {
-			throw new ShareNotFound;
-		}
-
-		return $data;
-	}
-
-	public function getSharesInFolder($userId, Folder $node, $reshares) {
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->select('*')
-			->from('share', 's')
-			->andWhere($qb->expr()->orX(
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
-			))
-			->andWhere(
-				$qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_EMAIL))
-			);
-
-		/**
-		 * Reshares for this user are shares where they are the owner.
-		 */
-		if ($reshares === false) {
-			$qb->andWhere($qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId)));
-		} else {
-			$qb->andWhere(
-				$qb->expr()->orX(
-					$qb->expr()->eq('uid_owner', $qb->createNamedParameter($userId)),
-					$qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId))
-				)
-			);
-		}
-
-		$qb->innerJoin('s', 'filecache' ,'f', $qb->expr()->eq('s.file_source', 'f.fileid'));
-		$qb->andWhere($qb->expr()->eq('f.parent', $qb->createNamedParameter($node->getId())));
-
-		$qb->orderBy('id');
-
-		$cursor = $qb->execute();
-		$shares = [];
-		while ($data = $cursor->fetch()) {
-			$shares[$data['fileid']][] = $this->createShareObject($data);
-		}
-		$cursor->closeCursor();
-
-		return $shares;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getAccessList($nodes, $currentAccess) {
-		$ids = [];
-		foreach ($nodes as $node) {
-			$ids[] = $node->getId();
-		}
-
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb->select('share_with')
-			->from('share')
-			->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_EMAIL)))
-			->andWhere($qb->expr()->in('file_source', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)))
-			->andWhere($qb->expr()->orX(
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
-			))
-			->setMaxResults(1);
-		$cursor = $qb->execute();
-
-		$mail = $cursor->fetch() !== false;
-		$cursor->closeCursor();
-
-		return ['public' => $mail];
-	}
-
-	public function getAllShares(): iterable {
-		$qb = $this->dbConnection->getQueryBuilder();
-
-		$qb->select('*')
-			->from('share')
-			->where(
-				$qb->expr()->orX(
-					$qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share\IShare::TYPE_EMAIL))
-				)
-			);
-
-		$cursor = $qb->execute();
-		while($data = $cursor->fetch()) {
-			try {
-				$share = $this->createShareObject($data);
-			} catch (InvalidShare $e) {
-				continue;
-			} catch (ShareNotFound $e) {
-				continue;
-			}
-
-			yield $share;
-		}
-		$cursor->closeCursor();
-	}
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->update('share')
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($share->getId())))
+            ->set('permissions', $qb->createNamedParameter($share->getPermissions()))
+            ->set('uid_owner', $qb->createNamedParameter($share->getShareOwner()))
+            ->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy()))
+            ->set('password', $qb->createNamedParameter($share->getPassword()))
+            ->set('password_by_talk', $qb->createNamedParameter($share->getSendPasswordByTalk(), IQueryBuilder::PARAM_BOOL))
+            ->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATE))
+            ->set('note', $qb->createNamedParameter($share->getNote()))
+            ->set('hide_download', $qb->createNamedParameter((int)$share->getHideDownload(), IQueryBuilder::PARAM_INT))
+            ->execute();
+
+        if ($originalShare->getNote() !== $share->getNote() && $share->getNote() !== '') {
+            $this->sendNote($share);
+        }
+
+        return $share;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function move(IShare $share, $recipient) {
+        /**
+         * nothing to do here, mail shares are only outgoing shares
+         */
+        return $share;
+    }
+
+    /**
+     * Delete a share (owner unShares the file)
+     *
+     * @param IShare $share
+     */
+    public function delete(IShare $share) {
+        try {
+            $this->createShareActivity($share, 'unshare');
+        } catch (\Exception $e) {
+        }
+
+        $this->removeShareFromTable($share->getId());
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function deleteFromSelf(IShare $share, $recipient) {
+        // nothing to do here, mail shares are only outgoing shares
+    }
+
+    public function restore(IShare $share, string $recipient): IShare {
+        throw new GenericShareException('not implemented');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSharesBy($userId, $shareType, $node, $reshares, $limit, $offset) {
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->select('*')
+            ->from('share');
+
+        $qb->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_EMAIL)));
+
+        /**
+         * Reshares for this user are shares where they are the owner.
+         */
+        if ($reshares === false) {
+            //Special case for old shares created via the web UI
+            $or1 = $qb->expr()->andX(
+                $qb->expr()->eq('uid_owner', $qb->createNamedParameter($userId)),
+                $qb->expr()->isNull('uid_initiator')
+            );
+
+            $qb->andWhere(
+                $qb->expr()->orX(
+                    $qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId)),
+                    $or1
+                )
+            );
+        } else {
+            $qb->andWhere(
+                $qb->expr()->orX(
+                    $qb->expr()->eq('uid_owner', $qb->createNamedParameter($userId)),
+                    $qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId))
+                )
+            );
+        }
+
+        if ($node !== null) {
+            $qb->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($node->getId())));
+        }
+
+        if ($limit !== -1) {
+            $qb->setMaxResults($limit);
+        }
+
+        $qb->setFirstResult($offset);
+        $qb->orderBy('id');
+
+        $cursor = $qb->execute();
+        $shares = [];
+        while($data = $cursor->fetch()) {
+            $shares[] = $this->createShareObject($data);
+        }
+        $cursor->closeCursor();
+
+        return $shares;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getShareById($id, $recipientId = null) {
+        $qb = $this->dbConnection->getQueryBuilder();
+
+        $qb->select('*')
+            ->from('share')
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
+            ->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_EMAIL)));
+
+        $cursor = $qb->execute();
+        $data = $cursor->fetch();
+        $cursor->closeCursor();
+
+        if ($data === false) {
+            throw new ShareNotFound();
+        }
+
+        try {
+            $share = $this->createShareObject($data);
+        } catch (InvalidShare $e) {
+            throw new ShareNotFound();
+        }
+
+        return $share;
+    }
+
+    /**
+     * Get shares for a given path
+     *
+     * @param \OCP\Files\Node $path
+     * @return IShare[]
+     */
+    public function getSharesByPath(Node $path) {
+        $qb = $this->dbConnection->getQueryBuilder();
+
+        $cursor = $qb->select('*')
+            ->from('share')
+            ->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($path->getId())))
+            ->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_EMAIL)))
+            ->execute();
+
+        $shares = [];
+        while($data = $cursor->fetch()) {
+            $shares[] = $this->createShareObject($data);
+        }
+        $cursor->closeCursor();
+
+        return $shares;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSharedWith($userId, $shareType, $node, $limit, $offset) {
+        /** @var IShare[] $shares */
+        $shares = [];
+
+        //Get shares directly with this user
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->select('*')
+            ->from('share');
+
+        // Order by id
+        $qb->orderBy('id');
+
+        // Set limit and offset
+        if ($limit !== -1) {
+            $qb->setMaxResults($limit);
+        }
+        $qb->setFirstResult($offset);
+
+        $qb->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_EMAIL)));
+        $qb->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($userId)));
+
+        // Filter by node if provided
+        if ($node !== null) {
+            $qb->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($node->getId())));
+        }
+
+        $cursor = $qb->execute();
+
+        while($data = $cursor->fetch()) {
+            $shares[] = $this->createShareObject($data);
+        }
+        $cursor->closeCursor();
+
+
+        return $shares;
+    }
+
+    /**
+     * Get a share by token
+     *
+     * @param string $token
+     * @return IShare
+     * @throws ShareNotFound
+     */
+    public function getShareByToken($token) {
+        $qb = $this->dbConnection->getQueryBuilder();
+
+        $cursor = $qb->select('*')
+            ->from('share')
+            ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_EMAIL)))
+            ->andWhere($qb->expr()->eq('token', $qb->createNamedParameter($token)))
+            ->execute();
+
+        $data = $cursor->fetch();
+
+        if ($data === false) {
+            throw new ShareNotFound('Share not found', $this->l->t('Could not find share'));
+        }
+
+        try {
+            $share = $this->createShareObject($data);
+        } catch (InvalidShare $e) {
+            throw new ShareNotFound('Share not found', $this->l->t('Could not find share'));
+        }
+
+        return $share;
+    }
+
+    /**
+     * remove share from table
+     *
+     * @param string $shareId
+     */
+    protected function removeShareFromTable($shareId) {
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->delete('share')
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($shareId)));
+        $qb->execute();
+    }
+
+    /**
+     * Create a share object from an database row
+     *
+     * @param array $data
+     * @return IShare
+     * @throws InvalidShare
+     * @throws ShareNotFound
+     */
+    protected function createShareObject($data) {
+
+        $share = new Share($this->rootFolder, $this->userManager);
+        $share->setId((int)$data['id'])
+            ->setShareType((int)$data['share_type'])
+            ->setPermissions((int)$data['permissions'])
+            ->setTarget($data['file_target'])
+            ->setMailSend((bool)$data['mail_send'])
+            ->setNote($data['note'])
+            ->setToken($data['token']);
+
+        $shareTime = new \DateTime();
+        $shareTime->setTimestamp((int)$data['stime']);
+        $share->setShareTime($shareTime);
+        $share->setSharedWith($data['share_with']);
+        $share->setPassword($data['password']);
+        $share->setSendPasswordByTalk((bool)$data['password_by_talk']);
+        $share->setHideDownload((bool)$data['hide_download']);
+
+        if ($data['uid_initiator'] !== null) {
+            $share->setShareOwner($data['uid_owner']);
+            $share->setSharedBy($data['uid_initiator']);
+        } else {
+            //OLD SHARE
+            $share->setSharedBy($data['uid_owner']);
+            $path = $this->getNode($share->getSharedBy(), (int)$data['file_source']);
+
+            $owner = $path->getOwner();
+            $share->setShareOwner($owner->getUID());
+        }
+
+        if ($data['expiration'] !== null) {
+            $expiration = \DateTime::createFromFormat('Y-m-d H:i:s', $data['expiration']);
+            if ($expiration !== false) {
+                $share->setExpirationDate($expiration);
+            }
+        }
+
+        $share->setNodeId((int)$data['file_source']);
+        $share->setNodeType($data['item_type']);
+
+        $share->setProviderId($this->identifier());
+
+        return $share;
+    }
+
+    /**
+     * Get the node with file $id for $user
+     *
+     * @param string $userId
+     * @param int $id
+     * @return \OCP\Files\File|\OCP\Files\Folder
+     * @throws InvalidShare
+     */
+    private function getNode($userId, $id) {
+        try {
+            $userFolder = $this->rootFolder->getUserFolder($userId);
+        } catch (NoUserException $e) {
+            throw new InvalidShare();
+        }
+
+        $nodes = $userFolder->getById($id);
+
+        if (empty($nodes)) {
+            throw new InvalidShare();
+        }
+
+        return $nodes[0];
+    }
+
+    /**
+     * A user is deleted from the system
+     * So clean up the relevant shares.
+     *
+     * @param string $uid
+     * @param int $shareType
+     */
+    public function userDeleted($uid, $shareType) {
+        $qb = $this->dbConnection->getQueryBuilder();
+
+        $qb->delete('share')
+            ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_EMAIL)))
+            ->andWhere($qb->expr()->eq('uid_owner', $qb->createNamedParameter($uid)))
+            ->execute();
+    }
+
+    /**
+     * This provider does not support group shares
+     *
+     * @param string $gid
+     */
+    public function groupDeleted($gid) {
+    }
+
+    /**
+     * This provider does not support group shares
+     *
+     * @param string $uid
+     * @param string $gid
+     */
+    public function userDeletedFromGroup($uid, $gid) {
+    }
+
+    /**
+     * get database row of a give share
+     *
+     * @param $id
+     * @return array
+     * @throws ShareNotFound
+     */
+    protected function getRawShare($id) {
+
+        // Now fetch the inserted share and create a complete share object
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->select('*')
+            ->from('share')
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($id)));
+
+        $cursor = $qb->execute();
+        $data = $cursor->fetch();
+        $cursor->closeCursor();
+
+        if ($data === false) {
+            throw new ShareNotFound;
+        }
+
+        return $data;
+    }
+
+    public function getSharesInFolder($userId, Folder $node, $reshares) {
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->select('*')
+            ->from('share', 's')
+            ->andWhere($qb->expr()->orX(
+                $qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
+                $qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
+            ))
+            ->andWhere(
+                $qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_EMAIL))
+            );
+
+        /**
+         * Reshares for this user are shares where they are the owner.
+         */
+        if ($reshares === false) {
+            $qb->andWhere($qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId)));
+        } else {
+            $qb->andWhere(
+                $qb->expr()->orX(
+                    $qb->expr()->eq('uid_owner', $qb->createNamedParameter($userId)),
+                    $qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId))
+                )
+            );
+        }
+
+        $qb->innerJoin('s', 'filecache' ,'f', $qb->expr()->eq('s.file_source', 'f.fileid'));
+        $qb->andWhere($qb->expr()->eq('f.parent', $qb->createNamedParameter($node->getId())));
+
+        $qb->orderBy('id');
+
+        $cursor = $qb->execute();
+        $shares = [];
+        while ($data = $cursor->fetch()) {
+            $shares[$data['fileid']][] = $this->createShareObject($data);
+        }
+        $cursor->closeCursor();
+
+        return $shares;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAccessList($nodes, $currentAccess) {
+        $ids = [];
+        foreach ($nodes as $node) {
+            $ids[] = $node->getId();
+        }
+
+        $qb = $this->dbConnection->getQueryBuilder();
+        $qb->select('share_with')
+            ->from('share')
+            ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share::SHARE_TYPE_EMAIL)))
+            ->andWhere($qb->expr()->in('file_source', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)))
+            ->andWhere($qb->expr()->orX(
+                $qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
+                $qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
+            ))
+            ->setMaxResults(1);
+        $cursor = $qb->execute();
+
+        $mail = $cursor->fetch() !== false;
+        $cursor->closeCursor();
+
+        return ['public' => $mail];
+    }
+
+    public function getAllShares(): iterable {
+        $qb = $this->dbConnection->getQueryBuilder();
+
+        $qb->select('*')
+            ->from('share')
+            ->where(
+                $qb->expr()->orX(
+                    $qb->expr()->eq('share_type', $qb->createNamedParameter(\OCP\Share\IShare::TYPE_EMAIL))
+                )
+            );
+
+        $cursor = $qb->execute();
+        while($data = $cursor->fetch()) {
+            try {
+                $share = $this->createShareObject($data);
+            } catch (InvalidShare $e) {
+                continue;
+            } catch (ShareNotFound $e) {
+                continue;
+            }
+
+            yield $share;
+        }
+        $cursor->closeCursor();
+    }
 }

apps/provisioning_api/lib/AppInfo/Application.php

Indentation +29 added lines, -29 removed lines

@@ -36,35 +36,35 @@
 use OCP\Util;
 
 class Application extends App {
-	public function __construct(array $urlParams = []) {
-		parent::__construct('provisioning_api', $urlParams);
+    public function __construct(array $urlParams = []) {
+        parent::__construct('provisioning_api', $urlParams);
 
-		$container = $this->getContainer();
-		$server = $container->getServer();
+        $container = $this->getContainer();
+        $server = $container->getServer();
 
-		$container->registerService(NewUserMailHelper::class, function(SimpleContainer $c) use ($server) {
-			return new NewUserMailHelper(
-				$server->query(Defaults::class),
-				$server->getURLGenerator(),
-				$server->getL10NFactory(),
-				$server->getMailer(),
-				$server->getSecureRandom(),
-				new TimeFactory(),
-				$server->getConfig(),
-				$server->getCrypto(),
-				Util::getDefaultEmailAddress('no-reply')
-			);
-		});
-		$container->registerService('ProvisioningApiMiddleware', function(SimpleContainer $c) use ($server) {
-			$user = $server->getUserManager()->get($c['UserId']);
-			$isAdmin = $user !== null ? $server->getGroupManager()->isAdmin($user->getUID()) : false;
-			$isSubAdmin = $user !== null ? $server->getGroupManager()->getSubAdmin()->isSubAdmin($user) : false;
-			return new ProvisioningApiMiddleware(
-				$c->query(IControllerMethodReflector::class),
-				$isAdmin,
-				$isSubAdmin
-			);
-		});
-		$container->registerMiddleWare('ProvisioningApiMiddleware');
-	}
+        $container->registerService(NewUserMailHelper::class, function(SimpleContainer $c) use ($server) {
+            return new NewUserMailHelper(
+                $server->query(Defaults::class),
+                $server->getURLGenerator(),
+                $server->getL10NFactory(),
+                $server->getMailer(),
+                $server->getSecureRandom(),
+                new TimeFactory(),
+                $server->getConfig(),
+                $server->getCrypto(),
+                Util::getDefaultEmailAddress('no-reply')
+            );
+        });
+        $container->registerService('ProvisioningApiMiddleware', function(SimpleContainer $c) use ($server) {
+            $user = $server->getUserManager()->get($c['UserId']);
+            $isAdmin = $user !== null ? $server->getGroupManager()->isAdmin($user->getUID()) : false;
+            $isSubAdmin = $user !== null ? $server->getGroupManager()->getSubAdmin()->isSubAdmin($user) : false;
+            return new ProvisioningApiMiddleware(
+                $c->query(IControllerMethodReflector::class),
+                $isAdmin,
+                $isSubAdmin
+            );
+        });
+        $container->registerMiddleWare('ProvisioningApiMiddleware');
+    }
 }

apps/files_external/ajax/applicable.php

Indentation +5 added lines, -5 removed lines

@@ -32,23 +32,23 @@
 $limit = null;
 $offset = null;
 if (isset($_GET['pattern'])) {
-	$pattern = (string)$_GET['pattern'];
+    $pattern = (string)$_GET['pattern'];
 }
 if (isset($_GET['limit'])) {
-	$limit = (int)$_GET['limit'];
+    $limit = (int)$_GET['limit'];
 }
 if (isset($_GET['offset'])) {
-	$offset = (int)$_GET['offset'];
+    $offset = (int)$_GET['offset'];
 }
 
 $groups = [];
 foreach (\OC::$server->getGroupManager()->search($pattern, $limit, $offset) as $group) {
-	$groups[$group->getGID()] = $group->getDisplayName();
+    $groups[$group->getGID()] = $group->getDisplayName();
 }
 
 $users = [];
 foreach (\OC::$server->getUserManager()->searchDisplayName($pattern, $limit, $offset) as $user) {
-	$users[$user->getUID()] = $user->getDisplayName();
+    $users[$user->getUID()] = $user->getDisplayName();
 }
 
 $results = ['groups' => $groups, 'users' => $users];