nextcloud / server

apps/accessibility/lib/Controller/AccessibilityController.php

Indentation +256 added lines, -256 removed lines

@@ -53,271 +53,271 @@
 
 class AccessibilityController extends Controller {
 
-	/** @var string */
-	protected $appName;
-
-	/** @var string */
-	protected $serverRoot;
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	/** @var ITimeFactory */
-	protected $timeFactory;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	/** @var IAppManager */
-	private $appManager;
-
-	/** @var IconsCacher */
-	protected $iconsCacher;
-
-	/** @var \OC_Defaults */
-	private $defaults;
-
-	/** @var null|string */
-	private $injectedVariables;
-
-	/**
-	 * Account constructor.
-	 *
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IConfig $config
-	 * @param IUserManager $userManager
-	 * @param ILogger $logger
-	 * @param IURLGenerator $urlGenerator
-	 * @param ITimeFactory $timeFactory
-	 * @param IUserSession $userSession
-	 * @param IAppManager $appManager
-	 * @param \OC_Defaults $defaults
-	 */
-	public function __construct(string $appName,
-								IRequest $request,
-								IConfig $config,
-								IUserManager $userManager,
-								ILogger $logger,
-								IURLGenerator $urlGenerator,
-								ITimeFactory $timeFactory,
-								IUserSession $userSession,
-								IAppManager $appManager,
-								IconsCacher $iconsCacher,
-								\OC_Defaults $defaults) {
-		parent::__construct($appName, $request);
-		$this->appName      = $appName;
-		$this->config       = $config;
-		$this->userManager  = $userManager;
-		$this->logger       = $logger;
-		$this->urlGenerator = $urlGenerator;
-		$this->timeFactory  = $timeFactory;
-		$this->userSession  = $userSession;
-		$this->appManager   = $appManager;
-		$this->iconsCacher  = $iconsCacher;
-		$this->defaults     = $defaults;
-
-		$this->serverRoot = \OC::$SERVERROOT;
-		$this->appRoot    = $this->appManager->getAppPath($this->appName);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 * @NoSameSiteCookieRequired
-	 *
-	 * @return DataDisplayResponse
-	 */
-	public function getCss(): DataDisplayResponse {
-		$css        = '';
-		$imports    = '';
-		$userValues = $this->getUserValues();
-
-		foreach ($userValues as $key => $scssFile) {
-			if ($scssFile !== false) {
-				if ($scssFile === 'highcontrast' && in_array('dark', $userValues)) {
-					$scssFile .= 'dark';
-				}
-				$imports .= '@import "' . $scssFile . '";';
-			}
-		}
-
-		if ($imports !== '') {
-			$scss = new Compiler();
-			$scss->setImportPaths([
-				$this->appRoot . '/css/',
-				$this->serverRoot . '/core/css/'
-			]);
-
-			// Continue after throw
-			$scss->setIgnoreErrors(true);
-			$scss->setFormatter(Crunched::class);
-
-			// Import theme, variables and compile css4 variables
-			try {
-				$css .= $scss->compile(
-					$imports .
-					$this->getInjectedVariables() .
-					'@import "variables.scss";' .
-					'@import "css-variables.scss";'
-				);
-			} catch (ParserException $e) {
-				$this->logger->error($e->getMessage(), ['app' => 'core']);
-			}
-		}
-
-		// We don't want to override vars with url since path is different
-		$css = $this->filterOutRule('/--[a-z-:]+url\([^;]+\)/mi', $css);
-
-		// Rebase all urls
-		$appWebRoot = substr($this->appRoot, strlen($this->serverRoot) - strlen(\OC::$WEBROOT));
-		$css        = $this->rebaseUrls($css, $appWebRoot . '/css');
-
-		if (in_array('dark', $userValues) && $this->iconsCacher->getCachedList() && $this->iconsCacher->getCachedList()->getSize() > 0) {
-			$iconsCss = $this->invertSvgIconsColor($this->iconsCacher->getCachedList()->getContent());
-			$css = $css . $iconsCss;
-		}
-
-		$response = new DataDisplayResponse($css, Http::STATUS_OK, ['Content-Type' => 'text/css']);
-
-		// Set cache control
-		$ttl = 31536000;
-		$response->addHeader('Cache-Control', 'max-age=' . $ttl . ', immutable');
-		$expires = new \DateTime();
-		$expires->setTimestamp($this->timeFactory->getTime());
-		$expires->add(new \DateInterval('PT' . $ttl . 'S'));
-		$response->addHeader('Expires', $expires->format(\DateTime::RFC1123));
-		$response->addHeader('Pragma', 'cache');
-
-		// store current cache hash
-		$this->config->setUserValue($this->userSession->getUser()->getUID(), $this->appName, 'icons-css', md5($css));
-
-		return $response;
-	}
-
-	/**
-	 * @NoCSRFRequired
-	 * @PublicPage
-	 * @NoSameSiteCookieRequired
-	 *
-	 * @return DataDownloadResponse
-	 */
-	public function getJavascript(): DataDownloadResponse {
-		$user = $this->userSession->getUser();
-
-		if ($user === null) {
-			$theme = false;
-			$highcontrast = false;
-		} else {
-			$theme = $this->config->getUserValue($user->getUID(), $this->appName, 'theme', false);
-			$highcontrast = $this->config->getUserValue($user->getUID(), $this->appName, 'highcontrast', false) !== false;
-		}
-		if ($theme !== false) {
-			$responseJS = '(function() {
+    /** @var string */
+    protected $appName;
+
+    /** @var string */
+    protected $serverRoot;
+
+    /** @var IConfig */
+    private $config;
+
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var IURLGenerator */
+    private $urlGenerator;
+
+    /** @var ITimeFactory */
+    protected $timeFactory;
+
+    /** @var IUserSession */
+    private $userSession;
+
+    /** @var IAppManager */
+    private $appManager;
+
+    /** @var IconsCacher */
+    protected $iconsCacher;
+
+    /** @var \OC_Defaults */
+    private $defaults;
+
+    /** @var null|string */
+    private $injectedVariables;
+
+    /**
+     * Account constructor.
+     *
+     * @param string $appName
+     * @param IRequest $request
+     * @param IConfig $config
+     * @param IUserManager $userManager
+     * @param ILogger $logger
+     * @param IURLGenerator $urlGenerator
+     * @param ITimeFactory $timeFactory
+     * @param IUserSession $userSession
+     * @param IAppManager $appManager
+     * @param \OC_Defaults $defaults
+     */
+    public function __construct(string $appName,
+                                IRequest $request,
+                                IConfig $config,
+                                IUserManager $userManager,
+                                ILogger $logger,
+                                IURLGenerator $urlGenerator,
+                                ITimeFactory $timeFactory,
+                                IUserSession $userSession,
+                                IAppManager $appManager,
+                                IconsCacher $iconsCacher,
+                                \OC_Defaults $defaults) {
+        parent::__construct($appName, $request);
+        $this->appName      = $appName;
+        $this->config       = $config;
+        $this->userManager  = $userManager;
+        $this->logger       = $logger;
+        $this->urlGenerator = $urlGenerator;
+        $this->timeFactory  = $timeFactory;
+        $this->userSession  = $userSession;
+        $this->appManager   = $appManager;
+        $this->iconsCacher  = $iconsCacher;
+        $this->defaults     = $defaults;
+
+        $this->serverRoot = \OC::$SERVERROOT;
+        $this->appRoot    = $this->appManager->getAppPath($this->appName);
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     * @NoSameSiteCookieRequired
+     *
+     * @return DataDisplayResponse
+     */
+    public function getCss(): DataDisplayResponse {
+        $css        = '';
+        $imports    = '';
+        $userValues = $this->getUserValues();
+
+        foreach ($userValues as $key => $scssFile) {
+            if ($scssFile !== false) {
+                if ($scssFile === 'highcontrast' && in_array('dark', $userValues)) {
+                    $scssFile .= 'dark';
+                }
+                $imports .= '@import "' . $scssFile . '";';
+            }
+        }
+
+        if ($imports !== '') {
+            $scss = new Compiler();
+            $scss->setImportPaths([
+                $this->appRoot . '/css/',
+                $this->serverRoot . '/core/css/'
+            ]);
+
+            // Continue after throw
+            $scss->setIgnoreErrors(true);
+            $scss->setFormatter(Crunched::class);
+
+            // Import theme, variables and compile css4 variables
+            try {
+                $css .= $scss->compile(
+                    $imports .
+                    $this->getInjectedVariables() .
+                    '@import "variables.scss";' .
+                    '@import "css-variables.scss";'
+                );
+            } catch (ParserException $e) {
+                $this->logger->error($e->getMessage(), ['app' => 'core']);
+            }
+        }
+
+        // We don't want to override vars with url since path is different
+        $css = $this->filterOutRule('/--[a-z-:]+url\([^;]+\)/mi', $css);
+
+        // Rebase all urls
+        $appWebRoot = substr($this->appRoot, strlen($this->serverRoot) - strlen(\OC::$WEBROOT));
+        $css        = $this->rebaseUrls($css, $appWebRoot . '/css');
+
+        if (in_array('dark', $userValues) && $this->iconsCacher->getCachedList() && $this->iconsCacher->getCachedList()->getSize() > 0) {
+            $iconsCss = $this->invertSvgIconsColor($this->iconsCacher->getCachedList()->getContent());
+            $css = $css . $iconsCss;
+        }
+
+        $response = new DataDisplayResponse($css, Http::STATUS_OK, ['Content-Type' => 'text/css']);
+
+        // Set cache control
+        $ttl = 31536000;
+        $response->addHeader('Cache-Control', 'max-age=' . $ttl . ', immutable');
+        $expires = new \DateTime();
+        $expires->setTimestamp($this->timeFactory->getTime());
+        $expires->add(new \DateInterval('PT' . $ttl . 'S'));
+        $response->addHeader('Expires', $expires->format(\DateTime::RFC1123));
+        $response->addHeader('Pragma', 'cache');
+
+        // store current cache hash
+        $this->config->setUserValue($this->userSession->getUser()->getUID(), $this->appName, 'icons-css', md5($css));
+
+        return $response;
+    }
+
+    /**
+     * @NoCSRFRequired
+     * @PublicPage
+     * @NoSameSiteCookieRequired
+     *
+     * @return DataDownloadResponse
+     */
+    public function getJavascript(): DataDownloadResponse {
+        $user = $this->userSession->getUser();
+
+        if ($user === null) {
+            $theme = false;
+            $highcontrast = false;
+        } else {
+            $theme = $this->config->getUserValue($user->getUID(), $this->appName, 'theme', false);
+            $highcontrast = $this->config->getUserValue($user->getUID(), $this->appName, 'highcontrast', false) !== false;
+        }
+        if ($theme !== false) {
+            $responseJS = '(function() {
 	OCA.Accessibility = {
 		highcontrast: ' . json_encode($highcontrast) . ',
 		theme: ' . json_encode($theme) . ',
 	};
 	document.body.classList.add(' . json_encode($theme) . ');
 })();';
-		} else {
-			$responseJS = '(function() {
+        } else {
+            $responseJS = '(function() {
 	OCA.Accessibility = {
 		highcontrast: ' . json_encode($highcontrast) . ',
 		theme: ' . json_encode($theme) . ',
 	};
 })();';
-		}
-		$response = new DataDownloadResponse($responseJS, 'javascript', 'text/javascript');
-		$response->cacheFor(3600);
-		return $response;
-	}
-
-	/**
-	 * Return an array with the user theme & font settings
-	 *
-	 * @return array
-	 */
-	private function getUserValues(): array {
-		$userTheme = $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'theme', false);
-		$userFont  = $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'font', false);
-		$userHighContrast = $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'highcontrast', false);
-
-		return [$userTheme, $userHighContrast, $userFont];
-	}
-
-	/**
-	 * Remove all matches from the $rule regex
-	 *
-	 * @param string $rule regex to match
-	 * @param string $css string to parse
-	 * @return string
-	 */
-	private function filterOutRule(string $rule, string $css): string {
-		return preg_replace($rule, '', $css);
-	}
-
-	/**
-	 * Add the correct uri prefix to make uri valid again
-	 *
-	 * @param string $css
-	 * @param string $webDir
-	 * @return string
-	 */
-	private function rebaseUrls(string $css, string $webDir): string {
-		$re    = '/url\([\'"]([^\/][\.\w?=\/-]*)[\'"]\)/x';
-		$subst = 'url(\'' . $webDir . '/$1\')';
-
-		return preg_replace($re, $subst, $css);
-	}
-
-	/**
-	 * Remove all matches from the $rule regex
-	 *
-	 * @param string $css string to parse
-	 * @return string
-	 */
-	private function invertSvgIconsColor(string $css) {
-		return str_replace(
-			['color=000&', 'color=fff&', 'color=***&'],
-			['color=***&', 'color=000&', 'color=fff&'],
-			str_replace(
-				['color=000000&', 'color=ffffff&', 'color=******&'],
-				['color=******&', 'color=000000&', 'color=ffffff&'],
-				$css
-			)
-		);
-	}
-
-	/**
-	 * @return string SCSS code for variables from OC_Defaults
-	 */
-	private function getInjectedVariables(): string {
-		if ($this->injectedVariables !== null) {
-			return $this->injectedVariables;
-		}
-		$variables = '';
-		foreach ($this->defaults->getScssVariables() as $key => $value) {
-			$variables .= '$' . $key . ': ' . $value . ';';
-		}
-
-		// check for valid variables / otherwise fall back to defaults
-		try {
-			$scss = new Compiler();
-			$scss->compile($variables);
-			$this->injectedVariables = $variables;
-		} catch (ParserException $e) {
-			$this->logger->logException($e, ['app' => 'core']);
-		}
-		return $variables;
-	}
+        }
+        $response = new DataDownloadResponse($responseJS, 'javascript', 'text/javascript');
+        $response->cacheFor(3600);
+        return $response;
+    }
+
+    /**
+     * Return an array with the user theme & font settings
+     *
+     * @return array
+     */
+    private function getUserValues(): array {
+        $userTheme = $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'theme', false);
+        $userFont  = $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'font', false);
+        $userHighContrast = $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'highcontrast', false);
+
+        return [$userTheme, $userHighContrast, $userFont];
+    }
+
+    /**
+     * Remove all matches from the $rule regex
+     *
+     * @param string $rule regex to match
+     * @param string $css string to parse
+     * @return string
+     */
+    private function filterOutRule(string $rule, string $css): string {
+        return preg_replace($rule, '', $css);
+    }
+
+    /**
+     * Add the correct uri prefix to make uri valid again
+     *
+     * @param string $css
+     * @param string $webDir
+     * @return string
+     */
+    private function rebaseUrls(string $css, string $webDir): string {
+        $re    = '/url\([\'"]([^\/][\.\w?=\/-]*)[\'"]\)/x';
+        $subst = 'url(\'' . $webDir . '/$1\')';
+
+        return preg_replace($re, $subst, $css);
+    }
+
+    /**
+     * Remove all matches from the $rule regex
+     *
+     * @param string $css string to parse
+     * @return string
+     */
+    private function invertSvgIconsColor(string $css) {
+        return str_replace(
+            ['color=000&', 'color=fff&', 'color=***&'],
+            ['color=***&', 'color=000&', 'color=fff&'],
+            str_replace(
+                ['color=000000&', 'color=ffffff&', 'color=******&'],
+                ['color=******&', 'color=000000&', 'color=ffffff&'],
+                $css
+            )
+        );
+    }
+
+    /**
+     * @return string SCSS code for variables from OC_Defaults
+     */
+    private function getInjectedVariables(): string {
+        if ($this->injectedVariables !== null) {
+            return $this->injectedVariables;
+        }
+        $variables = '';
+        foreach ($this->defaults->getScssVariables() as $key => $value) {
+            $variables .= '$' . $key . ': ' . $value . ';';
+        }
+
+        // check for valid variables / otherwise fall back to defaults
+        try {
+            $scss = new Compiler();
+            $scss->compile($variables);
+            $this->injectedVariables = $variables;
+        } catch (ParserException $e) {
+            $this->logger->logException($e, ['app' => 'core']);
+        }
+        return $variables;
+    }
 }

apps/accessibility/lib/Migration/RepairUserConfig.php

Indentation +47 added lines, -47 removed lines

@@ -35,56 +35,56 @@
 
 class RepairUserConfig implements IRepairStep {
 
-	/** @var IUserManager */
-	protected $userManager;
+    /** @var IUserManager */
+    protected $userManager;
 
-	/** @var IConfig */
-	protected $config;
+    /** @var IConfig */
+    protected $config;
 
-	/**
-	 * MigrateUserConfig constructor.
-	 *
-	 * @param IConfig $config
-	 * @param IUserManager $userManager
-	 */
-	public function __construct(IConfig $config,
-								IUserManager $userManager) {
-		$this->config = $config;
-		$this->userManager = $userManager;
-	}
+    /**
+     * MigrateUserConfig constructor.
+     *
+     * @param IConfig $config
+     * @param IUserManager $userManager
+     */
+    public function __construct(IConfig $config,
+                                IUserManager $userManager) {
+        $this->config = $config;
+        $this->userManager = $userManager;
+    }
 
-	/**
-	 * Returns the step's name
-	 *
-	 * @return string
-	 * @since 9.1.0
-	 */
-	public function getName() {
-		return 'Migrate old user config';
-	}
+    /**
+     * Returns the step's name
+     *
+     * @return string
+     * @since 9.1.0
+     */
+    public function getName() {
+        return 'Migrate old user config';
+    }
 
-	/**
-	 * Run repair step.
-	 * Must throw exception on error.
-	 *
-	 * @param IOutput $output
-	 * @throws \Exception in case of failure
-	 * @since 9.1.0
-	 */
-	public function run(IOutput $output) {
-		$output->startProgress();
-		$this->userManager->callForSeenUsers(function (IUser $user) use ($output) {
-			$theme = $this->config->getUserValue($user->getUID(), Application::APP_NAME, 'theme', false);
-			if ($theme === 'themedark') {
-				$this->config->setUserValue($user->getUID(), Application::APP_NAME, 'theme', 'dark');
-			}
-			if ($theme === 'themehighcontrast') {
-				$this->config->setUserValue($user->getUID(), Application::APP_NAME, 'highcontrast', 'highcontrast');
-				$this->config->deleteUserValue($user->getUID(), Application::APP_NAME, 'theme');
-			}
-			$output->advance();
-		});
-		$output->finishProgress();
-	}
+    /**
+     * Run repair step.
+     * Must throw exception on error.
+     *
+     * @param IOutput $output
+     * @throws \Exception in case of failure
+     * @since 9.1.0
+     */
+    public function run(IOutput $output) {
+        $output->startProgress();
+        $this->userManager->callForSeenUsers(function (IUser $user) use ($output) {
+            $theme = $this->config->getUserValue($user->getUID(), Application::APP_NAME, 'theme', false);
+            if ($theme === 'themedark') {
+                $this->config->setUserValue($user->getUID(), Application::APP_NAME, 'theme', 'dark');
+            }
+            if ($theme === 'themehighcontrast') {
+                $this->config->setUserValue($user->getUID(), Application::APP_NAME, 'highcontrast', 'highcontrast');
+                $this->config->deleteUserValue($user->getUID(), Application::APP_NAME, 'theme');
+            }
+            $output->advance();
+        });
+        $output->finishProgress();
+    }
 
 }

apps/files_sharing/lib/AppInfo/Application.php

Indentation +238 added lines, -238 removed lines

