From aab8a34f78f4929f1807a22921eac9abae72ee82 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 14 Dec 2019 15:30:56 +0100
Subject: [PATCH 01/29] Allow sharing websites with groups without sharing
 source files

Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>
---
 css/pico.scss                         |  6 +++
 js/personal.js                        | 70 +++++++++++++++++++--------
 lib/Controller/WebsitesController.php | 14 ++++++
 lib/Model/Website.php                 | 17 +++++--
 lib/Settings/Personal.php             |  2 +
 templates/settings.personal.php       | 69 ++++++++++++++++++++++++--
 6 files changed, 150 insertions(+), 28 deletions(-)

diff --git a/css/pico.scss b/css/pico.scss
index 3f879c5b..b7d4e87d 100644
--- a/css/pico.scss
+++ b/css/pico.scss
@@ -139,6 +139,12 @@
 		}
 	}
 
+	.dialog-hint {
+		margin-top: -2px;
+		margin-bottom: calc(var(--margin));
+		opacity: 0.7;
+	}
+
 	table.table {
 		width: 100%;
 		border: 1px solid var(--color-border);
diff --git a/js/personal.js b/js/personal.js
index 27802d4d..e8fa77c2 100644
--- a/js/personal.js
+++ b/js/personal.js
@@ -42,6 +42,7 @@
 	 * @param {string}        [options.route]
 	 * @param {jQuery|string} [options.template]
 	 * @param {jQuery|string} [options.itemTemplate]
+	 * @param {jQuery|string} [options.privateSettingsTemplate]
 	 * @param {jQuery|string} [options.loadingTemplate]
 	 * @param {jQuery|string} [options.errorTemplate]
 	 * @param {string}        [options.websiteBaseUrl]
@@ -60,6 +61,9 @@
 		/** @member {jQuery} */
 		$itemTemplate: $(),
 
+		/** @member {jQuery} */
+		$privateSettingsTemplate: $(),
+
 		/** @member {string} */
 		websiteBaseUrl: '',
 
@@ -71,6 +75,7 @@
 		 * @param {string}        [options.route]
 		 * @param {jQuery|string} [options.template]
 		 * @param {jQuery|string} [options.itemTemplate]
+		 * @param {jQuery|string} [options.privateSettingsTemplate]
 		 * @param {jQuery|string} [options.loadingTemplate]
 		 * @param {jQuery|string} [options.errorTemplate]
 		 * @param {string}        [options.websiteBaseUrl]
@@ -80,14 +85,17 @@
 
 			options = $.extend({
 				itemTemplate: $element.data('itemTemplate'),
+				privateSettingsTemplate: $element.data('privateSettingsTemplate'),
 				websiteBaseUrl: $element.data('websiteBaseUrl')
 			}, options);
 
 			this.$itemTemplate = $(options.itemTemplate);
+			this.$privateSettingsTemplate = $(options.privateSettingsTemplate);
 			this.websiteBaseUrl = options.websiteBaseUrl + ((options.websiteBaseUrl.substr(-1) !== '/') ? '/' : '');
 
 			var signature = 'OCA.CMSPico.WebsiteList.initialize()';
 			if (!this.$itemTemplate.length) throw signature + ': No valid item template given';
+			if (!this.$privateSettingsTemplate.length) throw signature + ': No valid private settings template given';
 			if (this.websiteBaseUrl === '/') throw signature + ': No valid website base URL given';
 
 			this._init();
@@ -164,17 +172,18 @@
 		/**
 		 * @protected
 		 *
-		 * @param {jQuery} $website
-		 * @param {Object} websiteData
-		 * @param {int}    websiteData.id
-		 * @param {string} websiteData.user_id
-		 * @param {string} websiteData.name
-		 * @param {string} websiteData.site
-		 * @param {string} websiteData.theme
-		 * @param {int}    websiteData.type
-		 * @param {Object} websiteData.options
-		 * @param {string} websiteData.path
-		 * @param {int}    websiteData.creation
+		 * @param {jQuery}   $website
+		 * @param {Object}   websiteData
+		 * @param {int}      websiteData.id
+		 * @param {string}   websiteData.user_id
+		 * @param {string}   websiteData.name
+		 * @param {string}   websiteData.site
+		 * @param {string}   websiteData.theme
+		 * @param {int}      websiteData.type
+		 * @param {Object}   websiteData.options
+		 * @param {string[]} [websiteData.options.group_access]
+		 * @param {string}   websiteData.path
+		 * @param {int}      websiteData.creation
 		 */
 		_setupItem: function ($website, websiteData) {
 			var that = this;
@@ -187,23 +196,42 @@
 			var filesUrl = OC.generateUrl('/apps/files/') + '?dir=' + OC.encodePath(websiteData.path);
 			this._clickRedirect($website.find('.action-files'), filesUrl);
 
-			// toggle private website
+			// edit private websites settings
+			var websitePrivate = (websiteData.type === WEBSITE_TYPE_PRIVATE),
+				websiteGroupAccess = (websiteData.options || {}).group_access || [];
 			$website.find('.action-private').each(function () {
 				var $this = $(this),
-					$icon = $this.find('[class^="icon-"], [class*=" icon-"]'),
-					value = (websiteData.type === WEBSITE_TYPE_PRIVATE);
+					$icon = $this.find('[class^="icon-"], [class*=" icon-"]');
 
 				$icon
-					.addClass(value ? 'icon-lock' : 'icon-lock-open')
-					.removeClass(value ? 'icon-lock-open' : 'icon-lock');
+					.addClass(websitePrivate ? 'icon-lock' : 'icon-lock-open')
+					.removeClass(websitePrivate ? 'icon-lock-open' : 'icon-lock');
+
+				var dialog = new OCA.CMSPico.Dialog(that.$privateSettingsTemplate, {
+					title: $this.data('originalTitle') || $this.prop('title') || $this.text(),
+					buttons: [
+						{ type: OCA.CMSPico.Dialog.BUTTON_ABORT },
+						{ type: OCA.CMSPico.Dialog.BUTTON_SUBMIT }
+					]
+				});
 
-				$this.data('value', value);
+				dialog.on('open.CMSPicoAdminList', function () {
+					var $inputType = this.$element.find('.input-private-' + (!websitePrivate ? 'public' : 'private')),
+						$inputGroups = this.$element.find('.input-private-groups');
 
-				$this.on('click.CMSPicoWebsiteList', function (event) {
-					event.preventDefault();
+					$inputType.prop('checked', true);
+					$inputGroups.val(websiteGroupAccess.join('|'));
+					OC.Settings.setupGroupsSelect($inputGroups);
+				});
+
+				dialog.on('submit.CMSPicoAdminList', function () {
+					var data = OCA.CMSPico.Util.serialize(this.$element);
+					that._updateItem(websiteData.id, data);
+				});
 
-					var websiteType = $(this).data('value') ? WEBSITE_TYPE_PUBLIC : WEBSITE_TYPE_PRIVATE;
-					that._updateItem(websiteData.id, { type: websiteType });
+				$this.on('click.CMSPicoAdminList', function (event) {
+					event.preventDefault();
+					dialog.open();
 				});
 			});
 
diff --git a/lib/Controller/WebsitesController.php b/lib/Controller/WebsitesController.php
index c16318ca..663bd81e 100644
--- a/lib/Controller/WebsitesController.php
+++ b/lib/Controller/WebsitesController.php
@@ -159,6 +159,20 @@ public function updatePersonalWebsite(int $siteId, array $data): DataResponse
 						$website->setTheme($value);
 						break;
 
+					case 'options':
+						foreach ($value as $optionKey => $optionValue) {
+							switch ($optionKey) {
+								case 'group_access':
+									$groupAccess = $optionValue ? explode('|', $optionValue) : [];
+									$website->setOption($optionKey, $groupAccess ?: null);
+									break;
+
+								default:
+									throw new WebsiteInvalidDataException();
+							}
+						}
+						break;
+
 					default:
 						throw new WebsiteInvalidDataException();
 				}
diff --git a/lib/Model/Website.php b/lib/Model/Website.php
index 5acf9103..f5e6343c 100644
--- a/lib/Model/Website.php
+++ b/lib/Model/Website.php
@@ -145,12 +145,12 @@ public function assertViewerAccess(string $path, array $meta = [])
 				return;
 			}
 
-			$groupAccess = $meta['access'];
-			if (!is_array($groupAccess)) {
-				$groupAccess = explode(',', $groupAccess);
+			$groupPageAccess = $meta['access'];
+			if (!is_array($groupPageAccess)) {
+				$groupPageAccess = explode(',', $groupPageAccess);
 			}
 
-			foreach ($groupAccess as $group) {
+			foreach ($groupPageAccess as $group) {
 				$group = trim($group);
 
 				if ($group === 'public') {
@@ -174,6 +174,15 @@ public function assertViewerAccess(string $path, array $meta = [])
 				return;
 			}
 
+			$groupAccess = $this->getOption('group_access') ?? [];
+			foreach ($groupAccess as $group) {
+				if ($this->groupManager->groupExists($group)) {
+					if ($this->groupManager->isInGroup($this->getViewer(), $group)) {
+						return;
+					}
+				}
+			}
+
 			/** @var OCFolder $viewerOCFolder */
 			$viewerOCFolder = \OC::$server->getUserFolder($this->getViewer());
 			$viewerAccessClosure = function (OCNode $node) use ($viewerOCFolder) {
diff --git a/lib/Settings/Personal.php b/lib/Settings/Personal.php
index 85e9d537..815d32e3 100644
--- a/lib/Settings/Personal.php
+++ b/lib/Settings/Personal.php
@@ -89,6 +89,8 @@ public function getForm(): TemplateResponse
 		$data = [
 			'exampleSite' => $exampleSite,
 			'baseUrl' => $baseUrl,
+			'typePublic' => Website::TYPE_PUBLIC,
+			'typePrivate' => Website::TYPE_PRIVATE,
 			'nameLengthMin' => Website::NAME_LENGTH_MIN,
 			'nameLengthMax' => Website::NAME_LENGTH_MAX,
 			'siteLengthMin' => Website::SITE_LENGTH_MIN,
diff --git a/templates/settings.personal.php b/templates/settings.personal.php
index 95dd8a95..3d6896e2 100644
--- a/templates/settings.personal.php
+++ b/templates/settings.personal.php
@@ -99,6 +99,7 @@
 			data-route="/apps/cms_pico/personal/websites"
 			data-template="#picocms-websites-template"
 			data-item-template="#picocms-websites-template-item"
+			data-private-settings-template="#picocms-websites-template-private-settings"
 			data-loading-template="#picocms-websites-template-loading"
 			data-error-template="#picocms-websites-template-error"
 			data-website-base-url="<?php p($_['baseUrl']); ?>">
@@ -144,9 +145,9 @@
 							<span class="hidden-visually"><?php p($l->t('Go to website directory')); ?></span>
 						</a>
 						<a class="action action-private has-tooltip"
-								title="<?php p($l->t('Toggle private website')); ?>">
+								title="<?php p($l->t('Edit private website settings')); ?>">
 							<span class="icon-lock-open"></span>
-							<span class="hidden-visually"><?php p($l->t('Toggle private website')); ?></span>
+							<span class="hidden-visually"><?php p($l->t('Edit private website settings')); ?></span>
 						</a>
 						<a class="action action-delete has-tooltip"
 								title="<?php p($l->t('Delete website')); ?>">
@@ -175,7 +176,7 @@
 								<li>
 									<a class="action-private">
 										<span class="icon-lock-open"></span>
-										<span><?php p($l->t('Toggle private website')); ?></span>
+										<span><?php p($l->t('Edit private website settings')); ?></span>
 									</a>
 								</li>
 								<li>
@@ -225,6 +226,68 @@
 		</tr>
 	</script>
 
+	<script id="picocms-websites-template-private-settings" type="text/template">
+		<form id="{id}" title="{title}" class="form">
+			<p class="dialog-hint"><?php p($l->t(
+				'Pico CMS for Nextcloud supports both public and private websites. Everyone can access public '
+				. 'websites, no matter whether they are logged in or not. If you want to limit access to a certain '
+				. 'subset of users, create a private website. All visitors of a private website must be logged in, '
+				. 'otherwise a "Access forbidden" error is shown. Additionally one of the following conditions must '
+				. 'be met: (1) the user has access to the website\'s source files (i.e. the source folder is shared '
+				. 'with the user), (2) the user is a member of one of the groups listed below, or (3) the user is a '
+				. 'member of one of the groups specified in the YAML header of the requested page using the "access" '
+				. 'meta value.'
+			)); ?></p>
+			<fieldset>
+				<div class="label">
+					<span><?php p($l->t('Website type')); ?></span>
+				</div>
+				<div class="content">
+					<p>
+						<input type="radio" id="picocms-websites-private-public" class="radio input-private-public"
+								name="type" value="<?php p($_['typePublic']); ?>">
+						<label for="picocms-websites-private-public">
+							<?php p($l->t('Public website')); ?>
+							<span class="note">– <?php p($l->t(
+								'The website is publicly accessible and requires no authentication whatsoever.'
+							)); ?></span>
+						</label>
+					</p>
+					<p>
+						<input type="radio" id="picocms-websites-private-private" class="radio input-private-private"
+								name="type" value="<?php p($_['typePrivate']); ?>">
+						<label for="picocms-websites-private-private">
+							<?php p($l->t('Private website')); ?>
+							<span class="note">– <?php p($l->t(
+								'The website requires authentication, access is limited to a subset of all users.'
+							)); ?></span>
+						</label>
+					</p>
+				</div>
+			</fieldset>
+			<fieldset>
+				<div class="label">
+					<label class="select2-align" for="picocms-websites-private-groups">
+						<?php p($l->t('Group access')); ?>
+					</label>
+				</div>
+				<div class="content">
+					<input type="hidden" class="input input-private-groups select2-placeholder"
+							name="options[group_access]" value="" />
+					<div class="message input select2-loading">
+						<div class="icon icon-loading"></div>
+						<div>
+							<p><?php p($l->t('Loading groups…')); ?></p>
+						</div>
+					</div>
+					<p class="note"><?php p($l->t(
+						'Grant access to all members of the selected groups.'
+					)); ?></p>
+				</div>
+			</fieldset>
+		</form>
+	</script>
+
 	<script id="picocms-websites-template-loading" type="text/template"
 			data-replaces="#picocms-websites">
 		<div class="app-content-loading message large">

From 2b5821095e6a622a2ed2da714570190d1cf8bef5 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Fri, 17 Jan 2020 16:39:17 +0100
Subject: [PATCH 02/29] Update to PHP 7.1+

Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>
---
 appinfo/info.xml                          |  2 +-
 lib/AppInfo/Application.php               |  6 ++--
 lib/Controller/PicoController.php         | 26 +++-----------
 lib/Db/CoreRequestBuilder.php             | 10 +++---
 lib/Db/WebsitesRequest.php                |  8 ++---
 lib/Events/UserEvents.php                 |  2 +-
 lib/ExternalStorage/BackendProvider.php   |  2 +-
 lib/Files/AbstractLocalNode.php           |  2 +-
 lib/Files/AbstractNode.php                |  4 +--
 lib/Files/AbstractStorageNode.php         |  2 +-
 lib/Files/FileInterface.php               |  2 +-
 lib/Files/FolderInterface.php             |  6 ++--
 lib/Files/FolderTrait.php                 |  5 ++-
 lib/Files/Glob/GlobIterator.php           | 12 +++----
 lib/Files/Glob/GlobPattern.php            | 16 ++++-----
 lib/Files/LocalFile.php                   |  2 +-
 lib/Files/LocalFolder.php                 |  6 ++--
 lib/Files/NodeInterface.php               |  4 +--
 lib/Files/StorageFile.php                 |  4 +--
 lib/Files/StorageFolder.php               |  6 ++--
 lib/Hooks/UserHooks.php                   |  2 +-
 lib/Migration/AppDataRepairStep.php       | 24 ++++++-------
 lib/Migration/MigrationTrait.php          | 10 +++---
 lib/Migration/Version010000.php           |  2 +-
 lib/Migration/Version010000From000908.php | 12 +++----
 lib/Model/Plugin.php                      | 13 +++----
 lib/Model/Template.php                    | 16 +++------
 lib/Model/TemplateFile.php                |  6 ++--
 lib/Model/Theme.php                       | 24 ++++---------
 lib/Model/Website.php                     | 41 +++++++++--------------
 lib/Model/WebsiteCore.php                 | 14 ++++----
 lib/Pico.php                              | 20 +++++------
 lib/Service/AssetsService.php             |  8 ++---
 lib/Service/ConfigService.php             | 34 +++++++++----------
 lib/Service/FileService.php               |  6 ++--
 lib/Service/MiscService.php               | 21 ++----------
 lib/Service/PicoService.php               | 32 +++++++-----------
 lib/Service/PluginsService.php            |  2 +-
 lib/Service/TemplatesService.php          | 12 +++----
 lib/Service/ThemesService.php             |  6 ++--
 lib/Service/WebsitesService.php           | 22 ++++++------
 lib/Settings/Personal.php                 |  2 +-
 42 files changed, 190 insertions(+), 266 deletions(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 5b39ac26..ddf2b657 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -47,7 +47,7 @@ You want to learn more about Pico CMS for Nextcloud? Easy! Just download and ena
 	<screenshot>https://raw.githubusercontent.com/nextcloud/cms_pico/master/screenshots/settings.png</screenshot>
 	<screenshot>https://raw.githubusercontent.com/nextcloud/cms_pico/master/screenshots/apache.png</screenshot>
 	<dependencies>
-		<php min-version="7.0.0"/>
+		<php min-version="7.1.0"/>
 		<nextcloud min-version="16" max-version="19"/>
 	</dependencies>
 	<repair-steps>
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 98b06d71..7d90eb52 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -35,7 +35,7 @@
 class Application extends App
 {
 	/** @var string */
-	const APP_NAME = 'cms_pico';
+	public const APP_NAME = 'cms_pico';
 
 	/**
 	 * @param array $params
@@ -48,7 +48,7 @@ public function __construct(array $params = [])
 	/**
 	 * Register hooks.
 	 */
-	public function registerHooks()
+	public function registerHooks(): void
 	{
 		Util::connectHook('OC_User', 'post_deleteUser', '\OCA\CMSPico\Hooks\UserHooks', 'onUserDeleted');
 	}
@@ -56,7 +56,7 @@ public function registerHooks()
 	/**
 	 * Registers a unencrypted storage backend.
 	 */
-	public function registerExternalStorage()
+	public function registerExternalStorage(): void
 	{
 		// TODO >= NC 18: Add \OCP\EventDispatcher\Event $event param to closure
 		\OC::$server->getEventDispatcher()->addListener(
diff --git a/lib/Controller/PicoController.php b/lib/Controller/PicoController.php
index 2abe1503..2b94415d 100644
--- a/lib/Controller/PicoController.php
+++ b/lib/Controller/PicoController.php
@@ -79,7 +79,7 @@ class PicoController extends Controller
 	 */
 	public function __construct(
 		IRequest $request,
-		$userId,
+		?string $userId,
 		IL10N $l10n,
 		WebsitesService $websitesService,
 		FileService $fileService
@@ -107,11 +107,7 @@ public function getPage(string $site, string $page, bool $proxyRequest = false):
 		try {
 			$picoPage = $this->websitesService->getPage($site, $page, $this->userId, $proxyRequest);
 			return new PicoPageResponse($picoPage);
-		} catch (WebsiteNotFoundException $e) {
-			return new NotFoundResponse($this->l10n->t(
-				'The requested website could not be found on the server. Maybe the website was deleted?'
-			));
-		} catch (WebsiteInvalidOwnerException $e) {
+		} catch (WebsiteNotFoundException | WebsiteInvalidOwnerException $e) {
 			return new NotFoundResponse($this->l10n->t(
 				'The requested website could not be found on the server. Maybe the website was deleted?'
 			));
@@ -135,11 +131,7 @@ public function getPage(string $site, string $page, bool $proxyRequest = false):
 			return new InternalServerErrorResponse($this->l10n->t(
 				'This website uses a incompatible theme and thus could not be built.'
 			));
-		} catch (PageInvalidPathException $e) {
-			return new NotFoundResponse($this->l10n->t(
-				'The requested website page could not be found on the server. Maybe the page was deleted?'
-			));
-		} catch (PageNotFoundException $e) {
+		} catch (PageInvalidPathException | PageNotFoundException $e) {
 			return new NotFoundResponse($this->l10n->t(
 				'The requested website page could not be found on the server. Maybe the page was deleted?'
 			));
@@ -182,11 +174,7 @@ public function getAsset(string $site, string $asset, string $assetsETag = ''):
 			}
 
 			return $response;
-		} catch (WebsiteNotFoundException $e) {
-			return new NotFoundResponse($this->l10n->t(
-				'The requested website could not be found on the server. Maybe the website was deleted?'
-			));
-		} catch (WebsiteInvalidOwnerException $e) {
+		} catch (WebsiteNotFoundException | WebsiteInvalidOwnerException $e) {
 			return new NotFoundResponse($this->l10n->t(
 				'The requested website could not be found on the server. Maybe the website was deleted?'
 			));
@@ -202,11 +190,7 @@ public function getAsset(string $site, string $asset, string $assetsETag = ''):
 			return new InternalServerErrorResponse($this->l10n->t(
 				'This website is hosted on a non-local storage and thus could not be accessed.'
 			));
-		} catch (AssetInvalidPathException $e) {
-			return new NotFoundResponse($this->l10n->t(
-				'The requested website asset could not be found on the server. Maybe the asset was deleted?'
-			));
-		} catch (AssetNotFoundException $e) {
+		} catch (AssetInvalidPathException | AssetNotFoundException $e) {
 			return new NotFoundResponse($this->l10n->t(
 				'The requested website asset could not be found on the server. Maybe the asset was deleted?'
 			));
diff --git a/lib/Db/CoreRequestBuilder.php b/lib/Db/CoreRequestBuilder.php
index ba46c663..4480b8b5 100644
--- a/lib/Db/CoreRequestBuilder.php
+++ b/lib/Db/CoreRequestBuilder.php
@@ -31,7 +31,7 @@
 class CoreRequestBuilder
 {
 	/** @var string */
-	const TABLE_WEBSITES = 'cms_pico_websites';
+	public const TABLE_WEBSITES = 'cms_pico_websites';
 
 	/** @var IDBConnection */
 	protected $dbConnection;
@@ -52,7 +52,7 @@ public function __construct(IDBConnection $connection)
 	 * @param IQueryBuilder $qb
 	 * @param int           $id
 	 */
-	protected function limitToId(IQueryBuilder $qb, int $id)
+	protected function limitToId(IQueryBuilder $qb, int $id): void
 	{
 		$this->limitToDBField($qb, 'id', $id);
 	}
@@ -63,7 +63,7 @@ protected function limitToId(IQueryBuilder $qb, int $id)
 	 * @param IQueryBuilder $qb
 	 * @param string        $userId
 	 */
-	protected function limitToUserId(IQueryBuilder $qb, string $userId)
+	protected function limitToUserId(IQueryBuilder $qb, string $userId): void
 	{
 		$this->limitToDBField($qb, 'user_id', $userId);
 	}
@@ -74,7 +74,7 @@ protected function limitToUserId(IQueryBuilder $qb, string $userId)
 	 * @param IQueryBuilder $qb
 	 * @param string        $userId
 	 */
-	protected function limitToSite(IQueryBuilder $qb, string $userId)
+	protected function limitToSite(IQueryBuilder $qb, string $userId): void
 	{
 		$this->limitToDBField($qb, 'site', $userId);
 	}
@@ -84,7 +84,7 @@ protected function limitToSite(IQueryBuilder $qb, string $userId)
 	 * @param string        $field
 	 * @param mixed         $value
 	 */
-	private function limitToDBField(IQueryBuilder $qb, string $field, $value)
+	private function limitToDBField(IQueryBuilder $qb, string $field, $value): void
 	{
 		$qb->andWhere($qb->expr()->eq($field, $qb->createNamedParameter($value)));
 	}
diff --git a/lib/Db/WebsitesRequest.php b/lib/Db/WebsitesRequest.php
index f725998c..5803dbc2 100644
--- a/lib/Db/WebsitesRequest.php
+++ b/lib/Db/WebsitesRequest.php
@@ -33,7 +33,7 @@ class WebsitesRequest extends WebsitesRequestBuilder
 	/**
 	 * @param Website $website
 	 */
-	public function create(Website $website)
+	public function create(Website $website): void
 	{
 		$qb = $this->getWebsitesInsertSql();
 		$qb
@@ -51,7 +51,7 @@ public function create(Website $website)
 	/**
 	 * @param Website $website
 	 */
-	public function update(Website $website)
+	public function update(Website $website): void
 	{
 		$qb = $this->getWebsitesUpdateSql();
 		$qb
@@ -71,7 +71,7 @@ public function update(Website $website)
 	/**
 	 * @param Website $website
 	 */
-	public function delete(Website $website)
+	public function delete(Website $website): void
 	{
 		$qb = $this->getWebsitesDeleteSql();
 		$this->limitToId($qb, $website->getId());
@@ -82,7 +82,7 @@ public function delete(Website $website)
 	/**
 	 * @param string $userId
 	 */
-	public function deleteAllFromUser(string $userId)
+	public function deleteAllFromUser(string $userId): void
 	{
 		$qb = $this->getWebsitesDeleteSql();
 		$this->limitToUserId($qb, $userId);
diff --git a/lib/Events/UserEvents.php b/lib/Events/UserEvents.php
index 729ddc5c..f6dcb7a4 100644
--- a/lib/Events/UserEvents.php
+++ b/lib/Events/UserEvents.php
@@ -45,7 +45,7 @@ public function __construct(WebsitesService $websitesService)
 	/**
 	 * @param array $params
 	 */
-	public function onUserDeleted(array $params)
+	public function onUserDeleted(array $params): void
 	{
 		$userId = $params['uid'];
 		$this->websitesService->onUserRemoved($userId);
diff --git a/lib/ExternalStorage/BackendProvider.php b/lib/ExternalStorage/BackendProvider.php
index ae6a2b54..1da5f357 100644
--- a/lib/ExternalStorage/BackendProvider.php
+++ b/lib/ExternalStorage/BackendProvider.php
@@ -32,7 +32,7 @@ class BackendProvider implements IBackendProvider
 	/**
 	 * @return CommonBackend[]
 	 */
-	public function getBackends()
+	public function getBackends(): array
 	{
 		return [
 			\OC::$server->query(Backend::class)
diff --git a/lib/Files/AbstractLocalNode.php b/lib/Files/AbstractLocalNode.php
index fd7499fd..fe1a9dd3 100644
--- a/lib/Files/AbstractLocalNode.php
+++ b/lib/Files/AbstractLocalNode.php
@@ -148,7 +148,7 @@ public function move(FolderInterface $targetPath, string $name = null): NodeInte
 	/**
 	 * {@inheritDoc}
 	 */
-	public function delete()
+	public function delete(): void
 	{
 		if (!$this->isDeletable()) {
 			throw new NotPermittedException();
diff --git a/lib/Files/AbstractNode.php b/lib/Files/AbstractNode.php
index 30d035eb..7068373d 100644
--- a/lib/Files/AbstractNode.php
+++ b/lib/Files/AbstractNode.php
@@ -93,7 +93,7 @@ public function move(FolderInterface $targetPath, string $name = null): NodeInte
 	/**
 	 * {@inheritDoc}
 	 */
-	public function truncate()
+	public function truncate(): void
 	{
 		if ($this->isFolder()) {
 			/** @var FolderInterface $this */
@@ -159,7 +159,7 @@ public function __toString(): string
 	 *
 	 * @throws InvalidPathException
 	 */
-	protected function assertValidFileName(string $name)
+	protected function assertValidFileName(string $name): void
 	{
 		if (in_array($name, [ '', '.', '..' ], true)) {
 			throw new InvalidPathException();
diff --git a/lib/Files/AbstractStorageNode.php b/lib/Files/AbstractStorageNode.php
index 37e8a91d..3affb5ef 100644
--- a/lib/Files/AbstractStorageNode.php
+++ b/lib/Files/AbstractStorageNode.php
@@ -115,7 +115,7 @@ public function move(FolderInterface $targetPath, string $name = null): NodeInte
 	/**
 	 * {@inheritDoc}
 	 */
-	public function delete()
+	public function delete(): void
 	{
 		$this->node->delete();
 	}
diff --git a/lib/Files/FileInterface.php b/lib/Files/FileInterface.php
index 7bc1557a..8bb7151a 100644
--- a/lib/Files/FileInterface.php
+++ b/lib/Files/FileInterface.php
@@ -47,5 +47,5 @@ public function getContent(): string;
 	 * @throws NotPermittedException
 	 * @throws GenericFileException
 	 */
-	public function putContent(string $data);
+	public function putContent(string $data): void;
 }
diff --git a/lib/Files/FolderInterface.php b/lib/Files/FolderInterface.php
index 54be140f..3f2db2c0 100644
--- a/lib/Files/FolderInterface.php
+++ b/lib/Files/FolderInterface.php
@@ -42,10 +42,10 @@
 interface FolderInterface extends NodeInterface, \RecursiveIterator
 {
 	/** @var bool */
-	const SYNC_SHALLOW = false;
+	public const SYNC_SHALLOW = false;
 
 	/** @var bool */
-	const SYNC_RECURSIVE = true;
+	public const SYNC_RECURSIVE = true;
 
 	/**
 	 * @return NodeInterface[]
@@ -126,7 +126,7 @@ public function fakeRoot(): FolderInterface;
 	 * @throws NotPermittedException
 	 * @throws GenericFileException
 	 */
-	public function sync(bool $recursive = self::SYNC_RECURSIVE);
+	public function sync(bool $recursive = self::SYNC_RECURSIVE): void;
 
 	/**
 	 * @return bool
diff --git a/lib/Files/FolderTrait.php b/lib/Files/FolderTrait.php
index 29cd7659..611a734c 100644
--- a/lib/Files/FolderTrait.php
+++ b/lib/Files/FolderTrait.php
@@ -80,11 +80,10 @@ public function getFile(string $path): FileInterface
 	abstract protected function getGenerator(): \Generator;
 
 	/**
-	 * @return void
 	 * @throws NotPermittedException
 	 * @throws GenericFileException
 	 */
-	public function rewind()
+	public function rewind(): void
 	{
 		$this->generator = $this->getGenerator();
 	}
@@ -92,7 +91,7 @@ public function rewind()
 	/**
 	 * @return void
 	 */
-	public function next()
+	public function next(): void
 	{
 		$this->generator->next();
 	}
diff --git a/lib/Files/Glob/GlobIterator.php b/lib/Files/Glob/GlobIterator.php
index 191e8bd2..9478c621 100644
--- a/lib/Files/Glob/GlobIterator.php
+++ b/lib/Files/Glob/GlobIterator.php
@@ -48,7 +48,7 @@ public function __construct(FolderInterface $folder, string $pattern)
 	/**
 	 * @return void
 	 */
-	private function init()
+	private function init(): void
 	{
 		$this->folders = [ $this->folder ];
 		$this->current = $this->folder;
@@ -62,7 +62,7 @@ private function init()
 	 * @throws NotPermittedException
 	 * @throws GenericFileException
 	 */
-	public function rewind()
+	public function rewind(): void
 	{
 		$this->init();
 
@@ -72,7 +72,7 @@ public function rewind()
 	/**
 	 * @return void
 	 */
-	public function next()
+	public function next(): void
 	{
 		$this->current->next();
 	}
@@ -129,7 +129,7 @@ public function key(): int
 	/**
 	 * @param FolderInterface $folder
 	 */
-	private function descend(FolderInterface $folder)
+	private function descend(FolderInterface $folder): void
 	{
 		$this->folders[] = $folder;
 		$this->depth++;
@@ -141,7 +141,7 @@ private function descend(FolderInterface $folder)
 	/**
 	 * @return void
 	 */
-	private function ascend()
+	private function ascend(): void
 	{
 		array_pop($this->folders);
 		$this->depth--;
@@ -153,7 +153,7 @@ private function ascend()
 	/**
 	 * @param FileInterface $file
 	 */
-	private function set(FileInterface $file)
+	private function set(FileInterface $file): void
 	{
 		$this->currentValue = $file;
 		$this->currentKey++;
diff --git a/lib/Files/Glob/GlobPattern.php b/lib/Files/Glob/GlobPattern.php
index 6577f78f..bbc03b22 100644
--- a/lib/Files/Glob/GlobPattern.php
+++ b/lib/Files/Glob/GlobPattern.php
@@ -27,13 +27,13 @@
 class GlobPattern
 {
 	/** @var int */
-	const TYPE_NONE = 0;
+	protected const TYPE_NONE = 0;
 
 	/** @var int */
-	const TYPE_STATIC = 1;
+	protected const TYPE_STATIC = 1;
 
 	/** @var int */
-	const TYPE_REGEX = 2;
+	protected const TYPE_REGEX = 2;
 
 	/** @var string */
 	protected $delimiter = '~';
@@ -86,7 +86,7 @@ public function compare(int $depth, string $fileName): bool
 	{
 		/** @var int $componentType */
 		/** @var string $componentPattern */
-		list($componentType, $componentPattern) = $this->getComponent($depth);
+		[ $componentType, $componentPattern ] = $this->getComponent($depth);
 
 		if ($componentType === self::TYPE_STATIC) {
 			return ($fileName === $componentPattern);
@@ -118,7 +118,7 @@ private function getComponent(int $depth): array
 	/**
 	 * @return void
 	 */
-	private function evaluateComponent()
+	private function evaluateComponent(): void
 	{
 		$this->resetComponent();
 
@@ -149,7 +149,7 @@ private function evaluateComponent()
 	/**
 	 * @param string $char
 	 */
-	private function evaluateComponentChar(string $char)
+	private function evaluateComponentChar(string $char): void
 	{
 		$i = &$this->patternPos;
 
@@ -205,7 +205,7 @@ private function evaluateComponentChar(string $char)
 	/**
 	 * @return void
 	 */
-	private function commitComponent()
+	private function commitComponent(): void
 	{
 		if ($this->context['inGroup']) {
 			throw new \InvalidArgumentException('Invalid glob: Missing "]": ' . $this->pattern);
@@ -222,7 +222,7 @@ private function commitComponent()
 	/**
 	 * @return void
 	 */
-	private function resetComponent()
+	private function resetComponent(): void
 	{
 		$this->current = '';
 		$this->context = [
diff --git a/lib/Files/LocalFile.php b/lib/Files/LocalFile.php
index a27f3a69..0885d9af 100644
--- a/lib/Files/LocalFile.php
+++ b/lib/Files/LocalFile.php
@@ -77,7 +77,7 @@ public function getContent(): string
 	/**
 	 * {@inheritDoc}
 	 */
-	public function putContent(string $data)
+	public function putContent(string $data): void
 	{
 		if (!$this->isUpdateable()) {
 			throw new NotPermittedException();
diff --git a/lib/Files/LocalFolder.php b/lib/Files/LocalFolder.php
index c158d86d..f6f3fb9e 100644
--- a/lib/Files/LocalFolder.php
+++ b/lib/Files/LocalFolder.php
@@ -59,7 +59,7 @@ public function __construct(string $path, string $basePath)
 	/**
 	 * {@inheritDoc}
 	 */
-	public function delete()
+	public function delete(): void
 	{
 		if (!$this->isDeletable()) {
 			throw new NotPermittedException();
@@ -230,7 +230,7 @@ public function fakeRoot(): FolderInterface
 	/**
 	 * {@inheritDoc}
 	 */
-	public function sync(bool $recursive = self::SYNC_RECURSIVE)
+	public function sync(bool $recursive = self::SYNC_RECURSIVE): void
 	{
 		// nothing to do
 	}
@@ -248,7 +248,7 @@ public function isCreatable(): bool
 	 *
 	 * @return AbstractLocalNode|null
 	 */
-	private function createNode(string $path)
+	private function createNode(string $path): ?AbstractLocalNode
 	{
 		try {
 			if ($path === '/') {
diff --git a/lib/Files/NodeInterface.php b/lib/Files/NodeInterface.php
index 0fa871e7..2f2bdf7f 100644
--- a/lib/Files/NodeInterface.php
+++ b/lib/Files/NodeInterface.php
@@ -71,13 +71,13 @@ public function move(FolderInterface $targetPath, string $name = null): NodeInte
 	 * @throws NotPermittedException
 	 * @throws GenericFileException
 	 */
-	public function truncate();
+	public function truncate(): void;
 
 	/**
 	 * @throws NotPermittedException
 	 * @throws GenericFileException
 	 */
-	public function delete();
+	public function delete(): void;
 
 	/**
 	 * @return string
diff --git a/lib/Files/StorageFile.php b/lib/Files/StorageFile.php
index 4b2edf13..893a4021 100644
--- a/lib/Files/StorageFile.php
+++ b/lib/Files/StorageFile.php
@@ -64,8 +64,8 @@ public function getContent(): string
 	/**
 	 * {@inheritDoc}
 	 */
-	public function putContent(string $data)
+	public function putContent(string $data): void
 	{
-		return $this->node->putContent($data);
+		$this->node->putContent($data);
 	}
 }
diff --git a/lib/Files/StorageFolder.php b/lib/Files/StorageFolder.php
index cc253dec..239a1c00 100644
--- a/lib/Files/StorageFolder.php
+++ b/lib/Files/StorageFolder.php
@@ -167,10 +167,10 @@ public function fakeRoot(): FolderInterface
 	/**
 	 * {@inheritDoc}
 	 */
-	public function sync(bool $recursive = FolderInterface::SYNC_RECURSIVE)
+	public function sync(bool $recursive = FolderInterface::SYNC_RECURSIVE): void
 	{
 		// TODO >= NC 18: Remove version switch
-		list($majorVersion) = \OC_Util::getVersion();
+		[ $majorVersion ] = \OC_Util::getVersion();
 		if ($majorVersion >= 18) {
 			if ($this->eventDispatcher === null) {
 				$this->eventDispatcher = \OC::$server->query(IEventDispatcher::class);
@@ -202,7 +202,7 @@ public function isCreatable(): bool
 	 * @return string|null
 	 * @throws InvalidPathException
 	 */
-	private function getBasePath(string $path)
+	private function getBasePath(string $path): ?string
 	{
 		$path = $this->normalizePath($this->getPath() . '/' . $path);
 		return ($path !== '/') ? dirname($path) : null;
diff --git a/lib/Hooks/UserHooks.php b/lib/Hooks/UserHooks.php
index 82c35c34..4c915267 100644
--- a/lib/Hooks/UserHooks.php
+++ b/lib/Hooks/UserHooks.php
@@ -32,7 +32,7 @@ class UserHooks
 	/**
 	 * @param array $params
 	 */
-	public static function onUserDeleted(array $params)
+	public static function onUserDeleted(array $params): void
 	{
 		/** @var UserEvents $userEvents */
 		$userEvents = \OC::$server->query(UserEvents::class);
diff --git a/lib/Migration/AppDataRepairStep.php b/lib/Migration/AppDataRepairStep.php
index ae93c7bf..767ce5bf 100644
--- a/lib/Migration/AppDataRepairStep.php
+++ b/lib/Migration/AppDataRepairStep.php
@@ -102,7 +102,7 @@ public function getName(): string
 	/**
 	 * @param IOutput $output
 	 */
-	public function run(IOutput $output)
+	public function run(IOutput $output): void
 	{
 		$this->setOutput($output);
 
@@ -138,7 +138,7 @@ public function run(IOutput $output)
 	/**
 	 * @return void
 	 */
-	private function syncAppDataFolder()
+	private function syncAppDataFolder(): void
 	{
 		$this->fileService->syncAppDataFolder();
 	}
@@ -146,7 +146,7 @@ private function syncAppDataFolder()
 	/**
 	 * @return void
 	 */
-	private function copyConfig()
+	private function copyConfig(): void
 	{
 		$appDataConfigFolder = $this->fileService->getAppDataFolder(PicoService::DIR_CONFIG);
 		$systemConfigFolder = $this->fileService->getSystemFolder(PicoService::DIR_CONFIG);
@@ -172,7 +172,7 @@ private function copyConfig()
 	/**
 	 * @return void
 	 */
-	private function registerTemplates()
+	private function registerTemplates(): void
 	{
 		$this->registerSystemTemplates();
 		$this->registerCustomTemplates();
@@ -181,7 +181,7 @@ private function registerTemplates()
 	/**
 	 * @return void
 	 */
-	private function registerSystemTemplates()
+	private function registerSystemTemplates(): void
 	{
 		$systemTemplatesFolder = $this->fileService->getSystemFolder(PicoService::DIR_TEMPLATES);
 
@@ -203,7 +203,7 @@ private function registerSystemTemplates()
 	/**
 	 * @return void
 	 */
-	private function registerCustomTemplates()
+	private function registerCustomTemplates(): void
 	{
 		$appDataTemplatesFolder = $this->fileService->getAppDataFolder(PicoService::DIR_TEMPLATES);
 
@@ -228,7 +228,7 @@ private function registerCustomTemplates()
 	/**
 	 * @return void
 	 */
-	private function publishThemes()
+	private function publishThemes(): void
 	{
 		$publicThemesFolder = $this->fileService->getPublicFolder(PicoService::DIR_THEMES);
 		$publicThemesFolder->truncate();
@@ -242,7 +242,7 @@ private function publishThemes()
 	/**
 	 * @return void
 	 */
-	private function publishSystemThemes()
+	private function publishSystemThemes(): void
 	{
 		$systemThemesFolder = $this->fileService->getSystemFolder(PicoService::DIR_THEMES);
 
@@ -264,7 +264,7 @@ private function publishSystemThemes()
 	/**
 	 * @return void
 	 */
-	private function publishCustomThemes()
+	private function publishCustomThemes(): void
 	{
 		$appDataThemesFolder = $this->fileService->getAppDataFolder(PicoService::DIR_THEMES);
 
@@ -289,7 +289,7 @@ private function publishCustomThemes()
 	/**
 	 * @return void
 	 */
-	private function publishPlugins()
+	private function publishPlugins(): void
 	{
 		$publicPluginsFolder = $this->fileService->getPublicFolder(PicoService::DIR_PLUGINS);
 		$publicPluginsFolder->truncate();
@@ -303,7 +303,7 @@ private function publishPlugins()
 	/**
 	 * @return void
 	 */
-	private function publishSystemPlugins()
+	private function publishSystemPlugins(): void
 	{
 		$systemPluginsFolder = $this->fileService->getSystemFolder(PicoService::DIR_PLUGINS);
 
@@ -325,7 +325,7 @@ private function publishSystemPlugins()
 	/**
 	 * @return void
 	 */
-	private function publishCustomPlugins()
+	private function publishCustomPlugins(): void
 	{
 		$appDataPluginsFolder = $this->fileService->getAppDataFolder(PicoService::DIR_PLUGINS);
 
diff --git a/lib/Migration/MigrationTrait.php b/lib/Migration/MigrationTrait.php
index 5f942fb3..9dd30c53 100644
--- a/lib/Migration/MigrationTrait.php
+++ b/lib/Migration/MigrationTrait.php
@@ -39,7 +39,7 @@ trait MigrationTrait
 	/**
 	 * @param ILogger $logger
 	 */
-	protected function setLogger(ILogger $logger)
+	protected function setLogger(ILogger $logger): void
 	{
 		$this->logger = $logger;
 	}
@@ -47,7 +47,7 @@ protected function setLogger(ILogger $logger)
 	/**
 	 * @param IOutput $output
 	 */
-	protected function setOutput(IOutput $output)
+	protected function setOutput(IOutput $output): void
 	{
 		$this->output = $output;
 	}
@@ -56,7 +56,7 @@ protected function setOutput(IOutput $output)
 	 * @param string  $message
 	 * @param mixed[] ...$arguments
 	 */
-	protected function logInfo(string $message, ...$arguments)
+	protected function logInfo(string $message, ...$arguments): void
 	{
 		if (!$this->logger || !$this->output) {
 			throw new \LogicException('No logger or output instance set');
@@ -71,7 +71,7 @@ protected function logInfo(string $message, ...$arguments)
 	 * @param string $message
 	 * @param mixed[] ...$arguments
 	 */
-	protected function logWarning(string $message, ...$arguments)
+	protected function logWarning(string $message, ...$arguments): void
 	{
 		if (!$this->logger || !$this->output) {
 			throw new \LogicException('No logger or output instance set');
@@ -88,7 +88,7 @@ protected function logWarning(string $message, ...$arguments)
 	 * @param array  $oldItems
 	 * @param bool   $warnUpdates
 	 */
-	protected function logChanges(string $title, array $newItems, array $oldItems, bool $warnUpdates = false)
+	protected function logChanges(string $title, array $newItems, array $oldItems, bool $warnUpdates = false): void
 	{
 		if (!$this->logger || !$this->output) {
 			throw new \LogicException('No logger or output instance set');
diff --git a/lib/Migration/Version010000.php b/lib/Migration/Version010000.php
index 2ee7751a..f4063cc4 100644
--- a/lib/Migration/Version010000.php
+++ b/lib/Migration/Version010000.php
@@ -124,7 +124,7 @@ public function changeSchema(IOutput $output, \Closure $schemaClosure, array $op
 	 * @param \Closure $schemaClosure
 	 * @param array    $options
 	 */
-	public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options)
+	public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options): void
 	{
 		$this->miscService->checkComposer();
 		$this->miscService->checkPublicFolder();
diff --git a/lib/Migration/Version010000From000908.php b/lib/Migration/Version010000From000908.php
index f688a0f8..7723adb5 100644
--- a/lib/Migration/Version010000From000908.php
+++ b/lib/Migration/Version010000From000908.php
@@ -76,7 +76,7 @@ public function __construct()
 	 * @param \Closure $schemaClosure
 	 * @param array    $options
 	 */
-	public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options)
+	public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options): void
 	{
 		$this->setOutput($output);
 
@@ -95,7 +95,7 @@ public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array
 	/**
 	 * @return void
 	 */
-	private function migrateCustomTemplates()
+	private function migrateCustomTemplates(): void
 	{
 		$customTemplatesJson = $this->configService->getAppValue(ConfigService::CUSTOM_TEMPLATES);
 		$customTemplates = $customTemplatesJson ? json_decode($customTemplatesJson, true) : [];
@@ -117,7 +117,7 @@ private function migrateCustomTemplates()
 	/**
 	 * @return void
 	 */
-	private function migrateCustomThemes()
+	private function migrateCustomThemes(): void
 	{
 		$customThemesJson = $this->configService->getAppValue(ConfigService::CUSTOM_THEMES);
 		$customThemes = $customThemesJson ? json_decode($customThemesJson, true) : [];
@@ -139,7 +139,7 @@ private function migrateCustomThemes()
 	/**
 	 * @return array<string,string>
 	 */
-	private function migrateSystemTemplates()
+	private function migrateSystemTemplates(): array
 	{
 		$systemTemplatesFolder = $this->fileService->getSystemFolder(PicoService::DIR_TEMPLATES);
 		$systemTemplatesFolder->sync(FolderInterface::SYNC_SHALLOW);
@@ -178,7 +178,7 @@ private function migrateSystemTemplates()
 	/**
 	 * @return array<string,string>
 	 */
-	private function migrateSystemThemes()
+	private function migrateSystemThemes(): array
 	{
 		$systemThemesFolder = $this->fileService->getSystemFolder(PicoService::DIR_THEMES);
 		$systemThemesFolder->sync(FolderInterface::SYNC_SHALLOW);
@@ -217,7 +217,7 @@ private function migrateSystemThemes()
 	/**
 	 * @param array $themesMigrationMap
 	 */
-	private function migratePrivateWebsites(array $themesMigrationMap)
+	private function migratePrivateWebsites(array $themesMigrationMap): void
 	{
 		$qbUpdate = $this->databaseConnection->getQueryBuilder();
 		$qbUpdate
diff --git a/lib/Model/Plugin.php b/lib/Model/Plugin.php
index 28c1b979..6e3c3697 100644
--- a/lib/Model/Plugin.php
+++ b/lib/Model/Plugin.php
@@ -34,13 +34,13 @@
 class Plugin implements \JsonSerializable
 {
 	/** @var int */
-	const TYPE_SYSTEM = 1;
+	public const TYPE_SYSTEM = 1;
 
 	/** @var int */
-	const TYPE_CUSTOM = 2;
+	public const TYPE_CUSTOM = 2;
 
 	/** @var int[] */
-	const PLUGIN_API_VERSIONS = [
+	public const PLUGIN_API_VERSIONS = [
 		Pico::API_VERSION_1,
 		Pico::API_VERSION_2,
 		Pico::API_VERSION_3,
@@ -119,7 +119,7 @@ public function isCompatible(): bool
 	/**
 	 * @throws PluginNotCompatibleException
 	 */
-	public function checkCompatibility()
+	public function checkCompatibility(): void
 	{
 		if ($this->compat === false) {
 			throw $this->compatException;
@@ -136,10 +136,7 @@ public function checkCompatibility()
 			try {
 				$pluginFile = $this->getFolder()->getFile($this->getName() . '.php');
 				$includeClosure($pluginFile->getLocalPath());
-			} catch (\Exception $e) {
-				/** @noinspection PhpUnhandledExceptionInspection */
-				$this->miscService->consumeException($e, InvalidPathException::class, NotFoundException::class);
-
+			} catch (InvalidPathException | NotFoundException $e) {
 				throw new PluginNotCompatibleException(
 					$this->getName(),
 					'Incompatible plugin: Plugin file "{file}" not found.',
diff --git a/lib/Model/Template.php b/lib/Model/Template.php
index d367e6a3..de4d5a18 100644
--- a/lib/Model/Template.php
+++ b/lib/Model/Template.php
@@ -33,10 +33,10 @@
 class Template implements \JsonSerializable
 {
 	/** @var int */
-	const TYPE_SYSTEM = 1;
+	public const TYPE_SYSTEM = 1;
 
 	/** @var int */
-	const TYPE_CUSTOM = 2;
+	public const TYPE_CUSTOM = 2;
 
 	/** @var MiscService */
 	private $miscService;
@@ -111,7 +111,7 @@ public function isCompatible(): bool
 	/**
 	 * @throws TemplateNotCompatibleException
 	 */
-	public function checkCompatibility()
+	public function checkCompatibility(): void
 	{
 		if ($this->compat === false) {
 			throw $this->compatException;
@@ -122,10 +122,7 @@ public function checkCompatibility()
 		try {
 			try {
 				$this->folder->getFolder('assets');
-			} catch (\Exception $e) {
-				/** @noinspection PhpUnhandledExceptionInspection */
-				$this->miscService->consumeException($e, InvalidPathException::class, NotFoundException::class);
-
+			} catch (InvalidPathException | NotFoundException $e) {
 				throw new TemplateNotCompatibleException(
 					$this->getName(),
 					'Incompatible template: Required directory "{file}" not found.',
@@ -135,10 +132,7 @@ public function checkCompatibility()
 
 			try {
 				$this->folder->getFolder('content');
-			} catch (\Exception $e) {
-				/** @noinspection PhpUnhandledExceptionInspection */
-				$this->miscService->consumeException($e, InvalidPathException::class, NotFoundException::class);
-
+			} catch (InvalidPathException | NotFoundException $e) {
 				throw new TemplateNotCompatibleException(
 					$this->getName(),
 					'Incompatible template: Required directory "{file}" not found.',
diff --git a/lib/Model/TemplateFile.php b/lib/Model/TemplateFile.php
index 8a16200b..e224e72f 100644
--- a/lib/Model/TemplateFile.php
+++ b/lib/Model/TemplateFile.php
@@ -69,7 +69,7 @@ public function rename(string $name): NodeInterface
 	/**
 	 * {@inheritDoc}
 	 */
-	public function delete()
+	public function delete(): void
 	{
 		// nothing to do
 	}
@@ -153,7 +153,7 @@ public function getContent(): string
 	/**
 	 * {@inheritDoc}
 	 */
-	public function putContent(string $data)
+	public function putContent(string $data): void
 	{
 		throw new NotPermittedException();
 	}
@@ -175,7 +175,7 @@ public function isBinary(): bool
 	/**
 	 * @param array<string,string> $data
 	 */
-	public function setTemplateData(array $data)
+	public function setTemplateData(array $data): void
 	{
 		$this->data = [];
 		foreach ($data as $key => $value) {
diff --git a/lib/Model/Theme.php b/lib/Model/Theme.php
index a958cc5d..8d6d9fe5 100644
--- a/lib/Model/Theme.php
+++ b/lib/Model/Theme.php
@@ -37,13 +37,13 @@
 class Theme implements \JsonSerializable
 {
 	/** @var int */
-	const TYPE_SYSTEM = 1;
+	public const TYPE_SYSTEM = 1;
 
 	/** @var int */
-	const TYPE_CUSTOM = 2;
+	public const TYPE_CUSTOM = 2;
 
 	/** @var int[] */
-	const THEME_API_VERSIONS = [
+	public const THEME_API_VERSIONS = [
 		Pico::API_VERSION_0,
 		Pico::API_VERSION_1,
 		Pico::API_VERSION_2,
@@ -123,7 +123,7 @@ public function isCompatible(): bool
 	/**
 	 * @throws ThemeNotCompatibleException
 	 */
-	public function checkCompatibility()
+	public function checkCompatibility(): void
 	{
 		if ($this->compat === false) {
 			throw $this->compatException;
@@ -134,10 +134,7 @@ public function checkCompatibility()
 		try {
 			try {
 				$this->getFolder()->getFile('index.twig');
-			} catch (\Exception $e) {
-				/** @noinspection PhpUnhandledExceptionInspection */
-				$this->miscService->consumeException($e, InvalidPathException::class, NotFoundException::class);
-
+			} catch (InvalidPathException | NotFoundException $e) {
 				throw new ThemeNotCompatibleException(
 					$this->getName(),
 					'Incompatible theme: Twig template "{file}" not found.',
@@ -151,16 +148,7 @@ public function checkCompatibility()
 
 				$themeConfig = (new YamlParser())->parse($themeConfigYaml);
 				$themeConfig = is_array($themeConfig) ? $themeConfig : [];
-			} catch (\Exception $e) {
-				/** @noinspection PhpUnhandledExceptionInspection */
-				$this->miscService->consumeException(
-					$e,
-					NotFoundException::class,
-					InvalidPathException::class,
-					NotPermittedException::class,
-					YamlParseException::class
-				);
-
+			} catch (InvalidPathException | NotFoundException | NotPermittedException | YamlParseException $e) {
 				$themeConfig = [];
 			}
 
diff --git a/lib/Model/Website.php b/lib/Model/Website.php
index 4769cd97..d84b7791 100644
--- a/lib/Model/Website.php
+++ b/lib/Model/Website.php
@@ -55,19 +55,19 @@
 class Website extends WebsiteCore
 {
 	/** @var int */
-	const SITE_LENGTH_MIN = 3;
+	public const SITE_LENGTH_MIN = 3;
 
 	/** @var int */
-	const SITE_LENGTH_MAX = 255;
+	public const SITE_LENGTH_MAX = 255;
 
 	/** @var string */
-	const SITE_REGEX = '^[a-z0-9][a-z0-9_-]+[a-z0-9]$';
+	public const SITE_REGEX = '^[a-z0-9][a-z0-9_-]+[a-z0-9]$';
 
 	/** @var int */
-	const NAME_LENGTH_MIN = 3;
+	public const NAME_LENGTH_MIN = 3;
 
 	/** @var int */
-	const NAME_LENGTH_MAX = 255;
+	public const NAME_LENGTH_MAX = 255;
 
 	/** @var IConfig */
 	private $config;
@@ -137,7 +137,7 @@ public function getTimeZone(): string
 	 * @throws WebsiteNotPermittedException
 	 * @throws NotPermittedException
 	 */
-	public function assertViewerAccess(string $path, array $meta = [])
+	public function assertViewerAccess(string $path, array $meta = []): void
 	{
 		$exceptionClass = WebsiteNotPermittedException::class;
 		if ($this->getType() === self::TYPE_PUBLIC) {
@@ -231,7 +231,7 @@ public function assertViewerAccess(string $path, array $meta = [])
 	/**
 	 * @throws WebsiteInvalidOwnerException
 	 */
-	public function assertValidOwner()
+	public function assertValidOwner(): void
 	{
 		$user = $this->userManager->get($this->getUserId());
 		if ($user === null) {
@@ -248,7 +248,7 @@ public function assertValidOwner()
 	/**
 	 * @throws WebsiteInvalidDataException
 	 */
-	public function assertValidName()
+	public function assertValidName(): void
 	{
 		if (strlen($this->getName()) < self::NAME_LENGTH_MIN) {
 			throw new WebsiteInvalidDataException('name', $this->l10n->t('The name of the website must be longer.'));
@@ -261,7 +261,7 @@ public function assertValidName()
 	/**
 	 * @throws WebsiteInvalidDataException
 	 */
-	public function assertValidSite()
+	public function assertValidSite(): void
 	{
 		if (strlen($this->getSite()) < self::SITE_LENGTH_MIN) {
 			$error = $this->l10n->t('The identifier of the website must be longer.');
@@ -280,7 +280,7 @@ public function assertValidSite()
 	/**
 	 * @throws WebsiteInvalidDataException
 	 */
-	public function assertValidPath()
+	public function assertValidPath(): void
 	{
 		try {
 			$path = $this->miscService->normalizePath($this->getPath());
@@ -316,12 +316,7 @@ public function assertValidPath()
 					);
 				}
 			}
-		} catch (InvalidPathException $e) {
-			throw new WebsiteInvalidDataException(
-				'path',
-				$this->l10n->t('Parent folder of the website\'s path not found.')
-			);
-		} catch (NotFoundException $e) {
+		} catch (InvalidPathException | NotFoundException $e) {
 			throw new WebsiteInvalidDataException(
 				'path',
 				$this->l10n->t('Parent folder of the website\'s path not found.')
@@ -333,7 +328,7 @@ public function assertValidPath()
 	 * @throws ThemeNotFoundException
 	 * @throws ThemeNotCompatibleException
 	 */
-	public function assertValidTheme()
+	public function assertValidTheme(): void
 	{
 		$this->themesService->assertValidTheme($this->getTheme());
 	}
@@ -342,7 +337,7 @@ public function assertValidTheme()
 	 * @throws TemplateNotFoundException
 	 * @throws TemplateNotCompatibleException
 	 */
-	public function assertValidTemplate()
+	public function assertValidTemplate(): void
 	{
 		$this->templatesService->assertValidTemplate($this->getTemplateSource());
 	}
@@ -352,7 +347,7 @@ public function assertValidTemplate()
 	 *
 	 * @throws WebsiteForeignOwnerException
 	 */
-	public function assertOwnedBy($userId)
+	public function assertOwnedBy(string $userId): void
 	{
 		if ($this->getUserId() !== $userId) {
 			throw new WebsiteForeignOwnerException();
@@ -384,9 +379,7 @@ public function getWebsiteFolder(): StorageFolder
 
 				$websiteFolder = $userFolder->getFolder($this->getPath());
 				$this->folder = $websiteFolder->fakeRoot();
-			} catch (InvalidPathException $e) {
-				throw new WebsiteInvalidFilesystemException($e);
-			} catch (NotFoundException $e) {
+			} catch (InvalidPathException | NotFoundException $e) {
 				throw new WebsiteInvalidFilesystemException($e);
 			}
 		}
@@ -402,9 +395,7 @@ public function getWebsitePath(): string
 	{
 		try {
 			return $this->getWebsiteFolder()->getLocalPath() . '/';
-		} catch (InvalidPathException $e) {
-			throw new WebsiteInvalidFilesystemException($e);
-		} catch (NotFoundException $e) {
+		} catch (InvalidPathException | NotFoundException $e) {
 			throw new WebsiteInvalidFilesystemException($e);
 		}
 	}
diff --git a/lib/Model/WebsiteCore.php b/lib/Model/WebsiteCore.php
index f3f6f555..74690244 100644
--- a/lib/Model/WebsiteCore.php
+++ b/lib/Model/WebsiteCore.php
@@ -28,10 +28,10 @@
 class WebsiteCore implements \JsonSerializable
 {
 	/** @var int */
-	const TYPE_PUBLIC = 1;
+	public const TYPE_PUBLIC = 1;
 
 	/** @var int */
-	const TYPE_PRIVATE = 2;
+	public const TYPE_PRIVATE = 2;
 
 	/** @var int */
 	private $id;
@@ -206,7 +206,7 @@ public function getType(): int
 
 	/**
 	 * @param string $key
-	 * @param mixed $value
+	 * @param mixed  $value
 	 *
 	 * @return $this
 	 */
@@ -226,13 +226,13 @@ public function setOption(string $key, $value): self
 	 *
 	 * @return mixed
 	 */
-	public function getOption($key)
+	public function getOption(string $key)
 	{
 		return $this->options[$key] ?? null;
 	}
 
 	/**
-	 * @param array|string $options
+	 * @param array|string|null $options
 	 *
 	 * @return $this
 	 */
@@ -403,7 +403,7 @@ public function jsonSerialize(): array
 	 *
 	 * @throws \UnexpectedValueException
 	 */
-	public function fromArray(array $data)
+	public function fromArray(array $data): void
 	{
 		if (!isset($data['user_id']) || !isset($data['name']) || !isset($data['site']) || !isset($data['path'])) {
 			throw new \UnexpectedValueException();
@@ -439,7 +439,7 @@ public function fromArray(array $data)
 	 *
 	 * @throws \UnexpectedValueException
 	 */
-	public function fromJSON(string $json)
+	public function fromJSON(string $json): void
 	{
 		$this->fromArray(json_decode($json, true));
 	}
diff --git a/lib/Pico.php b/lib/Pico.php
index a168194e..20ce0ed7 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -46,28 +46,28 @@ class Pico extends \Pico
 	 *
 	 * @var int
 	 */
-	const API_VERSION_0 = 0;
+	public const API_VERSION_0 = 0;
 
 	/**
 	 * API version 1, used by Pico 1.0
 	 *
 	 * @var int
 	 */
-	const API_VERSION_1 = 1;
+	public const API_VERSION_1 = 1;
 
 	/**
 	 * API version 2, used by Pico 2.0
 	 *
 	 * @var int
 	 */
-	const API_VERSION_2 = 2;
+	public const API_VERSION_2 = 2;
 
 	/**
 	 * API version 3, used by Pico 2.1
 	 *
 	 * @var int
 	 */
-	const API_VERSION_3 = 3;
+	public const API_VERSION_3 = 3;
 
 	/** @var PicoService */
 	private $picoService;
@@ -156,7 +156,7 @@ public function loadFileContent($absolutePath)
 		/** @var FolderInterface $folder */
 		/** @var string $basePath */
 		/** @var string $relativePath */
-		list($folder, $basePath, $relativePath) = $this->picoService->getRelativePath($this->website, $absolutePath);
+		[ $folder, $basePath, $relativePath ] = $this->picoService->getRelativePath($this->website, $absolutePath);
 
 		$file = $folder->getFile($relativePath);
 		return $file->getContent();
@@ -184,7 +184,7 @@ public function parseFileMeta($rawContent, array $headers)
 	 *
 	 * @return array
 	 */
-	protected function purifyFileMeta(array $meta)
+	protected function purifyFileMeta(array $meta): array
 	{
 		$newMeta = [];
 		foreach ($meta as $key => $value) {
@@ -219,7 +219,7 @@ public function parseFileContent($markdown, $singleLine = false)
 	 *
 	 * @return string
 	 */
-	protected function purifyFileContent(string $content)
+	protected function purifyFileContent(string $content): string
 	{
 		return $this->getHtmlPurifier()->purify($content);
 	}
@@ -229,7 +229,7 @@ protected function purifyFileContent(string $content)
 	 *
 	 * @return HTMLPurifier
 	 */
-	public function getHtmlPurifier()
+	public function getHtmlPurifier(): HTMLPurifier
 	{
 		if ($this->htmlPurifier === null) {
 			$htmlPurifierConfig = HTMLPurifier_HTML5Config::createDefault();
@@ -257,7 +257,7 @@ public function getFiles($absolutePath, $fileExtension = '', $order = \Pico::SOR
 		/** @var FolderInterface $folder */
 		/** @var string $basePath */
 		/** @var string $relativePath */
-		list($folder, $basePath, $relativePath) = $this->picoService->getRelativePath($this->website, $absolutePath);
+		[ $folder, $basePath, $relativePath ] = $this->picoService->getRelativePath($this->website, $absolutePath);
 
 		if ($folder->isLocal()) {
 			return parent::getFiles($absolutePath, $fileExtension, $order);
@@ -309,7 +309,7 @@ public function getFilesGlob($absolutePathPattern, $order = \Pico::SORT_ASC)
 		/** @var FolderInterface $folder */
 		/** @var string $basePath */
 		/** @var string $pattern */
-		list($folder, $basePath, $pattern) = $this->picoService->getRelativePath($this->website, $absolutePathPattern);
+		[ $folder, $basePath, $pattern ] = $this->picoService->getRelativePath($this->website, $absolutePathPattern);
 
 		if ($folder->isLocal()) {
 			return parent::getFilesGlob($absolutePathPattern, $order);
diff --git a/lib/Service/AssetsService.php b/lib/Service/AssetsService.php
index ae222e20..4f41eeb7 100644
--- a/lib/Service/AssetsService.php
+++ b/lib/Service/AssetsService.php
@@ -91,9 +91,7 @@ public function getAssetsFolder(Website $website): StorageFolder
 	{
 		try {
 			return $website->getWebsiteFolder()->getFolder(PicoService::DIR_ASSETS)->fakeRoot();
-		} catch (InvalidPathException $e) {
-			throw new WebsiteInvalidFilesystemException($e);
-		} catch (NotFoundException $e) {
+		} catch (InvalidPathException | NotFoundException $e) {
 			throw new WebsiteInvalidFilesystemException($e);
 		}
 	}
@@ -108,9 +106,7 @@ public function getAssetsPath(Website $website): string
 	{
 		try {
 			return $this->getAssetsFolder($website)->getLocalPath() . '/';
-		} catch (InvalidPathException $e) {
-			throw new WebsiteInvalidFilesystemException($e);
-		} catch (NotFoundException $e) {
+		} catch (InvalidPathException | NotFoundException $e) {
 			throw new WebsiteInvalidFilesystemException($e);
 		}
 	}
diff --git a/lib/Service/ConfigService.php b/lib/Service/ConfigService.php
index a8684fa4..bf8c453f 100644
--- a/lib/Service/ConfigService.php
+++ b/lib/Service/ConfigService.php
@@ -31,34 +31,34 @@
 class ConfigService
 {
 	/** @var string */
-	const SYSTEM_TEMPLATES = 'system_templates';
+	public const SYSTEM_TEMPLATES = 'system_templates';
 
 	/** @var string */
-	const CUSTOM_TEMPLATES = 'custom_templates';
+	public const CUSTOM_TEMPLATES = 'custom_templates';
 
 	/** @var string */
-	const SYSTEM_THEMES = 'system_themes';
+	public const SYSTEM_THEMES = 'system_themes';
 
 	/** @var string */
-	const CUSTOM_THEMES = 'custom_themes';
+	public const CUSTOM_THEMES = 'custom_themes';
 
 	/** @var string */
-	const THEMES_ETAG = 'themes_etag';
+	public const THEMES_ETAG = 'themes_etag';
 
 	/** @var string */
-	const SYSTEM_PLUGINS = 'system_plugins';
+	public const SYSTEM_PLUGINS = 'system_plugins';
 
 	/** @var string */
-	const CUSTOM_PLUGINS = 'custom_plugins';
+	public const CUSTOM_PLUGINS = 'custom_plugins';
 
 	/** @var string */
-	const PLUGINS_ETAG = 'plugins_etag';
+	public const PLUGINS_ETAG = 'plugins_etag';
 
 	/** @var string */
-	const LIMIT_GROUPS = 'limit_groups';
+	public const LIMIT_GROUPS = 'limit_groups';
 
 	/** @var string */
-	const LINK_MODE = 'link_mode';
+	public const LINK_MODE = 'link_mode';
 
 	/** @var array<string,mixed> */
 	private $defaults = [
@@ -77,16 +77,16 @@ class ConfigService
 	/** @var IConfig */
 	private $config;
 
-	/** @var string */
+	/** @var string|null */
 	private $userId;
 
 	/**
 	 * ConfigService constructor.
 	 *
 	 * @param IConfig     $config
-	 * @param string      $userId
+	 * @param string|null $userId
 	 */
-	public function __construct(IConfig $config, $userId)
+	public function __construct(IConfig $config, ?string $userId)
 	{
 		$this->config = $config;
 		$this->userId = $userId;
@@ -107,7 +107,7 @@ public function getAppValue(string $key)
 	 * @param string $key
 	 * @param mixed $value
 	 */
-	public function setAppValue(string $key, $value)
+	public function setAppValue(string $key, $value): void
 	{
 		$this->config->setAppValue(Application::APP_NAME, $key, $value);
 	}
@@ -115,7 +115,7 @@ public function setAppValue(string $key, $value)
 	/**
 	 * @param string $key
 	 */
-	public function deleteAppValue(string $key)
+	public function deleteAppValue(string $key): void
 	{
 		$this->config->deleteAppValue(Application::APP_NAME, $key);
 	}
@@ -137,7 +137,7 @@ public function getUserValue(string $key, string $userId = null)
 	 * @param mixed       $value
 	 * @param string|null $userId
 	 */
-	public function setUserValue(string $key, $value, string $userId = null)
+	public function setUserValue(string $key, $value, string $userId = null): void
 	{
 		$this->config->setUserValue($userId ?? $this->userId, Application::APP_NAME, $key, $value);
 	}
@@ -146,7 +146,7 @@ public function setUserValue(string $key, $value, string $userId = null)
 	 * @param string      $key
 	 * @param string|null $userId
 	 */
-	public function deleteUserValue(string $key, string $userId = null)
+	public function deleteUserValue(string $key, string $userId = null): void
 	{
 		$this->config->deleteUserValue($userId ?? $this->userId, Application::APP_NAME, $key);
 	}
diff --git a/lib/Service/FileService.php b/lib/Service/FileService.php
index 812ca94c..88ff40df 100644
--- a/lib/Service/FileService.php
+++ b/lib/Service/FileService.php
@@ -37,10 +37,10 @@
 class FileService
 {
 	/** @var string */
-	const APPDATA_PUBLIC = 'appdata_public';
+	private const APPDATA_PUBLIC = 'appdata_public';
 
 	/** @var string */
-	const APPDATA_SYSTEM = 'appdata';
+	private const APPDATA_SYSTEM = 'appdata';
 
 	/** @var IRootFolder */
 	private $rootFolder;
@@ -177,7 +177,7 @@ public function getAppDataFolderPath(string $folderName = null): string
 	/**
 	 * @return void
 	 */
-	public function syncAppDataFolder()
+	public function syncAppDataFolder(): void
 	{
 		$baseFolderName = 'appdata_' . $this->configService->getSystemValue('instanceid');
 		$appDataFolderName = Application::APP_NAME;
diff --git a/lib/Service/MiscService.php b/lib/Service/MiscService.php
index c6cd1bc6..20d14fc0 100644
--- a/lib/Service/MiscService.php
+++ b/lib/Service/MiscService.php
@@ -205,27 +205,10 @@ public function getRandom(int $length = 10, string $prefix = '', string $suffix
 		return ($prefix ? $prefix . '.' : '') . $random . ($suffix ? '.' . $suffix : '');
 	}
 
-	/**
-	 * @param \Exception $e
-	 * @param string     ...$classNames
-	 *
-	 * @throws \Exception
-	 */
-	public function consumeException(\Exception $e, string ...$classNames)
-	{
-		foreach ($classNames as $className) {
-			if (is_a($e, $className)) {
-				return;
-			}
-		}
-
-		throw $e;
-	}
-
 	/**
 	 * @throws ComposerException
 	 */
-	public function checkComposer()
+	public function checkComposer(): void
 	{
 		$appPath = Application::getAppPath();
 		if (!is_file($appPath . '/vendor/autoload.php')) {
@@ -247,7 +230,7 @@ public function checkComposer()
 	/**
 	 * @throws FilesystemNotWritableException
 	 */
-	public function checkPublicFolder()
+	public function checkPublicFolder(): void
 	{
 		$publicFolder = $this->fileService->getPublicFolder();
 
diff --git a/lib/Service/PicoService.php b/lib/Service/PicoService.php
index 378e0e0c..a9300d2d 100644
--- a/lib/Service/PicoService.php
+++ b/lib/Service/PicoService.php
@@ -46,25 +46,25 @@
 class PicoService
 {
 	/** @var string */
-	const DIR_TEMPLATES = 'templates';
+	public const DIR_TEMPLATES = 'templates';
 
 	/** @var string */
-	const DIR_CONFIG = 'config';
+	public const DIR_CONFIG = 'config';
 
 	/** @var string */
-	const DIR_PLUGINS = 'plugins';
+	public const DIR_PLUGINS = 'plugins';
 
 	/** @var string */
-	const DIR_THEMES = 'themes';
+	public const DIR_THEMES = 'themes';
 
 	/** @var string */
-	const DIR_CONTENT = 'content';
+	public const DIR_CONTENT = 'content';
 
 	/** @var string */
-	const DIR_ASSETS = 'assets';
+	public const DIR_ASSETS = 'assets';
 
 	/** @var string */
-	const CONTENT_EXT = '.md';
+	public const CONTENT_EXT = '.md';
 
 	/** @var ILogger */
 	private $logger;
@@ -147,11 +147,7 @@ public function getPage(Website $website): PicoPage
 				$output = $pico->run();
 			} catch (WebsiteInvalidFilesystemException $e) {
 				throw $e;
-			} catch (InvalidPathException $e) {
-				throw $e;
-			} catch (NotFoundException $e) {
-				throw $e;
-			} catch (NotPermittedException $e) {
+			} catch (InvalidPathException | NotFoundException | NotPermittedException $e) {
 				throw $e;
 			} catch (\Exception $e) {
 				$exception = new PicoRuntimeException($e);
@@ -181,7 +177,7 @@ public function getPage(Website $website): PicoPage
 	 *
 	 * @throws WebsiteInvalidFilesystemException
 	 */
-	private function setupPico(Website $website, Pico $pico, string $page)
+	private function setupPico(Website $website, Pico $pico, string $page): void
 	{
 		$pico->setRequestUrl($page);
 		$pico->setNextcloudWebsite($website);
@@ -208,7 +204,7 @@ private function setupPico(Website $website, Pico $pico, string $page)
 	/**
 	 * @param Pico $pico
 	 */
-	private function loadPicoPlugins(Pico $pico)
+	private function loadPicoPlugins(Pico $pico): void
 	{
 		$includeClosure = static function (string $pluginFile) {
 			/** @noinspection PhpIncludeInspection */
@@ -282,9 +278,7 @@ public function getContentFolder(Website $website): StorageFolder
 			/** @var StorageFolder $websiteFolder */
 			$websiteFolder = $website->getWebsiteFolder()->getFolder(PicoService::DIR_CONTENT)->fakeRoot();
 			return $websiteFolder;
-		} catch (InvalidPathException $e) {
-			throw new WebsiteInvalidFilesystemException($e);
-		} catch (NotFoundException $e) {
+		} catch (InvalidPathException | NotFoundException $e) {
 			throw new WebsiteInvalidFilesystemException($e);
 		}
 	}
@@ -299,9 +293,7 @@ public function getContentPath(Website $website): string
 	{
 		try {
 			return $this->getContentFolder($website)->getLocalPath() . '/';
-		} catch (InvalidPathException $e) {
-			throw new WebsiteInvalidFilesystemException($e);
-		} catch (NotFoundException $e) {
+		} catch (InvalidPathException | NotFoundException $e) {
 			throw new WebsiteInvalidFilesystemException($e);
 		}
 	}
diff --git a/lib/Service/PluginsService.php b/lib/Service/PluginsService.php
index 8240fc79..cf8dda5f 100644
--- a/lib/Service/PluginsService.php
+++ b/lib/Service/PluginsService.php
@@ -201,7 +201,7 @@ private function publishPlugin(FolderInterface $pluginSourceFolder, int $pluginT
 	 *
 	 * @throws PluginNotFoundException
 	 */
-	public function depublishCustomPlugin(string $pluginName)
+	public function depublishCustomPlugin(string $pluginName): void
 	{
 		if (!$pluginName) {
 			throw new PluginNotFoundException();
diff --git a/lib/Service/TemplatesService.php b/lib/Service/TemplatesService.php
index 3353ea45..533f3dab 100644
--- a/lib/Service/TemplatesService.php
+++ b/lib/Service/TemplatesService.php
@@ -63,7 +63,7 @@ public function __construct(ConfigService $configService, FileService $fileServi
 	 * @throws TemplateNotFoundException
 	 * @throws TemplateNotCompatibleException
 	 */
-	public function assertValidTemplate(string $templateName)
+	public function assertValidTemplate(string $templateName): void
 	{
 		$templates = $this->getTemplates();
 
@@ -134,7 +134,7 @@ public function getNewCustomTemplates(): array
 	 * @throws TemplateNotFoundException
 	 * @throws TemplateAlreadyExistsException
 	 */
-	public function registerSystemTemplate(string $templateName)
+	public function registerSystemTemplate(string $templateName): Template
 	{
 		if (!$templateName) {
 			throw new TemplateNotFoundException();
@@ -163,7 +163,7 @@ public function registerSystemTemplate(string $templateName)
 	 * @throws TemplateNotFoundException
 	 * @throws TemplateAlreadyExistsException
 	 */
-	public function registerCustomTemplate(string $templateName)
+	public function registerCustomTemplate(string $templateName): Template
 	{
 		if (!$templateName) {
 			throw new TemplateNotFoundException();
@@ -195,7 +195,7 @@ public function registerCustomTemplate(string $templateName)
 	 *
 	 * @throws TemplateNotFoundException
 	 */
-	public function removeCustomTemplate(string $templateName)
+	public function removeCustomTemplate(string $templateName): void
 	{
 		if (!$templateName) {
 			throw new TemplateNotFoundException();
@@ -214,7 +214,7 @@ public function removeCustomTemplate(string $templateName)
 	 * @throws TemplateNotFoundException
 	 * @throws TemplateAlreadyExistsException
 	 */
-	public function copyTemplate(string $baseTemplateName, string $templateName)
+	public function copyTemplate(string $baseTemplateName, string $templateName): Template
 	{
 		if (!$baseTemplateName || !$templateName) {
 			throw new TemplateNotFoundException();
@@ -244,7 +244,7 @@ public function copyTemplate(string $baseTemplateName, string $templateName)
 	 *
 	 * @throws TemplateNotFoundException
 	 */
-	public function installTemplate(Website $website)
+	public function installTemplate(Website $website): void
 	{
 		$userFolder = new StorageFolder(\OC::$server->getUserFolder($website->getUserId()));
 
diff --git a/lib/Service/ThemesService.php b/lib/Service/ThemesService.php
index 25c0783b..5af42659 100644
--- a/lib/Service/ThemesService.php
+++ b/lib/Service/ThemesService.php
@@ -69,7 +69,7 @@ public function __construct(ConfigService $configService, FileService $fileServi
 	 * @throws ThemeNotFoundException
 	 * @throws ThemeNotCompatibleException
 	 */
-	public function assertValidTheme(string $themeName)
+	public function assertValidTheme(string $themeName): void
 	{
 		$themes = $this->getThemes();
 
@@ -227,7 +227,7 @@ private function publishTheme(FolderInterface $themeSourceFolder, int $themeType
 	 *
 	 * @throws ThemeNotFoundException
 	 */
-	public function depublishCustomTheme(string $themeName)
+	public function depublishCustomTheme(string $themeName): void
 	{
 		if (!$themeName) {
 			throw new ThemeNotFoundException();
@@ -254,7 +254,7 @@ public function depublishCustomTheme(string $themeName)
 	 * @throws ThemeNotFoundException
 	 * @throws ThemeAlreadyExistsException
 	 */
-	public function copyTheme(string $baseThemeName, string $themeName)
+	public function copyTheme(string $baseThemeName, string $themeName): Theme
 	{
 		if (!$baseThemeName || !$themeName) {
 			throw new ThemeNotFoundException();
diff --git a/lib/Service/WebsitesService.php b/lib/Service/WebsitesService.php
index 4c8a19f7..3a6258cc 100644
--- a/lib/Service/WebsitesService.php
+++ b/lib/Service/WebsitesService.php
@@ -53,10 +53,10 @@
 class WebsitesService
 {
 	/** @var int */
-	const LINK_MODE_LONG = 1;
+	public const LINK_MODE_LONG = 1;
 
 	/** @var int */
-	const LINK_MODE_SHORT = 2;
+	public const LINK_MODE_SHORT = 2;
 
 	/** @var WebsitesRequest */
 	private $websiteRequest;
@@ -123,7 +123,7 @@ public function __construct(
 	 * @throws TemplateNotFoundException
 	 * @throws TemplateNotCompatibleException
 	 */
-	public function createWebsite(Website $website)
+	public function createWebsite(Website $website): void
 	{
 		$website->assertValidOwner();
 		$website->assertValidName();
@@ -158,7 +158,7 @@ public function createWebsite(Website $website)
 	 * @throws TemplateNotFoundException
 	 * @throws TemplateNotCompatibleException
 	 */
-	public function updateWebsite(Website $website)
+	public function updateWebsite(Website $website): void
 	{
 		$originalWebsite = $this->websiteRequest->getWebsiteFromId($website->getId());
 
@@ -193,7 +193,7 @@ public function updateWebsite(Website $website)
 	 *
 	 * @throws WebsiteNotFoundException
 	 */
-	public function deleteWebsite(Website $website)
+	public function deleteWebsite(Website $website): void
 	{
 		// check whether website actually exists
 		$this->websiteRequest->getWebsiteFromId($website->getId());
@@ -204,7 +204,7 @@ public function deleteWebsite(Website $website)
 	/**
 	 * @param string $userId
 	 */
-	public function onUserRemoved($userId)
+	public function onUserRemoved(string $userId): void
 	{
 		$this->websiteRequest->deleteAllFromUser($userId);
 	}
@@ -260,7 +260,7 @@ public function getWebsitesFromUser(string $userId): array
 	 * @throws ThemeNotCompatibleException
 	 * @throws PicoRuntimeException
 	 */
-	public function getPage(string $site, string $page, string $viewer = null, bool $proxyRequest = false): PicoPage
+	public function getPage(string $site, string $page, ?string $viewer, bool $proxyRequest = false): PicoPage
 	{
 		try {
 			$page = $this->miscService->normalizePath($page);
@@ -297,7 +297,7 @@ public function getPage(string $site, string $page, string $viewer = null, bool
 	 * @throws AssetNotFoundException
 	 * @throws AssetNotPermittedException
 	 */
-	public function getAsset(string $site, string $asset, string $viewer = null): PicoAsset
+	public function getAsset(string $site, string $asset, ?string $viewer): PicoAsset
 	{
 		try {
 			$asset = $this->miscService->normalizePath($asset);
@@ -326,7 +326,7 @@ public function getAsset(string $site, string $asset, string $viewer = null): Pi
 	 *
 	 * @throws \UnexpectedValueException
 	 */
-	public function setLimitGroups(array $limitGroups)
+	public function setLimitGroups(array $limitGroups): void
 	{
 		foreach ($limitGroups as $group) {
 			if (!$this->groupManager->groupExists($group)) {
@@ -351,7 +351,7 @@ public function getLimitGroups(): array
 	 *
 	 * @return bool
 	 */
-	public function isUserAllowed(string $userId = null)
+	public function isUserAllowed(?string $userId): bool
 	{
 		if (!$userId) {
 			return false;
@@ -376,7 +376,7 @@ public function isUserAllowed(string $userId = null)
 	 *
 	 * @throws \UnexpectedValueException
 	 */
-	public function setLinkMode(int $linkMode)
+	public function setLinkMode(int $linkMode): void
 	{
 		if (($linkMode !== self::LINK_MODE_LONG) && ($linkMode !== self::LINK_MODE_SHORT)) {
 			throw new \UnexpectedValueException();
diff --git a/lib/Settings/Personal.php b/lib/Settings/Personal.php
index 815d32e3..48077f75 100644
--- a/lib/Settings/Personal.php
+++ b/lib/Settings/Personal.php
@@ -61,7 +61,7 @@ class Personal implements ISettings
 	 * @param TemplatesService $templatesService
 	 */
 	public function __construct(
-		$userId,
+		?string $userId,
 		IURLGenerator $urlGenerator,
 		WebsitesService $websitesService,
 		ThemesService $themesService,

From 80941b740d9b8dbf1f121bb57e7ec430d6bcd365 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Fri, 17 Jan 2020 16:39:43 +0100
Subject: [PATCH 03/29] Split WebsiteCore::getOptions() to
 WebsiteCore::getOptionsJSON()

Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>
---
 lib/Db/WebsitesRequest.php |  4 ++--
 lib/Model/WebsiteCore.php  | 18 ++++++++++--------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/lib/Db/WebsitesRequest.php b/lib/Db/WebsitesRequest.php
index 5803dbc2..5687846c 100644
--- a/lib/Db/WebsitesRequest.php
+++ b/lib/Db/WebsitesRequest.php
@@ -42,7 +42,7 @@ public function create(Website $website): void
 			->setValue('site', $qb->createNamedParameter($website->getSite()))
 			->setValue('theme', $qb->createNamedParameter($website->getTheme()))
 			->setValue('type', $qb->createNamedParameter($website->getType()))
-			->setValue('options', $qb->createNamedParameter($website->getOptions(true)))
+			->setValue('options', $qb->createNamedParameter($website->getOptionsJSON()))
 			->setValue('path', $qb->createNamedParameter($website->getPath()));
 
 		$qb->execute();
@@ -60,7 +60,7 @@ public function update(Website $website): void
 			->set('site', $qb->createNamedParameter($website->getSite()))
 			->set('theme', $qb->createNamedParameter($website->getTheme()))
 			->set('type', $qb->createNamedParameter($website->getType()))
-			->set('options', $qb->createNamedParameter($website->getOptions(true)))
+			->set('options', $qb->createNamedParameter($website->getOptionsJSON()))
 			->set('path', $qb->createNamedParameter($website->getPath()));
 
 		$this->limitToId($qb, $website->getId());
diff --git a/lib/Model/WebsiteCore.php b/lib/Model/WebsiteCore.php
index 74690244..abaafc36 100644
--- a/lib/Model/WebsiteCore.php
+++ b/lib/Model/WebsiteCore.php
@@ -251,19 +251,21 @@ public function setOptions($options): self
 	}
 
 	/**
-	 * @param bool $json
-	 *
-	 * @return array|string
+	 * @return array
 	 */
-	public function getOptions(bool $json = false)
+	public function getOptions(): array
 	{
-		if ($json === true) {
-			return json_encode($this->options);
-		}
-
 		return $this->options;
 	}
 
+	/**
+	 * @return string
+	 */
+	public function getOptionsJSON(): string
+	{
+		return json_encode($this->options);
+	}
+
 	/**
 	 * @param string $path
 	 *

From 0932f9f552c6b37ba1dd5504639247f70bc42f36 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 11 Apr 2020 16:01:33 +0200
Subject: [PATCH 04/29] Add DummyPlugin example plugin

Adding Pico's DummyPlugin as example plugin hopefully encourages users to develop their own plugins :smiley:

Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>
---
 Makefile                             |   2 +
 appdata/plugins/.gitignore           |   1 +
 appinfo/routes.php                   |   1 +
 js/admin.js                          |  56 ++++++++-
 lib/Controller/PluginsController.php |  20 +++
 lib/Model/DummyPluginFile.php        | 175 +++++++++++++++++++++++++++
 lib/Service/PluginsService.php       |  45 +++++++
 templates/settings.admin.php         |  45 +++++++
 8 files changed, 342 insertions(+), 3 deletions(-)
 create mode 100644 lib/Model/DummyPluginFile.php

diff --git a/Makefile b/Makefile
index a24d972c..2db2c2a7 100644
--- a/Makefile
+++ b/Makefile
@@ -111,6 +111,8 @@ build: lazy-check clean-build composer
 		--exclude="/*.phar" \
 		--exclude=".git" \
 		./ "$(build_dir)/$(app_name)/"
+	cp "./vendor/picocms/pico/plugins/DummyPlugin.php" \
+		"$(build_dir)/$(app_name)/appdata/plugins/DummyPlugin.php"
 	tar cfz "$(build_dir)/$(archive)" \
 		-C "$(build_dir)" "$(app_name)"
 
diff --git a/appdata/plugins/.gitignore b/appdata/plugins/.gitignore
index a9f7294d..614615f2 100644
--- a/appdata/plugins/.gitignore
+++ b/appdata/plugins/.gitignore
@@ -1,2 +1,3 @@
 # You should add plugins installed by Composer here
 /PicoDeprecated
+/DummyPlugin.php
diff --git a/appinfo/routes.php b/appinfo/routes.php
index b4c8546f..2e0d4df7 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -87,6 +87,7 @@
 		[ 'name' => 'Plugins#addCustomPlugin', 'url' => '/admin/plugins', 'verb' => 'POST' ],
 		[ 'name' => 'Plugins#updateCustomPlugin', 'url' => '/admin/plugins/{item}', 'verb' => 'POST' ],
 		[ 'name' => 'Plugins#removeCustomPlugin', 'url' => '/admin/plugins/{item}', 'verb' => 'DELETE' ],
+		[ 'name' => 'Plugins#copyDummyPlugin', 'url' => '/admin/plugins/DummyPlugin', 'verb' => 'CLONE' ],
 
 		[ 'name' => 'Settings#setLimitGroups', 'url' => '/admin/limit_groups', 'verb' => 'POST' ],
 		[ 'name' => 'Settings#setLinkMode', 'url' => '/admin/link_mode', 'verb' => 'POST' ],
diff --git a/js/admin.js b/js/admin.js
index ef71a40e..62d3153b 100644
--- a/js/admin.js
+++ b/js/admin.js
@@ -50,6 +50,9 @@
 	 * @lends OCA.CMSPico.AdminList.prototype
 	 */
 	OCA.CMSPico.AdminList.prototype = $.extend({}, OCA.CMSPico.List.prototype, {
+		/** @member {Object[]|string[]} */
+		staticItems: [],
+
 		/** @member {Object[]|string[]} */
 		systemItems: [],
 
@@ -59,6 +62,9 @@
 		/** @member {Object[]|string[]} */
 		newItems: [],
 
+		/** @member {jQuery} */
+		$staticTemplate: $(),
+
 		/** @member {jQuery} */
 		$systemTemplate: $(),
 
@@ -78,6 +84,7 @@
 		 * @param {Object}        [options]
 		 * @param {string}        [options.route]
 		 * @param {jQuery|string} [options.template]
+		 * @param {jQuery|string} [options.staticTemplate]
 		 * @param {jQuery|string} [options.systemTemplate]
 		 * @param {jQuery|string} [options.customTemplate]
 		 * @param {jQuery|string} [options.newTemplate]
@@ -89,12 +96,14 @@
 			OCA.CMSPico.List.prototype.initialize.apply(this, arguments);
 
 			options = $.extend({
+				staticTemplate: $element.data('staticTemplate'),
 				systemTemplate: $element.data('systemTemplate'),
 				customTemplate: $element.data('customTemplate'),
 				newTemplate: $element.data('newTemplate'),
 				copyTemplate: $element.data('copyTemplate')
 			}, options);
 
+			this.$staticTemplate = $(options.staticTemplate);
 			this.$systemTemplate = $(options.systemTemplate);
 			this.$customTemplate = $(options.customTemplate);
 			this.$newTemplate = $(options.newTemplate);
@@ -103,6 +112,42 @@
 			var signature = 'OCA.CMSPico.AdminList.initialize()';
 			if (!this.$systemTemplate.length) throw signature + ': No valid system item template given';
 			if (!this.$customTemplate.length) throw signature + ': No valid custom item template given';
+
+			this._initStaticItems();
+		},
+
+		/**
+		 * @protected
+		 */
+		_initStaticItems: function () {
+			var $content = this.$staticTemplate.octemplate() || $(),
+				filter = this.$staticTemplate.data('filter') || '*',
+				that = this;
+
+			this.staticItems = [];
+			$content.filter(filter).each(function () {
+				var $itemTemplate = $(this),
+					itemData = {};
+
+				if (that.$staticTemplate.data('replaces')) {
+					$itemTemplate.data('replaces', that.$staticTemplate.data('replaces'));
+				}
+				if (that.$staticTemplate.data('appendTo')) {
+					$itemTemplate.data('appendTo', that.$staticTemplate.data('appendTo'));
+				}
+
+				$.each($itemTemplate.data(), function (key, value) {
+					if (key.substr(0, 4) === 'item') {
+						key = key[4].toLowerCase() + key.substr(5);
+						itemData[key] = value;
+					}
+				});
+
+				that.staticItems.push({
+					'$itemTemplate': $itemTemplate,
+					'itemData': itemData
+				});
+			});
 		},
 
 		/**
@@ -122,19 +167,24 @@
 
 			this._content(this.$template);
 
-			$.each(data.systemItems, function (_, value) {
+			$.each(this.staticItems, function (_, data) {
+				var $item = that._content(data.$itemTemplate, data.itemData);
+				that._setupItem($item, data.itemData);
+			});
+
+			$.each(this.systemItems, function (_, value) {
 				var itemData = (typeof value === 'object') ? value : { name: value },
 					$item = that._content(that.$systemTemplate, itemData);
 				that._setupItem($item, itemData);
 			});
 
-			$.each(data.customItems, function (_, value) {
+			$.each(this.customItems, function (_, value) {
 				var itemData = (typeof value === 'object') ? value : { name: value },
 					$item = that._content(that.$customTemplate, itemData);
 				that._setupItem($item, itemData);
 			});
 
-			$.each(data.newItems, function (_, value) {
+			$.each(this.newItems, function (_, value) {
 				var itemData = (typeof value === 'object') ? value : { name: value },
 					$item = that._content(that.$newTemplate, itemData);
 				that._setupItem($item, itemData);
diff --git a/lib/Controller/PluginsController.php b/lib/Controller/PluginsController.php
index b50db6d8..a6e0ec20 100644
--- a/lib/Controller/PluginsController.php
+++ b/lib/Controller/PluginsController.php
@@ -133,4 +133,24 @@ public function removeCustomPlugin(string $item): DataResponse
 			return $this->createErrorResponse($e);
 		}
 	}
+
+	/**
+	 * @param string $name
+	 *
+	 * @return DataResponse
+	 */
+	public function copyDummyPlugin(string $name): DataResponse
+	{
+		try {
+			$this->pluginsService->copyDummyPlugin($name);
+
+			return $this->getPlugins();
+		} catch (PluginNotFoundException $e) {
+			return $this->createErrorResponse($e, [ 'error' => $this->l10n->t('Plugin not found.') ]);
+		} catch (PluginAlreadyExistsException $e) {
+			return $this->createErrorResponse($e, [ 'error' => $this->l10n->t('Plugin exists already.') ]);
+		} catch (\Exception $e) {
+			return $this->createErrorResponse($e);
+		}
+	}
 }
diff --git a/lib/Model/DummyPluginFile.php b/lib/Model/DummyPluginFile.php
new file mode 100644
index 00000000..d9d9b22f
--- /dev/null
+++ b/lib/Model/DummyPluginFile.php
@@ -0,0 +1,175 @@
+<?php
+/**
+ * CMS Pico - Create websites using Pico CMS for Nextcloud.
+ *
+ * @copyright Copyright (c) 2020, Daniel Rudolf (<picocms.org@daniel-rudolf.de>)
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace OCA\CMSPico\Model;
+
+use OCA\CMSPico\Files\AbstractNode;
+use OCA\CMSPico\Files\FileInterface;
+use OCA\CMSPico\Files\FolderInterface;
+use OCA\CMSPico\Files\NodeInterface;
+use OCP\Constants;
+use OCP\Files\InvalidPathException;
+use OCP\Files\NotFoundException;
+use OCP\Files\NotPermittedException;
+
+class DummyPluginFile extends AbstractNode implements FileInterface
+{
+	/** @var string */
+	private $pluginName;
+
+	/** @var FileInterface */
+	private $file;
+
+	/**
+	 * DummyPluginFile constructor.
+	 *
+	 * @param string        $pluginName
+	 * @param FileInterface $file
+	 *
+	 * @throws InvalidPathException
+	 */
+	public function __construct(string $pluginName, FileInterface $file)
+	{
+		parent::__construct();
+
+		$this->file = $file;
+		$this->rename($pluginName . '.' . $this->getExtension());
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function rename(string $name): NodeInterface
+	{
+		$this->assertValidFileName($name);
+
+		$extension = '';
+		if (($extensionPos = strrpos($name, '.')) !== false) {
+			$extension = substr($name, $extensionPos + 1);
+			$name = substr($name, 0, $extensionPos);
+		}
+
+		if ($extension !== $this->getExtension()) {
+			throw new InvalidPathException();
+		}
+		if (!preg_match('/^[a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff]*$/', $name)) {
+			throw new InvalidPathException();
+		}
+
+		$this->pluginName = $name;
+		return $this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function delete()
+	{
+		// nothing to do
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getPath(): string
+	{
+		return '/' . $this->getName();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getLocalPath(): string
+	{
+		throw new NotFoundException();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getName(): string
+	{
+		return $this->pluginName . '.' . $this->getExtension();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getParent(): string
+	{
+		return '/';
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getParentNode(): FolderInterface
+	{
+		throw new InvalidPathException();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function isLocal(): bool
+	{
+		return false;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getPermissions(): int
+	{
+		return Constants::PERMISSION_READ | Constants::PERMISSION_DELETE;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getExtension(): string
+	{
+		return 'php';
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getContent(): string
+	{
+		return preg_replace(
+			'/^class DummyPlugin(?= |$)/m',
+			'class ' . $this->pluginName,
+			$this->file->getContent()
+		);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function putContent(string $data)
+	{
+		throw new NotPermittedException();
+	}
+}
diff --git a/lib/Service/PluginsService.php b/lib/Service/PluginsService.php
index cf8dda5f..5277683d 100644
--- a/lib/Service/PluginsService.php
+++ b/lib/Service/PluginsService.php
@@ -29,7 +29,10 @@
 use OCA\CMSPico\Exceptions\PluginNotFoundException;
 use OCA\CMSPico\Files\FolderInterface;
 use OCA\CMSPico\Files\LocalFolder;
+use OCA\CMSPico\Model\DummyPluginFile;
 use OCA\CMSPico\Model\Plugin;
+use OCP\Files\AlreadyExistsException;
+use OCP\Files\InvalidPathException;
 use OCP\Files\NotFoundException;
 
 class PluginsService
@@ -220,6 +223,48 @@ public function depublishCustomPlugin(string $pluginName): void
 		$this->configService->setAppValue(ConfigService::CUSTOM_PLUGINS, json_encode($customPlugins));
 	}
 
+	/**
+	 * @param string $pluginName
+	 *
+	 * @return Plugin
+	 * @throws PluginNotFoundException
+	 * @throws PluginAlreadyExistsException
+	 */
+	public function copyDummyPlugin(string $pluginName)
+	{
+		if (!$pluginName) {
+			throw new PluginNotFoundException();
+		}
+
+		$systemPlugins = $this->getSystemPlugins();
+		$customPlugins = $this->getCustomPlugins();
+
+		if (isset($systemPlugins[$pluginName]) || isset($customPlugins[$pluginName])) {
+			throw new PluginAlreadyExistsException();
+		}
+
+		$systemPluginsFolder = $this->fileService->getSystemFolder(PicoService::DIR_PLUGINS);
+		$appDataPluginsFolder = $this->fileService->getAppDataFolder(PicoService::DIR_PLUGINS);
+
+		try {
+			$basePluginFile = $systemPluginsFolder->getFile('DummyPlugin.php');
+		} catch (NotFoundException $e) {
+			throw new PluginNotFoundException();
+		}
+
+		try {
+			$pluginFile = new DummyPluginFile($pluginName, $basePluginFile);
+			$pluginFolder = $appDataPluginsFolder->newFolder($pluginName);
+			$pluginFile->copy($pluginFolder);
+		} catch (InvalidPathException $e) {
+			throw new PluginNotFoundException();
+		} catch (AlreadyExistsException $e) {
+			throw new PluginAlreadyExistsException();
+		}
+
+		return $this->publishCustomPlugin($pluginName);
+	}
+
 	/**
 	 * @param bool $renewETag
 	 * @param bool $forceRenewETag
diff --git a/templates/settings.admin.php b/templates/settings.admin.php
index afb7881e..d439906f 100644
--- a/templates/settings.admin.php
+++ b/templates/settings.admin.php
@@ -219,9 +219,11 @@
 	<section id="picocms-plugins" class="picocms-admin-list"
 			data-route="/apps/cms_pico/admin/plugins"
 			data-template="#picocms-plugins-template"
+			data-static-template="#picocms-plugins-template-static-items"
 			data-system-template="#picocms-plugins-template-system-item"
 			data-custom-template="#picocms-plugins-template-custom-item"
 			data-new-template="#picocms-plugins-template-new-item"
+			data-copy-template="#picocms-plugins-template-copy-item"
 			data-loading-template="#picocms-plugins-template-loading"
 			data-error-template="#picocms-plugins-template-error">
 		<div class="app-content-loading message large">
@@ -251,6 +253,27 @@
 		</div>
 	</script>
 
+	<script id="picocms-plugins-template-static-items" type="text/template"
+			data-append-to="#picocms-plugins > .app-content-list"
+			data-filter=".app-content-list-item-static">
+		<div class="app-content-list-item app-content-list-item-static"
+				data-item-name="DummyPlugin">
+			<div class="app-content-list-item-line-one">
+				<p>{name}</p>
+				<div class="info-compat message">
+					<div class="icon-checkmark has-tooltip" title="<?php p($l->t('Compatible plugin.')); ?>"></div>
+					<div>
+						<p class="note"><?php p($l->t('Example plugin')); ?></p>
+					</div>
+				</div>
+			</div>
+			<div class="action-copy icon-copy has-tooltip" data-placement="left"
+					title="<?php p($l->t('Copy example plugin')); ?>">
+				<span class="hidden-visually"><?php p($l->t('Copy example plugin')); ?></span>
+			</div>
+		</div>
+	</script>
+
 	<script id="picocms-plugins-template-system-item" type="text/template"
 			data-append-to="#picocms-plugins > .app-content-list">
 		<div class="app-content-list-item">
@@ -294,6 +317,28 @@
 		<option name="{name}">{name}</option>
 	</script>
 
+	<script id="picocms-plugins-template-copy-item" type="text/template">
+		<form id="{id}" title="{title}" class="form">
+			<fieldset>
+				<div class="label">
+					<label for="picocms-plugins-copy-base"><?php p($l->t('Base plugin')); ?></label>
+				</div>
+				<div class="content">
+					<span id="picocms-plugins-copy-base" class="input">{source}</span>
+				</div>
+			</fieldset>
+			<fieldset>
+				<div class="label">
+					<label for="picocms-plugins-copy-name"><?php p($l->t('Plugin name')); ?></label>
+				</div>
+				<div class="content">
+					<input id="picocms-plugins-copy-name" class="input input-name" type="text" name="name"
+							value="" placeholder="{source}" />
+				</div>
+			</fieldset>
+		</form>
+	</script>
+
 	<script id="picocms-plugins-template-loading" type="text/template"
 			data-replaces="#picocms-plugins">
 		<div class="app-content-loading message large">

From 8ff70291decd1b36de9c84d1bd107024e4082033 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Mon, 13 Apr 2020 12:19:56 +0200
Subject: [PATCH 05/29] Various small improvements

Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>
---
 lib/Model/DummyPluginFile.php  | 4 ++--
 lib/Service/PluginsService.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/Model/DummyPluginFile.php b/lib/Model/DummyPluginFile.php
index d9d9b22f..d20a6a2f 100644
--- a/lib/Model/DummyPluginFile.php
+++ b/lib/Model/DummyPluginFile.php
@@ -84,7 +84,7 @@ public function rename(string $name): NodeInterface
 	/**
 	 * {@inheritDoc}
 	 */
-	public function delete()
+	public function delete(): void
 	{
 		// nothing to do
 	}
@@ -168,7 +168,7 @@ public function getContent(): string
 	/**
 	 * {@inheritDoc}
 	 */
-	public function putContent(string $data)
+	public function putContent(string $data): void
 	{
 		throw new NotPermittedException();
 	}
diff --git a/lib/Service/PluginsService.php b/lib/Service/PluginsService.php
index 5277683d..52eea744 100644
--- a/lib/Service/PluginsService.php
+++ b/lib/Service/PluginsService.php
@@ -230,7 +230,7 @@ public function depublishCustomPlugin(string $pluginName): void
 	 * @throws PluginNotFoundException
 	 * @throws PluginAlreadyExistsException
 	 */
-	public function copyDummyPlugin(string $pluginName)
+	public function copyDummyPlugin(string $pluginName): Plugin
 	{
 		if (!$pluginName) {
 			throw new PluginNotFoundException();

From 124ac7c494d6598190ecbaac755500c0d4b690a6 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 14 Jun 2020 17:05:37 +0200
Subject: [PATCH 06/29] Require Nextcloud 18+ and PHP 7.2+

Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>
---
 appinfo/info.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index ddf2b657..a7976ec0 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -47,8 +47,8 @@ You want to learn more about Pico CMS for Nextcloud? Easy! Just download and ena
 	<screenshot>https://raw.githubusercontent.com/nextcloud/cms_pico/master/screenshots/settings.png</screenshot>
 	<screenshot>https://raw.githubusercontent.com/nextcloud/cms_pico/master/screenshots/apache.png</screenshot>
 	<dependencies>
-		<php min-version="7.1.0"/>
-		<nextcloud min-version="16" max-version="19"/>
+		<php min-version="7.2.0"/>
+		<nextcloud min-version="18" max-version="20"/>
 	</dependencies>
 	<repair-steps>
 		<post-migration>

From d2776ed5a8687c7208ece31bfca97412003c1461 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 14 Jun 2020 17:07:17 +0200
Subject: [PATCH 07/29] Remove pre-NC18 workarounds

Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>
---
 .scrutinizer.yml            |  4 ++--
 appinfo/app.php             |  3 +--
 lib/AppInfo/Application.php | 18 ++++++++++++------
 lib/Files/StorageFolder.php | 15 +++------------
 4 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index 3587e58b..ff6fa25a 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -43,7 +43,7 @@ build:
           - js-scrutinizer-run
 
           - cd ~/nextcloud
-#          - php ./occ app:check-code $APP_NAME -c private
+          - php ./occ app:check-code $APP_NAME -c private
           - php ./occ app:check-code $APP_NAME -c strong-comparison
           - php ./occ app:check-code $APP_NAME -c deprecation
 
@@ -83,7 +83,7 @@ build:
       tests: &tests
         override:
           - cd ~/nextcloud
-#          - php ./occ app:check-code $APP_NAME -c private
+          - php ./occ app:check-code $APP_NAME -c private
           - php ./occ app:check-code $APP_NAME -c strong-comparison
           - php ./occ app:check-code $APP_NAME -c deprecation
 
diff --git a/appinfo/app.php b/appinfo/app.php
index a27fcb02..4b29a108 100644
--- a/appinfo/app.php
+++ b/appinfo/app.php
@@ -27,7 +27,6 @@
 	require_once(__DIR__ . '/../vendor/autoload.php');
 }
 
-// TODO >= NC 18: Replace by \OC::$server->query(Application::class)
-$app = new Application();
+$app = \OC::$server->query(Application::class);
 $app->registerHooks();
 $app->registerExternalStorage();
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 7d90eb52..0613687c 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -30,6 +30,8 @@
 use OCP\App\AppPathNotFoundException;
 use OCP\App\IAppManager;
 use OCP\AppFramework\App;
+use OCP\EventDispatcher\Event;
+use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Util;
 
 class Application extends App
@@ -58,10 +60,10 @@ public function registerHooks(): void
 	 */
 	public function registerExternalStorage(): void
 	{
-		// TODO >= NC 18: Add \OCP\EventDispatcher\Event $event param to closure
-		\OC::$server->getEventDispatcher()->addListener(
+		$eventDispatcher = \OC::$server->query(IEventDispatcher::class);
+		$eventDispatcher->addListener(
 			'OCA\\Files_External::loadAdditionalBackends',
-			function () {
+			function (Event $event) {
 				$encryptionManager = \OC::$server->getEncryptionManager();
 				if ($encryptionManager->isEnabled()) {
 					$backendService = \OC::$server->query(BackendService::class);
@@ -94,8 +96,12 @@ public static function getAppPath(): string
 	 */
 	public static function getAppWebPath(): string
 	{
-		// TODO >= NC 18: Replace by \OC::$server->getAppManager()->getAppWebPath() and
-		//                enable private API code checks in .scrutinizer.yml
-		return \OC_App::getAppWebPath(self::APP_NAME) ?: '';
+		try {
+			/** @var IAppManager $appManager */
+			$appManager = \OC::$server->getAppManager();
+			return $appManager->getAppWebPath(self::APP_NAME);
+		} catch (AppPathNotFoundException $e) {
+			return '';
+		}
 	}
 }
diff --git a/lib/Files/StorageFolder.php b/lib/Files/StorageFolder.php
index 239a1c00..0cca9468 100644
--- a/lib/Files/StorageFolder.php
+++ b/lib/Files/StorageFolder.php
@@ -54,7 +54,7 @@ class StorageFolder extends AbstractStorageNode implements FolderInterface
 	/** @var ILogger */
 	private $logger;
 
-	/** @var IEventDispatcher|null */
+	/** @var IEventDispatcher */
 	private $eventDispatcher;
 
 	/**
@@ -70,6 +70,7 @@ public function __construct(OCFolder $folder, string $basePath = null)
 		$this->tempManager = \OC::$server->getTempManager();
 		$this->connection = \OC::$server->query(IDBConnection::class);
 		$this->logger = \OC::$server->query(ILogger::class);
+		$this->eventDispatcher = \OC::$server->query(IEventDispatcher::class);
 
 		parent::__construct($folder, $basePath);
 	}
@@ -169,17 +170,7 @@ public function fakeRoot(): FolderInterface
 	 */
 	public function sync(bool $recursive = FolderInterface::SYNC_RECURSIVE): void
 	{
-		// TODO >= NC 18: Remove version switch
-		[ $majorVersion ] = \OC_Util::getVersion();
-		if ($majorVersion >= 18) {
-			if ($this->eventDispatcher === null) {
-				$this->eventDispatcher = \OC::$server->query(IEventDispatcher::class);
-			}
-
-			$scanner = new Scanner(null, $this->connection, $this->eventDispatcher, $this->logger);
-		} else {
-			$scanner = new Scanner(null, $this->connection, $this->logger);
-		}
+		$scanner = new Scanner(null, $this->connection, $this->eventDispatcher, $this->logger);
 
 		try {
 			$scanner->scan($this->node->getPath(), $recursive);

From 9e82c90b2c8529d17bc86ce5877f58ac92feb9d0 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 14 Jun 2020 17:08:09 +0200
Subject: [PATCH 08/29] Replace various substr() calls by more efficient
 counterparts

Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>
---
 lib/Pico.php                  | 4 ++--
 lib/Service/AssetsService.php | 2 +-
 lib/Service/MiscService.php   | 4 ++--
 templates/settings.admin.php  | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/Pico.php b/lib/Pico.php
index 20ce0ed7..e69c412e 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -268,7 +268,7 @@ public function getFiles($absolutePath, $fileExtension = '', $order = \Pico::SOR
 
 			// exclude hidden files/dirs starting with a .
 			// exclude files ending with a ~ (vim/nano backup) or # (emacs backup)
-			if (($fileName[0] === '.') || in_array(substr($fileName, -1), [ '~', '#' ], true)) {
+			if (($fileName[0] === '.') || in_array($fileName[-1], [ '~', '#' ], true)) {
 				return false;
 			}
 
@@ -321,7 +321,7 @@ public function getFilesGlob($absolutePathPattern, $order = \Pico::SORT_ASC)
 				$fileName = $file->getName();
 
 				// exclude files ending with a ~ (vim/nano backup) or # (emacs backup)
-				if (in_array(substr($fileName, -1), [ '~', '#' ], true)) {
+				if (in_array($fileName[-1], [ '~', '#' ], true)) {
 					continue;
 				}
 
diff --git a/lib/Service/AssetsService.php b/lib/Service/AssetsService.php
index 4f41eeb7..426affe1 100644
--- a/lib/Service/AssetsService.php
+++ b/lib/Service/AssetsService.php
@@ -56,7 +56,7 @@ public function getAsset(Website $website): PicoAsset
 
 			$assetsDir = PicoService::DIR_ASSETS . '/';
 			$assetsDirLength = strlen($assetsDir);
-			if (substr($asset, 0, $assetsDirLength) !== $assetsDir) {
+			if (substr_compare($asset, $assetsDir, 0, $assetsDirLength) !== 0) {
 				throw new InvalidPathException();
 			}
 
diff --git a/lib/Service/MiscService.php b/lib/Service/MiscService.php
index 20d14fc0..f49c69cb 100644
--- a/lib/Service/MiscService.php
+++ b/lib/Service/MiscService.php
@@ -128,7 +128,7 @@ public function getRelativePath(string $path, string $basePath = null): string
 
 		if ($path === $basePath) {
 			return '';
-		} elseif (substr($path, 0, $basePathLength + 1) === $basePath . '/') {
+		} elseif (substr_compare($path, $basePath . '/', 0, $basePathLength + 1) === 0) {
 			return substr($path, $basePathLength + 1);
 		} else {
 			throw new InvalidPathException();
@@ -146,7 +146,7 @@ public function dropFileExtension(string $path, string $fileExtension): string
 	{
 		$fileName = basename($path);
 		$fileExtensionPos = strrpos($fileName, '.');
-		if (($fileExtensionPos === false) || (substr($fileName, $fileExtensionPos) !== $fileExtension)) {
+		if (($fileExtensionPos === false) || (substr_compare($fileName, $fileExtension, $fileExtensionPos) !== 0)) {
 			throw new InvalidPathException();
 		}
 
diff --git a/templates/settings.admin.php b/templates/settings.admin.php
index d439906f..cefadd9f 100644
--- a/templates/settings.admin.php
+++ b/templates/settings.admin.php
@@ -633,7 +633,7 @@
 				<code>
 					ProxyPass <?php p($_['internalPath']); ?> <?php p($_['internalProxyUrl']); ?><br/>
 					ProxyPassReverse <?php p($_['internalPath']); ?> <?php p($_['internalProxyUrl']); ?><br/>
-					<?php if (substr($_['internalProxyUrl'], 0, 5) === 'https') { ?>
+					<?php if (substr_compare($_['internalProxyUrl'], 'https', 0, 5) === 0) { ?>
 						SSLProxyEngine on<br/>
 					<?php } ?>
 				</code>
@@ -687,7 +687,7 @@
 					&nbsp;&nbsp;&nbsp;&nbsp;proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;<br/>
 					&nbsp;&nbsp;&nbsp;&nbsp;proxy_set_header X-Forwarded-Server $host;<br/>
 					&nbsp;&nbsp;&nbsp;&nbsp;proxy_pass <?php p($_['internalProxyUrl']); ?>;<br/>
-					<?php if (substr($_['internalProxyUrl'], 0, 5) === 'https') { ?>
+					<?php if (substr_compare($_['internalProxyUrl'], 'https', 0, 5) === 0) { ?>
 						&nbsp;&nbsp;&nbsp;&nbsp;proxy_ssl_server_name on;<br/>
 					<?php } ?>
 					}<br/>

From 60102da13bbdb9f4912349379bc1c01dc2cf2b32 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 28 Nov 2020 12:13:03 +0100
Subject: [PATCH 09/29] Fix code formatting

Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>
---
 templates/settings.personal.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/templates/settings.personal.php b/templates/settings.personal.php
index 3a85bf00..16e69422 100644
--- a/templates/settings.personal.php
+++ b/templates/settings.personal.php
@@ -233,13 +233,13 @@
 		<form id="{id}" title="{title}" class="form">
 			<p class="dialog-hint"><?php p($l->t(
 				'Pico CMS for Nextcloud supports both public and private websites. Everyone can access public '
-				. 'websites, no matter whether they are logged in or not. If you want to limit access to a certain '
-				. 'subset of users, create a private website. All visitors of a private website must be logged in, '
-				. 'otherwise a "Access forbidden" error is shown. Additionally one of the following conditions must '
-				. 'be met: (1) the user has access to the website\'s source files (i.e. the source folder is shared '
-				. 'with the user), (2) the user is a member of one of the groups listed below, or (3) the user is a '
-				. 'member of one of the groups specified in the YAML header of the requested page using the "access" '
-				. 'meta value.'
+						. 'websites, no matter whether they are logged in or not. If you want to limit access to a '
+						. 'certain subset of users, create a private website. All visitors of a private website must '
+						. 'be logged in, otherwise a "Access forbidden" error is shown. Additionally one of the '
+						. 'following conditions must be met: (1) the user has access to the website\'s source files '
+						. '(i.e. the source folder is shared with the user), (2) the user is a member of one of the '
+						. 'groups listed below, or (3) the user is a member of one of the groups specified in the '
+						. 'YAML Front Matter of the requested page using the "access" meta value.'
 			)); ?></p>
 			<fieldset>
 				<div class="label">

From 0c61cef654b95a17117e39f74afc767d178f1808 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sun, 28 Feb 2021 16:47:33 +0100
Subject: [PATCH 10/29] Allow editing website names by double clicking them

Closes #123

Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>
---
 css/pico.scss                         |  4 +++
 js/personal.js                        | 40 ++++++++++++++++++++++++++-
 lib/Controller/WebsitesController.php |  4 +++
 templates/settings.personal.php       |  8 +++++-
 4 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/css/pico.scss b/css/pico.scss
index b70f47ba..5d5cf319 100644
--- a/css/pico.scss
+++ b/css/pico.scss
@@ -187,6 +187,10 @@
 					flex: 1 1 auto;
 				}
 
+				> .name-edit {
+					display: none;
+				}
+
 				> .actions,
 				> .more {
 					flex: 0 0 auto;
diff --git a/js/personal.js b/js/personal.js
index 315a5304..8e0b2c1d 100644
--- a/js/personal.js
+++ b/js/personal.js
@@ -241,6 +241,45 @@
 				});
 			});
 
+			// change website name
+			$website.find('.name').on('dblclick.CMSPicoWebsiteList', function (event) {
+				event.preventDefault();
+
+				var $textContainer = $(this),
+					$inputContainer = $textContainer.siblings('.name-edit'),
+					$input = $inputContainer.children('.input-name');
+
+				$textContainer.hide();
+				$inputContainer.show();
+				$input.focus();
+			});
+
+			$website.find('.name-edit > .input-name')
+				.on('change.CMSPicoWebsiteList', function (event) {
+					var $input = $(this),
+						$inputContainer = $input.parent(),
+						$textContainer = $inputContainer.siblings('.name'),
+						oldValue = $input.prop('placeholder'),
+						newValue = $input.val() || oldValue;
+
+					$inputContainer.hide();
+					$textContainer.show();
+
+					$input.val(newValue);
+
+					if (newValue !== oldValue) {
+						that._updateItem(websiteData.id, { name: newValue });
+					}
+				})
+				.on('keyup.CMSPicoWebsiteList', function (event) {
+					if ((event.which === 13) || (event.which === 27)) {
+						$(this).change();
+					}
+				})
+				.on('blur.CMSPicoWebsiteList', function (event) {
+					$(this).change();
+				});
+
 			// change website theme
 			$website.find('.action-theme').each(function () {
 				var $this = $(this);
@@ -248,7 +287,6 @@
 				$this.val(websiteData.theme);
 
 				$this.on('change.CMSPicoWebsiteList', function (event) {
-					event.preventDefault();
 					that._updateItem(websiteData.id, { theme: $(this).val() });
 				});
 			});
diff --git a/lib/Controller/WebsitesController.php b/lib/Controller/WebsitesController.php
index a70ba82c..63041cec 100644
--- a/lib/Controller/WebsitesController.php
+++ b/lib/Controller/WebsitesController.php
@@ -158,6 +158,10 @@ public function updatePersonalWebsite(int $siteId, array $data): DataResponse
 
 			foreach ($data as $key => $value) {
 				switch ($key) {
+					case 'name':
+						$website->setName($value);
+						break;
+
 					case 'type':
 						$website->setType((int) $value);
 						break;
diff --git a/templates/settings.personal.php b/templates/settings.personal.php
index 16e69422..7fa1082a 100644
--- a/templates/settings.personal.php
+++ b/templates/settings.personal.php
@@ -134,9 +134,15 @@
 		<tr>
 			<td class="name-column">
 				<div class="name-container">
-					<div>
+					<div class="name">
 						<p>{name}</p>
 					</div>
+					<div class="name-edit">
+						<input class="input input-name" type="text" name="name"
+							value="{name}" placeholder="{name}"
+							minlength="<?php p($_['nameLengthMin']); ?>"
+							maxlength="<?php p($_['nameLengthMax']); ?>" />
+					</div>
 					<div class="actions">
 						<a class="action action-open has-tooltip" title="<?php p($l->t('Go to website')); ?>">
 							<span class="icon-link"></span>

From 850f58a94ffb0d5764c8291173c0c8eb7542efe0 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Wed, 3 Mar 2021 13:32:17 +0100
Subject: [PATCH 11/29] Add OCA.CMSPico.Editable for editable website names

Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>
---
 css/pico.scss                   |  20 +++
 js/personal.js                  |  48 ++----
 js/pico.js                      | 249 +++++++++++++++++++++++++-------
 templates/settings.personal.php |  11 ++
 4 files changed, 238 insertions(+), 90 deletions(-)

diff --git a/css/pico.scss b/css/pico.scss
index 5d5cf319..94ffe2cd 100644
--- a/css/pico.scss
+++ b/css/pico.scss
@@ -377,6 +377,17 @@
 		max-width: 37.5em;
 	}
 
+	.has-input-icon {
+		display: inline-block;
+		padding-right: 32px;
+	}
+
+	.input-icon {
+		margin: 4px 4px 4px -36px;
+		padding: 16px;
+		cursor: pointer;
+	}
+
 	p {
 		margin-bottom: calc(var(--margin) * 0.5);
 		text-align: justify;
@@ -544,6 +555,8 @@
  * @license https://fontawesome.com/license/free
  */
 :root {
+	--icon-edit-000: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA1NzYgNTEyIiB3aWR0aD0iMTUuNzUiIGhlaWdodD0iMTQiPjxwYXRoIGQ9Ik00MDIuNiA4My4ybDkwLjIgOTAuMmMzLjggMy44IDMuOCAxMCAwIDEzLjhMMjc0LjQgNDA1LjZsLTkyLjggMTAuM2MtMTIuNCAxLjQtMjIuOS05LjEtMjEuNS0yMS41bDEwLjMtOTIuOEwzODguOCA4My4yYzMuOC0zLjggMTAtMy44IDEzLjggMHptMTYyLTIyLjlsLTQ4LjgtNDguOGMtMTUuMi0xNS4yLTM5LjktMTUuMi01NS4yIDBsLTM1LjQgMzUuNGMtMy44IDMuOC0zLjggMTAgMCAxMy44bDkwLjIgOTAuMmMzLjggMy44IDEwIDMuOCAxMy44IDBsMzUuNC0zNS40YzE1LjItMTUuMyAxNS4yLTQwIDAtNTUuMnpNMzg0IDM0Ni4yVjQ0OEg2NFYxMjhoMjI5LjhjMy4yIDAgNi4yLTEuMyA4LjUtMy41bDQwLTQwYzcuNi03LjYgMi4yLTIwLjUtOC41LTIwLjVINDhDMjEuNSA2NCAwIDg1LjUgMCAxMTJ2MzUyYzAgMjYuNSAyMS41IDQ4IDQ4IDQ4aDM1MmMyNi41IDAgNDgtMjEuNSA0OC00OFYzMDYuMmMwLTEwLjctMTIuOS0xNi0yMC41LTguNWwtNDAgNDBjLTIuMiAyLjMtMy41IDUuMy0zLjUgOC41eiIvPjwvc3ZnPgoK);
+	--icon-edit-fff: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA1NzYgNTEyIiB3aWR0aD0iMTUuNzUiIGhlaWdodD0iMTQiPjxwYXRoIGQ9Ik00MDIuNiA4My4ybDkwLjIgOTAuMmMzLjggMy44IDMuOCAxMCAwIDEzLjhMMjc0LjQgNDA1LjZsLTkyLjggMTAuM2MtMTIuNCAxLjQtMjIuOS05LjEtMjEuNS0yMS41bDEwLjMtOTIuOEwzODguOCA4My4yYzMuOC0zLjggMTAtMy44IDEzLjggMHptMTYyLTIyLjlsLTQ4LjgtNDguOGMtMTUuMi0xNS4yLTM5LjktMTUuMi01NS4yIDBsLTM1LjQgMzUuNGMtMy44IDMuOC0zLjggMTAgMCAxMy44bDkwLjIgOTAuMmMzLjggMy44IDEwIDMuOCAxMy44IDBsMzUuNC0zNS40YzE1LjItMTUuMyAxNS4yLTQwIDAtNTUuMnpNMzg0IDM0Ni4yVjQ0OEg2NFYxMjhoMjI5LjhjMy4yIDAgNi4yLTEuMyA4LjUtMy41bDQwLTQwYzcuNi03LjYgMi4yLTIwLjUtOC41LTIwLjVINDhDMjEuNSA2NCAwIDg1LjUgMCAxMTJ2MzUyYzAgMjYuNSAyMS41IDQ4IDQ4IDQ4aDM1MmMyNi41IDAgNDgtMjEuNSA0OC00OFYzMDYuMmMwLTEwLjctMTIuOS0xNi0yMC41LTguNWwtNDAgNDBjLTIuMiAyLjMtMy41IDUuMy0zLjUgOC41eiIgZmlsbD0iI2ZmZiIvPjwvc3ZnPgoK);
 	--icon-lock-000: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA0NDggNTEyIiB3aWR0aD0iMTIuMjUiIGhlaWdodD0iMTQiPjxwYXRoIGQ9Ik00MDAgMjI0aC0yNHYtNzJDMzc2IDY4LjIgMzA3LjggMCAyMjQgMFM3MiA2OC4yIDcyIDE1MnY3Mkg0OGMtMjYuNSAwLTQ4IDIxLjUtNDggNDh2MTkyYzAgMjYuNSAyMS41IDQ4IDQ4IDQ4aDM1MmMyNi41IDAgNDgtMjEuNSA0OC00OFYyNzJjMC0yNi41LTIxLjUtNDgtNDgtNDh6bS0xMDQgMEgxNTJ2LTcyYzAtMzkuNyAzMi4zLTcyIDcyLTcyczcyIDMyLjMgNzIgNzJ2NzJ6Ii8+PC9zdmc+);
 	--icon-lock-fff: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA0NDggNTEyIiB3aWR0aD0iMTIuMjUiIGhlaWdodD0iMTQiPjxwYXRoIGQ9Ik00MDAgMjI0aC0yNHYtNzJDMzc2IDY4LjIgMzA3LjggMCAyMjQgMFM3MiA2OC4yIDcyIDE1MnY3Mkg0OGMtMjYuNSAwLTQ4IDIxLjUtNDggNDh2MTkyYzAgMjYuNSAyMS41IDQ4IDQ4IDQ4aDM1MmMyNi41IDAgNDgtMjEuNSA0OC00OFYyNzJjMC0yNi41LTIxLjUtNDgtNDgtNDh6bS0xMDQgMEgxNTJ2LTcyYzAtMzkuNyAzMi4zLTcyIDcyLTcyczcyIDMyLjMgNzIgNzJ2NzJ6IiBmaWxsPSIjZmZmIi8+PC9zdmc+);
 	--icon-lock-open-000: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA1NzYgNTEyIiB3aWR0aD0iMTUuNzUiIGhlaWdodD0iMTQiPjxwYXRoIGQ9Ik00MjMuNSAwQzMzOS41LjMgMjcyIDY5LjUgMjcyIDE1My41VjIyNEg0OGMtMjYuNSAwLTQ4IDIxLjUtNDggNDh2MTkyYzAgMjYuNSAyMS41IDQ4IDQ4IDQ4aDM1MmMyNi41IDAgNDgtMjEuNSA0OC00OFYyNzJjMC0yNi41LTIxLjUtNDgtNDgtNDhoLTQ4di03MS4xYzAtMzkuNiAzMS43LTcyLjUgNzEuMy03Mi45IDQwLS40IDcyLjcgMzIuMSA3Mi43IDcydjgwYzAgMTMuMyAxMC43IDI0IDI0IDI0aDMyYzEzLjMgMCAyNC0xMC43IDI0LTI0di04MEM1NzYgNjggNTA3LjUtLjMgNDIzLjUgMHoiLz48L3N2Zz4=);
@@ -558,6 +571,13 @@
 	--icon-copy-fff: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA0NDggNTEyIiB3aWR0aD0iMTIuMjUiIGhlaWdodD0iMTQiPjxwYXRoIGZpbGw9ImN1cnJlbnRDb2xvciIgZD0iTTMyMCA0NDh2NDBjMCAxMy4yNTUtMTAuNzQ1IDI0LTI0IDI0SDI0Yy0xMy4yNTUgMC0yNC0xMC43NDUtMjQtMjRWMTIwYzAtMTMuMjU1IDEwLjc0NS0yNCAyNC0yNGg3MnYyOTZjMCAzMC44NzkgMjUuMTIxIDU2IDU2IDU2aDE2OHptMC0zNDRWMEgxNTJjLTEzLjI1NSAwLTI0IDEwLjc0NS0yNCAyNHYzNjhjMCAxMy4yNTUgMTAuNzQ1IDI0IDI0IDI0aDI3MmMxMy4yNTUgMCAyNC0xMC43NDUgMjQtMjRWMTI4SDM0NGMtMTMuMiAwLTI0LTEwLjgtMjQtMjR6bTEyMC45NzEtMzEuMDI5TDM3NS4wMjkgNy4wMjlBMjQgMjQgMCAwIDAgMzU4LjA1OSAwSDM1MnY5Nmg5NnYtNi4wNTlhMjQgMjQgMCAwIDAtNy4wMjktMTYuOTd6IiBmaWxsPSIjZmZmIj48L3BhdGg+PC9zdmc+);
 }
 
+.icon-edit {
+	background-image: var(--icon-edit-000);
+}
+.icon-edit-white, .icon-edit.icon-white {
+	background-image: var(--icon-edit-fff);
+}
+
 .icon-lock {
 	background-image: var(--icon-lock-000);
 }
diff --git a/js/personal.js b/js/personal.js
index 8e0b2c1d..7dac85d2 100644
--- a/js/personal.js
+++ b/js/personal.js
@@ -242,43 +242,21 @@
 			});
 
 			// change website name
-			$website.find('.name').on('dblclick.CMSPicoWebsiteList', function (event) {
-				event.preventDefault();
-
-				var $textContainer = $(this),
-					$inputContainer = $textContainer.siblings('.name-edit'),
-					$input = $inputContainer.children('.input-name');
-
-				$textContainer.hide();
-				$inputContainer.show();
-				$input.focus();
+			var nameEditable = new OCA.CMSPico.Editable(
+				$website.find('.name > p'),
+				$website.find('.name-edit > input')
+			);
+
+			nameEditable.on('submit.CMSPicoWebsiteList', function (value, defaultValue) {
+				if (value !== defaultValue) {
+					that._updateItem(websiteData.id, { name: value });
+				}
 			});
 
-			$website.find('.name-edit > .input-name')
-				.on('change.CMSPicoWebsiteList', function (event) {
-					var $input = $(this),
-						$inputContainer = $input.parent(),
-						$textContainer = $inputContainer.siblings('.name'),
-						oldValue = $input.prop('placeholder'),
-						newValue = $input.val() || oldValue;
-
-					$inputContainer.hide();
-					$textContainer.show();
-
-					$input.val(newValue);
-
-					if (newValue !== oldValue) {
-						that._updateItem(websiteData.id, { name: newValue });
-					}
-				})
-				.on('keyup.CMSPicoWebsiteList', function (event) {
-					if ((event.which === 13) || (event.which === 27)) {
-						$(this).change();
-					}
-				})
-				.on('blur.CMSPicoWebsiteList', function (event) {
-					$(this).change();
-				});
+			$website.find('.action-rename').on('click.CMSPicoWebsiteList', function (event) {
+				event.preventDefault();
+				nameEditable.toggle();
+			});
 
 			// change website theme
 			$website.find('.action-theme').each(function () {
diff --git a/js/pico.js b/js/pico.js
index 666bba98..e0206668 100644
--- a/js/pico.js
+++ b/js/pico.js
@@ -266,6 +266,98 @@
 
 	/**
 	 * @class
+	 */
+	OCA.CMSPico.Events = function () {};
+
+	/**
+	 * @lends OCA.CMSPico.Events.prototype
+	 */
+	OCA.CMSPico.Events.prototype = {
+		/** @member {?object} */
+		events: null,
+
+		/**
+		 * @public
+		 *
+		 * @param {string}   eventName
+		 * @param {function} callback
+		 */
+		on: function (eventName, callback) {
+			var event = this._parseEventName(eventName);
+			if (event === false) {
+				$.error('Invalid event name: ' + eventName);
+				return;
+			}
+
+			if (this.events[event[0]] === undefined) {
+				this.events[event[0]] = {};
+			}
+
+			this.events[event[0]][event[1]] = callback;
+		},
+
+		/**
+		 * @public
+		 *
+		 * @param {string} eventName
+		 */
+		off: function (eventName) {
+			var event = this._parseEventName(eventName);
+			if (event === false) {
+				$.error('Invalid event name: ' + eventName);
+				return false;
+			}
+
+			if ((this.events[event[0]] !== undefined) && (this.events[event[0]][event[1]] !== undefined)) {
+				delete this.events[event[0]][event[1]];
+				return true;
+			}
+
+			return false;
+		},
+
+		/**
+		 * @protected
+		 *
+		 * @param {string} eventType
+		 * @param {...*}   eventArguments
+		 */
+		_trigger: function (eventType, ...eventArguments) {
+			if (!this.events[eventType]) {
+				return;
+			}
+
+			var that = this;
+			$.each(this.events[eventType], function (id, callback) {
+				callback.apply(that, eventArguments);
+			});
+		},
+
+		/**
+		 * @protected
+		 *
+		 * @param {string} eventName
+		 *
+		 * @returns {[string, string]|false}
+		 */
+		_parseEventName: function (eventName) {
+			var pos = eventName.indexOf('.');
+			pos = (pos !== -1) ? pos : eventName.length;
+
+			var type = eventName.substr(0, pos),
+				id = eventName.substr(pos + 1);
+
+			if (!type || !id) {
+				return false;
+			}
+
+			return [ type, id ];
+		}
+	};
+
+	/**
+	 * @class
+	 * @extends OCA.CMSPico.Events
 	 *
 	 * @param {jQuery}   $template
 	 * @param {object}   options
@@ -303,7 +395,7 @@
 	/**
 	 * @lends OCA.CMSPico.Dialog.prototype
 	 */
-	OCA.CMSPico.Dialog.prototype = {
+	OCA.CMSPico.Dialog.prototype = $.extend({}, OCA.CMSPico.Events.prototype, {
 		/** @member {jQuery} */
 		$element: $(),
 
@@ -322,9 +414,6 @@
 		/** @member {object[]} */
 		buttons: [],
 
-		/** @member {object} */
-		events: {},
-
 		/** @member {boolean} */
 		opened: false,
 
@@ -444,85 +533,135 @@
 			}
 
 			this._trigger('close');
-		},
+		}
+	});
+
+	/**
+	 * @class
+	 * @extends OCA.CMSPico.Events
+	 *
+	 * @param {jQuery}   $element
+	 * @param {jQuery}   $input
+	 */
+	OCA.CMSPico.Editable = function ($element, $input) {
+		this.initialize($element, $input);
+	};
+
+	/**
+	 * @lends OCA.CMSPico.Editable.prototype
+	 */
+	OCA.CMSPico.Editable.prototype = $.extend({}, OCA.CMSPico.Events.prototype, {
+		/** @member {jQuery} */
+		$element: $(),
+
+		/** @member {jQuery} */
+		$input: $(),
+
+		/** @member {?jQuery} */
+		$inputIcon: null,
+
+		/** @member {boolean} */
+		initialized: false,
+
+		/** @member {boolean} */
+		opened: false,
 
 		/**
-		 * @public
+		 * @constructs
 		 *
-		 * @param {string}   eventName
-		 * @param {function} callback
+		 * @param {jQuery}   $element
+		 * @param {jQuery}   $input
 		 */
-		on: function (eventName, callback) {
-			var event = this._parseEventName(eventName);
-			if (event === false) {
-				$.error('Invalid event name: ' + eventName);
+		initialize: function ($element, $input) {
+			this.$element = $element;
+			this.$input = $input;
+			this.events = {};
+		},
+
+		/**
+		 * @protected
+		 */
+		_setupElements: function () {
+			if (this.initialized) {
 				return;
 			}
 
-			if (this.events[event[0]] === undefined) {
-				this.events[event[0]] = {};
-			}
+			var that = this;
 
-			this.events[event[0]][event[1]] = callback;
+			this.$inputIcon = $('<span class="input-icon icon-checkmark"></span>')
+			this.$inputIcon.on('click.CMSPicoEditable', function (event) {
+				that.submit();
+				that.close();
+			});
+
+			this.$input.on('keyup.CMSPicoEditable', function (event) {
+				if (event.which === 13) {
+					that.submit();
+					that.close();
+				} else if (event.which === 27) {
+					that.close();
+				}
+			});
+
+			this.$input
+				.after(this.$inputIcon)
+				.addClass('has-input-icon');
+
+			this.initialized = true;
 		},
 
 		/**
 		 * @public
-		 *
-		 * @param {string} eventName
 		 */
-		off: function (eventName) {
-			var event = this._parseEventName(eventName);
-			if (event === false) {
-				$.error('Invalid event name: ' + eventName);
-				return false;
-			}
+		open: function () {
+			this._setupElements();
 
-			if ((this.events[event[0]] !== undefined) && (this.events[event[0]][event[1]] !== undefined)) {
-				delete this.events[event[0]][event[1]];
-				return true;
-			}
+			this.$element.parent().hide();
+			this.$input.parent().show();
+			this.$input.focus();
 
-			return false;
+			this._trigger('open');
+			this.opened = true;
 		},
 
 		/**
-		 * @protected
-		 *
-		 * @param {string} eventType
+		 * @public
 		 */
-		_trigger: function (eventType) {
-			if (!this.events[eventType]) {
-				return;
-			}
+		submit: function () {
+			var defaultValue = this.$input.prop('defaultValue'),
+				value = this.$input.val() || defaultValue;
 
-			var that = this;
-			$.each(this.events[eventType], function (id, callback) {
-				callback.apply(that);
-			});
+			this.$element.text(value);
+			this.$input.val(value);
+
+			this._trigger('submit', value, defaultValue);
 		},
 
 		/**
-		 * @protected
-		 *
-		 * @param {string} eventName
-		 *
-		 * @returns {[string, string]|false}
+		 * @public
 		 */
-		_parseEventName: function (eventName) {
-			var pos = eventName.indexOf('.');
-			pos = (pos !== -1) ? pos : eventName.length;
-
-			var type = eventName.substr(0, pos),
-				id = eventName.substr(pos + 1);
+		close: function () {
+			if (this.opened) {
+				this.$input.parent().hide();
+				this.$element.parent().show();
 
-			if (!type || !id) {
-				return false;
+				this.opened = false;
 			}
 
-			return [ type, id ];
+			this._trigger('close');
+		},
+
+		/**
+		 * @public
+		 */
+		toggle: function () {
+			if (!this.opened) {
+				this.open();
+			} else {
+				this.close();
+			}
 		}
-	};
+	});
 
 	/** @namespace OCA.CMSPico.Util */
 	OCA.CMSPico.Util = {
diff --git a/templates/settings.personal.php b/templates/settings.personal.php
index 7fa1082a..64b1e855 100644
--- a/templates/settings.personal.php
+++ b/templates/settings.personal.php
@@ -153,6 +153,11 @@
 							<span class="icon-files-dark"></span>
 							<span class="hidden-visually"><?php p($l->t('Go to website directory')); ?></span>
 						</a>
+						<a class="action action-rename has-tooltip"
+							title="<?php p($l->t('Edit website name')); ?>">
+							<span class="icon-edit"></span>
+							<span class="hidden-visually"><?php p($l->t('Edit website name')); ?></span>
+						</a>
 						<a class="action action-private has-tooltip"
 								title="<?php p($l->t('Edit private website settings')); ?>">
 							<span class="icon-lock-open"></span>
@@ -182,6 +187,12 @@
 										<span><?php p($l->t('Go to website directory')); ?></span>
 									</a>
 								</li>
+								<li>
+									<a class="action-rename">
+										<span class="icon-edit"></span>
+										<span><?php p($l->t('Edit website name')); ?></span>
+									</a>
+								</li>
 								<li>
 									<a class="action-private">
 										<span class="icon-lock-open"></span>

From bb6b8260afe62f9111c101e2a18e43862ab6b7a1 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Sat, 6 Mar 2021 18:52:24 +0100
Subject: [PATCH 12/29] Code cleanup

Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>
---
 js/personal.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/js/personal.js b/js/personal.js
index 4c9c05e0..91cac242 100644
--- a/js/personal.js
+++ b/js/personal.js
@@ -221,7 +221,7 @@
 					]
 				});
 
-				dialog.on('open.CMSPicoAdminList', function () {
+				dialog.on('open.CMSPicoWebsiteList', function () {
 					var $inputType = this.$element.find('.input-private-' + (!websitePrivate ? 'public' : 'private')),
 						$inputGroups = this.$element.find('.input-private-groups');
 
@@ -230,12 +230,12 @@
 					OC.Settings.setupGroupsSelect($inputGroups);
 				});
 
-				dialog.on('submit.CMSPicoAdminList', function () {
+				dialog.on('submit.CMSPicoWebsiteList', function () {
 					var data = OCA.CMSPico.Util.serialize(this.$element);
 					that._updateItem(websiteData.id, data);
 				});
 
-				$this.on('click.CMSPicoAdminList', function (event) {
+				$this.on('click.CMSPicoWebsiteList', function (event) {
 					event.preventDefault();
 					dialog.open();
 				});

From 2530df86cfbb47b80eba4f0e967fd9dab620e360 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Thu, 1 Apr 2021 00:58:22 +0200
Subject: [PATCH 13/29] Merge WebsitesRequestBuilder into WebsitesRequest

Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>
---
 lib/Db/WebsitesRequest.php                |  92 ++++++++++++---
 lib/Db/WebsitesRequestBuilder.php         | 132 ----------------------
 lib/Migration/Version010000.php           |   6 +-
 lib/Migration/Version010000From000908.php |   6 +-
 4 files changed, 80 insertions(+), 156 deletions(-)
 delete mode 100644 lib/Db/WebsitesRequestBuilder.php

diff --git a/lib/Db/WebsitesRequest.php b/lib/Db/WebsitesRequest.php
index bc3869ad..d7f91a52 100644
--- a/lib/Db/WebsitesRequest.php
+++ b/lib/Db/WebsitesRequest.php
@@ -27,15 +27,35 @@
 
 use OCA\CMSPico\Exceptions\WebsiteNotFoundException;
 use OCA\CMSPico\Model\Website;
+use OCP\DB\QueryBuilder\IQueryBuilder;
+use OCP\IDBConnection;
 
-class WebsitesRequest extends WebsitesRequestBuilder
+class WebsitesRequest
 {
+	/** @var string */
+	public const TABLE_NAME = 'cms_pico_websites';
+
+	/** @var IDBConnection */
+	protected $dbConnection;
+
+	/**
+	 * CoreRequestBuilder constructor.
+	 *
+	 * @param IDBConnection $connection
+	 */
+	public function __construct(IDBConnection $connection)
+	{
+		$this->dbConnection = $connection;
+	}
+
 	/**
 	 * @param Website $website
 	 */
 	public function create(Website $website): void
 	{
-		$qb = $this->getWebsitesInsertSql();
+		$qb = $this->dbConnection->getQueryBuilder()
+			->insert(WebsitesRequest::TABLE_NAME);
+
 		$qb
 			->setValue('name', $qb->createNamedParameter($website->getName()))
 			->setValue('user_id', $qb->createNamedParameter($website->getUserId()))
@@ -43,7 +63,8 @@ public function create(Website $website): void
 			->setValue('theme', $qb->createNamedParameter($website->getTheme()))
 			->setValue('type', $qb->createNamedParameter($website->getType()))
 			->setValue('options', $qb->createNamedParameter($website->getOptionsJSON()))
-			->setValue('path', $qb->createNamedParameter($website->getPath()));
+			->setValue('path', $qb->createNamedParameter($website->getPath()))
+			->setValue('creation', $qb->createFunction('NOW()'));
 
 		$qb->execute();
 
@@ -55,7 +76,9 @@ public function create(Website $website): void
 	 */
 	public function update(Website $website): void
 	{
-		$qb = $this->getWebsitesUpdateSql();
+		$qb = $this->dbConnection->getQueryBuilder()
+			->update(WebsitesRequest::TABLE_NAME);
+
 		$qb
 			->set('name', $qb->createNamedParameter($website->getName()))
 			->set('user_id', $qb->createNamedParameter($website->getUserId()))
@@ -65,7 +88,7 @@ public function update(Website $website): void
 			->set('options', $qb->createNamedParameter($website->getOptionsJSON()))
 			->set('path', $qb->createNamedParameter($website->getPath()));
 
-		$this->limitToId($qb, $website->getId());
+		$this->limitToField($qb, 'id', $website->getId());
 
 		$qb->execute();
 	}
@@ -75,8 +98,10 @@ public function update(Website $website): void
 	 */
 	public function delete(Website $website): void
 	{
-		$qb = $this->getWebsitesDeleteSql();
-		$this->limitToId($qb, $website->getId());
+		$qb = $this->dbConnection->getQueryBuilder()
+			->delete(WebsitesRequest::TABLE_NAME);
+
+		$this->limitToField($qb, 'id', $website->getId());
 
 		$qb->execute();
 	}
@@ -86,8 +111,10 @@ public function delete(Website $website): void
 	 */
 	public function deleteAllFromUserId(string $userId): void
 	{
-		$qb = $this->getWebsitesDeleteSql();
-		$this->limitToUserId($qb, $userId);
+		$qb = $this->dbConnection->getQueryBuilder()
+			->delete(WebsitesRequest::TABLE_NAME);
+
+		$this->limitToField($qb, 'user_id', $userId);
 
 		$qb->execute();
 	}
@@ -99,13 +126,16 @@ public function deleteAllFromUserId(string $userId): void
 	 */
 	public function getWebsitesFromUserId(string $userId): array
 	{
-		$qb = $this->getWebsitesSelectSql();
-		$this->limitToUserId($qb, $userId);
+		$qb = $this->dbConnection->getQueryBuilder()
+			->select('*')
+			->from(WebsitesRequest::TABLE_NAME);
+
+		$this->limitToField($qb, 'user_id', $userId);
 
 		$websites = [];
 		$cursor = $qb->execute();
 		while ($data = $cursor->fetch()) {
-			$websites[] = new Website($data);
+			$websites[] = $this->createInstance($data);
 		}
 		$cursor->closeCursor();
 
@@ -118,10 +148,13 @@ public function getWebsitesFromUserId(string $userId): array
 	 * @return Website
 	 * @throws WebsiteNotFoundException
 	 */
-	public function getWebsiteFromId(int $siteId): Website
+	public function getWebsiteFromId(int $id): Website
 	{
-		$qb = $this->getWebsitesSelectSql();
-		$this->limitToId($qb, $siteId);
+		$qb = $this->dbConnection->getQueryBuilder()
+			->select('*')
+			->from(WebsitesRequest::TABLE_NAME);
+
+		$this->limitToField($qb, 'id', $id);
 
 		$cursor = $qb->execute();
 		$data = $cursor->fetch();
@@ -131,7 +164,7 @@ public function getWebsiteFromId(int $siteId): Website
 			throw new WebsiteNotFoundException();
 		}
 
-		return new Website($data);
+		return $this->createInstance($data);
 	}
 
 	/**
@@ -142,8 +175,11 @@ public function getWebsiteFromId(int $siteId): Website
 	 */
 	public function getWebsiteFromSite(string $site): Website
 	{
-		$qb = $this->getWebsitesSelectSql();
-		$this->limitToSite($qb, $site);
+		$qb = $this->dbConnection->getQueryBuilder()
+			->select('*')
+			->from(WebsitesRequest::TABLE_NAME);
+
+		$this->limitToField($qb, 'site', $site);
 
 		$cursor = $qb->execute();
 		$data = $cursor->fetch();
@@ -153,6 +189,26 @@ public function getWebsiteFromSite(string $site): Website
 			throw new WebsiteNotFoundException();
 		}
 
+		return $this->createInstance($data);
+	}
+
+	/**
+	 * @param array $data
+	 *
+	 * @return Website
+	 */
+	private function createInstance(array $data): Website
+	{
 		return new Website($data);
 	}
+
+	/**
+	 * @param IQueryBuilder $qb
+	 * @param string        $field
+	 * @param mixed         $value
+	 */
+	private function limitToField(IQueryBuilder $qb, string $field, $value): void
+	{
+		$qb->andWhere($qb->expr()->eq($field, $qb->createNamedParameter($value)));
+	}
 }
diff --git a/lib/Db/WebsitesRequestBuilder.php b/lib/Db/WebsitesRequestBuilder.php
deleted file mode 100644
index f0a58d59..00000000
--- a/lib/Db/WebsitesRequestBuilder.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-/**
- * CMS Pico - Create websites using Pico CMS for Nextcloud.
- *
- * @copyright Copyright (c) 2017, Maxence Lange (<maxence@artificial-owl.com>)
- * @copyright Copyright (c) 2019, Daniel Rudolf (<picocms.org@daniel-rudolf.de>)
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-declare(strict_types=1);
-
-namespace OCA\CMSPico\Db;
-
-use OCP\DB\QueryBuilder\IQueryBuilder;
-use OCP\IDBConnection;
-
-class WebsitesRequestBuilder
-{
-	/** @var string */
-	public const TABLE_WEBSITES = 'cms_pico_websites';
-
-	/** @var IDBConnection */
-	protected $dbConnection;
-
-	/**
-	 * CoreRequestBuilder constructor.
-	 *
-	 * @param IDBConnection $connection
-	 */
-	public function __construct(IDBConnection $connection)
-	{
-		$this->dbConnection = $connection;
-	}
-
-	/**
-	 * @return IQueryBuilder
-	 */
-	protected function getWebsitesSelectSql(): IQueryBuilder
-	{
-		return $this->dbConnection->getQueryBuilder()
-			->select('*')
-			->from(self::TABLE_WEBSITES);
-	}
-
-	/**
-	 * @return IQueryBuilder
-	 */
-	protected function getWebsitesInsertSql(): IQueryBuilder
-	{
-		$qb = $this->dbConnection->getQueryBuilder();
-		$qb
-			->insert(self::TABLE_WEBSITES)
-			->setValue('creation', $qb->createFunction('NOW()'));
-
-		return $qb;
-	}
-
-	/**
-	 * @return IQueryBuilder
-	 */
-	protected function getWebsitesUpdateSql(): IQueryBuilder
-	{
-		return $this->dbConnection->getQueryBuilder()
-			->update(self::TABLE_WEBSITES);
-	}
-
-	/**
-	 * @return IQueryBuilder
-	 */
-	protected function getWebsitesDeleteSql(): IQueryBuilder
-	{
-		return $this->dbConnection->getQueryBuilder()
-			->delete(self::TABLE_WEBSITES);
-	}
-
-	/**
-	 * Limit the request by id.
-	 *
-	 * @param IQueryBuilder $qb
-	 * @param int           $id
-	 */
-	protected function limitToId(IQueryBuilder $qb, int $id): void
-	{
-		$this->limitToDBField($qb, 'id', $id);
-	}
-
-	/**
-	 * Limit the request to a user.
-	 *
-	 * @param IQueryBuilder $qb
-	 * @param string        $userId
-	 */
-	protected function limitToUserId(IQueryBuilder $qb, string $userId): void
-	{
-		$this->limitToDBField($qb, 'user_id', $userId);
-	}
-
-	/**
-	 * Limit the request to a site.
-	 *
-	 * @param IQueryBuilder $qb
-	 * @param string        $site
-	 */
-	protected function limitToSite(IQueryBuilder $qb, string $site): void
-	{
-		$this->limitToDBField($qb, 'site', $site);
-	}
-
-	/**
-	 * @param IQueryBuilder $qb
-	 * @param string        $field
-	 * @param mixed         $value
-	 */
-	private function limitToDBField(IQueryBuilder $qb, string $field, $value): void
-	{
-		$qb->andWhere($qb->expr()->eq($field, $qb->createNamedParameter($value)));
-	}
-}
diff --git a/lib/Migration/Version010000.php b/lib/Migration/Version010000.php
index 616e867d..037463d4 100644
--- a/lib/Migration/Version010000.php
+++ b/lib/Migration/Version010000.php
@@ -25,7 +25,7 @@
 namespace OCA\CMSPico\Migration;
 
 use Doctrine\DBAL\Schema\SchemaException;
-use OCA\CMSPico\Db\WebsitesRequestBuilder;
+use OCA\CMSPico\Db\WebsitesRequest;
 use OCA\CMSPico\Service\MiscService;
 use OCP\DB\ISchemaWrapper;
 use OCP\Migration\IOutput;
@@ -57,9 +57,9 @@ public function changeSchema(IOutput $output, \Closure $schemaClosure, array $op
 		$schema = $schemaClosure();
 
 		try {
-			$table = $schema->getTable(WebsitesRequestBuilder::TABLE_WEBSITES);
+			$table = $schema->getTable(WebsitesRequest::TABLE_NAME);
 		} catch (SchemaException $e) {
-			$table = $schema->createTable(WebsitesRequestBuilder::TABLE_WEBSITES);
+			$table = $schema->createTable(WebsitesRequest::TABLE_NAME);
 
 			$table->addColumn('id', 'integer', [
 				'autoincrement' => true,
diff --git a/lib/Migration/Version010000From000908.php b/lib/Migration/Version010000From000908.php
index 206d2746..23046354 100644
--- a/lib/Migration/Version010000From000908.php
+++ b/lib/Migration/Version010000From000908.php
@@ -24,7 +24,7 @@
 
 namespace OCA\CMSPico\Migration;
 
-use OCA\CMSPico\Db\WebsitesRequestBuilder;
+use OCA\CMSPico\Db\WebsitesRequest;
 use OCA\CMSPico\Files\FolderInterface;
 use OCA\CMSPico\Model\Template;
 use OCA\CMSPico\Model\Theme;
@@ -221,7 +221,7 @@ private function migratePrivateWebsites(array $themesMigrationMap): void
 	{
 		$qbUpdate = $this->databaseConnection->getQueryBuilder();
 		$qbUpdate
-			->update(WebsitesRequestBuilder::TABLE_WEBSITES)
+			->update(WebsitesRequest::TABLE_NAME)
 			->set('theme', $qbUpdate->createParameter('theme'))
 			->set('type', $qbUpdate->createParameter('type'))
 			->set('options', $qbUpdate->createParameter('options'))
@@ -229,7 +229,7 @@ private function migratePrivateWebsites(array $themesMigrationMap): void
 
 		$selectCursor = $this->databaseConnection->getQueryBuilder()
 			->select('id', 'site', 'theme', 'type', 'options')
-			->from(WebsitesRequestBuilder::TABLE_WEBSITES)
+			->from(WebsitesRequest::TABLE_NAME)
 			->execute();
 
 		while ($data = $selectCursor->fetch()) {

From a00542bf493ed16a6f383d377e139c3e8dad314e Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Thu, 8 Apr 2021 22:26:36 +0200
Subject: [PATCH 14/29] Fix DummyPluginFile

Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>
---
 lib/Model/DummyPluginFile.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Model/DummyPluginFile.php b/lib/Model/DummyPluginFile.php
index d20a6a2f..75185ed6 100644
--- a/lib/Model/DummyPluginFile.php
+++ b/lib/Model/DummyPluginFile.php
@@ -116,7 +116,7 @@ public function getName(): string
 	/**
 	 * {@inheritDoc}
 	 */
-	public function getParent(): string
+	public function getParentPath(): string
 	{
 		return '/';
 	}
@@ -124,7 +124,7 @@ public function getParent(): string
 	/**
 	 * {@inheritDoc}
 	 */
-	public function getParentNode(): FolderInterface
+	public function getParentFolder(): FolderInterface
 	{
 		throw new InvalidPathException();
 	}

From 4d066be33a9c10d1ea5f011552bbe4c29b7908ca Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Thu, 8 Apr 2021 22:32:07 +0200
Subject: [PATCH 15/29] Code cleanup

Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>
---
 lib/Controller/PicoController.php |  9 +--------
 lib/Model/Website.php             | 10 ++++++++++
 lib/Model/WebsiteCore.php         |  8 --------
 lib/Service/ConfigService.php     | 17 +++--------------
 lib/Service/WebsitesService.php   | 24 ++++++++++++------------
 5 files changed, 26 insertions(+), 42 deletions(-)

diff --git a/lib/Controller/PicoController.php b/lib/Controller/PicoController.php
index 66965e03..c15f3702 100644
--- a/lib/Controller/PicoController.php
+++ b/lib/Controller/PicoController.php
@@ -47,7 +47,6 @@
 use OCA\CMSPico\Http\PicoAssetResponse;
 use OCA\CMSPico\Http\PicoErrorResponse;
 use OCA\CMSPico\Http\PicoPageResponse;
-use OCA\CMSPico\Service\FileService;
 use OCA\CMSPico\Service\WebsitesService;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\Response;
@@ -66,9 +65,6 @@ class PicoController extends Controller
 	/** @var WebsitesService */
 	private $websitesService;
 
-	/** @var FileService */
-	private $fileService;
-
 	/**
 	 * PicoController constructor.
 	 *
@@ -76,21 +72,18 @@ class PicoController extends Controller
 	 * @param IUserSession    $userSession
 	 * @param IL10N           $l10n
 	 * @param WebsitesService $websitesService
-	 * @param FileService     $fileService
 	 */
 	public function __construct(
 		IRequest $request,
 		IUserSession $userSession,
 		IL10N $l10n,
-		WebsitesService $websitesService,
-		FileService $fileService
+		WebsitesService $websitesService
 	) {
 		parent::__construct(Application::APP_NAME, $request);
 
 		$this->userSession = $userSession;
 		$this->l10n = $l10n;
 		$this->websitesService = $websitesService;
-		$this->fileService = $fileService;
 	}
 
 	/**
diff --git a/lib/Model/Website.php b/lib/Model/Website.php
index 651b9e1c..01b87030 100644
--- a/lib/Model/Website.php
+++ b/lib/Model/Website.php
@@ -107,6 +107,14 @@ public function __construct($data = null)
 		parent::__construct($data);
 	}
 
+	/**
+	 * @return string
+	 */
+	public function getOptionsJSON(): string
+	{
+		return json_encode($this->getOptions());
+	}
+
 	/**
 	 * @return string
 	 */
@@ -280,6 +288,8 @@ public function getWebsitePath(): string
 	}
 
 	/**
+	 * @param bool $proxyRequest
+	 *
 	 * @return string
 	 */
 	public function getWebsiteUrl(bool $proxyRequest = false): string
diff --git a/lib/Model/WebsiteCore.php b/lib/Model/WebsiteCore.php
index 2e3648c1..29449c64 100644
--- a/lib/Model/WebsiteCore.php
+++ b/lib/Model/WebsiteCore.php
@@ -244,14 +244,6 @@ public function getOptions(): array
 		return $this->options;
 	}
 
-	/**
-	 * @return string
-	 */
-	public function getOptionsJSON(): string
-	{
-		return json_encode($this->options);
-	}
-
 	/**
 	 * @param string $path
 	 *
diff --git a/lib/Service/ConfigService.php b/lib/Service/ConfigService.php
index adccf46b..7699f2d5 100644
--- a/lib/Service/ConfigService.php
+++ b/lib/Service/ConfigService.php
@@ -64,7 +64,7 @@ class ConfigService
 	protected $config;
 
 	/** @var array<string,string> */
-	private $defaults;
+	protected $defaultValues;
 
 	/**
 	 * ConfigService constructor.
@@ -75,7 +75,7 @@ public function __construct(IConfig $config)
 	{
 		$this->config = $config;
 
-		$this->defaults = [
+		$this->defaultValues = [
 			self::SYSTEM_TEMPLATES => '',
 			self::CUSTOM_TEMPLATES => '',
 			self::SYSTEM_THEMES => '',
@@ -96,8 +96,7 @@ public function __construct(IConfig $config)
 	 */
 	public function getAppValue(string $key): string
 	{
-		$defaultValue = $this->getDefaultValue($key);
-		return $this->config->getAppValue(Application::APP_NAME, $key, $defaultValue);
+		return $this->config->getAppValue(Application::APP_NAME, $key, $this->defaultValues[$key] ?? '');
 	}
 
 	/**
@@ -127,14 +126,4 @@ public function getSystemValue(string $key, $defaultValue = '')
 	{
 		return $this->config->getSystemValue($key, $defaultValue);
 	}
-
-	/**
-	 * @param string $key
-	 *
-	 * @return string
-	 */
-	protected function getDefaultValue(string $key): string
-	{
-		return $this->defaults[$key] ?? '';
-	}
 }
diff --git a/lib/Service/WebsitesService.php b/lib/Service/WebsitesService.php
index 5ec999fe..2882bfc1 100644
--- a/lib/Service/WebsitesService.php
+++ b/lib/Service/WebsitesService.php
@@ -60,7 +60,7 @@ class WebsitesService
 	public const LINK_MODE_SHORT = 2;
 
 	/** @var WebsitesRequest */
-	private $websiteRequest;
+	private $websitesRequest;
 
 	/** @var IGroupManager */
 	private $groupManager;
@@ -100,7 +100,7 @@ public function __construct(
 		AssetsService $assetsService,
 		MiscService $miscService
 	) {
-		$this->websiteRequest = $websiteRequest;
+		$this->websitesRequest = $websiteRequest;
 		$this->groupManager = $groupManager;
 		$this->configService = $configService;
 		$this->templatesService = $templatesService;
@@ -134,7 +134,7 @@ public function createWebsite(Website $website, string $templateName): void
 		$website->assertValidTheme();
 
 		try {
-			$website = $this->websiteRequest->getWebsiteFromSite($website->getSite());
+			$this->websitesRequest->getWebsiteFromSite($website->getSite());
 			throw new WebsiteExistsException();
 		} catch (WebsiteNotFoundException $e) {
 			// in fact we want the website not to exist yet
@@ -143,7 +143,7 @@ public function createWebsite(Website $website, string $templateName): void
 		$this->templatesService->assertValidTemplate($templateName);
 		$this->templatesService->installTemplate($website, $templateName);
 
-		$this->websiteRequest->create($website);
+		$this->websitesRequest->create($website);
 	}
 
 	/**
@@ -163,7 +163,7 @@ public function createWebsite(Website $website, string $templateName): void
 	 */
 	public function updateWebsite(Website $website): void
 	{
-		$originalWebsite = $this->websiteRequest->getWebsiteFromId($website->getId());
+		$originalWebsite = $this->websitesRequest->getWebsiteFromId($website->getId());
 
 		if ($website->getName() !== $originalWebsite->getName()) {
 			$website->assertValidName();
@@ -178,7 +178,7 @@ public function updateWebsite(Website $website): void
 			$website->assertValidTheme();
 		}
 
-		$this->websiteRequest->update($website);
+		$this->websitesRequest->update($website);
 	}
 
 	/**
@@ -194,9 +194,9 @@ public function updateWebsite(Website $website): void
 	public function deleteWebsite(Website $website): void
 	{
 		// check whether website actually exists
-		$this->websiteRequest->getWebsiteFromId($website->getId());
+		$this->websitesRequest->getWebsiteFromId($website->getId());
 
-		$this->websiteRequest->delete($website);
+		$this->websitesRequest->delete($website);
 	}
 
 	/**
@@ -204,7 +204,7 @@ public function deleteWebsite(Website $website): void
 	 */
 	public function deleteUserWebsites(string $userId): void
 	{
-		$this->websiteRequest->deleteAllFromUserId($userId);
+		$this->websitesRequest->deleteAllFromUserId($userId);
 	}
 
 	/**
@@ -215,7 +215,7 @@ public function deleteUserWebsites(string $userId): void
 	 */
 	public function getWebsiteFromId(int $siteId): Website
 	{
-		return $this->websiteRequest->getWebsiteFromId($siteId);
+		return $this->websitesRequest->getWebsiteFromId($siteId);
 	}
 
 	/**
@@ -226,7 +226,7 @@ public function getWebsiteFromId(int $siteId): Website
 	 */
 	public function getWebsiteFromSite(string $site): Website
 	{
-		return $this->websiteRequest->getWebsiteFromSite($site);
+		return $this->websitesRequest->getWebsiteFromSite($site);
 	}
 
 	/**
@@ -236,7 +236,7 @@ public function getWebsiteFromSite(string $site): Website
 	 */
 	public function getWebsitesFromUser(string $userId): array
 	{
-		return $this->websiteRequest->getWebsitesFromUserId($userId);
+		return $this->websitesRequest->getWebsitesFromUserId($userId);
 	}
 
 	/**

From 7a373657621896e5fe0e863c2b36de6f932c1d6e Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Thu, 8 Apr 2021 22:34:05 +0200
Subject: [PATCH 16/29] Include website timezone in getPersonalWebsites()
 response

Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>
---
 js/personal.js        |  2 ++
 lib/Model/Website.php | 10 ++++++++++
 2 files changed, 12 insertions(+)

diff --git a/js/personal.js b/js/personal.js
index 91cac242..2c864b3c 100644
--- a/js/personal.js
+++ b/js/personal.js
@@ -144,6 +144,7 @@
 		 * @param {Object}   data.websites[].options
 		 * @param {string}   data.websites[].path
 		 * @param {int}      data.websites[].creation
+		 * @param {string}   data.websites[].timezone
 		 */
 		update: function (data) {
 			this.websites = data.websites;
@@ -190,6 +191,7 @@
 		 * @param {string[]} [websiteData.options.group_access]
 		 * @param {string}   websiteData.path
 		 * @param {int}      websiteData.creation
+		 * @param {string}   websiteData.timezone
 		 */
 		_setupItem: function ($website, websiteData) {
 			var that = this;
diff --git a/lib/Model/Website.php b/lib/Model/Website.php
index 01b87030..49bcb00e 100644
--- a/lib/Model/Website.php
+++ b/lib/Model/Website.php
@@ -124,6 +124,16 @@ public function getTimeZone(): string
 		return $this->config->getUserValue($this->getUserId(), 'core', 'timezone', $serverTimeZone);
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getData(): array
+	{
+		$data = parent::getData();
+		$data['timezone'] = $this->getTimeZone();
+		return $data;
+	}
+
 	/**
 	 * @throws WebsiteInvalidOwnerException
 	 */

From 984eb5578e983f73e8c4f80550b4c2b2c2d5ce9b Mon Sep 17 00:00:00 2001
From: Valdnet <47037905+Valdnet@users.noreply.github.com>
Date: Tue, 23 Nov 2021 08:45:32 +0100
Subject: [PATCH 17/29] l10n: Spelling unification

Spelling unification in Transifex.

Signed-off-by: Valdnet <47037905+Valdnet@users.noreply.github.com>
---
 templates/settings.admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/settings.admin.php b/templates/settings.admin.php
index e095def9..93e2d8e7 100644
--- a/templates/settings.admin.php
+++ b/templates/settings.admin.php
@@ -620,7 +620,7 @@
 				<p class="note"><?php p($l->t(
 					'After you\'ve configured your webserver to enable shortened URLs, you should select the '
 							. 'corresponding option above to let your users know about this feature. Don\'t enable '
-							. 'this option if you haven\'t configured the virtual "sites/" folder yet using one of the '
+							. 'this option if you have not configured the virtual "sites/" folder yet using one of the '
 							. 'configuration examples shown below.'
 				)); ?></p>
 			</form>

From 651084f042a6e74e1ec94e2a60340228fef0414b Mon Sep 17 00:00:00 2001
From: Valdnet <47037905+Valdnet@users.noreply.github.com>
Date: Tue, 23 Nov 2021 10:44:36 +0100
Subject: [PATCH 18/29] l10n: Spelling unification

Signed-off-by: Valdnet <47037905+Valdnet@users.noreply.github.com>
---
 templates/settings.admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/settings.admin.php b/templates/settings.admin.php
index 93e2d8e7..4e1505a7 100644
--- a/templates/settings.admin.php
+++ b/templates/settings.admin.php
@@ -618,7 +618,7 @@
 					</label>
 				</p>
 				<p class="note"><?php p($l->t(
-					'After you\'ve configured your webserver to enable shortened URLs, you should select the '
+					'After you have configured your web server to enable shortened URLs, you should select the '
 							. 'corresponding option above to let your users know about this feature. Don\'t enable '
 							. 'this option if you have not configured the virtual "sites/" folder yet using one of the '
 							. 'configuration examples shown below.'

From a4fdb3779dd19d5642db306312ee31a1534b025a Mon Sep 17 00:00:00 2001
From: Valdnet <47037905+Valdnet@users.noreply.github.com>
Date: Tue, 23 Nov 2021 10:50:30 +0100
Subject: [PATCH 19/29] l10n: Spelling unification

Signed-off-by: Valdnet <47037905+Valdnet@users.noreply.github.com>
---
 templates/settings.admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/settings.admin.php b/templates/settings.admin.php
index 4e1505a7..8ad2655a 100644
--- a/templates/settings.admin.php
+++ b/templates/settings.admin.php
@@ -619,7 +619,7 @@
 				</p>
 				<p class="note"><?php p($l->t(
 					'After you have configured your web server to enable shortened URLs, you should select the '
-							. 'corresponding option above to let your users know about this feature. Don\'t enable '
+							. 'corresponding option above to let your users know about this feature. Do not enable '
 							. 'this option if you have not configured the virtual "sites/" folder yet using one of the '
 							. 'configuration examples shown below.'
 				)); ?></p>

From f6c0bfca1b4943efc3f2f132a7d761aae91e5bb6 Mon Sep 17 00:00:00 2001
From: Valdnet <47037905+Valdnet@users.noreply.github.com>
Date: Tue, 23 Nov 2021 12:29:11 +0100
Subject: [PATCH 20/29] l10n: Separate words

Signed-off-by: Valdnet <47037905+Valdnet@users.noreply.github.com>
---
 lib/Service/MiscService.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Service/MiscService.php b/lib/Service/MiscService.php
index 54c7876c..2d6e223f 100644
--- a/lib/Service/MiscService.php
+++ b/lib/Service/MiscService.php
@@ -275,8 +275,8 @@ public function checkPublicFolder(): void
 			}
 
 			throw new FilesystemNotWritableException($this->l10n->t(
-				'Failed to enable Pico CMS for Nextcloud: The webserver has no permission to create files and '
-						. 'folders below "%s". Make sure to give the webserver write access to this directory by '
+				'Failed to enable Pico CMS for Nextcloud: The web server has no permission to create files and '
+						. 'folders below "%s". Make sure to give the web server write access to this directory by '
 						. 'changing its permissions and ownership to the same as of your "%s" directory. Then try '
 						. 'again enabling Pico CMS for Nextcloud.',
 				[ $appDataPublicPath, $dataPath ]

From 0c7698ded0fefb5bf647af59b3ae010ae6bdea78 Mon Sep 17 00:00:00 2001
From: Valdnet <47037905+Valdnet@users.noreply.github.com>
Date: Tue, 23 Nov 2021 12:41:01 +0100
Subject: [PATCH 21/29] l10n: Separate words

Signed-off-by: Valdnet <47037905+Valdnet@users.noreply.github.com>
---
 templates/settings.admin.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/templates/settings.admin.php b/templates/settings.admin.php
index 8ad2655a..4643afb3 100644
--- a/templates/settings.admin.php
+++ b/templates/settings.admin.php
@@ -565,9 +565,9 @@
 </article>
 
 <article class="section">
-	<h2><?php p($l->t('Configure your webserver')); ?></h2>
+	<h2><?php p($l->t('Configure your webs erver')); ?></h2>
 	<p class="settings-hint"><?php p($l->t(
-		'Enable Pico CMS for Nextcloud\'s full potential by configuring your webserver appropriately.'
+		'Enable Pico CMS for Nextcloud\'s full potential by configuring your web server appropriately.'
 	)); ?></p>
 
 	<div class="message large">
@@ -575,12 +575,12 @@
 		<div>
 			<p><?php p($l->t(
 				'Depending on your webserver\'s configuration, users can access their websites using different URLs. '
-						. 'By default, users can access their websites using Pico CMS for Nextcloud\'s full '
+						. 'By default, users can access their web sites using Pico CMS for Nextcloud\'s full '
 						. 'application URL. However, these URLs are pretty long and thus not very user-friendly. For '
 						. 'this reason, Pico CMS for Nextcloud also supports shortened URLs utilizing the virtual '
-						. '"sites/" folder. However, using this feature requires some additional webserver '
-						. 'configuration. If you\'re using the Apache webserver, try one of the first two examples '
-						. 'shown below. If you\'re rather using the nginx webserver, try one of last two examples. If '
+						. '"sites/" folder. However, using this feature requires some additional web server '
+						. 'configuration. If you\'re using the Apache web server, try one of the first two examples '
+						. 'shown below. If you\'re rather using the nginx web server, try one of last two examples. If '
 						. 'you don\'t really understand what\'s going on, contact your server administrator and send '
 						. 'him the information below. If your server administrator tells you this isn\'t possible, '
 						. 'don\'t despair - you can still use Pico CMS for Nextcloud\'s full application URLs, they '
@@ -648,7 +648,7 @@
 			<p><?php p($l->t(
 				'Copy the config snippet above to Nextcloud\'s <VirtualHost …> section of your apache.conf. Before '
 						. 'doing so you must enable both Apache\'s mod_proxy and mod_proxy_http modules. Otherwise '
-						. 'your webserver will either refuse to (re)start or yield a 500 Internal Server Error.'
+						. 'your web server will either refuse to (re)start or yield a 500 Internal Server Error.'
 			)); ?></p>
 		</section>
 	</section>
@@ -670,7 +670,7 @@
 			</p>
 			<p><?php p($l->t(
 				'Before copying the config snippet above to Nextcloud\'s <VirtualHost …> section of your apache.conf, '
-						. 'make sure to enable Apache\'s mod_rewrite module. Otherwise your webserver will refuse to '
+						. 'make sure to enable Apache\'s mod_rewrite module. Otherwise your web server will refuse to '
 						. '(re)start or yield a 500 Internal Server Error. Please note that this config won\'t '
 						. 'actually let you use shortened URLs, it just redirects users from shortened URLs to the '
 						. 'site\'s full URL. Thus you should prefer the solution utilizing mod_proxy shown above.'
@@ -702,7 +702,7 @@
 			</p>
 			<p><?php p($l->t(
 				'Copy the config snippet above to Nextcloud\'s server { … } section of your nginx.conf. Before doing '
-						. 'doing so you must enable nginx\'s ngx_http_proxy_module module. Otherwise your webserver '
+						. 'doing so you must enable nginx\'s ngx_http_proxy_module module. Otherwise your web server '
 						. 'will either refuse to (re)start or yield a 500 Internal Server Error.'
 			)); ?></p>
 		</section>

From 33405416b744b7fd778731037e97c9511ca7c9fe Mon Sep 17 00:00:00 2001
From: Valdnet <47037905+Valdnet@users.noreply.github.com>
Date: Tue, 23 Nov 2021 12:52:50 +0100
Subject: [PATCH 22/29] l10n: Spelling unification

Signed-off-by: Valdnet <47037905+Valdnet@users.noreply.github.com>
---
 templates/settings.admin.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/settings.admin.php b/templates/settings.admin.php
index 4643afb3..62e388a7 100644
--- a/templates/settings.admin.php
+++ b/templates/settings.admin.php
@@ -574,16 +574,16 @@
 		<div class="icon icon-info"></div>
 		<div>
 			<p><?php p($l->t(
-				'Depending on your webserver\'s configuration, users can access their websites using different URLs. '
+				'Depending on your web server\'s configuration, users can access their websites using different URLs. '
 						. 'By default, users can access their web sites using Pico CMS for Nextcloud\'s full '
 						. 'application URL. However, these URLs are pretty long and thus not very user-friendly. For '
 						. 'this reason, Pico CMS for Nextcloud also supports shortened URLs utilizing the virtual '
 						. '"sites/" folder. However, using this feature requires some additional web server '
 						. 'configuration. If you\'re using the Apache web server, try one of the first two examples '
 						. 'shown below. If you\'re rather using the nginx web server, try one of last two examples. If '
-						. 'you don\'t really understand what\'s going on, contact your server administrator and send '
+						. 'you do not really understand what\'s going on, contact your server administrator and send '
 						. 'him the information below. If your server administrator tells you this isn\'t possible, '
-						. 'don\'t despair - you can still use Pico CMS for Nextcloud\'s full application URLs, they '
+						. 'do not despair - you can still use Pico CMS for Nextcloud\'s full application URLs, they '
 						. 'always work out-of-the-box.'
 			)); ?></p>
 		</div>

From a29b1746394d975eeb6864dd9de6107fe2d4d6a4 Mon Sep 17 00:00:00 2001
From: Valdnet <47037905+Valdnet@users.noreply.github.com>
Date: Tue, 23 Nov 2021 13:02:28 +0100
Subject: [PATCH 23/29] l10n: Separate words

Signed-off-by: Valdnet <47037905+Valdnet@users.noreply.github.com>
---
 templates/settings.admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/settings.admin.php b/templates/settings.admin.php
index 62e388a7..b3e9a43f 100644
--- a/templates/settings.admin.php
+++ b/templates/settings.admin.php
@@ -565,7 +565,7 @@
 </article>
 
 <article class="section">
-	<h2><?php p($l->t('Configure your webs erver')); ?></h2>
+	<h2><?php p($l->t('Configure your web server')); ?></h2>
 	<p class="settings-hint"><?php p($l->t(
 		'Enable Pico CMS for Nextcloud\'s full potential by configuring your web server appropriately.'
 	)); ?></p>

From d3c3c30760b937585079a035cb8f7ef2e8b34bb1 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Mon, 17 Jan 2022 14:50:15 +0100
Subject: [PATCH 24/29] Fix removal of WebsitesRequestBuilder

Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>
---
 lib/Migration/Version010000.php |  8 ++++----
 lib/Migration/Version010017.php | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/Migration/Version010000.php b/lib/Migration/Version010000.php
index 4d83ce07..a83e0585 100644
--- a/lib/Migration/Version010000.php
+++ b/lib/Migration/Version010000.php
@@ -108,12 +108,12 @@ public function changeSchema(IOutput $output, \Closure $schemaClosure, array $op
 			$themeColumn->setLength(64);
 		}
 
-		if (!$table->hasIndex(WebsitesRequestBuilder::TABLE_WEBSITES . '_user_id')) {
-			$table->addIndex([ 'user_id' ], WebsitesRequestBuilder::TABLE_WEBSITES . '_user_id');
+		if (!$table->hasIndex(WebsitesRequest::TABLE_NAME . '_user_id')) {
+			$table->addIndex([ 'user_id' ], WebsitesRequest::TABLE_NAME . '_user_id');
 		}
 
-		if (!$table->hasIndex(WebsitesRequestBuilder::TABLE_WEBSITES . '_site')) {
-			$table->addIndex([ 'site' ], WebsitesRequestBuilder::TABLE_WEBSITES . '_site');
+		if (!$table->hasIndex(WebsitesRequest::TABLE_NAME . '_site')) {
+			$table->addIndex([ 'site' ], WebsitesRequest::TABLE_NAME . '_site');
 		}
 
 		return $schema;
diff --git a/lib/Migration/Version010017.php b/lib/Migration/Version010017.php
index 6ef834fd..1713b406 100644
--- a/lib/Migration/Version010017.php
+++ b/lib/Migration/Version010017.php
@@ -24,7 +24,7 @@
 
 namespace OCA\CMSPico\Migration;
 
-use OCA\CMSPico\Db\WebsitesRequestBuilder;
+use OCA\CMSPico\Db\WebsitesRequest;
 use OCP\DB\ISchemaWrapper;
 use OCP\Migration\IOutput;
 use OCP\Migration\SimpleMigrationStep;
@@ -43,22 +43,22 @@ public function changeSchema(IOutput $output, \Closure $schemaClosure, array $op
 		/** @var ISchemaWrapper $schema */
 		$schema = $schemaClosure();
 
-		$table = $schema->getTable(WebsitesRequestBuilder::TABLE_WEBSITES);
+		$table = $schema->getTable(WebsitesRequest::TABLE_NAME);
 
 		if ($table->hasIndex('user_id')) {
 			$table->dropIndex('user_id');
 		}
 
-		if (!$table->hasIndex(WebsitesRequestBuilder::TABLE_WEBSITES . '_user_id')) {
-			$table->addIndex([ 'user_id' ], WebsitesRequestBuilder::TABLE_WEBSITES . '_user_id');
+		if (!$table->hasIndex(WebsitesRequest::TABLE_NAME . '_user_id')) {
+			$table->addIndex([ 'user_id' ], WebsitesRequest::TABLE_NAME . '_user_id');
 		}
 
 		if ($table->hasIndex('site')) {
 			$table->dropIndex('site');
 		}
 
-		if (!$table->hasIndex(WebsitesRequestBuilder::TABLE_WEBSITES . '_site')) {
-			$table->addIndex([ 'site' ], WebsitesRequestBuilder::TABLE_WEBSITES . '_site');
+		if (!$table->hasIndex(WebsitesRequest::TABLE_NAME . '_site')) {
+			$table->addIndex([ 'site' ], WebsitesRequest::TABLE_NAME . '_site');
 		}
 
 		return $schema;

From 4c035187e847f0341350fbf884aa5e80c97be984 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Mon, 17 Jan 2022 15:22:36 +0100
Subject: [PATCH 25/29] Remove direct usage of WebsiteCore::TYPE_*

Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>
---
 lib/Migration/Version010000From000908.php                 | 8 ++++----
 lib/Model/WebsiteRequest.php                              | 2 +-
 lib/Service/AssetsService.php                             | 3 +--
 .../Integration/Stage1/PicoControllerIntegrationTest.php  | 3 +--
 .../Stage1/WebsitesControllerIntegrationTest.php          | 5 ++---
 tests/Utils/Manager/TestWebsitesManager.php               | 3 +--
 6 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/lib/Migration/Version010000From000908.php b/lib/Migration/Version010000From000908.php
index 23046354..377eadfd 100644
--- a/lib/Migration/Version010000From000908.php
+++ b/lib/Migration/Version010000From000908.php
@@ -28,7 +28,7 @@
 use OCA\CMSPico\Files\FolderInterface;
 use OCA\CMSPico\Model\Template;
 use OCA\CMSPico\Model\Theme;
-use OCA\CMSPico\Model\WebsiteCore;
+use OCA\CMSPico\Model\Website;
 use OCA\CMSPico\Service\ConfigService;
 use OCA\CMSPico\Service\FileService;
 use OCA\CMSPico\Service\PicoService;
@@ -235,10 +235,10 @@ private function migratePrivateWebsites(array $themesMigrationMap): void
 		while ($data = $selectCursor->fetch()) {
 			$websiteTheme = $themesMigrationMap[$data['theme']] ?? $data['theme'];
 
-			$websiteType = $data['type'] ?: WebsiteCore::TYPE_PUBLIC;
+			$websiteType = $data['type'] ?: Website::TYPE_PUBLIC;
 			$websiteOptions = $data['options'] ? json_decode($data['options'], true) : [];
 			if (isset($websiteOptions['private'])) {
-				$websiteType = $websiteOptions['private'] ? WebsiteCore::TYPE_PRIVATE : WebsiteCore::TYPE_PUBLIC;
+				$websiteType = $websiteOptions['private'] ? Website::TYPE_PRIVATE : Website::TYPE_PUBLIC;
 				unset($websiteOptions['private']);
 			}
 
@@ -252,7 +252,7 @@ private function migratePrivateWebsites(array $themesMigrationMap): void
 			$this->logInfo(
 				'Migrating Pico CMS website "%s" (private: %s, theme: "%s")',
 				$data['site'],
-				($websiteType === WebsiteCore::TYPE_PRIVATE) ? 'yes' : 'no',
+				($websiteType === Website::TYPE_PRIVATE) ? 'yes' : 'no',
 				$websiteTheme
 			);
 
diff --git a/lib/Model/WebsiteRequest.php b/lib/Model/WebsiteRequest.php
index 28fb5e00..f069e09c 100644
--- a/lib/Model/WebsiteRequest.php
+++ b/lib/Model/WebsiteRequest.php
@@ -92,7 +92,7 @@ public function __construct(Website $website, string $viewer = null, string $pag
 	public function assertViewerAccess(string $path, array $meta = []): void
 	{
 		$exceptionClass = WebsiteNotPermittedException::class;
-		if ($this->website->getType() === WebsiteCore::TYPE_PUBLIC) {
+		if ($this->website->getType() === Website::TYPE_PUBLIC) {
 			if (empty($meta['access'])) {
 				return;
 			}
diff --git a/lib/Service/AssetsService.php b/lib/Service/AssetsService.php
index 117b5662..c958f052 100644
--- a/lib/Service/AssetsService.php
+++ b/lib/Service/AssetsService.php
@@ -33,7 +33,6 @@
 use OCA\CMSPico\Files\StorageFolder;
 use OCA\CMSPico\Model\PicoAsset;
 use OCA\CMSPico\Model\Website;
-use OCA\CMSPico\Model\WebsiteCore;
 use OCA\CMSPico\Model\WebsiteRequest;
 use OCP\Files\InvalidPathException;
 use OCP\Files\NotFoundException;
@@ -72,7 +71,7 @@ public function getAsset(WebsiteRequest $websiteRequest): PicoAsset
 
 			/** @var StorageFile $assetFile */
 			$assetFile = $this->getAssetsFolder($website)->getFile($asset);
-			$picoAsset = new PicoAsset($assetFile, $website->getType() === WebsiteCore::TYPE_PUBLIC);
+			$picoAsset = new PicoAsset($assetFile, $website->getType() === Website::TYPE_PUBLIC);
 		} catch (InvalidPathException $e) {
 			throw new AssetInvalidPathException($e);
 		} catch (NotFoundException $e) {
diff --git a/tests/Integration/Stage1/PicoControllerIntegrationTest.php b/tests/Integration/Stage1/PicoControllerIntegrationTest.php
index fce9c3d6..ec22833f 100644
--- a/tests/Integration/Stage1/PicoControllerIntegrationTest.php
+++ b/tests/Integration/Stage1/PicoControllerIntegrationTest.php
@@ -29,7 +29,6 @@
 use OCA\CMSPico\Http\PicoAssetResponse;
 use OCA\CMSPico\Http\PicoPageResponse;
 use OCA\CMSPico\Model\Website;
-use OCA\CMSPico\Model\WebsiteCore;
 use OCA\CMSPico\Tests\TestCase;
 use OCA\CMSPico\Tests\Utils\Manager\TestUsersManager;
 use OCA\CMSPico\Tests\Utils\Manager\TestWebsitesManager;
@@ -70,7 +69,7 @@ protected function setUp(): void
 
 		$this->testWebsitesManager->createTestWebsite('private', [
 			'user_id' => $ownerUserId,
-			'type' => WebsiteCore::TYPE_PRIVATE,
+			'type' => Website::TYPE_PRIVATE,
 		]);
 
 		// setup controller
diff --git a/tests/Integration/Stage1/WebsitesControllerIntegrationTest.php b/tests/Integration/Stage1/WebsitesControllerIntegrationTest.php
index 465ebea5..bc279a85 100644
--- a/tests/Integration/Stage1/WebsitesControllerIntegrationTest.php
+++ b/tests/Integration/Stage1/WebsitesControllerIntegrationTest.php
@@ -26,7 +26,6 @@
 
 use OCA\CMSPico\Controller\WebsitesController;
 use OCA\CMSPico\Model\Website;
-use OCA\CMSPico\Model\WebsiteCore;
 use OCA\CMSPico\Tests\TestCase;
 use OCA\CMSPico\Tests\Utils\Manager\TestUsersManager;
 use OCA\CMSPico\Tests\Utils\Manager\TestWebsitesManager;
@@ -144,11 +143,11 @@ public function testUpdatePersonalWebsite(): void
 		$website1 = $this->testWebsitesManager->getTestWebsite('test1');
 
 		$response = $this->controller->updatePersonalWebsite($website1->getId(), [
-			'type' => WebsiteCore::TYPE_PRIVATE
+			'type' => Website::TYPE_PRIVATE
 		]);
 
 		$this->assertWebsitesResponse($response, [
-			array_merge($website1->getData(), [ 'type' => WebsiteCore::TYPE_PRIVATE ]),
+			array_merge($website1->getData(), [ 'type' => Website::TYPE_PRIVATE ]),
 			$this->testWebsitesManager->getTestWebsite('test2')->getData(),
 		]);
 
diff --git a/tests/Utils/Manager/TestWebsitesManager.php b/tests/Utils/Manager/TestWebsitesManager.php
index a80e2605..d8d35dff 100644
--- a/tests/Utils/Manager/TestWebsitesManager.php
+++ b/tests/Utils/Manager/TestWebsitesManager.php
@@ -25,7 +25,6 @@
 namespace OCA\CMSPico\Tests\Utils\Manager;
 
 use OCA\CMSPico\Model\Website;
-use OCA\CMSPico\Model\WebsiteCore;
 use OCA\CMSPico\Service\WebsitesService;
 
 class TestWebsitesManager extends TestManager
@@ -44,7 +43,7 @@ class TestWebsitesManager extends TestManager
 		'user_id'  => '{user_id}',
 		'site'     => '{site}',
 		'name'     => 'Pico Test Website "{id}" ({site})',
-		'type'     => WebsiteCore::TYPE_PUBLIC,
+		'type'     => Website::TYPE_PUBLIC,
 		'path'     => '/Pico Test Website {site}/',
 		'theme'    => 'default',
 		'options'  => [],

From e70d70598a35f801d5ec01a18cbfe67dda075f53 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Mon, 17 Jan 2022 15:25:42 +0100
Subject: [PATCH 26/29] Composer: Whitelist picocms/composer-installer plugin

Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>
---
 composer.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 20bd4d09..3a7038c6 100644
--- a/composer.json
+++ b/composer.json
@@ -39,5 +39,10 @@
     "pico-plugin-dir": "appdata/plugins/"
   },
   "minimum-stability": "beta",
-  "prefer-stable": true
+  "prefer-stable": true,
+  "config": {
+    "allow-plugins": {
+      "picocms/*": true
+    }
+  }
 }

From e275728c6874a927ec62c414a2306611c9ad74f6 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Mon, 17 Jan 2022 15:48:55 +0100
Subject: [PATCH 27/29] Code cleanup

Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>
---
 js/admin.js                                              | 5 -----
 js/personal.js                                           | 7 -------
 js/pico.js                                               | 9 ++++-----
 lib/Model/Website.php                                    | 5 -----
 .../Integration/Stage1/PicoControllerIntegrationTest.php | 3 ---
 tests/Integration/Stage2/PicoIntegrationTest.php         | 3 ---
 6 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/js/admin.js b/js/admin.js
index 620d40f1..da65b514 100644
--- a/js/admin.js
+++ b/js/admin.js
@@ -207,7 +207,6 @@
 
 			if ($newItem.val()) {
 				$newItemButton.on('click.CMSPicoAdminList', function (event) {
-					event.preventDefault();
 					that._api('POST', '', { item: $newItem.val() });
 				});
 			} else {
@@ -215,7 +214,6 @@
 			}
 
 			this.$element.find('.action-reload').on('click.CMSPicoAdminList', function (event) {
-				event.preventDefault();
 				that.reload();
 			});
 		},
@@ -259,7 +257,6 @@
 			});
 
 			$item.find('.action-sync').on('click.CMSPicoAdminList', function (event) {
-				event.preventDefault();
 				that._api('POST', itemData.name);
 			});
 
@@ -288,13 +285,11 @@
 				});
 
 				$this.on('click.CMSPicoAdminList', function (event) {
-					event.preventDefault();
 					dialog.open();
 				});
 			});
 
 			$item.find('.action-delete').on('click.CMSPicoAdminList', function (event) {
-				event.preventDefault();
 				that._api('DELETE', itemData.name);
 			});
 		}
diff --git a/js/personal.js b/js/personal.js
index 2c864b3c..e92fc6de 100644
--- a/js/personal.js
+++ b/js/personal.js
@@ -238,7 +238,6 @@
 				});
 
 				$this.on('click.CMSPicoWebsiteList', function (event) {
-					event.preventDefault();
 					dialog.open();
 				});
 			});
@@ -256,7 +255,6 @@
 			});
 
 			$website.find('.action-rename').on('click.CMSPicoWebsiteList', function (event) {
-				event.preventDefault();
 				nameEditable.toggle();
 			});
 
@@ -273,8 +271,6 @@
 
 			// delete website
 			$website.find('.action-delete').on('click.CMSPicoWebsiteList', function (event) {
-				event.preventDefault();
-
 				var dialogTitle = t('cms_pico', 'Confirm website deletion'),
 					dialogText = t('cms_pico', 'This operation will delete the website "{name}". However, all of ' +
 							'its contents will still be available in your Nextcloud.', { name: websiteData.name });
@@ -301,7 +297,6 @@
 					$element.attr('href', url);
 				} else {
 					$element.on('click.CMSPicoWebsiteList', function (event) {
-						event.preventDefault();
 						OC.redirect(url);
 					});
 				}
@@ -383,8 +378,6 @@
 			});
 
 			$path.on('click.CMSPicoWebsiteForm', function (event) {
-				event.preventDefault();
-
 				OC.dialogs.filepicker(
 					t('cms_pico', 'Choose website directory'),
 					function (path, type) {
diff --git a/js/pico.js b/js/pico.js
index addefb00..163ff82d 100644
--- a/js/pico.js
+++ b/js/pico.js
@@ -199,7 +199,6 @@
 			}
 
 			$error.find('.action-reload').on('click.CMSPicoList', function (event) {
-				event.preventDefault();
 				that.reload();
 			});
 		}
@@ -552,8 +551,8 @@
 	 * @class
 	 * @extends OCA.CMSPico.Events
 	 *
-	 * @param {jQuery}   $element
-	 * @param {jQuery}   $input
+	 * @param {jQuery} $element
+	 * @param {jQuery} $input
 	 */
 	OCA.CMSPico.Editable = function ($element, $input) {
 		this.initialize($element, $input);
@@ -581,8 +580,8 @@
 		/**
 		 * @constructs
 		 *
-		 * @param {jQuery}   $element
-		 * @param {jQuery}   $input
+		 * @param {jQuery} $element
+		 * @param {jQuery} $input
 		 */
 		initialize: function ($element, $input) {
 			this.$element = $element;
diff --git a/lib/Model/Website.php b/lib/Model/Website.php
index 49bcb00e..f7cf88d0 100644
--- a/lib/Model/Website.php
+++ b/lib/Model/Website.php
@@ -34,7 +34,6 @@
 use OCA\CMSPico\Exceptions\WebsiteInvalidOwnerException;
 use OCA\CMSPico\Files\StorageFolder;
 use OCA\CMSPico\Service\MiscService;
-use OCA\CMSPico\Service\TemplatesService;
 use OCA\CMSPico\Service\ThemesService;
 use OCA\CMSPico\Service\WebsitesService;
 use OCP\Files\InvalidPathException;
@@ -79,9 +78,6 @@ class Website extends WebsiteCore
 	/** @var ThemesService */
 	private $themesService;
 
-	/** @var TemplatesService */
-	private $templatesService;
-
 	/** @var MiscService */
 	private $miscService;
 
@@ -101,7 +97,6 @@ public function __construct($data = null)
 		$this->urlGenerator = \OC::$server->getURLGenerator();
 		$this->websitesService = \OC::$server->query(WebsitesService::class);
 		$this->themesService = \OC::$server->query(ThemesService::class);
-		$this->templatesService = \OC::$server->query(TemplatesService::class);
 		$this->miscService = \OC::$server->query(MiscService::class);
 
 		parent::__construct($data);
diff --git a/tests/Integration/Stage1/PicoControllerIntegrationTest.php b/tests/Integration/Stage1/PicoControllerIntegrationTest.php
index ec22833f..7aeb75d6 100644
--- a/tests/Integration/Stage1/PicoControllerIntegrationTest.php
+++ b/tests/Integration/Stage1/PicoControllerIntegrationTest.php
@@ -48,9 +48,6 @@ class PicoControllerIntegrationTest extends TestCase
 	/** @var TestWebsitesManager */
 	protected $testWebsitesManager;
 
-	/** @var Website */
-	protected $website;
-
 	protected function setUp(): void
 	{
 		parent::setUp();
diff --git a/tests/Integration/Stage2/PicoIntegrationTest.php b/tests/Integration/Stage2/PicoIntegrationTest.php
index 8615f487..c66e4247 100644
--- a/tests/Integration/Stage2/PicoIntegrationTest.php
+++ b/tests/Integration/Stage2/PicoIntegrationTest.php
@@ -52,9 +52,6 @@ class PicoIntegrationTest extends TestCase
 	/** @var TestWebsitesManager */
 	protected $testWebsitesManager;
 
-	/** @var Website */
-	protected $website;
-
 	/** @var bool */
 	protected static $websiteSetUp = false;
 

From 5faacb0fac54f9fb11d64810f0f98500c79f5d88 Mon Sep 17 00:00:00 2001
From: Daniel Rudolf <github.com@daniel-rudolf.de>
Date: Mon, 17 Jan 2022 16:56:04 +0100
Subject: [PATCH 28/29] Bump version

Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>
---
 appinfo/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 63f70ee9..fa9d3214 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -23,7 +23,7 @@ You want to learn more about Pico CMS for Nextcloud? Easy! Just download and ena
 
 ]]>
 	</description>
-	<version>1.0.17</version>
+	<version>1.1.0-beta.1</version>
 	<licence>agpl</licence>
 	<author homepage="https://github.com/daita">Maxence Lange</author>
 	<author homepage="https://github.com/PhrozenByte">Daniel Rudolf</author>

From 001b7d2c074b097afc79cd07078fcd5e5f87ed19 Mon Sep 17 00:00:00 2001
From: Valdnet <47037905+Valdnet@users.noreply.github.com>
Date: Mon, 17 Jan 2022 17:48:03 +0100
Subject: [PATCH 29/29] l10n: Combine words

Signed-off-by: Valdnet <47037905+Valdnet@users.noreply.github.com>
---
 templates/settings.admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/settings.admin.php b/templates/settings.admin.php
index b3e9a43f..ca3ef610 100644
--- a/templates/settings.admin.php
+++ b/templates/settings.admin.php
@@ -575,7 +575,7 @@
 		<div>
 			<p><?php p($l->t(
 				'Depending on your web server\'s configuration, users can access their websites using different URLs. '
-						. 'By default, users can access their web sites using Pico CMS for Nextcloud\'s full '
+						. 'By default, users can access their websites using Pico CMS for Nextcloud\'s full '
 						. 'application URL. However, these URLs are pretty long and thus not very user-friendly. For '
 						. 'this reason, Pico CMS for Nextcloud also supports shortened URLs utilizing the virtual '
 						. '"sites/" folder. However, using this feature requires some additional web server '