nextcloud / server

lib/public/AppFramework/Bootstrap/IRegistrationContext.php

Indentation +166 added lines, -166 removed lines

@@ -43,170 +43,170 @@
  */
 interface IRegistrationContext {
 
-	/**
-	 * @param string $capability
-	 * @psalm-param class-string<ICapability> $capability
-	 * @see IAppContainer::registerCapability
-	 *
-	 * @since 20.0.0
-	 */
-	public function registerCapability(string $capability): void;
-
-	/**
-	 * Register an implementation of \OCP\Support\CrashReport\IReporter that
-	 * will receive unhandled exceptions and throwables
-	 *
-	 * @param string $reporterClass
-	 * @psalm-param class-string<\OCP\Support\CrashReport\IReporter> $reporterClass
-	 * @return void
-	 * @since 20.0.0
-	 */
-	public function registerCrashReporter(string $reporterClass): void;
-
-	/**
-	 * Register an implementation of \OCP\Dashboard\IWidget that
-	 * will handle the implementation of a dashboard widget
-	 *
-	 * @param string $widgetClass
-	 * @psalm-param class-string<\OCP\Dashboard\IWidget> $widgetClass
-	 * @return void
-	 * @since 20.0.0
-	 */
-	public function registerDashboardWidget(string $widgetClass): void;
-	/**
-	 * Register a service
-	 *
-	 * @param string $name
-	 * @param callable $factory
-	 * @psalm-param callable(\Psr\Container\ContainerInterface): mixed $factory
-	 * @param bool $shared
-	 *
-	 * @return void
-	 * @see IContainer::registerService()
-	 *
-	 * @since 20.0.0
-	 */
-	public function registerService(string $name, callable $factory, bool $shared = true): void;
-
-	/**
-	 * @param string $alias
-	 * @psalm-param string|class-string $alias
-	 * @param string $target
-	 * @psalm-param string|class-string $target
-	 *
-	 * @return void
-	 * @see IContainer::registerAlias()
-	 *
-	 * @since 20.0.0
-	 */
-	public function registerServiceAlias(string $alias, string $target): void;
-
-	/**
-	 * @param string $name
-	 * @param mixed $value
-	 *
-	 * @return void
-	 * @see IContainer::registerParameter()
-	 *
-	 * @since 20.0.0
-	 */
-	public function registerParameter(string $name, $value): void;
-
-	/**
-	 * Register a service listener
-	 *
-	 * This is equivalent to calling IEventDispatcher::addServiceListener
-	 *
-	 * @template T of \OCP\EventDispatcher\Event
-	 * @param string $event preferably the fully-qualified class name of the Event sub class to listen for
-	 * @psalm-param string|class-string<T> $event preferably the fully-qualified class name of the Event sub class to listen for
-	 * @param string $listener fully qualified class name (or ::class notation) of a \OCP\EventDispatcher\IEventListener that can be built by the DI container
-	 * @psalm-param class-string<\OCP\EventDispatcher\IEventListener<T>> $listener fully qualified class name that can be built by the DI container
-	 * @param int $priority The higher this value, the earlier an event
-	 *                      listener will be triggered in the chain (defaults to 0)
-	 *
-	 * @see IEventDispatcher::addServiceListener()
-	 *
-	 * @since 20.0.0
-	 */
-	public function registerEventListener(string $event, string $listener, int $priority = 0): void;
-
-	/**
-	 * @param string $class
-	 * @psalm-param class-string<\OCP\AppFramework\Middleware> $class
-	 *
-	 * @return void
-	 * @see IAppContainer::registerMiddleWare()
-	 *
-	 * @since 20.0.0
-	 */
-	public function registerMiddleware(string $class): void;
-
-	/**
-	 * Register a search provider for the unified search
-	 *
-	 * It is allowed to register more than one provider per app as the search
-	 * results can go into distinct sections, e.g. "Files" and "Files shared
-	 * with you" in the Files app.
-	 *
-	 * @param string $class
-	 * @psalm-param class-string<\OCP\Search\IProvider> $class
-	 *
-	 * @return void
-	 *
-	 * @since 20.0.0
-	 */
-	public function registerSearchProvider(string $class): void;
-
-	/**
-	 * Register an alternative login option
-	 *
-	 * It is allowed to register more than one option per app.
-	 *
-	 * @param string $class
-	 * @psalm-param class-string<\OCP\Authentication\IAlternativeLogin> $class
-	 *
-	 * @return void
-	 *
-	 * @since 20.0.0
-	 */
-	public function registerAlternativeLogin(string $class): void;
-
-	/**
-	 * Register an initialstate provider
-	 *
-	 * It is allowed to register more than one provider per app.
-	 *
-	 * @param string $class
-	 * @psalm-param class-string<\OCP\AppFramework\Services\InitialStateProvider> $class
-	 *
-	 * @return void
-	 *
-	 * @since 21.0.0
-	 */
-	public function registerInitialStateProvider(string $class): void;
-
-	/**
-	 * Register a well known protocol handler
-	 *
-	 * It is allowed to register more than one handler per app.
-	 *
-	 * @param string $class
-	 * @psalm-param class-string<\OCP\Http\WellKnown\IHandler> $class
-	 *
-	 * @return void
-	 *
-	 * @since 21.0.0
-	 */
-	public function registerWellKnownHandler(string $class): void;
-
-	/**
-	 * Register a custom template provider class that is able to inject custom templates
-	 * in addition to the user defined ones
-	 *
-	 * @param string $providerClass
-	 * @psalm-param class-string<ICustomTemplateProvider> $providerClass
-	 * @since 21.0.0
-	 */
-	public function registerTemplateProvider(string $providerClass): void;
+    /**
+     * @param string $capability
+     * @psalm-param class-string<ICapability> $capability
+     * @see IAppContainer::registerCapability
+     *
+     * @since 20.0.0
+     */
+    public function registerCapability(string $capability): void;
+
+    /**
+     * Register an implementation of \OCP\Support\CrashReport\IReporter that
+     * will receive unhandled exceptions and throwables
+     *
+     * @param string $reporterClass
+     * @psalm-param class-string<\OCP\Support\CrashReport\IReporter> $reporterClass
+     * @return void
+     * @since 20.0.0
+     */
+    public function registerCrashReporter(string $reporterClass): void;
+
+    /**
+     * Register an implementation of \OCP\Dashboard\IWidget that
+     * will handle the implementation of a dashboard widget
+     *
+     * @param string $widgetClass
+     * @psalm-param class-string<\OCP\Dashboard\IWidget> $widgetClass
+     * @return void
+     * @since 20.0.0
+     */
+    public function registerDashboardWidget(string $widgetClass): void;
+    /**
+     * Register a service
+     *
+     * @param string $name
+     * @param callable $factory
+     * @psalm-param callable(\Psr\Container\ContainerInterface): mixed $factory
+     * @param bool $shared
+     *
+     * @return void
+     * @see IContainer::registerService()
+     *
+     * @since 20.0.0
+     */
+    public function registerService(string $name, callable $factory, bool $shared = true): void;
+
+    /**
+     * @param string $alias
+     * @psalm-param string|class-string $alias
+     * @param string $target
+     * @psalm-param string|class-string $target
+     *
+     * @return void
+     * @see IContainer::registerAlias()
+     *
+     * @since 20.0.0
+     */
+    public function registerServiceAlias(string $alias, string $target): void;
+
+    /**
+     * @param string $name
+     * @param mixed $value
+     *
+     * @return void
+     * @see IContainer::registerParameter()
+     *
+     * @since 20.0.0
+     */
+    public function registerParameter(string $name, $value): void;
+
+    /**
+     * Register a service listener
+     *
+     * This is equivalent to calling IEventDispatcher::addServiceListener
+     *
+     * @template T of \OCP\EventDispatcher\Event
+     * @param string $event preferably the fully-qualified class name of the Event sub class to listen for
+     * @psalm-param string|class-string<T> $event preferably the fully-qualified class name of the Event sub class to listen for
+     * @param string $listener fully qualified class name (or ::class notation) of a \OCP\EventDispatcher\IEventListener that can be built by the DI container
+     * @psalm-param class-string<\OCP\EventDispatcher\IEventListener<T>> $listener fully qualified class name that can be built by the DI container
+     * @param int $priority The higher this value, the earlier an event
+     *                      listener will be triggered in the chain (defaults to 0)
+     *
+     * @see IEventDispatcher::addServiceListener()
+     *
+     * @since 20.0.0
+     */
+    public function registerEventListener(string $event, string $listener, int $priority = 0): void;
+
+    /**
+     * @param string $class
+     * @psalm-param class-string<\OCP\AppFramework\Middleware> $class
+     *
+     * @return void
+     * @see IAppContainer::registerMiddleWare()
+     *
+     * @since 20.0.0
+     */
+    public function registerMiddleware(string $class): void;
+
+    /**
+     * Register a search provider for the unified search
+     *
+     * It is allowed to register more than one provider per app as the search
+     * results can go into distinct sections, e.g. "Files" and "Files shared
+     * with you" in the Files app.
+     *
+     * @param string $class
+     * @psalm-param class-string<\OCP\Search\IProvider> $class
+     *
+     * @return void
+     *
+     * @since 20.0.0
+     */
+    public function registerSearchProvider(string $class): void;
+
+    /**
+     * Register an alternative login option
+     *
+     * It is allowed to register more than one option per app.
+     *
+     * @param string $class
+     * @psalm-param class-string<\OCP\Authentication\IAlternativeLogin> $class
+     *
+     * @return void
+     *
+     * @since 20.0.0
+     */
+    public function registerAlternativeLogin(string $class): void;
+
+    /**
+     * Register an initialstate provider
+     *
+     * It is allowed to register more than one provider per app.
+     *
+     * @param string $class
+     * @psalm-param class-string<\OCP\AppFramework\Services\InitialStateProvider> $class
+     *
+     * @return void
+     *
+     * @since 21.0.0
+     */
+    public function registerInitialStateProvider(string $class): void;
+
+    /**
+     * Register a well known protocol handler
+     *
+     * It is allowed to register more than one handler per app.
+     *
+     * @param string $class
+     * @psalm-param class-string<\OCP\Http\WellKnown\IHandler> $class
+     *
+     * @return void
+     *
+     * @since 21.0.0
+     */
+    public function registerWellKnownHandler(string $class): void;
+
+    /**
+     * Register a custom template provider class that is able to inject custom templates
+     * in addition to the user defined ones
+     *
+     * @param string $providerClass
+     * @psalm-param class-string<ICustomTemplateProvider> $providerClass
+     * @since 21.0.0
+     */
+    public function registerTemplateProvider(string $providerClass): void;
 }