@@ -66,242 +66,242 @@
 
 class Application extends App {
 
-	const APP_ID = 'files_sharing';
-
-	public function __construct(array $urlParams = []) {
-		parent::__construct(self::APP_ID, $urlParams);
-
-		$container = $this->getContainer();
-
-		/** @var IServerContainer $server */
-		$server = $container->getServer();
-
-		/** @var IEventDispatcher $dispatcher */
-		$dispatcher = $container->query(IEventDispatcher::class);
-		$mountProviderCollection = $server->getMountProviderCollection();
-		$notifications = $server->getNotificationManager();
-
-		/**
-		 * Controllers
-		 */
-		$container->registerService('ShareController', function (SimpleContainer $c) use ($server) {
-			$federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application();
-			return new ShareController(
-				$c->query('AppName'),
-				$c->query('Request'),
-				$server->getConfig(),
-				$server->getURLGenerator(),
-				$server->getUserManager(),
-				$server->getLogger(),
-				$server->getActivityManager(),
-				$server->getShareManager(),
-				$server->getSession(),
-				$server->getPreviewManager(),
-				$server->getRootFolder(),
-				$federatedSharingApp->getFederatedShareProvider(),
-				$server->getEventDispatcher(),
-				$server->getL10N($c->query('AppName')),
-				$server->query(Defaults::class)
-			);
-		});
-		$container->registerService('ExternalSharesController', function (SimpleContainer $c) {
-			return new ExternalSharesController(
-				$c->query('AppName'),
-				$c->query('Request'),
-				$c->query('ExternalManager'),
-				$c->query('HttpClientService')
-			);
-		});
-
-		/**
-		 * Core class wrappers
-		 */
-		$container->registerService('HttpClientService', function (SimpleContainer $c) use ($server) {
-			return $server->getHTTPClientService();
-		});
-		$container->registerService(ICloudIdManager::class, function (SimpleContainer $c) use ($server) {
-			return $server->getCloudIdManager();
-		});
-		$container->registerService('ExternalManager', function (SimpleContainer $c) use ($server) {
-			$user = $server->getUserSession()->getUser();
-			$uid = $user ? $user->getUID() : null;
-			return new \OCA\Files_Sharing\External\Manager(
-				$server->getDatabaseConnection(),
-				\OC\Files\Filesystem::getMountManager(),
-				\OC\Files\Filesystem::getLoader(),
-				$server->getHTTPClientService(),
-				$server->getNotificationManager(),
-				$server->query(\OCP\OCS\IDiscoveryService::class),
-				$server->getCloudFederationProviderManager(),
-				$server->getCloudFederationFactory(),
-				$server->getGroupManager(),
-				$server->getUserManager(),
-				$uid
-			);
-		});
-		$container->registerAlias(Manager::class, 'ExternalManager');
-
-		/**
-		 * Middleware
-		 */
-		$container->registerService('SharingCheckMiddleware', function (SimpleContainer $c) use ($server) {
-			return new SharingCheckMiddleware(
-				$c->query('AppName'),
-				$server->getConfig(),
-				$server->getAppManager(),
-				$server->query(IControllerMethodReflector::class),
-				$server->getShareManager(),
-				$server->getRequest()
-			);
-		});
-
-		$container->registerService(ShareInfoMiddleware::class, function () use ($server) {
-			return new ShareInfoMiddleware(
-				$server->getShareManager()
-			);
-		});
-
-		// Execute middlewares
-		$container->registerMiddleWare('SharingCheckMiddleware');
-		$container->registerMiddleWare(OCSShareAPIMiddleware::class);
-		$container->registerMiddleWare(ShareInfoMiddleware::class);
-
-		$container->registerService('MountProvider', function (IContainer $c) {
-			/** @var \OCP\IServerContainer $server */
-			$server = $c->query('ServerContainer');
-			return new MountProvider(
-				$server->getConfig(),
-				$server->getShareManager(),
-				$server->getLogger()
-			);
-		});
-
-		$container->registerService('ExternalMountProvider', function (IContainer $c) {
-			/** @var \OCP\IServerContainer $server */
-			$server = $c->query('ServerContainer');
-			return new \OCA\Files_Sharing\External\MountProvider(
-				$server->getDatabaseConnection(),
-				function () use ($c) {
-					return $c->query('ExternalManager');
-				},
-				$server->getCloudIdManager()
-			);
-		});
-
-		/**
-		 * Register capabilities
-		 */
-		$container->registerCapability(Capabilities::class);
-
-		$notifications->registerNotifierService(Notifier::class);
-
-		$this->registerMountProviders($mountProviderCollection);
-		$this->registerEventsScripts($dispatcher);
-		$this->setupSharingMenus();
-
-		/**
-		 * Always add main sharing script
-		 */
-		Util::addScript(self::APP_ID, 'dist/main');
-	}
-
-	protected function registerMountProviders(IMountProviderCollection $mountProviderCollection) {
-		$mountProviderCollection->registerProvider($this->getContainer()->query('MountProvider'));
-		$mountProviderCollection->registerProvider($this->getContainer()->query('ExternalMountProvider'));
-	}
-
-	protected function registerEventsScripts(IEventDispatcher $dispatcher) {
-		// sidebar and files scripts
-		$dispatcher->addServiceListener(LoadAdditionalScriptsEvent::class, LoadAdditionalListener::class);
-		$dispatcher->addServiceListener(LoadSidebar::class, LoadSidebarListener::class);
-		$dispatcher->addServiceListener(ShareCreatedEvent::class, ShareInteractionListener::class);
-		$dispatcher->addListener('\OCP\Collaboration\Resources::loadAdditionalScripts', function () {
-			\OCP\Util::addScript('files_sharing', 'dist/collaboration');
-		});
-		$dispatcher->addServiceListener(ShareCreatedEvent::class, UserShareAcceptanceListener::class);
-		$dispatcher->addServiceListener(UserAddedEvent::class, UserAddedToGroupListener::class);
-
-		// notifications api to accept incoming user shares
-		$dispatcher->addListener('OCP\Share::postShare', function (GenericEvent $event) {
-			/** @var Listener $listener */
-			$listener = $this->getContainer()->query(Listener::class);
-			$listener->shareNotification($event);
-		});
-		$dispatcher->addListener(IGroup::class . '::postAddUser', function (GenericEvent $event) {
-			/** @var Listener $listener */
-			$listener = $this->getContainer()->query(Listener::class);
-			$listener->userAddedToGroup($event);
-		});
-	}
-
-	protected function setupSharingMenus() {
-		$config = \OC::$server->getConfig();
-		$l = \OC::$server->getL10N('files_sharing');
-
-		if ($config->getAppValue('core', 'shareapi_enabled', 'yes') !== 'yes') {
-			return;
-		}
-
-		$sharingSublistArray = [];
-
-		if (\OCP\Util::isSharingDisabledForUser() === false) {
-			array_push($sharingSublistArray, [
-				'id' => 'sharingout',
-				'appname' => 'files_sharing',
-				'script' => 'list.php',
-				'order' => 16,
-				'name' => $l->t('Shared with others'),
-			]);
-		}
-
-		array_push($sharingSublistArray, [
-			'id' => 'sharingin',
-			'appname' => 'files_sharing',
-			'script' => 'list.php',
-			'order' => 15,
-			'name' => $l->t('Shared with you'),
-		]);
-
-		if (\OCP\Util::isSharingDisabledForUser() === false) {
-			// Check if sharing by link is enabled
-			if ($config->getAppValue('core', 'shareapi_allow_links', 'yes') === 'yes') {
-				array_push($sharingSublistArray, [
-					'id' => 'sharinglinks',
-					'appname' => 'files_sharing',
-					'script' => 'list.php',
-					'order' => 17,
-					'name' => $l->t('Shared by link'),
-				]);
-			}
-		}
-
-		array_push($sharingSublistArray, [
-			'id' => 'deletedshares',
-			'appname' => 'files_sharing',
-			'script' => 'list.php',
-			'order' => 19,
-			'name' => $l->t('Deleted shares'),
-		]);
-
-		array_push($sharingSublistArray, [
-			'id' => 'pendingshares',
-			'appname' => 'files_sharing',
-			'script' => 'list.php',
-			'order' => 19,
-			'name' => $l->t('Pending shares'),
-		]);
-
-
-		// show_Quick_Access stored as string
-		\OCA\Files\App::getNavigationManager()->add([
-			'id' => 'shareoverview',
-			'appname' => 'files_sharing',
-			'script' => 'list.php',
-			'order' => 18,
-			'name' => $l->t('Shares'),
-			'classes' => 'collapsible',
-			'sublist' => $sharingSublistArray,
-			'expandedState' => 'show_sharing_menu'
-		]);
-	}
+    const APP_ID = 'files_sharing';
+
+    public function __construct(array $urlParams = []) {
+        parent::__construct(self::APP_ID, $urlParams);
+
+        $container = $this->getContainer();
+
+        /** @var IServerContainer $server */
+        $server = $container->getServer();
+
+        /** @var IEventDispatcher $dispatcher */
+        $dispatcher = $container->query(IEventDispatcher::class);
+        $mountProviderCollection = $server->getMountProviderCollection();
+        $notifications = $server->getNotificationManager();
+
+        /**
+         * Controllers
+         */
+        $container->registerService('ShareController', function (SimpleContainer $c) use ($server) {
+            $federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application();
+            return new ShareController(
+                $c->query('AppName'),
+                $c->query('Request'),
+                $server->getConfig(),
+                $server->getURLGenerator(),
+                $server->getUserManager(),
+                $server->getLogger(),
+                $server->getActivityManager(),
+                $server->getShareManager(),
+                $server->getSession(),
+                $server->getPreviewManager(),
+                $server->getRootFolder(),
+                $federatedSharingApp->getFederatedShareProvider(),
+                $server->getEventDispatcher(),
+                $server->getL10N($c->query('AppName')),
+                $server->query(Defaults::class)
+            );
+        });
+        $container->registerService('ExternalSharesController', function (SimpleContainer $c) {
+            return new ExternalSharesController(
+                $c->query('AppName'),
+                $c->query('Request'),
+                $c->query('ExternalManager'),
+                $c->query('HttpClientService')
+            );
+        });
+
+        /**
+         * Core class wrappers
+         */
+        $container->registerService('HttpClientService', function (SimpleContainer $c) use ($server) {
+            return $server->getHTTPClientService();
+        });
+        $container->registerService(ICloudIdManager::class, function (SimpleContainer $c) use ($server) {
+            return $server->getCloudIdManager();
+        });
+        $container->registerService('ExternalManager', function (SimpleContainer $c) use ($server) {
+            $user = $server->getUserSession()->getUser();
+            $uid = $user ? $user->getUID() : null;
+            return new \OCA\Files_Sharing\External\Manager(
+                $server->getDatabaseConnection(),
+                \OC\Files\Filesystem::getMountManager(),
+                \OC\Files\Filesystem::getLoader(),
+                $server->getHTTPClientService(),
+                $server->getNotificationManager(),
+                $server->query(\OCP\OCS\IDiscoveryService::class),
+                $server->getCloudFederationProviderManager(),
+                $server->getCloudFederationFactory(),
+                $server->getGroupManager(),
+                $server->getUserManager(),
+                $uid
+            );
+        });
+        $container->registerAlias(Manager::class, 'ExternalManager');
+
+        /**
+         * Middleware
+         */
+        $container->registerService('SharingCheckMiddleware', function (SimpleContainer $c) use ($server) {
+            return new SharingCheckMiddleware(
+                $c->query('AppName'),
+                $server->getConfig(),
+                $server->getAppManager(),
+                $server->query(IControllerMethodReflector::class),
+                $server->getShareManager(),
+                $server->getRequest()
+            );
+        });
+
+        $container->registerService(ShareInfoMiddleware::class, function () use ($server) {
+            return new ShareInfoMiddleware(
+                $server->getShareManager()
+            );
+        });
+
+        // Execute middlewares
+        $container->registerMiddleWare('SharingCheckMiddleware');
+        $container->registerMiddleWare(OCSShareAPIMiddleware::class);
+        $container->registerMiddleWare(ShareInfoMiddleware::class);
+
+        $container->registerService('MountProvider', function (IContainer $c) {
+            /** @var \OCP\IServerContainer $server */
+            $server = $c->query('ServerContainer');
+            return new MountProvider(
+                $server->getConfig(),
+                $server->getShareManager(),
+                $server->getLogger()
+            );
+        });
+
+        $container->registerService('ExternalMountProvider', function (IContainer $c) {
+            /** @var \OCP\IServerContainer $server */
+            $server = $c->query('ServerContainer');
+            return new \OCA\Files_Sharing\External\MountProvider(
+                $server->getDatabaseConnection(),
+                function () use ($c) {
+                    return $c->query('ExternalManager');
+                },
+                $server->getCloudIdManager()
+            );
+        });
+
+        /**
+         * Register capabilities
+         */
+        $container->registerCapability(Capabilities::class);
+
+        $notifications->registerNotifierService(Notifier::class);
+
+        $this->registerMountProviders($mountProviderCollection);
+        $this->registerEventsScripts($dispatcher);
+        $this->setupSharingMenus();
+
+        /**
+         * Always add main sharing script
+         */
+        Util::addScript(self::APP_ID, 'dist/main');
+    }
+
+    protected function registerMountProviders(IMountProviderCollection $mountProviderCollection) {
+        $mountProviderCollection->registerProvider($this->getContainer()->query('MountProvider'));
+        $mountProviderCollection->registerProvider($this->getContainer()->query('ExternalMountProvider'));
+    }
+
+    protected function registerEventsScripts(IEventDispatcher $dispatcher) {
+        // sidebar and files scripts
+        $dispatcher->addServiceListener(LoadAdditionalScriptsEvent::class, LoadAdditionalListener::class);
+        $dispatcher->addServiceListener(LoadSidebar::class, LoadSidebarListener::class);
+        $dispatcher->addServiceListener(ShareCreatedEvent::class, ShareInteractionListener::class);
+        $dispatcher->addListener('\OCP\Collaboration\Resources::loadAdditionalScripts', function () {
+            \OCP\Util::addScript('files_sharing', 'dist/collaboration');
+        });
+        $dispatcher->addServiceListener(ShareCreatedEvent::class, UserShareAcceptanceListener::class);
+        $dispatcher->addServiceListener(UserAddedEvent::class, UserAddedToGroupListener::class);
+
+        // notifications api to accept incoming user shares
+        $dispatcher->addListener('OCP\Share::postShare', function (GenericEvent $event) {
+            /** @var Listener $listener */
+            $listener = $this->getContainer()->query(Listener::class);
+            $listener->shareNotification($event);
+        });
+        $dispatcher->addListener(IGroup::class . '::postAddUser', function (GenericEvent $event) {
+            /** @var Listener $listener */
+            $listener = $this->getContainer()->query(Listener::class);
+            $listener->userAddedToGroup($event);
+        });
+    }
+
+    protected function setupSharingMenus() {
+        $config = \OC::$server->getConfig();
+        $l = \OC::$server->getL10N('files_sharing');
+
+        if ($config->getAppValue('core', 'shareapi_enabled', 'yes') !== 'yes') {
+            return;
+        }
+
+        $sharingSublistArray = [];
+
+        if (\OCP\Util::isSharingDisabledForUser() === false) {
+            array_push($sharingSublistArray, [
+                'id' => 'sharingout',
+                'appname' => 'files_sharing',
+                'script' => 'list.php',
+                'order' => 16,
+                'name' => $l->t('Shared with others'),
+            ]);
+        }
+
+        array_push($sharingSublistArray, [
+            'id' => 'sharingin',
+            'appname' => 'files_sharing',
+            'script' => 'list.php',
+            'order' => 15,
+            'name' => $l->t('Shared with you'),
+        ]);
+
+        if (\OCP\Util::isSharingDisabledForUser() === false) {
+            // Check if sharing by link is enabled
+            if ($config->getAppValue('core', 'shareapi_allow_links', 'yes') === 'yes') {
+                array_push($sharingSublistArray, [
+                    'id' => 'sharinglinks',
+                    'appname' => 'files_sharing',
+                    'script' => 'list.php',
+                    'order' => 17,
+                    'name' => $l->t('Shared by link'),
+                ]);
+            }
+        }
+
+        array_push($sharingSublistArray, [
+            'id' => 'deletedshares',
+            'appname' => 'files_sharing',
+            'script' => 'list.php',
+            'order' => 19,
+            'name' => $l->t('Deleted shares'),
+        ]);
+
+        array_push($sharingSublistArray, [
+            'id' => 'pendingshares',
+            'appname' => 'files_sharing',
+            'script' => 'list.php',
+            'order' => 19,
+            'name' => $l->t('Pending shares'),
+        ]);
+
+
+        // show_Quick_Access stored as string
+        \OCA\Files\App::getNavigationManager()->add([
+            'id' => 'shareoverview',
+            'appname' => 'files_sharing',
+            'script' => 'list.php',
+            'order' => 18,
+            'name' => $l->t('Shares'),
+            'classes' => 'collapsible',
+            'sublist' => $sharingSublistArray,
+            'expandedState' => 'show_sharing_menu'
+        ]);
+    }
 }

apps/files_sharing/lib/Controller/ShareesAPIController.php

Indentation +369 added lines, -369 removed lines

