From 82b9565c442b59f75ab4ed43082e5317c600e8c1 Mon Sep 17 00:00:00 2001
From: joshuaruesweg <ruesweg@woltlab.com>
Date: Mon, 25 May 2020 23:26:39 +0200
Subject: [PATCH] Add (un)confirm email address acp actions

---
 com.woltlab.wcf/clipboardAction.xml           | 24 ++++++++--
 .../install/files/acp/templates/userList.tpl  |  6 ++-
 .../WoltLabSuite/Core/Acp/Ui/User/Editor.js   | 45 ++++++++++++++++-
 .../files/lib/data/user/UserAction.class.php  | 34 +++++++++++++
 .../action/UserClipboardAction.class.php      | 48 +++++++++++++++++--
 wcfsetup/install/lang/de.xml                  |  4 ++
 wcfsetup/install/lang/en.xml                  |  4 ++
 7 files changed, 155 insertions(+), 10 deletions(-)

diff --git a/com.woltlab.wcf/clipboardAction.xml b/com.woltlab.wcf/clipboardAction.xml
index 837f6a35c0..e4b159bd48 100644
--- a/com.woltlab.wcf/clipboardAction.xml
+++ b/com.woltlab.wcf/clipboardAction.xml
@@ -37,37 +37,51 @@
 				<page>wcf\acp\page\UserListPage</page>
 			</pages>
 		</action>
-		<action name="resendActivationMail">
+		<action name="confirmEmail">
 			<actionclassname>wcf\system\clipboard\action\UserClipboardAction</actionclassname>
 			<showorder>6</showorder>
 			<pages>
 				<page>wcf\acp\page\UserListPage</page>
 			</pages>
 		</action>
-		<action name="sendMail">
+		<action name="unconfirmEmail">
 			<actionclassname>wcf\system\clipboard\action\UserClipboardAction</actionclassname>
 			<showorder>7</showorder>
 			<pages>
 				<page>wcf\acp\page\UserListPage</page>
 			</pages>
 		</action>
-		<action name="exportMailAddress">
+		<action name="resendActivationMail">
 			<actionclassname>wcf\system\clipboard\action\UserClipboardAction</actionclassname>
 			<showorder>8</showorder>
 			<pages>
 				<page>wcf\acp\page\UserListPage</page>
 			</pages>
 		</action>
-		<action name="sendNewPassword">
+		<action name="sendMail">
 			<actionclassname>wcf\system\clipboard\action\UserClipboardAction</actionclassname>
 			<showorder>9</showorder>
 			<pages>
 				<page>wcf\acp\page\UserListPage</page>
 			</pages>
 		</action>
+		<action name="exportMailAddress">
+			<actionclassname>wcf\system\clipboard\action\UserClipboardAction</actionclassname>
+			<showorder>10</showorder>
+			<pages>
+				<page>wcf\acp\page\UserListPage</page>
+			</pages>
+		</action>
+		<action name="sendNewPassword">
+			<actionclassname>wcf\system\clipboard\action\UserClipboardAction</actionclassname>
+			<showorder>11</showorder>
+			<pages>
+				<page>wcf\acp\page\UserListPage</page>
+			</pages>
+		</action>
 		<action name="revertContentChanges">
 			<actionclassname>wcf\system\clipboard\action\UserContentClipboardAction</actionclassname>
-			<showorder>10</showorder>
+			<showorder>12</showorder>
 			<pages>
 				<page>wcf\acp\page\UserListPage</page>
 			</pages>
diff --git a/wcfsetup/install/files/acp/templates/userList.tpl b/wcfsetup/install/files/acp/templates/userList.tpl
index ed812f2703..cba7cf322e 100644
--- a/wcfsetup/install/files/acp/templates/userList.tpl
+++ b/wcfsetup/install/files/acp/templates/userList.tpl
@@ -107,7 +107,7 @@
 			
 			<tbody>
 				{foreach from=$users item=user}
-					<tr class="jsUserRow jsClipboardObject" data-object-id="{@$user->userID}" data-banned="{if $user->banned}true{else}false{/if}" data-enabled="{if !$user->activationCode}true{else}false{/if}">
+					<tr class="jsUserRow jsClipboardObject" data-object-id="{@$user->userID}" data-banned="{if $user->banned}true{else}false{/if}" data-enabled="{if !$user->activationCode}true{else}false{/if}" data-email-confirmed="{if $user->isEmailConfirmed()}true{else}false{/if}">
 						<td class="columnMark"><input type="checkbox" class="jsClipboardItem" data-object-id="{@$user->userID}"></td>
 						<td class="columnIcon">
 							<div class="dropdown" id="userListDropdown{@$user->userID}">