lib/private/Files/Template/TemplateManager.php

Indentation +301 added lines, -301 removed lines

@@ -51,305 +51,305 @@
 use Psr\Log\LoggerInterface;
 
 class TemplateManager implements ITemplateManager {
-	private $registeredTypes = [];
-	private $types = [];
-
-	/** @var array|null */
-	private $providers = null;
-
-	private $serverContainer;
-	private $eventDispatcher;
-	private $rootFolder;
-	private $userManager;
-	private $previewManager;
-	private $config;
-	private $l10n;
-	private $logger;
-	private $userId;
-	private $l10nFactory;
-	/** @var Coordinator */
-	private $bootstrapCoordinator;
-
-	public function __construct(
-		IServerContainer $serverContainer,
-		IEventDispatcher $eventDispatcher,
-		Coordinator $coordinator,
-		IRootFolder $rootFolder,
-		IUserSession $userSession,
-		IUserManager $userManager,
-		IPreview $previewManager,
-		IConfig $config,
-		IFactory $l10nFactory,
-		LoggerInterface $logger
-	) {
-		$this->serverContainer = $serverContainer;
-		$this->eventDispatcher = $eventDispatcher;
-		$this->bootstrapCoordinator = $coordinator;
-		$this->rootFolder = $rootFolder;
-		$this->userManager = $userManager;
-		$this->previewManager = $previewManager;
-		$this->config = $config;
-		$this->l10nFactory = $l10nFactory;
-		$this->l10n = $l10nFactory->get('lib');
-		$this->logger = $logger;
-		$user = $userSession->getUser();
-		$this->userId = $user ? $user->getUID() : null;
-	}
-
-	public function registerTemplateFileCreator(callable $callback): void {
-		$this->registeredTypes[] = $callback;
-	}
-
-	public function getRegisteredProviders(): array {
-		if ($this->providers !== null) {
-			return $this->providers;
-		}
-
-		$context = $this->bootstrapCoordinator->getRegistrationContext();
-
-		$this->providers = [];
-		foreach ($context->getTemplateProviders() as $provider) {
-			$class = $provider->getService();
-			$this->providers[$class] = $this->serverContainer->get($class);
-		}
-		return $this->providers;
-	}
-
-	public function getTypes(): array {
-		if (!empty($this->types)) {
-			return $this->types;
-		}
-		foreach ($this->registeredTypes as $registeredType) {
-			$this->types[] = $registeredType();
-		}
-		return $this->types;
-	}
-
-	public function listCreators(): array {
-		$types = $this->getTypes();
-		usort($types, function (TemplateFileCreator $a, TemplateFileCreator $b) {
-			return $a->getOrder() - $b->getOrder();
-		});
-		return $types;
-	}
-
-	public function listTemplates(): array {
-		return array_map(function (TemplateFileCreator $entry) {
-			return array_merge($entry->jsonSerialize(), [
-				'templates' => $this->getTemplateFiles($entry)
-			]);
-		}, $this->listCreators());
-	}
-
-	/**
-	 * @param string $filePath
-	 * @param string $templateId
-	 * @return array
-	 * @throws GenericFileException
-	 */
-	public function createFromTemplate(string $filePath, string $templateId = '', string $templateType = 'user'): array {
-		$userFolder = $this->rootFolder->getUserFolder($this->userId);
-		try {
-			$userFolder->get($filePath);
-			throw new GenericFileException($this->l10n->t('File already exists'));
-		} catch (NotFoundException $e) {
-		}
-		try {
-			$targetFile = $userFolder->newFile($filePath);
-			if ($templateType === 'user' && $templateId !== '') {
-				$template = $userFolder->get($templateId);
-				$template->copy($targetFile->getPath());
-			} else {
-				$matchingProvider = array_filter($this->getRegisteredProviders(), function (ICustomTemplateProvider $provider) use ($templateType) {
-					return $templateType === get_class($provider);
-				});
-				$provider = array_shift($matchingProvider);
-				if ($provider) {
-					$template = $provider->getCustomTemplate($templateId);
-					$template->copy($targetFile->getPath());
-				}
-			}
-			$this->eventDispatcher->dispatchTyped(new FileCreatedFromTemplateEvent($template, $targetFile));
-			return $this->formatFile($userFolder->get($filePath));
-		} catch (\Exception $e) {
-			$this->logger->error($e->getMessage(), ['exception' => $e]);
-			throw new GenericFileException($this->l10n->t('Failed to create file from template'));
-		}
-	}
-
-	/**
-	 * @return Folder
-	 * @throws \OCP\Files\NotFoundException
-	 * @throws \OCP\Files\NotPermittedException
-	 * @throws \OC\User\NoUserException
-	 */
-	private function getTemplateFolder(): Node {
-		if ($this->getTemplatePath() !== '') {
-			return $this->rootFolder->getUserFolder($this->userId)->get($this->getTemplatePath());
-		}
-		throw new NotFoundException();
-	}
-
-	private function getTemplateFiles(TemplateFileCreator $type): array {
-		$templates = [];
-		foreach ($this->getRegisteredProviders() as $provider) {
-			foreach ($type->getMimetypes() as $mimetype) {
-				foreach ($provider->getCustomTemplates($mimetype) as $template) {
-					$templates[] = $template;
-				}
-			}
-		}
-		try {
-			$userTemplateFolder = $this->getTemplateFolder();
-		} catch (\Exception $e) {
-			return $templates;
-		}
-		foreach ($type->getMimetypes() as $mimetype) {
-			foreach ($userTemplateFolder->searchByMime($mimetype) as $templateFile) {
-				$template = new Template(
-					'user',
-					$this->rootFolder->getUserFolder($this->userId)->getRelativePath($templateFile->getPath()),
-					$templateFile
-				);
-				$template->setHasPreview($this->previewManager->isAvailable($templateFile));
-				$templates[] = $template;
-			}
-		}
-
-		return $templates;
-	}
-
-	/**
-	 * @param Node|File $file
-	 * @return array
-	 * @throws NotFoundException
-	 * @throws \OCP\Files\InvalidPathException
-	 */
-	private function formatFile(Node $file): array {
-		return [
-			'basename' => $file->getName(),
-			'etag' => $file->getEtag(),
-			'fileid' => $file->getId(),
-			'filename' => $this->rootFolder->getUserFolder($this->userId)->getRelativePath($file->getPath()),
-			'lastmod' => $file->getMTime(),
-			'mime' => $file->getMimetype(),
-			'size' => $file->getSize(),
-			'type' => $file->getType(),
-			'hasPreview' => $this->previewManager->isAvailable($file)
-		];
-	}
-
-	public function hasTemplateDirectory(): bool {
-		try {
-			$this->getTemplateFolder();
-			return true;
-		} catch (\Exception $e) {
-		}
-		return false;
-	}
-
-	public function setTemplatePath(string $path): void {
-		$this->config->setUserValue($this->userId, 'core', 'templateDirectory', $path);
-	}
-
-	public function getTemplatePath(): string {
-		return $this->config->getUserValue($this->userId, 'core', 'templateDirectory', '');
-	}
-
-	public function initializeTemplateDirectory(string $path = null, string $userId = null, $copyTemplates = true): string {
-		if ($userId !== null) {
-			$this->userId = $userId;
-		}
-
-		$defaultSkeletonDirectory = \OC::$SERVERROOT . '/core/skeleton';
-		$defaultTemplateDirectory = \OC::$SERVERROOT . '/core/skeleton/Templates';
-		$skeletonPath = $this->config->getSystemValue('skeletondirectory', $defaultSkeletonDirectory);
-		$skeletonTemplatePath = $this->config->getSystemValue('templatedirectory', $defaultTemplateDirectory);
-		$isDefaultSkeleton = $skeletonPath === $defaultSkeletonDirectory;
-		$isDefaultTemplates = $skeletonTemplatePath === $defaultTemplateDirectory;
-		$userLang = $this->l10nFactory->getUserLanguage($this->userManager->get($this->userId));
-
-		try {
-			$l10n = $this->l10nFactory->get('lib', $userLang);
-			$userFolder = $this->rootFolder->getUserFolder($this->userId);
-			$userTemplatePath = $path ?? $l10n->t('Templates') . '/';
-
-			// Initial user setup without a provided path
-			if ($path === null) {
-				// All locations are default so we just need to rename the directory to the users language
-				if ($isDefaultSkeleton && $isDefaultTemplates) {
-					if (!$userFolder->nodeExists('Templates')) {
-						return '';
-					}
-					$newPath = Filesystem::normalizePath($userFolder->getPath() . '/' . $userTemplatePath);
-					if ($newPath !== $userFolder->get('Templates')->getPath()) {
-						$userFolder->get('Templates')->move($newPath);
-					}
-					$this->setTemplatePath($userTemplatePath);
-					return $userTemplatePath;
-				}
-
-				if ($isDefaultSkeleton && !empty($skeletonTemplatePath) && !$isDefaultTemplates && $userFolder->nodeExists('Templates')) {
-					$shippedSkeletonTemplates = $userFolder->get('Templates');
-					$shippedSkeletonTemplates->delete();
-				}
-			}
-
-			try {
-				$folder = $userFolder->newFolder($userTemplatePath);
-			} catch (NotPermittedException $e) {
-				$folder = $userFolder->get($userTemplatePath);
-			}
-
-			$folderIsEmpty = count($folder->getDirectoryListing()) === 0;
-
-			if (!$copyTemplates) {
-				$this->setTemplatePath($userTemplatePath);
-				return $userTemplatePath;
-			}
-
-			if (!$isDefaultTemplates && $folderIsEmpty) {
-				$localizedSkeletonTemplatePath = $this->getLocalizedTemplatePath($skeletonTemplatePath, $userLang);
-				if (!empty($localizedSkeletonTemplatePath) && file_exists($localizedSkeletonTemplatePath)) {
-					\OC_Util::copyr($localizedSkeletonTemplatePath, $folder);
-					$userFolder->getStorage()->getScanner()->scan($folder->getInternalPath(), Scanner::SCAN_RECURSIVE);
-					$this->setTemplatePath($userTemplatePath);
-					return $userTemplatePath;
-				}
-			}
-
-			if ($path !== null && $isDefaultSkeleton && $isDefaultTemplates && $folderIsEmpty) {
-				$localizedSkeletonPath = $this->getLocalizedTemplatePath($skeletonPath . '/Templates', $userLang);
-				if (!empty($localizedSkeletonPath) && file_exists($localizedSkeletonPath)) {
-					\OC_Util::copyr($localizedSkeletonPath, $folder);
-					$userFolder->getStorage()->getScanner()->scan($folder->getInternalPath(), Scanner::SCAN_RECURSIVE);
-					$this->setTemplatePath($userTemplatePath);
-					return $userTemplatePath;
-				}
-			}
-
-			$this->setTemplatePath($path ?? '');
-			return $this->getTemplatePath();
-		} catch (\Throwable $e) {
-			$this->logger->error('Failed to initialize templates directory to user language ' . $userLang . ' for ' . $userId, ['app' => 'files_templates', 'exception' => $e]);
-		}
-		$this->setTemplatePath('');
-		return $this->getTemplatePath();
-	}
-
-	private function getLocalizedTemplatePath(string $skeletonTemplatePath, string $userLang) {
-		$localizedSkeletonTemplatePath = str_replace('{lang}', $userLang, $skeletonTemplatePath);
-
-		if (!file_exists($localizedSkeletonTemplatePath)) {
-			$dialectStart = strpos($userLang, '_');
-			if ($dialectStart !== false) {
-				$localizedSkeletonTemplatePath = str_replace('{lang}', substr($userLang, 0, $dialectStart), $skeletonTemplatePath);
-			}
-			if ($dialectStart === false || !file_exists($localizedSkeletonTemplatePath)) {
-				$localizedSkeletonTemplatePath = str_replace('{lang}', 'default', $skeletonTemplatePath);
-			}
-		}
-
-		return $localizedSkeletonTemplatePath;
-	}
+    private $registeredTypes = [];
+    private $types = [];
+
+    /** @var array|null */
+    private $providers = null;
+
+    private $serverContainer;
+    private $eventDispatcher;
+    private $rootFolder;
+    private $userManager;
+    private $previewManager;
+    private $config;
+    private $l10n;
+    private $logger;
+    private $userId;
+    private $l10nFactory;
+    /** @var Coordinator */
+    private $bootstrapCoordinator;
+
+    public function __construct(
+        IServerContainer $serverContainer,
+        IEventDispatcher $eventDispatcher,
+        Coordinator $coordinator,
+        IRootFolder $rootFolder,
+        IUserSession $userSession,
+        IUserManager $userManager,
+        IPreview $previewManager,
+        IConfig $config,
+        IFactory $l10nFactory,
+        LoggerInterface $logger
+    ) {
+        $this->serverContainer = $serverContainer;
+        $this->eventDispatcher = $eventDispatcher;
+        $this->bootstrapCoordinator = $coordinator;
+        $this->rootFolder = $rootFolder;
+        $this->userManager = $userManager;
+        $this->previewManager = $previewManager;
+        $this->config = $config;
+        $this->l10nFactory = $l10nFactory;
+        $this->l10n = $l10nFactory->get('lib');
+        $this->logger = $logger;
+        $user = $userSession->getUser();
+        $this->userId = $user ? $user->getUID() : null;
+    }
+
+    public function registerTemplateFileCreator(callable $callback): void {
+        $this->registeredTypes[] = $callback;
+    }
+
+    public function getRegisteredProviders(): array {
+        if ($this->providers !== null) {
+            return $this->providers;
+        }
+
+        $context = $this->bootstrapCoordinator->getRegistrationContext();
+
+        $this->providers = [];
+        foreach ($context->getTemplateProviders() as $provider) {
+            $class = $provider->getService();
+            $this->providers[$class] = $this->serverContainer->get($class);
+        }
+        return $this->providers;
+    }
+
+    public function getTypes(): array {
+        if (!empty($this->types)) {
+            return $this->types;
+        }
+        foreach ($this->registeredTypes as $registeredType) {
+            $this->types[] = $registeredType();
+        }
+        return $this->types;
+    }
+
+    public function listCreators(): array {
+        $types = $this->getTypes();
+        usort($types, function (TemplateFileCreator $a, TemplateFileCreator $b) {
+            return $a->getOrder() - $b->getOrder();
+        });
+        return $types;
+    }
+
+    public function listTemplates(): array {
+        return array_map(function (TemplateFileCreator $entry) {
+            return array_merge($entry->jsonSerialize(), [
+                'templates' => $this->getTemplateFiles($entry)
+            ]);
+        }, $this->listCreators());
+    }
+
+    /**
+     * @param string $filePath
+     * @param string $templateId
+     * @return array
+     * @throws GenericFileException
+     */
+    public function createFromTemplate(string $filePath, string $templateId = '', string $templateType = 'user'): array {
+        $userFolder = $this->rootFolder->getUserFolder($this->userId);
+        try {
+            $userFolder->get($filePath);
+            throw new GenericFileException($this->l10n->t('File already exists'));
+        } catch (NotFoundException $e) {
+        }
+        try {
+            $targetFile = $userFolder->newFile($filePath);
+            if ($templateType === 'user' && $templateId !== '') {
+                $template = $userFolder->get($templateId);
+                $template->copy($targetFile->getPath());
+            } else {
+                $matchingProvider = array_filter($this->getRegisteredProviders(), function (ICustomTemplateProvider $provider) use ($templateType) {
+                    return $templateType === get_class($provider);
+                });
+                $provider = array_shift($matchingProvider);
+                if ($provider) {
+                    $template = $provider->getCustomTemplate($templateId);
+                    $template->copy($targetFile->getPath());
+                }
+            }
+            $this->eventDispatcher->dispatchTyped(new FileCreatedFromTemplateEvent($template, $targetFile));
+            return $this->formatFile($userFolder->get($filePath));
+        } catch (\Exception $e) {
+            $this->logger->error($e->getMessage(), ['exception' => $e]);
+            throw new GenericFileException($this->l10n->t('Failed to create file from template'));
+        }
+    }
+
+    /**
+     * @return Folder
+     * @throws \OCP\Files\NotFoundException
+     * @throws \OCP\Files\NotPermittedException
+     * @throws \OC\User\NoUserException
+     */
+    private function getTemplateFolder(): Node {
+        if ($this->getTemplatePath() !== '') {
+            return $this->rootFolder->getUserFolder($this->userId)->get($this->getTemplatePath());
+        }
+        throw new NotFoundException();
+    }
+
+    private function getTemplateFiles(TemplateFileCreator $type): array {
+        $templates = [];
+        foreach ($this->getRegisteredProviders() as $provider) {
+            foreach ($type->getMimetypes() as $mimetype) {
+                foreach ($provider->getCustomTemplates($mimetype) as $template) {
+                    $templates[] = $template;
+                }
+            }
+        }
+        try {
+            $userTemplateFolder = $this->getTemplateFolder();
+        } catch (\Exception $e) {
+            return $templates;
+        }
+        foreach ($type->getMimetypes() as $mimetype) {
+            foreach ($userTemplateFolder->searchByMime($mimetype) as $templateFile) {
+                $template = new Template(
+                    'user',
+                    $this->rootFolder->getUserFolder($this->userId)->getRelativePath($templateFile->getPath()),
+                    $templateFile
+                );
+                $template->setHasPreview($this->previewManager->isAvailable($templateFile));
+                $templates[] = $template;
+            }
+        }
+
+        return $templates;
+    }
+
+    /**
+     * @param Node|File $file
+     * @return array
+     * @throws NotFoundException
+     * @throws \OCP\Files\InvalidPathException
+     */
+    private function formatFile(Node $file): array {
+        return [
+            'basename' => $file->getName(),
+            'etag' => $file->getEtag(),
+            'fileid' => $file->getId(),
+            'filename' => $this->rootFolder->getUserFolder($this->userId)->getRelativePath($file->getPath()),
+            'lastmod' => $file->getMTime(),
+            'mime' => $file->getMimetype(),
+            'size' => $file->getSize(),
+            'type' => $file->getType(),
+            'hasPreview' => $this->previewManager->isAvailable($file)
+        ];
+    }
+
+    public function hasTemplateDirectory(): bool {
+        try {
+            $this->getTemplateFolder();
+            return true;
+        } catch (\Exception $e) {
+        }
+        return false;
+    }
+
+    public function setTemplatePath(string $path): void {
+        $this->config->setUserValue($this->userId, 'core', 'templateDirectory', $path);
+    }
+
+    public function getTemplatePath(): string {
+        return $this->config->getUserValue($this->userId, 'core', 'templateDirectory', '');
+    }
+
+    public function initializeTemplateDirectory(string $path = null, string $userId = null, $copyTemplates = true): string {
+        if ($userId !== null) {
+            $this->userId = $userId;
+        }
+
+        $defaultSkeletonDirectory = \OC::$SERVERROOT . '/core/skeleton';
+        $defaultTemplateDirectory = \OC::$SERVERROOT . '/core/skeleton/Templates';
+        $skeletonPath = $this->config->getSystemValue('skeletondirectory', $defaultSkeletonDirectory);
+        $skeletonTemplatePath = $this->config->getSystemValue('templatedirectory', $defaultTemplateDirectory);
+        $isDefaultSkeleton = $skeletonPath === $defaultSkeletonDirectory;
+        $isDefaultTemplates = $skeletonTemplatePath === $defaultTemplateDirectory;
+        $userLang = $this->l10nFactory->getUserLanguage($this->userManager->get($this->userId));
+
+        try {
+            $l10n = $this->l10nFactory->get('lib', $userLang);
+            $userFolder = $this->rootFolder->getUserFolder($this->userId);
+            $userTemplatePath = $path ?? $l10n->t('Templates') . '/';
+
+            // Initial user setup without a provided path
+            if ($path === null) {
+                // All locations are default so we just need to rename the directory to the users language
+                if ($isDefaultSkeleton && $isDefaultTemplates) {
+                    if (!$userFolder->nodeExists('Templates')) {
+                        return '';
+                    }
+                    $newPath = Filesystem::normalizePath($userFolder->getPath() . '/' . $userTemplatePath);
+                    if ($newPath !== $userFolder->get('Templates')->getPath()) {
+                        $userFolder->get('Templates')->move($newPath);
+                    }
+                    $this->setTemplatePath($userTemplatePath);
+                    return $userTemplatePath;
+                }
+
+                if ($isDefaultSkeleton && !empty($skeletonTemplatePath) && !$isDefaultTemplates && $userFolder->nodeExists('Templates')) {
+                    $shippedSkeletonTemplates = $userFolder->get('Templates');
+                    $shippedSkeletonTemplates->delete();
+                }
+            }
+
+            try {
+                $folder = $userFolder->newFolder($userTemplatePath);
+            } catch (NotPermittedException $e) {
+                $folder = $userFolder->get($userTemplatePath);
+            }
+
+            $folderIsEmpty = count($folder->getDirectoryListing()) === 0;
+
+            if (!$copyTemplates) {
+                $this->setTemplatePath($userTemplatePath);
+                return $userTemplatePath;
+            }
+
+            if (!$isDefaultTemplates && $folderIsEmpty) {
+                $localizedSkeletonTemplatePath = $this->getLocalizedTemplatePath($skeletonTemplatePath, $userLang);
+                if (!empty($localizedSkeletonTemplatePath) && file_exists($localizedSkeletonTemplatePath)) {
+                    \OC_Util::copyr($localizedSkeletonTemplatePath, $folder);
+                    $userFolder->getStorage()->getScanner()->scan($folder->getInternalPath(), Scanner::SCAN_RECURSIVE);
+                    $this->setTemplatePath($userTemplatePath);
+                    return $userTemplatePath;
+                }
+            }
+
+            if ($path !== null && $isDefaultSkeleton && $isDefaultTemplates && $folderIsEmpty) {
+                $localizedSkeletonPath = $this->getLocalizedTemplatePath($skeletonPath . '/Templates', $userLang);
+                if (!empty($localizedSkeletonPath) && file_exists($localizedSkeletonPath)) {
+                    \OC_Util::copyr($localizedSkeletonPath, $folder);
+                    $userFolder->getStorage()->getScanner()->scan($folder->getInternalPath(), Scanner::SCAN_RECURSIVE);
+                    $this->setTemplatePath($userTemplatePath);
+                    return $userTemplatePath;
+                }
+            }
+
+            $this->setTemplatePath($path ?? '');
+            return $this->getTemplatePath();
+        } catch (\Throwable $e) {
+            $this->logger->error('Failed to initialize templates directory to user language ' . $userLang . ' for ' . $userId, ['app' => 'files_templates', 'exception' => $e]);
+        }
+        $this->setTemplatePath('');
+        return $this->getTemplatePath();
+    }
+
+    private function getLocalizedTemplatePath(string $skeletonTemplatePath, string $userLang) {
+        $localizedSkeletonTemplatePath = str_replace('{lang}', $userLang, $skeletonTemplatePath);
+
+        if (!file_exists($localizedSkeletonTemplatePath)) {
+            $dialectStart = strpos($userLang, '_');
+            if ($dialectStart !== false) {
+                $localizedSkeletonTemplatePath = str_replace('{lang}', substr($userLang, 0, $dialectStart), $skeletonTemplatePath);
+            }
+            if ($dialectStart === false || !file_exists($localizedSkeletonTemplatePath)) {
+                $localizedSkeletonTemplatePath = str_replace('{lang}', 'default', $skeletonTemplatePath);
+            }
+        }
+
+        return $localizedSkeletonTemplatePath;
+    }
 }