@@ -53,373 +53,373 @@
 
 class ShareesAPIController extends OCSController {
 
-	/** @var userId */
-	protected $userId;
-
-	/** @var IConfig */
-	protected $config;
-
-	/** @var IURLGenerator */
-	protected $urlGenerator;
-
-	/** @var IManager */
-	protected $shareManager;
-
-	/** @var int */
-	protected $offset = 0;
-
-	/** @var int */
-	protected $limit = 10;
-
-	/** @var array */
-	protected $result = [
-		'exact' => [
-			'users' => [],
-			'groups' => [],
-			'remotes' => [],
-			'remote_groups' => [],
-			'emails' => [],
-			'circles' => [],
-			'rooms' => [],
-		],
-		'users' => [],
-		'groups' => [],
-		'remotes' => [],
-		'remote_groups' => [],
-		'emails' => [],
-		'lookup' => [],
-		'circles' => [],
-		'rooms' => [],
-		'lookupEnabled' => false,
-	];
-
-	protected $reachedEndFor = [];
-	/** @var ISearch */
-	private $collaboratorSearch;
-
-	/**
-	 * @param string $UserId
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IConfig $config
-	 * @param IURLGenerator $urlGenerator
-	 * @param IManager $shareManager
-	 * @param ISearch $collaboratorSearch
-	 */
-	public function __construct(
-		$UserId,
-		string $appName,
-		IRequest $request,
-		IConfig $config,
-		IURLGenerator $urlGenerator,
-		IManager $shareManager,
-		ISearch $collaboratorSearch
-	) {
-		parent::__construct($appName, $request);
-		$this->userId = $UserId;
-		$this->config = $config;
-		$this->urlGenerator = $urlGenerator;
-		$this->shareManager = $shareManager;
-		$this->collaboratorSearch = $collaboratorSearch;
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param string $search
-	 * @param string $itemType
-	 * @param int $page
-	 * @param int $perPage
-	 * @param int|int[] $shareType
-	 * @param bool $lookup
-	 * @return DataResponse
-	 * @throws OCSBadRequestException
-	 */
-	public function search(string $search = '', string $itemType = null, int $page = 1, int $perPage = 200, $shareType = null, bool $lookup = true): DataResponse {
-
-		// only search for string larger than a given threshold
-		$threshold = (int)$this->config->getSystemValue('sharing.minSearchStringLength', 0);
-		if (strlen($search) < $threshold) {
-			return new DataResponse($this->result);
-		}
-
-		// never return more than the max. number of results configured in the config.php
-		$maxResults = (int)$this->config->getSystemValue('sharing.maxAutocompleteResults', 0);
-		if ($maxResults > 0) {
-			$perPage = min($perPage, $maxResults);
-		}
-		if ($perPage <= 0) {
-			throw new OCSBadRequestException('Invalid perPage argument');
-		}
-		if ($page <= 0) {
-			throw new OCSBadRequestException('Invalid page');
-		}
-
-		$shareTypes = [
-			Share::SHARE_TYPE_USER,
-		];
-
-		if ($itemType === null) {
-			throw new OCSBadRequestException('Missing itemType');
-		} elseif ($itemType === 'file' || $itemType === 'folder') {
-			if ($this->shareManager->allowGroupSharing()) {
-				$shareTypes[] = Share::SHARE_TYPE_GROUP;
-			}
-
-			if ($this->isRemoteSharingAllowed($itemType)) {
-				$shareTypes[] = Share::SHARE_TYPE_REMOTE;
-			}
-
-			if ($this->isRemoteGroupSharingAllowed($itemType)) {
-				$shareTypes[] = Share::SHARE_TYPE_REMOTE_GROUP;
-			}
-
-			if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_EMAIL)) {
-				$shareTypes[] = Share::SHARE_TYPE_EMAIL;
-			}
-
-			if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_ROOM)) {
-				$shareTypes[] = Share::SHARE_TYPE_ROOM;
-			}
-		} else {
-			$shareTypes[] = Share::SHARE_TYPE_GROUP;
-			$shareTypes[] = Share::SHARE_TYPE_EMAIL;
-		}
-
-		// FIXME: DI
-		if (\OC::$server->getAppManager()->isEnabledForUser('circles') && class_exists('\OCA\Circles\ShareByCircleProvider')) {
-			$shareTypes[] = Share::SHARE_TYPE_CIRCLE;
-		}
-
-		if ($shareType !== null && is_array($shareType)) {
-			$shareTypes = array_intersect($shareTypes, $shareType);
-		} else if (is_numeric($shareType)) {
-			$shareTypes = array_intersect($shareTypes, [(int) $shareType]);
-		}
-		sort($shareTypes);
-
-		$this->limit = (int) $perPage;
-		$this->offset = $perPage * ($page - 1);
-
-		// In global scale mode we always search the loogup server
-		if ($this->config->getSystemValueBool('gs.enabled', false)) {
-			$lookup = true;
-			$this->result['lookupEnabled'] = true;
-		} else {
-			$this->result['lookupEnabled'] = $this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'yes') === 'yes';
-		}
-
-		list($result, $hasMoreResults) = $this->collaboratorSearch->search($search, $shareTypes, $lookup, $this->limit, $this->offset);
-
-		// extra treatment for 'exact' subarray, with a single merge expected keys might be lost
-		if(isset($result['exact'])) {
-			$result['exact'] = array_merge($this->result['exact'], $result['exact']);
-		}
-		$this->result = array_merge($this->result, $result);
-		$response = new DataResponse($this->result);
-
-		if ($hasMoreResults) {
-			$response->addHeader('Link', $this->getPaginationLink($page, [
-				'search' => $search,
-				'itemType' => $itemType,
-				'shareType' => $shareTypes,
-				'perPage' => $perPage,
-			]));
-		}
-
-		return $response;
-	}
-
-	/**
-	 * @param string $user
-	 * @param int $shareType
-	 *
-	 * @return Generator<array<string>>
-	 */
-	private function getAllShareesByType(string $user, int $shareType): Generator {
-		$offset = 0;
-		$pageSize = 50;
-
-		while (count($page = $this->shareManager->getSharesBy(
-			$user,
-			$shareType,
-			null,
-			false,
-			$pageSize,
-			$offset
-		))) {
-			foreach ($page as $share) {
-				yield [$share->getSharedWith(), $share->getSharedWithDisplayName() ?? $share->getSharedWith()];
-			}
-
-			$offset += $pageSize;
-		}
-	}
-
-	private function sortShareesByFrequency(array $sharees): array {
-		usort($sharees, function (array $s1, array $s2) {
-			return $s2['count'] - $s1['count'];
-		});
-		return $sharees;
-	}
-
-	private $searchResultTypeMap = [
-		Share::SHARE_TYPE_USER => 'users',
-		Share::SHARE_TYPE_GROUP => 'groups',
-		Share::SHARE_TYPE_REMOTE => 'remotes',
-		Share::SHARE_TYPE_REMOTE_GROUP => 'remote_groups',
-		Share::SHARE_TYPE_EMAIL => 'emails',
-	];
-
-	private function getAllSharees(string $user, array $shareTypes): ISearchResult {
-		$result = [];
-		foreach ($shareTypes as $shareType) {
-			$sharees = $this->getAllShareesByType($user, $shareType);
-			$shareTypeResults = [];
-			foreach ($sharees as list($sharee, $displayname)) {
-				if (!isset($this->searchResultTypeMap[$shareType])) {
-					continue;
-				}
-
-				if (!isset($shareTypeResults[$sharee])) {
-					$shareTypeResults[$sharee] = [
-						'count' => 1,
-						'label' => $displayname,
-						'value' => [
-							'shareType' => $shareType,
-							'shareWith' => $sharee,
-						],
-					];
-				} else {
-					$shareTypeResults[$sharee]['count']++;
-				}
-			}
-			$result = array_merge($result, array_values($shareTypeResults));
-		}
-
-		$top5 = array_slice(
-			$this->sortShareesByFrequency($result),
-			0,
-			5
-		);
-
-		$searchResult = new SearchResult();
-		foreach ($this->searchResultTypeMap as $int => $str) {
-			$searchResult->addResultSet(new SearchResultType($str), [], []);
-			foreach ($top5 as $x) {
-				if ($x['value']['shareType'] === $int) {
-					$searchResult->addResultSet(new SearchResultType($str), [], [$x]);
-				}
-			}
-		}
-		return $searchResult;
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param string $itemType
-	 * @return DataResponse
-	 * @throws OCSBadRequestException
-	 */
-	public function findRecommended(string $itemType = null, $shareType = null): DataResponse {
-		$shareTypes = [
-			Share::SHARE_TYPE_USER,
-		];
-
-		if ($itemType === null) {
-			throw new OCSBadRequestException('Missing itemType');
-		} elseif ($itemType === 'file' || $itemType === 'folder') {
-			if ($this->shareManager->allowGroupSharing()) {
-				$shareTypes[] = Share::SHARE_TYPE_GROUP;
-			}
-
-			if ($this->isRemoteSharingAllowed($itemType)) {
-				$shareTypes[] = Share::SHARE_TYPE_REMOTE;
-			}
-
-			if ($this->isRemoteGroupSharingAllowed($itemType)) {
-				$shareTypes[] = Share::SHARE_TYPE_REMOTE_GROUP;
-			}
-
-			if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_EMAIL)) {
-				$shareTypes[] = Share::SHARE_TYPE_EMAIL;
-			}
-
-			if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_ROOM)) {
-				$shareTypes[] = Share::SHARE_TYPE_ROOM;
-			}
-		} else {
-			$shareTypes[] = Share::SHARE_TYPE_GROUP;
-			$shareTypes[] = Share::SHARE_TYPE_EMAIL;
-		}
-
-		// FIXME: DI
-		if (\OC::$server->getAppManager()->isEnabledForUser('circles') && class_exists('\OCA\Circles\ShareByCircleProvider')) {
-			$shareTypes[] = Share::SHARE_TYPE_CIRCLE;
-		}
-
-		if (isset($_GET['shareType']) && is_array($_GET['shareType'])) {
-			$shareTypes = array_intersect($shareTypes, $_GET['shareType']);
-			sort($shareTypes);
-		} else if (is_numeric($shareType)) {
-			$shareTypes = array_intersect($shareTypes, [(int) $shareType]);
-			sort($shareTypes);
-		}
-
-		return new DataResponse(
-			$this->getAllSharees($this->userId, $shareTypes)->asArray()
-		);
-	}
-
-	/**
-	 * Method to get out the static call for better testing
-	 *
-	 * @param string $itemType
-	 * @return bool
-	 */
-	protected function isRemoteSharingAllowed(string $itemType): bool {
-		try {
-			// FIXME: static foo makes unit testing unnecessarily difficult
-			$backend = \OC\Share\Share::getBackend($itemType);
-			return $backend->isShareTypeAllowed(Share::SHARE_TYPE_REMOTE);
-		} catch (\Exception $e) {
-			return false;
-		}
-	}
-
-	protected function isRemoteGroupSharingAllowed(string $itemType): bool {
-		try {
-			// FIXME: static foo makes unit testing unnecessarily difficult
-			$backend = \OC\Share\Share::getBackend($itemType);
-			return $backend->isShareTypeAllowed(Share::SHARE_TYPE_REMOTE_GROUP);
-		} catch (\Exception $e) {
-			return false;
-		}
-	}
-
-
-	/**
-	 * Generates a bunch of pagination links for the current page
-	 *
-	 * @param int $page Current page
-	 * @param array $params Parameters for the URL
-	 * @return string
-	 */
-	protected function getPaginationLink(int $page, array $params): string {
-		if ($this->isV2()) {
-			$url = $this->urlGenerator->getAbsoluteURL('/ocs/v2.php/apps/files_sharing/api/v1/sharees') . '?';
-		} else {
-			$url = $this->urlGenerator->getAbsoluteURL('/ocs/v1.php/apps/files_sharing/api/v1/sharees') . '?';
-		}
-		$params['page'] = $page + 1;
-		return '<' . $url . http_build_query($params) . '>; rel="next"';
-	}
-
-	/**
-	 * @return bool
-	 */
-	protected function isV2(): bool {
-		return $this->request->getScriptName() === '/ocs/v2.php';
-	}
+    /** @var userId */
+    protected $userId;
+
+    /** @var IConfig */
+    protected $config;
+
+    /** @var IURLGenerator */
+    protected $urlGenerator;
+
+    /** @var IManager */
+    protected $shareManager;
+
+    /** @var int */
+    protected $offset = 0;
+
+    /** @var int */
+    protected $limit = 10;
+
+    /** @var array */
+    protected $result = [
+        'exact' => [
+            'users' => [],
+            'groups' => [],
+            'remotes' => [],
+            'remote_groups' => [],
+            'emails' => [],
+            'circles' => [],
+            'rooms' => [],
+        ],
+        'users' => [],
+        'groups' => [],
+        'remotes' => [],
+        'remote_groups' => [],
+        'emails' => [],
+        'lookup' => [],
+        'circles' => [],
+        'rooms' => [],
+        'lookupEnabled' => false,
+    ];
+
+    protected $reachedEndFor = [];
+    /** @var ISearch */
+    private $collaboratorSearch;
+
+    /**
+     * @param string $UserId
+     * @param string $appName
+     * @param IRequest $request
+     * @param IConfig $config
+     * @param IURLGenerator $urlGenerator
+     * @param IManager $shareManager
+     * @param ISearch $collaboratorSearch
+     */
+    public function __construct(
+        $UserId,
+        string $appName,
+        IRequest $request,
+        IConfig $config,
+        IURLGenerator $urlGenerator,
+        IManager $shareManager,
+        ISearch $collaboratorSearch
+    ) {
+        parent::__construct($appName, $request);
+        $this->userId = $UserId;
+        $this->config = $config;
+        $this->urlGenerator = $urlGenerator;
+        $this->shareManager = $shareManager;
+        $this->collaboratorSearch = $collaboratorSearch;
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @param string $search
+     * @param string $itemType
+     * @param int $page
+     * @param int $perPage
+     * @param int|int[] $shareType
+     * @param bool $lookup
+     * @return DataResponse
+     * @throws OCSBadRequestException
+     */
+    public function search(string $search = '', string $itemType = null, int $page = 1, int $perPage = 200, $shareType = null, bool $lookup = true): DataResponse {
+
+        // only search for string larger than a given threshold
+        $threshold = (int)$this->config->getSystemValue('sharing.minSearchStringLength', 0);
+        if (strlen($search) < $threshold) {
+            return new DataResponse($this->result);
+        }
+
+        // never return more than the max. number of results configured in the config.php
+        $maxResults = (int)$this->config->getSystemValue('sharing.maxAutocompleteResults', 0);
+        if ($maxResults > 0) {
+            $perPage = min($perPage, $maxResults);
+        }
+        if ($perPage <= 0) {
+            throw new OCSBadRequestException('Invalid perPage argument');
+        }
+        if ($page <= 0) {
+            throw new OCSBadRequestException('Invalid page');
+        }
+
+        $shareTypes = [
+            Share::SHARE_TYPE_USER,
+        ];
+
+        if ($itemType === null) {
+            throw new OCSBadRequestException('Missing itemType');
+        } elseif ($itemType === 'file' || $itemType === 'folder') {
+            if ($this->shareManager->allowGroupSharing()) {
+                $shareTypes[] = Share::SHARE_TYPE_GROUP;
+            }
+
+            if ($this->isRemoteSharingAllowed($itemType)) {
+                $shareTypes[] = Share::SHARE_TYPE_REMOTE;
+            }
+
+            if ($this->isRemoteGroupSharingAllowed($itemType)) {
+                $shareTypes[] = Share::SHARE_TYPE_REMOTE_GROUP;
+            }
+
+            if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_EMAIL)) {
+                $shareTypes[] = Share::SHARE_TYPE_EMAIL;
+            }
+
+            if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_ROOM)) {
+                $shareTypes[] = Share::SHARE_TYPE_ROOM;
+            }
+        } else {
+            $shareTypes[] = Share::SHARE_TYPE_GROUP;
+            $shareTypes[] = Share::SHARE_TYPE_EMAIL;
+        }
+
+        // FIXME: DI
+        if (\OC::$server->getAppManager()->isEnabledForUser('circles') && class_exists('\OCA\Circles\ShareByCircleProvider')) {
+            $shareTypes[] = Share::SHARE_TYPE_CIRCLE;
+        }
+
+        if ($shareType !== null && is_array($shareType)) {
+            $shareTypes = array_intersect($shareTypes, $shareType);
+        } else if (is_numeric($shareType)) {
+            $shareTypes = array_intersect($shareTypes, [(int) $shareType]);
+        }
+        sort($shareTypes);
+
+        $this->limit = (int) $perPage;
+        $this->offset = $perPage * ($page - 1);
+
+        // In global scale mode we always search the loogup server
+        if ($this->config->getSystemValueBool('gs.enabled', false)) {
+            $lookup = true;
+            $this->result['lookupEnabled'] = true;
+        } else {
+            $this->result['lookupEnabled'] = $this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'yes') === 'yes';
+        }
+
+        list($result, $hasMoreResults) = $this->collaboratorSearch->search($search, $shareTypes, $lookup, $this->limit, $this->offset);
+
+        // extra treatment for 'exact' subarray, with a single merge expected keys might be lost
+        if(isset($result['exact'])) {
+            $result['exact'] = array_merge($this->result['exact'], $result['exact']);
+        }
+        $this->result = array_merge($this->result, $result);
+        $response = new DataResponse($this->result);
+
+        if ($hasMoreResults) {
+            $response->addHeader('Link', $this->getPaginationLink($page, [
+                'search' => $search,
+                'itemType' => $itemType,
+                'shareType' => $shareTypes,
+                'perPage' => $perPage,
+            ]));
+        }
+
+        return $response;
+    }
+
+    /**
+     * @param string $user
+     * @param int $shareType
+     *
+     * @return Generator<array<string>>
+     */
+    private function getAllShareesByType(string $user, int $shareType): Generator {
+        $offset = 0;
+        $pageSize = 50;
+
+        while (count($page = $this->shareManager->getSharesBy(
+            $user,
+            $shareType,
+            null,
+            false,
+            $pageSize,
+            $offset
+        ))) {
+            foreach ($page as $share) {
+                yield [$share->getSharedWith(), $share->getSharedWithDisplayName() ?? $share->getSharedWith()];
+            }
+
+            $offset += $pageSize;
+        }
+    }
+
+    private function sortShareesByFrequency(array $sharees): array {
+        usort($sharees, function (array $s1, array $s2) {
+            return $s2['count'] - $s1['count'];
+        });
+        return $sharees;
+    }
+
+    private $searchResultTypeMap = [
+        Share::SHARE_TYPE_USER => 'users',
+        Share::SHARE_TYPE_GROUP => 'groups',
+        Share::SHARE_TYPE_REMOTE => 'remotes',
+        Share::SHARE_TYPE_REMOTE_GROUP => 'remote_groups',
+        Share::SHARE_TYPE_EMAIL => 'emails',
+    ];
+
+    private function getAllSharees(string $user, array $shareTypes): ISearchResult {
+        $result = [];
+        foreach ($shareTypes as $shareType) {
+            $sharees = $this->getAllShareesByType($user, $shareType);
+            $shareTypeResults = [];
+            foreach ($sharees as list($sharee, $displayname)) {
+                if (!isset($this->searchResultTypeMap[$shareType])) {
+                    continue;
+                }
+
+                if (!isset($shareTypeResults[$sharee])) {
+                    $shareTypeResults[$sharee] = [
+                        'count' => 1,
+                        'label' => $displayname,
+                        'value' => [
+                            'shareType' => $shareType,
+                            'shareWith' => $sharee,
+                        ],
+                    ];
+                } else {
+                    $shareTypeResults[$sharee]['count']++;
+                }
+            }
+            $result = array_merge($result, array_values($shareTypeResults));
+        }
+
+        $top5 = array_slice(
+            $this->sortShareesByFrequency($result),
+            0,
+            5
+        );
+
+        $searchResult = new SearchResult();
+        foreach ($this->searchResultTypeMap as $int => $str) {
+            $searchResult->addResultSet(new SearchResultType($str), [], []);
+            foreach ($top5 as $x) {
+                if ($x['value']['shareType'] === $int) {
+                    $searchResult->addResultSet(new SearchResultType($str), [], [$x]);
+                }
+            }
+        }
+        return $searchResult;
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @param string $itemType
+     * @return DataResponse
+     * @throws OCSBadRequestException
+     */
+    public function findRecommended(string $itemType = null, $shareType = null): DataResponse {
+        $shareTypes = [
+            Share::SHARE_TYPE_USER,
+        ];
+
+        if ($itemType === null) {
+            throw new OCSBadRequestException('Missing itemType');
+        } elseif ($itemType === 'file' || $itemType === 'folder') {
+            if ($this->shareManager->allowGroupSharing()) {
+                $shareTypes[] = Share::SHARE_TYPE_GROUP;
+            }
+
+            if ($this->isRemoteSharingAllowed($itemType)) {
+                $shareTypes[] = Share::SHARE_TYPE_REMOTE;
+            }
+
+            if ($this->isRemoteGroupSharingAllowed($itemType)) {
+                $shareTypes[] = Share::SHARE_TYPE_REMOTE_GROUP;
+            }
+
+            if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_EMAIL)) {
+                $shareTypes[] = Share::SHARE_TYPE_EMAIL;
+            }
+
+            if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_ROOM)) {
+                $shareTypes[] = Share::SHARE_TYPE_ROOM;
+            }
+        } else {
+            $shareTypes[] = Share::SHARE_TYPE_GROUP;
+            $shareTypes[] = Share::SHARE_TYPE_EMAIL;
+        }
+
+        // FIXME: DI
+        if (\OC::$server->getAppManager()->isEnabledForUser('circles') && class_exists('\OCA\Circles\ShareByCircleProvider')) {
+            $shareTypes[] = Share::SHARE_TYPE_CIRCLE;
+        }
+
+        if (isset($_GET['shareType']) && is_array($_GET['shareType'])) {
+            $shareTypes = array_intersect($shareTypes, $_GET['shareType']);
+            sort($shareTypes);
+        } else if (is_numeric($shareType)) {
+            $shareTypes = array_intersect($shareTypes, [(int) $shareType]);
+            sort($shareTypes);
+        }
+
+        return new DataResponse(
+            $this->getAllSharees($this->userId, $shareTypes)->asArray()
+        );
+    }
+
+    /**
+     * Method to get out the static call for better testing
+     *
+     * @param string $itemType
+     * @return bool
+     */
+    protected function isRemoteSharingAllowed(string $itemType): bool {
+        try {
+            // FIXME: static foo makes unit testing unnecessarily difficult
+            $backend = \OC\Share\Share::getBackend($itemType);
+            return $backend->isShareTypeAllowed(Share::SHARE_TYPE_REMOTE);
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
+
+    protected function isRemoteGroupSharingAllowed(string $itemType): bool {
+        try {
+            // FIXME: static foo makes unit testing unnecessarily difficult
+            $backend = \OC\Share\Share::getBackend($itemType);
+            return $backend->isShareTypeAllowed(Share::SHARE_TYPE_REMOTE_GROUP);
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
+
+
+    /**
+     * Generates a bunch of pagination links for the current page
+     *
+     * @param int $page Current page
+     * @param array $params Parameters for the URL
+     * @return string
+     */
+    protected function getPaginationLink(int $page, array $params): string {
+        if ($this->isV2()) {
+            $url = $this->urlGenerator->getAbsoluteURL('/ocs/v2.php/apps/files_sharing/api/v1/sharees') . '?';
+        } else {
+            $url = $this->urlGenerator->getAbsoluteURL('/ocs/v1.php/apps/files_sharing/api/v1/sharees') . '?';
+        }
+        $params['page'] = $page + 1;
+        return '<' . $url . http_build_query($params) . '>; rel="next"';
+    }
+
+    /**
+     * @return bool
+     */
+    protected function isV2(): bool {
+        return $this->request->getScriptName() === '/ocs/v2.php';
+    }
 }

apps/files_sharing/lib/Controller/ShareAPIController.php

Indentation +1576 added lines, -1576 removed lines

@@ -76,1584 +76,1584 @@
  */
 class ShareAPIController extends OCSController {
 
-	/** @var IManager */
-	private $shareManager;
-	/** @var IGroupManager */
-	private $groupManager;
-	/** @var IUserManager */
-	private $userManager;
-	/** @var IRootFolder */
-	private $rootFolder;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var string */
-	private $currentUser;
-	/** @var IL10N */
-	private $l;
-	/** @var \OCP\Files\Node */
-	private $lockedNode;
-	/** @var IConfig */
-	private $config;
-	/** @var IAppManager */
-	private $appManager;
-	/** @var IServerContainer */
-	private $serverContainer;
-
-	/**
-	 * Share20OCS constructor.
-	 *
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IManager $shareManager
-	 * @param IGroupManager $groupManager
-	 * @param IUserManager $userManager
-	 * @param IRootFolder $rootFolder
-	 * @param IURLGenerator $urlGenerator
-	 * @param string $userId
-	 * @param IL10N $l10n
-	 * @param IConfig $config
-	 * @param IAppManager $appManager
-	 * @param IServerContainer $serverContainer
-	 */
-	public function __construct(
-		string $appName,
-		IRequest $request,
-		IManager $shareManager,
-		IGroupManager $groupManager,
-		IUserManager $userManager,
-		IRootFolder $rootFolder,
-		IURLGenerator $urlGenerator,
-		string $userId = null,
-		IL10N $l10n,
-		IConfig $config,
-		IAppManager $appManager,
-		IServerContainer $serverContainer
-	) {
-		parent::__construct($appName, $request);
-
-		$this->shareManager = $shareManager;
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-		$this->request = $request;
-		$this->rootFolder = $rootFolder;
-		$this->urlGenerator = $urlGenerator;
-		$this->currentUser = $userId;
-		$this->l = $l10n;
-		$this->config = $config;
-		$this->appManager = $appManager;
-		$this->serverContainer = $serverContainer;
-	}
-
-	/**
-	 * Convert an IShare to an array for OCS output
-	 *
-	 * @param \OCP\Share\IShare $share
-	 * @param Node|null $recipientNode
-	 * @return array
-	 * @throws NotFoundException In case the node can't be resolved.
-	 *
-	 * @suppress PhanUndeclaredClassMethod
-	 */
-	protected function formatShare(\OCP\Share\IShare $share, Node $recipientNode = null): array {
-		$sharedBy = $this->userManager->get($share->getSharedBy());
-		$shareOwner = $this->userManager->get($share->getShareOwner());
-
-		$result = [
-			'id' => $share->getId(),
-			'share_type' => $share->getShareType(),
-			'uid_owner' => $share->getSharedBy(),
-			'displayname_owner' => $sharedBy !== null ? $sharedBy->getDisplayName() : $share->getSharedBy(),
-			// recipient permissions
-			'permissions' => $share->getPermissions(),
-			// current user permissions on this share
-			'can_edit' => $this->canEditShare($share),
-			'can_delete' => $this->canDeleteShare($share),
-			'stime' => $share->getShareTime()->getTimestamp(),
-			'parent' => null,
-			'expiration' => null,
-			'token' => null,
-			'uid_file_owner' => $share->getShareOwner(),
-			'note' => $share->getNote(),
-			'label' => $share->getLabel(),
-			'displayname_file_owner' => $shareOwner !== null ? $shareOwner->getDisplayName() : $share->getShareOwner(),
-		];
-
-		$userFolder = $this->rootFolder->getUserFolder($this->currentUser);
-		if ($recipientNode) {
-			$node = $recipientNode;
-		} else {
-			$nodes = $userFolder->getById($share->getNodeId());
-			if (empty($nodes)) {
-				// fallback to guessing the path
-				$node = $userFolder->get($share->getTarget());
-				if ($node === null || $share->getTarget() === '') {
-					throw new NotFoundException();
-				}
-			} else {
-				$node = reset($nodes);
-			}
-		}
-
-		$result['path'] = $userFolder->getRelativePath($node->getPath());
-		if ($node instanceof \OCP\Files\Folder) {
-			$result['item_type'] = 'folder';
-		} else {
-			$result['item_type'] = 'file';
-		}
-
-		$result['mimetype'] = $node->getMimetype();
-		$result['storage_id'] = $node->getStorage()->getId();
-		$result['storage'] = $node->getStorage()->getCache()->getNumericStorageId();
-		$result['item_source'] = $node->getId();
-		$result['file_source'] = $node->getId();
-		$result['file_parent'] = $node->getParent()->getId();
-		$result['file_target'] = $share->getTarget();
-
-		$expiration = $share->getExpirationDate();
-		if ($expiration !== null) {
-			$result['expiration'] = $expiration->format('Y-m-d 00:00:00');
-		}
-
-		if ($share->getShareType() === Share::SHARE_TYPE_USER) {
-			$sharedWith = $this->userManager->get($share->getSharedWith());
-			$result['share_with'] = $share->getSharedWith();
-			$result['share_with_displayname'] = $sharedWith !== null ? $sharedWith->getDisplayName() : $share->getSharedWith();
-		} else if ($share->getShareType() === Share::SHARE_TYPE_GROUP) {
-			$group = $this->groupManager->get($share->getSharedWith());
-			$result['share_with'] = $share->getSharedWith();
-			$result['share_with_displayname'] = $group !== null ? $group->getDisplayName() : $share->getSharedWith();
-		} else if ($share->getShareType() === IShare::TYPE_LINK) {
-
-			// "share_with" and "share_with_displayname" for passwords of link
-			// shares was deprecated in Nextcloud 15, use "password" instead.
-			$result['share_with'] = $share->getPassword();
-			$result['share_with_displayname'] = '(' . $this->l->t('Shared link') . ')';
-
-			$result['password'] = $share->getPassword();
-
-			$result['send_password_by_talk'] = $share->getSendPasswordByTalk();
-
-			$result['token'] = $share->getToken();
-			$result['url'] = $this->urlGenerator->linkToRouteAbsolute('files_sharing.sharecontroller.showShare', ['token' => $share->getToken()]);
-		} else if ($share->getShareType() === Share::SHARE_TYPE_REMOTE || $share->getShareType() === Share::SHARE_TYPE_REMOTE_GROUP) {
-			$result['share_with'] = $share->getSharedWith();
-			$result['share_with_displayname'] = $this->getDisplayNameFromAddressBook($share->getSharedWith(), 'CLOUD');
-			$result['token'] = $share->getToken();
-		} else if ($share->getShareType() === Share::SHARE_TYPE_EMAIL) {
-			$result['share_with'] = $share->getSharedWith();
-			$result['password'] = $share->getPassword();
-			$result['send_password_by_talk'] = $share->getSendPasswordByTalk();
-			$result['share_with_displayname'] = $this->getDisplayNameFromAddressBook($share->getSharedWith(), 'EMAIL');
-			$result['token'] = $share->getToken();
-		} else if ($share->getShareType() === Share::SHARE_TYPE_CIRCLE) {
-			// getSharedWith() returns either "name (type, owner)" or
-			// "name (type, owner) [id]", depending on the Circles app version.
-			$hasCircleId = (substr($share->getSharedWith(), -1) === ']');
-
-			$result['share_with_displayname'] = $share->getSharedWithDisplayName();
-			if (empty($result['share_with_displayname'])) {
-				$displayNameLength = ($hasCircleId ? strrpos($share->getSharedWith(), ' ') : strlen($share->getSharedWith()));
-				$result['share_with_displayname'] = substr($share->getSharedWith(), 0, $displayNameLength);
-			}
-
-			$result['share_with_avatar'] = $share->getSharedWithAvatar();
-
-			$shareWithStart = ($hasCircleId ? strrpos($share->getSharedWith(), '[') + 1 : 0);
-			$shareWithLength = ($hasCircleId ? -1 : strpos($share->getSharedWith(), ' '));
-			if (is_bool($shareWithLength)) {
-				$shareWithLength = -1;
-			}
-			$result['share_with'] = substr($share->getSharedWith(), $shareWithStart, $shareWithLength);
-		} else if ($share->getShareType() === Share::SHARE_TYPE_ROOM) {
-			$result['share_with'] = $share->getSharedWith();
-			$result['share_with_displayname'] = '';
-
-			try {
-				$result = array_merge($result, $this->getRoomShareHelper()->formatShare($share));
-			} catch (QueryException $e) {}
-		}
-
-
-		$result['mail_send'] = $share->getMailSend() ? 1 : 0;
-		$result['hide_download'] = $share->getHideDownload() ? 1 : 0;
-
-		return $result;
-	}
-
-	/**
-	 * Check if one of the users address books knows the exact property, if
-	 * yes we return the full name.
-	 *
-	 * @param string $query
-	 * @param string $property
-	 * @return string
-	 */
-	private function getDisplayNameFromAddressBook(string $query, string $property): string {
-		// FIXME: If we inject the contacts manager it gets initialized bofore any address books are registered
-		$result = \OC::$server->getContactsManager()->search($query, [$property]);
-		foreach ($result as $r) {
-			foreach ($r[$property] as $value) {
-				if ($value === $query) {
-					return $r['FN'];
-				}
-			}
-		}
-
-		return $query;
-	}
-
-	/**
-	 * Get a specific share by id
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param string $id
-	 * @return DataResponse
-	 * @throws OCSNotFoundException
-	 */
-	public function getShare(string $id): DataResponse {
-		try {
-			$share = $this->getShareById($id);
-		} catch (ShareNotFound $e) {
-			throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
-		}
-
-		try {
-			if ($this->canAccessShare($share)) {
-				$share = $this->formatShare($share);
-				return new DataResponse([$share]);
-			}
-		} catch (NotFoundException $e) {
-			// Fall trough
-		}
-
-		throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
-	}
-
-	/**
-	 * Delete a share
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param string $id
-	 * @return DataResponse
-	 * @throws OCSNotFoundException
-	 */
-	public function deleteShare(string $id): DataResponse {
-		try {
-			$share = $this->getShareById($id);
-		} catch (ShareNotFound $e) {
-			throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
-		}
-
-		try {
-			$this->lock($share->getNode());
-		} catch (LockedException $e) {
-			throw new OCSNotFoundException($this->l->t('Could not delete share'));
-		}
-
-		if (!$this->canAccessShare($share)) {
-			throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
-		}
-
-		// if it's a group share or a room share
-		// we don't delete the share, but only the
-		// mount point. Allowing it to be restored
-		// from the deleted shares
-		if ($this->canDeleteShareFromSelf($share)) {
-			$this->shareManager->deleteFromSelf($share, $this->currentUser);
-		} else {
-			if (!$this->canDeleteShare($share)) {
-				throw new OCSForbiddenException($this->l->t('Could not delete share'));
-			}
-
-			$this->shareManager->deleteShare($share);
-		}
-
-		return new DataResponse();
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param string $path
-	 * @param int $permissions
-	 * @param int $shareType
-	 * @param string $shareWith
-	 * @param string $publicUpload
-	 * @param string $password
-	 * @param string $sendPasswordByTalk
-	 * @param string $expireDate
-	 * @param string $label
-	 *
-	 * @return DataResponse
-	 * @throws NotFoundException
-	 * @throws OCSBadRequestException
-	 * @throws OCSException
-	 * @throws OCSForbiddenException
-	 * @throws OCSNotFoundException
-	 * @throws InvalidPathException
-	 * @suppress PhanUndeclaredClassMethod
-	 */
-	public function createShare(
-		string $path = null,
-		int $permissions = null,
-		int $shareType = -1,
-		string $shareWith = null,
-		string $publicUpload = 'false',
-		string $password = '',
-		string $sendPasswordByTalk = null,
-		string $expireDate = '',
-		string $label = ''
-	): DataResponse {
-		$share = $this->shareManager->newShare();
-
-		if ($permissions === null) {
-			$permissions = $this->config->getAppValue('core', 'shareapi_default_permissions', Constants::PERMISSION_ALL);
-		}
-
-		// Verify path
-		if ($path === null) {
-			throw new OCSNotFoundException($this->l->t('Please specify a file or folder path'));
-		}
-
-		$userFolder = $this->rootFolder->getUserFolder($this->currentUser);
-		try {
-			$path = $userFolder->get($path);
-		} catch (NotFoundException $e) {
-			throw new OCSNotFoundException($this->l->t('Wrong path, file/folder doesn\'t exist'));
-		}
-
-		$share->setNode($path);
-
-		try {
-			$this->lock($share->getNode());
-		} catch (LockedException $e) {
-			throw new OCSNotFoundException($this->l->t('Could not create share'));
-		}
-
-		if ($permissions < 0 || $permissions > Constants::PERMISSION_ALL) {
-			throw new OCSNotFoundException($this->l->t('invalid permissions'));
-		}
-
-		// Shares always require read permissions
-		$permissions |= Constants::PERMISSION_READ;
-
-		if ($path instanceof \OCP\Files\File) {
-			// Single file shares should never have delete or create permissions
-			$permissions &= ~Constants::PERMISSION_DELETE;
-			$permissions &= ~Constants::PERMISSION_CREATE;
-		}
-
-		/**
-		 * Hack for https://github.com/owncloud/core/issues/22587
-		 * We check the permissions via webdav. But the permissions of the mount point
-		 * do not equal the share permissions. Here we fix that for federated mounts.
-		 */
-		if ($path->getStorage()->instanceOfStorage(Storage::class)) {
-			$permissions &= ~($permissions & ~$path->getPermissions());
-		}
-
-		if ($shareType === Share::SHARE_TYPE_USER) {
-			// Valid user is required to share
-			if ($shareWith === null || !$this->userManager->userExists($shareWith)) {
-				throw new OCSNotFoundException($this->l->t('Please specify a valid user'));
-			}
-			$share->setSharedWith($shareWith);
-			$share->setPermissions($permissions);
-		} else if ($shareType === Share::SHARE_TYPE_GROUP) {
-			if (!$this->shareManager->allowGroupSharing()) {
-				throw new OCSNotFoundException($this->l->t('Group sharing is disabled by the administrator'));
-			}
-
-			// Valid group is required to share
-			if ($shareWith === null || !$this->groupManager->groupExists($shareWith)) {
-				throw new OCSNotFoundException($this->l->t('Please specify a valid group'));
-			}
-			$share->setSharedWith($shareWith);
-			$share->setPermissions($permissions);
-		} else if ($shareType === Share::SHARE_TYPE_LINK
-			|| $shareType === Share::SHARE_TYPE_EMAIL) {
-
-			// Can we even share links?
-			if (!$this->shareManager->shareApiAllowLinks()) {
-				throw new OCSNotFoundException($this->l->t('Public link sharing is disabled by the administrator'));
-			}
-
-			if ($publicUpload === 'true') {
-				// Check if public upload is allowed
-				if (!$this->shareManager->shareApiLinkAllowPublicUpload()) {
-					throw new OCSForbiddenException($this->l->t('Public upload disabled by the administrator'));
-				}
-
-				// Public upload can only be set for folders
-				if ($path instanceof \OCP\Files\File) {
-					throw new OCSNotFoundException($this->l->t('Public upload is only possible for publicly shared folders'));
-				}
-
-				$share->setPermissions(
-					Constants::PERMISSION_READ |
-					Constants::PERMISSION_CREATE |
-					Constants::PERMISSION_UPDATE |
-					Constants::PERMISSION_DELETE
-				);
-			} else {
-				$share->setPermissions(Constants::PERMISSION_READ);
-			}
-
-			// Set password
-			if ($password !== '') {
-				$share->setPassword($password);
-			}
-
-			// Only share by mail have a recipient
-			if ($shareType === Share::SHARE_TYPE_EMAIL) {
-				$share->setSharedWith($shareWith);
-			} else {
-				// Only link share have a label
-				if (!empty($label)) {
-					$share->setLabel($label);
-				}
-			}
-
-			if ($sendPasswordByTalk === 'true') {
-				if (!$this->appManager->isEnabledForUser('spreed')) {
-					throw new OCSForbiddenException($this->l->t('Sharing %s sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled', [$path->getPath()]));
-				}
-
-				$share->setSendPasswordByTalk(true);
-			}
-
-			//Expire date
-			if ($expireDate !== '') {
-				try {
-					$expireDate = $this->parseDate($expireDate);
-					$share->setExpirationDate($expireDate);
-				} catch (\Exception $e) {
-					throw new OCSNotFoundException($this->l->t('Invalid date, date format must be YYYY-MM-DD'));
-				}
-			}
-		} else if ($shareType === Share::SHARE_TYPE_REMOTE) {
-			if (!$this->shareManager->outgoingServer2ServerSharesAllowed()) {
-				throw new OCSForbiddenException($this->l->t('Sharing %1$s failed because the back end does not allow shares from type %2$s', [$path->getPath(), $shareType]));
-			}
-
-			$share->setSharedWith($shareWith);
-			$share->setPermissions($permissions);
-		} else if ($shareType === Share::SHARE_TYPE_REMOTE_GROUP) {
-			if (!$this->shareManager->outgoingServer2ServerGroupSharesAllowed()) {
-				throw new OCSForbiddenException($this->l->t('Sharing %1$s failed because the back end does not allow shares from type %2$s', [$path->getPath(), $shareType]));
-			}
-
-			$share->setSharedWith($shareWith);
-			$share->setPermissions($permissions);
-		} else if ($shareType === Share::SHARE_TYPE_CIRCLE) {
-			if (!\OC::$server->getAppManager()->isEnabledForUser('circles') || !class_exists('\OCA\Circles\ShareByCircleProvider')) {
-				throw new OCSNotFoundException($this->l->t('You cannot share to a Circle if the app is not enabled'));
-			}
-
-			$circle = \OCA\Circles\Api\v1\Circles::detailsCircle($shareWith);
-
-			// Valid circle is required to share
-			if ($circle === null) {
-				throw new OCSNotFoundException($this->l->t('Please specify a valid circle'));
-			}
-			$share->setSharedWith($shareWith);
-			$share->setPermissions($permissions);
-		} else if ($shareType === Share::SHARE_TYPE_ROOM) {
-			try {
-				$this->getRoomShareHelper()->createShare($share, $shareWith, $permissions, $expireDate);
-			} catch (QueryException $e) {
-				throw new OCSForbiddenException($this->l->t('Sharing %s failed because the back end does not support room shares', [$path->getPath()]));
-			}
-		} else {
-			throw new OCSBadRequestException($this->l->t('Unknown share type'));
-		}
-
-		$share->setShareType($shareType);
-		$share->setSharedBy($this->currentUser);
-
-		try {
-			$share = $this->shareManager->createShare($share);
-		} catch (GenericShareException $e) {
-			$code = $e->getCode() === 0 ? 403 : $e->getCode();
-			throw new OCSException($e->getHint(), $code);
-		} catch (\Exception $e) {
-			throw new OCSForbiddenException($e->getMessage(), $e);
-		}
-
-		$output = $this->formatShare($share);
-
-		return new DataResponse($output);
-	}
-
-	/**
-	 * @param null|Node $node
-	 * @param boolean $includeTags
-	 *
-	 * @return array
-	 */
-	private function getSharedWithMe($node, bool $includeTags): array {
-
-		$userShares = $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_USER, $node, -1, 0);
-		$groupShares = $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_GROUP, $node, -1, 0);
-		$circleShares = $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_CIRCLE, $node, -1, 0);
-		$roomShares = $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_ROOM, $node, -1, 0);
-
-		$shares = array_merge($userShares, $groupShares, $circleShares, $roomShares);
-
-		$shares = array_filter($shares, function (IShare $share) {
-			return $share->getShareOwner() !== $this->currentUser;
-		});
-
-		$formatted = [];
-		foreach ($shares as $share) {
-			if ($this->canAccessShare($share)) {
-				try {
-					$formatted[] = $this->formatShare($share);
-				} catch (NotFoundException $e) {
-					// Ignore this share
-				}
-			}
-		}
-
-		if ($includeTags) {
-			$formatted = Helper::populateTags($formatted, 'file_source', \OC::$server->getTagManager());
-		}
-
-		return $formatted;
-	}
-
-	/**
-	 * @param \OCP\Files\Node $folder
-	 *
-	 * @return array
-	 * @throws OCSBadRequestException
-	 * @throws NotFoundException
-	 */
-	private function getSharesInDir(Node $folder): array {
-		if (!($folder instanceof \OCP\Files\Folder)) {
-			throw new OCSBadRequestException($this->l->t('Not a directory'));
-		}
-
-		$nodes = $folder->getDirectoryListing();
-
-		/** @var \OCP\Share\IShare[] $shares */
-		$shares = array_reduce($nodes, function ($carry, $node) {
-			$carry = array_merge($carry, $this->getAllShares($node, true));
-			return $carry;
-		}, []);
-
-		// filter out duplicate shares
-		$known = [];
-
-
-		$formatted = $miniFormatted = [];
-		$resharingRight = false;
-		$known = [];
-		foreach ($shares as $share) {
-			if (in_array($share->getId(), $known) || $share->getSharedWith() === $this->currentUser) {
-				continue;
-			}
-
-			try {
-				$format = $this->formatShare($share);
-
-				$known[] = $share->getId();
-				$formatted[] = $format;
-				if ($share->getSharedBy() === $this->currentUser) {
-					$miniFormatted[] = $format;
-				}
-				if (!$resharingRight && $this->shareProviderResharingRights($this->currentUser, $share, $folder)) {
-					$resharingRight = true;
-				}
-			} catch (\Exception $e) {
-				//Ignore this share
-			}
-		}
-
-		if (!$resharingRight) {
-			$formatted = $miniFormatted;
-		}
-
-		return $formatted;
-	}
-
-	/**
-	 * The getShares function.
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param string $shared_with_me
-	 * @param string $reshares
-	 * @param string $subfiles
-	 * @param string $path
-	 *
-	 * - Get shares by the current user
-	 * - Get shares by the current user and reshares (?reshares=true)
-	 * - Get shares with the current user (?shared_with_me=true)
-	 * - Get shares for a specific path (?path=...)
-	 * - Get all shares in a folder (?subfiles=true&path=..)
-	 *
-	 * @param string $include_tags
-	 *
-	 * @return DataResponse
-	 * @throws NotFoundException
-	 * @throws OCSBadRequestException
-	 * @throws OCSNotFoundException
-	 */
-	public function getShares(
-		string $shared_with_me = 'false',
-		string $reshares = 'false',
-		string $subfiles = 'false',
-		string $path = '',
-		string $include_tags = 'false'
-	): DataResponse {
-
-		$node = null;
-		if ($path !== '') {
-			$userFolder = $this->rootFolder->getUserFolder($this->currentUser);
-			try {
-				$node = $userFolder->get($path);
-				$this->lock($node);
-			} catch (NotFoundException $e) {
-				throw new OCSNotFoundException(
-					$this->l->t('Wrong path, file/folder doesn\'t exist')
-				);
-			} catch (LockedException $e) {
-				throw new OCSNotFoundException($this->l->t('Could not lock node'));
-			}
-		}
-
-		$shares = $this->getFormattedShares(
-			$this->currentUser,
-			$node,
-			($shared_with_me === 'true'),
-			($reshares === 'true'),
-			($subfiles === 'true'),
-			($include_tags === 'true')
-		);
-
-		return new DataResponse($shares);
-	}
-
-
-	/**
-	 * @param string $viewer
-	 * @param Node $node
-	 * @param bool $sharedWithMe
-	 * @param bool $reShares
-	 * @param bool $subFiles
-	 * @param bool $includeTags
-	 *
-	 * @return array
-	 * @throws NotFoundException
-	 * @throws OCSBadRequestException
-	 */
-	private function getFormattedShares(
-		string $viewer, $node = null, bool $sharedWithMe = false, bool $reShares = false,
-		bool $subFiles = false, bool $includeTags = false
-	): array {
-
-		if ($sharedWithMe) {
-			return $this->getSharedWithMe($node, $includeTags);
-		}
-
-		if ($subFiles) {
-			return $this->getSharesInDir($node);
-		}
-
-		$shares = $this->getSharesFromNode($viewer, $node, $reShares);
-
-		$known = $formatted = $miniFormatted = [];
-		$resharingRight = false;
-		foreach ($shares as $share) {
-			try {
-				$share->getNode();
-			} catch (NotFoundException $e) {
-				/*
+    /** @var IManager */
+    private $shareManager;
+    /** @var IGroupManager */
+    private $groupManager;
+    /** @var IUserManager */
+    private $userManager;
+    /** @var IRootFolder */
+    private $rootFolder;
+    /** @var IURLGenerator */
+    private $urlGenerator;
+    /** @var string */
+    private $currentUser;
+    /** @var IL10N */
+    private $l;
+    /** @var \OCP\Files\Node */
+    private $lockedNode;
+    /** @var IConfig */
+    private $config;
+    /** @var IAppManager */
+    private $appManager;
+    /** @var IServerContainer */
+    private $serverContainer;
+
+    /**
+     * Share20OCS constructor.
+     *
+     * @param string $appName
+     * @param IRequest $request
+     * @param IManager $shareManager
+     * @param IGroupManager $groupManager
+     * @param IUserManager $userManager
+     * @param IRootFolder $rootFolder
+     * @param IURLGenerator $urlGenerator
+     * @param string $userId
+     * @param IL10N $l10n
+     * @param IConfig $config
+     * @param IAppManager $appManager
+     * @param IServerContainer $serverContainer
+     */
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        IManager $shareManager,
+        IGroupManager $groupManager,
+        IUserManager $userManager,
+        IRootFolder $rootFolder,
+        IURLGenerator $urlGenerator,
+        string $userId = null,
+        IL10N $l10n,
+        IConfig $config,
+        IAppManager $appManager,
+        IServerContainer $serverContainer
+    ) {
+        parent::__construct($appName, $request);
+
+        $this->shareManager = $shareManager;
+        $this->userManager = $userManager;
+        $this->groupManager = $groupManager;
+        $this->request = $request;
+        $this->rootFolder = $rootFolder;
+        $this->urlGenerator = $urlGenerator;
+        $this->currentUser = $userId;
+        $this->l = $l10n;
+        $this->config = $config;
+        $this->appManager = $appManager;
+        $this->serverContainer = $serverContainer;
+    }
+
+    /**
+     * Convert an IShare to an array for OCS output
+     *
+     * @param \OCP\Share\IShare $share
+     * @param Node|null $recipientNode
+     * @return array
+     * @throws NotFoundException In case the node can't be resolved.
+     *
+     * @suppress PhanUndeclaredClassMethod
+     */
+    protected function formatShare(\OCP\Share\IShare $share, Node $recipientNode = null): array {
+        $sharedBy = $this->userManager->get($share->getSharedBy());
+        $shareOwner = $this->userManager->get($share->getShareOwner());
+
+        $result = [
+            'id' => $share->getId(),
+            'share_type' => $share->getShareType(),
+            'uid_owner' => $share->getSharedBy(),
+            'displayname_owner' => $sharedBy !== null ? $sharedBy->getDisplayName() : $share->getSharedBy(),
+            // recipient permissions
+            'permissions' => $share->getPermissions(),
+            // current user permissions on this share
+            'can_edit' => $this->canEditShare($share),
+            'can_delete' => $this->canDeleteShare($share),
+            'stime' => $share->getShareTime()->getTimestamp(),
+            'parent' => null,
+            'expiration' => null,
+            'token' => null,
+            'uid_file_owner' => $share->getShareOwner(),
+            'note' => $share->getNote(),
+            'label' => $share->getLabel(),
+            'displayname_file_owner' => $shareOwner !== null ? $shareOwner->getDisplayName() : $share->getShareOwner(),
+        ];
+
+        $userFolder = $this->rootFolder->getUserFolder($this->currentUser);
+        if ($recipientNode) {
+            $node = $recipientNode;
+        } else {
+            $nodes = $userFolder->getById($share->getNodeId());
+            if (empty($nodes)) {
+                // fallback to guessing the path
+                $node = $userFolder->get($share->getTarget());
+                if ($node === null || $share->getTarget() === '') {
+                    throw new NotFoundException();
+                }
+            } else {
+                $node = reset($nodes);
+            }
+        }
+
+        $result['path'] = $userFolder->getRelativePath($node->getPath());
+        if ($node instanceof \OCP\Files\Folder) {
+            $result['item_type'] = 'folder';
+        } else {
+            $result['item_type'] = 'file';
+        }
+
+        $result['mimetype'] = $node->getMimetype();
+        $result['storage_id'] = $node->getStorage()->getId();
+        $result['storage'] = $node->getStorage()->getCache()->getNumericStorageId();
+        $result['item_source'] = $node->getId();
+        $result['file_source'] = $node->getId();
+        $result['file_parent'] = $node->getParent()->getId();
+        $result['file_target'] = $share->getTarget();
+
+        $expiration = $share->getExpirationDate();
+        if ($expiration !== null) {
+            $result['expiration'] = $expiration->format('Y-m-d 00:00:00');
+        }
+
+        if ($share->getShareType() === Share::SHARE_TYPE_USER) {
+            $sharedWith = $this->userManager->get($share->getSharedWith());
+            $result['share_with'] = $share->getSharedWith();
+            $result['share_with_displayname'] = $sharedWith !== null ? $sharedWith->getDisplayName() : $share->getSharedWith();
+        } else if ($share->getShareType() === Share::SHARE_TYPE_GROUP) {
+            $group = $this->groupManager->get($share->getSharedWith());
+            $result['share_with'] = $share->getSharedWith();
+            $result['share_with_displayname'] = $group !== null ? $group->getDisplayName() : $share->getSharedWith();
+        } else if ($share->getShareType() === IShare::TYPE_LINK) {
+
+            // "share_with" and "share_with_displayname" for passwords of link
+            // shares was deprecated in Nextcloud 15, use "password" instead.
+            $result['share_with'] = $share->getPassword();
+            $result['share_with_displayname'] = '(' . $this->l->t('Shared link') . ')';
+
+            $result['password'] = $share->getPassword();
+
+            $result['send_password_by_talk'] = $share->getSendPasswordByTalk();
+
+            $result['token'] = $share->getToken();
+            $result['url'] = $this->urlGenerator->linkToRouteAbsolute('files_sharing.sharecontroller.showShare', ['token' => $share->getToken()]);
+        } else if ($share->getShareType() === Share::SHARE_TYPE_REMOTE || $share->getShareType() === Share::SHARE_TYPE_REMOTE_GROUP) {
+            $result['share_with'] = $share->getSharedWith();
+            $result['share_with_displayname'] = $this->getDisplayNameFromAddressBook($share->getSharedWith(), 'CLOUD');
+            $result['token'] = $share->getToken();
+        } else if ($share->getShareType() === Share::SHARE_TYPE_EMAIL) {
+            $result['share_with'] = $share->getSharedWith();
+            $result['password'] = $share->getPassword();
+            $result['send_password_by_talk'] = $share->getSendPasswordByTalk();
+            $result['share_with_displayname'] = $this->getDisplayNameFromAddressBook($share->getSharedWith(), 'EMAIL');
+            $result['token'] = $share->getToken();
+        } else if ($share->getShareType() === Share::SHARE_TYPE_CIRCLE) {
+            // getSharedWith() returns either "name (type, owner)" or
+            // "name (type, owner) [id]", depending on the Circles app version.
+            $hasCircleId = (substr($share->getSharedWith(), -1) === ']');
+
+            $result['share_with_displayname'] = $share->getSharedWithDisplayName();
+            if (empty($result['share_with_displayname'])) {
+                $displayNameLength = ($hasCircleId ? strrpos($share->getSharedWith(), ' ') : strlen($share->getSharedWith()));
+                $result['share_with_displayname'] = substr($share->getSharedWith(), 0, $displayNameLength);
+            }
+
+            $result['share_with_avatar'] = $share->getSharedWithAvatar();
+
+            $shareWithStart = ($hasCircleId ? strrpos($share->getSharedWith(), '[') + 1 : 0);
+            $shareWithLength = ($hasCircleId ? -1 : strpos($share->getSharedWith(), ' '));
+            if (is_bool($shareWithLength)) {
+                $shareWithLength = -1;
+            }
+            $result['share_with'] = substr($share->getSharedWith(), $shareWithStart, $shareWithLength);
+        } else if ($share->getShareType() === Share::SHARE_TYPE_ROOM) {
+            $result['share_with'] = $share->getSharedWith();
+            $result['share_with_displayname'] = '';
+
+            try {
+                $result = array_merge($result, $this->getRoomShareHelper()->formatShare($share));
+            } catch (QueryException $e) {}
+        }
+
+
+        $result['mail_send'] = $share->getMailSend() ? 1 : 0;
+        $result['hide_download'] = $share->getHideDownload() ? 1 : 0;
+
+        return $result;
+    }
+
+    /**
+     * Check if one of the users address books knows the exact property, if
+     * yes we return the full name.
+     *
+     * @param string $query
+     * @param string $property
+     * @return string
+     */
+    private function getDisplayNameFromAddressBook(string $query, string $property): string {
+        // FIXME: If we inject the contacts manager it gets initialized bofore any address books are registered
+        $result = \OC::$server->getContactsManager()->search($query, [$property]);
+        foreach ($result as $r) {
+            foreach ($r[$property] as $value) {
+                if ($value === $query) {
+                    return $r['FN'];
+                }
+            }
+        }
+
+        return $query;
+    }
+
+    /**
+     * Get a specific share by id
+     *
+     * @NoAdminRequired
+     *
+     * @param string $id
+     * @return DataResponse
+     * @throws OCSNotFoundException
+     */
+    public function getShare(string $id): DataResponse {
+        try {
+            $share = $this->getShareById($id);
+        } catch (ShareNotFound $e) {
+            throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
+        }
+
+        try {
+            if ($this->canAccessShare($share)) {
+                $share = $this->formatShare($share);
+                return new DataResponse([$share]);
+            }
+        } catch (NotFoundException $e) {
+            // Fall trough
+        }
+
+        throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
+    }
+
+    /**
+     * Delete a share
+     *
+     * @NoAdminRequired
+     *
+     * @param string $id
+     * @return DataResponse
+     * @throws OCSNotFoundException
+     */
+    public function deleteShare(string $id): DataResponse {
+        try {
+            $share = $this->getShareById($id);
+        } catch (ShareNotFound $e) {
+            throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
+        }
+
+        try {
+            $this->lock($share->getNode());
+        } catch (LockedException $e) {
+            throw new OCSNotFoundException($this->l->t('Could not delete share'));
+        }
+
+        if (!$this->canAccessShare($share)) {
+            throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
+        }
+
+        // if it's a group share or a room share
+        // we don't delete the share, but only the
+        // mount point. Allowing it to be restored
+        // from the deleted shares
+        if ($this->canDeleteShareFromSelf($share)) {
+            $this->shareManager->deleteFromSelf($share, $this->currentUser);
+        } else {
+            if (!$this->canDeleteShare($share)) {
+                throw new OCSForbiddenException($this->l->t('Could not delete share'));
+            }
+
+            $this->shareManager->deleteShare($share);
+        }
+
+        return new DataResponse();
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @param string $path
+     * @param int $permissions
+     * @param int $shareType
+     * @param string $shareWith
+     * @param string $publicUpload
+     * @param string $password
+     * @param string $sendPasswordByTalk
+     * @param string $expireDate
+     * @param string $label
+     *
+     * @return DataResponse
+     * @throws NotFoundException
+     * @throws OCSBadRequestException
+     * @throws OCSException
+     * @throws OCSForbiddenException
+     * @throws OCSNotFoundException
+     * @throws InvalidPathException
+     * @suppress PhanUndeclaredClassMethod
+     */
+    public function createShare(
+        string $path = null,
+        int $permissions = null,
+        int $shareType = -1,
+        string $shareWith = null,
+        string $publicUpload = 'false',
+        string $password = '',
+        string $sendPasswordByTalk = null,
+        string $expireDate = '',
+        string $label = ''
+    ): DataResponse {
+        $share = $this->shareManager->newShare();
+
+        if ($permissions === null) {
+            $permissions = $this->config->getAppValue('core', 'shareapi_default_permissions', Constants::PERMISSION_ALL);
+        }
+
+        // Verify path
+        if ($path === null) {
+            throw new OCSNotFoundException($this->l->t('Please specify a file or folder path'));
+        }
+
+        $userFolder = $this->rootFolder->getUserFolder($this->currentUser);
+        try {
+            $path = $userFolder->get($path);
+        } catch (NotFoundException $e) {
+            throw new OCSNotFoundException($this->l->t('Wrong path, file/folder doesn\'t exist'));
+        }
+
+        $share->setNode($path);
+
+        try {
+            $this->lock($share->getNode());
+        } catch (LockedException $e) {
+            throw new OCSNotFoundException($this->l->t('Could not create share'));
+        }
+
+        if ($permissions < 0 || $permissions > Constants::PERMISSION_ALL) {
+            throw new OCSNotFoundException($this->l->t('invalid permissions'));
+        }
+
+        // Shares always require read permissions
+        $permissions |= Constants::PERMISSION_READ;
+
+        if ($path instanceof \OCP\Files\File) {
+            // Single file shares should never have delete or create permissions
+            $permissions &= ~Constants::PERMISSION_DELETE;
+            $permissions &= ~Constants::PERMISSION_CREATE;
+        }
+
+        /**
+         * Hack for https://github.com/owncloud/core/issues/22587
+         * We check the permissions via webdav. But the permissions of the mount point
+         * do not equal the share permissions. Here we fix that for federated mounts.
+         */
+        if ($path->getStorage()->instanceOfStorage(Storage::class)) {
+            $permissions &= ~($permissions & ~$path->getPermissions());
+        }
+
+        if ($shareType === Share::SHARE_TYPE_USER) {
+            // Valid user is required to share
+            if ($shareWith === null || !$this->userManager->userExists($shareWith)) {
+                throw new OCSNotFoundException($this->l->t('Please specify a valid user'));
+            }
+            $share->setSharedWith($shareWith);
+            $share->setPermissions($permissions);
+        } else if ($shareType === Share::SHARE_TYPE_GROUP) {
+            if (!$this->shareManager->allowGroupSharing()) {
+                throw new OCSNotFoundException($this->l->t('Group sharing is disabled by the administrator'));
+            }
+
+            // Valid group is required to share
+            if ($shareWith === null || !$this->groupManager->groupExists($shareWith)) {
+                throw new OCSNotFoundException($this->l->t('Please specify a valid group'));
+            }
+            $share->setSharedWith($shareWith);
+            $share->setPermissions($permissions);
+        } else if ($shareType === Share::SHARE_TYPE_LINK
+            || $shareType === Share::SHARE_TYPE_EMAIL) {
+
+            // Can we even share links?
+            if (!$this->shareManager->shareApiAllowLinks()) {
+                throw new OCSNotFoundException($this->l->t('Public link sharing is disabled by the administrator'));
+            }
+
+            if ($publicUpload === 'true') {
+                // Check if public upload is allowed
+                if (!$this->shareManager->shareApiLinkAllowPublicUpload()) {
+                    throw new OCSForbiddenException($this->l->t('Public upload disabled by the administrator'));
+                }
+
+                // Public upload can only be set for folders
+                if ($path instanceof \OCP\Files\File) {
+                    throw new OCSNotFoundException($this->l->t('Public upload is only possible for publicly shared folders'));
+                }
+
+                $share->setPermissions(
+                    Constants::PERMISSION_READ |
+                    Constants::PERMISSION_CREATE |
+                    Constants::PERMISSION_UPDATE |
+                    Constants::PERMISSION_DELETE
+                );
+            } else {
+                $share->setPermissions(Constants::PERMISSION_READ);
+            }
+
+            // Set password
+            if ($password !== '') {
+                $share->setPassword($password);
+            }
+
+            // Only share by mail have a recipient
+            if ($shareType === Share::SHARE_TYPE_EMAIL) {
+                $share->setSharedWith($shareWith);
+            } else {
+                // Only link share have a label
+                if (!empty($label)) {
+                    $share->setLabel($label);
+                }
+            }
+
+            if ($sendPasswordByTalk === 'true') {
+                if (!$this->appManager->isEnabledForUser('spreed')) {
+                    throw new OCSForbiddenException($this->l->t('Sharing %s sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled', [$path->getPath()]));
+                }
+
+                $share->setSendPasswordByTalk(true);
+            }
+
+            //Expire date
+            if ($expireDate !== '') {
+                try {
+                    $expireDate = $this->parseDate($expireDate);
+                    $share->setExpirationDate($expireDate);
+                } catch (\Exception $e) {
+                    throw new OCSNotFoundException($this->l->t('Invalid date, date format must be YYYY-MM-DD'));
+                }
+            }
+        } else if ($shareType === Share::SHARE_TYPE_REMOTE) {
+            if (!$this->shareManager->outgoingServer2ServerSharesAllowed()) {
+                throw new OCSForbiddenException($this->l->t('Sharing %1$s failed because the back end does not allow shares from type %2$s', [$path->getPath(), $shareType]));
+            }
+
+            $share->setSharedWith($shareWith);
+            $share->setPermissions($permissions);
+        } else if ($shareType === Share::SHARE_TYPE_REMOTE_GROUP) {
+            if (!$this->shareManager->outgoingServer2ServerGroupSharesAllowed()) {
+                throw new OCSForbiddenException($this->l->t('Sharing %1$s failed because the back end does not allow shares from type %2$s', [$path->getPath(), $shareType]));
+            }
+
+            $share->setSharedWith($shareWith);
+            $share->setPermissions($permissions);
+        } else if ($shareType === Share::SHARE_TYPE_CIRCLE) {
+            if (!\OC::$server->getAppManager()->isEnabledForUser('circles') || !class_exists('\OCA\Circles\ShareByCircleProvider')) {
+                throw new OCSNotFoundException($this->l->t('You cannot share to a Circle if the app is not enabled'));
+            }
+
+            $circle = \OCA\Circles\Api\v1\Circles::detailsCircle($shareWith);
+
+            // Valid circle is required to share
+            if ($circle === null) {
+                throw new OCSNotFoundException($this->l->t('Please specify a valid circle'));
+            }
+            $share->setSharedWith($shareWith);
+            $share->setPermissions($permissions);
+        } else if ($shareType === Share::SHARE_TYPE_ROOM) {
+            try {
+                $this->getRoomShareHelper()->createShare($share, $shareWith, $permissions, $expireDate);
+            } catch (QueryException $e) {
+                throw new OCSForbiddenException($this->l->t('Sharing %s failed because the back end does not support room shares', [$path->getPath()]));
+            }
+        } else {
+            throw new OCSBadRequestException($this->l->t('Unknown share type'));
+        }
+
+        $share->setShareType($shareType);
+        $share->setSharedBy($this->currentUser);
+
+        try {
+            $share = $this->shareManager->createShare($share);
+        } catch (GenericShareException $e) {
+            $code = $e->getCode() === 0 ? 403 : $e->getCode();
+            throw new OCSException($e->getHint(), $code);
+        } catch (\Exception $e) {
+            throw new OCSForbiddenException($e->getMessage(), $e);
+        }
+
+        $output = $this->formatShare($share);
+
+        return new DataResponse($output);
+    }
+
+    /**
+     * @param null|Node $node
+     * @param boolean $includeTags
+     *
+     * @return array
+     */
+    private function getSharedWithMe($node, bool $includeTags): array {
+
+        $userShares = $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_USER, $node, -1, 0);
+        $groupShares = $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_GROUP, $node, -1, 0);
+        $circleShares = $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_CIRCLE, $node, -1, 0);
+        $roomShares = $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_ROOM, $node, -1, 0);
+
+        $shares = array_merge($userShares, $groupShares, $circleShares, $roomShares);
+
+        $shares = array_filter($shares, function (IShare $share) {
+            return $share->getShareOwner() !== $this->currentUser;
+        });
+
+        $formatted = [];
+        foreach ($shares as $share) {
+            if ($this->canAccessShare($share)) {
+                try {
+                    $formatted[] = $this->formatShare($share);
+                } catch (NotFoundException $e) {
+                    // Ignore this share
+                }
+            }
+        }
+
+        if ($includeTags) {
+            $formatted = Helper::populateTags($formatted, 'file_source', \OC::$server->getTagManager());
+        }
+
+        return $formatted;
+    }
+
+    /**
+     * @param \OCP\Files\Node $folder
+     *
+     * @return array
+     * @throws OCSBadRequestException
+     * @throws NotFoundException
+     */
+    private function getSharesInDir(Node $folder): array {
+        if (!($folder instanceof \OCP\Files\Folder)) {
+            throw new OCSBadRequestException($this->l->t('Not a directory'));
+        }
+
+        $nodes = $folder->getDirectoryListing();
+
+        /** @var \OCP\Share\IShare[] $shares */
+        $shares = array_reduce($nodes, function ($carry, $node) {
+            $carry = array_merge($carry, $this->getAllShares($node, true));
+            return $carry;
+        }, []);
+
+        // filter out duplicate shares
+        $known = [];
+
+
+        $formatted = $miniFormatted = [];
+        $resharingRight = false;
+        $known = [];
+        foreach ($shares as $share) {
+            if (in_array($share->getId(), $known) || $share->getSharedWith() === $this->currentUser) {
+                continue;
+            }
+
+            try {
+                $format = $this->formatShare($share);
+
+                $known[] = $share->getId();
+                $formatted[] = $format;
+                if ($share->getSharedBy() === $this->currentUser) {
+                    $miniFormatted[] = $format;
+                }
+                if (!$resharingRight && $this->shareProviderResharingRights($this->currentUser, $share, $folder)) {
+                    $resharingRight = true;
+                }
+            } catch (\Exception $e) {
+                //Ignore this share
+            }
+        }
+
+        if (!$resharingRight) {
+            $formatted = $miniFormatted;
+        }
+
+        return $formatted;
+    }
+
+    /**
+     * The getShares function.
+     *
+     * @NoAdminRequired
+     *
+     * @param string $shared_with_me
+     * @param string $reshares
+     * @param string $subfiles
+     * @param string $path
+     *
+     * - Get shares by the current user
+     * - Get shares by the current user and reshares (?reshares=true)
+     * - Get shares with the current user (?shared_with_me=true)
+     * - Get shares for a specific path (?path=...)
+     * - Get all shares in a folder (?subfiles=true&path=..)
+     *
+     * @param string $include_tags
+     *
+     * @return DataResponse
+     * @throws NotFoundException
+     * @throws OCSBadRequestException
+     * @throws OCSNotFoundException
+     */
+    public function getShares(
+        string $shared_with_me = 'false',
+        string $reshares = 'false',
+        string $subfiles = 'false',
+        string $path = '',
+        string $include_tags = 'false'
+    ): DataResponse {
+
+        $node = null;
+        if ($path !== '') {
+            $userFolder = $this->rootFolder->getUserFolder($this->currentUser);
+            try {
+                $node = $userFolder->get($path);
+                $this->lock($node);
+            } catch (NotFoundException $e) {
+                throw new OCSNotFoundException(
+                    $this->l->t('Wrong path, file/folder doesn\'t exist')
+                );
+            } catch (LockedException $e) {
+                throw new OCSNotFoundException($this->l->t('Could not lock node'));
+            }
+        }
+
+        $shares = $this->getFormattedShares(
+            $this->currentUser,
+            $node,
+            ($shared_with_me === 'true'),
+            ($reshares === 'true'),
+            ($subfiles === 'true'),
+            ($include_tags === 'true')
+        );
+
+        return new DataResponse($shares);
+    }
+
+
+    /**
+     * @param string $viewer
+     * @param Node $node
+     * @param bool $sharedWithMe
+     * @param bool $reShares
+     * @param bool $subFiles
+     * @param bool $includeTags
+     *
+     * @return array
+     * @throws NotFoundException
+     * @throws OCSBadRequestException
+     */
+    private function getFormattedShares(
+        string $viewer, $node = null, bool $sharedWithMe = false, bool $reShares = false,
+        bool $subFiles = false, bool $includeTags = false
+    ): array {
+
+        if ($sharedWithMe) {
+            return $this->getSharedWithMe($node, $includeTags);
+        }
+
+        if ($subFiles) {
+            return $this->getSharesInDir($node);
+        }
+
+        $shares = $this->getSharesFromNode($viewer, $node, $reShares);
+
+        $known = $formatted = $miniFormatted = [];
+        $resharingRight = false;
+        foreach ($shares as $share) {
+            try {
+                $share->getNode();
+            } catch (NotFoundException $e) {
+                /*
 				 * Ignore shares where we can't get the node
 				 * For example delted shares
 				 */
-				continue;
-			}
-
-			if (in_array($share->getId(), $known) || $share->getSharedWith() === $this->currentUser) {
-				continue;
-			}
-
-			$known[] = $share->getId();
-			try {
-				/** @var IShare $share */
-				$format = $this->formatShare($share, $node);
-				$formatted[] = $format;
-
-				// let's also build a list of shares created
-				// by the current user only, in case
-				// there is no resharing rights
-				if ($share->getSharedBy() === $this->currentUser) {
-					$miniFormatted[] = $format;
-				}
-
-				// check if one of those share is shared with me
-				// and if I have resharing rights on it
-				if (!$resharingRight && $this->shareProviderResharingRights($this->currentUser, $share, $node)) {
-					$resharingRight = true;
-				}
-			} catch (InvalidPathException | NotFoundException $e) {
-			}
-		}
-
-		if (!$resharingRight) {
-			$formatted = $miniFormatted;
-		}
-
-		if ($includeTags) {
-			$formatted =
-				Helper::populateTags($formatted, 'file_source', \OC::$server->getTagManager());
-		}
-
-		return $formatted;
-	}
-
-
-	/**
-	 * The getInheritedShares function.
-	 * returns all shares relative to a file, including parent folders shares rights.
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param string $path
-	 *
-	 * - Get shares by the current user
-	 * - Get shares by the current user and reshares (?reshares=true)
-	 * - Get shares with the current user (?shared_with_me=true)
-	 * - Get shares for a specific path (?path=...)
-	 * - Get all shares in a folder (?subfiles=true&path=..)
-	 *
-	 * @return DataResponse
-	 * @throws InvalidPathException
-	 * @throws NotFoundException
-	 * @throws OCSNotFoundException
-	 * @throws OCSBadRequestException
-	 * @throws SharingRightsException
-	 */
-	public function getInheritedShares(string $path): DataResponse {
-
-		// get Node from (string) path.
-		$userFolder = $this->rootFolder->getUserFolder($this->currentUser);
-		try {
-			$node = $userFolder->get($path);
-			$this->lock($node);
-		} catch (\OCP\Files\NotFoundException $e) {
-			throw new OCSNotFoundException($this->l->t('Wrong path, file/folder doesn\'t exist'));
-		} catch (LockedException $e) {
-			throw new OCSNotFoundException($this->l->t('Could not lock path'));
-		}
-
-		// current User has resharing rights ?
-		$this->confirmSharingRights($node);
-
-		// initiate real owner.
-		$owner = $node->getOwner()
-					  ->getUID();
-		if (!$this->userManager->userExists($owner)) {
-			return new DataResponse([]);
-		}
-
-		// get node based on the owner, fix owner in case of external storage
-		$userFolder = $this->rootFolder->getUserFolder($owner);
-		if ($node->getId() !== $userFolder->getId() && !$userFolder->isSubNode($node)) {
-			$owner = $node->getOwner()
-						  ->getUID();
-			$userFolder = $this->rootFolder->getUserFolder($owner);
-			$nodes = $userFolder->getById($node->getId());
-			$node = array_shift($nodes);
-		}
-		$basePath = $userFolder->getPath();
-
-		// generate node list for each parent folders
-		/** @var Node[] $nodes */
-		$nodes = [];
-		while ($node->getPath() !== $basePath) {
-			$node = $node->getParent();
-			$nodes[] = $node;
-		}
-
-		// for each nodes, retrieve shares.
-		$shares = [];
-		foreach ($nodes as $node) {
-			$getShares = $this->getFormattedShares($owner, $node, false, true);
-			$this->mergeFormattedShares($shares, $getShares);
-		}
-
-		return new DataResponse(array_values($shares));
-	}
-
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param string $id
-	 * @param int $permissions
-	 * @param string $password
-	 * @param string $sendPasswordByTalk
-	 * @param string $publicUpload
-	 * @param string $expireDate
-	 * @param string $note
-	 * @param string $label
-	 * @param string $hideDownload
-	 * @return DataResponse
-	 * @throws LockedException
-	 * @throws NotFoundException
-	 * @throws OCSBadRequestException
-	 * @throws OCSForbiddenException
-	 * @throws OCSNotFoundException
-	 */
-	public function updateShare(
-		string $id,
-		int $permissions = null,
-		string $password = null,
-		string $sendPasswordByTalk = null,
-		string $publicUpload = null,
-		string $expireDate = null,
-		string $note = null,
-		string $label = null,
-		string $hideDownload = null
-	): DataResponse {
-		try {
-			$share = $this->getShareById($id);
-		} catch (ShareNotFound $e) {
-			throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
-		}
-
-		$this->lock($share->getNode());
-
-		if (!$this->canAccessShare($share, false)) {
-			throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
-		}
-
-		if (!$this->canEditShare($share)) {
-			throw new OCSForbiddenException('You are not allowed to edit incoming shares');
-		}
-
-		if (
-			$permissions === null &&
-			$password === null &&
-			$sendPasswordByTalk === null &&
-			$publicUpload === null &&
-			$expireDate === null &&
-			$note === null &&
-			$label === null &&
-			$hideDownload === null
-		) {
-			throw new OCSBadRequestException($this->l->t('Wrong or no update parameter given'));
-		}
-
-		if ($note !== null) {
-			$share->setNote($note);
-		}
-
-		/**
-		 * expirationdate, password and publicUpload only make sense for link shares
-		 */
-		if ($share->getShareType() === Share::SHARE_TYPE_LINK
-			|| $share->getShareType() === Share::SHARE_TYPE_EMAIL) {
-
-			/**
-			 * We do not allow editing link shares that the current user
-			 * doesn't own. This is confusing and lead to errors when
-			 * someone else edit a password or expiration date without
-			 * the share owner knowing about it.
-			 * We only allow deletion
-			 */
-
-			if ($share->getSharedBy() !== $this->currentUser) {
-				throw new OCSForbiddenException('You are not allowed to edit link shares that you don\'t own');
-			}
-
-			// Update hide download state
-			if ($hideDownload === 'true') {
-				$share->setHideDownload(true);
-			} else if ($hideDownload === 'false') {
-				$share->setHideDownload(false);
-			}
-
-			$newPermissions = null;
-			if ($publicUpload === 'true') {
-				$newPermissions = Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE | Constants::PERMISSION_DELETE;
-			} else if ($publicUpload === 'false') {
-				$newPermissions = Constants::PERMISSION_READ;
-			}
-
-			if ($permissions !== null) {
-				$newPermissions = (int) $permissions;
-				$newPermissions = $newPermissions & ~Constants::PERMISSION_SHARE;
-			}
-
-			if ($newPermissions !== null &&
-				!in_array($newPermissions, [
-					Constants::PERMISSION_READ,
-					Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE, // legacy
-					Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE | Constants::PERMISSION_DELETE, // correct
-					Constants::PERMISSION_CREATE, // hidden file list
-					Constants::PERMISSION_READ | Constants::PERMISSION_UPDATE, // allow to edit single files
-				], true)
-			) {
-				throw new OCSBadRequestException($this->l->t('Can\'t change permissions for public share links'));
-			}
-
-			if (
-				// legacy
-				$newPermissions === (Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE) ||
-				// correct
-				$newPermissions === (Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE | Constants::PERMISSION_DELETE)
-			) {
-				if (!$this->shareManager->shareApiLinkAllowPublicUpload()) {
-					throw new OCSForbiddenException($this->l->t('Public upload disabled by the administrator'));
-				}
-
-				if (!($share->getNode() instanceof \OCP\Files\Folder)) {
-					throw new OCSBadRequestException($this->l->t('Public upload is only possible for publicly shared folders'));
-				}
-
-				// normalize to correct public upload permissions
-				$newPermissions = Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE | Constants::PERMISSION_DELETE;
-			}
-
-			if ($newPermissions !== null) {
-				$share->setPermissions($newPermissions);
-				$permissions = $newPermissions;
-			}
-
-			if ($expireDate === '') {
-				$share->setExpirationDate(null);
-			} else if ($expireDate !== null) {
-				try {
-					$expireDate = $this->parseDate($expireDate);
-				} catch (\Exception $e) {
-					throw new OCSBadRequestException($e->getMessage(), $e);
-				}
-				$share->setExpirationDate($expireDate);
-			}
-
-			if ($password === '') {
-				$share->setPassword(null);
-			} else if ($password !== null) {
-				$share->setPassword($password);
-			}
-
-			// only link shares have labels
-			if ($share->getShareType() === Share::SHARE_TYPE_LINK && $label !== null) {
-				$share->setLabel($label);
-			}
-
-			if ($sendPasswordByTalk === 'true') {
-				if (!$this->appManager->isEnabledForUser('spreed')) {
-					throw new OCSForbiddenException($this->l->t('Sharing sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled'));
-				}
-
-				$share->setSendPasswordByTalk(true);
-			} else if ($sendPasswordByTalk !== null) {
-				$share->setSendPasswordByTalk(false);
-			}
-		}
-
-		// NOT A LINK SHARE
-		else {
-			if ($permissions !== null) {
-				$permissions = (int) $permissions;
-				$share->setPermissions($permissions);
-			}
-
-			if ($expireDate === '') {
-				$share->setExpirationDate(null);
-			} else if ($expireDate !== null) {
-				try {
-					$expireDate = $this->parseDate($expireDate);
-				} catch (\Exception $e) {
-					throw new OCSBadRequestException($e->getMessage(), $e);
-				}
-				$share->setExpirationDate($expireDate);
-			}
-		}
-
-		try {
-			$share = $this->shareManager->updateShare($share);
-		} catch (GenericShareException $e) {
-			$code = $e->getCode() === 0 ? 403 : $e->getCode();
-			throw new OCSException($e->getHint(), $code);
-		} catch (\Exception $e) {
-			throw new OCSBadRequestException($e->getMessage(), $e);
-		}
-
-		return new DataResponse($this->formatShare($share));
-	}
-
-	/**
-	 * @NoAdminRequired
-	 */
-	public function pendingShares(): DataResponse {
-		$pendingShares = [];
-
-		$shareTypes = [
-			IShare::TYPE_USER,
-			IShare::TYPE_GROUP
-		];
-
-		foreach ($shareTypes as $shareType) {
-			$shares = $this->shareManager->getSharedWith($this->currentUser, $shareType, null, -1, 0);
-
-			foreach ($shares as $share) {
-				if ($share->getStatus() === IShare::STATUS_PENDING || $share->getStatus() === IShare::STATUS_REJECTED) {
-					$pendingShares[] = $share;
-				}
-			}
-		}
-
-		$result = array_filter(array_map(function (IShare $share) {
-			$userFolder = $this->rootFolder->getUserFolder($share->getSharedBy());
-			$nodes = $userFolder->getById($share->getNodeId());
-			if (empty($nodes)) {
-				// fallback to guessing the path
-				$node = $userFolder->get($share->getTarget());
-				if ($node === null || $share->getTarget() === '') {
-					return null;
-				}
-			} else {
-				$node = $nodes[0];
-			}
-
-			try {
-				$formattedShare = $this->formatShare($share, $node);
-				$formattedShare['status'] = $share->getStatus();
-				$formattedShare['path'] = $share->getNode()->getName();
-				$formattedShare['permissions'] = 0;
-				return $formattedShare;
-			} catch (NotFoundException $e) {
-				return null;
-			}
-		}, $pendingShares), function ($entry) {
-			return $entry !== null;
-		});
-
-		return new DataResponse($result);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param string $id
-	 * @return DataResponse
-	 * @throws OCSNotFoundException
-	 * @throws OCSException
-	 * @throws OCSBadRequestException
-	 */
-	public function acceptShare(string $id): DataResponse {
-		try {
-			$share = $this->getShareById($id);
-		} catch (ShareNotFound $e) {
-			throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
-		}
-
-		if (!$this->canAccessShare($share)) {
-			throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
-		}
-
-		try {
-			$this->shareManager->acceptShare($share, $this->currentUser);
-		} catch (GenericShareException $e) {
-			$code = $e->getCode() === 0 ? 403 : $e->getCode();
-			throw new OCSException($e->getHint(), $code);
-		} catch (\Exception $e) {
-			throw new OCSBadRequestException($e->getMessage(), $e);
-		}
-
-		return new DataResponse();
-	}
-
-	/**
-	 * Does the user have read permission on the share
-	 *
-	 * @param \OCP\Share\IShare $share the share to check
-	 * @param boolean $checkGroups check groups as well?
-	 * @return boolean
-	 * @throws NotFoundException
-	 *
-	 * @suppress PhanUndeclaredClassMethod
-	 */
-	protected function canAccessShare(\OCP\Share\IShare $share, bool $checkGroups = true): bool {
-		// A file with permissions 0 can't be accessed by us. So Don't show it
-		if ($share->getPermissions() === 0) {
-			return false;
-		}
-
-		// Owner of the file and the sharer of the file can always get share
-		if ($share->getShareOwner() === $this->currentUser
-			|| $share->getSharedBy() === $this->currentUser) {
-			return true;
-		}
-
-		// If the share is shared with you, you can access it!
-		if ($share->getShareType() === Share::SHARE_TYPE_USER
-			&& $share->getSharedWith() === $this->currentUser) {
-			return true;
-		}
-
-		// Have reshare rights on the shared file/folder ?
-		// Does the currentUser have access to the shared file?
-		$userFolder = $this->rootFolder->getUserFolder($this->currentUser);
-		$files = $userFolder->getById($share->getNodeId());
-		if (!empty($files) && $this->shareProviderResharingRights($this->currentUser, $share, $files[0])) {
-			return true;
-		}
-
-		// If in the recipient group, you can see the share
-		if ($checkGroups && $share->getShareType() === Share::SHARE_TYPE_GROUP) {
-			$sharedWith = $this->groupManager->get($share->getSharedWith());
-			$user = $this->userManager->get($this->currentUser);
-			if ($user !== null && $sharedWith !== null && $sharedWith->inGroup($user)) {
-				return true;
-			}
-		}
-
-		if ($share->getShareType() === Share::SHARE_TYPE_CIRCLE) {
-			// TODO: have a sanity check like above?
-			return true;
-		}
-
-		if ($share->getShareType() === Share::SHARE_TYPE_ROOM) {
-			try {
-				return $this->getRoomShareHelper()->canAccessShare($share, $this->currentUser);
-			} catch (QueryException $e) {
-				return false;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Does the user have edit permission on the share
-	 *
-	 * @param \OCP\Share\IShare $share the share to check
-	 * @return boolean
-	 */
-	protected function canEditShare(\OCP\Share\IShare $share): bool {
-		// A file with permissions 0 can't be accessed by us. So Don't show it
-		if ($share->getPermissions() === 0) {
-			return false;
-		}
-
-		// The owner of the file and the creator of the share
-		// can always edit the share
-		if ($share->getShareOwner() === $this->currentUser ||
-			$share->getSharedBy() === $this->currentUser
-		) {
-			return true;
-		}
-
-		//! we do NOT support some kind of `admin` in groups.
-		//! You cannot edit shares shared to a group you're
-		//! a member of if you're not the share owner or the file owner!
-
-		return false;
-	}
-
-	/**
-	 * Does the user have delete permission on the share
-	 *
-	 * @param \OCP\Share\IShare $share the share to check
-	 * @return boolean
-	 */
-	protected function canDeleteShare(\OCP\Share\IShare $share): bool {
-		// A file with permissions 0 can't be accessed by us. So Don't show it
-		if ($share->getPermissions() === 0) {
-			return false;
-		}
-
-		// if the user is the recipient, i can unshare
-		// the share with self
-		if ($share->getShareType() === Share::SHARE_TYPE_USER &&
-			$share->getSharedWith() === $this->currentUser
-		) {
-			return true;
-		}
-
-		// The owner of the file and the creator of the share
-		// can always delete the share
-		if ($share->getShareOwner() === $this->currentUser ||
-			$share->getSharedBy() === $this->currentUser
-		) {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Does the user have delete permission on the share
-	 * This differs from the canDeleteShare function as it only
-	 * remove the share for the current user. It does NOT
-	 * completely delete the share but only the mount point.
-	 * It can then be restored from the deleted shares section.
-	 *
-	 * @param \OCP\Share\IShare $share the share to check
-	 * @return boolean
-	 *
-	 * @suppress PhanUndeclaredClassMethod
-	 */
-	protected function canDeleteShareFromSelf(\OCP\Share\IShare $share): bool {
-		if ($share->getShareType() !== IShare::TYPE_GROUP &&
-			$share->getShareType() !== IShare::TYPE_ROOM
-		) {
-			return false;
-		}
-
-		if ($share->getShareOwner() === $this->currentUser ||
-			$share->getSharedBy() === $this->currentUser
-		) {
-			// Delete the whole share, not just for self
-			return false;
-		}
-
-		// If in the recipient group, you can delete the share from self
-		if ($share->getShareType() === Share::SHARE_TYPE_GROUP) {
-			$sharedWith = $this->groupManager->get($share->getSharedWith());
-			$user = $this->userManager->get($this->currentUser);
-			if ($user !== null && $sharedWith !== null && $sharedWith->inGroup($user)) {
-				return true;
-			}
-		}
-
-		if ($share->getShareType() === Share::SHARE_TYPE_ROOM) {
-			try {
-				return $this->getRoomShareHelper()->canAccessShare($share, $this->currentUser);
-			} catch (QueryException $e) {
-				return false;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Make sure that the passed date is valid ISO 8601
-	 * So YYYY-MM-DD
-	 * If not throw an exception
-	 *
-	 * @param string $expireDate
-	 *
-	 * @throws \Exception
-	 * @return \DateTime
-	 */
-	private function parseDate(string $expireDate): \DateTime {
-		try {
-			$date = new \DateTime($expireDate);
-		} catch (\Exception $e) {
-			throw new \Exception('Invalid date. Format must be YYYY-MM-DD');
-		}
-
-		if ($date === false) {
-			throw new \Exception('Invalid date. Format must be YYYY-MM-DD');
-		}
-
-		$date->setTime(0, 0, 0);
-
-		return $date;
-	}
-
-	/**
-	 * Since we have multiple providers but the OCS Share API v1 does
-	 * not support this we need to check all backends.
-	 *
-	 * @param string $id
-	 * @return \OCP\Share\IShare
-	 * @throws ShareNotFound
-	 */
-	private function getShareById(string $id): IShare {
-		$share = null;
-
-		// First check if it is an internal share.
-		try {
-			$share = $this->shareManager->getShareById('ocinternal:' . $id, $this->currentUser);
-			return $share;
-		} catch (ShareNotFound $e) {
-			// Do nothing, just try the other share type
-		}
-
-
-		try {
-			if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_CIRCLE)) {
-				$share = $this->shareManager->getShareById('ocCircleShare:' . $id, $this->currentUser);
-				return $share;
-			}
-		} catch (ShareNotFound $e) {
-			// Do nothing, just try the other share type
-		}
-
-		try {
-			if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_EMAIL)) {
-				$share = $this->shareManager->getShareById('ocMailShare:' . $id, $this->currentUser);
-				return $share;
-			}
-		} catch (ShareNotFound $e) {
-			// Do nothing, just try the other share type
-		}
-
-		try {
-			$share = $this->shareManager->getShareById('ocRoomShare:' . $id, $this->currentUser);
-			return $share;
-		} catch (ShareNotFound $e) {
-			// Do nothing, just try the other share type
-		}
-
-		if (!$this->shareManager->outgoingServer2ServerSharesAllowed()) {
-			throw new ShareNotFound();
-		}
-		$share = $this->shareManager->getShareById('ocFederatedSharing:' . $id, $this->currentUser);
-
-		return $share;
-	}
-
-	/**
-	 * Lock a Node
-	 *
-	 * @param \OCP\Files\Node $node
-	 * @throws LockedException
-	 */
-	private function lock(\OCP\Files\Node $node) {
-		$node->lock(ILockingProvider::LOCK_SHARED);
-		$this->lockedNode = $node;
-	}
-
-	/**
-	 * Cleanup the remaining locks
-	 * @throws @LockedException
-	 */
-	public function cleanup() {
-		if ($this->lockedNode !== null) {
-			$this->lockedNode->unlock(ILockingProvider::LOCK_SHARED);
-		}
-	}
-
-	/**
-	 * Returns the helper of ShareAPIController for room shares.
-	 *
-	 * If the Talk application is not enabled or the helper is not available
-	 * a QueryException is thrown instead.
-	 *
-	 * @return \OCA\Talk\Share\Helper\ShareAPIController
-	 * @throws QueryException
-	 */
-	private function getRoomShareHelper() {
-		if (!$this->appManager->isEnabledForUser('spreed')) {
-			throw new QueryException();
-		}
-
-		return $this->serverContainer->query('\OCA\Talk\Share\Helper\ShareAPIController');
-	}
-
-
-	/**
-	 * @param string $viewer
-	 * @param Node $node
-	 * @param bool $reShares
-	 *
-	 * @return IShare[]
-	 */
-	private function getSharesFromNode(string $viewer, $node, bool $reShares): array {
-
-		$providers = [
-			Share::SHARE_TYPE_USER,
-			Share::SHARE_TYPE_GROUP,
-			Share::SHARE_TYPE_LINK,
-			Share::SHARE_TYPE_EMAIL,
-			Share::SHARE_TYPE_EMAIL,
-			Share::SHARE_TYPE_CIRCLE,
-			Share::SHARE_TYPE_ROOM
-		];
-
-		// Should we assume that the (currentUser) viewer is the owner of the node !?
-		$shares = [];
-		foreach ($providers as $provider) {
-			if (!$this->shareManager->shareProviderExists($provider)) {
-				continue;
-			}
-
-			$providerShares =
-				$this->shareManager->getSharesBy($viewer, $provider, $node, $reShares, -1, 0);
-			$shares = array_merge($shares, $providerShares);
-		}
-
-		if ($this->shareManager->outgoingServer2ServerSharesAllowed()) {
-			$federatedShares = $this->shareManager->getSharesBy(
-				$this->currentUser, Share::SHARE_TYPE_REMOTE, $node, $reShares, -1, 0
-			);
-			$shares = array_merge($shares, $federatedShares);
-		}
-
-		if ($this->shareManager->outgoingServer2ServerGroupSharesAllowed()) {
-			$federatedShares = $this->shareManager->getSharesBy(
-				$this->currentUser, Share::SHARE_TYPE_REMOTE_GROUP, $node, $reShares, -1, 0
-			);
-			$shares = array_merge($shares, $federatedShares);
-		}
-
-		return $shares;
-	}
-
-
-	/**
-	 * @param Node $node
-	 *
-	 * @throws SharingRightsException
-	 */
-	private function confirmSharingRights(Node $node): void {
-		if (!$this->hasResharingRights($this->currentUser, $node)) {
-			throw new SharingRightsException('no sharing rights on this item');
-		}
-	}
-
-
-	/**
-	 * @param string $viewer
-	 * @param Node $node
-	 *
-	 * @return bool
-	 */
-	private function hasResharingRights($viewer, $node): bool {
-		if ($viewer === $node->getOwner()->getUID()) {
-			return true;
-		}
-
-		foreach ([$node, $node->getParent()] as $node) {
-			$shares = $this->getSharesFromNode($viewer, $node, true);
-			foreach ($shares as $share) {
-				try {
-					if ($this->shareProviderResharingRights($viewer, $share, $node)) {
-						return true;
-					}
-				} catch (InvalidPathException | NotFoundException $e) {
-				}
-			}
-		}
-
-		return false;
-	}
-
-
-	/**
-	 * Returns if we can find resharing rights in an IShare object for a specific user.
-	 *
-	 * @suppress PhanUndeclaredClassMethod
-	 *
-	 * @param string $userId
-	 * @param IShare $share
-	 * @param Node $node
-	 *
-	 * @return bool
-	 * @throws NotFoundException
-	 * @throws InvalidPathException
-	 */
-	private function shareProviderResharingRights(string $userId, IShare $share, $node): bool {
-		if ($share->getShareOwner() === $userId) {
-			return true;
-		}
-
-		// we check that current user have parent resharing rights on the current file
-		if ($node !== null && ($node->getPermissions() & Constants::PERMISSION_SHARE) !== 0) {
-			return true;
-		}
-
-		if ((\OCP\Constants::PERMISSION_SHARE & $share->getPermissions()) === 0) {
-			return false;
-		}
-
-		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER && $share->getSharedWith() === $userId) {
-			return true;
-		}
-
-		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP && $this->groupManager->isInGroup($userId, $share->getSharedWith())) {
-			return true;
-		}
-
-		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_CIRCLE && \OC::$server->getAppManager()->isEnabledForUser('circles')
-			&& class_exists('\OCA\Circles\Api\v1\Circles')) {
-
-			$hasCircleId = (substr($share->getSharedWith(), -1) === ']');
-			$shareWithStart = ($hasCircleId ? strrpos($share->getSharedWith(), '[') + 1 : 0);
-			$shareWithLength = ($hasCircleId ? -1 : strpos($share->getSharedWith(), ' '));
-			if (is_bool($shareWithLength)) {
-				$shareWithLength = -1;
-			}
-			$sharedWith = substr($share->getSharedWith(), $shareWithStart, $shareWithLength);
-			try {
-				$member = \OCA\Circles\Api\v1\Circles::getMember($sharedWith, $userId, 1);
-				if ($member->getLevel() >= 4) {
-					return true;
-				}
-				return false;
-			} catch (QueryException $e) {
-				return false;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Get all the shares for the current user
-	 *
-	 * @param Node|null $path
-	 * @param boolean $reshares
-	 * @return void
-	 */
-	private function getAllShares(?Node $path = null, bool $reshares = false) {
-		// Get all shares
-		$userShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_USER, $path, $reshares, -1, 0);
-		$groupShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_GROUP, $path, $reshares, -1, 0);
-		$linkShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_LINK, $path, $reshares, -1, 0);
-
-		// EMAIL SHARES
-		$mailShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_EMAIL, $path, $reshares, -1, 0);
-
-		// CIRCLE SHARES
-		$circleShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_CIRCLE, $path, $reshares, -1, 0);
-
-		// TALK SHARES
-		$roomShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_ROOM, $path, $reshares, -1, 0);
-
-		// FEDERATION
-		if ($this->shareManager->outgoingServer2ServerSharesAllowed()) {
-			$federatedShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_REMOTE, $path, $reshares, -1, 0);
-		} else {
-			$federatedShares = [];
-		}
-		if ($this->shareManager->outgoingServer2ServerGroupSharesAllowed()) {
-			$federatedGroupShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_REMOTE_GROUP, $path, $reshares, -1, 0);
-		} else {
-			$federatedGroupShares = [];
-		}
-
-		return array_merge($userShares, $groupShares, $linkShares, $mailShares, $circleShares, $roomShares, $federatedShares, $federatedGroupShares);
-	}
-
-
-	/**
-	 * merging already formatted shares.
-	 * We'll make an associative array to easily detect duplicate Ids.
-	 * Keys _needs_ to be removed after all shares are retrieved and merged.
-	 *
-	 * @param array $shares
-	 * @param array $newShares
-	 */
-	private function mergeFormattedShares(array &$shares, array $newShares) {
-		foreach ($newShares as $newShare) {
-			if (!array_key_exists($newShare['id'], $shares)) {
-				$shares[$newShare['id']] = $newShare;
-			}
-		}
-	}
+                continue;
+            }
+
+            if (in_array($share->getId(), $known) || $share->getSharedWith() === $this->currentUser) {
+                continue;
+            }
+
+            $known[] = $share->getId();
+            try {
+                /** @var IShare $share */
+                $format = $this->formatShare($share, $node);
+                $formatted[] = $format;
+
+                // let's also build a list of shares created
+                // by the current user only, in case
+                // there is no resharing rights
+                if ($share->getSharedBy() === $this->currentUser) {
+                    $miniFormatted[] = $format;
+                }
+
+                // check if one of those share is shared with me
+                // and if I have resharing rights on it
+                if (!$resharingRight && $this->shareProviderResharingRights($this->currentUser, $share, $node)) {
+                    $resharingRight = true;
+                }
+            } catch (InvalidPathException | NotFoundException $e) {
+            }
+        }
+
+        if (!$resharingRight) {
+            $formatted = $miniFormatted;
+        }
+
+        if ($includeTags) {
+            $formatted =
+                Helper::populateTags($formatted, 'file_source', \OC::$server->getTagManager());
+        }
+
+        return $formatted;
+    }
+
+
+    /**
+     * The getInheritedShares function.
+     * returns all shares relative to a file, including parent folders shares rights.
+     *
+     * @NoAdminRequired
+     *
+     * @param string $path
+     *
+     * - Get shares by the current user
+     * - Get shares by the current user and reshares (?reshares=true)
+     * - Get shares with the current user (?shared_with_me=true)
+     * - Get shares for a specific path (?path=...)
+     * - Get all shares in a folder (?subfiles=true&path=..)
+     *
+     * @return DataResponse
+     * @throws InvalidPathException
+     * @throws NotFoundException
+     * @throws OCSNotFoundException
+     * @throws OCSBadRequestException
+     * @throws SharingRightsException
+     */
+    public function getInheritedShares(string $path): DataResponse {
+
+        // get Node from (string) path.
+        $userFolder = $this->rootFolder->getUserFolder($this->currentUser);
+        try {
+            $node = $userFolder->get($path);
+            $this->lock($node);
+        } catch (\OCP\Files\NotFoundException $e) {
+            throw new OCSNotFoundException($this->l->t('Wrong path, file/folder doesn\'t exist'));
+        } catch (LockedException $e) {
+            throw new OCSNotFoundException($this->l->t('Could not lock path'));
+        }
+
+        // current User has resharing rights ?
+        $this->confirmSharingRights($node);
+
+        // initiate real owner.
+        $owner = $node->getOwner()
+                        ->getUID();
+        if (!$this->userManager->userExists($owner)) {
+            return new DataResponse([]);
+        }
+
+        // get node based on the owner, fix owner in case of external storage
+        $userFolder = $this->rootFolder->getUserFolder($owner);
+        if ($node->getId() !== $userFolder->getId() && !$userFolder->isSubNode($node)) {
+            $owner = $node->getOwner()
+                            ->getUID();
+            $userFolder = $this->rootFolder->getUserFolder($owner);
+            $nodes = $userFolder->getById($node->getId());
+            $node = array_shift($nodes);
+        }
+        $basePath = $userFolder->getPath();
+
+        // generate node list for each parent folders
+        /** @var Node[] $nodes */
+        $nodes = [];
+        while ($node->getPath() !== $basePath) {
+            $node = $node->getParent();
+            $nodes[] = $node;
+        }
+
+        // for each nodes, retrieve shares.
+        $shares = [];
+        foreach ($nodes as $node) {
+            $getShares = $this->getFormattedShares($owner, $node, false, true);
+            $this->mergeFormattedShares($shares, $getShares);
+        }
+
+        return new DataResponse(array_values($shares));
+    }
+
+
+    /**
+     * @NoAdminRequired
+     *
+     * @param string $id
+     * @param int $permissions
+     * @param string $password
+     * @param string $sendPasswordByTalk
+     * @param string $publicUpload
+     * @param string $expireDate
+     * @param string $note
+     * @param string $label
+     * @param string $hideDownload
+     * @return DataResponse
+     * @throws LockedException
+     * @throws NotFoundException
+     * @throws OCSBadRequestException
+     * @throws OCSForbiddenException
+     * @throws OCSNotFoundException
+     */
+    public function updateShare(
+        string $id,
+        int $permissions = null,
+        string $password = null,
+        string $sendPasswordByTalk = null,
+        string $publicUpload = null,
+        string $expireDate = null,
+        string $note = null,
+        string $label = null,
+        string $hideDownload = null
+    ): DataResponse {
+        try {
+            $share = $this->getShareById($id);
+        } catch (ShareNotFound $e) {
+            throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
+        }
+
+        $this->lock($share->getNode());
+
+        if (!$this->canAccessShare($share, false)) {
+            throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
+        }
+
+        if (!$this->canEditShare($share)) {
+            throw new OCSForbiddenException('You are not allowed to edit incoming shares');
+        }
+
+        if (
+            $permissions === null &&
+            $password === null &&
+            $sendPasswordByTalk === null &&
+            $publicUpload === null &&
+            $expireDate === null &&
+            $note === null &&
+            $label === null &&
+            $hideDownload === null
+        ) {
+            throw new OCSBadRequestException($this->l->t('Wrong or no update parameter given'));
+        }
+
+        if ($note !== null) {
+            $share->setNote($note);
+        }
+
+        /**
+         * expirationdate, password and publicUpload only make sense for link shares
+         */
+        if ($share->getShareType() === Share::SHARE_TYPE_LINK
+            || $share->getShareType() === Share::SHARE_TYPE_EMAIL) {
+
+            /**
+             * We do not allow editing link shares that the current user
+             * doesn't own. This is confusing and lead to errors when
+             * someone else edit a password or expiration date without
+             * the share owner knowing about it.
+             * We only allow deletion
+             */
+
+            if ($share->getSharedBy() !== $this->currentUser) {
+                throw new OCSForbiddenException('You are not allowed to edit link shares that you don\'t own');
+            }
+
+            // Update hide download state
+            if ($hideDownload === 'true') {
+                $share->setHideDownload(true);
+            } else if ($hideDownload === 'false') {
+                $share->setHideDownload(false);
+            }
+
+            $newPermissions = null;
+            if ($publicUpload === 'true') {
+                $newPermissions = Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE | Constants::PERMISSION_DELETE;
+            } else if ($publicUpload === 'false') {
+                $newPermissions = Constants::PERMISSION_READ;
+            }
+
+            if ($permissions !== null) {
+                $newPermissions = (int) $permissions;
+                $newPermissions = $newPermissions & ~Constants::PERMISSION_SHARE;
+            }
+
+            if ($newPermissions !== null &&
+                !in_array($newPermissions, [
+                    Constants::PERMISSION_READ,
+                    Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE, // legacy
+                    Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE | Constants::PERMISSION_DELETE, // correct
+                    Constants::PERMISSION_CREATE, // hidden file list
+                    Constants::PERMISSION_READ | Constants::PERMISSION_UPDATE, // allow to edit single files
+                ], true)
+            ) {
+                throw new OCSBadRequestException($this->l->t('Can\'t change permissions for public share links'));
+            }
+
+            if (
+                // legacy
+                $newPermissions === (Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE) ||
+                // correct
+                $newPermissions === (Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE | Constants::PERMISSION_DELETE)
+            ) {
+                if (!$this->shareManager->shareApiLinkAllowPublicUpload()) {
+                    throw new OCSForbiddenException($this->l->t('Public upload disabled by the administrator'));
+                }
+
+                if (!($share->getNode() instanceof \OCP\Files\Folder)) {
+                    throw new OCSBadRequestException($this->l->t('Public upload is only possible for publicly shared folders'));
+                }
+
+                // normalize to correct public upload permissions
+                $newPermissions = Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE | Constants::PERMISSION_DELETE;
+            }
+
+            if ($newPermissions !== null) {
+                $share->setPermissions($newPermissions);
+                $permissions = $newPermissions;
+            }
+
+            if ($expireDate === '') {
+                $share->setExpirationDate(null);
+            } else if ($expireDate !== null) {
+                try {
+                    $expireDate = $this->parseDate($expireDate);
+                } catch (\Exception $e) {
+                    throw new OCSBadRequestException($e->getMessage(), $e);
+                }
+                $share->setExpirationDate($expireDate);
+            }
+
+            if ($password === '') {
+                $share->setPassword(null);
+            } else if ($password !== null) {
+                $share->setPassword($password);
+            }
+
+            // only link shares have labels
+            if ($share->getShareType() === Share::SHARE_TYPE_LINK && $label !== null) {
+                $share->setLabel($label);
+            }
+
+            if ($sendPasswordByTalk === 'true') {
+                if (!$this->appManager->isEnabledForUser('spreed')) {
+                    throw new OCSForbiddenException($this->l->t('Sharing sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled'));
+                }
+
+                $share->setSendPasswordByTalk(true);
+            } else if ($sendPasswordByTalk !== null) {
+                $share->setSendPasswordByTalk(false);
+            }
+        }
+
+        // NOT A LINK SHARE
+        else {
+            if ($permissions !== null) {
+                $permissions = (int) $permissions;
+                $share->setPermissions($permissions);
+            }
+
+            if ($expireDate === '') {
+                $share->setExpirationDate(null);
+            } else if ($expireDate !== null) {
+                try {
+                    $expireDate = $this->parseDate($expireDate);
+                } catch (\Exception $e) {
+                    throw new OCSBadRequestException($e->getMessage(), $e);
+                }
+                $share->setExpirationDate($expireDate);
+            }
+        }
+
+        try {
+            $share = $this->shareManager->updateShare($share);
+        } catch (GenericShareException $e) {
+            $code = $e->getCode() === 0 ? 403 : $e->getCode();
+            throw new OCSException($e->getHint(), $code);
+        } catch (\Exception $e) {
+            throw new OCSBadRequestException($e->getMessage(), $e);
+        }
+
+        return new DataResponse($this->formatShare($share));
+    }
+
+    /**
+     * @NoAdminRequired
+     */
+    public function pendingShares(): DataResponse {
+        $pendingShares = [];
+
+        $shareTypes = [
+            IShare::TYPE_USER,
+            IShare::TYPE_GROUP
+        ];
+
+        foreach ($shareTypes as $shareType) {
+            $shares = $this->shareManager->getSharedWith($this->currentUser, $shareType, null, -1, 0);
+
+            foreach ($shares as $share) {
+                if ($share->getStatus() === IShare::STATUS_PENDING || $share->getStatus() === IShare::STATUS_REJECTED) {
+                    $pendingShares[] = $share;
+                }
+            }
+        }
+
+        $result = array_filter(array_map(function (IShare $share) {
+            $userFolder = $this->rootFolder->getUserFolder($share->getSharedBy());
+            $nodes = $userFolder->getById($share->getNodeId());
+            if (empty($nodes)) {
+                // fallback to guessing the path
+                $node = $userFolder->get($share->getTarget());
+                if ($node === null || $share->getTarget() === '') {
+                    return null;
+                }
+            } else {
+                $node = $nodes[0];
+            }
+
+            try {
+                $formattedShare = $this->formatShare($share, $node);
+                $formattedShare['status'] = $share->getStatus();
+                $formattedShare['path'] = $share->getNode()->getName();
+                $formattedShare['permissions'] = 0;
+                return $formattedShare;
+            } catch (NotFoundException $e) {
+                return null;
+            }
+        }, $pendingShares), function ($entry) {
+            return $entry !== null;
+        });
+
+        return new DataResponse($result);
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @param string $id
+     * @return DataResponse
+     * @throws OCSNotFoundException
+     * @throws OCSException
+     * @throws OCSBadRequestException
+     */
+    public function acceptShare(string $id): DataResponse {
+        try {
+            $share = $this->getShareById($id);
+        } catch (ShareNotFound $e) {
+            throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
+        }
+
+        if (!$this->canAccessShare($share)) {
+            throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
+        }
+
+        try {
+            $this->shareManager->acceptShare($share, $this->currentUser);
+        } catch (GenericShareException $e) {
+            $code = $e->getCode() === 0 ? 403 : $e->getCode();
+            throw new OCSException($e->getHint(), $code);
+        } catch (\Exception $e) {
+            throw new OCSBadRequestException($e->getMessage(), $e);
+        }
+
+        return new DataResponse();
+    }
+
+    /**
+     * Does the user have read permission on the share
+     *
+     * @param \OCP\Share\IShare $share the share to check
+     * @param boolean $checkGroups check groups as well?
+     * @return boolean
+     * @throws NotFoundException
+     *
+     * @suppress PhanUndeclaredClassMethod
+     */
+    protected function canAccessShare(\OCP\Share\IShare $share, bool $checkGroups = true): bool {
+        // A file with permissions 0 can't be accessed by us. So Don't show it
+        if ($share->getPermissions() === 0) {
+            return false;
+        }
+
+        // Owner of the file and the sharer of the file can always get share
+        if ($share->getShareOwner() === $this->currentUser
+            || $share->getSharedBy() === $this->currentUser) {
+            return true;
+        }
+
+        // If the share is shared with you, you can access it!
+        if ($share->getShareType() === Share::SHARE_TYPE_USER
+            && $share->getSharedWith() === $this->currentUser) {
+            return true;
+        }
+
+        // Have reshare rights on the shared file/folder ?
+        // Does the currentUser have access to the shared file?
+        $userFolder = $this->rootFolder->getUserFolder($this->currentUser);
+        $files = $userFolder->getById($share->getNodeId());
+        if (!empty($files) && $this->shareProviderResharingRights($this->currentUser, $share, $files[0])) {
+            return true;
+        }
+
+        // If in the recipient group, you can see the share
+        if ($checkGroups && $share->getShareType() === Share::SHARE_TYPE_GROUP) {
+            $sharedWith = $this->groupManager->get($share->getSharedWith());
+            $user = $this->userManager->get($this->currentUser);
+            if ($user !== null && $sharedWith !== null && $sharedWith->inGroup($user)) {
+                return true;
+            }
+        }
+
+        if ($share->getShareType() === Share::SHARE_TYPE_CIRCLE) {
+            // TODO: have a sanity check like above?
+            return true;
+        }
+
+        if ($share->getShareType() === Share::SHARE_TYPE_ROOM) {
+            try {
+                return $this->getRoomShareHelper()->canAccessShare($share, $this->currentUser);
+            } catch (QueryException $e) {
+                return false;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Does the user have edit permission on the share
+     *
+     * @param \OCP\Share\IShare $share the share to check
+     * @return boolean
+     */
+    protected function canEditShare(\OCP\Share\IShare $share): bool {
+        // A file with permissions 0 can't be accessed by us. So Don't show it
+        if ($share->getPermissions() === 0) {
+            return false;
+        }
+
+        // The owner of the file and the creator of the share
+        // can always edit the share
+        if ($share->getShareOwner() === $this->currentUser ||
+            $share->getSharedBy() === $this->currentUser
+        ) {
+            return true;
+        }
+
+        //! we do NOT support some kind of `admin` in groups.
+        //! You cannot edit shares shared to a group you're
+        //! a member of if you're not the share owner or the file owner!
+
+        return false;
+    }
+
+    /**
+     * Does the user have delete permission on the share
+     *
+     * @param \OCP\Share\IShare $share the share to check
+     * @return boolean
+     */
+    protected function canDeleteShare(\OCP\Share\IShare $share): bool {
+        // A file with permissions 0 can't be accessed by us. So Don't show it
+        if ($share->getPermissions() === 0) {
+            return false;
+        }
+
+        // if the user is the recipient, i can unshare
+        // the share with self
+        if ($share->getShareType() === Share::SHARE_TYPE_USER &&
+            $share->getSharedWith() === $this->currentUser
+        ) {
+            return true;
+        }
+
+        // The owner of the file and the creator of the share
+        // can always delete the share
+        if ($share->getShareOwner() === $this->currentUser ||
+            $share->getSharedBy() === $this->currentUser
+        ) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Does the user have delete permission on the share
+     * This differs from the canDeleteShare function as it only
+     * remove the share for the current user. It does NOT
+     * completely delete the share but only the mount point.
+     * It can then be restored from the deleted shares section.
+     *
+     * @param \OCP\Share\IShare $share the share to check
+     * @return boolean
+     *
+     * @suppress PhanUndeclaredClassMethod
+     */
+    protected function canDeleteShareFromSelf(\OCP\Share\IShare $share): bool {
+        if ($share->getShareType() !== IShare::TYPE_GROUP &&
+            $share->getShareType() !== IShare::TYPE_ROOM
+        ) {
+            return false;
+        }
+
+        if ($share->getShareOwner() === $this->currentUser ||
+            $share->getSharedBy() === $this->currentUser
+        ) {
+            // Delete the whole share, not just for self
+            return false;
+        }
+
+        // If in the recipient group, you can delete the share from self
+        if ($share->getShareType() === Share::SHARE_TYPE_GROUP) {
+            $sharedWith = $this->groupManager->get($share->getSharedWith());
+            $user = $this->userManager->get($this->currentUser);
+            if ($user !== null && $sharedWith !== null && $sharedWith->inGroup($user)) {
+                return true;
+            }
+        }
+
+        if ($share->getShareType() === Share::SHARE_TYPE_ROOM) {
+            try {
+                return $this->getRoomShareHelper()->canAccessShare($share, $this->currentUser);
+            } catch (QueryException $e) {
+                return false;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Make sure that the passed date is valid ISO 8601
+     * So YYYY-MM-DD
+     * If not throw an exception
+     *
+     * @param string $expireDate
+     *
+     * @throws \Exception
+     * @return \DateTime
+     */
+    private function parseDate(string $expireDate): \DateTime {
+        try {
+            $date = new \DateTime($expireDate);
+        } catch (\Exception $e) {
+            throw new \Exception('Invalid date. Format must be YYYY-MM-DD');
+        }
+
+        if ($date === false) {
+            throw new \Exception('Invalid date. Format must be YYYY-MM-DD');
+        }
+
+        $date->setTime(0, 0, 0);
+
+        return $date;
+    }
+
+    /**
+     * Since we have multiple providers but the OCS Share API v1 does
+     * not support this we need to check all backends.
+     *
+     * @param string $id
+     * @return \OCP\Share\IShare
+     * @throws ShareNotFound
+     */
+    private function getShareById(string $id): IShare {
+        $share = null;
+
+        // First check if it is an internal share.
+        try {
+            $share = $this->shareManager->getShareById('ocinternal:' . $id, $this->currentUser);
+            return $share;
+        } catch (ShareNotFound $e) {
+            // Do nothing, just try the other share type
+        }
+
+
+        try {
+            if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_CIRCLE)) {
+                $share = $this->shareManager->getShareById('ocCircleShare:' . $id, $this->currentUser);
+                return $share;
+            }
+        } catch (ShareNotFound $e) {
+            // Do nothing, just try the other share type
+        }
+
+        try {
+            if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_EMAIL)) {
+                $share = $this->shareManager->getShareById('ocMailShare:' . $id, $this->currentUser);
+                return $share;
+            }
+        } catch (ShareNotFound $e) {
+            // Do nothing, just try the other share type
+        }
+
+        try {
+            $share = $this->shareManager->getShareById('ocRoomShare:' . $id, $this->currentUser);
+            return $share;
+        } catch (ShareNotFound $e) {
+            // Do nothing, just try the other share type
+        }
+
+        if (!$this->shareManager->outgoingServer2ServerSharesAllowed()) {
+            throw new ShareNotFound();
+        }
+        $share = $this->shareManager->getShareById('ocFederatedSharing:' . $id, $this->currentUser);
+
+        return $share;
+    }
+
+    /**
+     * Lock a Node
+     *
+     * @param \OCP\Files\Node $node
+     * @throws LockedException
+     */
+    private function lock(\OCP\Files\Node $node) {
+        $node->lock(ILockingProvider::LOCK_SHARED);
+        $this->lockedNode = $node;
+    }
+
+    /**
+     * Cleanup the remaining locks
+     * @throws @LockedException
+     */
+    public function cleanup() {
+        if ($this->lockedNode !== null) {
+            $this->lockedNode->unlock(ILockingProvider::LOCK_SHARED);
+        }
+    }
+
+    /**
+     * Returns the helper of ShareAPIController for room shares.
+     *
+     * If the Talk application is not enabled or the helper is not available
+     * a QueryException is thrown instead.
+     *
+     * @return \OCA\Talk\Share\Helper\ShareAPIController
+     * @throws QueryException
+     */
+    private function getRoomShareHelper() {
+        if (!$this->appManager->isEnabledForUser('spreed')) {
+            throw new QueryException();
+        }
+
+        return $this->serverContainer->query('\OCA\Talk\Share\Helper\ShareAPIController');
+    }
+
+
+    /**
+     * @param string $viewer
+     * @param Node $node
+     * @param bool $reShares
+     *
+     * @return IShare[]
+     */
+    private function getSharesFromNode(string $viewer, $node, bool $reShares): array {
+
+        $providers = [
+            Share::SHARE_TYPE_USER,
+            Share::SHARE_TYPE_GROUP,
+            Share::SHARE_TYPE_LINK,
+            Share::SHARE_TYPE_EMAIL,
+            Share::SHARE_TYPE_EMAIL,
+            Share::SHARE_TYPE_CIRCLE,
+            Share::SHARE_TYPE_ROOM
+        ];
+
+        // Should we assume that the (currentUser) viewer is the owner of the node !?
+        $shares = [];
+        foreach ($providers as $provider) {
+            if (!$this->shareManager->shareProviderExists($provider)) {
+                continue;
+            }
+
+            $providerShares =
+                $this->shareManager->getSharesBy($viewer, $provider, $node, $reShares, -1, 0);
+            $shares = array_merge($shares, $providerShares);
+        }
+
+        if ($this->shareManager->outgoingServer2ServerSharesAllowed()) {
+            $federatedShares = $this->shareManager->getSharesBy(
+                $this->currentUser, Share::SHARE_TYPE_REMOTE, $node, $reShares, -1, 0
+            );
+            $shares = array_merge($shares, $federatedShares);
+        }
+
+        if ($this->shareManager->outgoingServer2ServerGroupSharesAllowed()) {
+            $federatedShares = $this->shareManager->getSharesBy(
+                $this->currentUser, Share::SHARE_TYPE_REMOTE_GROUP, $node, $reShares, -1, 0
+            );
+            $shares = array_merge($shares, $federatedShares);
+        }
+
+        return $shares;
+    }
+
+
+    /**
+     * @param Node $node
+     *
+     * @throws SharingRightsException
+     */
+    private function confirmSharingRights(Node $node): void {
+        if (!$this->hasResharingRights($this->currentUser, $node)) {
+            throw new SharingRightsException('no sharing rights on this item');
+        }
+    }
+
+
+    /**
+     * @param string $viewer
+     * @param Node $node
+     *
+     * @return bool
+     */
+    private function hasResharingRights($viewer, $node): bool {
+        if ($viewer === $node->getOwner()->getUID()) {
+            return true;
+        }
+
+        foreach ([$node, $node->getParent()] as $node) {
+            $shares = $this->getSharesFromNode($viewer, $node, true);
+            foreach ($shares as $share) {
+                try {
+                    if ($this->shareProviderResharingRights($viewer, $share, $node)) {
+                        return true;
+                    }
+                } catch (InvalidPathException | NotFoundException $e) {
+                }
+            }
+        }
+
+        return false;
+    }
+
+
+    /**
+     * Returns if we can find resharing rights in an IShare object for a specific user.
+     *
+     * @suppress PhanUndeclaredClassMethod
+     *
+     * @param string $userId
+     * @param IShare $share
+     * @param Node $node
+     *
+     * @return bool
+     * @throws NotFoundException
+     * @throws InvalidPathException
+     */
+    private function shareProviderResharingRights(string $userId, IShare $share, $node): bool {
+        if ($share->getShareOwner() === $userId) {
+            return true;
+        }
+
+        // we check that current user have parent resharing rights on the current file
+        if ($node !== null && ($node->getPermissions() & Constants::PERMISSION_SHARE) !== 0) {
+            return true;
+        }
+
+        if ((\OCP\Constants::PERMISSION_SHARE & $share->getPermissions()) === 0) {
+            return false;
+        }
+
+        if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER && $share->getSharedWith() === $userId) {
+            return true;
+        }
+
+        if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP && $this->groupManager->isInGroup($userId, $share->getSharedWith())) {
+            return true;
+        }
+
+        if ($share->getShareType() === \OCP\Share::SHARE_TYPE_CIRCLE && \OC::$server->getAppManager()->isEnabledForUser('circles')
+            && class_exists('\OCA\Circles\Api\v1\Circles')) {
+
+            $hasCircleId = (substr($share->getSharedWith(), -1) === ']');
+            $shareWithStart = ($hasCircleId ? strrpos($share->getSharedWith(), '[') + 1 : 0);
+            $shareWithLength = ($hasCircleId ? -1 : strpos($share->getSharedWith(), ' '));
+            if (is_bool($shareWithLength)) {
+                $shareWithLength = -1;
+            }
+            $sharedWith = substr($share->getSharedWith(), $shareWithStart, $shareWithLength);
+            try {
+                $member = \OCA\Circles\Api\v1\Circles::getMember($sharedWith, $userId, 1);
+                if ($member->getLevel() >= 4) {
+                    return true;
+                }
+                return false;
+            } catch (QueryException $e) {
+                return false;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Get all the shares for the current user
+     *
+     * @param Node|null $path
+     * @param boolean $reshares
+     * @return void
+     */
+    private function getAllShares(?Node $path = null, bool $reshares = false) {
+        // Get all shares
+        $userShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_USER, $path, $reshares, -1, 0);
+        $groupShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_GROUP, $path, $reshares, -1, 0);
+        $linkShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_LINK, $path, $reshares, -1, 0);
+
+        // EMAIL SHARES
+        $mailShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_EMAIL, $path, $reshares, -1, 0);
+
+        // CIRCLE SHARES
+        $circleShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_CIRCLE, $path, $reshares, -1, 0);
+
+        // TALK SHARES
+        $roomShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_ROOM, $path, $reshares, -1, 0);
+
+        // FEDERATION
+        if ($this->shareManager->outgoingServer2ServerSharesAllowed()) {
+            $federatedShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_REMOTE, $path, $reshares, -1, 0);
+        } else {
+            $federatedShares = [];
+        }
+        if ($this->shareManager->outgoingServer2ServerGroupSharesAllowed()) {
+            $federatedGroupShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_REMOTE_GROUP, $path, $reshares, -1, 0);
+        } else {
+            $federatedGroupShares = [];
+        }
+
+        return array_merge($userShares, $groupShares, $linkShares, $mailShares, $circleShares, $roomShares, $federatedShares, $federatedGroupShares);
+    }
+
+
+    /**
+     * merging already formatted shares.
+     * We'll make an associative array to easily detect duplicate Ids.
+     * Keys _needs_ to be removed after all shares are retrieved and merged.
+     *
+     * @param array $shares
+     * @param array $newShares
+     */
+    private function mergeFormattedShares(array &$shares, array $newShares) {
+        foreach ($newShares as $newShare) {
+            if (!array_key_exists($newShare['id'], $shares)) {
+                $shares[$newShare['id']] = $newShare;
+            }
+        }
+    }
 
 }

