From: Alexander Ebert <ebert@woltlab.com>
Date: Mon, 3 May 2021 10:37:52 +0000 (+0200)
Subject: Improved the code / Cleanup
X-Git-Tag: 5.4.0_Alpha_1~11^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7eb44e31e3dfecd1b6342397c5b2b8e54eb3fc67;p=GitHub%2FWoltLab%2FWCF.git

Improved the code / Cleanup
---

diff --git a/wcfsetup/install/files/acp/templates/applicationManagement.tpl b/wcfsetup/install/files/acp/templates/applicationManagement.tpl
index 87e4e41a7e..c1e19fda84 100644
--- a/wcfsetup/install/files/acp/templates/applicationManagement.tpl
+++ b/wcfsetup/install/files/acp/templates/applicationManagement.tpl
@@ -27,7 +27,7 @@
 				<dt><label for="domainName">{lang}wcf.acp.application.management.domainName{/lang}</label></dt>
 				<dd>
 					<div class="inputAddon">
-						<span class="inputPrefix">http(s)://</span>
+						<span class="inputPrefix">https://</span>
 						<input type="text" name="domainName" id="domainName" value="{$domainName}" class="long">
 					</div>
 					{if $errorField == 'domainName'}
@@ -61,19 +61,19 @@
 			</dl>
 		</section>
 
-		<script>
-			(() => {
-				const domainName = document.getElementById("domainName");
-				const cookieDomain = document.getElementById("cookieDomain");
+		{* Keep the cookie domain in sync if it was previously identical. *}
+		{if $domainName === $cookieDomain}
+			<script>
+				(() => {
+					const domainName = document.getElementById("domainName");
+					const cookieDomain = document.getElementById("cookieDomain");
 
-				// Keep the cookie domain in sync if it was previously identical.
-				if (domainName.value === cookieDomain.value) {
 					domainName.addEventListener("input", () => {
 						cookieDomain.value = domainName.value;
 					});
-				}
-			})();
-		</script>
+				})();
+			</script>
+		{/if}
 	{/if}
 
 	<section class="section">
diff --git a/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.4_removeFiles.php b/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.4_removeFiles.php
index a19137bd0e..e50e9c1d59 100644
--- a/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.4_removeFiles.php
+++ b/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.4_removeFiles.php
@@ -33,6 +33,7 @@ $files = [
     'acp/update_com.woltlab.wcf_5.3_packageServer.php',
     'acp/update_com.woltlab.wcf_5.3_preUpdate.php',
     'lib/acp/form/UserGroupPromoteOwnerForm.class.php',
+    'lib/acp/page/ApplicationManagementPage.class.php',
     'lib/system/database/table/DatabaseTableUtil.class.php',
 ];
 
diff --git a/wcfsetup/install/files/lib/acp/form/ApplicationEditForm.class.php b/wcfsetup/install/files/lib/acp/form/ApplicationEditForm.class.php
index 2fce080e5c..5de2feb987 100644
--- a/wcfsetup/install/files/lib/acp/form/ApplicationEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/ApplicationEditForm.class.php
@@ -17,7 +17,6 @@ use wcf\system\exception\UserInputException;
 use wcf\system\Regex;
 use wcf\system\WCF;
 use wcf\util\FileUtil;
-use wcf\util\HeaderUtil;
 use wcf\util\StringUtil;
 
 /**
diff --git a/wcfsetup/install/files/lib/acp/form/ApplicationManagementForm.class.php b/wcfsetup/install/files/lib/acp/form/ApplicationManagementForm.class.php
index 29ed475007..f9c8e0a520 100644
--- a/wcfsetup/install/files/lib/acp/form/ApplicationManagementForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/ApplicationManagementForm.class.php
@@ -2,7 +2,6 @@
 
 namespace wcf\acp\form;
 
-use Stripe\Exception\PermissionException;
 use wcf\data\application\ViewableApplicationList;
 use wcf\data\page\Page;
 use wcf\data\page\PageList;
@@ -11,6 +10,7 @@ use wcf\form\AbstractForm;
 use wcf\system\application\ApplicationHandler;
 use wcf\system\cache\builder\ApplicationCacheBuilder;
 use wcf\system\cache\builder\RoutingCacheBuilder;
+use wcf\system\exception\PermissionDeniedException;
 use wcf\system\exception\UserInputException;
 use wcf\system\Regex;
 use wcf\system\WCF;
@@ -26,7 +26,7 @@ use wcf\util\StringUtil;
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @package WoltLabSuite\Core\Acp\Form
  */
-class ApplicationManagementForm extends AbstractForm
+final class ApplicationManagementForm extends AbstractForm
 {
     /**
      * @inheritDoc
@@ -100,7 +100,7 @@ class ApplicationManagementForm extends AbstractForm
         if (ApplicationHandler::getInstance()->isMultiDomainSetup()) {
             // Changes to the domain for all apps are only possible for setups using the same domain.
             if (!empty($this->cookieDomain) || !empty($this->domainName)) {
-                throw new PermissionException();
+                throw new PermissionDeniedException();
             }
         }
 
@@ -192,8 +192,8 @@ class ApplicationManagementForm extends AbstractForm
             (new Page($this->landingPageID[1]))->setAsLandingPage();
         } else {
             $sql = "UPDATE  wcf" . WCF_N . "_page
-                        SET     isLandingPage = ?
-                        WHERE   isLandingPage = ?";
+                    SET     isLandingPage = ?
+                    WHERE   isLandingPage = ?";
             $statement = WCF::getDB()->prepareStatement($sql);
             $statement->execute([
                 0,