Move the HTTP header name into a common class
authorAlexander Ebert <ebert@woltlab.com>
Mon, 14 Nov 2022 15:48:13 +0000 (16:48 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 14 Nov 2022 15:48:13 +0000 (16:48 +0100)
wcfsetup/install/files/lib/action/AJAXProxyAction.class.php
wcfsetup/install/files/lib/http/middleware/TriggerBackgroundQueue.class.php
wcfsetup/install/files/lib/system/background/BackgroundQueueHandler.class.php

index 7858eec89e41c3a1b28dcb77e588d591b7208595..ffc5a79220a5bb787d8b9a8a8c09bf1b952cdd30 100644 (file)
@@ -3,13 +3,12 @@
 namespace wcf\action;
 
 use wcf\data\IDatabaseObjectAction;
-use wcf\http\middleware\TriggerBackgroundQueue;
+use wcf\system\background\BackgroundQueueHandler;
 use wcf\system\exception\ImplementationException;
 use wcf\system\exception\ParentClassException;
 use wcf\system\exception\UserInputException;
 use wcf\system\request\RequestHandler;
 use wcf\system\WCF;
-use wcf\system\WCFACP;
 use wcf\util\ArrayUtil;
 use wcf\util\StringUtil;
 
@@ -120,8 +119,8 @@ class AJAXProxyAction extends AJAXInvokeAction
             @\header(
                 \sprintf(
                     '%s: %s',
-                    TriggerBackgroundQueue::HEADER_NAME,
-                    TriggerBackgroundQueue::HEADER_VALUE,
+                    BackgroundQueueHandler::FORCE_CHECK_HTTP_HEADER_NAME,
+                    BackgroundQueueHandler::FORCE_CHECK_HTTP_HEADER_VALUE,
                 )
             );
         }
index 5ba434988b930f961ae92a28eba6637c63bcfc25..212648354efa66939ec8189fa1a4da6ae70b20eb 100644 (file)
@@ -22,9 +22,6 @@ use wcf\system\request\RequestHandler;
  */
 final class TriggerBackgroundQueue implements MiddlewareInterface
 {
-    public const HEADER_NAME = 'woltlab-background-queue-check';
-    public const HEADER_VALUE = 'yes';
-
     private readonly BackgroundQueueHandler $backgroundQueueHandler;
     private readonly RequestHandler $requestHandler;
 
@@ -51,6 +48,9 @@ final class TriggerBackgroundQueue implements MiddlewareInterface
             return $response;
         }
 
-        return $response->withHeader(self::HEADER_NAME, self::HEADER_VALUE);
+        return $response->withHeader(
+            BackgroundQueueHandler::FORCE_CHECK_HTTP_HEADER_NAME,
+            BackgroundQueueHandler::FORCE_CHECK_HTTP_HEADER_VALUE,
+        );
     }
 }
index 45302d510dde039d7d2bd34d14659ce7beb4ecfc..b0e363ea8d61f6a8329149b15392825285b61938 100644 (file)
@@ -20,6 +20,9 @@ use wcf\system\WCF;
  */
 final class BackgroundQueueHandler extends SingletonFactory
 {
+    public const FORCE_CHECK_HTTP_HEADER_NAME = 'woltlab-background-queue-check';
+    public const FORCE_CHECK_HTTP_HEADER_VALUE = 'yes';
+
     private bool $hasPendingCheck = false;
 
     /**