From 3cab11c04220282a46117e31a80a75660835be7a Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Tue, 7 Nov 2017 15:02:32 +0100
Subject: [PATCH] Hide link input for system-type boxes

---
 .../install/files/acp/templates/boxAdd.tpl    | 156 +++++++++---------
 .../files/lib/acp/form/BoxAddForm.class.php   |   4 +-
 2 files changed, 82 insertions(+), 78 deletions(-)

diff --git a/wcfsetup/install/files/acp/templates/boxAdd.tpl b/wcfsetup/install/files/acp/templates/boxAdd.tpl
index 7d3e8b7ce1..3b08d8e97c 100644
--- a/wcfsetup/install/files/acp/templates/boxAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/boxAdd.tpl
@@ -169,84 +169,88 @@
 				</dl>
 			</div>
 			
-			<section class="section">
-				<h2 class="sectionTitle">{lang}wcf.acp.box.link{/lang}</h2>
-				
-				<dl>
-					<dt></dt>
-					<dd class="floated">
-						<label><input type="radio" name="linkType" value="none"{if $linkType == 'none'} checked{/if}> {lang}wcf.acp.box.linkType.none{/lang}</label>
-						<label><input type="radio" name="linkType" value="internal"{if $linkType == 'internal'} checked{/if}> {lang}wcf.acp.box.linkType.internal{/lang}</label>
-						<label><input type="radio" name="linkType" value="external"{if $linkType == 'external'} checked{/if}> {lang}wcf.acp.box.linkType.external{/lang}</label>
-					</dd>
-				</dl>
-				
-				<dl id="linkPageIDContainer"{if $errorField == 'linkPageID'} class="formError"{/if}{if $linkType != 'internal'} style="display: none;"{/if}>
-					<dt><label for="linkPageID">{lang}wcf.acp.page.page{/lang}</label></dt>
-					<dd>
-						<select name="linkPageID" id="linkPageID">
-							<option value="0">{lang}wcf.global.noSelection{/lang}</option>
-							
-							{foreach from=$pageNodeList item=pageNode}
-								<option value="{@$pageNode->pageID}"{if $pageNode->pageID == $linkPageID} selected{/if} data-identifier="{@$pageNode->identifier}">{if $pageNode->getDepth() > 1}{@"&nbsp;&nbsp;&nbsp;&nbsp;"|str_repeat:($pageNode->getDepth() - 1)}{/if}{$pageNode->name}</option>
-							{/foreach}
-						</select>
-						{if $errorField == 'linkPageID'}
-							<small class="innerError">
-								{if $errorType == 'empty'}
-									{lang}wcf.global.form.error.empty{/lang}
-								{else}
-									{lang}wcf.acp.box.linkPageID.error.{@$errorType}{/lang}
-								{/if}
-							</small>
-						{/if}
-					</dd>
-				</dl>
-				
-				<dl id="linkPageObjectIDContainer"{if $errorField == 'linkPageObjectID'} class="formError"{/if}{if !$linkPageID || !$pageHandler[$linkPageID]|isset} style="display: none;"{/if}>
-					<dt><label for="linkPageObjectID">{lang}wcf.page.pageObjectID{/lang}</label></dt>
-					<dd>
-						<div class="inputAddon">
-							<input type="text" id="linkPageObjectID" name="linkPageObjectID" value="{$linkPageObjectID}" class="short">
-							<a href="#" id="searchLinkPageObjectID" class="inputSuffix button jsTooltip" title="{lang}wcf.page.pageObjectID.search{/lang}"><span class="icon icon16 fa-search"></span></a>
-						</div>
-						{if $errorField == 'linkPageObjectID'}
-							<small class="innerError">
-								{if $errorType == 'empty'}
-									{lang}wcf.global.form.error.empty{/lang}
-								{else}
-									{lang}wcf.acp.box.linkPageObjectID.error.{@$errorType}{/lang}
-								{/if}
-							</small>
-						{/if}
-					</dd>
-				</dl>
-				
-				<dl id="externalURLContainer"{if $errorField == 'externalURL'} class="formError"{/if}{if $linkType != 'external'} style="display: none;"{/if}>
-					<dt><label for="externalURL">{lang}wcf.acp.box.link.externalURL{/lang}</label></dt>
-					<dd>
-						<input type="text" name="externalURL" id="externalURL" value="{$externalURL}" class="long" maxlength="255" placeholder="http://">
-						{if $errorField == 'externalURL'}
-							<small class="innerError">
-								{if $errorType == 'empty'}
-									{lang}wcf.global.form.error.empty{/lang}
-								{else}
-									{lang}wcf.acp.box.link.externalURL.error.{$errorType}{/lang}
-								{/if}
-							</small>
-						{/if}
-					</dd>
-				</dl>
+			{if $boxType === 'system'}
+				<input type="hidden" name="linkType" value="none">
+			{else}
+				<section class="section">
+					<h2 class="sectionTitle">{lang}wcf.acp.box.link{/lang}</h2>
+					
+					<dl>
+						<dt></dt>
+						<dd class="floated">
+							<label><input type="radio" name="linkType" value="none"{if $linkType == 'none'} checked{/if}> {lang}wcf.acp.box.linkType.none{/lang}</label>
+							<label><input type="radio" name="linkType" value="internal"{if $linkType == 'internal'} checked{/if}> {lang}wcf.acp.box.linkType.internal{/lang}</label>
+							<label><input type="radio" name="linkType" value="external"{if $linkType == 'external'} checked{/if}> {lang}wcf.acp.box.linkType.external{/lang}</label>
+						</dd>
+					</dl>
+					
+					<dl id="linkPageIDContainer"{if $errorField == 'linkPageID'} class="formError"{/if}{if $linkType != 'internal'} style="display: none;"{/if}>
+						<dt><label for="linkPageID">{lang}wcf.acp.page.page{/lang}</label></dt>
+						<dd>
+							<select name="linkPageID" id="linkPageID">
+								<option value="0">{lang}wcf.global.noSelection{/lang}</option>
+								
+								{foreach from=$pageNodeList item=pageNode}
+									<option value="{@$pageNode->pageID}"{if $pageNode->pageID == $linkPageID} selected{/if} data-identifier="{@$pageNode->identifier}">{if $pageNode->getDepth() > 1}{@"&nbsp;&nbsp;&nbsp;&nbsp;"|str_repeat:($pageNode->getDepth() - 1)}{/if}{$pageNode->name}</option>
+								{/foreach}
+							</select>
+							{if $errorField == 'linkPageID'}
+								<small class="innerError">
+									{if $errorType == 'empty'}
+										{lang}wcf.global.form.error.empty{/lang}
+									{else}
+										{lang}wcf.acp.box.linkPageID.error.{@$errorType}{/lang}
+									{/if}
+								</small>
+							{/if}
+						</dd>
+					</dl>
+					
+					<dl id="linkPageObjectIDContainer"{if $errorField == 'linkPageObjectID'} class="formError"{/if}{if !$linkPageID || !$pageHandler[$linkPageID]|isset} style="display: none;"{/if}>
+						<dt><label for="linkPageObjectID">{lang}wcf.page.pageObjectID{/lang}</label></dt>
+						<dd>
+							<div class="inputAddon">
+								<input type="text" id="linkPageObjectID" name="linkPageObjectID" value="{$linkPageObjectID}" class="short">
+								<a href="#" id="searchLinkPageObjectID" class="inputSuffix button jsTooltip" title="{lang}wcf.page.pageObjectID.search{/lang}"><span class="icon icon16 fa-search"></span></a>
+							</div>
+							{if $errorField == 'linkPageObjectID'}
+								<small class="innerError">
+									{if $errorType == 'empty'}
+										{lang}wcf.global.form.error.empty{/lang}
+									{else}
+										{lang}wcf.acp.box.linkPageObjectID.error.{@$errorType}{/lang}
+									{/if}
+								</small>
+							{/if}
+						</dd>
+					</dl>
+					
+					<dl id="externalURLContainer"{if $errorField == 'externalURL'} class="formError"{/if}{if $linkType != 'external'} style="display: none;"{/if}>
+						<dt><label for="externalURL">{lang}wcf.acp.box.link.externalURL{/lang}</label></dt>
+						<dd>
+							<input type="text" name="externalURL" id="externalURL" value="{$externalURL}" class="long" maxlength="255" placeholder="http://">
+							{if $errorField == 'externalURL'}
+								<small class="innerError">
+									{if $errorType == 'empty'}
+										{lang}wcf.global.form.error.empty{/lang}
+									{else}
+										{lang}wcf.acp.box.link.externalURL.error.{$errorType}{/lang}
+									{/if}
+								</small>
+							{/if}
+						</dd>
+					</dl>
+					
+					{event name='linkFields'}
+				</section>
 				
