From 718bafcf88e6fd4f643e96d7516f680e3ea16b4f Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Tue, 23 Apr 2013 22:48:15 +0200
Subject: [PATCH] Fixed multiple user option issues

---
 com.woltlab.wcf/template/selectOptionType.tpl |  7 +++---
 .../files/acp/templates/selectOptionType.tpl  |  1 +
 .../lib/acp/form/UserOptionAddForm.class.php  |  4 +++-
 .../form/UserOptionSetDefaultsForm.class.php  | 24 +++++++++++++++----
 .../user/option/UserOptionEditor.class.php    | 15 +++++++++++-
 .../option/MultiSelectOptionType.class.php    |  4 ++--
 6 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/com.woltlab.wcf/template/selectOptionType.tpl b/com.woltlab.wcf/template/selectOptionType.tpl
index caa4a50af8..25332e39d2 100644
--- a/com.woltlab.wcf/template/selectOptionType.tpl
+++ b/com.woltlab.wcf/template/selectOptionType.tpl
@@ -1,5 +1,6 @@
 <select id="{$option->optionName}" name="values[{$option->optionName}]">
-{foreach from=$selectOptions key=key item=selectOption}
-	<option value="{$key}"{if $value == $key} selected="selected"{/if}>{lang}{@$selectOption}{/lang}</option>
-{/foreach}
+	<option value=""></option>
+	{foreach from=$selectOptions key=key item=selectOption}
+		<option value="{$key}"{if $value == $key} selected="selected"{/if}>{lang}{@$selectOption}{/lang}</option>
+	{/foreach}
 </select>
\ No newline at end of file
diff --git a/wcfsetup/install/files/acp/templates/selectOptionType.tpl b/wcfsetup/install/files/acp/templates/selectOptionType.tpl
index 424e96a172..25332e39d2 100644
--- a/wcfsetup/install/files/acp/templates/selectOptionType.tpl
+++ b/wcfsetup/install/files/acp/templates/selectOptionType.tpl
@@ -1,4 +1,5 @@
 <select id="{$option->optionName}" name="values[{$option->optionName}]">
+	<option value=""></option>
 	{foreach from=$selectOptions key=key item=selectOption}
 		<option value="{$key}"{if $value == $key} selected="selected"{/if}>{lang}{@$selectOption}{/lang}</option>
 	{/foreach}