@@ -117,6 +117,10 @@
 									{event name='dropdownItems'}
 									
 									{if $user->userID !== $__wcf->user->userID}
+										{if $user->accessible && $__wcf->session->getPermission('admin.user.canEnableUser')}
+											<li><a href="#" class="jsConfirmEmailToggle" data-confirm-email-message="{lang}wcf.acp.user.action.confirmEmail{/lang}" data-unconfirm-email-message="{lang}wcf.acp.user.action.unconfirmEmail{/lang}">{lang}wcf.acp.user.action.{if $user->isEmailConfirmed()}un{/if}confirmEmail{/lang}</a></li>
+										{/if}
+										
 										{if $__wcf->session->getPermission('admin.user.canMailUser')}
 											<li><a href="{link controller='UserMail' id=$user->userID}{/link}">{lang}wcf.acp.user.action.sendMail{/lang}</a></li>
 										{/if}
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/User/Editor.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/User/Editor.js
index 8322fd6507..ce1b9bb697 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/User/Editor.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/User/Editor.js
@@ -7,7 +7,7 @@
  * @module	WoltLabSuite/Core/Acp/Ui/User/Editor
  * @since       3.1
  */
-define(['Ajax', 'Core', 'EventHandler', 'Language', 'Ui/SimpleDropdown', 'WoltLabSuite/Core/Acp/Ui/User/Content/Remove/Handler'], function(Ajax, Core, EventHandler, Language, UiSimpleDropdown, RemoveContentHandler) {
+define(['Ajax', 'Core', 'EventHandler', 'Language', 'Ui/Notification', 'Ui/SimpleDropdown', 'WoltLabSuite/Core/Acp/Ui/User/Content/Remove/Handler'], function(Ajax, Core, EventHandler, Language, UiNotification, UiSimpleDropdown, RemoveContentHandler) {
 	"use strict";
 	
 	/**
@@ -80,6 +80,49 @@ define(['Ajax', 'Core', 'EventHandler', 'Language', 'Ui/SimpleDropdown', 'WoltLa
 			if (deleteContent !== null) {
 				new RemoveContentHandler(deleteContent, userId);
 			}
+			
+			var toggleConfirmEmail = elBySel('.jsConfirmEmailToggle', dropdownMenu);
+			if (toggleConfirmEmail !== null) {
+				toggleConfirmEmail.addEventListener(WCF_CLICK_EVENT, function (event) {
+					event.preventDefault();
+					
+					Ajax.api({
+						_ajaxSetup: function () {
+							return {
+								data: {
+									actionName: (elDataBool(userRow, 'email-confirmed') ? 'un' : '') + 'confirmEmail',
+									className: 'wcf\\data\\user\\UserAction',
+									objectIDs: [userId]
+								}
+							};
+						}
+					}, null, function (data) {
+						elBySelAll('.jsUserRow', undefined, function(userRow) {
+							var userId = parseInt(elData(userRow, 'object-id'));
+							if (data.objectIDs.indexOf(userId) !== -1) {
+								var confirmEmailButton = elBySel('.jsConfirmEmailToggle', UiSimpleDropdown.getDropdownMenu('userListDropdown' + userId));
+								
+								switch (data.actionName) {
+									case 'confirmEmail':
+										elData(userRow, 'email-confirmed', 'true');
+										confirmEmailButton.textContent = elData(confirmEmailButton, 'unconfirm-email-message');
+										break;
+									
+									case 'unconfirmEmail':
+										elData(userRow, 'email-confirmed', 'false');
+										confirmEmailButton.textContent = elData(confirmEmailButton, 'confirm-email-message');
+										break;
+										
+									default: 
+										throw new Error("Unreachable");
+								}
+							}
+						});
+						
+						UiNotification.show();
+					});
+				});
+			}
 		},
 		
 		/**
diff --git a/wcfsetup/install/files/lib/data/user/UserAction.class.php b/wcfsetup/install/files/lib/data/user/UserAction.class.php
index b3fb6346db..5427da2a7f 100644
--- a/wcfsetup/install/files/lib/data/user/UserAction.class.php
+++ b/wcfsetup/install/files/lib/data/user/UserAction.class.php
@@ -618,6 +618,22 @@ class UserAction extends AbstractDatabaseObjectAction implements IClipboardActio
 		$this->validateEnable();
 	}
 	
+	/**
+	 * Validates the confirm email action.
+	 * @since       5.3
+	 */
+	public function validateConfirmEmail() {
+		$this->validateEnable();
+	}
+	
+	/**
+	 * Validates the unconfirm email action.
+	 * @since       5.3
+	 */
+	public function validateUnconfirmEmail() {
+		$this->validateEnable();
+	}
+	
 	/**
 	 * Marks the email address as confirmed and enables the user, iff the register method is user activation only.
 	 * @since 5.3 
@@ -640,6 +656,24 @@ class UserAction extends AbstractDatabaseObjectAction implements IClipboardActio
 		$this->unmarkItems();
 	}
 	
+	/**
+	 * Marks the email address as unconfirmed.
+	 * @since 5.3
+	 */
+	public function unconfirmEmail() {
+		if (empty($this->objects)) $this->readObjects();
+		
+		foreach ($this->objects as $object) {
+			(new UserAction([$object], 'update', [
+				'data' => [
+					'emailConfirmed' => bin2hex(\random_bytes(20))
+				]
+			]))->executeAction();
+		}
+		
+		$this->unmarkItems();
+	}
+	
 	/**
 	 * Enables users.
 	 */
diff --git a/wcfsetup/install/files/lib/system/clipboard/action/UserClipboardAction.class.php b/wcfsetup/install/files/lib/system/clipboard/action/UserClipboardAction.class.php
index d5d2920f12..19f87d2daa 100644
--- a/wcfsetup/install/files/lib/system/clipboard/action/UserClipboardAction.class.php
+++ b/wcfsetup/install/files/lib/system/clipboard/action/UserClipboardAction.class.php
@@ -20,12 +20,12 @@ class UserClipboardAction extends AbstractClipboardAction {
 	/**
 	 * @inheritDoc
 	 */
-	protected $actionClassActions = ['delete', 'resendActivationMail'];
+	protected $actionClassActions = ['delete', 'resendActivationMail', 'confirmEmail', 'unconfirmEmail'];
 	
 	/**
 	 * @inheritDoc
 	 */
-	protected $supportedActions = ['assignToGroup', 'ban', 'delete', 'enable', 'exportMailAddress', 'merge', 'sendMail', 'sendNewPassword', 'resendActivationMail'];
+	protected $supportedActions = ['assignToGroup', 'ban', 'confirmEmail', 'delete', 'enable', 'exportMailAddress', 'merge', 'sendMail', 'sendNewPassword', 'resendActivationMail', 'unconfirmEmail'];
 	
 	/**
 	 * @inheritDoc
@@ -161,6 +161,48 @@ class UserClipboardAction extends AbstractClipboardAction {
 		return array_values($userIDs);
 	}
 	
+	/**
+	 * Returns the ids of the users which can be marked as email confirmed.
+	 *
+	 * @return	integer[]
+	 * @since	5.3
+	 */
+	protected function validateConfirmEmail() {
+		// check permissions
+		if (!WCF::getSession()->getPermission('admin.user.canEnableUser')) {
+			return [];
+		}
+		
+		$userIDs = [];
+		foreach ($this->objects as $user) {
+			/** @var User $user */
+			if (!$user->isEmailConfirmed()) $userIDs[] = $user->userID;
+		}
+		
+		return $this->__validateAccessibleGroups($userIDs);
+	}
+	
+	/**
+	 * Returns the ids of the users which can be unmarked as email confirmed.
+	 *
+	 * @return	integer[]
+	 * @since	5.3
+	 */
+	protected function validateUnconfirmEmail() {
+		// check permissions
+		if (!WCF::getSession()->getPermission('admin.user.canEnableUser')) {
+			return [];
+		}
+		
+		$userIDs = [];
+		foreach ($this->objects as $user) {
+			/** @var User $user */
+			if ($user->isEmailConfirmed()) $userIDs[] = $user->userID;
+		}
+		
+		return $this->__validateAccessibleGroups($userIDs);
+	}
+	
 	/**
 	 * Returns the ids of the users which can be sent new passwords.
 	 * 
@@ -196,7 +238,7 @@ class UserClipboardAction extends AbstractClipboardAction {
 		$userIDs = [];
 		foreach ($this->objects as $user) {
 			/** @var User $user */
-			if ($user->isActivated()) $userIDs[] = $user->userID;
+			if (!$user->isActivated()) $userIDs[] = $user->userID;
 		}
 		
 		return $userIDs;
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 0d67613385..cd522ff97b 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -3207,6 +3207,8 @@ Benutzerkontos nun in vollem Umfang nutzen.]]></item>
 		<item name="wcf.acp.user.action.sendMail"><![CDATA[E-Mail senden]]></item>
 		<item name="wcf.acp.user.action.sendNewPassword"><![CDATA[Neues Passwort zusenden]]></item>
 		<item name="wcf.acp.user.action.sendNewPassword.confirmMessage"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Willst du{else}Wollen Sie{/if} diesem Benutzer wirklich ein neues Kennwort zusenden?]]></item>