apps/files_sharing/lib/ShareBackend/Folder.php

Indentation +105 added lines, -105 removed lines

@@ -31,110 +31,110 @@
 
 class Folder extends File implements \OCP\Share_Backend_Collection {
 
-	/**
-	 * get shared parents
-	 *
-	 * @param int $itemSource item source ID
-	 * @param string $shareWith with whom should the item be shared
-	 * @param string $owner owner of the item
-	 * @return array with shares
-	 */
-	public function getParents($itemSource, $shareWith = null, $owner = null) {
-		$result = [];
-		$parent = $this->getParentId($itemSource);
-
-		$userManager = \OC::$server->getUserManager();
-
-		while ($parent) {
-			$shares = \OCP\Share::getItemSharedWithUser('folder', $parent, $shareWith, $owner);
-			if ($shares) {
-				foreach ($shares as $share) {
-					$name = basename($share['path']);
-					$share['collection']['path'] = $name;
-					$share['collection']['item_type'] = 'folder';
-					$share['file_path'] = $name;
-
-					$ownerUser = $userManager->get($share['uid_owner']);
-					$displayNameOwner = $ownerUser === null ? $share['uid_owner'] : $ownerUser->getDisplayName();
-					$shareWithUser = $userManager->get($share['share_with']);
-					$displayNameShareWith = $shareWithUser === null ? $share['share_with'] : $shareWithUser->getDisplayName();
-					$share['displayname_owner'] = $displayNameOwner ? $displayNameOwner : $share['uid_owner'];
-					$share['share_with_displayname'] = $displayNameShareWith ? $displayNameShareWith : $share['uid_owner'];
-
-					$result[] = $share;
-				}
-			}
-			$parent = $this->getParentId($parent);
-		}
-
-		return $result;
-	}
-
-	/**
-	 * get file cache ID of parent
-	 *
-	 * @param int $child file cache ID of child
-	 * @return mixed parent ID or null
-	 */
-	private function getParentId($child) {
-		$qb = \OC::$server->getDatabaseConnection()->getQueryBuilder();
-		$qb->select('parent')
-			->from('filecache')
-			->where(
-				$qb->expr()->eq('fileid', $qb->createNamedParameter($child))
-			);
-		$result = $qb->execute();
-		$row = $result->fetch();
-		$result->closeCursor();
-		return $row ? $row['parent'] : null;
-	}
-
-	public function getChildren($itemSource) {
-		$children = [];
-		$parents = [$itemSource];
-
-		$qb = \OC::$server->getDatabaseConnection()->getQueryBuilder();
-		$qb->select('id')
-			->from('mimetypes')
-			->where(
-				$qb->expr()->eq('mimetype', $qb->createNamedParameter('httpd/unix-directory'))
-			);
-		$result = $qb->execute();
-		$row = $result->fetch();
-		$result->closeCursor();
-
-		if ($row = $result->fetchRow()) {
-			$mimetype = (int) $row['id'];
-		} else {
-			$mimetype = -1;
-		}
-		while (!empty($parents)) {
-
-			$qb = \OC::$server->getDatabaseConnection()->getQueryBuilder();
-
-			$parents = array_map(function ($parent) use ($qb) {
-				return $qb->createNamedParameter($parent);
-			}, $parents);
-
-			$qb->select('`fileid', 'name', '`mimetype')
-				->from('filecache')
-				->where(
-					$qb->expr()->in('parent', $parents)
-				);
-
-			$result = $qb->execute();
-
-			$parents = [];
-			while ($file = $result->fetch()) {
-				$children[] = ['source' => $file['fileid'], 'file_path' => $file['name']];
-				// If a child folder is found look inside it
-				if ((int) $file['mimetype'] === $mimetype) {
-					$parents[] = $file['fileid'];
-				}
-			}
-			$result->closeCursor();
-		}
-		return $children;
-	}
+    /**
+     * get shared parents
+     *
+     * @param int $itemSource item source ID
+     * @param string $shareWith with whom should the item be shared
+     * @param string $owner owner of the item
+     * @return array with shares
+     */
+    public function getParents($itemSource, $shareWith = null, $owner = null) {
+        $result = [];
+        $parent = $this->getParentId($itemSource);
+
+        $userManager = \OC::$server->getUserManager();
+
+        while ($parent) {
+            $shares = \OCP\Share::getItemSharedWithUser('folder', $parent, $shareWith, $owner);
+            if ($shares) {
+                foreach ($shares as $share) {
+                    $name = basename($share['path']);
+                    $share['collection']['path'] = $name;
+                    $share['collection']['item_type'] = 'folder';
+                    $share['file_path'] = $name;
+
+                    $ownerUser = $userManager->get($share['uid_owner']);
+                    $displayNameOwner = $ownerUser === null ? $share['uid_owner'] : $ownerUser->getDisplayName();
+                    $shareWithUser = $userManager->get($share['share_with']);
+                    $displayNameShareWith = $shareWithUser === null ? $share['share_with'] : $shareWithUser->getDisplayName();
+                    $share['displayname_owner'] = $displayNameOwner ? $displayNameOwner : $share['uid_owner'];
+                    $share['share_with_displayname'] = $displayNameShareWith ? $displayNameShareWith : $share['uid_owner'];
+
+                    $result[] = $share;
+                }
+            }
+            $parent = $this->getParentId($parent);
+        }
+
+        return $result;
+    }
+
+    /**
+     * get file cache ID of parent
+     *
+     * @param int $child file cache ID of child
+     * @return mixed parent ID or null
+     */
+    private function getParentId($child) {
+        $qb = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+        $qb->select('parent')
+            ->from('filecache')
+            ->where(
+                $qb->expr()->eq('fileid', $qb->createNamedParameter($child))
+            );
+        $result = $qb->execute();
+        $row = $result->fetch();
+        $result->closeCursor();
+        return $row ? $row['parent'] : null;
+    }
+
+    public function getChildren($itemSource) {
+        $children = [];
+        $parents = [$itemSource];
+
+        $qb = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+        $qb->select('id')
+            ->from('mimetypes')
+            ->where(
+                $qb->expr()->eq('mimetype', $qb->createNamedParameter('httpd/unix-directory'))
+            );
+        $result = $qb->execute();
+        $row = $result->fetch();
+        $result->closeCursor();
+
+        if ($row = $result->fetchRow()) {
+            $mimetype = (int) $row['id'];
+        } else {
+            $mimetype = -1;
+        }
+        while (!empty($parents)) {
+
+            $qb = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+
+            $parents = array_map(function ($parent) use ($qb) {
+                return $qb->createNamedParameter($parent);
+            }, $parents);
+
+            $qb->select('`fileid', 'name', '`mimetype')
+                ->from('filecache')
+                ->where(
+                    $qb->expr()->in('parent', $parents)
+                );
+
+            $result = $qb->execute();
+
+            $parents = [];
+            while ($file = $result->fetch()) {
+                $children[] = ['source' => $file['fileid'], 'file_path' => $file['name']];
+                // If a child folder is found look inside it
+                if ((int) $file['mimetype'] === $mimetype) {
+                    $parents[] = $file['fileid'];
+                }
+            }
+            $result->closeCursor();
+        }
+        return $children;
+    }
 
 }