diff --git a/wcfsetup/install/files/lib/acp/form/UserOptionAddForm.class.php b/wcfsetup/install/files/lib/acp/form/UserOptionAddForm.class.php
index f164b86e37..815084a707 100644
--- a/wcfsetup/install/files/lib/acp/form/UserOptionAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserOptionAddForm.class.php
@@ -246,7 +246,9 @@ class UserOptionAddForm extends AbstractForm {
 	
 		// reset values
 		$this->optionName = $this->optionDescription = $this->categoryName = $this->optionType = $this->defaultValue = $this->validationPattern = $this->optionType = $this->selectOptions = $this->outputClass = '';
-		$this->required = $this->editable = $this->visible = $this->searchable = $this->showOrder = $this->askDuringRegistration = 0;
+		$this->required = $this->searchable = $this->showOrder = $this->askDuringRegistration = 0;
+		$this->editable = 3;
+		$this->visible = 15;
 		
 		// show success
 		WCF::getTPL()->assign('success', true);
diff --git a/wcfsetup/install/files/lib/acp/form/UserOptionSetDefaultsForm.class.php b/wcfsetup/install/files/lib/acp/form/UserOptionSetDefaultsForm.class.php
index 4ee00b5343..aef6617a2e 100644
--- a/wcfsetup/install/files/lib/acp/form/UserOptionSetDefaultsForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserOptionSetDefaultsForm.class.php
@@ -89,15 +89,31 @@ class UserOptionSetDefaultsForm extends AbstractForm {
 		// apply changes
 		if ($this->applyChangesToExistingUsers) {
 			$optionIDs = array_keys($saveOptions);
-			$sql = "UPDATE	wcf".WCF_N."_user_option_value
-				SET	userOption".implode(' = ?, userOption', $optionIDs)." = ?";
+			
+			// get changed options
+			$sql = "SELECT	optionID, defaultValue
+				FROM	wcf".WCF_N."_user_option
+				WHERE	optionID IN (?".str_repeat(', ?', count($optionIDs) - 1).")"; 
 			$statement = WCF::getDB()->prepareStatement($sql);
-			$statement->execute(array_merge($saveOptions));
+			$statement->execute($optionIDs);
+			$optionIDs = $optionValues = array();
+			while ($row = $statement->fetchArray()) {
+				if ($row['defaultValue'] != $saveOptions[$row['optionID']]) {
+					$optionIDs[] = $row['optionID'];
+					$optionValues[] = $saveOptions[$row['optionID']];
+				}
+			}
+			
+			if (!empty($optionIDs)) {
+				$sql = "UPDATE	wcf".WCF_N."_user_option_value
+					SET	userOption".implode(' = ?, userOption', $optionIDs)." = ?";
+				$statement = WCF::getDB()->prepareStatement($sql);
+				$statement->execute(array_merge($optionValues));
+			}
 		}
 		
 		// reset cache
 		UserOptionCacheBuilder::getInstance()->reset();
-		
 		$this->saved();
 	
 		WCF::getTPL()->assign('success', true);
diff --git a/wcfsetup/install/files/lib/data/user/option/UserOptionEditor.class.php b/wcfsetup/install/files/lib/data/user/option/UserOptionEditor.class.php
index f1145b9d4a..410919ab2a 100644
--- a/wcfsetup/install/files/lib/data/user/option/UserOptionEditor.class.php
+++ b/wcfsetup/install/files/lib/data/user/option/UserOptionEditor.class.php
@@ -67,7 +67,20 @@ class UserOptionEditor extends DatabaseObjectEditor implements IEditableCachedOb
 		$statement = WCF::getDB()->prepareStatement($sql);
 		$statement->execute(array($this->optionID));
 		
-		$sql = WCF::getDB()->getEditor()->dropColumn('wcf'.WCF_N.'_user_option_value', 'userOption'.$this->optionID);
+		WCF::getDB()->getEditor()->dropColumn('wcf'.WCF_N.'_user_option_value', 'userOption'.$this->optionID);
+	}
+	
+	/**
+	 * @see	wcf\data\IEditableObject::deleteAll()
+	 */
+	public static function deleteAll(array $objectIDs = array()) {
+		$returnValue = parent::deleteAll($objectIDs);
+		
+		foreach ($objectIDs as $objectID) {
+			WCF::getDB()->getEditor()->dropColumn('wcf'.WCF_N.'_user_option_value', 'userOption'.$objectID);
+		}
+		
+		return $returnValue;
 	}
 	
 	/**
diff --git a/wcfsetup/install/files/lib/system/option/MultiSelectOptionType.class.php b/wcfsetup/install/files/lib/system/option/MultiSelectOptionType.class.php
index 81d57613ac..10a1e61ffb 100644
--- a/wcfsetup/install/files/lib/system/option/MultiSelectOptionType.class.php
+++ b/wcfsetup/install/files/lib/system/option/MultiSelectOptionType.class.php
@@ -24,7 +24,7 @@ class MultiSelectOptionType extends SelectOptionType {
 		WCF::getTPL()->assign(array(
 			'option' => $option,
 			'selectOptions' => $option->parseSelectOptions(),
-			'value' => explode("\n", $value)
+			'value' => (!is_array($value) ? explode("\n", $value) : $value)
 		));
 		return WCF::getTPL()->fetch('multiSelectOptionType');
 	}
@@ -58,7 +58,7 @@ class MultiSelectOptionType extends SelectOptionType {
 		$value = ArrayUtil::trim($value);
 		if (empty($value)) return false;
 		
-		$conditions->add("option_value.userOption".$option->optionID." = ?", array(implode("\n", $value)));
+		$conditions->add("option_value.userOption".$option->optionID." REGEXP '".'(^|\n)'.implode('\n([^\n]*\n)*', array_map('escapeString', $value)).'($|\n)'."'");
 		return true;
 	}
 }
-- 
2.20.1