From: Joshua Rüsweg <ruesweg@woltlab.com>
Date: Tue, 6 Jul 2021 11:58:09 +0000 (+0200)
Subject: Fix codestyle issues
X-Git-Tag: 5.5.0_Alpha_1~479^2~8
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0ead3869eed8a57b609abab1d5753e9d0220f873;p=GitHub%2FWoltLab%2FWCF.git

Fix codestyle issues

Co-authored-by: Matthias Schmidt <gravatronics@live.com>
---

diff --git a/ts/WoltLabSuite/Core/Acp/Ui/User/Action/DisableAction.ts b/ts/WoltLabSuite/Core/Acp/Ui/User/Action/DisableAction.ts
index 8fddd1c0f3..fe842dd31d 100644
--- a/ts/WoltLabSuite/Core/Acp/Ui/User/Action/DisableAction.ts
+++ b/ts/WoltLabSuite/Core/Acp/Ui/User/Action/DisableAction.ts
@@ -35,22 +35,24 @@ export class DisableAction extends AbstractUserAction implements AjaxCallbackObj
   }
 
   _ajaxSuccess(data: DatabaseObjectActionResponse): void {
-    if (data.objectIDs.includes(this.userId)) {
-      switch (data.actionName) {
-        case "enable":
-          this.userDataElement.dataset.enabled = "true";
-          this.button.textContent = this.button.dataset.disableMessage!;
-          break;
-
-        case "disable":
-          this.userDataElement.dataset.enabled = "false";
-          this.button.textContent = this.button.dataset.enableMessage!;
-          break;
-
-        default:
-          throw new Error("Unreachable");
+    data.objectIDs.forEach((objectId) => {
+      if (~~objectId == this.userId) {
+        switch (data.actionName) {
+          case "enable":
+            this.userDataElement.dataset.enabled = "true";
+            this.button.textContent = this.button.dataset.disableMessage!;
+            break;
+
+          case "disable":
+            this.userDataElement.dataset.enabled = "false";
+            this.button.textContent = this.button.dataset.enableMessage!;
+            break;
+
+          default:
+            throw new Error("Unreachable");
+        }
       }
-    }
+    });
 
     UiNotification.show();
 
diff --git a/ts/WoltLabSuite/Core/Acp/Ui/User/Action/Handler/Dialog/Ban.ts b/ts/WoltLabSuite/Core/Acp/Ui/User/Action/Handler/Dialog/Ban.ts
index 4430eadee5..7db3a45cd9 100644
--- a/ts/WoltLabSuite/Core/Acp/Ui/User/Action/Handler/Dialog/Ban.ts
+++ b/ts/WoltLabSuite/Core/Acp/Ui/User/Action/Handler/Dialog/Ban.ts
@@ -99,46 +99,47 @@ export class BanDialog {
         },
         title: Language.get("wcf.acp.user.ban.sure"),
       },
-      source: `<div class="section">
-                <dl>
-                  <dt><label for="userBanReason">${Language.get("wcf.acp.user.banReason")}</label></dt>
-                  <dd>
-                    <textarea id="userBanReason" cols="40" rows="3" class=""></textarea>
-                    <small>${Language.get("wcf.acp.user.banReason.description")}</small>
-                  </dd>
-                </dl>
-                <dl>
-                  <dt></dt>
-                  <dd>
-                    <label for="userBanNeverExpires">
-                      <input type="checkbox" name="userBanNeverExpires" id="userBanNeverExpires" checked="">
-                      ${Language.get("wcf.acp.user.ban.neverExpires")}
-                    </label>
-                  </dd>
-                </dl>
-                <dl id="userBanExpiresSettings" style="display: none;">
-                  <dt>
-                    <label for="userBanExpires">${Language.get("wcf.acp.user.ban.expires")}</label>
-                  </dt>
-                  <dd>
-                    <div class="inputAddon">
-                      <input  type="date"
-                              name="userBanExpires"
-                              id="userBanExpires"
-                              class="medium"
-                              min="${new Date(window.TIME_NOW * 1000).toISOString()}"
-                              data-ignore-timezone="true"
-                      />
-                    </div>
-                    <small>${Language.get("wcf.acp.user.ban.expires.description")}</small>
-                  </dd>
-                </dl>
-              </div>
-              <div class="formSubmit dialogFormSubmit">
-                <button class="buttonPrimary formSubmitButton" accesskey="s">${Language.get(
-                  "wcf.global.button.submit",
-                )}</button>
-              </div>`,
+      source: `
+<div class="section">
+  <dl>
+    <dt><label for="userBanReason">${Language.get("wcf.acp.user.banReason")}</label></dt>
+    <dd>
+      <textarea id="userBanReason" cols="40" rows="3" class=""></textarea>
+      <small>${Language.get("wcf.acp.user.banReason.description")}</small>
+    </dd>
+  </dl>
+  <dl>
+    <dt></dt>
+    <dd>
+      <label for="userBanNeverExpires">
+        <input type="checkbox" name="userBanNeverExpires" id="userBanNeverExpires" checked="">
+        ${Language.get("wcf.acp.user.ban.neverExpires")}
+      </label>
+    </dd>
+  </dl>
+  <dl id="userBanExpiresSettings" style="display: none;">
+    <dt>
+      <label for="userBanExpires">${Language.get("wcf.acp.user.ban.expires")}</label>
+    </dt>
+    <dd>
+      <div class="inputAddon">
+        <input  type="date"
+                name="userBanExpires"
+                id="userBanExpires"
+                class="medium"
+                min="${new Date(window.TIME_NOW * 1000).toISOString()}"
+                data-ignore-timezone="true"
+        />
+      </div>
+      <small>${Language.get("wcf.acp.user.ban.expires.description")}</small>
+    </dd>
+  </dl>
+</div>
+<div class="formSubmit dialogFormSubmit">
+  <button class="buttonPrimary formSubmitButton" accesskey="s">${Language.get(
+    "wcf.global.button.submit",
+  )}</button>
+</div>`,
     };
   }
 }
