Merge branch '6.2' into 6.2-captcha

# Conflicts: # wcfsetup/install/files/lib/data/TI18nDatabaseObjectAction.class.php
WoltLab · Nov 26, 2024 · 1a410bd · 1a410bd
2 parents 983bacc + 8ff1df0
commit 1a410bd
Show file tree

Hide file tree

Showing 365 changed files with 6,992 additions and 24,996 deletions.
diff --git a/.github/workflows/javascript.yml b/.github/workflows/javascript.yml
@@ -68,3 +68,6 @@ jobs:
     - name: "Check '@ckeditor/ckeditor5-inspector'"
       run: |
         diff -wu wcfsetup/install/files/js/3rdParty/ckeditor/ckeditor5-inspector/inspector.js node_modules/@ckeditor/ckeditor5-inspector/build/inspector.js
+    - name: "Check '@fancyapps/ui'"
+      run: |
+        diff -wu wcfsetup/install/files/js/3rdParty/fancybox/fancybox.umd.js node_modules/@fancyapps/ui/dist/fancybox/fancybox.umd.js
diff --git a/.github/workflows/wcfsetup.yml b/.github/workflows/wcfsetup.yml
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 WoltLab Suite Core is a free CMS and web-framework, designed for awesome websites and communities.
 Cutting-edge technologies and strict object-oriented programming makes it the ideal choice for developers and communities, and is actively maintained and improved by WoltLab.
 
-# About CKEditor 5
+## About CKEditor 5
 
 CKEditor 5 is a WYISWYG editor created by CKSource Holding sp. z o.o, Copyright (c) 2003-2023.
 
@@ -12,6 +12,15 @@ You may use this instance of CKEditor 5 with any plugin or app built on top of W
 
 If you would like to use CKEditor 5 yourself and are not building on top of WoltLab Suite Core then please visit https://ckeditor.com/pricing/ to learn more.
 
+## About Fancybox
+
+Fancybox is a lightbox alternative created by Jānis Skarnelis.
+
+This repository includes a build artifact of Fancybox that is comerically licensed to WoltLab GmbH.
+You may use this instance of Fancybox with any plugin or app built on top of WoltLab Suite Core only.
+
+If you would like to use Fancybox yourself and are not building on top of WoltLab Suite Core then please visit https://fancyapps.com/pricing/ to learn more.
+
 ## License
 
 This library is free software; you can redistribute it and/or

diff --git a/com.woltlab.wcf/acpTemplateDelete.xml b/com.woltlab.wcf/acpTemplateDelete.xml
@@ -154,5 +154,6 @@
 		<template>__audioAttachmentBBCode</template>
 		<template>__multiPageCondition</template>
 		<template>__multilineItemListFormField</template>
+		<template>imageViewer</template>
 	</delete>
 </data>
diff --git a/com.woltlab.wcf/fileDelete.xml b/com.woltlab.wcf/fileDelete.xml
@@ -1291,6 +1291,7 @@
 		<file>js/WCF.Comment.min.js</file>
 		<file>js/WCF.Core.min.js</file>
 		<file>js/WCF.ImageViewer.min.js</file>
+		<file>js/WCF.ImageViewer.js</file>
 		<file>js/WCF.Label.min.js</file>
 		<file>js/WCF.Like.js</file>
 		<file>js/WCF.Like.min.js</file>
@@ -2165,6 +2166,39 @@
 		<file>lib/system/api/paragonie/random_compat/other/build_phar.php</file>
 		<file>lib/system/api/paragonie/random_compat/psalm-autoload.php</file>
 		<file>lib/system/api/paragonie/random_compat/psalm.xml</file>
