Merge branch '5.5' of https://github.com/WoltLab/WCF into 5.5

BurntimeX · BurntimeX · commit 932795b8edff · 2024-10-21T17:29:11.000+02:00
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>5.5.21</version>
-		<date>2024-04-22</date>
+		<version>5.5.23</version>
+		<date>2024-09-13</date>
 	</packageinformation>
 
 	<authorinformation>
@@ -50,7 +50,7 @@
 		<instruction type="script">acp/post_install.php</instruction>
 	</instructions>
 
-	<instructions type="update" fromversion="5.5.20">
+	<instructions type="update" fromversion="5.5.22">
 		<instruction type="file">files_update.tar</instruction>
 	</instructions>
 </package>
diff --git a/com.woltlab.wcf/templates/articleAdd.tpl b/com.woltlab.wcf/templates/articleAdd.tpl
@@ -381,6 +381,8 @@
 						<small class="innerError">
 							{if $errorType == 'empty'}
 								{lang}wcf.global.form.error.empty{/lang}
+							{elseif $errorType == 'disallowedBBCodes'}
+								{lang}wcf.message.error.disallowedBBCodes{/lang}
 							{else}
 								{lang}wcf.acp.article.content.error.{@$errorType}{/lang}
 							{/if}
@@ -539,6 +541,8 @@
 									<small class="innerError">
 										{if $errorType == 'empty'}
 											{lang}wcf.global.form.error.empty{/lang}
+										{elseif $errorType == 'disallowedBBCodes'}
+											{lang}wcf.message.error.disallowedBBCodes{/lang}
 										{else}
 											{lang}wcf.acp.article.content.error.{@$errorType}{/lang}
 										{/if}
diff --git a/ts/WoltLabSuite/Core/Date/Picker.ts b/ts/WoltLabSuite/Core/Date/Picker.ts
@@ -911,6 +911,7 @@ const DatePicker = {
     const data = _data.get(element) as DatePickerData;
 
     element.dataset.value = date.getTime().toString();
+    element.dataset.empty = "false";
 
     let format = "";
     let value: string;
diff --git a/ts/WoltLabSuite/Core/Ui/Dropdown/Simple.ts b/ts/WoltLabSuite/Core/Ui/Dropdown/Simple.ts
@@ -77,6 +77,19 @@ function onScroll() {
   });
 }
 
+/**
+ * Recalculates drop-down positions on page resize.
+ */
+function onWindowResize() {
+  _dropdowns.forEach((dropdown, containerId) => {
+    if (!dropdown.classList.contains("dropdownOpen")) {
+      return;
+    }
+
+    UiDropdownSimple.setAlignment(dropdown, _menus.get(containerId)!);
+  });
+}
+
 /**
  * Notifies callbacks on status change.
  */
@@ -379,6 +392,7 @@ const UiDropdownSimple = {
     DomChangeListener.add("WoltLabSuite/Core/Ui/Dropdown/Simple", () => UiDropdownSimple.initAll());
 
     document.addEventListener("scroll", onScroll);
+    window.addEventListener("resize", () => onWindowResize(), { passive: true });
 
     // expose on window object for backward compatibility
     window.bc_wcfSimpleDropdown = this;
diff --git a/ts/WoltLabSuite/Core/Ui/Search.ts b/ts/WoltLabSuite/Core/Ui/Search.ts
@@ -75,6 +75,20 @@ function initSearchBar(): void {
 
     _pageHeaderSearchMobile?.setAttribute("aria-expanded", "false");
   });