diff --git a/ts/WoltLabSuite/Core/Acp/Ui/User/Action/ToggleConfirmEmailAction.ts b/ts/WoltLabSuite/Core/Acp/Ui/User/Action/ToggleConfirmEmailAction.ts
index ec24798587..584eb9a86f 100644
--- a/ts/WoltLabSuite/Core/Acp/Ui/User/Action/ToggleConfirmEmailAction.ts
+++ b/ts/WoltLabSuite/Core/Acp/Ui/User/Action/ToggleConfirmEmailAction.ts
@@ -34,22 +34,24 @@ export class ToggleConfirmEmailAction extends AbstractUserAction {
   }
 
   _ajaxSuccess(data: DatabaseObjectActionResponse): void {
-    if (data.objectIDs.includes(this.userId)) {
-      switch (data.actionName) {
-        case "confirmEmail":
-          this.userDataElement.dataset.emailConfirmed = "true";
-          this.button.textContent = this.button.dataset.unconfirmEmailMessage!;
-          break;
-
-        case "unconfirmEmail":
-          this.userDataElement.dataset.emailConfirmed = "false";
-          this.button.textContent = this.button.dataset.confirmEmailMessage!;
-          break;
-
-        default:
-          throw new Error("Unreachable");
+    data.objectIDs.forEach((objectId) => {
+      if (~~objectId == this.userId) {
+        switch (data.actionName) {
+          case "confirmEmail":
+            this.userDataElement.dataset.emailConfirmed = "true";
+            this.button.textContent = this.button.dataset.unconfirmEmailMessage!;
+            break;
+
+          case "unconfirmEmail":
+            this.userDataElement.dataset.emailConfirmed = "false";
+            this.button.textContent = this.button.dataset.confirmEmailMessage!;
+            break;
+
+          default:
+            throw new Error("Unreachable");
+        }
       }
-    }
+    });
 
     UiNotification.show();
   }
diff --git a/wcfsetup/install/files/acp/templates/userAdd.tpl b/wcfsetup/install/files/acp/templates/userAdd.tpl
index 5b6e39c190..f42bebb01e 100644
--- a/wcfsetup/install/files/acp/templates/userAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userAdd.tpl
@@ -28,11 +28,10 @@
 							{if $user->userID !== $__wcf->user->userID}
 								{if $__wcf->session->getPermission('admin.user.canEnableUser')}
 									<li>
-										<a {*
-										*}href="#" {*
-										*}class="jsEnable" {*
-										*}data-enable-message="{lang}wcf.acp.user.enable{/lang}" {*
-										*}data-disable-message="{lang}wcf.acp.user.disable{/lang}"{*
+										<a  href="#" {*
+											*}class="jsEnable" {*
+											*}data-enable-message="{lang}wcf.acp.user.enable{/lang}" {*
+											*}data-disable-message="{lang}wcf.acp.user.disable{/lang}"{*
 										*}>
 											{lang}wcf.acp.user.{if !$user->activationCode}disable{else}enable{/if}{/lang}
 										</a>
@@ -74,7 +73,7 @@
 							{/if}
 
 							{if $__wcf->session->getPermission('admin.user.canExportGdprData')}
-								<li
+								<li>
 									<a {*
 										*}href="{link controller='UserExportGdpr' id=$user->userID}{/link}"{*
 										*}>
@@ -92,23 +91,23 @@
 					</div>
 				</li>
 				<script data-relocate="true">
-					require(['Language',
-							 'WoltLabSuite/Core/Acp/Ui/User/Editor',
-							 'WoltLabSuite/Core/Acp/Ui/User/Content/Remove/Handler',
-							 'WoltLabSuite/Core/Acp/Ui/User/Action/DisableAction',
-							 'WoltLabSuite/Core/Acp/Ui/User/Action/SendNewPasswordAction',
-							 'WoltLabSuite/Core/Acp/Ui/User/Action/ToggleConfirmEmailAction',
-							 'WoltLabSuite/Core/Controller/Clipboard',
-						],
-						function (
-							 Language,
-							 AcpUiUserList,
-							 AcpUserContentRemoveHandler,
-							 DisableAction,
-							 SendNewPasswordAction,
-							 ToggleConfirmEmailAction,
-							 Clipboard
-						) {
+					require([
+						'WoltLabSuite/Core/Language',
+						'WoltLabSuite/Core/Acp/Ui/User/Editor',
+						'WoltLabSuite/Core/Acp/Ui/User/Content/Remove/Handler',
+						'WoltLabSuite/Core/Acp/Ui/User/Action/DisableAction',
+						'WoltLabSuite/Core/Acp/Ui/User/Action/SendNewPasswordAction',
+						'WoltLabSuite/Core/Acp/Ui/User/Action/ToggleConfirmEmailAction',
+						'WoltLabSuite/Core/Controller/Clipboard',
+					], (
+						Language,
+						AcpUiUserList,
+						AcpUserContentRemoveHandler,
+						DisableAction,
+						SendNewPasswordAction,
+						ToggleConfirmEmailAction,
+						Clipboard
+					) => {
 							Language.addObject({
 								'wcf.acp.user.sendNewPassword.workerTitle': '{jslang}wcf.acp.user.sendNewPassword.workerTitle{/jslang}',
 								'wcf.acp.user.action.sendNewPassword.confirmMessage': '{jslang}wcf.acp.user.action.sendNewPassword.confirmMessage{/jslang}',
diff --git a/wcfsetup/install/files/acp/templates/userList.tpl b/wcfsetup/install/files/acp/templates/userList.tpl
index fcb9179880..263d6fd1ff 100644
--- a/wcfsetup/install/files/acp/templates/userList.tpl
+++ b/wcfsetup/install/files/acp/templates/userList.tpl
@@ -34,14 +34,14 @@
 			WCF.ACP.User.SendNewPasswordHandler.init();
 		{/if}
 
-		require(['Language', 'WoltLabSuite/Core/Acp/Ui/User/Editor', 'WoltLabSuite/Core/Acp/Ui/User/Content/Remove/Clipboard'], function (Language, AcpUiUserList, AcpUserContentRemoveClipboard) {
+		require(['Language', 'WoltLabSuite/Core/Acp/Ui/User/Editor', 'WoltLabSuite/Core/Acp/Ui/User/Content/Remove/Clipboard'], function (Language, AcpUiUserList, { AcpUserContentRemoveClipboard }) {
 			Language.addObject({
 				'wcf.acp.user.action.sendNewPassword.confirmMessage': '{jslang}wcf.acp.user.action.sendNewPassword.confirmMessage{/jslang}',
 			});
 
 			new AcpUiUserList();
 
-			new AcpUserContentRemoveClipboard.default();
+			new AcpUserContentRemoveClipboard();
 		});
 
 		{event name='javascriptInit'}
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/User/Action/DisableAction.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/User/Action/DisableAction.js
index 90b2051a59..19a37bee22 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/User/Action/DisableAction.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/User/Action/DisableAction.js
@@ -33,20 +33,22 @@ define(["require", "exports", "tslib", "../../../../Ajax", "../../../../Core", "
             };
         }
         _ajaxSuccess(data) {
-            if (data.objectIDs.includes(this.userId)) {
-                switch (data.actionName) {
-                    case "enable":
-                        this.userDataElement.dataset.enabled = "true";
-                        this.button.textContent = this.button.dataset.disableMessage;
-                        break;
-                    case "disable":
-                        this.userDataElement.dataset.enabled = "false";
-                        this.button.textContent = this.button.dataset.enableMessage;
-                        break;
-                    default:
-                        throw new Error("Unreachable");
+            data.objectIDs.forEach((objectId) => {
+                if (~~objectId == this.userId) {
+                    switch (data.actionName) {
+                        case "enable":
+                            this.userDataElement.dataset.enabled = "true";
+                            this.button.textContent = this.button.dataset.disableMessage;
+                            break;
+                        case "disable":
+                            this.userDataElement.dataset.enabled = "false";
+                            this.button.textContent = this.button.dataset.enableMessage;
+                            break;
+                        default:
+                            throw new Error("Unreachable");
+                    }
                 }
-            }
+            });
             UiNotification.show();
             EventHandler.fire("com.woltlab.wcf.acp.user", "refresh", {
                 userIds: [this.userId],
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/User/Action/Handler/Dialog/Ban.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/User/Action/Handler/Dialog/Ban.js
index 921ba376d8..aec65ef656 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/User/Action/Handler/Dialog/Ban.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/User/Action/Handler/Dialog/Ban.js
@@ -80,44 +80,45 @@ define(["require", "exports", "tslib", "../../../../../../Ui/Dialog", "../../../
                     },
                     title: Language.get("wcf.acp.user.ban.sure"),
                 },
-                source: `<div class="section">
-                <dl>
-                  <dt><label for="userBanReason">${Language.get("wcf.acp.user.banReason")}</label></dt>
-                  <dd>
-                    <textarea id="userBanReason" cols="40" rows="3" class=""></textarea>
-                    <small>${Language.get("wcf.acp.user.banReason.description")}</small>
-                  </dd>
-                </dl>
-                <dl>
-                  <dt></dt>
-                  <dd>
-                    <label for="userBanNeverExpires">
-                      <input type="checkbox" name="userBanNeverExpires" id="userBanNeverExpires" checked="">
-                      ${Language.get("wcf.acp.user.ban.neverExpires")}
-                    </label>
-                  </dd>
-                </dl>
-                <dl id="userBanExpiresSettings" style="display: none;">
-                  <dt>
-                    <label for="userBanExpires">${Language.get("wcf.acp.user.ban.expires")}</label>
-                  </dt>
-                  <dd>
-                    <div class="inputAddon">
-                      <input  type="date"
-                              name="userBanExpires"
-                              id="userBanExpires"
-                              class="medium"
-                              min="${new Date(window.TIME_NOW * 1000).toISOString()}"
-                              data-ignore-timezone="true"
-                      />
-                    </div>
-                    <small>${Language.get("wcf.acp.user.ban.expires.description")}</small>
-                  </dd>
-                </dl>
-              </div>
-              <div class="formSubmit dialogFormSubmit">
-                <button class="buttonPrimary formSubmitButton" accesskey="s">${Language.get("wcf.global.button.submit")}</button>
-              </div>`,
+                source: `
+<div class="section">
+  <dl>
+    <dt><label for="userBanReason">${Language.get("wcf.acp.user.banReason")}</label></dt>
+    <dd>
+      <textarea id="userBanReason" cols="40" rows="3" class=""></textarea>
+      <small>${Language.get("wcf.acp.user.banReason.description")}</small>
+    </dd>
+  </dl>
+  <dl>
+    <dt></dt>
+    <dd>
+      <label for="userBanNeverExpires">
+        <input type="checkbox" name="userBanNeverExpires" id="userBanNeverExpires" checked="">
+        ${Language.get("wcf.acp.user.ban.neverExpires")}
+      </label>
+    </dd>
+  </dl>
+  <dl id="userBanExpiresSettings" style="display: none;">
+    <dt>
+      <label for="userBanExpires">${Language.get("wcf.acp.user.ban.expires")}</label>
+    </dt>
+    <dd>
+      <div class="inputAddon">
+        <input  type="date"
+                name="userBanExpires"
+                id="userBanExpires"
+                class="medium"
+                min="${new Date(window.TIME_NOW * 1000).toISOString()}"
+                data-ignore-timezone="true"
+        />
+      </div>
+      <small>${Language.get("wcf.acp.user.ban.expires.description")}</small>
+    </dd>
+  </dl>
+</div>
+<div class="formSubmit dialogFormSubmit">
+  <button class="buttonPrimary formSubmitButton" accesskey="s">${Language.get("wcf.global.button.submit")}</button>
+</div>`,
             };
         }
     }
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/User/Action/ToggleConfirmEmailAction.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/User/Action/ToggleConfirmEmailAction.js
index 76a3445778..3ca6146c9c 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/User/Action/ToggleConfirmEmailAction.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/User/Action/ToggleConfirmEmailAction.js
@@ -32,20 +32,22 @@ define(["require", "exports", "tslib", "./AbstractUserAction", "../../../../Ajax
             };
         }
         _ajaxSuccess(data) {
-            if (data.objectIDs.includes(this.userId)) {
-                switch (data.actionName) {
-                    case "confirmEmail":
-                        this.userDataElement.dataset.emailConfirmed = "true";
-                        this.button.textContent = this.button.dataset.unconfirmEmailMessage;
-                        break;
-                    case "unconfirmEmail":
-                        this.userDataElement.dataset.emailConfirmed = "false";
-                        this.button.textContent = this.button.dataset.confirmEmailMessage;
-                        break;
-                    default:
-                        throw new Error("Unreachable");
+            data.objectIDs.forEach((objectId) => {
+                if (~~objectId == this.userId) {
+                    switch (data.actionName) {
+                        case "confirmEmail":
+                            this.userDataElement.dataset.emailConfirmed = "true";
+                            this.button.textContent = this.button.dataset.unconfirmEmailMessage;
+                            break;
+                        case "unconfirmEmail":
+                            this.userDataElement.dataset.emailConfirmed = "false";
+                            this.button.textContent = this.button.dataset.confirmEmailMessage;
+                            break;
+                        default:
+                            throw new Error("Unreachable");
+                    }
                 }
-            }
+            });
             UiNotification.show();
         }
     }