+		<file>lib/system/api/paragonie/sodium_compat/autoload-php7.php</file>
+		<file>lib/system/api/paragonie/sodium_compat/composer-php52.json</file>
+		<file>lib/system/api/paragonie/sodium_compat/lib/constants.php</file>
+		<file>lib/system/api/paragonie/sodium_compat/lib/sodium_compat.php</file>
+		<file>lib/system/api/paragonie/sodium_compat/src/Core32/BLAKE2b.php</file>
+		<file>lib/system/api/paragonie/sodium_compat/src/Core32/ChaCha20.php</file>
+		<file>lib/system/api/paragonie/sodium_compat/src/Core32/ChaCha20/Ctx.php</file>
+		<file>lib/system/api/paragonie/sodium_compat/src/Core32/ChaCha20/IetfCtx.php</file>
+		<file>lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519.php</file>
+		<file>lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519/Fe.php</file>
+		<file>lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519/Ge/Cached.php</file>
+		<file>lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519/Ge/P1p1.php</file>
+		<file>lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519/Ge/P2.php</file>
+		<file>lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519/Ge/P3.php</file>
+		<file>lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519/Ge/Precomp.php</file>
+		<file>lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519/H.php</file>
+		<file>lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519/README.md</file>
+		<file>lib/system/api/paragonie/sodium_compat/src/Core32/Ed25519.php</file>
+		<file>lib/system/api/paragonie/sodium_compat/src/Core32/HChaCha20.php</file>
+		<file>lib/system/api/paragonie/sodium_compat/src/Core32/HSalsa20.php</file>
+		<file>lib/system/api/paragonie/sodium_compat/src/Core32/Int32.php</file>
+		<file>lib/system/api/paragonie/sodium_compat/src/Core32/Int64.php</file>
+		<file>lib/system/api/paragonie/sodium_compat/src/Core32/Poly1305.php</file>
+		<file>lib/system/api/paragonie/sodium_compat/src/Core32/Poly1305/State.php</file>
+		<file>lib/system/api/paragonie/sodium_compat/src/Core32/Salsa20.php</file>
+		<file>lib/system/api/paragonie/sodium_compat/src/Core32/SecretStream/State.php</file>
+		<file>lib/system/api/paragonie/sodium_compat/src/Core32/SipHash.php</file>
+		<file>lib/system/api/paragonie/sodium_compat/src/Core32/Util.php</file>
+		<file>lib/system/api/paragonie/sodium_compat/src/Core32/X25519.php</file>
+		<file>lib/system/api/paragonie/sodium_compat/src/Core32/XChaCha20.php</file>
+		<file>lib/system/api/paragonie/sodium_compat/src/Core32/XSalsa20.php</file>
+		<file>lib/system/api/paragonie/sodium_compat/src/Crypto32.php</file>
+		<file>lib/system/api/paragonie/sodium_compat/src/PHP52/SplFixedArray.php</file>
 		<file>lib/system/api/parsedown/LICENSE.txt</file>
 		<file>lib/system/api/parsedown/Parsedown.php</file>
 		<file>lib/system/api/parsedown/README.md</file>
@@ -2757,6 +2791,7 @@
 		<file>lib/system/html/input/node/HtmlInputNodeWoltlabColor.class.php</file>
 		<file>lib/system/html/input/node/HtmlInputNodeWoltlabMention.class.php</file>
 		<file>lib/system/html/input/node/IHtmlInputNodeProcessor.class.php</file>
+		<file>lib/system/html/metacode/upcast/ImageMetacodeUpcast.class.php</file>
 		<file>lib/system/html/node/HtmlNodeProcessor.class.php</file>
 		<file>lib/system/html/output/AmpHtmlOutputProcessor.class.php</file>
 		<file>lib/system/html/output/HtmlOutputNodeProcessor.class.php</file>

diff --git a/com.woltlab.wcf/files_pre_check.tar b/com.woltlab.wcf/files_pre_check.tar
diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
@@ -5,8 +5,8 @@
 		<packagedescription>Free CMS and web-framework, designed for awesome websites and communities.</packagedescription>
 		<packagedescription language="de">Freies CMS und Web-Framework, das eindrucksvolle Websites und Communities ermöglicht.</packagedescription>
 		<isapplication>1</isapplication>
-		<version>6.1.0 RC 1</version>
-		<date>2024-10-10</date>
+		<version>6.1.0</version>
+		<date>2024-10-28</date>
 	</packageinformation>
 
 	<authorinformation>
@@ -99,11 +99,8 @@ tar cvf com.woltlab.wcf/files_pre_check.tar -C wcfsetup/install/files/ \
 		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.1_serviceWorker.php</instruction>
 	</instructions>
 
-	<instructions type="update" fromversion="6.1.0 Beta 2">
-		<instruction type="acpTemplate">acptemplates_update.tar</instruction>
-		<instruction type="file">files_update.tar</instruction>
-		<instruction type="template">templates_update.tar</instruction>
-		<instruction type="language"/>
+	<instructions type="update" fromversion="6.1.0">
+		<!-- https://github.com/WoltLab/WCF/commit/3434ac976c35ac20a16b717b2fe8d457841c6220 -->
 		<instruction type="fileDelete"/>
 	</instructions>
 </package>
diff --git a/com.woltlab.wcf/templateDelete.xml b/com.woltlab.wcf/templateDelete.xml
@@ -116,5 +116,6 @@
 		<template>__multiPageCondition</template>
 		<template>__multilineItemListFormField</template>
 		<template>email_notification_userRegistration</template>