-				{event name='linkFields'}
-			</section>
-			
-			<div id="boxConditions">
-				{if $boxController && $boxController->getProcessor()|is_subclass_of:'wcf\system\box\IConditionBoxController'}
-					{@$boxController->getProcessor()->getConditionsTemplate()}
-				{/if}
+				<div id="boxConditions">
+					{if $boxController && $boxController->getProcessor()|is_subclass_of:'wcf\system\box\IConditionBoxController'}
+						{@$boxController->getProcessor()->getConditionsTemplate()}
+					{/if}
+				</div>
 			</div>
-		</div>
+		{/if}
 		
 		<div id="contents" class="tabMenuContent">
 			{if !$isMultilingual && $boxType != 'system'}
diff --git a/wcfsetup/install/files/lib/acp/form/BoxAddForm.class.php b/wcfsetup/install/files/lib/acp/form/BoxAddForm.class.php
index 22cec70961..a88c78451b 100644
--- a/wcfsetup/install/files/lib/acp/form/BoxAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/BoxAddForm.class.php
@@ -332,7 +332,7 @@ class BoxAddForm extends AbstractForm {
 		$this->validateBoxPosition();
 		
 		// validate link
-		if ($this->linkType == 'internal') {
+		if ($this->boxType !== 'system' && $this->linkType == 'internal') {
 			$this->externalURL = '';
 			
 			if (!$this->linkPageID) {
@@ -356,7 +356,7 @@ class BoxAddForm extends AbstractForm {
 				}
 			}
 		}
-		else if ($this->linkType == 'external') {
+		else if ($this->boxType !== 'system' && $this->linkType == 'external') {
 			$this->linkPageID = $this->linkPageObjectID = null;
 			
 			if (empty($this->externalURL)) {
-- 
2.20.1