apps/files_sharing/lib/MountProvider.php

Indentation +199 added lines, -199 removed lines

@@ -39,203 +39,203 @@
 use OCP\Share\IShare;
 
 class MountProvider implements IMountProvider {
-	/**
-	 * @var \OCP\IConfig
-	 */
-	protected $config;
-
-	/**
-	 * @var IManager
-	 */
-	protected $shareManager;
-
-	/**
-	 * @var ILogger
-	 */
-	protected $logger;
-
-	/**
-	 * @param \OCP\IConfig $config
-	 * @param IManager $shareManager
-	 * @param ILogger $logger
-	 */
-	public function __construct(IConfig $config, IManager $shareManager, ILogger $logger) {
-		$this->config = $config;
-		$this->shareManager = $shareManager;
-		$this->logger = $logger;
-	}
-
-
-	/**
-	 * Get all mountpoints applicable for the user and check for shares where we need to update the etags
-	 *
-	 * @param \OCP\IUser $user
-	 * @param \OCP\Files\Storage\IStorageFactory $storageFactory
-	 * @return \OCP\Files\Mount\IMountPoint[]
-	 */
-	public function getMountsForUser(IUser $user, IStorageFactory $storageFactory) {
-
-		$shares = $this->shareManager->getSharedWith($user->getUID(), \OCP\Share::SHARE_TYPE_USER, null, -1);
-		$shares = array_merge($shares, $this->shareManager->getSharedWith($user->getUID(), \OCP\Share::SHARE_TYPE_GROUP, null, -1));
-		$shares = array_merge($shares, $this->shareManager->getSharedWith($user->getUID(), \OCP\Share::SHARE_TYPE_CIRCLE, null, -1));
-		$shares = array_merge($shares, $this->shareManager->getSharedWith($user->getUID(), \OCP\Share::SHARE_TYPE_ROOM, null, -1));
-
-		// filter out excluded shares and group shares that includes self
-		$shares = array_filter($shares, function (\OCP\Share\IShare $share) use ($user) {
-			return $share->getPermissions() > 0 && $share->getShareOwner() !== $user->getUID();
-		});
-
-		$superShares = $this->buildSuperShares($shares, $user);
-
-		$mounts = [];
-		$view = new View('/' . $user->getUID() . '/files');
-		$ownerViews = [];
-		$sharingDisabledForUser = $this->shareManager->sharingDisabledForUser($user->getUID());
-		$foldersExistCache = new CappedMemoryCache();
-		foreach ($superShares as $share) {
-			try {
-				/** @var \OCP\Share\IShare $parentShare */
-				$parentShare = $share[0];
-
-				if ($parentShare->getStatus() !== IShare::STATUS_ACCEPTED &&
-					($parentShare->getShareType() === IShare::TYPE_GROUP ||
-						$parentShare->getShareType() === IShare::TYPE_USERGROUP ||
-						$parentShare->getShareType() === IShare::TYPE_USER)) {
-					continue;
-				}
-
-				$owner = $parentShare->getShareOwner();
-				if (!isset($ownerViews[$owner])) {
-					$ownerViews[$owner] = new View('/' . $parentShare->getShareOwner() . '/files');
-				}
-				$mount = new SharedMount(
-					'\OCA\Files_Sharing\SharedStorage',
-					$mounts,
-					[
-						'user' => $user->getUID(),
-						// parent share
-						'superShare' => $parentShare,
-						// children/component of the superShare
-						'groupedShares' => $share[1],
-						'ownerView' => $ownerViews[$owner],
-						'sharingDisabledForUser' => $sharingDisabledForUser
-					],
-					$storageFactory,
-					$view,
-					$foldersExistCache
-				);
-				$mounts[$mount->getMountPoint()] = $mount;
-			} catch (\Exception $e) {
-				$this->logger->logException($e);
-				$this->logger->error('Error while trying to create shared mount');
-			}
-		}
-
-		// array_filter removes the null values from the array
-		return array_values(array_filter($mounts));
-	}
-
-	/**
-	 * Groups shares by path (nodeId) and target path
-	 *
-	 * @param \OCP\Share\IShare[] $shares
-	 * @return \OCP\Share\IShare[][] array of grouped shares, each element in the
-	 * array is a group which itself is an array of shares
-	 */
-	private function groupShares(array $shares) {
-		$tmp = [];
-
-		foreach ($shares as $share) {
-			if (!isset($tmp[$share->getNodeId()])) {
-				$tmp[$share->getNodeId()] = [];
-			}
-			$tmp[$share->getNodeId()][] = $share;
-		}
-
-		$result = [];
-		// sort by stime, the super share will be based on the least recent share
-		foreach ($tmp as &$tmp2) {
-			@usort($tmp2, function ($a, $b) {
-				if ($a->getShareTime() <= $b->getShareTime()) {
-					return -1;
-				}
-				return 1;
-			});
-			$result[] = $tmp2;
-		}
-
-		return array_values($result);
-	}
-
-	/**
-	 * Build super shares (virtual share) by grouping them by node id and target,
-	 * then for each group compute the super share and return it along with the matching
-	 * grouped shares. The most permissive permissions are used based on the permissions
-	 * of all shares within the group.
-	 *
-	 * @param \OCP\Share\IShare[] $allShares
-	 * @param \OCP\IUser $user user
-	 * @return array Tuple of [superShare, groupedShares]
-	 */
-	private function buildSuperShares(array $allShares, \OCP\IUser $user) {
-		$result = [];
-
-		$groupedShares = $this->groupShares($allShares);
-
-		/** @var \OCP\Share\IShare[] $shares */
-		foreach ($groupedShares as $shares) {
-			if (count($shares) === 0) {
-				continue;
-			}
-
-			$superShare = $this->shareManager->newShare();
-
-			// compute super share based on first entry of the group
-			$superShare->setId($shares[0]->getId())
-				->setShareOwner($shares[0]->getShareOwner())
-				->setNodeId($shares[0]->getNodeId())
-				->setShareType($shares[0]->getShareType())
-				->setTarget($shares[0]->getTarget());
-
-			// use most permissive permissions
-			$permissions = 0;
-			$status = IShare::STATUS_PENDING;
-			foreach ($shares as $share) {
-				$permissions |= $share->getPermissions();
-				$status = max($status, $share->getStatus());
-
-				if ($share->getTarget() !== $superShare->getTarget()) {
-					// adjust target, for database consistency
-					$share->setTarget($superShare->getTarget());
-					try {
-						$this->shareManager->moveShare($share, $user->getUID());
-					} catch (\InvalidArgumentException $e) {
-						// ignore as it is not important and we don't want to
-						// block FS setup
-
-						// the subsequent code anyway only uses the target of the
-						// super share
-
-						// such issue can usually happen when dealing with
-						// null groups which usually appear with group backend
-						// caching inconsistencies
-						$this->logger->debug(
-							'Could not adjust share target for share ' . $share->getId() . ' to make it consistent: ' . $e->getMessage(),
-							['app' => 'files_sharing']
-						);
-					}
-				}
-				if (!is_null($share->getNodeCacheEntry())) {
-					$superShare->setNodeCacheEntry($share->getNodeCacheEntry());
-				}
-			}
-
-			$superShare->setPermissions($permissions)
-				->setStatus($status);
-
-			$result[] = [$superShare, $shares];
-		}
-
-		return $result;
-	}
+    /**
+     * @var \OCP\IConfig
+     */
+    protected $config;
+
+    /**
+     * @var IManager
+     */
+    protected $shareManager;
+
+    /**
+     * @var ILogger
+     */
+    protected $logger;
+
+    /**
+     * @param \OCP\IConfig $config
+     * @param IManager $shareManager
+     * @param ILogger $logger
+     */
+    public function __construct(IConfig $config, IManager $shareManager, ILogger $logger) {
+        $this->config = $config;
+        $this->shareManager = $shareManager;
+        $this->logger = $logger;
+    }
+
+
+    /**
+     * Get all mountpoints applicable for the user and check for shares where we need to update the etags
+     *
+     * @param \OCP\IUser $user
+     * @param \OCP\Files\Storage\IStorageFactory $storageFactory
+     * @return \OCP\Files\Mount\IMountPoint[]
+     */
+    public function getMountsForUser(IUser $user, IStorageFactory $storageFactory) {
+
+        $shares = $this->shareManager->getSharedWith($user->getUID(), \OCP\Share::SHARE_TYPE_USER, null, -1);
+        $shares = array_merge($shares, $this->shareManager->getSharedWith($user->getUID(), \OCP\Share::SHARE_TYPE_GROUP, null, -1));
+        $shares = array_merge($shares, $this->shareManager->getSharedWith($user->getUID(), \OCP\Share::SHARE_TYPE_CIRCLE, null, -1));
+        $shares = array_merge($shares, $this->shareManager->getSharedWith($user->getUID(), \OCP\Share::SHARE_TYPE_ROOM, null, -1));
+
+        // filter out excluded shares and group shares that includes self
+        $shares = array_filter($shares, function (\OCP\Share\IShare $share) use ($user) {
+            return $share->getPermissions() > 0 && $share->getShareOwner() !== $user->getUID();
+        });
+
+        $superShares = $this->buildSuperShares($shares, $user);
+
+        $mounts = [];
+        $view = new View('/' . $user->getUID() . '/files');
+        $ownerViews = [];
+        $sharingDisabledForUser = $this->shareManager->sharingDisabledForUser($user->getUID());
+        $foldersExistCache = new CappedMemoryCache();
+        foreach ($superShares as $share) {
+            try {
+                /** @var \OCP\Share\IShare $parentShare */
+                $parentShare = $share[0];
+
+                if ($parentShare->getStatus() !== IShare::STATUS_ACCEPTED &&
+                    ($parentShare->getShareType() === IShare::TYPE_GROUP ||
+                        $parentShare->getShareType() === IShare::TYPE_USERGROUP ||
+                        $parentShare->getShareType() === IShare::TYPE_USER)) {
+                    continue;
+                }
+
+                $owner = $parentShare->getShareOwner();
+                if (!isset($ownerViews[$owner])) {
+                    $ownerViews[$owner] = new View('/' . $parentShare->getShareOwner() . '/files');
+                }
+                $mount = new SharedMount(
+                    '\OCA\Files_Sharing\SharedStorage',
+                    $mounts,
+                    [
+                        'user' => $user->getUID(),
+                        // parent share
+                        'superShare' => $parentShare,
+                        // children/component of the superShare
+                        'groupedShares' => $share[1],
+                        'ownerView' => $ownerViews[$owner],
+                        'sharingDisabledForUser' => $sharingDisabledForUser
+                    ],
+                    $storageFactory,
+                    $view,
+                    $foldersExistCache
+                );
+                $mounts[$mount->getMountPoint()] = $mount;
+            } catch (\Exception $e) {
+                $this->logger->logException($e);
+                $this->logger->error('Error while trying to create shared mount');
+            }
+        }
+
+        // array_filter removes the null values from the array
+        return array_values(array_filter($mounts));
+    }
+
+    /**
+     * Groups shares by path (nodeId) and target path
+     *
+     * @param \OCP\Share\IShare[] $shares
+     * @return \OCP\Share\IShare[][] array of grouped shares, each element in the
+     * array is a group which itself is an array of shares
+     */
+    private function groupShares(array $shares) {
+        $tmp = [];
+
+        foreach ($shares as $share) {
+            if (!isset($tmp[$share->getNodeId()])) {
+                $tmp[$share->getNodeId()] = [];
+            }
+            $tmp[$share->getNodeId()][] = $share;
+        }
+
+        $result = [];
+        // sort by stime, the super share will be based on the least recent share
+        foreach ($tmp as &$tmp2) {
+            @usort($tmp2, function ($a, $b) {
+                if ($a->getShareTime() <= $b->getShareTime()) {
+                    return -1;
+                }
+                return 1;
+            });
+            $result[] = $tmp2;
+        }
+
+        return array_values($result);
+    }
+
+    /**
+     * Build super shares (virtual share) by grouping them by node id and target,
+     * then for each group compute the super share and return it along with the matching
+     * grouped shares. The most permissive permissions are used based on the permissions
+     * of all shares within the group.
+     *
+     * @param \OCP\Share\IShare[] $allShares
+     * @param \OCP\IUser $user user
+     * @return array Tuple of [superShare, groupedShares]
+     */
+    private function buildSuperShares(array $allShares, \OCP\IUser $user) {
+        $result = [];
+
+        $groupedShares = $this->groupShares($allShares);
+
+        /** @var \OCP\Share\IShare[] $shares */
+        foreach ($groupedShares as $shares) {
+            if (count($shares) === 0) {
+                continue;
+            }
+
+            $superShare = $this->shareManager->newShare();
+
+            // compute super share based on first entry of the group
+            $superShare->setId($shares[0]->getId())
+                ->setShareOwner($shares[0]->getShareOwner())
+                ->setNodeId($shares[0]->getNodeId())
+                ->setShareType($shares[0]->getShareType())
+                ->setTarget($shares[0]->getTarget());
+
+            // use most permissive permissions
+            $permissions = 0;
+            $status = IShare::STATUS_PENDING;
+            foreach ($shares as $share) {
+                $permissions |= $share->getPermissions();
+                $status = max($status, $share->getStatus());
+
+                if ($share->getTarget() !== $superShare->getTarget()) {
+                    // adjust target, for database consistency
+                    $share->setTarget($superShare->getTarget());
+                    try {
+                        $this->shareManager->moveShare($share, $user->getUID());
+                    } catch (\InvalidArgumentException $e) {
+                        // ignore as it is not important and we don't want to
+                        // block FS setup
+
+                        // the subsequent code anyway only uses the target of the
+                        // super share
+
+                        // such issue can usually happen when dealing with
+                        // null groups which usually appear with group backend
+                        // caching inconsistencies
+                        $this->logger->debug(
+                            'Could not adjust share target for share ' . $share->getId() . ' to make it consistent: ' . $e->getMessage(),
+                            ['app' => 'files_sharing']
+                        );
+                    }
+                }
+                if (!is_null($share->getNodeCacheEntry())) {
+                    $superShare->setNodeCacheEntry($share->getNodeCacheEntry());
+                }
+            }
+
+            $superShare->setPermissions($permissions)
+                ->setStatus($status);
+
+            $result[] = [$superShare, $shares];
+        }
+
+        return $result;
+    }
 }

