From 3f891203d65cc5dbd21fe04443d932877580407b Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Tue, 15 Aug 2017 13:31:10 +0200
Subject: [PATCH] Fixed default value for html bbcode

---
 .../install/files/acp/templates/userGroupAdd.tpl  |  6 +++++-
 .../files/acp/templates/userGroupOption.tpl       | 10 +++++++++-
 .../files/lib/acp/form/UserGroupAddForm.class.php |  3 ++-
 .../lib/acp/form/UserGroupOptionForm.class.php    | 15 +++++++++++----
 4 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
index d697a2bd11..055bc8d8ba 100644
--- a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
@@ -18,7 +18,11 @@
 			new WCF.ACP.User.Group.Copy({@$groupID});
 		{/if}
 		
-		{if $action == 'edit' && ($groupIsEveryone || $groupIsGuest || $groupIsUsers)}
+		{if $action === 'add' && $isBlankForm}
+			elBySelAll('.jsBbcodeSelectOptionHtml input[type="checkbox"]', undefined, function (checkbox) {
+				checkbox.checked = true;
+			});
+		{elseif $action == 'edit' && ($groupIsEveryone || $groupIsGuest || $groupIsUsers)}
 			elBySelAll('.jsBbcodeSelectOptionHtml', undefined, function (bbcodeHtml) {
 				elBySel('input[type="checkbox"]', bbcodeHtml).checked = true;
 				
diff --git a/wcfsetup/install/files/acp/templates/userGroupOption.tpl b/wcfsetup/install/files/acp/templates/userGroupOption.tpl
index f5e716841f..b5dcea1d07 100644
--- a/wcfsetup/install/files/acp/templates/userGroupOption.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupOption.tpl
@@ -42,6 +42,14 @@
 		else {
 			parent.appendChild(fragment);
 		}
+		
+		[{@$everyoneGroupID}, {@$guestGroupID}, {@$userGroupID}].forEach(function(groupID) {
+			elBySelAll('dl[data-group-id="' + groupID + '"] .jsBbcodeSelectOptionHtml', undefined, function (bbcodeHtml) {
+				elBySel('input[type="checkbox"]', bbcodeHtml).checked = true;
+				
+				elHide(bbcodeHtml);
+			});
+		});
 	})();
 </script>
 
@@ -77,7 +85,7 @@
 		</header>
 		
 		{foreach from=$groups item=group}
-			<dl>
+			<dl data-group-id="{@$group->groupID}">
 				<dt>{if VISITOR_USE_TINY_BUILD && $guestGroupID == $group->groupID && $userGroupOption->excludedInTinyBuild}<span class="icon icon16 fa-bolt red jsTooltip" title="{lang}wcf.acp.group.excludedInTinyBuild{/lang}"></span> {/if}<label for="userGroupOption{@$group->groupID}">{lang}{$group->groupName}{/lang}</label></dt>
 				<dd>
 					{@$formElements[$group->groupID]}
diff --git a/wcfsetup/install/files/lib/acp/form/UserGroupAddForm.class.php b/wcfsetup/install/files/lib/acp/form/UserGroupAddForm.class.php
index 89fc056463..635e06b21d 100755
--- a/wcfsetup/install/files/lib/acp/form/UserGroupAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserGroupAddForm.class.php
@@ -217,7 +217,8 @@ class UserGroupAddForm extends AbstractOptionListForm {
 			'priority' => $this->priority,
 			'userOnlineMarking' => $this->userOnlineMarking,
 			'showOnTeamPage' => $this->showOnTeamPage,
-			'groupIsGuest' => false
+			'groupIsGuest' => false,
+			'isBlankForm' => empty($_POST)
 		]);
 	}
 	
diff --git a/wcfsetup/install/files/lib/acp/form/UserGroupOptionForm.class.php b/wcfsetup/install/files/lib/acp/form/UserGroupOptionForm.class.php
index 2311d97861..489c3523ca 100644
--- a/wcfsetup/install/files/lib/acp/form/UserGroupOptionForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserGroupOptionForm.class.php
@@ -246,11 +246,16 @@ class UserGroupOptionForm extends AbstractForm {
 	public function assignVariables() {
 		parent::assignVariables();
 		
-		$guestGroupID = 0;
+		$everyoneGroupID = $guestGroupID = $userGroupID = 0;
 		foreach ($this->groups as $group) {
-			if ($group->groupType == UserGroup::GUESTS) {
+			if ($group->groupType == UserGroup::EVERYONE) {
+				$everyoneGroupID = $group->groupID;
+			}
+			else if ($group->groupType == UserGroup::GUESTS) {
 				$guestGroupID = $group->groupID;
-				break;
+			}
+			else if ($group->groupType == UserGroup::USERS) {
+				$userGroupID = $group->groupID;
 			}
 		}
 		
@@ -260,7 +265,9 @@ class UserGroupOptionForm extends AbstractForm {
 			'parentCategories' => $this->parentCategories,
 			'userGroupOption' => $this->userGroupOption,
 			'values' => $this->values,
-			'guestGroupID' => $guestGroupID
+			'everyoneGroupID' => $everyoneGroupID,
+			'guestGroupID' => $guestGroupID,
+			'userGroupID' => $userGroupID
 		]);
 	}
 	
-- 
2.20.1