+		<template>imageViewer</template>
 	</delete>
 </data>
diff --git a/com.woltlab.wcf/templates/attachments.tpl b/com.woltlab.wcf/templates/attachments.tpl
@@ -7,8 +7,8 @@
 				{content}
 					{foreach from=$attachmentList->getGroupedObjects($objectID) item=attachment}
 						{if $attachment->showAsImage() && !$attachment->isEmbedded()}
-							<li class="attachmentThumbnail" data-attachment-id="{@$attachment->attachmentID}">
-								<a href="{$attachment->getLink()}"{if $attachment->canDownload()} class="jsImageViewer jsTooltip" title="{lang}wcf.attachment.image.title{/lang}"{/if}>
+							<li class="attachmentThumbnail" data-attachment-id="{$attachment->attachmentID}">
+								<a href="{$attachment->getLink()}"{if $attachment->canDownload()} data-fancybox="message-{$attachmentList->getObjectTypeName()}-{$objectID}" data-caption="{$attachment->filename}" aria-title="{lang}wcf.attachment.image.title{/lang}"{/if}>
 									<div class="attachmentThumbnailContainer">
 										<span class="attachmentThumbnailImage">
 											{if $attachment->hasThumbnail()}
@@ -44,7 +44,7 @@
 									<ul class="attachmentMetaData inlineList">
 										<li>
 											{icon name='file-lines'}
-											{@$attachment->filesize|filesize}
+											{$attachment->filesize|filesize}
 										</li>
 										<li>
 											{icon name='up-right-and-down-left-from-center'}

diff --git a/com.woltlab.wcf/templates/authFlowHeader.tpl b/com.woltlab.wcf/templates/authFlowHeader.tpl
@@ -32,7 +32,7 @@
 
 <div id="pageContainer" class="pageContainer">
 	<div id="pageHeaderContainer" class="pageHeaderContainer">
-		<header id="pageHeader" class="pageHeader">
+		<header id="pageHeader" class="pageHeader pageHeader--authFlow">
 			<div id="pageHeaderPanel" class="pageHeaderPanel">
 				<div class="layoutBoundary">
 					{include file='pageHeaderMenu'}