apps/files_sharing/lib/Collaboration/ShareRecipientSorter.php

Indentation +64 added lines, -64 removed lines

@@ -32,78 +32,78 @@
 
 class ShareRecipientSorter implements ISorter {
 
-	/** @var IManager */
-	private $shareManager;
-	/** @var Folder */
-	private $rootFolder;
-	/** @var IUserSession */
-	private $userSession;
+    /** @var IManager */
+    private $shareManager;
+    /** @var Folder */
+    private $rootFolder;
+    /** @var IUserSession */
+    private $userSession;
 
-	public function __construct(IManager $shareManager, IRootFolder $rootFolder, IUserSession $userSession) {
-		$this->shareManager = $shareManager;
-		$this->rootFolder = $rootFolder;
-		$this->userSession = $userSession;
-	}
+    public function __construct(IManager $shareManager, IRootFolder $rootFolder, IUserSession $userSession) {
+        $this->shareManager = $shareManager;
+        $this->rootFolder = $rootFolder;
+        $this->userSession = $userSession;
+    }
 
-	public function getId() {
-		return 'share-recipients';
-	}
+    public function getId() {
+        return 'share-recipients';
+    }
 
-	public function sort(array &$sortArray, array $context) {
-		// let's be tolerant. Comments  uses "files" by default, other usages are often singular
-		if($context['itemType'] !== 'files' && $context['itemType'] !== 'file') {
-			return;
-		}
-		$user = $this->userSession->getUser();
-		if($user === null) {
-			return;
-		}
-		$userFolder = $this->rootFolder->getUserFolder($user->getUID());
-		/** @var Node[] $nodes */
-		$nodes = $userFolder->getById((int)$context['itemId']);
-		if(count($nodes) === 0) {
-			return;
-		}
-		$al = $this->shareManager->getAccessList($nodes[0]);
+    public function sort(array &$sortArray, array $context) {
+        // let's be tolerant. Comments  uses "files" by default, other usages are often singular
+        if($context['itemType'] !== 'files' && $context['itemType'] !== 'file') {
+            return;
+        }
+        $user = $this->userSession->getUser();
+        if($user === null) {
+            return;
+        }
+        $userFolder = $this->rootFolder->getUserFolder($user->getUID());
+        /** @var Node[] $nodes */
+        $nodes = $userFolder->getById((int)$context['itemId']);
+        if(count($nodes) === 0) {
+            return;
+        }
+        $al = $this->shareManager->getAccessList($nodes[0]);
 
-		foreach ($sortArray as $type => &$byType) {
-			if(!isset($al[$type]) || !is_array($al[$type])) {
-				continue;
-			}
+        foreach ($sortArray as $type => &$byType) {
+            if(!isset($al[$type]) || !is_array($al[$type])) {
+                continue;
+            }
 
-			// at least on PHP 5.6 usort turned out to be not stable. So we add
-			// the current index to the value and compare it on a draw
-			$i = 0;
-			$workArray = array_map(function ($element) use (&$i) {
-				return [$i++, $element];
-			}, $byType);
+            // at least on PHP 5.6 usort turned out to be not stable. So we add
+            // the current index to the value and compare it on a draw
+            $i = 0;
+            $workArray = array_map(function ($element) use (&$i) {
+                return [$i++, $element];
+            }, $byType);
 
-			usort($workArray, function ($a, $b) use ($al, $type) {
-				$result = $this->compare($a[1], $b[1], $al[$type]);
-				if($result === 0) {
-					$result = $a[0] - $b[0];
-				}
-				return $result;
-			});
+            usort($workArray, function ($a, $b) use ($al, $type) {
+                $result = $this->compare($a[1], $b[1], $al[$type]);
+                if($result === 0) {
+                    $result = $a[0] - $b[0];
+                }
+                return $result;
+            });
 
-			// and remove the index values again
-			$byType = array_column($workArray, 1);
-		}
-	}
+            // and remove the index values again
+            $byType = array_column($workArray, 1);
+        }
+    }
 
-	/**
-	 * @param array $a
-	 * @param array $b
-	 * @param array $al
-	 * @return int
-	 */
-	protected function compare(array $a, array $b, array $al) {
-		$a = $a['value']['shareWith'];
-		$b = $b['value']['shareWith'];
+    /**
+     * @param array $a
+     * @param array $b
+     * @param array $al
+     * @return int
+     */
+    protected function compare(array $a, array $b, array $al) {
+        $a = $a['value']['shareWith'];
+        $b = $b['value']['shareWith'];
 
-		$valueA = (int)in_array($a, $al, true);
-		$valueB = (int)in_array($b, $al, true);
+        $valueA = (int)in_array($a, $al, true);
+        $valueB = (int)in_array($b, $al, true);
 
-		return $valueB - $valueA;
-	}
+        return $valueB - $valueA;
+    }
 }

