From 38d3d320d8b7af6cd927c24b5f680c9115c96de7 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Wed, 18 Feb 2015 11:56:22 +0100
Subject: [PATCH] Fixed default value for accessibleGroups

---
 com.woltlab.wcf/package.xml                   | 16 +----
 com.woltlab.wcf/userGroupOption.xml           |  2 +-
 ...sibleGroups_com.woltlab.wcf_2.1.0_rc_2.php | 61 +++++++++++++++++++
 .../acp/update_com.woltlab.wcf_2.1.0_rc_1.php | 13 ----
 .../install/files/lib/system/WCF.class.php    |  2 +-
 5 files changed, 66 insertions(+), 28 deletions(-)
 create mode 100644 wcfsetup/install/files/acp/update_accessibleGroups_com.woltlab.wcf_2.1.0_rc_2.php
 delete mode 100644 wcfsetup/install/files/acp/update_com.woltlab.wcf_2.1.0_rc_1.php

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index bbf32ad881..c4c11b0d64 100644
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -5,7 +5,7 @@
 		<packagedescription><![CDATA[Free web-framework, designed and developed for complex community applications.]]></packagedescription>
 		<packagedescription language="de"><![CDATA[Freies Web-Framework, das für komplexe Community-Anwendungen entworfen und entwickelt wurde.]]></packagedescription>
 		<isapplication>1</isapplication>
-		<version>2.1.0 RC 1</version> <!-- codename: typhoon -->
+		<version>2.1.0 RC 2</version> <!-- codename: typhoon -->
 		<date>2015-02-16</date>
 	</packageinformation>
 	
@@ -89,18 +89,8 @@
 		<instruction type="script" run="standalone">acp/rebuild_comments_com.woltlab.wcf_2.1.php</instruction>
 	</instructions>
 	
-	<instructions type="update" fromversion="2.1.0 Beta 4">
-		<instruction type="option">option.xml</instruction>
+	<instructions type="update" fromversion="2.1.0 RC 1">
 		<instruction type="file">files_update.tar</instruction>
-		<instruction type="script">acp/update_com.woltlab.wcf_2.1.0_rc_1.php</instruction>
-		
-		<instruction type="language" run="standalone">language/*.xml</instruction>
-		
-		<instruction type="acpTemplate">acptemplates_update.tar</instruction>
-		<instruction type="template">templates_update.tar</instruction>
-		
-		<instruction type="sql">update_2.1.0_rc_1.sql</instruction>
-		
-		<instruction type="userGroupOption">userGroupOption.xml</instruction>
+		<instruction type="script">acp/update_accessibleGroups_com.woltlab.wcf_2.1.0_rc_2.php</instruction>
 	</instructions>
 </package>
diff --git a/com.woltlab.wcf/userGroupOption.xml b/com.woltlab.wcf/userGroupOption.xml
index 8e61456a0d..e9914de0ea 100644
--- a/com.woltlab.wcf/userGroupOption.xml
+++ b/com.woltlab.wcf/userGroupOption.xml
@@ -191,7 +191,7 @@
 				<categoryname>admin.user.group</categoryname>
 				<optiontype>userGroups</optiontype>
 				<defaultvalue></defaultvalue>
-				<admindefaultvalue>1,2,3,4,5,6</admindefaultvalue>
+				<admindefaultvalue>1,2,3,4,5</admindefaultvalue>
 				<usersonly>1</usersonly>
 			</option>
 			<option name="admin.user.canAddUser">
diff --git a/wcfsetup/install/files/acp/update_accessibleGroups_com.woltlab.wcf_2.1.0_rc_2.php b/wcfsetup/install/files/acp/update_accessibleGroups_com.woltlab.wcf_2.1.0_rc_2.php
new file mode 100644
index 0000000000..06214f7478
--- /dev/null
+++ b/wcfsetup/install/files/acp/update_accessibleGroups_com.woltlab.wcf_2.1.0_rc_2.php
@@ -0,0 +1,61 @@
+<?php
+use wcf\system\WCF;
+
+/**
+ * @author	Alexander Ebert
+ * @copyright	2001-2015 WoltLab GmbH
+ * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @package	com.woltlab.wcf
+ * @category	Community Framework
+ */
+
+// fix superfluous group ID in accessibleGroups list
+$sql = "SELECT	groupID
+	FROM	wcf".WCF_N."_user_group";
+$statement = WCF::getDB()->prepareStatement($sql);
+$statement->execute();
+$validGroupIDs = array();
+while ($row = $statement->fetchArray()) {
+	$validGroupIDs[] = $row['groupID'];
+}
+
+$sql = "SELECT	*
+	FROM	wcf".WCF_N."_user_group_option_value
+	WHERE	optionID = (
+			SELECT	optionID
+			FROM	wcf".WCF_N."_user_group_option
+			WHERE	optionName = 'admin.user.accessibleGroups'
+		)";
+$statement = WCF::getDB()->prepareStatement($sql);
+$statement->execute();
+$updateData = array();
+$optionID = 0;
+while ($row = $statement->fetchArray()) {
+	$optionID = $row['optionID'];
+	$groupIDs = explode(',', $row['optionValue']);
+	$newGroupIDs = array();
+	for ($i = 0, $length = count($groupIDs); $i < $length; $i++) {
+		$groupID = $groupIDs[$i];
+		if (in_array($groupID, $validGroupIDs)) {
+			$newGroupIDs[] = $groupID;
+		}
+	}
+	
+	$updateData[$row['groupID']] = implode(',', $newGroupIDs);
+}
+
+$sql = "UPDATE	wcf".WCF_N."_user_group_option_value
+	SET	optionValue = ?
+	WHERE	groupID = ?
+		AND optionID = ?";
+$statement = WCF::getDB()->prepareStatement($sql);
+
+WCF::getDB()->beginTransaction();
+foreach ($updateData as $groupID => $optionValue) {
+	$statement->execute(array(
+		$optionValue,
+		$groupID,
+		$optionID
+	));
+}
+WCF::getDB()->commitTransaction();
diff --git a/wcfsetup/install/files/acp/update_com.woltlab.wcf_2.1.0_rc_1.php b/wcfsetup/install/files/acp/update_com.woltlab.wcf_2.1.0_rc_1.php
deleted file mode 100644
index 737910adbd..0000000000
--- a/wcfsetup/install/files/acp/update_com.woltlab.wcf_2.1.0_rc_1.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-use wcf\data\option\OptionEditor;
-
-/**
- * @author	Alexander Ebert
- * @copyright	2001-2015 WoltLab GmbH
- * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @package	com.woltlab.wcf
- * @category	Community Framework
- */
-
-// rebuild options during update to properly handle new option
-OptionEditor::resetCache();
diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index 6bd98e09b0..46501e4e26 100644
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -38,7 +38,7 @@ if (!@ini_get('date.timezone')) {
 }
 
 // define current wcf version
-define('WCF_VERSION', '2.1.0 RC 1 (Typhoon)');
+define('WCF_VERSION', '2.1.0 RC 2 (Typhoon)');
 
 // define current unix timestamp
 define('TIME_NOW', time());
-- 
2.20.1