+		<item name="wcf.acp.user.action.confirmEmail"><![CDATA[E-Mail-Adresse bestätigen]]></item>
+		<item name="wcf.acp.user.action.unconfirmEmail"><![CDATA[Bestätigung der E-Mail-Adresse widerrufen]]></item>
 		<item name="wcf.acp.user.exportGdpr"><![CDATA[Persönliche Daten exportieren (DSGVO)]]></item>
 		<item name="wcf.acp.user.coverPhoto.description"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Du kannst{else}Sie können{/if} ein Titelbild im Profil des Benutzers hochladen.]]></item>
 	</category>
@@ -3391,6 +3393,8 @@ Fehler sind beispielsweise:
 		<item name="wcf.clipboard.item.com.woltlab.wcf.user.sendMail"><![CDATA[E-Mail senden]]></item>
 		<item name="wcf.clipboard.item.com.woltlab.wcf.user.sendNewPassword"><![CDATA[Neues Kennwort senden ({#$count})]]></item>
 		<item name="wcf.clipboard.item.com.woltlab.wcf.user.sendNewPassword.confirmMessage"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Willst du{else}Wollen Sie{/if} wirklich {if $count == 1}einem Benutzer{else}{#$count} Benutzern{/if} ein neues Kennwort zusenden?]]></item>
+		<item name="wcf.clipboard.item.com.woltlab.wcf.user.confirmEmail"><![CDATA[E-Mail-Adresse bestätigen ({#$count})]]></item>
+		<item name="wcf.clipboard.item.com.woltlab.wcf.user.unconfirmEmail"><![CDATA[Bestätigung der E-Mail-Adresse widerrufen ({#$count})]]></item>
 		<item name="wcf.clipboard.label.com.woltlab.wcf.article.marked"><![CDATA[{if $count == 1}Ein{else}{#$count}{/if} Artikel]]></item>
 		<item name="wcf.clipboard.label.com.woltlab.wcf.media.marked"><![CDATA[{if $count == 1}Eine Datei{else}{#$count} Dateien{/if}]]></item>
 		<item name="wcf.clipboard.label.com.woltlab.wcf.tag.marked"><![CDATA[{if $count == 1}Ein Tag{else}{#$count} Tags{/if}]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 9992478084..409ea13221 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -3130,6 +3130,8 @@ full extend.]]></item>
 		<item name="wcf.acp.user.action.sendMail"><![CDATA[Send Email]]></item>
 		<item name="wcf.acp.user.action.sendNewPassword"><![CDATA[Send New Password]]></item>
 		<item name="wcf.acp.user.action.sendNewPassword.confirmMessage"><![CDATA[Do you really want to send a new password to this user?]]></item>
+		<item name="wcf.acp.user.action.confirmEmail"><![CDATA[Confirm Email Address]]></item>
+		<item name="wcf.acp.user.action.unconfirmEmail"><![CDATA[Unconfirm Email Address]]></item>
 		<item name="wcf.acp.user.exportGdpr"><![CDATA[Export Personal Data (GDPR)]]></item>
 		<item name="wcf.acp.user.coverPhoto.description"><![CDATA[You can upload a cover photo on their user profile page.]]></item>
 	</category>
@@ -3314,6 +3316,8 @@ Errors are:
 		<item name="wcf.clipboard.item.com.woltlab.wcf.user.sendMail"><![CDATA[Send Email]]></item>
 		<item name="wcf.clipboard.item.com.woltlab.wcf.user.sendNewPassword"><![CDATA[Send New Password ({#$count})]]></item>
 		<item name="wcf.clipboard.item.com.woltlab.wcf.user.sendNewPassword.confirmMessage"><![CDATA[Do you really want to send a new password to {#$count} user{if $count != 1}s{/if}?]]></item>
+		<item name="wcf.clipboard.item.com.woltlab.wcf.user.confirmEmail"><![CDATA[Confirm Email Address ({#$count})]]></item>
+		<item name="wcf.clipboard.item.com.woltlab.wcf.user.unconfirmEmail"><![CDATA[Unconfirm Email Address ({#$count})]]></item>
 		<item name="wcf.clipboard.label.com.woltlab.wcf.article.marked"><![CDATA[{if $count == 1}One Article{else}{#$count} Articles{/if}]]></item>
 		<item name="wcf.clipboard.label.com.woltlab.wcf.media.marked"><![CDATA[{if $count == 1}One File{else}{#$count} Files{/if}]]></item>
 		<item name="wcf.clipboard.label.com.woltlab.wcf.tag.marked"><![CDATA[{if $count == 1}One Tag{else}{#$count} Tags{/if}]]></item>
-- 
2.20.1