lib/private/Http/WellKnown/RequestManager.php

Indentation +84 added lines, -84 removed lines

@@ -41,88 +41,88 @@
 
 class RequestManager {
 
-	/** @var Coordinator */
-	private $coordinator;
-
-	/** @var IServerContainer */
-	private $container;
-
-	/** @var LoggerInterface */
-	private $logger;
-
-	public function __construct(Coordinator $coordinator,
-								IServerContainer $container,
-								LoggerInterface $logger) {
-		$this->coordinator = $coordinator;
-		$this->container = $container;
-		$this->logger = $logger;
-	}
-
-	public function process(string $service, IRequest $request): ?IResponse {
-		$handlers = $this->loadHandlers();
-		$context = new class($request) implements IRequestContext {
-			/** @var IRequest */
-			private $request;
-
-			public function __construct(IRequest $request) {
-				$this->request = $request;
-			}
-
-			public function getHttpRequest(): IRequest {
-				return $this->request;
-			}
-		};
-
-		$subject = $request->getParam('resource');
-		$initialResponse = new JrdResponse($subject ?? '');
-		$finalResponse = array_reduce($handlers, function (?IResponse $previousResponse, IHandler $handler) use ($context, $service) {
-			return $handler->handle($service, $context, $previousResponse);
-		}, $initialResponse);
-
-		if ($finalResponse instanceof JrdResponse && $finalResponse->isEmpty()) {
-			return null;
-		}
-
-		return $finalResponse;
-	}
-
-	/**
-	 * @return IHandler[]
-	 */
-	private function loadHandlers(): array {
-		$context = $this->coordinator->getRegistrationContext();
-
-		if ($context === null) {
-			throw new RuntimeException("Well known handlers requested before the apps had been fully registered");
-		}
-
-		$registrations = $context->getWellKnownHandlers();
-		$this->logger->debug(count($registrations) . " well known handlers registered");
-
-		return array_filter(
-			array_map(function (ServiceRegistration $registration) {
-				/** @var ServiceRegistration<IHandler> $registration */
-				$class = $registration->getService();
-
-				try {
-					$handler = $this->container->get($class);
-
-					if (!($handler) instanceof IHandler) {
-						$this->logger->error("Well known handler $class is invalid");
-
-						return null;
-					}
-
-					return $handler;
-				} catch (QueryException $e) {
-					$this->logger->error("Could not load well known handler $class", [
-						'exception' => $e,
-						'app' => $registration->getAppId(),
-					]);
-
-					return null;
-				}
-			}, $registrations)
-		);
-	}
+    /** @var Coordinator */
+    private $coordinator;
+
+    /** @var IServerContainer */
+    private $container;
+
+    /** @var LoggerInterface */
+    private $logger;
+
+    public function __construct(Coordinator $coordinator,
+                                IServerContainer $container,
+                                LoggerInterface $logger) {
+        $this->coordinator = $coordinator;
+        $this->container = $container;
+        $this->logger = $logger;
+    }
+
+    public function process(string $service, IRequest $request): ?IResponse {
+        $handlers = $this->loadHandlers();
+        $context = new class($request) implements IRequestContext {
+            /** @var IRequest */
+            private $request;
+
+            public function __construct(IRequest $request) {
+                $this->request = $request;
+            }
+
+            public function getHttpRequest(): IRequest {
+                return $this->request;
+            }
+        };
+
+        $subject = $request->getParam('resource');
+        $initialResponse = new JrdResponse($subject ?? '');
+        $finalResponse = array_reduce($handlers, function (?IResponse $previousResponse, IHandler $handler) use ($context, $service) {
+            return $handler->handle($service, $context, $previousResponse);
+        }, $initialResponse);
+
+        if ($finalResponse instanceof JrdResponse && $finalResponse->isEmpty()) {
+            return null;
+        }
+
+        return $finalResponse;
+    }
+
+    /**
+     * @return IHandler[]
+     */
+    private function loadHandlers(): array {
+        $context = $this->coordinator->getRegistrationContext();
+
+        if ($context === null) {
+            throw new RuntimeException("Well known handlers requested before the apps had been fully registered");
+        }
+
+        $registrations = $context->getWellKnownHandlers();
+        $this->logger->debug(count($registrations) . " well known handlers registered");
+
+        return array_filter(
+            array_map(function (ServiceRegistration $registration) {
+                /** @var ServiceRegistration<IHandler> $registration */
+                $class = $registration->getService();
+
+                try {
+                    $handler = $this->container->get($class);
+
+                    if (!($handler) instanceof IHandler) {
+                        $this->logger->error("Well known handler $class is invalid");
+
+                        return null;
+                    }
+
+                    return $handler;
+                } catch (QueryException $e) {
+                    $this->logger->error("Could not load well known handler $class", [
+                        'exception' => $e,
+                        'app' => $registration->getAppId(),
+                    ]);
+
+                    return null;
+                }
+            }, $registrations)
+        );
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -75,7 +75,7 @@ 
 
 		$subject = $request->getParam('resource');
 		$initialResponse = new JrdResponse($subject ?? '');
-		$finalResponse = array_reduce($handlers, function (?IResponse $previousResponse, IHandler $handler) use ($context, $service) {
+		$finalResponse = array_reduce($handlers, function(?IResponse $previousResponse, IHandler $handler) use ($context, $service) {
 			return $handler->handle($service, $context, $previousResponse);
 		}, $initialResponse);
 
@@ -97,10 +97,10 @@ 
 		}
 
 		$registrations = $context->getWellKnownHandlers();
-		$this->logger->debug(count($registrations) . " well known handlers registered");
+		$this->logger->debug(count($registrations)." well known handlers registered");
 
 		return array_filter(
-			array_map(function (ServiceRegistration $registration) {
+			array_map(function(ServiceRegistration $registration) {
 				/** @var ServiceRegistration<IHandler> $registration */
 				$class = $registration->getService();
 

lib/private/AppFramework/Bootstrap/ServiceAliasRegistration.php

Indentation +33 added lines, -33 removed lines

@@ -30,41 +30,41 @@
  */
 class ServiceAliasRegistration extends ARegistration {
 
-	/**
-	 * @var string
-	 * @psalm-var string|class-string
-	 */
-	private $alias;
+    /**
+     * @var string
+     * @psalm-var string|class-string
+     */
+    private $alias;
 
-	/**
-	 * @var string
-	 * @psalm-var string|class-string
-	 */
-	private $target;
+    /**
+     * @var string
+     * @psalm-var string|class-string
+     */
+    private $target;
 
-	/**
-	 * @psalm-param string|class-string $alias
-	 * @paslm-param string|class-string $target
-	 */
-	public function __construct(string $appId,
-								string $alias,
-								string $target) {
-		parent::__construct($appId);
-		$this->alias = $alias;
-		$this->target = $target;
-	}
+    /**
+     * @psalm-param string|class-string $alias
+     * @paslm-param string|class-string $target
+     */
+    public function __construct(string $appId,
+                                string $alias,
+                                string $target) {
+        parent::__construct($appId);
+        $this->alias = $alias;
+        $this->target = $target;
+    }
 
-	/**
-	 * @psalm-return string|class-string
-	 */
-	public function getAlias(): string {
-		return $this->alias;
-	}
+    /**
+     * @psalm-return string|class-string
+     */
+    public function getAlias(): string {
+        return $this->alias;
+    }
 
-	/**
-	 * @psalm-return string|class-string
-	 */
-	public function getTarget(): string {
-		return $this->target;
-	}
+    /**
+     * @psalm-return string|class-string
+     */
+    public function getTarget(): string {
+        return $this->target;
+    }
 }

lib/private/AppFramework/Bootstrap/ServiceRegistration.php

Indentation +18 added lines, -18 removed lines

@@ -30,24 +30,24 @@
  * @template T
  */
 class ServiceRegistration extends ARegistration {
-	/**
-	 * @var string
-	 * @psalm-var class-string<T>
-	 */
-	private $service;
+    /**
+     * @var string
+     * @psalm-var class-string<T>
+     */
+    private $service;
 
-	/**
-	 * @psalm-param class-string<T> $service
-	 */
-	public function __construct(string $appId, string $service) {
-		parent::__construct($appId);
-		$this->service = $service;
-	}
+    /**
+     * @psalm-param class-string<T> $service
+     */
+    public function __construct(string $appId, string $service) {
+        parent::__construct($appId);
+        $this->service = $service;
+    }
 
-	/**
-	 * @psalm-return class-string<T>
-	 */
-	public function getService(): string {
-		return $this->service;
-	}
+    /**
+     * @psalm-return class-string<T>
+     */
+    public function getService(): string {
+        return $this->service;
+    }
 }

lib/private/AppFramework/Bootstrap/ParameterRegistration.php

Indentation +24 added lines, -24 removed lines

@@ -30,28 +30,28 @@
  */
 final class ParameterRegistration extends ARegistration {
 
-	/** @var string */
-	private $name;
-
-	/** @var mixed */
-	private $value;
-
-	public function __construct(string $appId,
-								string $name,
-								$value) {
-		parent::__construct($appId);
-		$this->name = $name;
-		$this->value = $value;
-	}
-
-	public function getName(): string {
-		return $this->name;
-	}
-
-	/**
-	 * @return mixed
-	 */
-	public function getValue() {
-		return $this->value;
-	}
+    /** @var string */
+    private $name;
+
+    /** @var mixed */
+    private $value;
+
+    public function __construct(string $appId,
+                                string $name,
+                                $value) {
+        parent::__construct($appId);
+        $this->name = $name;
+        $this->value = $value;
+    }
+
+    public function getName(): string {
+        return $this->name;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getValue() {
+        return $this->value;
+    }
 }

lib/private/AppFramework/Bootstrap/ARegistration.php

Indentation +11 added lines, -11 removed lines

@@ -30,17 +30,17 @@
  */
 abstract class ARegistration {
 
-	/** @var string */
-	private $appId;
+    /** @var string */
+    private $appId;
 
-	public function __construct(string $appId) {
-		$this->appId = $appId;
-	}
+    public function __construct(string $appId) {
+        $this->appId = $appId;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getAppId(): string {
-		return $this->appId;
-	}
+    /**
+     * @return string
+     */
+    public function getAppId(): string {
+        return $this->appId;
+    }
 }

lib/private/AppFramework/Bootstrap/ServiceFactoryRegistration.php

Indentation +33 added lines, -33 removed lines

@@ -30,43 +30,43 @@
  */
 class ServiceFactoryRegistration extends ARegistration {
 
-	/**
-	 * @var string
-	 * @psalm-var string|class-string
-	 */
-	private $name;
+    /**
+     * @var string
+     * @psalm-var string|class-string
+     */
+    private $name;
 
-	/**
-	 * @var callable
-	 * @psalm-var callable(\Psr\Container\ContainerInterface): mixed
-	 */
-	private $factory;
+    /**
+     * @var callable
+     * @psalm-var callable(\Psr\Container\ContainerInterface): mixed
+     */
+    private $factory;
 
-	/** @var bool */
-	private $shared;
+    /** @var bool */
+    private $shared;
 
-	public function __construct(string $appId,
-								string $alias,
-								callable $target,
-								bool $shared) {
-		parent::__construct($appId);
-		$this->name = $alias;
-		$this->factory = $target;
-		$this->shared = $shared;
-	}
+    public function __construct(string $appId,
+                                string $alias,
+                                callable $target,
+                                bool $shared) {
+        parent::__construct($appId);
+        $this->name = $alias;
+        $this->factory = $target;
+        $this->shared = $shared;
+    }
 
-	public function getName(): string {
-		return $this->name;
-	}
+    public function getName(): string {
+        return $this->name;
+    }
 
-	/**
-	 * @psalm-return callable(\Psr\Container\ContainerInterface): mixed
-	 */
-	public function getFactory(): callable {
-		return $this->factory;
-	}
+    /**
+     * @psalm-return callable(\Psr\Container\ContainerInterface): mixed
+     */
+    public function getFactory(): callable {
+        return $this->factory;
+    }
 
-	public function isShared(): bool {
-		return $this->shared;
-	}
+    public function isShared(): bool {
+        return $this->shared;
+    }
 }

lib/private/AppFramework/Bootstrap/EventListenerRegistration.php

Indentation +28 added lines, -28 removed lines

@@ -31,32 +31,32 @@
  */
 class EventListenerRegistration extends ServiceRegistration {
 
-	/** @var string */
-	private $event;
-
-	/** @var int */
-	private $priority;
-
-	public function __construct(string $appId,
-								string $event,
-								string $service,
-								int $priority) {
-		parent::__construct($appId, $service);
-		$this->event = $event;
-		$this->priority = $priority;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getEvent(): string {
-		return $this->event;
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getPriority(): int {
-		return $this->priority;
-	}
+    /** @var string */
+    private $event;
+
+    /** @var int */
+    private $priority;
+
+    public function __construct(string $appId,
+                                string $event,
+                                string $service,
+                                int $priority) {
+        parent::__construct($appId, $service);
+        $this->event = $event;
+        $this->priority = $priority;
+    }
+
+    /**
+     * @return string
+     */
+    public function getEvent(): string {
+        return $this->event;
+    }
+
+    /**
+     * @return int
+     */
+    public function getPriority(): int {
+        return $this->priority;
+    }
 }