+
+  window.addEventListener(
+    "resize",
+    () => {
+      if (_isMobile || !_pageHeader.classList.contains("searchBarOpen")) {
+        return;
+      }
+
+      UiAlignment.set(_pageHeaderSearch, _topMenu, {
+        horizontal: "right",
+      });
+    },
+    { passive: true },
+  );
 }
 
 function initMobileSearch(): void {
diff --git a/ts/WoltLabSuite/Core/Ui/User/Menu/ControlPanel.ts b/ts/WoltLabSuite/Core/Ui/User/Menu/ControlPanel.ts
@@ -70,6 +70,18 @@ export function setup(): void {
 
     element.addEventListener("click", (event) => event.stopPropagation());
 
+    window.addEventListener(
+      "resize",
+      () => {
+        if (element.hidden) {
+          return;
+        }
+
+        setAlignment(element, button);
+      },
+      { passive: true },
+    );
+
     button.addEventListener("click", (event) => {
       event.preventDefault();
       event.stopPropagation();
diff --git a/wcfsetup/install/files/acp/templates/articleAdd.tpl b/wcfsetup/install/files/acp/templates/articleAdd.tpl
@@ -374,6 +374,8 @@
 						<small class="innerError">
 							{if $errorType == 'empty'}
 								{lang}wcf.global.form.error.empty{/lang}
+							{elseif $errorType == 'disallowedBBCodes'}
+								{lang}wcf.message.error.disallowedBBCodes{/lang}
 							{else}
 								{lang}wcf.acp.article.content.error.{@$errorType}{/lang}
 							{/if}
@@ -532,6 +534,8 @@
 									<small class="innerError">
 										{if $errorType == 'empty'}
 											{lang}wcf.global.form.error.empty{/lang}
+										{elseif $errorType == 'disallowedBBCodes'}
+											{lang}wcf.message.error.disallowedBBCodes{/lang}
 										{else}
 											{lang}wcf.acp.article.content.error.{@$errorType}{/lang}
 										{/if}
diff --git a/wcfsetup/install/files/js/WCF.User.js b/wcfsetup/install/files/js/WCF.User.js
@@ -790,13 +790,14 @@ if (COMPILER_TARGET_DEFAULT) {
 		 */
 		_beginEdit: function (event) {
 			if (event) event.preventDefault();
+
+			$("#profileContent").wcfTabs("select", "about");
 			
 			if (this._active) return;
 			this._active = true;
 			
 			this._actionName = 'beginEdit';
 			this._buttons.beginEdit.parent().addClass('active');
-			$('#profileContent').wcfTabs('select', 'about');
 			
 			// load form
 			this._proxy.setOption('data', {
diff --git a/wcfsetup/install/files/js/WoltLabSuite.Core.min.js b/wcfsetup/install/files/js/WoltLabSuite.Core.min.js
diff --git a/wcfsetup/install/files/js/WoltLabSuite.Core.tiny.min.js b/wcfsetup/install/files/js/WoltLabSuite.Core.tiny.min.js
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Date/Picker.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Date/Picker.js
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Dropdown/Simple.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Dropdown/Simple.js
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Search.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Search.js
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/Menu/ControlPanel.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/User/Menu/ControlPanel.js
diff --git a/wcfsetup/install/files/lib/acp/form/ArticleAddForm.class.php b/wcfsetup/install/files/lib/acp/form/ArticleAddForm.class.php
@@ -13,6 +13,7 @@
 use wcf\data\smiley\SmileyCache;
 use wcf\data\user\User;
 use wcf\form\AbstractForm;
+use wcf\system\bbcode\BBCodeHandler;
 use wcf\system\cache\builder\ArticleCategoryLabelCacheBuilder;
 use wcf\system\exception\UserInputException;
 use wcf\system\html\input\HtmlInputProcessor;
@@ -394,6 +395,8 @@ public function validate()
             }
         }
 
+        $this->setDisallowedBBCodes();
+
         if ($this->isMultilingual) {
             foreach (LanguageFactory::getInstance()->getLanguages() as $language) {
                 // title
@@ -411,6 +414,12 @@ public function validate()
                     'com.woltlab.wcf.article.content',
                     0
                 );
+
+                $disallowedBBCodes = $this->htmlInputProcessors[$language->languageID]->validate();
+                if (!empty($disallowedBBCodes)) {
+                    WCF::getTPL()->assign('disallowedBBCodes', $disallowedBBCodes);
+                    throw new UserInputException('content', 'disallowedBBCodes');
+                }
             }
         } else {
             // title
@@ -424,6 +433,12 @@ public function validate()
 
             $this->htmlInputProcessors[0] = new HtmlInputProcessor();
             $this->htmlInputProcessors[0]->process($this->content[0], 'com.woltlab.wcf.article.content', 0);
+
+            $disallowedBBCodes = $this->htmlInputProcessors[0]->validate();
+            if (!empty($disallowedBBCodes)) {
+                WCF::getTPL()->assign('disallowedBBCodes', $disallowedBBCodes);
+                throw new UserInputException('content', 'disallowedBBCodes');
+            }
         }
 
         $this->validateLabelIDs();
@@ -569,6 +584,8 @@ public function readData()
                 }
             }
         }
+
+        $this->setDisallowedBBCodes();
     }
 
     /**
@@ -625,4 +642,14 @@ public function assignVariables()
             'labelGroupsToCategories' => $this->labelGroupsToCategories,
         ]);
     }
+
+    protected function setDisallowedBBCodes(): void
+    {
+        BBCodeHandler::getInstance()->setDisallowedBBCodes(
+            \explode(
+                ',',
+                WCF::getSession()->getPermission('user.message.disallowedBBCodes')
+            )
+        );
+    }
 }
diff --git a/wcfsetup/install/files/lib/acp/form/PackageEnableUpgradeOverrideForm.class.php b/wcfsetup/install/files/lib/acp/form/PackageEnableUpgradeOverrideForm.class.php
@@ -365,15 +365,24 @@ public function save()
     {
         AbstractForm::save();
 
+        $overrideKey = \sprintf(
+            "%s\0upgradeOverride_%s",
+            PackageUpdateServer::class,
+            WCF::AVAILABLE_UPGRADE_VERSION,
+        );
+
         $formData = $this->form->getData();
         if ($formData['data']['enable']) {
             $this->isEnabled = true;
-            RegistryHandler::getInstance()->set('com.woltlab.wcf', PackageUpdateServer::class . "\0upgradeOverride", \TIME_NOW);
+            RegistryHandler::getInstance()->set('com.woltlab.wcf', $overrideKey, \TIME_NOW);
         } else {
             $this->isEnabled = false;
-            RegistryHandler::getInstance()->delete('com.woltlab.wcf', PackageUpdateServer::class . "\0upgradeOverride");
+            RegistryHandler::getInstance()->delete('com.woltlab.wcf', $overrideKey);
         }
 
+        // Clear the legacy override.
+        RegistryHandler::getInstance()->delete('com.woltlab.wcf', PackageUpdateServer::class . "\0upgradeOverride");
+
         PackageUpdateServer::resetAll();
 
         $this->form->cleanup();
diff --git a/wcfsetup/install/files/lib/acp/page/ExceptionLogViewPage.class.php b/wcfsetup/install/files/lib/acp/page/ExceptionLogViewPage.class.php
@@ -103,7 +103,7 @@ public function readData()
         RegistryHandler::getInstance()->set('com.woltlab.wcf', 'exceptionMailerTimestamp', TIME_NOW);
 
         $fileNameRegex = new Regex('(?:^|/)\d{4}-\d{2}-\d{2}\.txt$');
-        $this->logFiles = DirectoryUtil::getInstance(WCF_DIR . 'log/')->getFiles(\SORT_DESC, $fileNameRegex);
+        $this->logFiles = DirectoryUtil::getInstance(WCF_DIR . 'log/', false)->getFiles(\SORT_DESC, $fileNameRegex);
 
         if ($this->exceptionID) {
             // search the appropriate file
diff --git a/wcfsetup/install/files/lib/data/package/update/server/PackageUpdateServer.class.php b/wcfsetup/install/files/lib/data/package/update/server/PackageUpdateServer.class.php
@@ -420,14 +420,19 @@ final public static function isUpgradeOverrideEnabled()
             return false;
         }
 
-        $override = RegistryHandler::getInstance()->get('com.woltlab.wcf', self::class . "\0upgradeOverride");
+        $overrideKey = \sprintf(
+            "%s\0upgradeOverride_%s",
+            self::class,
+            WCF::AVAILABLE_UPGRADE_VERSION,
+        );
+        $override = RegistryHandler::getInstance()->get('com.woltlab.wcf', $overrideKey);
 
         if (!$override) {
             return false;
         }
 
         if ($override < TIME_NOW - 86400) {
-            RegistryHandler::getInstance()->delete('com.woltlab.wcf', self::class . "\0upgradeOverride");
+            RegistryHandler::getInstance()->delete('com.woltlab.wcf', $overrideKey);
 
             // Clear package list cache to actually stop the upgrade from happening.
             self::resetAll();
diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -50,7 +50,7 @@
 }
 
 // define current woltlab suite version
-\define('WCF_VERSION', '5.5.21');
+\define('WCF_VERSION', '5.5.23');
 
 // define current API version
 // @deprecated 5.2
diff --git a/wcfsetup/install/files/lib/system/clipboard/ClipboardHandler.class.php b/wcfsetup/install/files/lib/system/clipboard/ClipboardHandler.class.php
@@ -123,6 +123,10 @@ public function mark(array $objectIDs, $objectTypeID)
      */
     public function unmark(array $objectIDs, $objectTypeID)
     {
+        if ($objectIDs === []) {
+            return;
+        }
+
         $conditions = new PreparedStatementConditionBuilder();
         $conditions->add("objectTypeID = ?", [$objectTypeID]);
         $conditions->add("objectID IN (?)", [$objectIDs]);
diff --git a/wcfsetup/install/files/lib/system/message/embedded/object/MediaMessageEmbeddedObjectHandler.class.php b/wcfsetup/install/files/lib/system/message/embedded/object/MediaMessageEmbeddedObjectHandler.class.php
@@ -38,7 +38,7 @@ public function parse(HtmlInputProcessor $htmlInputProcessor, array $embeddedDat
             }
         }
 
-        return $mediaIDs;
+        return \array_unique($mediaIDs);
     }
 
     /**
diff --git a/wcfsetup/install/files/lib/system/message/embedded/object/UnfurlUrlEmbeddedObjectHandler.class.php b/wcfsetup/install/files/lib/system/message/embedded/object/UnfurlUrlEmbeddedObjectHandler.class.php
@@ -44,6 +44,6 @@ public function parse(HtmlInputProcessor $htmlInputProcessor, array $embeddedDat
             }
         }
 
-        return $unfurlUrlIDs;
+        return \array_unique($unfurlUrlIDs);
     }
 }