apps/theming/lib/ThemingDefaults.php

Indentation +375 added lines, -375 removed lines

@@ -50,379 +50,379 @@
 
 class ThemingDefaults extends \OC_Defaults {
 
-	/** @var IConfig */
-	private $config;
-	/** @var IL10N */
-	private $l;
-	/** @var ImageManager */
-	private $imageManager;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var ICacheFactory */
-	private $cacheFactory;
-	/** @var Util */
-	private $util;
-	/** @var IAppManager */
-	private $appManager;
-	/** @var INavigationManager */
-	private $navigationManager;
-
-	/** @var string */
-	private $name;
-	/** @var string */
-	private $title;
-	/** @var string */
-	private $entity;
-	/** @var string */
-	private $url;
-	/** @var string */
-	private $color;
-
-	/** @var string */
-	private $iTunesAppId;
-	/** @var string */
-	private $iOSClientUrl;
-	/** @var string */
-	private $AndroidClientUrl;
-
-	/**
-	 * ThemingDefaults constructor.
-	 *
-	 * @param IConfig $config
-	 * @param IL10N $l
-	 * @param ImageManager $imageManager
-	 * @param IURLGenerator $urlGenerator
-	 * @param ICacheFactory $cacheFactory
-	 * @param Util $util
-	 * @param IAppManager $appManager
-	 */
-	public function __construct(IConfig $config,
-								IL10N $l,
-								IURLGenerator $urlGenerator,
-								ICacheFactory $cacheFactory,
-								Util $util,
-								ImageManager $imageManager,
-								IAppManager $appManager,
-								INavigationManager $navigationManager
-	) {
-		parent::__construct();
-		$this->config = $config;
-		$this->l = $l;
-		$this->imageManager = $imageManager;
-		$this->urlGenerator = $urlGenerator;
-		$this->cacheFactory = $cacheFactory;
-		$this->util = $util;
-		$this->appManager = $appManager;
-		$this->navigationManager = $navigationManager;
-
-		$this->name = parent::getName();
-		$this->title = parent::getTitle();
-		$this->entity = parent::getEntity();
-		$this->url = parent::getBaseUrl();
-		$this->color = parent::getColorPrimary();
-		$this->iTunesAppId = parent::getiTunesAppId();
-		$this->iOSClientUrl = parent::getiOSClientUrl();
-		$this->AndroidClientUrl = parent::getAndroidClientUrl();
-	}
-
-	public function getName() {
-		return strip_tags($this->config->getAppValue('theming', 'name', $this->name));
-	}
-
-	public function getHTMLName() {
-		return $this->config->getAppValue('theming', 'name', $this->name);
-	}
-
-	public function getTitle() {
-		return strip_tags($this->config->getAppValue('theming', 'name', $this->title));
-	}
-
-	public function getEntity() {
-		return strip_tags($this->config->getAppValue('theming', 'name', $this->entity));
-	}
-
-	public function getBaseUrl() {
-		return $this->config->getAppValue('theming', 'url', $this->url);
-	}
-
-	public function getSlogan() {
-		return \OCP\Util::sanitizeHTML($this->config->getAppValue('theming', 'slogan', parent::getSlogan()));
-	}
-
-	public function getImprintUrl() {
-		return (string)$this->config->getAppValue('theming', 'imprintUrl', '');
-	}
-
-	public function getPrivacyUrl() {
-		return (string)$this->config->getAppValue('theming', 'privacyUrl', '');
-	}
-
-	public function getShortFooter() {
-		$slogan = $this->getSlogan();
-		$baseUrl = $this->getBaseUrl();
-		if ($baseUrl !== '') {
-			$footer = '<a href="' . $baseUrl . '" target="_blank"' .
-				' rel="noreferrer noopener" class="entity-name">' . $this->getEntity() . '</a>';
-		} else {
-			$footer = '<span class="entity-name">' .$this->getEntity() . '</span>';
-		}
-		$footer .= ($slogan !== '' ? ' – ' . $slogan : '');
-
-		$links = [
-			[
-				'text' => $this->l->t('Legal notice'),
-				'url' => (string)$this->getImprintUrl()
-			],
-			[
-				'text' => $this->l->t('Privacy policy'),
-				'url' => (string)$this->getPrivacyUrl()
-			],
-		];
-
-		$navigation = $this->navigationManager->getAll(INavigationManager::TYPE_GUEST);
-		$guestNavigation = array_map(function ($nav) {
-			return [
-				'text' => $nav['name'],
-				'url' => $nav['href']
-			];
-		}, $navigation);
-		$links = array_merge($links, $guestNavigation);
-
-		$legalLinks = ''; $divider = '';
-		foreach($links as $link) {
-			if($link['url'] !== ''
-				&& filter_var($link['url'], FILTER_VALIDATE_URL)
-			) {
-				$legalLinks .= $divider . '<a href="' . $link['url'] . '" class="legal" target="_blank"' .
-					' rel="noreferrer noopener">' . $link['text'] . '</a>';
-				$divider = ' · ';
-			}
-		}
-		if($legalLinks !== '' ) {
-			$footer .= '<br/>' . $legalLinks;
-		}
-
-		return $footer;
-	}
-
-	/**
-	 * Color that is used for the header as well as for mail headers
-	 *
-	 * @return string
-	 */
-	public function getColorPrimary() {
-		return $this->config->getAppValue('theming', 'color', $this->color);
-	}
-
-	/**
-	 * Themed logo url
-	 *
-	 * @param bool $useSvg Whether to point to the SVG image or a fallback
-	 * @return string
-	 */
-	public function getLogo($useSvg = true): string {
-		$logo = $this->config->getAppValue('theming', 'logoMime', false);
-
-		$logoExists = true;
-		try {
-			$this->imageManager->getImage('logo', $useSvg);
-		} catch (\Exception $e) {
-			$logoExists = false;
-		}
-
-		$cacheBusterCounter = $this->config->getAppValue('theming', 'cachebuster', '0');
-
-		if(!$logo || !$logoExists) {
-			if($useSvg) {
-				$logo = $this->urlGenerator->imagePath('core', 'logo/logo.svg');
-			} else {
-				$logo = $this->urlGenerator->imagePath('core', 'logo/logo.png');
-			}
-			return $logo . '?v=' . $cacheBusterCounter;
-		}
-
-		return $this->urlGenerator->linkToRoute('theming.Theming.getImage', [ 'key' => 'logo', 'useSvg' => $useSvg, 'v' => $cacheBusterCounter ]);
-	}
-
-	/**
-	 * Themed background image url
-	 *
-	 * @return string
-	 */
-	public function getBackground(): string {
-		return $this->imageManager->getImageUrl('background');
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getiTunesAppId() {
-		return $this->config->getAppValue('theming', 'iTunesAppId', $this->iTunesAppId);
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getiOSClientUrl() {
-		return $this->config->getAppValue('theming', 'iOSClientUrl', $this->iOSClientUrl);
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getAndroidClientUrl() {
-		return $this->config->getAppValue('theming', 'AndroidClientUrl', $this->AndroidClientUrl);
-	}
-
-
-	/**
-	 * @return array scss variables to overwrite
-	 */
-	public function getScssVariables() {
-		$cache = $this->cacheFactory->createDistributed('theming-' . $this->urlGenerator->getBaseUrl());
-		if ($value = $cache->get('getScssVariables')) {
-			return $value;
-		}
-
-		$variables = [
-			'theming-cachebuster' => "'" . $this->config->getAppValue('theming', 'cachebuster', '0') . "'",
-			'theming-logo-mime' => "'" . $this->config->getAppValue('theming', 'logoMime') . "'",
-			'theming-background-mime' => "'" . $this->config->getAppValue('theming', 'backgroundMime') . "'",
-			'theming-logoheader-mime' => "'" . $this->config->getAppValue('theming', 'logoheaderMime') . "'",
-			'theming-favicon-mime' => "'" . $this->config->getAppValue('theming', 'faviconMime') . "'"
-		];
-
-		$variables['image-logo'] = "url('".$this->imageManager->getImageUrl('logo')."')";
-		$variables['image-logoheader'] = "url('".$this->imageManager->getImageUrl('logoheader')."')";
-		$variables['image-favicon'] = "url('".$this->imageManager->getImageUrl('favicon')."')";
-		$variables['image-login-background'] = "url('".$this->imageManager->getImageUrl('background')."')";
-		$variables['image-login-plain'] = 'false';
-
-		if ($this->config->getAppValue('theming', 'color', null) !== null) {
-			$variables['color-primary'] = $this->getColorPrimary();
-			$variables['color-primary-text'] = $this->getTextColorPrimary();
-			$variables['color-primary-element'] = $this->util->elementColor($this->getColorPrimary());
-		}
-
-		if ($this->config->getAppValue('theming', 'backgroundMime', null) === 'backgroundColor') {
-			$variables['image-login-plain'] = 'true';
-		}
-
-		$variables['has-legal-links'] = 'false';
-		if($this->getImprintUrl() !== '' || $this->getPrivacyUrl() !== '') {
-			$variables['has-legal-links'] = 'true';
-		}
-
-		$cache->set('getScssVariables', $variables);
-		return $variables;
-	}
-
-	/**
-	 * Check if the image should be replaced by the theming app
-	 * and return the new image location then
-	 *
-	 * @param string $app name of the app
-	 * @param string $image filename of the image
-	 * @return bool|string false if image should not replaced, otherwise the location of the image
-	 */
-	public function replaceImagePath($app, $image) {
-		if ($app === '' || $app === 'files_sharing') {
-			$app = 'core';
-		}
-		$cacheBusterValue = $this->config->getAppValue('theming', 'cachebuster', '0');
-
-		try {
-			$customFavicon = $this->imageManager->getImage('favicon');
-		} catch (NotFoundException $e) {
-			$customFavicon = null;
-		}
-
-		$route = false;
-		if ($image === 'favicon.ico' && ($customFavicon !== null || $this->imageManager->shouldReplaceIcons())) {
-			$route = $this->urlGenerator->linkToRoute('theming.Icon.getFavicon', ['app' => $app]);
-		}
-		if (($image === 'favicon-touch.png' || $image === 'favicon-fb.png') && ($customFavicon !== null || $this->imageManager->shouldReplaceIcons())) {
-			$route = $this->urlGenerator->linkToRoute('theming.Icon.getTouchIcon', ['app' => $app]);
-		}
-		if ($image === 'manifest.json') {
-			try {
-				$appPath = $this->appManager->getAppPath($app);
-				if (file_exists($appPath . '/img/manifest.json')) {
-					return false;
-				}
-			} catch (AppPathNotFoundException $e) {}
-			$route = $this->urlGenerator->linkToRoute('theming.Theming.getManifest');
-		}
-		if (strpos($image, 'filetypes/') === 0 && file_exists(\OC::$SERVERROOT . '/core/img/' . $image )) {
-			$route = $this->urlGenerator->linkToRoute('theming.Icon.getThemedIcon', ['app' => $app, 'image' => $image]);
-		}
-
-		if ($route) {
-			return $route . '?v=' . $cacheBusterValue;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Increases the cache buster key
-	 */
-	private function increaseCacheBuster() {
-		$cacheBusterKey = $this->config->getAppValue('theming', 'cachebuster', '0');
-		$this->config->setAppValue('theming', 'cachebuster', (int)$cacheBusterKey+1);
-		$this->cacheFactory->createDistributed('theming-')->clear();
-		$this->cacheFactory->createDistributed('imagePath')->clear();
-
-	}
-
-	/**
-	 * Update setting in the database
-	 *
-	 * @param string $setting
-	 * @param string $value
-	 */
-	public function set($setting, $value) {
-		$this->config->setAppValue('theming', $setting, $value);
-		$this->increaseCacheBuster();
-	}
-
-	/**
-	 * Revert settings to the default value
-	 *
-	 * @param string $setting setting which should be reverted
-	 * @return string default value
-	 */
-	public function undo($setting) {
-		$this->config->deleteAppValue('theming', $setting);
-		$this->increaseCacheBuster();
-
-		switch ($setting) {
-			case 'name':
-				$returnValue = $this->getEntity();
-				break;
-			case 'url':
-				$returnValue = $this->getBaseUrl();
-				break;
-			case 'slogan':
-				$returnValue = $this->getSlogan();
-				break;
-			case 'color':
-				$returnValue = $this->getColorPrimary();
-				break;
-			default:
-				$returnValue = '';
-				break;
-		}
-
-		return $returnValue;
-	}
-
-	/**
-	 * Color of text in the header and primary buttons
-	 *
-	 * @return string
-	 */
-	public function getTextColorPrimary() {
-		return $this->util->invertTextColor($this->getColorPrimary()) ? '#000000' : '#ffffff';
-	}
+    /** @var IConfig */
+    private $config;
+    /** @var IL10N */
+    private $l;
+    /** @var ImageManager */
+    private $imageManager;
+    /** @var IURLGenerator */
+    private $urlGenerator;
+    /** @var ICacheFactory */
+    private $cacheFactory;
+    /** @var Util */
+    private $util;
+    /** @var IAppManager */
+    private $appManager;
+    /** @var INavigationManager */
+    private $navigationManager;
+
+    /** @var string */
+    private $name;
+    /** @var string */
+    private $title;
+    /** @var string */
+    private $entity;
+    /** @var string */
+    private $url;
+    /** @var string */
+    private $color;
+
+    /** @var string */
+    private $iTunesAppId;
+    /** @var string */
+    private $iOSClientUrl;
+    /** @var string */
+    private $AndroidClientUrl;
+
+    /**
+     * ThemingDefaults constructor.
+     *
+     * @param IConfig $config
+     * @param IL10N $l
+     * @param ImageManager $imageManager
+     * @param IURLGenerator $urlGenerator
+     * @param ICacheFactory $cacheFactory
+     * @param Util $util
+     * @param IAppManager $appManager
+     */
+    public function __construct(IConfig $config,
+                                IL10N $l,
+                                IURLGenerator $urlGenerator,
+                                ICacheFactory $cacheFactory,
+                                Util $util,
+                                ImageManager $imageManager,
+                                IAppManager $appManager,
+                                INavigationManager $navigationManager
+    ) {
+        parent::__construct();
+        $this->config = $config;
+        $this->l = $l;
+        $this->imageManager = $imageManager;
+        $this->urlGenerator = $urlGenerator;
+        $this->cacheFactory = $cacheFactory;
+        $this->util = $util;
+        $this->appManager = $appManager;
+        $this->navigationManager = $navigationManager;
+
+        $this->name = parent::getName();
+        $this->title = parent::getTitle();
+        $this->entity = parent::getEntity();
+        $this->url = parent::getBaseUrl();
+        $this->color = parent::getColorPrimary();
+        $this->iTunesAppId = parent::getiTunesAppId();
+        $this->iOSClientUrl = parent::getiOSClientUrl();
+        $this->AndroidClientUrl = parent::getAndroidClientUrl();
+    }
+
+    public function getName() {
+        return strip_tags($this->config->getAppValue('theming', 'name', $this->name));
+    }
+
+    public function getHTMLName() {
+        return $this->config->getAppValue('theming', 'name', $this->name);
+    }
+
+    public function getTitle() {
+        return strip_tags($this->config->getAppValue('theming', 'name', $this->title));
+    }
+
+    public function getEntity() {
+        return strip_tags($this->config->getAppValue('theming', 'name', $this->entity));
+    }
+
+    public function getBaseUrl() {
+        return $this->config->getAppValue('theming', 'url', $this->url);
+    }
+
+    public function getSlogan() {
+        return \OCP\Util::sanitizeHTML($this->config->getAppValue('theming', 'slogan', parent::getSlogan()));
+    }
+
+    public function getImprintUrl() {
+        return (string)$this->config->getAppValue('theming', 'imprintUrl', '');
+    }
+
+    public function getPrivacyUrl() {
+        return (string)$this->config->getAppValue('theming', 'privacyUrl', '');
+    }
+
+    public function getShortFooter() {
+        $slogan = $this->getSlogan();
+        $baseUrl = $this->getBaseUrl();
+        if ($baseUrl !== '') {
+            $footer = '<a href="' . $baseUrl . '" target="_blank"' .
+                ' rel="noreferrer noopener" class="entity-name">' . $this->getEntity() . '</a>';
+        } else {
+            $footer = '<span class="entity-name">' .$this->getEntity() . '</span>';
+        }
+        $footer .= ($slogan !== '' ? ' – ' . $slogan : '');
+
+        $links = [
+            [
+                'text' => $this->l->t('Legal notice'),
+                'url' => (string)$this->getImprintUrl()
+            ],
+            [
+                'text' => $this->l->t('Privacy policy'),
+                'url' => (string)$this->getPrivacyUrl()
+            ],
+        ];
+
+        $navigation = $this->navigationManager->getAll(INavigationManager::TYPE_GUEST);
+        $guestNavigation = array_map(function ($nav) {
+            return [
+                'text' => $nav['name'],
+                'url' => $nav['href']
+            ];
+        }, $navigation);
+        $links = array_merge($links, $guestNavigation);
+
+        $legalLinks = ''; $divider = '';
+        foreach($links as $link) {
+            if($link['url'] !== ''
+                && filter_var($link['url'], FILTER_VALIDATE_URL)
+            ) {
+                $legalLinks .= $divider . '<a href="' . $link['url'] . '" class="legal" target="_blank"' .
+                    ' rel="noreferrer noopener">' . $link['text'] . '</a>';
+                $divider = ' · ';
+            }
+        }
+        if($legalLinks !== '' ) {
+            $footer .= '<br/>' . $legalLinks;
+        }
+
+        return $footer;
+    }
+
+    /**
+     * Color that is used for the header as well as for mail headers
+     *
+     * @return string
+     */
+    public function getColorPrimary() {
+        return $this->config->getAppValue('theming', 'color', $this->color);
+    }
+
+    /**
+     * Themed logo url
+     *
+     * @param bool $useSvg Whether to point to the SVG image or a fallback
+     * @return string
+     */
+    public function getLogo($useSvg = true): string {
+        $logo = $this->config->getAppValue('theming', 'logoMime', false);
+
+        $logoExists = true;
+        try {
+            $this->imageManager->getImage('logo', $useSvg);
+        } catch (\Exception $e) {
+            $logoExists = false;
+        }
+
+        $cacheBusterCounter = $this->config->getAppValue('theming', 'cachebuster', '0');
+
+        if(!$logo || !$logoExists) {
+            if($useSvg) {
+                $logo = $this->urlGenerator->imagePath('core', 'logo/logo.svg');
+            } else {
+                $logo = $this->urlGenerator->imagePath('core', 'logo/logo.png');
+            }
+            return $logo . '?v=' . $cacheBusterCounter;
+        }
+
+        return $this->urlGenerator->linkToRoute('theming.Theming.getImage', [ 'key' => 'logo', 'useSvg' => $useSvg, 'v' => $cacheBusterCounter ]);
+    }
+
+    /**
+     * Themed background image url
+     *
+     * @return string
+     */
+    public function getBackground(): string {
+        return $this->imageManager->getImageUrl('background');
+    }
+
+    /**
+     * @return string
+     */
+    public function getiTunesAppId() {
+        return $this->config->getAppValue('theming', 'iTunesAppId', $this->iTunesAppId);
+    }
+
+    /**
+     * @return string
+     */
+    public function getiOSClientUrl() {
+        return $this->config->getAppValue('theming', 'iOSClientUrl', $this->iOSClientUrl);
+    }
+
+    /**
+     * @return string
+     */
+    public function getAndroidClientUrl() {
+        return $this->config->getAppValue('theming', 'AndroidClientUrl', $this->AndroidClientUrl);
+    }
+
+
+    /**
+     * @return array scss variables to overwrite
+     */
+    public function getScssVariables() {
+        $cache = $this->cacheFactory->createDistributed('theming-' . $this->urlGenerator->getBaseUrl());
+        if ($value = $cache->get('getScssVariables')) {
+            return $value;
+        }
+
+        $variables = [
+            'theming-cachebuster' => "'" . $this->config->getAppValue('theming', 'cachebuster', '0') . "'",
+            'theming-logo-mime' => "'" . $this->config->getAppValue('theming', 'logoMime') . "'",
+            'theming-background-mime' => "'" . $this->config->getAppValue('theming', 'backgroundMime') . "'",
+            'theming-logoheader-mime' => "'" . $this->config->getAppValue('theming', 'logoheaderMime') . "'",
+            'theming-favicon-mime' => "'" . $this->config->getAppValue('theming', 'faviconMime') . "'"
+        ];
+
+        $variables['image-logo'] = "url('".$this->imageManager->getImageUrl('logo')."')";
+        $variables['image-logoheader'] = "url('".$this->imageManager->getImageUrl('logoheader')."')";
+        $variables['image-favicon'] = "url('".$this->imageManager->getImageUrl('favicon')."')";
+        $variables['image-login-background'] = "url('".$this->imageManager->getImageUrl('background')."')";
+        $variables['image-login-plain'] = 'false';
+
+        if ($this->config->getAppValue('theming', 'color', null) !== null) {
+            $variables['color-primary'] = $this->getColorPrimary();
+            $variables['color-primary-text'] = $this->getTextColorPrimary();
+            $variables['color-primary-element'] = $this->util->elementColor($this->getColorPrimary());
+        }
+
+        if ($this->config->getAppValue('theming', 'backgroundMime', null) === 'backgroundColor') {
+            $variables['image-login-plain'] = 'true';
+        }
+
+        $variables['has-legal-links'] = 'false';
+        if($this->getImprintUrl() !== '' || $this->getPrivacyUrl() !== '') {
+            $variables['has-legal-links'] = 'true';
+        }
+
+        $cache->set('getScssVariables', $variables);
+        return $variables;
+    }
+
+    /**
+     * Check if the image should be replaced by the theming app
+     * and return the new image location then
+     *
+     * @param string $app name of the app
+     * @param string $image filename of the image
+     * @return bool|string false if image should not replaced, otherwise the location of the image
+     */
+    public function replaceImagePath($app, $image) {
+        if ($app === '' || $app === 'files_sharing') {
+            $app = 'core';
+        }
+        $cacheBusterValue = $this->config->getAppValue('theming', 'cachebuster', '0');
+
+        try {
+            $customFavicon = $this->imageManager->getImage('favicon');
+        } catch (NotFoundException $e) {
+            $customFavicon = null;
+        }
+
+        $route = false;
+        if ($image === 'favicon.ico' && ($customFavicon !== null || $this->imageManager->shouldReplaceIcons())) {
+            $route = $this->urlGenerator->linkToRoute('theming.Icon.getFavicon', ['app' => $app]);
+        }
+        if (($image === 'favicon-touch.png' || $image === 'favicon-fb.png') && ($customFavicon !== null || $this->imageManager->shouldReplaceIcons())) {
+            $route = $this->urlGenerator->linkToRoute('theming.Icon.getTouchIcon', ['app' => $app]);
+        }
+        if ($image === 'manifest.json') {
+            try {
+                $appPath = $this->appManager->getAppPath($app);
+                if (file_exists($appPath . '/img/manifest.json')) {
+                    return false;
+                }
+            } catch (AppPathNotFoundException $e) {}
+            $route = $this->urlGenerator->linkToRoute('theming.Theming.getManifest');
+        }
+        if (strpos($image, 'filetypes/') === 0 && file_exists(\OC::$SERVERROOT . '/core/img/' . $image )) {
+            $route = $this->urlGenerator->linkToRoute('theming.Icon.getThemedIcon', ['app' => $app, 'image' => $image]);
+        }
+
+        if ($route) {
+            return $route . '?v=' . $cacheBusterValue;
+        }
+
+        return false;
+    }
+
+    /**
+     * Increases the cache buster key
+     */
+    private function increaseCacheBuster() {
+        $cacheBusterKey = $this->config->getAppValue('theming', 'cachebuster', '0');
+        $this->config->setAppValue('theming', 'cachebuster', (int)$cacheBusterKey+1);
+        $this->cacheFactory->createDistributed('theming-')->clear();
+        $this->cacheFactory->createDistributed('imagePath')->clear();
+
+    }
+
+    /**
+     * Update setting in the database
+     *
+     * @param string $setting
+     * @param string $value
+     */
+    public function set($setting, $value) {
+        $this->config->setAppValue('theming', $setting, $value);
+        $this->increaseCacheBuster();
+    }
+
+    /**
+     * Revert settings to the default value
+     *
+     * @param string $setting setting which should be reverted
+     * @return string default value
+     */
+    public function undo($setting) {
+        $this->config->deleteAppValue('theming', $setting);
+        $this->increaseCacheBuster();
+
+        switch ($setting) {
+            case 'name':
+                $returnValue = $this->getEntity();
+                break;
+            case 'url':
+                $returnValue = $this->getBaseUrl();
+                break;
+            case 'slogan':
+                $returnValue = $this->getSlogan();
+                break;
+            case 'color':
+                $returnValue = $this->getColorPrimary();
+                break;
+            default:
+                $returnValue = '';
+                break;
+        }
+
+        return $returnValue;
+    }
+
+    /**
+     * Color of text in the header and primary buttons
+     *
+     * @return string
+     */
+    public function getTextColorPrimary() {
+        return $this->util->invertTextColor($this->getColorPrimary()) ? '#000000' : '#ffffff';
+    }
 }