Merge branch '6.1' into 6.2

Author: dtdesign

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.3 dev 2</version>
-		<date>2024-12-31</date>
+		<version>6.1.3</version>
+		<date>2025-01-06</date>
 	</packageinformation>
 
 	<authorinformation>
@@ -110,4 +110,10 @@ tar cvf com.woltlab.wcf/files_pre_check.tar -C wcfsetup/install/files/ \
 		<instruction type="file">files_update.tar</instruction>
 		<instruction type="template">templates_update.tar</instruction>
 	</instructions>
+	<instructions type="update" fromversion="6.1.3 dev 2">
+		<instruction type="file">files_update.tar</instruction>
+	</instructions>
+	<instructions type="update" fromversion="6.1.3 dev 3">
+		<instruction type="file">files_update.tar</instruction>
+	</instructions>
 </package>

ts/WoltLabSuite/Core/Ajax/Status.ts

@@ -6,6 +6,8 @@
  * @license  GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  */
 
+import { getPageOverlayContainer } from "../Helper/PageOverlay";
+
 class AjaxStatus {
   private _activeRequests = 0;
   private readonly _overlay: Element;
@@ -20,7 +22,7 @@ class AjaxStatus {
     loadingIndicator.size = 48;
     this._overlay.append(loadingIndicator);
 
-    document.body.append(this._overlay);
+    getPageOverlayContainer().append(this._overlay);
   }
 
   show(): void {

wcfsetup/install/files/acp/templates/usersAwaitingApprovalAcpDashboardBox.tpl

@@ -20,10 +20,8 @@
 	{/foreach}
 </ul>
 
-{if $usersAwaitingApproval > $users|count}
-	<div class="acpDashboardBox__cta">
-		<a href="{link controller='UserQuickSearch' mode='pendingActivation'}{/link}" class="button small">
-			{lang}wcf.global.button.showAll{/lang}
-		</a>
-	</div>
-{/if}
+<div class="acpDashboardBox__cta">
+	<a href="{link controller='UserQuickSearch' mode='pendingActivation'}{/link}" class="button small">
+		{lang}wcf.global.button.showAll{/lang}
+	</a>
+</div>

wcfsetup/install/files/js/WoltLabSuite.Core.min.js

@@ -68,12 +68,19 @@ private function getForm(): Psr15DialogForm
             static::class,
             WCF::getLanguage()->get('wcf.acp.dashboard.configure')
         );
+
+        $boxOptions = $this->getBoxOptions();
+        $selectedBoxNames = \array_filter(
+            $this->getSelectedBoxNames(),
+            fn(string $boxName) => isset($boxOptions[$boxName])
+        );
+
         $form->appendChildren([
             $this->getConfigurationFormField()
                 ->id('boxes')
                 ->required()
-                ->options($this->getBoxOptions(), false, false)
-                ->value($this->getSelectedBoxNames()),
+                ->options($boxOptions, false, false)
+                ->value($selectedBoxNames),
         ]);
 
         $form->build();

wcfsetup/install/files/js/WoltLabSuite.Core.tiny.min.js

@@ -0,0 +1,68 @@
+<?php
+
+declare(strict_types=1);
+
+namespace wcf\http;
+
+use Laminas\HttpHandlerRunner\Emitter\EmitterInterface;
+use Laminas\HttpHandlerRunner\Emitter\SapiEmitterTrait;
+use Psr\Http\Message\ResponseInterface;
+
+use function flush;
+
+/**
+ * This emitter implementation is a copy of `Laminas\HttpHandlerRunner\Emitter\
+ * SapiStreamEmitter` with the range handling being ripped out. The handling
+ * of the `content-range` must be handled by the creator of the range itself.
+ *
+ * See https://github.com/laminas/laminas-httphandlerrunner/issues/22
+ */
+class SapiStreamEmitter implements EmitterInterface
+{
+    use SapiEmitterTrait;
+
+    public function __construct(
+        /** @param int Maximum output buffering size for each iteration. */
+        private int $maxBufferLength = 8192
+    ) {}
+
+    /**
+     * Emits a response for a PHP SAPI environment.
+     *
+     * Emits the status line and headers via the header() function, and the
+     * body content via the output buffer.
+     */
+    public function emit(ResponseInterface $response): bool
+    {
+        $this->assertNoPreviousOutput();
+        $this->emitHeaders($response);
+        $this->emitStatusLine($response);
+
+        flush();
+
+        $this->emitBody($response);
+
+        return true;
+    }
+
+    /**
+     * Emit the message body.
+     */
+    private function emitBody(ResponseInterface $response): void
+    {
+        $body = $response->getBody();
+
+        if ($body->isSeekable()) {
+            $body->rewind();
+        }
+
+        if (! $body->isReadable()) {
+            echo $body;
+            return;
+        }
+
+        while (! $body->eof()) {
+            echo $body->read($this->maxBufferLength);
+        }
+    }
+}

wcfsetup/install/files/js/WoltLabSuite/Core/Ajax/Status.js

@@ -79,7 +79,7 @@
 \mb_language('uni');
 
 // define current woltlab suite version
-\define('WCF_VERSION', '6.1.3 dev 2');
+\define('WCF_VERSION', '6.1.3');
 
 // define current unix timestamp
 \define('TIME_NOW', \time());

wcfsetup/install/files/lib/acp/action/DashboardConfigureAction.class.php

@@ -10,15 +10,15 @@
     }
   },
   "require": {
-    "cuyz/valinor": "^1.14.1",
+    "cuyz/valinor": "^1.14.2",
     "dragonmantank/cron-expression": "^3.4.0",
     "erusev/parsedown": "^1.7.4",
     "ezyang/htmlpurifier": "^4.18",
     "guzzlehttp/guzzle": "^7.9.2",
     "guzzlehttp/psr7": "^2.7.0",
     "laminas/laminas-diactoros": "^3.5.0",
     "laminas/laminas-httphandlerrunner": "^2.11.0",
-    "laminas/laminas-progressbar": "^2.14",
+    "laminas/laminas-progressbar": "^2.14.1",
     "minishlink/web-push": "^v9.0.1",
     "nikic/fast-route": "2.0.0-beta1",
     "paragonie/constant_time_encoding": "^3.0",
@@ -33,6 +33,7 @@
     "sebastian/diff": "^5.1.1",
     "symfony/polyfill-php82": "^1.31.0",
     "symfony/polyfill-php83": "^1.31",
+    "symfony/polyfill-php84": "^1.31",
     "willdurand/negotiation": "^3.1"
   },
   "replace": {