Prevent disabling of the 'Administrator' contact recipient

diff --git a/wcfsetup/install/files/acp/templates/contactRecipientAdd.tpl b/wcfsetup/install/files/acp/templates/contactRecipientAdd.tpl
index 48c002ce075088b5c51fe99a7085ac0473091950..6bab6a3ea413bea9fdce2fea018909abb698df74 100644 (file)
--- a/wcfsetup/install/files/acp/templates/contactRecipientAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/contactRecipientAdd.tpl
@@ -74,12 +74,14 @@
                        </dd>
                </dl>
                
-               <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 $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}
                
                {event name='dataFields'}
        </div>

diff --git a/wcfsetup/install/files/lib/acp/form/ContactRecipientEditForm.class.php b/wcfsetup/install/files/lib/acp/form/ContactRecipientEditForm.class.php
index f7056dc67deea595ee17209b31b28708ed1e00f4..0fbd82dfc761ebd98e269d7bb7702363cfa937a6 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/ContactRecipientEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/ContactRecipientEditForm.class.php
@@ -54,6 +54,20 @@ class ContactRecipientEditForm extends ContactRecipientAddForm {
                }
        }
        
+       /**
+        * @inheritDoc
+        */
+       public function validate() {
+               parent::validate();
+               
+               if ($this->recipient->isAdministrator) {
+                       $this->isDisabled = 0;
+               }
+       }
+       
+       /**
+        * @inheritDoc
+        */
        public function readData() {
                parent::readData();