diff --git a/com.woltlab.wcf/templates/headIncludeJavaScript.tpl b/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
@@ -82,6 +82,7 @@ window.addEventListener('pageshow', function(event) {
 				publicKey: '{@SERVICE_WORKER_PUBLIC_KEY|encodeJS}',
 				serviceWorkerJsUrl: '{$__wcf->getPath('wcf')}service-worker/',
 				registerUrl: '{link controller="RegisterServiceWorker"}{/link}',
+				notificationLastReadTime: {$__wcf->getUserNotificationHandler()->getTimeOfLastReadNotification()}
 			},
 			{/if}
 			dynamicColorScheme: {if $__wcf->getStyleHandler()->getColorScheme() === 'system'}true{else}false{/if},
@@ -137,7 +138,6 @@ window.addEventListener('pageshow', function(event) {
 </script>
 
 {js application='wcf' file='WCF.ColorPicker' bundle='WCF.Combined' hasTiny=true}
-{js application='wcf' file='WCF.ImageViewer' bundle='WCF.Combined' hasTiny=true}
 {js application='wcf' file='WCF.Label' bundle='WCF.Combined' hasTiny=true}
 {js application='wcf' file='WCF.Location' bundle='WCF.Combined' hasTiny=true}
 {js application='wcf' file='WCF.Message' bundle='WCF.Combined' hasTiny=true}
@@ -180,5 +180,5 @@ window.addEventListener('pageshow', function(event) {
 	});
 </script>
 
-{include file='imageViewer'}
+{include file='shared_imageViewer'}
 {include file='headIncludeJsonLd'}
diff --git a/com.woltlab.wcf/templates/imageViewer.tpl b/com.woltlab.wcf/templates/imageViewer.tpl
diff --git a/com.woltlab.wcf/templates/searchResultList.tpl b/com.woltlab.wcf/templates/searchResultList.tpl
@@ -4,11 +4,21 @@
 			<li class="gridListItem gridListItemMessage">
 				<div class="gridListItemImage">
 					{if $customIcons[$message->getObjectTypeName()]|isset}
-						{icon size=48 name=$customIcons[$message->getObjectTypeName()]}
+						<div class="gridListItemLargeIcon">
+							{icon size=48 name=$customIcons[$message->getObjectTypeName()]}
+						</div>
+						<div class="gridListItemSmallIcon">
+							{icon size=32 name=$customIcons[$message->getObjectTypeName()]}
+						</div>
 					{elseif $message->getUserProfile()}
 						{user object=$message->getUserProfile() type='avatar48' ariaHidden='true' tabindex='-1'}
 					{else}
-						{icon size=48 name='file'}
+						<div class="gridListItemLargeIcon">
+							{icon size=48 name='file'}
+						</div>
+						<div class="gridListItemSmallIcon">
+							{icon size=32 name='file'}
+						</div>
 					{/if}
 				</div>
 

diff --git a/com.woltlab.wcf/templates/shared_bbcode_wsm.tpl b/com.woltlab.wcf/templates/shared_bbcode_wsm.tpl
@@ -4,7 +4,7 @@
 	{if $media->isImage}
 		{if $thumbnailSize != 'original'}
 			{if !$removeLinks}
-				<a href="{$mediaLink}" class="embeddedAttachmentLink jsImageViewer">
+				<a href="{$mediaLink}" data-caption="{$media->title}" class="embeddedAttachmentLink" data-fancybox="message-{$activeMessageObjectType}-{$activeMessageID}">
 			{/if}
 					<img src="{$thumbnailLink}" alt="{$media->altText}" title="{$media->title}" width="{@$media->getThumbnailWidth($thumbnailSize)}" height="{@$media->getThumbnailHeight($thumbnailSize)}" loading="lazy">
 			{if !$removeLinks}

diff --git a/com.woltlab.wcf/templates/shared_imageViewer.tpl b/com.woltlab.wcf/templates/shared_imageViewer.tpl
@@ -0,0 +1,18 @@
+{if !$__imageViewerLoaded|isset}
+	<script data-eager="true">
+	  {
+		let stylesheet = document.getElementById("fancybox-stylesheet");
+		if (stylesheet === null) {
+		  stylesheet = document.createElement("link");
+		  stylesheet.rel = "stylesheet";
+		  stylesheet.type = "text/css";
+		  stylesheet.href = "{$__wcf->getPath()}style/fancybox.css";
+		  stylesheet.id = "fancybox-stylesheet";
+
+		  document.querySelector('link[rel="stylesheet"]').before(stylesheet);
+		}
+	  }
+	</script>
+
+	{assign var=__imageViewerLoaded value=true}
+{/if}
diff --git a/com.woltlab.wcf/templates/shared_multiplePagesSelectionFormField.tpl b/com.woltlab.wcf/templates/shared_multiplePagesSelectionFormField.tpl
@@ -0,0 +1,21 @@
+{include file="shared_multipleSelectionFormField"}
+
+{if $field->getVisibleEverywhereFieldId() !== null}
+	<script data-relocate="true">
+		{
+			const label = document.querySelector('label[for="{$field->getPrefixedId()}"]');
+
+			document.querySelectorAll('input[name="{$field->getVisibleEverywhereFieldId()}"]').forEach((input) => {
+				input.addEventListener("change", () => {
+					setLabelText(input.value);
+				});
+			});
+
+			function setLabelText (value) {
+				label.innerHTML = parseInt(value) === 0 ? '{unsafe:$field->getLabel()|encodeJS}' : '{unsafe:$field->getInvertedLabel()|encodeJS}';
+			}
+
+			setLabelText(document.querySelector('input[name="{$field->getVisibleEverywhereFieldId()}"]:checked').value);
+		}
+	</script>
+{/if}
diff --git a/com.woltlab.wcf/templates/shared_uploadFieldComponent.tpl b/com.woltlab.wcf/templates/shared_uploadFieldComponent.tpl
@@ -13,7 +13,7 @@
 			{foreach from=$uploadFieldFiles item=file}
 				<li class="box64 uploadedFile" data-unique-file-id="{$file->getUniqueFileId()}">
 					{if $file->isImage()}
-						<a href="{$file->getImage()}" class="jsImageViewer">
+						<a href="{$file->getImage()}" data-fancybox data-caption="{$file->getFilename()}">
 							<img src="{$file->getImage()}" width="{$file->getWidth()}" height="{$file->getHeight()}" loading="lazy" alt="" class="formUploadHandlerContentListImage">
 						</a>
 					{else}

diff --git a/extra/migrate-shared-template.php b/extra/migrate-shared-template.php
@@ -129,6 +129,7 @@
     'articleBBCodeTag' => 'shared_bbcode_wsa',
     '__multiPageCondition' => 'shared_multiPageCondition',
     '__multilineItemListFormField' => 'shared_multilineItemListFormField',
+    'imageViewer' => 'shared_imageViewer',
 ];
 if ($argc !== 2) {
     echo "ERROR: Expected a single argument to the directory that should be used to recursively replace template includes.\n";