From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Thu, 18 Feb 2021 11:23:23 +0000 (+0100)
Subject: Allow disabling the admin contact in ContactForm
X-Git-Tag: 5.4.0_Alpha_1~254^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e3aa54ad48f2d37eadaf4b355423bb8de06fd65f;p=GitHub%2FWoltLab%2FWCF.git

Allow disabling the admin contact in ContactForm

Resolves #3967
---

diff --git a/com.woltlab.wcf/page.xml b/com.woltlab.wcf/page.xml
index 015bfccbfd..4e2fbb15a2 100644
--- a/com.woltlab.wcf/page.xml
+++ b/com.woltlab.wcf/page.xml
@@ -602,6 +602,7 @@
 			<controller>wcf\form\ContactForm</controller>
 			<name language="de">Kontaktformular</name>
 			<name language="en">Contact Form</name>
+			<handler>wcf\system\page\handler\ContactFormPageHandler</handler>
 			<options>module_contact_form</options>
 			<content language="en">
 				<title>Contact</title>
diff --git a/wcfsetup/install/files/acp/templates/contactRecipientAdd.tpl b/wcfsetup/install/files/acp/templates/contactRecipientAdd.tpl
index ca2ef2a0e8..b0489d2681 100644
--- a/wcfsetup/install/files/acp/templates/contactRecipientAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/contactRecipientAdd.tpl
@@ -70,14 +70,12 @@
 			</dd>
 		</dl>
 		
-		{if $action != 'edit' || !$recipient->isAdministrator}
-			<dl>
-				<dt></dt>
-				<dd>
-					<label><input type="checkbox" name="isDisabled" value="1"{if $isDisabled} checked{/if}> {lang}wcf.acp.contact.recipient.isDisabled{/lang}</label>
-				</dd>
-			</dl>
-		{/if}
+		<dl>
+			<dt></dt>
+			<dd>
+				<label><input type="checkbox" name="isDisabled" value="1"{if $isDisabled} checked{/if}> {lang}wcf.acp.contact.recipient.isDisabled{/lang}</label>
+			</dd>
+		</dl>
 		
 		{event name='dataFields'}
 	</div>
diff --git a/wcfsetup/install/files/acp/templates/contactSettings.tpl b/wcfsetup/install/files/acp/templates/contactSettings.tpl
index 3f1c0ccf88..0bf0a32613 100644
--- a/wcfsetup/install/files/acp/templates/contactSettings.tpl
+++ b/wcfsetup/install/files/acp/templates/contactSettings.tpl
@@ -97,11 +97,7 @@
 						
 						<span class="statusDisplay sortableButtonContainer">
 							<span class="icon icon16 fa-arrows sortableNodeHandle"></span>
-							{if $recipient->isAdministrator}
-								<span class="icon icon16 fa-check-square-o disabled"></span>
-							{else}
-								<span class="icon icon16 fa-{if !$recipient->isDisabled}check-square-o{else}square-o{/if} jsToggleButton jsTooltip pointer" title="{lang}wcf.global.button.{if $recipient->isDisabled}enable{else}disable{/if}{/lang}" data-object-id="{@$recipient->recipientID}"></span>
-							{/if}
+							<span class="icon icon16 fa-{if !$recipient->isDisabled}check-square-o{else}square-o{/if} jsToggleButton jsTooltip pointer" title="{lang}wcf.global.button.{if $recipient->isDisabled}enable{else}disable{/if}{/lang}" data-object-id="{@$recipient->recipientID}"></span>
 							<a href="{link controller='ContactRecipientEdit' id=$recipient->recipientID}{/link}"><span title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip icon icon16 fa-pencil"></a>
 							{if $recipient->originIsSystem}
 								<span class="icon icon16 fa-times disabled"></span>
diff --git a/wcfsetup/install/files/lib/acp/form/ContactRecipientEditForm.class.php b/wcfsetup/install/files/lib/acp/form/ContactRecipientEditForm.class.php
index 82e4e37a5a..102cb839ca 100644
--- a/wcfsetup/install/files/lib/acp/form/ContactRecipientEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/ContactRecipientEditForm.class.php
@@ -60,18 +60,6 @@ class ContactRecipientEditForm extends ContactRecipientAddForm
         }
     }
 
-    /**
-     * @inheritDoc
-     */
-    public function validate()
-    {
-        parent::validate();
-
-        if ($this->recipient->isAdministrator) {
-            $this->isDisabled = 0;
-        }
-    }
-
     /**
      * @inheritDoc
      */
diff --git a/wcfsetup/install/files/lib/data/contact/recipient/ContactRecipientAction.class.php b/wcfsetup/install/files/lib/data/contact/recipient/ContactRecipientAction.class.php
index 1fd016483e..5539989621 100644
--- a/wcfsetup/install/files/lib/data/contact/recipient/ContactRecipientAction.class.php
+++ b/wcfsetup/install/files/lib/data/contact/recipient/ContactRecipientAction.class.php
@@ -71,12 +71,6 @@ class ContactRecipientAction extends AbstractDatabaseObjectAction implements ISo
     public function validateToggle()
     {
         parent::validateUpdate();
-
-        foreach ($this->getObjects() as $object) {
-            if ($object->isAdministrator) {
-                throw new PermissionDeniedException();
-            }
-        }
     }
 
     /**
diff --git a/wcfsetup/install/files/lib/form/ContactForm.class.php b/wcfsetup/install/files/lib/form/ContactForm.class.php
index ef2b97fb40..343be8b52d 100644
--- a/wcfsetup/install/files/lib/form/ContactForm.class.php
+++ b/wcfsetup/install/files/lib/form/ContactForm.class.php
@@ -92,7 +92,7 @@ class ContactForm extends AbstractCaptchaForm
         $this->recipientList->getConditionBuilder()->add("contact_recipient.isDisabled = ?", [0]);
         $this->recipientList->readObjects();
 
-        if (\count($this->recipientList) < 0) {
+        if (!\count($this->recipientList)) {
             throw new IllegalLinkException();
         }
 
diff --git a/wcfsetup/install/files/lib/system/page/handler/ContactFormPageHandler.class.php b/wcfsetup/install/files/lib/system/page/handler/ContactFormPageHandler.class.php
new file mode 100644
index 0000000000..0f8c629547
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/page/handler/ContactFormPageHandler.class.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace wcf\system\page\handler;
+
+use wcf\system\WCF;
+
+/**
+ * Hides the contact form if no recipients are enabled.
+ *
+ * @author  Tim Duesterhus
+ * @copyright   2001-2021 WoltLab GmbH
+ * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @package WoltLabSuite\Core\System\Page\Handler
+ * @since   5.4
+ */
+class ContactFormPageHandler extends AbstractMenuPageHandler
+{
+    /**
+     * @inheritDoc
+     */
+    public function isVisible($objectID = null)
+    {
+        $sql = "SELECT EXISTS(
+                    SELECT  *
+                    FROM    wcf" . WCF_N . "_contact_recipient
+                    WHERE   isDisabled = ?
+                )";
+        $statement = WCF::getDB()->prepareStatement($sql);
+        $statement->execute([0]);
+
+        return $statement->fetchSingleColumn();
+    }
+}